2
0
Эх сурвалжийг харах

Merged revisions 12638,12653,12665 via svnmerge from
svn+ssh://[email protected]/FPC/svn/fpc/trunk

........
r12638 | marco | 2009-02-01 14:20:21 +0100 (Sun, 01 Feb 2009) | 2 lines

* regionsize now ptruint, mantis 13077
........
r12653 | marco | 2009-02-02 11:06:03 +0100 (Mon, 02 Feb 2009) | 3 lines

* deprecated (for 2.4) some functions that take a shortstring path.
(problems with long filenames)
........
r12665 | marco | 2009-02-02 21:44:18 +0100 (Mon, 02 Feb 2009) | 2 lines

* log* defines.
........

git-svn-id: branches/fixes_2_2@12676 -

marco 16 жил өмнө
parent
commit
6bb67019cd

+ 5 - 5
rtl/unix/unixutil.pp

@@ -26,16 +26,16 @@ Type
   NameStr = String[255];
   ExtStr  = String[255];
 
-Function Dirname(Const path:pathstr):pathstr;
+Function Dirname(Const path:pathstr):pathstr; deprecated;
 Function StringToPPChar(S: PChar;ReserveEntries:integer):ppchar;
-Function StringToPPChar(Var S:String;ReserveEntries:integer):ppchar;
+Function StringToPPChar(Var S:String;ReserveEntries:integer):ppchar; deprecated; 
 Function StringToPPChar(Var S:AnsiString;ReserveEntries:integer):ppchar;
 function ArrayStringToPPchar(const S:Array of AnsiString;reserveentries:Longint):ppchar; // const ?
-Function Basename(Const path:pathstr;Const suf:pathstr):pathstr;
-Function FNMatch(const Pattern,Name:string):Boolean;
+Function Basename(Const path:pathstr;Const suf:pathstr):pathstr; deprecated;
+Function FNMatch(const Pattern,Name:string):Boolean; deprecated;
 Function GetFS (var T:Text):longint;
 Function GetFS(Var F:File):longint;
-Procedure FSplit(const Path:PathStr;Var Dir:DirStr;Var Name:NameStr;Var Ext:ExtStr);
+Procedure FSplit(const Path:PathStr;Var Dir:DirStr;Var Name:NameStr;Var Ext:ExtStr); deprecated;
 Function LocalToEpoch(year,month,day,hour,minute,second:Word):Longint;
 Procedure EpochToLocal(epoch:longint;var year,month,day,hour,minute,second:Word);
 Procedure JulianToGregorian(JulianDN:LongInt;Var Year,Month,Day:Word);

+ 7 - 0
rtl/win/wininc/defines.inc

@@ -1245,6 +1245,11 @@
      SETXON = 2;
      SETBREAK = 8;
      CLRBREAK = 9;
+
+     ENDSESSION_LOGOFF   = dword($80000000);  // all winver >= 0x400
+     ENDSESSION_CRITICAL = dword($40000000);
+     ENDSESSION_CLOSEAPP = dword($00000001);
+
   { ExitWindowsEx  }
      EWX_FORCE = 4;
      EWX_LOGOFF = 0;
@@ -1252,6 +1257,8 @@
      EWX_REBOOT = 2;
      EWX_SHUTDOWN = 1;
      EWX_FORCEIFHUNG = 16;
+     EWX_QUICKRESOLVE= 32; // win32_winnt>=0x500
+     EWX_RESTARTAPPS = 64; // win32_winnt>=0x600
   { ExtFloodFill  }
      FLOODFILLBORDER = 0;
      FLOODFILLSURFACE = 1;

+ 1 - 1
rtl/win/wininc/struct.inc

@@ -4181,7 +4181,7 @@ Const
           BaseAddress : PVOID;
           AllocationBase : PVOID;
           AllocationProtect : DWORD;
-          RegionSize : DWORD;
+          RegionSize : PTRUINT; // MvdV: size_t in win SDK 6.0.
           State : DWORD;
           Protect : DWORD;
           _Type : DWORD;