Some small fixes

One more step #7 to remove assembler
devlephant · Feb 12, 2020 · 978b112 · 978b112
1 parent a5a7b69
commit 978b112
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 6 deletions.
diff --git a/Source/Demos/psvPHP/console/phpcon.dpr b/Source/Demos/psvPHP/console/phpcon.dpr
@@ -42,7 +42,7 @@ var
 begin
   if zend_parse_method_parameters(1, TSRMLS_DC, this_ptr, 'z', @p) = 0 then
   begin
-      ZVAL_STRING(z,'🐆🐆🐆 .-=WPD=-. 🐆🐆🐆',true);
+      ZVAL_STRINGW(p,'🐆🐆🐆 .-=WPD=-. 🐆🐆🐆',true);
   end;
 end;
 begin

diff --git a/Source/ZENDAPI.pas b/Source/ZENDAPI.pas
@@ -1530,7 +1530,6 @@ procedure VariantToZend(const Value:Variant;z:pzval;
 cobj: TObjectAConvertMethod=nil);
 var
  W : WideString;
- S: String;
 begin
   if VarIsEmpty(value) or VarIsNull(Value) then
    begin

diff --git a/Source/php4delphi.pas b/Source/php4delphi.pas
@@ -1616,10 +1616,7 @@ procedure TPHPEngine.PrepareIniEntry;
 
    if FHandleErrors then
    begin
-    // p := integer(GetProcAddress(PHPLib, 'zend_do_print'));
-     p := GetProcAddress(PHPLib, 'zend_error_cb');
-     p2 := @delphi_error_cb;
-     Move(p, p2, 1);
+     ppointer(GetProcAddress(PHPLib, 'zend_error_cb'))^ := @delphi_error_cb;
    end;
     {$IFNDEF PHP540}
   if FSafeMode then