paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-12 01:06:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

* Explicitly disable checkpointer for functions using GetEnvironmentStrings

Browse Source 
git-svn-id: trunk@20179 -
This commit is contained in:
pierre 2012-01-26 13:50:36 +00:00
parent b1810691fa
commit 573102fa70
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
rtl/win/dos.pp
View File

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

7
rtl/win/sysutils.pp
View File

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