Final strokes

Author: Andrew Zenin

Source/DelphiFunctions.pas

@@ -139,7 +139,13 @@ procedure delphi_get_author(ht : integer; return_value : pzval; return_value_ptr
 procedure delphi_get_author(ht : integer; return_value : pzval; this_ptr : pzval;
       return_value_used : integer; TSRMLS_DC : pointer); cdecl;
 {$ENDIF}
-
+{$IFDEF PHP5}
+procedure delphi_is_uc(ht : integer; return_value : pzval; return_value_ptr : ppzval; this_ptr : pzval;
+      return_value_used : integer; TSRMLS_DC : pointer); cdecl;
+{$ELSE}
+procedure delphi_is_uc(ht : integer; return_value : pzval; this_ptr : pzval;
+      return_value_used : integer; TSRMLS_DC : pointer); cdecl;
+{$ENDIF}
 {$IFDEF PHP510}
 procedure register_delphi_component(ht : integer; return_value : pzval; return_value_ptr : ppzval; this_ptr : pzval;
       return_value_used : integer; TSRMLS_DC : pointer); cdecl;
@@ -641,8 +647,16 @@ procedure delphi_get_author(ht : integer; return_value : pzval; this_ptr : pzval
   {$ENDIF}
 end;
 
-
-
+{$IFDEF PHP5}
+procedure delphi_is_uc(ht : integer; return_value : pzval; return_value_ptr : ppzval; this_ptr : pzval;
+      return_value_used : integer; TSRMLS_DC : pointer); cdecl;
+{$ELSE}
+procedure delphi_is_uc(ht : integer; return_value : pzval; this_ptr : pzval;
+      return_value_used : integer; TSRMLS_DC : pointer);
+{$ENDIF}
+begin
+    {$IFDEF PHP_UNICE}ZVAL_TRUE{$ELSE}ZVAL_FALSE{$ENDIF}(return_value);
+end;
 
 {$IFDEF PHP510}
 procedure register_delphi_object(ht : integer; return_value : pzval; return_value_ptr : ppzval; this_ptr : pzval;

Source/ZENDAPI.pas

@@ -3433,13 +3433,13 @@ function Z_VARREC(z: pzval): TVarRec;
             Result.VExtended^ := z.value.dval;
         end;
         IS_STRING: begin
-            Result.VType := {$IFDEF PHP_UNICE}vtUnicodeString{$ELSE}vtAnsiString{$ENDIF};
+            Result.VType := {$IFDEF PHP_UNICE}vtString{$ELSE}vtAnsiString{$ENDIF};
 
             SetLength(P, z.value.str.len);
             Move(z.value.str.val^, P[1], z.value.str.len);
 
             {$IFDEF PHP_UNICE}
-              Result.VUnicodeString := Pointer(UnicodeString(p));
+              Result.VString := Pointer(String(p));
             {$ELSE}
               Result.VAnsiString := Pointer(P);
             {$ENDIF}

Source/php4delphi.pas

@@ -1791,7 +1791,7 @@ procedure TPHPEngine.RefreshLibrary;
  cnt, offset : integer;
  HashName : zend_ustr;
 begin
-  SetLength(FLibraryEntryTable, FHash.Count + MyFuncs.Count + 13);
+  SetLength(FLibraryEntryTable, FHash.Count + MyFuncs.Count + 14);
 
   PHP_FUNCTION(FLibraryEntryTable[0], 'delphi_date', @delphi_date);
   PHP_FUNCTION(FLibraryEntryTable[1], 'delphi_extract_file_dir', @delphi_extract_file_dir);
@@ -1830,37 +1830,44 @@ procedure TPHPEngine.RefreshLibrary;
   FLibraryEntryTable[7].arg_info := nil;
   {$ENDIF}
 
-  FLibraryEntryTable[8].fname := 'delphi_str_date';
-  FLibraryEntryTable[8].handler := @delphi_str_date;
+  FLibraryEntryTable[8].fname := 'delphi_is_uc';
+  FLibraryEntryTable[8].handler := @delphi_is_uc;
   {$IFDEF PHP4}
   FLibraryEntryTable[8].func_arg_types := nil;
   {$ELSE}
   FLibraryEntryTable[8].arg_info := nil;
   {$ENDIF}
 
+  FLibraryEntryTable[9].fname := 'delphi_str_date';
+  FLibraryEntryTable[9].handler := @delphi_str_date;
+  {$IFDEF PHP4}
+  FLibraryEntryTable[9].func_arg_types := nil;
+  {$ELSE}
+  FLibraryEntryTable[9].arg_info := nil;
+  {$ENDIF}
 
-  PHP_FUNCTION(FLibraryEntryTable[9], 'delphi_get_system_directory', @delphi_get_system_directory);
-  PHP_FUNCTION(FLibraryEntryTable[10], 'InputBox', @delphi_input_box);
-  PHP_FUNCTION(FLibraryEntryTable[11], 'register_delphi_component', @register_delphi_component);
+  PHP_FUNCTION(FLibraryEntryTable[10], 'delphi_get_system_directory', @delphi_get_system_directory);
+  PHP_FUNCTION(FLibraryEntryTable[11], 'InputBox', @delphi_input_box);
+  PHP_FUNCTION(FLibraryEntryTable[12], 'register_delphi_component', @register_delphi_component);
 
 
     for cnt := 0 to FHash.Count - 1 do
     begin
       HashName := FHash[cnt];
 
       {$IFNDEF COMPILER_VC9}
-      FLibraryEntryTable[cnt+12].fname := strdup(zend_pchar(HashName));
+      FLibraryEntryTable[cnt+13].fname := strdup(zend_pchar(HashName));
       {$ELSE}
-      FLibraryEntryTable[cnt+12].fname := DupStr(zend_pchar(HashName));
+      FLibraryEntryTable[cnt+13].fname := DupStr(zend_pchar(HashName));
       {$ENDIF}
 
-      FLibraryEntryTable[cnt+12].handler := @DispatchRequest;
+      FLibraryEntryTable[cnt+13].handler := @DispatchRequest;
       {$IFDEF PHP4}
-      FLibraryEntryTable[cnt+12].func_arg_types := nil;
+      FLibraryEntryTable[cnt+13].func_arg_types := nil;
       {$ENDIF}
     end;
 
-    offset := FHash.Count + 12;
+    offset := FHash.Count + 13;
     for cnt := 0 to MyFuncs.Count - 1 do
     begin
         HashName := MyFuncs[cnt];
@@ -1877,10 +1884,10 @@ procedure TPHPEngine.RefreshLibrary;
     end;
 
 
-    FLibraryEntryTable[FHash.Count+MyFuncs.Count+12].fname := nil;
-    FLibraryEntryTable[FHash.Count+MyFuncs.Count+12].handler := nil;
+    FLibraryEntryTable[FHash.Count+MyFuncs.Count+13].fname := nil;
+    FLibraryEntryTable[FHash.Count+MyFuncs.Count+13].handler := nil;
     {$IFDEF PHP4}
-    FLibraryEntryTable[FHash.Count+MyFuncs.Count+12].func_arg_types := nil;
+    FLibraryEntryTable[FHash.Count+MyFuncs.Count+13].func_arg_types := nil;
     {$ENDIF}
 
     FLibraryModule.functions := @FLibraryEntryTable[0];