dbghelp & imagehlp: Fix the PSYM_ENUMSYMBOLS_CALLBACK() and…

include/dbghelp.h

@@ -1012,8 +1012,8 @@ BOOL WINAPI SymEnumSymbols(HANDLE, ULONG64, PCSTR, PSYM_ENUMERATESYMBOLS_CALLBAC
                            PVOID);
 BOOL WINAPI SymEnumSymbolsW(HANDLE, ULONG64, PCWSTR, PSYM_ENUMERATESYMBOLS_CALLBACKW,
                             PVOID);
-typedef BOOL (CALLBACK *PSYM_ENUMSYMBOLS_CALLBACK)(PCSTR, DWORD, ULONG, PVOID);
-typedef BOOL (CALLBACK *PSYM_ENUMSYMBOLS_CALLBACKW)(PCWSTR, DWORD, ULONG, PVOID);
+typedef BOOL (CALLBACK *PSYM_ENUMSYMBOLS_CALLBACK)(PCSTR, ULONG, ULONG, PVOID);
+typedef BOOL (CALLBACK *PSYM_ENUMSYMBOLS_CALLBACKW)(PCWSTR, ULONG, ULONG, PVOID);
 BOOL WINAPI SymEnumerateSymbols(HANDLE, ULONG, PSYM_ENUMSYMBOLS_CALLBACK, PVOID);
 BOOL WINAPI SymEnumerateSymbolsW(HANDLE, ULONG, PSYM_ENUMSYMBOLS_CALLBACKW, PVOID);
 typedef BOOL (CALLBACK *PSYM_ENUMSYMBOLS_CALLBACK64)(PCSTR, DWORD64, ULONG, PVOID);

include/imagehlp.h

@@ -666,10 +666,10 @@ typedef BOOL (CALLBACK *PIMAGEHLP_STATUS_ROUTINE64)(
 );
 
 typedef BOOL (CALLBACK *PSYM_ENUMERATESYMBOLS_CALLBACK)(
-  PSYMBOL_INFO pSymInfo, DWORD SymbolSize, PVOID UserContext
+  PSYMBOL_INFO pSymInfo, ULONG SymbolSize, PVOID UserContext
 );
 typedef BOOL (CALLBACK *PSYM_ENUMERATESYMBOLS_CALLBACKW)(
-  PSYMBOL_INFOW pSymInfo, DWORD SymbolSize, PVOID UserContext
+  PSYMBOL_INFOW pSymInfo, ULONG SymbolSize, PVOID UserContext
 );
 
 typedef BOOL (CALLBACK* PSYM_ENUMLINES_CALLBACK)(
@@ -697,10 +697,10 @@ typedef BOOL (CALLBACK *PSYM_ENUMMODULES_CALLBACKW64)(
 );
 
 typedef BOOL (CALLBACK *PSYM_ENUMSYMBOLS_CALLBACK)(
-  PCSTR, DWORD, ULONG, PVOID
+  PCSTR, ULONG, ULONG, PVOID
 );
 typedef BOOL (CALLBACK *PSYM_ENUMSYMBOLS_CALLBACKW)(
-  PCWSTR, DWORD, ULONG, PVOID
+  PCWSTR, ULONG, ULONG, PVOID
 );
 typedef BOOL (CALLBACK *PSYM_ENUMSYMBOLS_CALLBACK64)(
   PCSTR, DWORD64, ULONG, PVOID

programs/winedbg/stack.c

@@ -215,7 +215,7 @@ struct sym_enum
     BOOL        first;
 };
 
-static BOOL WINAPI sym_enum_cb(SYMBOL_INFO* sym_info, ULONG size, void* user)
+static BOOL WINAPI sym_enum_cb(PSYMBOL_INFO sym_info, ULONG size, PVOID user)
 {
     struct sym_enum*    se = (struct sym_enum*)user;
 

programs/winedbg/symbol.c

@@ -144,7 +144,7 @@ struct sgv_data
     ULONG64                     frame_offset;   /* in      : frame for local & parameter variables look up */
 };
 
-static BOOL CALLBACK sgv_cb(SYMBOL_INFO* sym, ULONG size, void* ctx)
+static BOOL CALLBACK sgv_cb(PSYMBOL_INFO sym, ULONG size, PVOID ctx)
 {
     struct sgv_data*    sgv = (struct sgv_data*)ctx;
     unsigned            insp;
@@ -612,7 +612,7 @@ void symbol_print_local(const SYMBOL_INFO* sym, ULONG base,
     }
 }
 
-static BOOL CALLBACK info_locals_cb(SYMBOL_INFO* sym, ULONG size, void* ctx)
+static BOOL CALLBACK info_locals_cb(PSYMBOL_INFO sym, ULONG size, PVOID ctx)
 {
     struct dbg_type     type;
 
@@ -644,7 +644,7 @@ int symbol_info_locals(void)
 
 }
 
-static BOOL CALLBACK symbols_info_cb(SYMBOL_INFO* sym, ULONG size, void* ctx)
+static BOOL CALLBACK symbols_info_cb(PSYMBOL_INFO sym, ULONG size, PVOID ctx)
 {
     struct dbg_type     type;
     IMAGEHLP_MODULE     mi;