https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ad6eaca4644faba09ec26e...
commit ad6eaca4644faba09ec26e3989609df973aab660 Author: winesync ros-dev@reactos.org AuthorDate: Fri Sep 11 15:56:23 2020 +0200 Commit: Jérôme Gardou jerome.gardou@reactos.org CommitDate: Wed Sep 16 10:35:40 2020 +0200
[WINESYNC] dbghelp: Don't use strcasecmp.
Signed-off-by: Piotr Caban piotr@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
wine commit id 061f65f9aaa5e6c9e34f407293906a2cc9033f0d by Piotr Caban piotr@codeweavers.com --- dll/win32/dbghelp/compat.h | 1 + dll/win32/dbghelp/msc.c | 2 +- dll/win32/dbghelp/pe_module.c | 2 +- sdk/tools/winesync/dbghelp.cfg | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/dll/win32/dbghelp/compat.h b/dll/win32/dbghelp/compat.h index 4917889ca1c..2a212e60558 100644 --- a/dll/win32/dbghelp/compat.h +++ b/dll/win32/dbghelp/compat.h @@ -14,6 +14,7 @@ typedef HANDLE HWND;
#define min(x, y) (((x) < (y)) ? (x) : (y)) #define max(x, y) (((x) > (y)) ? (x) : (y)) +#define _strnicmp(_String1, _String2, _MaxCount) strncasecmp(_String1, _String2, _MaxCount)
#ifdef __i386__ #define CDECL __cdecl diff --git a/dll/win32/dbghelp/msc.c b/dll/win32/dbghelp/msc.c index adb66d68809..54fbe36596c 100644 --- a/dll/win32/dbghelp/msc.c +++ b/dll/win32/dbghelp/msc.c @@ -2684,7 +2684,7 @@ static void pdb_process_symbol_imports(const struct process* pcs, { ptr = (const char*)imp + sizeof(*imp) + strlen(imp->filename); if (i >= CV_MAX_MODULES) FIXME("Out of bounds!!!\n"); - if (!strcasecmp(pdb_lookup->filename, imp->filename)) + if (!_strnicmp(pdb_lookup->filename, imp->filename, -1)) { if (module_index != -1) FIXME("Twice the entry\n"); else module_index = i; diff --git a/dll/win32/dbghelp/pe_module.c b/dll/win32/dbghelp/pe_module.c index eca81bf9876..89d82d930e9 100644 --- a/dll/win32/dbghelp/pe_module.c +++ b/dll/win32/dbghelp/pe_module.c @@ -129,7 +129,7 @@ BOOL pe_find_section(struct image_file_map* fmap, const char* name, sectname = memcpy(tmp, sectname, IMAGE_SIZEOF_SHORT_NAME); tmp[IMAGE_SIZEOF_SHORT_NAME] = '\0'; } - if (!strcasecmp(sectname, name)) + if (!_strnicmp(sectname, name, -1)) { ism->fmap = fmap; ism->sidx = i; diff --git a/sdk/tools/winesync/dbghelp.cfg b/sdk/tools/winesync/dbghelp.cfg index cc630733cd5..ef3a09455a6 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: 3d6febc997c808e7c91289c34f7bb48b8b1fe2bb + wine: 061f65f9aaa5e6c9e34f407293906a2cc9033f0d