https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4cc24ef20ee2dfbf4421b6846d18c8dae64bc0a1
commit 4cc24ef20ee2dfbf4421b6846d18c8dae64bc0a1 Author: winesync <ros-...@reactos.org> AuthorDate: Fri Sep 11 19:12:13 2020 +0200 Commit: Jérôme Gardou <jerome.gar...@reactos.org> CommitDate: Wed Sep 16 10:35:59 2020 +0200 [WINESYNC] dbghelp: Make qsort callback explicitly cdecl. Signed-off-by: Alexandre Julliard <julli...@winehq.org> wine commit id 0163db5152124efbd1a5ba46aa52a6da66d897d5 by Alexandre Julliard <julli...@winehq.org> --- dll/win32/dbghelp/dbghelp_private.h | 2 +- dll/win32/dbghelp/symbol.c | 2 +- sdk/tools/winesync/dbghelp.cfg | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dll/win32/dbghelp/dbghelp_private.h b/dll/win32/dbghelp/dbghelp_private.h index 4f5bf926149..6faf8b8eb55 100644 --- a/dll/win32/dbghelp/dbghelp_private.h +++ b/dll/win32/dbghelp/dbghelp_private.h @@ -761,7 +761,7 @@ extern DWORD64 sw_module_base(struct cpu_stack_walk* csw, DWORD64 addr) DEC extern const char* symt_get_name(const struct symt* sym) DECLSPEC_HIDDEN; extern WCHAR* symt_get_nameW(const struct symt* sym) DECLSPEC_HIDDEN; extern BOOL symt_get_address(const struct symt* type, ULONG64* addr) DECLSPEC_HIDDEN; -extern int symt_cmp_addr(const void* p1, const void* p2) DECLSPEC_HIDDEN; +extern int __cdecl symt_cmp_addr(const void* p1, const void* p2) DECLSPEC_HIDDEN; extern void copy_symbolW(SYMBOL_INFOW* siw, const SYMBOL_INFO* si) DECLSPEC_HIDDEN; extern struct symt_ht* symt_find_nearest(struct module* module, DWORD_PTR addr) DECLSPEC_HIDDEN; diff --git a/dll/win32/dbghelp/symbol.c b/dll/win32/dbghelp/symbol.c index 09b83f38a00..f16a1e2cf8e 100644 --- a/dll/win32/dbghelp/symbol.c +++ b/dll/win32/dbghelp/symbol.c @@ -54,7 +54,7 @@ static inline int cmp_sorttab_addr(struct module* module, int idx, ULONG64 addr) return cmp_addr(ref, addr); } -int symt_cmp_addr(const void* p1, const void* p2) +int __cdecl symt_cmp_addr(const void* p1, const void* p2) { const struct symt* sym1 = *(const struct symt* const *)p1; const struct symt* sym2 = *(const struct symt* const *)p2; diff --git a/sdk/tools/winesync/dbghelp.cfg b/sdk/tools/winesync/dbghelp.cfg index e06fc334c77..ec7b0db7014 100644 --- a/sdk/tools/winesync/dbghelp.cfg +++ b/sdk/tools/winesync/dbghelp.cfg @@ -4,4 +4,4 @@ files: include/dbghelp.h: sdk/include/psdk/dbghelp.h include/wine/mscvpdb.h: sdk/include/reactos/wine/mscvpdb.h tags: - wine: e014d325ddb87dbb4678ef47ef17f9e7f49b0248 + wine: 0163db5152124efbd1a5ba46aa52a6da66d897d5