Changeset 21308 for trunk/src/psapi

Timestamp:

Jun 18, 2009, 6:27:45 PM (16 years ago)

Author:

ydario

Message:

Minor updates, backout imm changes.

Location:

trunk/src/psapi

Files:

• psapi.DEF (modified) (2 diffs)
• psapi.cpp (modified) (7 diffs)

trunk/src/psapi/psapi.DEF

@@ -10 +10 @@
     EmptyWorking                = _EmptyWorkingSet@4                    @1  
     EnumDeviceDrivers           = _EnumDeviceDrivers@12                 @2  
-    EnumProcessModules          = _EnumProcessModules@16                @3  
+    EnumProcessModules          = _PSAPI_EnumProcessModules@16          @3  
     EnumProcesses               = _EnumProcesses@12                     @4  
     GetDeviceDriverBaseNameA    = _GetDeviceDriverBaseNameA@12          @5  
@@ -22 +22 @@
     GetModuleFileNameExA        = _GetModuleFileNameExA@16              @13  
     GetModuleFileNameExW        = _GetModuleFileNameExW@16              @14  
-    GetModuleInformation        = _GetModuleInformation@16              @15
+    GetModuleInformation        = _PSAPI_GetModuleInformation@16        @15
     GetProcessMemoryInfo        = _GetProcessMemoryInfo@12              @16  
     GetWsChanges                = _GetWsChanges@12                      @17  

trunk/src/psapi/psapi.cpp

@@ -56 +56 @@
 }
 
+#ifndef __WIN32OS2__
 /***********************************************************************
  *           EnumProcessModules (PSAPI.4)
@@ -70 +71 @@
   return TRUE;
 }
+#endif
 
 /***********************************************************************
@@ -191 +193 @@
 }
 
+#ifdef __WIN32OS2__
 /***********************************************************************
  *           GetModuleFileNameExA (PSAPI.13)
@@ -197 +200 @@
   HANDLE hProcess, HMODULE hModule, LPSTR lpFilename, DWORD nSize)
 {
-#ifdef DEBUG
-  dprintf(("PSAPI: GetModuleFileNameExA not implemented\n"));
-#endif
+   if(hProcess != GetCurrentProcess()) {
+       dprintf(("PSAPI: GetModuleFileNameExA not implemented for other processes (%x %x)\n", hProcess, hModule));
+       return 0;
+   }
+   return GetModuleFileNameA(hModule, lpFilename, nSize);
+}
+#else
+/***********************************************************************
+ *           GetModuleFileNameExA (PSAPI.13)
+ */
+DWORD WINAPI GetModuleFileNameExA(
+  HANDLE hProcess, HMODULE hModule, LPSTR lpFilename, DWORD nSize)
+{
   if(lpFilename&&nSize)
     lpFilename[0]='\0';
@@ -205 +218 @@
   return 0;
 }
+#endif
 
 /***********************************************************************
@@ -221 +235 @@
 }
 
+#ifndef __WIN32OS2__
 /***********************************************************************
  *           GetModuleInformation (PSAPI.15)
@@ -234 +249 @@
   return TRUE;
 }
+#endif
 
 /***********************************************************************