Browse Source

* PChar -> PAnsiChar fixes

Michael VAN CANNEYT 2 years ago
parent
commit
16eed74ca4

+ 2 - 2
packages/winunits-base/src/comobj.pp

@@ -1228,8 +1228,8 @@ HKCR
                         if printcom then 
                         if printcom then 
                         writeln('Translating var ansistring argument ',PString(Params^)^);
                         writeln('Translating var ansistring argument ',PString(Params^)^);
 {$endif DEBUG_COMDISPATCH}
 {$endif DEBUG_COMDISPATCH}
-                        StringMap[NextString].ComStr:=StringToOleStr(PString(Params^)^);
-                        StringMap[NextString].PasStr:=PString(Params^);
+                        StringMap[NextString].ComStr:=StringToOleStr(PAnsiString(Params^)^);
+                        StringMap[NextString].PasStr:=PAnsiString(Params^);
                         StringMap[NextString].PasWStr:=Nil;
                         StringMap[NextString].PasWStr:=Nil;
                         Arguments[i].VType:=varOleStr or varByRef;
                         Arguments[i].VType:=varOleStr or varByRef;
                         Arguments[i].VPointer:=@StringMap[NextString].ComStr;
                         Arguments[i].VPointer:=@StringMap[NextString].ComStr;

+ 1 - 1
packages/winunits-jedi/src/ModuleLoader.pas

@@ -1,4 +1,4 @@
-****************************************************************}
+{******************************************************************}
 {                                                                  }
 {                                                                  }
 {       Project JEDI                                               }
 {       Project JEDI                                               }
 {       OS independent Dynamic Loading Helpers                     }
 {       OS independent Dynamic Loading Helpers                     }

+ 5 - 1
packages/winunits-jedi/src/jedi.inc

@@ -405,7 +405,11 @@
   {$ASMMODE Intel}
   {$ASMMODE Intel}
   {$ENDIF CPUI386 OR CPUX86_64}
   {$ENDIF CPUI386 OR CPUX86_64}
   {$UNDEF BORLAND}
   {$UNDEF BORLAND}
-   // FPC defines CPU* and Unix automatically
+  // FPC defines CPU* and Unix automatically
+  // CHAR is not known yet at this point, so SIZEOF(CHAR)) does not work. Not ideal...
+  {$IFDEF UNICODERTL}
+  {$DEFINE UNICODE}
+  {$ENDIF}
 {$ENDIF}
 {$ENDIF}
 
 
 {$IFDEF BORLAND}
 {$IFDEF BORLAND}