Commit a5a7b69

Lev ZeninLev Zenin

Lev Zenin

authored and

Lev Zenin

committed

zend_ustr

1 parent 93920a6 commit a5a7b69Copy full SHA for a5a7b69

File tree

-8

lines changed

-8

lines changed

Lines changed: 4 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -1538,9 +1538,8 @@ procedure VariantToZend(const Value:Variant;z:pzval;`
`1538`	`1538`	`Exit;`
`1539`	`1539`	`end;`
`1540`	`1540`	`case TVarData(Value).VType of`
`1541`		`- varString ://Peter Enz`
	`1541`	`+ varString :`
`1542`	`1542`	`begin`
`1543`		`- // ShowMessage('h_e');`
`1544`	`1543`	`if Assigned ( TVarData(Value).VString ) then`
`1545`	`1544`	`begin`
`1546`	`1545`	`ZVAL_STRINGA(z, AnsiString(PAnsiChar(TVarData(Value).VString)), true);`
`@@ -1551,10 +1550,10 @@ procedure VariantToZend(const Value:Variant;z:pzval;`
`1551`	`1550`	`end;`
`1552`	`1551`	`end;`
`1553`	`1552`
`1554`		`- varUString ://Peter Enz`
	`1553`	`+ varUString :`
`1555`	`1554`	`ZVAL_RawStr(z, RawByteString(TVarData(Value).VUString), true);`
`1556`	`1555`
`1557`		`- varOleStr ://Peter Enz`
	`1556`	`+ varOleStr :`
`1558`	`1557`	`begin`
`1559`	`1558`	`if Assigned ( TVarData(Value).VOleStr ) then`
`1560`	`1559`	`begin`
`@@ -1612,9 +1611,8 @@ procedure VariantToZend(const Value:Variant;z:pzval;`
`1612`	`1611`	`else`
`1613`	`1612`	`ZVALVAL(z, integer(TObject(TVarData(Value).VPointer^)));`
`1614`	`1613`	`end;`
`1615`		`- varStrArg ://Peter Enz`
	`1614`	`+ varStrArg :`
`1616`	`1615`	`begin`
`1617`		`- //ShowMessage('h_e_e');`
`1618`	`1616`	`if Assigned ( TVarData(Value).VString ) then`
`1619`	`1617`	`begin`
`1620`	`1618`	`ZVAL_STRINGA(z, AnsiString(PAnsiChar(TVarData(Value).VString)), true);`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -198,7 +198,7 @@ TCustomPHPLibrary = class(TPHPComponent)`
`198`	`198`	`TPHPEngineInitEvent = procedure(Sender:TObject;TSRMLS_DC:Pointer) of object;`
`199`	`199`	`TPHPEngine = class(TPHPComponent, IUnknown, IPHPEngine)`
`200`	`200`	`private`
`201`		`- FINIPath : AnsiString;`
	`201`	`+ FINIPath : zend_ustr;`
`202`	`202`	`FOnEngineStartup : TNotifyEvent;`
`203`	`203`	`FAddMods : TArray<Pzend_module_entry>;`
`204`	`204`	`FOnEngineShutdown : TNotifyEvent;`
`@@ -264,7 +264,7 @@ TPHPEngine = class(TPHPComponent, IUnknown, IPHPEngine)`
`264`	`264`	`property OnEngineShutdown : TNotifyEvent read FOnEngineShutdown write FOnEngineShutdown;`
`265`	`265`	`property OnScriptError : TPHPErrorEvent read FOnScriptError write FOnScriptError;`
`266`	`266`	`property OnLogMessage : TPHPLogMessage read FOnLogMessage write FOnLogMessage;`
`267`		`- property IniPath : AnsiString read FIniPath write FIniPath;`
	`267`	`+ property IniPath : zend_ustr read FIniPath write FIniPath;`
`268`	`268`	`{$IFNDEF PHP540}`
`269`	`269`	`property SafeMode : boolean read FSafeMode write FSafeMode default false;`
`270`	`270`	`property SafeModeGid : boolean read FSafeModeGid write FSafeModeGid default false;`

Comments

(0)