Browse Source

--- Merging r41918 into '.':
U rtl/win/wininc/ascdef.inc
U rtl/win/wininc/ascfun.inc
U rtl/win/wininc/unidef.inc
U rtl/win/wininc/unifun.inc
--- Recording mergeinfo for merge of r41918 into '.':
U .
--- Merging r41919 into '.':
U rtl/win/wininc/defines.inc
--- Recording mergeinfo for merge of r41919 into '.':
G .
--- Merging r41920 into '.':
G rtl/win/wininc/defines.inc
--- Recording mergeinfo for merge of r41920 into '.':
G .
--- Merging r41921 into '.':
U rtl/win/wininc/func.inc
--- Recording mergeinfo for merge of r41921 into '.':
G .
--- Merging r41922 into '.':
U rtl/win/wininc/messages.inc
--- Recording mergeinfo for merge of r41922 into '.':
G .
--- Merging r41925 into '.':
G rtl/win/wininc/func.inc
--- Recording mergeinfo for merge of r41925 into '.':
G .
--- Merging r41926 into '.':
G rtl/win/wininc/func.inc
--- Recording mergeinfo for merge of r41926 into '.':
G .
--- Merging r41930 into '.':
G rtl/win/wininc/func.inc
--- Recording mergeinfo for merge of r41930 into '.':
G .

# revisions: 41918,41919,41920,41921,41922,41925,41926,41930
r41918 | marco | 2019-04-21 20:00:24 +0200 (Sun, 21 Apr 2019) | 2 lines
Changed paths:
M /trunk/rtl/win/wininc/ascdef.inc
M /trunk/rtl/win/wininc/ascfun.inc
M /trunk/rtl/win/wininc/unidef.inc
M /trunk/rtl/win/wininc/unifun.inc

* QueryFullProcessImageName
r41919 | marco | 2019-04-21 20:06:09 +0200 (Sun, 21 Apr 2019) | 2 lines
Changed paths:
M /trunk/rtl/win/wininc/defines.inc

* PROCESS_NAME_NATIVE constant
r41920 | marco | 2019-04-21 20:10:12 +0200 (Sun, 21 Apr 2019) | 2 lines
Changed paths:
M /trunk/rtl/win/wininc/defines.inc

* PROCESS_QUERY_LIMITED_INFORMATION, mantis 35423
r41921 | marco | 2019-04-21 20:12:57 +0200 (Sun, 21 Apr 2019) | 2 lines
Changed paths:
M /trunk/rtl/win/wininc/func.inc

* IsDebuggerPresent, bug #35422
r41922 | marco | 2019-04-22 11:42:44 +0200 (Mon, 22 Apr 2019) | 1 line
Changed paths:
M /trunk/rtl/win/wininc/messages.inc

* add uint typecast to some negative message numbers Mantis 035324
r41925 | marco | 2019-04-22 21:51:41 +0200 (Mon, 22 Apr 2019) | 2 lines
Changed paths:
M /trunk/rtl/win/wininc/func.inc

* wow64 related functions from mantis 034328
r41926 | marco | 2019-04-23 09:50:12 +0200 (Tue, 23 Apr 2019) | 2 lines
Changed paths:
M /trunk/rtl/win/wininc/func.inc

* iswow64present and enable*fsredirection with a byte as param because the BOOLEAN type is a byte according to MSDN. Mantis 035429
r41930 | marco | 2019-04-25 11:06:23 +0200 (Thu, 25 Apr 2019) | 2 lines
Changed paths:
M /trunk/rtl/win/wininc/func.inc

* GetPhysicallyInstalledSystemMemory mantis 035439 by 440bx

git-svn-id: branches/fixes_3_2@41937 -

marco 6 years ago
parent
commit
458dac66cf

+ 1 - 0
rtl/win/wininc/ascdef.inc

