zend_ustr

devlephant · Feb 12, 2020 · a5a7b69 · a5a7b69
1 parent 93920a6
commit a5a7b69
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/Source/ZENDAPI.pas b/Source/ZENDAPI.pas
@@ -1538,9 +1538,8 @@ procedure VariantToZend(const Value:Variant;z:pzval;
      Exit;
    end;
   case TVarData(Value).VType of
-  varString    : //Peter Enz
+  varString    :
          begin
-         // ShowMessage('h_e');
            if Assigned ( TVarData(Value).VString ) then
              begin
                ZVAL_STRINGA(z, AnsiString(PAnsiChar(TVarData(Value).VString)), true);
@@ -1551,10 +1550,10 @@ procedure VariantToZend(const Value:Variant;z:pzval;
                  end;
          end;
 
-  varUString    : //Peter Enz
+  varUString    :
              ZVAL_RawStr(z, RawByteString(TVarData(Value).VUString), true);
 
-     varOleStr    : //Peter Enz
+     varOleStr    :
          begin
            if Assigned ( TVarData(Value).VOleStr ) then
              begin
@@ -1612,9 +1611,8 @@ procedure VariantToZend(const Value:Variant;z:pzval;
        else
         ZVALVAL(z, integer(TObject(TVarData(Value).VPointer^)));
      end;
-     varStrArg    : //Peter Enz
+     varStrArg    :
          begin
-          //ShowMessage('h_e_e');
            if Assigned ( TVarData(Value).VString ) then
              begin
                ZVAL_STRINGA(z, AnsiString(PAnsiChar(TVarData(Value).VString)), true);

diff --git a/Source/php4delphi.pas b/Source/php4delphi.pas
@@ -198,7 +198,7 @@   TCustomPHPLibrary = class(TPHPComponent)
   TPHPEngineInitEvent =  procedure(Sender:TObject;TSRMLS_DC:Pointer) of object;
   TPHPEngine = class(TPHPComponent, IUnknown, IPHPEngine)
   private
-    FINIPath : AnsiString;
+    FINIPath : zend_ustr;
     FOnEngineStartup  : TNotifyEvent;
     FAddMods          : TArray<Pzend_module_entry>;
     FOnEngineShutdown : TNotifyEvent;
@@ -264,7 +264,7 @@   TPHPEngine = class(TPHPComponent, IUnknown, IPHPEngine)
     property  OnEngineShutdown : TNotifyEvent read FOnEngineShutdown write FOnEngineShutdown;
     property  OnScriptError : TPHPErrorEvent read FOnScriptError write FOnScriptError;
     property  OnLogMessage : TPHPLogMessage read FOnLogMessage write FOnLogMessage;
-    property  IniPath : AnsiString read FIniPath write FIniPath;
+    property  IniPath : zend_ustr read FIniPath write FIniPath;
     {$IFNDEF PHP540}
     property  SafeMode : boolean read FSafeMode write FSafeMode default false;
     property  SafeModeGid : boolean read FSafeModeGid write FSafeModeGid default false;