Dmitry Timoshkov : shlwapi: Use existing shlwapi/ Win32 APIs to compare strings in Windows encoding.
Alexandre Julliard
julliard at winehq.org
Wed Oct 24 11:04:47 CDT 2007
Module: wine
Branch: master
Commit: 54c83b388c0b4038d62fd0881344f41ebd010380
URL: http://source.winehq.org/git/wine.git/?a=commit;h=54c83b388c0b4038d62fd0881344f41ebd010380
Author: Dmitry Timoshkov <dmitry at codeweavers.com>
Date: Wed Oct 24 14:03:25 2007 +0900
shlwapi: Use existing shlwapi/Win32 APIs to compare strings in Windows encoding.
---
dlls/shlwapi/ordinal.c | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c
index d3e5825..f5c0217 100644
--- a/dlls/shlwapi/ordinal.c
+++ b/dlls/shlwapi/ordinal.c
@@ -33,6 +33,7 @@
#include "windef.h"
#include "winbase.h"
+#include "winnls.h"
#include "winreg.h"
#include "wingdi.h"
#include "winuser.h"
@@ -796,7 +797,7 @@ BOOL WINAPI SetDlgItemTextWrapW(HWND hWnd, INT iItem, LPCWSTR lpszText)
*/
DWORD WINAPI StrCmpNCA(LPCSTR lpszSrc, LPCSTR lpszCmp, INT len)
{
- return strncmp(lpszSrc, lpszCmp, len);
+ return StrCmpNA(lpszSrc, lpszCmp, len);
}
/*************************************************************************
@@ -806,7 +807,7 @@ DWORD WINAPI StrCmpNCA(LPCSTR lpszSrc, LPCSTR lpszCmp, INT len)
*/
DWORD WINAPI StrCmpNCW(LPCWSTR lpszSrc, LPCWSTR lpszCmp, INT len)
{
- return strncmpW(lpszSrc, lpszCmp, len);
+ return StrCmpNW(lpszSrc, lpszCmp, len);
}
/*************************************************************************
@@ -825,7 +826,7 @@ DWORD WINAPI StrCmpNCW(LPCWSTR lpszSrc, LPCWSTR lpszCmp, INT len)
*/
DWORD WINAPI StrCmpNICA(LPCSTR lpszSrc, LPCSTR lpszCmp, DWORD len)
{
- return strncasecmp(lpszSrc, lpszCmp, len);
+ return StrCmpNIA(lpszSrc, lpszCmp, len);
}
/*************************************************************************
@@ -835,7 +836,7 @@ DWORD WINAPI StrCmpNICA(LPCSTR lpszSrc, LPCSTR lpszCmp, DWORD len)
*/
DWORD WINAPI StrCmpNICW(LPCWSTR lpszSrc, LPCWSTR lpszCmp, DWORD len)
{
- return strncmpiW(lpszSrc, lpszCmp, len);
+ return StrCmpNIW(lpszSrc, lpszCmp, len);
}
/*************************************************************************
@@ -853,7 +854,7 @@ DWORD WINAPI StrCmpNICW(LPCWSTR lpszSrc, LPCWSTR lpszCmp, DWORD len)
*/
DWORD WINAPI StrCmpCA(LPCSTR lpszSrc, LPCSTR lpszCmp)
{
- return strcmp(lpszSrc, lpszCmp);
+ return lstrcmpA(lpszSrc, lpszCmp);
}
/*************************************************************************
@@ -863,7 +864,7 @@ DWORD WINAPI StrCmpCA(LPCSTR lpszSrc, LPCSTR lpszCmp)
*/
DWORD WINAPI StrCmpCW(LPCWSTR lpszSrc, LPCWSTR lpszCmp)
{
- return strcmpW(lpszSrc, lpszCmp);
+ return lstrcmpW(lpszSrc, lpszCmp);
}
/*************************************************************************
@@ -881,7 +882,7 @@ DWORD WINAPI StrCmpCW(LPCWSTR lpszSrc, LPCWSTR lpszCmp)
*/
DWORD WINAPI StrCmpICA(LPCSTR lpszSrc, LPCSTR lpszCmp)
{
- return strcasecmp(lpszSrc, lpszCmp);
+ return lstrcmpiA(lpszSrc, lpszCmp);
}
/*************************************************************************
@@ -891,7 +892,7 @@ DWORD WINAPI StrCmpICA(LPCSTR lpszSrc, LPCSTR lpszCmp)
*/
DWORD WINAPI StrCmpICW(LPCWSTR lpszSrc, LPCWSTR lpszCmp)
{
- return strcmpiW(lpszSrc, lpszCmp);
+ return lstrcmpiW(lpszSrc, lpszCmp);
}
/*************************************************************************
More information about the wine-cvs
mailing list