@@ -480,6 +480,7 @@ function FindFirstFileEx(lpfilename : LPCStr;fInfoLevelId:FINDEX_INFO_LEVELS ;lp
 function FindFirstFileTransacted(lpfilename : LPCStr;fInfoLevelId:FINDEX_INFO_LEVELS ;lpFindFileData:pointer;fSearchOp : FINDEX_SEARCH_OPS;lpSearchFilter:pointer;dwAdditionalFlags:dword;htransaction : HANDLE):Handle; stdcall;
     external 'kernel32' name 'FindFirstFileTransactedA';
 function GetComputerNameEx(NameType:COMPUTER_NAME_FORMAT;lpbuffer:LPSTR;nSize:LPDWORD):BOOL;stdcall;external 'kernel32' name 'GetComputerNameExA';
+function QueryFullProcessImageName(hProcess:THandle;dwFlags:DWord; lpexename :lpstr;lpdwsize:pdword):BOOL; stdcall; external 'kernel32.dll' name 'QueryFullProcessImageNameA';
 {$endif read_interface}
 
 

+ 1 - 0
rtl/win/wininc/ascfun.inc

@@ -493,6 +493,7 @@ function GetConsoleAliasExesLengthA:DWORD;stdcall;external 'kernel32' name 'GetC
 function GetConsoleAliasesA(AliasBuffer:LPSTR; AliasBufferLength:DWORD; ExeName:LPSTR):DWORD;stdcall;external 'kernel32' name 'GetConsoleAliasesA';
 function GetConsoleAliasExesA(ExeNameBuffer:LPSTR; ExeNameBufferLength:DWORD):DWORD;stdcall;external 'kernel32' name 'GetConsoleAliasExesA';
 function GetComputerNameExA(NameType:COMPUTER_NAME_FORMAT;lpbuffer:LPSTR;nSize:LPDWORD):BOOL;stdcall;external 'kernel32' name 'GetComputerNameExA';
+function QueryFullProcessImageNameA(hProcess:THandle;dwFlags:DWord; lpexename :lpstr;lpdwsize:pdword):BOOL; stdcall; external 'kernel32.dll' name 'QueryFullProcessImageNameA';
 {$endif read_interface}
 
 

+ 3 - 3
rtl/win/wininc/defines.inc

@@ -1167,6 +1167,7 @@
      PROCESS_CREATE_THREAD = 2;
      PROCESS_DUP_HANDLE = 64;
      PROCESS_QUERY_INFORMATION = 1024;
+     PROCESS_QUERY_LIMITED_INFORMATION = $1000;
      PROCESS_SET_INFORMATION = 512;
      PROCESS_TERMINATE = 1;
      PROCESS_VM_OPERATION = 8;
@@ -6377,9 +6378,8 @@ const
 
 
     CONSOLE_FULLSCREEN_MODE = 1;    
-    CONSOLE_WINDOWED_MODE = 2;    
-
-
+    CONSOLE_WINDOWED_MODE   = 2;    
+    PROCESS_NAME_NATIVE     = 1;
 
 {$endif read_interface}
 

+ 6 - 1
rtl/win/wininc/func.inc

@@ -1320,7 +1320,12 @@ function CONSOLE_REAL_OUTPUT_HANDLE : HANDLE;
   function GetConsoleWindow:HWND;stdcall;external 'kernel32' name 'GetConsoleWindow';
   function GetConsoleProcessList(lpdwProcessList:LPDWORD; dwProcessCount:DWORD):DWORD;stdcall;external 'kernel32' name 'GetConsoleProcessList';
   function ReadDirectoryChangesW(hDirectory: HANDLE; lpBuffer: LPVOID;nBufferLength: DWORD; bWatchSubtree: BOOL; dwNotifyFilter: DWORD;lpBytesReturned: LPDWORD;lpOverlapped: LPOVERLAPPED;lpCompletionRoutine: LPOVERLAPPED_COMPLETION_ROUTINE): BOOL; stdcall; external 'kernel32' name 'ReadDirectoryChangesW';  
-
+  function IsDebuggerPresent : BOOL; stdcall; external 'kernel32.dll' name 'IsDebuggerPresent';
+  function Wow64DisableWow64FsRedirection(RedirectionState : ppointer) : BOOL; stdcall;   external 'kernel32.dll' name 'Wow64DisableWow64FsRedirection';
+  function Wow64EnableWow64FsRedirection(Wow64FsEnableRedirection:BYTE) : BOOL; stdcall;   external 'kernel32.dll' name 'Wow64EnableWow64FsRedirection';
+  function Wow64RevertWow64FsRedirection(RedirectionState : pointer) : BOOL; stdcall; external 'kernel32.dll' name 'Wow64RevertWow64FsRedirection';
+  function IsWow64Process(hProcess:THandle; Wow64Process:PBOOL):BOOL;stdcall; external 'kernel32.dll' name 'IsWow64Process';
+  function GetPhysicallyInstalledSystemMemory(TotalMemoryInKilobytes: PULONGLONG ):BOOL; stdcall; external 'kernel32.dll' name 'GetPhysicallyInstalledSystemMemory';
 {$endif read_interface}
 
 

+ 16 - 16
rtl/win/wininc/messages.inc

@@ -270,22 +270,22 @@
      HDM_HITTEST = 4614;
      HDM_LAYOUT = 4613;
   { Header control notifications  }
-     HDN_BEGINTRACKW = -(326);
-     HDN_DIVIDERDBLCLICKW = -(325);
-     HDN_ENDTRACKW = -(327);
-     HDN_ITEMCHANGEDW = -(321);
-     HDN_ITEMCHANGINGW = -(320);
-     HDN_ITEMCLICKW = -(322);
-     HDN_ITEMDBLCLICKW = -(323);
-     HDN_TRACKW = -(328);
-     HDN_BEGINTRACKA = -(306);
-     HDN_DIVIDERDBLCLICKA = -(305);
-     HDN_ENDTRACKA = -(307);
-     HDN_ITEMCHANGEDA = -(301);
-     HDN_ITEMCHANGINGA = -(300);
-     HDN_ITEMCLICKA = -(302);
-     HDN_ITEMDBLCLICKA = -(303);
-     HDN_TRACKA = -(308);
+     HDN_BEGINTRACKW = UINT(-326);
+     HDN_DIVIDERDBLCLICKW = UINT(-325);
+     HDN_ENDTRACKW = UINT(-327);
+     HDN_ITEMCHANGEDW = UINT(-321);
+     HDN_ITEMCHANGINGW = UINT(-320);
+     HDN_ITEMCLICKW = UINT(-322);
+     HDN_ITEMDBLCLICKW = UINT(-323);
+     HDN_TRACKW = UINT(-328);
+     HDN_BEGINTRACKA = UINT(-306);
+     HDN_DIVIDERDBLCLICKA = UINT(-305);
+     HDN_ENDTRACKA = UINT(-307);
+     HDN_ITEMCHANGEDA = UINT(-301);
+     HDN_ITEMCHANGINGA = UINT(-300);
+     HDN_ITEMCLICKA = UINT(-302);
+     HDN_ITEMDBLCLICKA = UINT(-303);
+     HDN_TRACKA = UINT(-308);
 {$ifdef UNICODE}
 
   const

+ 1 - 0
rtl/win/wininc/unidef.inc

@@ -473,6 +473,7 @@ function FindFirstFileEx(lpfilename : LPCWStr;fInfoLevelId:FINDEX_INFO_LEVELS ;l
 // winver>$0600 
 function FindFirstFileTransacted(lpfilename : LPCWStr;fInfoLevelId:FINDEX_INFO_LEVELS ;lpFindFileData:pointer;fSearchOp : FINDEX_SEARCH_OPS;lpSearchFilter:pointer;dwAdditionalFlags:dword;htransaction : HANDLE):Handle; stdcall; external 'kernel32' name 'FindFirstFileTransactedW';
 function GetComputerNameEx(NameType:COMPUTER_NAME_FORMAT;lpbuffer:LPWSTR;nSize:LPDWORD):BOOL;stdcall;external 'kernel32' name 'GetComputerNameExW';
+function QueryFullProcessImageName(hProcess:THandle;dwFlags:DWord; lpexename :lpwstr;lpdwsize:pdword):BOOL; stdcall; external 'kernel32.dll' name 'QueryFullProcessImageNameW';
 {$endif read_interface}
 
 

+ 1 - 0
rtl/win/wininc/unifun.inc

@@ -496,6 +496,7 @@ function GetConsoleAliasExesLengthW:DWORD;stdcall;external 'kernel32' name 'GetC
 function GetConsoleAliasesW(AliasBuffer:LPWSTR; AliasBufferLength:DWORD; ExeName:LPWSTR):DWORD;stdcall;external 'kernel32' name 'GetConsoleAliasesW';
 function GetConsoleAliasExesW(ExeNameBuffer:LPWSTR; ExeNameBufferLength:DWORD):DWORD;stdcall;external 'kernel32' name 'GetConsoleAliasExesW';
 function GetComputerNameExW(NameType:COMPUTER_NAME_FORMAT;lpbuffer:LPWSTR;nSize:LPDWORD):BOOL;stdcall;external 'kernel32' name 'GetComputerNameExW';
+function QueryFullProcessImageNameW(hProcess:THandle;dwFlags:DWord; lpexename :lpwstr;lpdwsize:pdword):BOOL; stdcall; external 'kernel32.dll' name 'QueryFullProcessImageNameW';
 {$endif read_interface}