commit d0421889c8be0954393b542daea925ca0182c103
author Huw D M Davies <daviesh@abacus.physics.ox.ac.uk> Sun Nov 01 19:23:52 1998 +0000
committer Alexandre Julliard <julliard@winehq.org> Sun Nov 01 19:23:52 1998 +0000
tree 2c38c92485bcf9c92bd78f7574d169f475356ca4
parent 7df1fbb3df8c727b987421bb699366bcbac434f3

Get rid of the redefinition of MAX_PATH and move PROCESSENTRY32
definition to toolhelp.h.

include/toolhelp.h

diff --git a/include/toolhelp.h b/include/toolhelp.h
index 1d2ddb7..78c865e 100644
--- a/include/toolhelp.h
+++ b/include/toolhelp.h
@@ -362,4 +362,27 @@
 
 #pragma pack(4)
 
+/*
+ * Process Entry list as created by CreateToolHelp32Snapshot 
+ */
+
+typedef struct tagPROCESSENTRY32 { 
+    DWORD dwSize; 
+    DWORD cntUsage; 
+    DWORD th32ProcessID; 
+    DWORD th32DefaultHeapID; 
+    DWORD th32ModuleID; 
+    DWORD cntThreads; 
+    DWORD th32ParentProcessID; 
+    LONG  pcPriClassBase; 
+    DWORD dwFlags; 
+    char szExeFile[MAX_PATH]; 
+} PROCESSENTRY32; 
+typedef PROCESSENTRY32 *  PPROCESSENTRY32; 
+typedef PROCESSENTRY32 *  LPPROCESSENTRY32; 
+
+BOOL32      WINAPI Process32First(HANDLE32,LPPROCESSENTRY32);
+BOOL32      WINAPI Process32Next(HANDLE32,LPPROCESSENTRY32);
+
+
 #endif /* __WINE_TOOLHELP_H */

include/windows.h

diff --git a/include/windows.h b/include/windows.h
index a7a313b..66f24f3 100644
--- a/include/windows.h
+++ b/include/windows.h
@@ -5445,28 +5445,6 @@
 #define TIME_ZONE_ID_STANDARD   1
 #define TIME_ZONE_ID_DAYLIGHT   2
 
-/*
- * Process Entry list as created by CreateToolHelp32Snapshot 
- */
-#ifndef MAX_PATH
-#define MAX_PATH 260
-#endif
-
-typedef struct tagPROCESSENTRY32 { 
-    DWORD dwSize; 
-    DWORD cntUsage; 
-    DWORD th32ProcessID; 
-    DWORD th32DefaultHeapID; 
-    DWORD th32ModuleID; 
-    DWORD cntThreads; 
-    DWORD th32ParentProcessID; 
-    LONG  pcPriClassBase; 
-    DWORD dwFlags; 
-    char szExeFile[MAX_PATH]; 
-} PROCESSENTRY32; 
-typedef PROCESSENTRY32 *  PPROCESSENTRY32; 
-typedef PROCESSENTRY32 *  LPPROCESSENTRY32; 
-
 /* CreateProcess: dwCreationFlag values
  */
 #define DEBUG_PROCESS               0x00000001
@@ -6980,8 +6958,6 @@
 BOOL32      WINAPI PlayEnhMetaFile(HDC32,HENHMETAFILE32,const RECT32*);
 BOOL32      WINAPI PlayEnhMetaFileRecord(HDC32,LPHANDLETABLE32,const ENHMETARECORD*,UINT32);
 BOOL32      WINAPI PolyPolyline32(HDC32,const POINT32*,const DWORD*,DWORD);
-BOOL32      WINAPI Process32First(HANDLE32,LPPROCESSENTRY32);
-BOOL32      WINAPI Process32Next(HANDLE32,LPPROCESSENTRY32);
 BOOL32      WINAPI PulseEvent(HANDLE32);
 DWORD       WINAPI QueryDosDevice32A(LPCSTR,LPSTR,DWORD);
 DWORD       WINAPI QueryDosDevice32W(LPCWSTR,LPWSTR,DWORD);