winapi_check: dbghelp tweaks and fix

Francois Gouget fgouget at free.fr
Thu Oct 21 09:18:24 CDT 2004


Tweak a couple of prototypes to use PVOID instead of void* as this is 
the 'official' type and also what win23.api already knows about.

More importantly, fix the SymEnumSymbols() declaration in the spec file.


Changelog:

  * dlls/dbghelp/dbghelp.spec
    dlls/dbghelp/path.c
    dlls/dbghelp/source.c
    dlls/dbghelp/type.c
    tools/winapi/win32.api

    Fix the declaration of SymEnumSymbols() in dbghelp.spec.
    Use PVOID instead of void* for consistency.
    Update the dbghelp section in win32.api.


-- 
Francois Gouget         fgouget at free.fr        http://fgouget.free.fr/
      The software said it requires Win95 or better, so I installed Linux.
-------------- next part --------------
Index: dlls/dbghelp/dbghelp.spec
===================================================================
RCS file: /var/cvs/wine/dlls/dbghelp/dbghelp.spec,v
retrieving revision 1.4
diff -u -r1.4 dbghelp.spec
--- dlls/dbghelp/dbghelp.spec	11 Oct 2004 21:00:17 -0000	1.4
+++ dlls/dbghelp/dbghelp.spec	21 Oct 2004 11:29:14 -0000
@@ -28,7 +28,7 @@
 @ stdcall SymCleanup(long)
 @ stdcall SymEnumSourceFiles(ptr long long str ptr ptr)
 @ stub SymEnumSym
-@ stdcall SymEnumSymbols(long long str ptr ptr)
+@ stdcall SymEnumSymbols(ptr long long str ptr ptr)
 @ stdcall SymEnumTypes(ptr long long ptr ptr)
 @ stdcall SymEnumerateModules(long ptr ptr)
 @ stub SymEnumerateModules64
Index: dlls/dbghelp/path.c
===================================================================
RCS file: /var/cvs/wine/dlls/dbghelp/path.c,v
retrieving revision 1.3
diff -u -r1.3 path.c
--- dlls/dbghelp/path.c	5 Oct 2004 02:05:28 -0000	1.3
+++ dlls/dbghelp/path.c	19 Oct 2004 18:03:43 -0000
@@ -191,7 +191,7 @@
  *
  */
 BOOL WINAPI EnumDirTree(HANDLE hProcess, PCSTR root, PCSTR file,
-                        LPSTR buffer, PENUMDIRTREE_CALLBACK cb, void* user)
+                        LPSTR buffer, PENUMDIRTREE_CALLBACK cb, PVOID user)
 {
     TRACE("(%p %s %s %p %p %p)\n", hProcess, root, file, buffer, cb, user);
 
Index: dlls/dbghelp/source.c
===================================================================
RCS file: /var/cvs/wine/dlls/dbghelp/source.c,v
retrieving revision 1.2
diff -u -r1.2 source.c
--- dlls/dbghelp/source.c	11 Oct 2004 21:00:17 -0000	1.2
+++ dlls/dbghelp/source.c	19 Oct 2004 18:03:43 -0000
@@ -96,7 +96,7 @@
  */
 BOOL WINAPI SymEnumSourceFiles(HANDLE hProcess, ULONG64 ModBase, LPSTR Mask,
                                PSYM_ENUMSOURCFILES_CALLBACK cbSrcFiles,
-                               void* UserContext)
+                               PVOID UserContext)
 {
     struct process*     pcs;
     struct module*      module;
Index: dlls/dbghelp/type.c
===================================================================
RCS file: /var/cvs/wine/dlls/dbghelp/type.c,v
retrieving revision 1.8
diff -u -r1.8 type.c
--- dlls/dbghelp/type.c	11 Oct 2004 21:00:17 -0000	1.8
+++ dlls/dbghelp/type.c	19 Oct 2004 18:03:43 -0000
@@ -361,7 +361,7 @@
  */
 BOOL WINAPI SymEnumTypes(HANDLE hProcess, ULONG64 BaseOfDll,
                          PSYM_ENUMERATESYMBOLS_CALLBACK EnumSymbolsCallback,
-                         void* UserContext)
+                         PVOID UserContext)
 {
     struct process*     pcs;
     struct module*      module;
Index: tools/winapi/win32.api
===================================================================
RCS file: /var/cvs/wine/tools/winapi/win32.api,v
retrieving revision 1.20
diff -u -r1.20 win32.api
--- tools/winapi/win32.api	8 Oct 2004 21:02:09 -0000	1.20
+++ tools/winapi/win32.api	21 Oct 2004 09:26:12 -0000
@@ -600,11 +608,15 @@
 HMODULE
 IMAGEHLP_SYMBOL_TYPE_INFO
 ULONG
-unsigned long
+
+%longlong
+
+DWORD64
+ULONG64
 
 %ptr
 
-DWORD *
+DWORD64 *
 LPAPI_VERSION
 LPSTACKFRAME
 LPVOID
@@ -631,7 +643,7 @@
 PTRANSLATE_ADDRESS_ROUTINE
 PVOID
 char *
-void *
+char **
 
 %str
 


More information about the wine-patches mailing list