marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

krnl386.exe16: Get rid of NE_str(n)casecmp helper. 

Signed-off-by: Piotr Caban <piotr@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
stable
Piotr Caban 2019-04-02 16:52:10 +02:00 committed by Alexandre Julliard
parent ea4d756cbd
commit 6b2c2eb76d
1 changed files with 4 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
dlls/krnl386.exe16/ne_module.c
View File

@ -112,34 +112,6 @@ static inline BOOL contains_path( LPCSTR name )
}
/***********************************************************************
* NE_strcasecmp
*
* locale-independent case conversion for module lookups
*/
static int NE_strcasecmp( const char *str1, const char *str2 )
{
int ret = 0;
for ( ; ; str1++, str2++)
if ((ret = RtlUpperChar(*str1) - RtlUpperChar(*str2)) || !*str1) break;
return ret;
}
/***********************************************************************
* NE_strncasecmp
*
* locale-independent case conversion for module lookups
*/
static int NE_strncasecmp( const char *str1, const char *str2, int len )
{
int ret = 0;
for ( ; len > 0; len--, str1++, str2++)
if ((ret = RtlUpperChar(*str1) - RtlUpperChar(*str2)) || !*str1) break;
return ret;
}
/***********************************************************************
* NE_GetPtr
*/
@ -1461,7 +1433,7 @@ HMODULE16 WINAPI GetModuleHandle16( LPCSTR name )
* 'i' compare is just a quickfix until the loader handles that
* correctly. -MM 990705
*/
if ((*name_table == len) && !NE_strncasecmp(tmpstr, (const char*)name_table+1, len))
if ((*name_table == len) && !_strnicmp(tmpstr, (const char*)name_table+1, len))
return hModule;
}
@ -1500,7 +1472,7 @@ HMODULE16 WINAPI GetModuleHandle16( LPCSTR name )
loadedfn--;
}
/* case insensitive compare ... */
if (!NE_strcasecmp(loadedfn, s))
if (!_strnicmp(loadedfn, s, -1))
return hModule;
}
return 0;
@ -1820,7 +1792,7 @@ static HMODULE16 NE_GetModuleByFilename( LPCSTR name )
loadedfn--;
}
/* case insensitive compare ... */
if (!NE_strcasecmp(loadedfn, s))
if (!_strnicmp(loadedfn, s, -1))
return hModule;
}
/* If basename (without ext) matches the module name of a module:
@ -1837,7 +1809,7 @@ static HMODULE16 NE_GetModuleByFilename( LPCSTR name )
if (pModule->ne_flags & NE_FFLAGS_WIN32) continue;
name_table = (BYTE *)pModule + pModule->ne_restab;
if ((*name_table == len) && !NE_strncasecmp(s, (const char*)name_table+1, len))
if ((*name_table == len) && !_strnicmp(s, (const char*)name_table+1, len))
return hModule;
}