The part about the imagehlp version in the header doesnt have to be in there I just figured we might as well add it while we are trying to be the same.
Changelog: Bring imagehlp (mostly) inline with the PSDK and Mingw
Index: wine/dlls/imagehlp/debug.c =================================================================== RCS file: /home/wine/wine/dlls/imagehlp/debug.c,v retrieving revision 1.11 diff -u -r1.11 debug.c --- wine/dlls/imagehlp/debug.c 5 Sep 2003 23:08:37 -0000 1.11 +++ wine/dlls/imagehlp/debug.c 9 Oct 2003 01:01:39 -0000 @@ -75,7 +75,7 @@ */ BOOL WINAPI StackWalk( DWORD MachineType, HANDLE hProcess, HANDLE hThread, - PSTACKFRAME StackFrame, PVOID ContextRecord, + LPSTACKFRAME StackFrame, LPVOID ContextRecord, PREAD_PROCESS_MEMORY_ROUTINE ReadMemoryRoutine, PFUNCTION_TABLE_ACCESS_ROUTINE FunctionTableAccessRoutine, PGET_MODULE_BASE_ROUTINE GetModuleBaseRoutine, Index: wine/dlls/imagehlp/imagehlp_main.c =================================================================== RCS file: /home/wine/wine/dlls/imagehlp/imagehlp_main.c,v retrieving revision 1.15 diff -u -r1.15 imagehlp_main.c --- wine/dlls/imagehlp/imagehlp_main.c 5 Sep 2003 23:08:37 -0000 1.15 +++ wine/dlls/imagehlp/imagehlp_main.c 9 Oct 2003 01:01:39 -0000 @@ -58,7 +58,7 @@
/*********************************************************************** * ImagehlpApiVersion (IMAGEHLP.@) */ -PAPI_VERSION WINAPI ImagehlpApiVersion() +LPAPI_VERSION WINAPI ImagehlpApiVersion(VOID) { return &IMAGEHLP_ApiVersion; } @@ -66,7 +66,7 @@
/*********************************************************************** * ImagehlpApiVersionEx (IMAGEHLP.@) */ -PAPI_VERSION WINAPI ImagehlpApiVersionEx(PAPI_VERSION AppVersion) +LPAPI_VERSION WINAPI ImagehlpApiVersionEx(LPAPI_VERSION AppVersion) { if(!AppVersion) return NULL;
Index: wine/include/imagehlp.h =================================================================== RCS file: /home/wine/wine/include/imagehlp.h,v retrieving revision 1.19 diff -u -r1.19 imagehlp.h --- wine/include/imagehlp.h 5 Sep 2003 23:15:44 -0000 1.19 +++ wine/include/imagehlp.h 9 Oct 2003 01:01:51 -0000 @@ -25,6 +25,8 @@ extern "C" { #endif /* defined(__cplusplus) */
+#define API_VERSION_NUMBER 7 /* 7 is the default */ +
/*********************************************************************** * Types */ @@ -168,7 +170,7 @@ USHORT MinorVersion; USHORT Revision; USHORT Reserved; -} API_VERSION, *PAPI_VERSION; +} API_VERSION, *LPAPI_VERSION;
typedef struct _IMAGE_DEBUG_INFORMATION { LIST_ENTRY List; @@ -414,11 +416,11 @@ BOOL WINAPI ImageUnload( PLOADED_IMAGE LoadedImage ); -PAPI_VERSION WINAPI ImagehlpApiVersion( +LPAPI_VERSION WINAPI ImagehlpApiVersion( void ); -PAPI_VERSION WINAPI ImagehlpApiVersionEx( - PAPI_VERSION AppVersion +LPAPI_VERSION WINAPI ImagehlpApiVersionEx( + LPAPI_VERSION AppVersion ); BOOL WINAPI MakeSureDirectoryPathExists( LPCSTR DirPath
__________________________________ Do you Yahoo!? The New Yahoo! Shopping - with improved product search http://shopping.yahoo.com