https://git.reactos.org/?p=reactos.git;a=commitdiff;h=37eff17d4dcc5ca475088ad0aa596e6c1396cb65
commit 37eff17d4dcc5ca475088ad0aa596e6c1396cb65 Author: winesync <[email protected]> AuthorDate: Fri Sep 11 19:12:13 2020 +0200 Commit: Jérôme Gardou <[email protected]> CommitDate: Wed Sep 16 10:35:59 2020 +0200 [WINESYNC] dbghelp: Use stricmp() instead of _strnicmp(..., -1). Signed-off-by: Alexandre Julliard <[email protected]> wine commit id 341feeb10eddd3d139c4c206a43db80d0671ff3b by Alexandre Julliard <[email protected]> --- 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 2bfa06bc242..2711bca953a 100644 --- a/dll/win32/dbghelp/compat.h +++ b/dll/win32/dbghelp/compat.h @@ -21,6 +21,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) +#define stricmp(_String1, _String2) strcasecmp(_String1, _String2) #ifdef __i386__ #define CDECL __cdecl diff --git a/dll/win32/dbghelp/msc.c b/dll/win32/dbghelp/msc.c index 0f0aa25e768..4dcbd41f26f 100644 --- a/dll/win32/dbghelp/msc.c +++ b/dll/win32/dbghelp/msc.c @@ -2682,7 +2682,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 (!_strnicmp(pdb_lookup->filename, imp->filename, -1)) + if (!stricmp(pdb_lookup->filename, imp->filename)) { 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 864be64f573..9ea60ecade4 100644 --- a/dll/win32/dbghelp/pe_module.c +++ b/dll/win32/dbghelp/pe_module.c @@ -129,7 +129,7 @@ static 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 (!_strnicmp(sectname, name, -1)) + if (!stricmp(sectname, name)) { ism->fmap = fmap; ism->sidx = i; diff --git a/sdk/tools/winesync/dbghelp.cfg b/sdk/tools/winesync/dbghelp.cfg index ec7b0db7014..d728bdefbc4 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: 0163db5152124efbd1a5ba46aa52a6da66d897d5 + wine: 341feeb10eddd3d139c4c206a43db80d0671ff3b
