Browse Source

* Explicitly disable checkpointer for functions using GetEnvironmentStrings

git-svn-id: trunk@20179 -
pierre 13 years ago
parent
commit
573102fa70
2 changed files with 11 additions and 2 deletions
  1. 5 1
      rtl/win/dos.pp
  2. 6 1
      rtl/win/sysutils.pp

+ 5 - 1
rtl/win/dos.pp

@@ -744,6 +744,10 @@ function GetEnvironmentStrings : pchar;
 function FreeEnvironmentStrings(p : pchar) : longbool;
   stdcall; external 'kernel32' name 'FreeEnvironmentStringsA';
 
+{$push}
+{ GetEnvironmentStrings cannot be checked by CheckPointer function }
+{$checkpointer off}
+
 function envcount : longint;
 var
    hp,p : pchar;
@@ -814,7 +818,7 @@ begin
      end;
    FreeEnvironmentStrings(p);
 end;
-
+{$pop}
 
 function GetModuleHandle(p : PChar) : PtrUInt;
   stdcall; external 'kernel32' name 'GetModuleHandleA';

+ 6 - 1
rtl/win/sysutils.pp

@@ -768,7 +768,7 @@ begin
 *)
 end;
 
-procedure GetLocaleFormatSettings(LCID: Integer; var FormatSettings: TFormatSettings); 
+procedure GetLocaleFormatSettings(LCID: Integer; var FormatSettings: TFormatSettings);
 var
   HF  : Shortstring;
   LID : Windows.LCID;
@@ -894,6 +894,10 @@ end;
                               Initialization code
 ****************************************************************************}
 
+{$push}
+{ GetEnvironmentStrings cannot be checked by CheckPointer function }
+{$checkpointer off}
+
 Function GetEnvironmentVariable(Const EnvVar : String) : String;
 
 var
@@ -957,6 +961,7 @@ begin
   FreeEnvironmentStrings(p);
 end;
 
+{$pop}
 
 function ExecuteProcess(Const Path: AnsiString; Const ComLine: AnsiString;Flags:TExecuteFlags=[]):integer;
 // win specific  function