Alexandre Julliard : krnl386: Use stricmp() instead of _strnicmp(..., -1).
Alexandre Julliard
julliard at winehq.org
Tue Apr 7 15:27:14 CDT 2020
Module: wine
Branch: master
Commit: 373973c9e955e7bec1b76978c32e2cc9f4884e94
URL: https://source.winehq.org/git/wine.git/?a=commit;h=373973c9e955e7bec1b76978c32e2cc9f4884e94
Author: Alexandre Julliard <julliard at winehq.org>
Date: Tue Apr 7 14:25:22 2020 +0200
krnl386: Use stricmp() instead of _strnicmp(..., -1).
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/krnl386.exe16/ne_module.c | 4 ++--
dlls/krnl386.exe16/relay.c | 4 ++--
dlls/krnl386.exe16/resource.c | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/dlls/krnl386.exe16/ne_module.c b/dlls/krnl386.exe16/ne_module.c
index 822a5df4c3..88485372ff 100644
--- a/dlls/krnl386.exe16/ne_module.c
+++ b/dlls/krnl386.exe16/ne_module.c
@@ -1462,7 +1462,7 @@ HMODULE16 WINAPI GetModuleHandle16( LPCSTR name )
loadedfn--;
}
/* case insensitive compare ... */
- if (!_strnicmp(loadedfn, s, -1))
+ if (!stricmp(loadedfn, s))
return hModule;
}
return 0;
@@ -1782,7 +1782,7 @@ static HMODULE16 NE_GetModuleByFilename( LPCSTR name )
loadedfn--;
}
/* case insensitive compare ... */
- if (!_strnicmp(loadedfn, s, -1))
+ if (!stricmp(loadedfn, s))
return hModule;
}
/* If basename (without ext) matches the module name of a module:
diff --git a/dlls/krnl386.exe16/relay.c b/dlls/krnl386.exe16/relay.c
index 3543898d79..6eab9970a9 100644
--- a/dlls/krnl386.exe16/relay.c
+++ b/dlls/krnl386.exe16/relay.c
@@ -179,11 +179,11 @@ static BOOL check_list( const char *module, int ordinal, const char *func, const
if (_strnicmp( module, *list, len-1 ) || module[len]) continue;
if (p[1] == '*' && !p[2]) return TRUE;
if (!strcmp( ord_str, p + 1 )) return TRUE;
- if (func && !_strnicmp( func, p + 1, -1 )) return TRUE;
+ if (func && !stricmp( func, p + 1 )) return TRUE;
}
else /* function only */
{
- if (func && !_strnicmp( func, *list, -1 )) return TRUE;
+ if (func && !stricmp( func, *list )) return TRUE;
}
}
return FALSE;
diff --git a/dlls/krnl386.exe16/resource.c b/dlls/krnl386.exe16/resource.c
index 0be9e2906e..c303e25a2d 100644
--- a/dlls/krnl386.exe16/resource.c
+++ b/dlls/krnl386.exe16/resource.c
@@ -209,7 +209,7 @@ static DWORD NE_FindNameTableId( NE_MODULE *pModule, LPCSTR typeId, LPCSTR resId
if (p[1] & 0x8000)
{
if (!HIWORD(typeId)) continue;
- if (_strnicmp( typeId, (char *)(p + 3), -1 )) continue;
+ if (stricmp( typeId, (char *)(p + 3) )) continue;
}
else if (HIWORD(typeId) || (((DWORD)typeId & ~0x8000)!= p[1]))
continue;
@@ -219,7 +219,7 @@ static DWORD NE_FindNameTableId( NE_MODULE *pModule, LPCSTR typeId, LPCSTR resId
if (p[2] & 0x8000)
{
if (!HIWORD(resId)) continue;
- if (_strnicmp( resId, (char*)(p+3)+strlen((char*)(p+3))+1, -1 )) continue;
+ if (stricmp( resId, (char*)(p+3)+strlen((char*)(p+3))+1 )) continue;
}
else if (HIWORD(resId) || ((LOWORD(resId) & ~0x8000) != p[2]))
More information about the wine-cvs
mailing list