From c1dad7d29e70c48b337a7d3764f17fa4d6324a0e Mon Sep 17 00:00:00 2001 From: Joachim Henze Date: Sat, 12 Mar 2022 21:53:40 +0100 Subject: [PATCH] [0.4.9][DBGHELP] Fix 3 MSVC warnings about MiniDumpWriteDump() (#643) - Fixes MSVC errors: "...\dll\win32\dbghelp\minidump.c(857) : error C4028: formal parameter 5 different from declaration", for parameters 5, 6 and 7. - Fix spec file too. CORE-7538 I could reproduce those warnings on MSVC2010SP1 x86. Ftr Wine 7.0 uses the same spec for that func atm, see https://fossies.org/linux/wine/dlls/dbghelp/dbghelp.spec (18 Jan 2022, 8523 Bytes) fix picked from 0.4.10-dev-275-g 3766d836c701d59cedb2d014bde572a7e8b40e59 --- dll/win32/dbghelp/dbghelp.spec | 2 +- sdk/include/psdk/dbghelp.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dll/win32/dbghelp/dbghelp.spec b/dll/win32/dbghelp/dbghelp.spec index 2a572512e4d..95cebca63d8 100644 --- a/dll/win32/dbghelp/dbghelp.spec +++ b/dll/win32/dbghelp/dbghelp.spec @@ -30,7 +30,7 @@ @ stdcall MakeSureDirectoryPathExists(str) @ stdcall MapDebugInformation(long str str long) @ stdcall MiniDumpReadDumpStream(ptr long ptr ptr ptr) -@ stdcall MiniDumpWriteDump(ptr long ptr long long long long) +@ stdcall MiniDumpWriteDump(ptr long ptr long ptr ptr ptr) @ stdcall SearchTreeForFile(str str ptr) @ stdcall SearchTreeForFileW(wstr wstr ptr) @ stdcall StackWalk(long long long ptr ptr ptr ptr ptr ptr) diff --git a/sdk/include/psdk/dbghelp.h b/sdk/include/psdk/dbghelp.h index 28eec9a10ae..a8fdf38e0a0 100644 --- a/sdk/include/psdk/dbghelp.h +++ b/sdk/include/psdk/dbghelp.h @@ -901,9 +901,9 @@ MiniDumpWriteDump( _In_ DWORD, _In_ HANDLE, _In_ MINIDUMP_TYPE, - _In_opt_ const PMINIDUMP_EXCEPTION_INFORMATION, - _In_opt_ const PMINIDUMP_USER_STREAM_INFORMATION, - _In_opt_ const PMINIDUMP_CALLBACK_INFORMATION); + _In_opt_ PMINIDUMP_EXCEPTION_INFORMATION, + _In_opt_ PMINIDUMP_USER_STREAM_INFORMATION, + _In_opt_ PMINIDUMP_CALLBACK_INFORMATION); BOOL WINAPI