Browse Source

moved GetCurrentProcess (and some constants for WinCE) from win*/system.pp to win/sysos.inc, because it will be needed in systhrd.inc

git-svn-id: branches/svenbarth/collector@17156 -
svenbarth 14 years ago
parent
commit
c12b953ad2
4 changed files with 21 additions and 22 deletions
  1. 21 0
      rtl/win/sysos.inc
  2. 0 3
      rtl/win32/system.pp
  3. 0 3
      rtl/win64/system.pp
  4. 0 16
      rtl/wince/system.pp

+ 21 - 0
rtl/win/sysos.inc

@@ -203,8 +203,29 @@ threadvar
 
   function Win32GetCurrentThreadId:DWORD;
     stdcall; external KernelDLL name 'GetCurrentThreadId';
+
+  function GetCurrentProcess:THANDLE;
+    stdcall;external KernelDLL name 'GetCurrentProcess';
 {$endif WINCE}
 
+{$ifdef WINCE}
+  const
+  {$ifdef CPUARM}
+    UserKData = $FFFFC800;
+  {$else CPUARM}
+    UserKData = $00005800;
+  {$endif CPUARM}
+    SYSHANDLE_OFFSET = $004;
+    SYS_HANDLE_BASE	 = 64;
+    SH_CURTHREAD     = 1;
+    SH_CURPROC       = 2;
+
+  function GetCurrentProcess:THANDLE;
+  begin
+    GetCurrentProcess := SH_CURPROC+SYS_HANDLE_BASE;
+  end;
+{$endif}
+
    { module functions }
    function GetModuleFileName(l1:longint;p:pointer;l2:longint):longint;
      {$ifdef wince}cdecl{$else}stdcall{$endif};external KernelDLL name 'GetModuleFileName' + ApiSuffix;

+ 0 - 3
rtl/win32/system.pp

@@ -382,9 +382,6 @@ procedure Exe_entry(const info : TEntryInformation);[public,alias:'_FPC_EXE_Entr
      system_exit;
   end;
 
-function GetCurrentProcess : dword;
- stdcall;external 'kernel32' name 'GetCurrentProcess';
-
 function ReadProcessMemory(process : dword;address : pointer;dest : pointer;size : dword;bytesread : pdword) :  longbool;
  stdcall;external 'kernel32' name 'ReadProcessMemory';
 

+ 0 - 3
rtl/win64/system.pp

@@ -473,9 +473,6 @@ begin
   DLL_Entry;
 end;
 
-function GetCurrentProcess : dword;
- stdcall;external 'kernel32' name 'GetCurrentProcess';
-
 function ReadProcessMemory(process : dword;address : pointer;dest : pointer;size : dword;bytesread : pdword) :  longbool;
  stdcall;external 'kernel32' name 'ReadProcessMemory';
 

+ 0 - 16
rtl/wince/system.pp

@@ -480,17 +480,6 @@ begin
   RemoveDirectory := RemoveDirectoryW(buf);
 end;
 
-const
-{$ifdef CPUARM}
-  UserKData = $FFFFC800;
-{$else CPUARM}
-  UserKData = $00005800;
-{$endif CPUARM}
-  SYSHANDLE_OFFSET = $004;
-  SYS_HANDLE_BASE	 = 64;
-  SH_CURTHREAD     = 1;
-  SH_CURPROC       = 2;
-
 type
   PHandle = ^THandle;
 
@@ -1114,11 +1103,6 @@ type
 {$ifdef CPUI386}
 {**************************** i386 Exception handling *****************************************}
 
-function GetCurrentProcess:DWORD;
-begin
-  GetCurrentProcess := SH_CURPROC+SYS_HANDLE_BASE;
-end;
-
 function ReadProcessMemory(process : dword;address : pointer;dest : pointer;size : dword;bytesread : pdword) :  longbool;
    cdecl; external 'coredll' name 'ReadProcessMemory';