https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e4930be4ffb31ce529d797...
commit e4930be4ffb31ce529d797cb90c9613bce163062 Author: Timo Kreuzer timo.kreuzer@reactos.org AuthorDate: Sat May 11 19:23:44 2024 +0300 Commit: Timo Kreuzer timo.kreuzer@reactos.org CommitDate: Sun Oct 20 14:12:25 2024 +0300
[REACTOS] Use the ISO C and C++ conformant names: _wcsicmp, _stricmp
Stop using non-conforming wcsicmp, stricmp, strcasecmp --- base/applications/cmdutils/attrib/attrib.c | 6 +- base/applications/cmdutils/doskey/doskey.c | 16 ++--- base/applications/cmdutils/hostname/hostname.c | 2 +- base/applications/cmdutils/whoami/whoami.c | 42 ++++++------- base/applications/mscutils/eventvwr/eventvwr.c | 6 +- base/applications/network/net/cmdAccounts.c | 4 +- base/applications/network/net/cmdUse.c | 6 +- base/applications/network/net/cmdUser.c | 2 +- base/applications/network/netsh/interpreter.c | 12 ++-- base/applications/network/netsh/netsh.c | 2 +- base/applications/rapps_com/main.c | 2 +- base/applications/runas/runas.c | 8 +-- base/applications/sndvol32/dialog.c | 10 ++-- base/applications/sndvol32/mixer.c | 4 +- base/applications/sndvol32/sndvol32.c | 2 +- base/services/dhcpcsvc/dhcp/adapter.c | 2 +- base/setup/lib/bootsup.c | 18 +++--- base/setup/lib/utils/partlist.c | 8 +-- base/setup/reactos/reactos.c | 6 +- base/setup/usetup/cmdcons.c | 4 +- base/setup/usetup/usetup.c | 20 +++---- base/system/diskpart/help.c | 26 ++++---- base/system/diskpart/interpreter.c | 16 ++--- base/system/services/rpcserver.c | 2 +- dll/appcompat/apphelp/hsdb.c | 4 +- dll/appcompat/apphelp/layer.c | 2 +- dll/appcompat/apphelp/sdbapi.c | 2 +- dll/appcompat/shims/genral/ignorefreelib.c | 2 +- dll/cpl/appwiz/createlink.c | 2 +- dll/cpl/desk/desk.c | 2 +- dll/cpl/sysdm/smbios.c | 14 ++--- dll/ntdll/rtl/libsupp.c | 4 +- dll/shellext/acppage/CLayerUIPropPage.cpp | 14 ++--- dll/shellext/fontext/CFontExt.cpp | 2 +- dll/win32/dnsapi/query.c | 2 +- dll/win32/fmifs/format.c | 4 +- dll/win32/framedyn/chstring.cpp | 2 +- dll/win32/iphlpapi/ipstats_reactos.c | 4 +- dll/win32/msgina/msgina.c | 4 +- dll/win32/netid/netid.c | 4 +- dll/win32/ntmarta/ntmarta.c | 2 +- dll/win32/shell32/CDefaultContextMenu.cpp | 2 +- dll/win32/shell32/CNewMenu.cpp | 4 +- dll/win32/shell32/COpenWithMenu.cpp | 2 +- dll/win32/shell32/CShellLink.cpp | 2 +- dll/win32/shell32/dialogs/dialogs.cpp | 2 +- dll/win32/shell32/dialogs/drive.cpp | 52 ++++++++-------- dll/win32/shell32/droptargets/CFSDropTarget.cpp | 2 +- dll/win32/shell32/folders/CControlPanelFolder.cpp | 4 +- dll/win32/shell32/folders/CDrivesFolder.cpp | 2 +- dll/win32/shell32/folders/CFSFolder.cpp | 4 +- dll/win32/shell32/folders/CRecycleBin.cpp | 6 +- dll/win32/shell32/iconcache.cpp | 2 +- dll/win32/shell32/shlexec.cpp | 2 +- dll/win32/shell32/shlfolder.cpp | 2 +- dll/win32/syssetup/install.c | 2 +- dll/win32/winmm/registry.c | 4 +- drivers/ksfilter/ks/api.c | 2 +- drivers/ksfilter/ks/swenum.c | 4 +- drivers/sac/driver/chanmgr.c | 2 +- .../applications/cmdutils/gflags/imagefile.c | 2 +- .../applications/devutils/shlextdbg/shlextdbg.cpp | 20 +++---- .../applications/sysutils/utils/pnpdump/pnpdump.c | 2 +- modules/rostests/apitests/apphelp/db.cpp | 8 +-- .../apitests/browseui/SHExplorerParseCmdLine.c | 2 +- modules/rostests/apitests/com/com_apitest.c | 6 +- modules/rostests/apitests/kernel32/dosdev.c | 2 +- modules/rostests/apitests/localspl/service.c | 2 +- modules/rostests/apitests/shell32/CIDLData.cpp | 2 +- modules/rostests/apitests/shell32/CShellLink.cpp | 2 +- .../apitests/shell32/SHCreateDataObject.cpp | 2 +- .../apitests/shell32/SHCreateFileDataObject.cpp | 2 +- .../rostests/apitests/zipfldr/EnumParentDir.cpp | 4 +- sdk/lib/drivers/sound/mmixer/sup.c | 4 +- win32ss/gdi/ntgdi/gdikdbgext.c | 14 ++--- win32ss/gdi/ntgdi/text.c | 16 ++--- win32ss/printing/base/winspool/printerdata.c | 4 +- win32ss/printing/base/winspool/printers.c | 4 +- win32ss/printing/monitors/localmon/tools.c | 2 +- win32ss/printing/monitors/localmon/ui/localui.c | 2 +- win32ss/printing/processors/winprint/main.c | 2 +- win32ss/printing/providers/localspl/jobs.c | 2 +- win32ss/printing/providers/localspl/printerdata.c | 70 +++++++++++----------- win32ss/printing/providers/localspl/printers.c | 4 +- .../printing/providers/localspl/printprocessors.c | 4 +- win32ss/user/ntuser/message.c | 2 +- win32ss/user/winsrv/consrv/console.c | 2 +- 87 files changed, 293 insertions(+), 293 deletions(-)
diff --git a/base/applications/cmdutils/attrib/attrib.c b/base/applications/cmdutils/attrib/attrib.c index 3f62a42c684..6b0fb8f9bb8 100644 --- a/base/applications/cmdutils/attrib/attrib.c +++ b/base/applications/cmdutils/attrib/attrib.c @@ -243,7 +243,7 @@ EnumFilesWorker( do { BOOL bIsDir = !!(EnumCtx->findData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY); - BOOL bExactMatch = (wcsicmp(findFileName, EnumCtx->FileName) == 0); + BOOL bExactMatch = (_wcsicmp(findFileName, EnumCtx->FileName) == 0);
if (bIsDir && !(EnumCtx->Flags & ENUM_DIRECTORIES) && !bExactMatch) continue; @@ -330,9 +330,9 @@ int wmain(int argc, WCHAR *argv[]) } else /* Retrieve the enumeration modes */ - if (wcsicmp(argv[i], L"/s") == 0) + if (_wcsicmp(argv[i], L"/s") == 0) dwEnumFlags |= ENUM_RECURSE; - else if (wcsicmp(argv[i], L"/d") == 0) + else if (_wcsicmp(argv[i], L"/d") == 0) dwEnumFlags |= ENUM_DIRECTORIES; else { diff --git a/base/applications/cmdutils/doskey/doskey.c b/base/applications/cmdutils/doskey/doskey.c index 47991c957d2..57539f4cdc0 100644 --- a/base/applications/cmdutils/doskey/doskey.c +++ b/base/applications/cmdutils/doskey/doskey.c @@ -305,8 +305,8 @@ wmain(VOID) { pszExeName = RemoveQuotes(pArgStart + 9); } - else if (!wcsicmp(pArgStart, L"/H") || - !wcsicmp(pArgStart, L"/HISTORY")) + else if (!_wcsicmp(pArgStart, L"/H") || + !_wcsicmp(pArgStart, L"/HISTORY")) { PrintHistory(); } @@ -314,20 +314,20 @@ wmain(VOID) { SetConsoleNumberOfCommandsW(_wtoi(pArgStart + 10), pszExeName); } - else if (!wcsicmp(pArgStart, L"/REINSTALL")) + else if (!_wcsicmp(pArgStart, L"/REINSTALL")) { ExpungeConsoleCommandHistoryW(pszExeName); } - else if (!wcsicmp(pArgStart, L"/INSERT")) + else if (!_wcsicmp(pArgStart, L"/INSERT")) { SetInsert(ENABLE_INSERT_MODE); } - else if (!wcsicmp(pArgStart, L"/OVERSTRIKE")) + else if (!_wcsicmp(pArgStart, L"/OVERSTRIKE")) { SetInsert(0); } - else if (!wcsicmp(pArgStart, L"/M") || - !wcsicmp(pArgStart, L"/MACROS")) + else if (!_wcsicmp(pArgStart, L"/M") || + !_wcsicmp(pArgStart, L"/MACROS")) { PrintMacros(pszExeName, L""); } @@ -335,7 +335,7 @@ wmain(VOID) !_wcsnicmp(pArgStart, L"/MACROS:", 8)) { LPWSTR exe = RemoveQuotes(wcschr(pArgStart, L':') + 1); - if (!wcsicmp(exe, L"ALL")) + if (!_wcsicmp(exe, L"ALL")) PrintAllMacros(); else PrintMacros(exe, L""); diff --git a/base/applications/cmdutils/hostname/hostname.c b/base/applications/cmdutils/hostname/hostname.c index 00ded61f1bf..768dd945a1d 100644 --- a/base/applications/cmdutils/hostname/hostname.c +++ b/base/applications/cmdutils/hostname/hostname.c @@ -56,7 +56,7 @@ int wmain(int argc, WCHAR* argv[]) } else { - if ((wcsicmp(argv[1], L"-s") == 0) || (wcsicmp(argv[1], L"/s") == 0)) + if ((_wcsicmp(argv[1], L"-s") == 0) || (_wcsicmp(argv[1], L"/s") == 0)) { /* The program doesn't allow the user to set the host name */ LoadStringW(GetModuleHandle(NULL), IDS_NOSET, Msg, _countof(Msg)); diff --git a/base/applications/cmdutils/whoami/whoami.c b/base/applications/cmdutils/whoami/whoami.c index 99bdc670301..85fcc6e4b8d 100644 --- a/base/applications/cmdutils/whoami/whoami.c +++ b/base/applications/cmdutils/whoami/whoami.c @@ -39,7 +39,7 @@ BOOL GetArgument(WCHAR* arg, int argc, WCHAR* argv[])
for (i = 1; i < argc; i++) { - if (wcsicmp(argv[i], arg) == 0) + if (_wcsicmp(argv[i], arg) == 0) return TRUE; }
@@ -698,7 +698,7 @@ int wmain(int argc, WCHAR* argv[]) /* first things first-- let's detect and manage both printing modifiers (/fo and /nh) */ for (i = 1; i < argc; i++) { - if (wcsicmp(argv[i], L"/nh") == 0) + if (_wcsicmp(argv[i], L"/nh") == 0) { NoHeaderArgCount++;
@@ -713,7 +713,7 @@ int wmain(int argc, WCHAR* argv[])
for (i = 1; i < argc; i++) { - if (wcsicmp(argv[i], L"/fo") == 0) + if (_wcsicmp(argv[i], L"/fo") == 0) { if ((i + 1) < argc) { @@ -721,14 +721,14 @@ int wmain(int argc, WCHAR* argv[])
PrintFormatArgCount++;
- if (wcsicmp(argv[i + 1], L"table") == 0 && PrintFormat != table) + if (_wcsicmp(argv[i + 1], L"table") == 0 && PrintFormat != table) { PrintFormat = table; // wprintf(L"Changed to table format\n"); BlankArgument(i, argv); BlankArgument(i + 1, argv); } - else if (wcsicmp(argv[i + 1], L"list") == 0 && PrintFormat != list) + else if (_wcsicmp(argv[i + 1], L"list") == 0 && PrintFormat != list) { PrintFormat = list; // wprintf(L"Changed to list format\n"); @@ -743,7 +743,7 @@ int wmain(int argc, WCHAR* argv[]) return 1; } } - else if (wcsicmp(argv[i + 1], L"csv") == 0 && PrintFormat != csv) + else if (_wcsicmp(argv[i + 1], L"csv") == 0 && PrintFormat != csv) { PrintFormat = csv; // wprintf(L"Changed to csv format\n"); @@ -751,14 +751,14 @@ int wmain(int argc, WCHAR* argv[]) BlankArgument(i + 1, argv); } /* /nh or /fo after /fo isn't parsed as a value */ - else if (wcsicmp(argv[i + 1], L"/nh") == 0 || wcsicmp(argv[i + 1], L"/fo") == 0 + else if (_wcsicmp(argv[i + 1], L"/nh") == 0 || _wcsicmp(argv[i + 1], L"/fo") == 0
/* same goes for the other named options, not ideal, but works */ - || wcsicmp(argv[i + 1], L"/priv") == 0 - || wcsicmp(argv[i + 1], L"/groups") == 0 - || wcsicmp(argv[i + 1], L"/user") == 0 - || wcsicmp(argv[i + 1], L"/all") == 0 - || wcsicmp(argv[i + 1], L"") == 0) + || _wcsicmp(argv[i + 1], L"/priv") == 0 + || _wcsicmp(argv[i + 1], L"/groups") == 0 + || _wcsicmp(argv[i + 1], L"/user") == 0 + || _wcsicmp(argv[i + 1], L"/all") == 0 + || _wcsicmp(argv[i + 1], L"") == 0) { goto FoValueExpected; } @@ -806,13 +806,13 @@ int wmain(int argc, WCHAR* argv[]) if (argc == 2) { /* now let's try to parse the triumvirate of simpler, single (1) arguments... plus help */ - if (wcsicmp(argv[1], L"/?") == 0) + if (_wcsicmp(argv[1], L"/?") == 0) { wprintf(WhoamiLoadRcString(IDS_HELP)); return 0; }
- else if (wcsicmp(argv[1], L"/upn") == 0) + else if (_wcsicmp(argv[1], L"/upn") == 0) { LPWSTR UserBuffer = WhoamiGetUser(NameUserPrincipal);
@@ -829,7 +829,7 @@ int wmain(int argc, WCHAR* argv[]) } }
- else if (wcsicmp(argv[1], L"/fqdn") == 0) + else if (_wcsicmp(argv[1], L"/fqdn") == 0) { LPWSTR UserBuffer = WhoamiGetUser(NameFullyQualifiedDN);
@@ -846,7 +846,7 @@ int wmain(int argc, WCHAR* argv[]) } }
- else if (wcsicmp(argv[1], L"/logonid") == 0) + else if (_wcsicmp(argv[1], L"/logonid") == 0) { return WhoamiLogonId(); } @@ -858,11 +858,11 @@ int wmain(int argc, WCHAR* argv[]) /* sometimes is just easier to whitelist for lack of a better method */ for (i=1; i<argc; i++) { - if ((wcsicmp(argv[i], L"/user") != 0) && - (wcsicmp(argv[i], L"/groups") != 0) && - (wcsicmp(argv[i], L"/priv") != 0) && - (wcsicmp(argv[i], L"/all") != 0) && - (wcsicmp(argv[i], L"") != 0)) + if ((_wcsicmp(argv[i], L"/user") != 0) && + (_wcsicmp(argv[i], L"/groups") != 0) && + (_wcsicmp(argv[i], L"/priv") != 0) && + (_wcsicmp(argv[i], L"/all") != 0) && + (_wcsicmp(argv[i], L"") != 0)) { wprintf(WhoamiLoadRcString(IDS_ERROR_INVALIDARG), argv[i]); return 1; diff --git a/base/applications/mscutils/eventvwr/eventvwr.c b/base/applications/mscutils/eventvwr/eventvwr.c index 54eb0131bbc..0e356afd7d6 100644 --- a/base/applications/mscutils/eventvwr/eventvwr.c +++ b/base/applications/mscutils/eventvwr/eventvwr.c @@ -1936,7 +1936,7 @@ FilterByString(IN PCWSTR FilterString, // This is a multi-string pStr = FilterString; while (*pStr) { - if (wcsicmp(pStr, String) == 0) + if (_wcsicmp(pStr, String) == 0) { /* We have a match, break the loop */ break; @@ -2955,7 +2955,7 @@ BuildLogListAndFilterList(IN LPCWSTR lpComputerName) for (lpcName = 0; lpcName < ARRAYSIZE(SystemLogs); ++lpcName) { /* Check whether the log name is part of the system logs */ - if (wcsicmp(LogName, SystemLogs[lpcName]) == 0) + if (_wcsicmp(LogName, SystemLogs[lpcName]) == 0) { hRootNode = htiSystemLogs; break; @@ -2967,7 +2967,7 @@ BuildLogListAndFilterList(IN LPCWSTR lpComputerName) 2, 3, (LPARAM)EventLogFilter);
/* Try to get the default event log: "Application" */ - if ((hItemDefault == NULL) && (wcsicmp(LogName, SystemLogs[0]) == 0)) + if ((hItemDefault == NULL) && (_wcsicmp(LogName, SystemLogs[0]) == 0)) { hItemDefault = hItem; } diff --git a/base/applications/network/net/cmdAccounts.c b/base/applications/network/net/cmdAccounts.c index 00b037ff1f4..1d6d1186f27 100644 --- a/base/applications/network/net/cmdAccounts.c +++ b/base/applications/network/net/cmdAccounts.c @@ -70,7 +70,7 @@ cmdAccounts( if (_wcsnicmp(argv[i], L"/forcelogoff:", 13) == 0) { p = &argv[i][13]; - if (wcsicmp(p, L"no") == 0) + if (_wcsicmp(p, L"no") == 0) { Info0->usrmod0_force_logoff = TIMEQ_FOREVER; Modified = TRUE; @@ -107,7 +107,7 @@ cmdAccounts( { p = &argv[i][10];
- if (wcsicmp(p, L"unlimited")) + if (_wcsicmp(p, L"unlimited")) { Info0->usrmod0_max_passwd_age = ULONG_MAX; Modified = TRUE; diff --git a/base/applications/network/net/cmdUse.c b/base/applications/network/net/cmdUse.c index 2219df44086..3e00bd2a746 100644 --- a/base/applications/network/net/cmdUse.c +++ b/base/applications/network/net/cmdUse.c @@ -47,7 +47,7 @@ EnumerateConnections(LPCWSTR Local) lpCur = lpRes; for (; dCount; dCount--) { - if (!Local || wcsicmp(lpCur->lpLocalName, Local) == 0) + if (!Local || _wcsicmp(lpCur->lpLocalName, Local) == 0) { ConPrintf(StdOut, L"%s\t\t\t%s\t\t%s\n", lpCur->lpLocalName, lpCur->lpRemoteName, lpCur->lpProvider); } @@ -135,7 +135,7 @@ cmdUse( }
Delete = 0; - if (wcsicmp(argv[2], L"/DELETE") == 0) + if (_wcsicmp(argv[2], L"/DELETE") == 0) { Delete = 3; } @@ -149,7 +149,7 @@ cmdUse( } }
- if (wcsicmp(argv[3], L"/DELETE") == 0) + if (_wcsicmp(argv[3], L"/DELETE") == 0) { Delete = 2; } diff --git a/base/applications/network/net/cmdUser.c b/base/applications/network/net/cmdUser.c index 9dbe206a01e..57447358cd0 100644 --- a/base/applications/network/net/cmdUser.c +++ b/base/applications/network/net/cmdUser.c @@ -962,7 +962,7 @@ ParseLogonHours( goto done; }
- if (wcsicmp(pszParams, L"all") == 0) + if (_wcsicmp(pszParams, L"all") == 0) { FillMemory(pLogonBitmap, UNITS_PER_WEEK / 8, 0xFF); goto done; diff --git a/base/applications/network/netsh/interpreter.c b/base/applications/network/netsh/interpreter.c index 87c5c2fc2fe..79c166432a3 100644 --- a/base/applications/network/netsh/interpreter.c +++ b/base/applications/network/netsh/interpreter.c @@ -36,8 +36,8 @@ InterpretCommand( return FALSE; }
- if ((wcsicmp(argv[dwArgCount - 1], L"?") == 0) || - (wcsicmp(argv[dwArgCount - 1], L"help") == 0)) + if ((_wcsicmp(argv[dwArgCount - 1], L"?") == 0) || + (_wcsicmp(argv[dwArgCount - 1], L"help") == 0)) { dwHelpLevel = dwArgCount - 1; } @@ -49,7 +49,7 @@ InterpretCommand( pCommand = pContext->pCommandListHead; while (pCommand != NULL) { - if (wcsicmp(argv[0], pCommand->pwszCmdToken) == 0) + if (_wcsicmp(argv[0], pCommand->pwszCmdToken) == 0) { if (dwHelpLevel == 1) { @@ -74,7 +74,7 @@ InterpretCommand( pGroup = pContext->pGroupListHead; while (pGroup != NULL) { - if (wcsicmp(argv[0], pGroup->pwszCmdGroupToken) == 0) + if (_wcsicmp(argv[0], pGroup->pwszCmdGroupToken) == 0) { if (dwHelpLevel == 1) { @@ -85,7 +85,7 @@ InterpretCommand( pCommand = pGroup->pCommandListHead; while (pCommand != NULL) { - if ((dwArgCount > 1) && (wcsicmp(argv[1], pCommand->pwszCmdToken) == 0)) + if ((dwArgCount > 1) && (_wcsicmp(argv[1], pCommand->pwszCmdToken) == 0)) { if (dwHelpLevel == 2) { @@ -120,7 +120,7 @@ InterpretCommand( pSubContext = pContext->pSubContextHead; while (pSubContext != NULL) { - if (wcsicmp(argv[0], pSubContext->pszContextName) == 0) + if (_wcsicmp(argv[0], pSubContext->pszContextName) == 0) { pCurrentContext = pSubContext; return TRUE; diff --git a/base/applications/network/netsh/netsh.c b/base/applications/network/netsh/netsh.c index 7c0a33b669b..0728009d440 100644 --- a/base/applications/network/netsh/netsh.c +++ b/base/applications/network/netsh/netsh.c @@ -212,7 +212,7 @@ MatchToken( _In_ LPCWSTR pwszCmdToken) { DPRINT1("MatchToken %S %S\n", pwszUserToken, pwszCmdToken); - return (wcsicmp(pwszUserToken, pwszCmdToken) == 0) ? TRUE : FALSE; + return (_wcsicmp(pwszUserToken, pwszCmdToken) == 0) ? TRUE : FALSE; }
DWORD diff --git a/base/applications/rapps_com/main.c b/base/applications/rapps_com/main.c index d5f7c01ff0f..28529a692dd 100644 --- a/base/applications/rapps_com/main.c +++ b/base/applications/rapps_com/main.c @@ -38,7 +38,7 @@ int wmain(int argc, wchar_t* argv[])
GetModuleFileNameW(NULL, RappsExe, ARRAYSIZE(RappsExe)); arglen = wcslen(RappsExe); - if (arglen > 4 && !wcsicmp(RappsExe + arglen - 4, L".com")) + if (arglen > 4 && !_wcsicmp(RappsExe + arglen - 4, L".com")) { wcscpy(RappsExe + arglen - 4, L".exe"); } diff --git a/base/applications/runas/runas.c b/base/applications/runas/runas.c index f0d7689dd5a..4291a1d9621 100644 --- a/base/applications/runas/runas.c +++ b/base/applications/runas/runas.c @@ -118,19 +118,19 @@ wmain( result = 0; goto done; } - else if (wcsicmp(pszArg, L"profile") == 0) + else if (_wcsicmp(pszArg, L"profile") == 0) { bProfile = TRUE; } - else if (wcsicmp(pszArg, L"netonly") == 0) + else if (_wcsicmp(pszArg, L"netonly") == 0) { bNetOnly = TRUE; } - else if (wcsicmp(pszArg, L"noprofile") == 0) + else if (_wcsicmp(pszArg, L"noprofile") == 0) { bNoProfile = TRUE; } - else if (wcsicmp(pszArg, L"env") == 0) + else if (_wcsicmp(pszArg, L"env") == 0) { bEnv = TRUE; } diff --git a/base/applications/sndvol32/dialog.c b/base/applications/sndvol32/dialog.c index 71f1e8abdc6..8ac5c65638e 100644 --- a/base/applications/sndvol32/dialog.c +++ b/base/applications/sndvol32/dialog.c @@ -180,7 +180,7 @@ AddDialogControl( *OutWnd = hwnd;
/* check if this the track bar */ - if (!wcsicmp(ClassName, L"msctls_trackbar32")) + if (!_wcsicmp(ClassName, L"msctls_trackbar32")) { if (DialogItem->style & TBS_VERT) { @@ -229,12 +229,12 @@ AddDialogControl( SendMessage(hwnd, TBM_SETTIC, 0, (LPARAM)i); } } - else if (!wcsicmp(ClassName, L"static")) + else if (!_wcsicmp(ClassName, L"static")) { /* Set font */ SendMessageW(hwnd, WM_SETFONT, (WPARAM)hFont, TRUE); } - else if (!wcsicmp(ClassName, L"button")) + else if (!_wcsicmp(ClassName, L"button")) { if (DialogItem->id == IDC_LINE_SWITCH) { @@ -789,7 +789,7 @@ UpdateDialogLineSwitchControl( }
/* check if the line name matches */ - if (!wcsicmp(LineName, Line->szName)) + if (!_wcsicmp(LineName, Line->szName)) { /* found matching line name */ wID = (Index + 1) * IDC_LINE_SWITCH; @@ -836,7 +836,7 @@ UpdateDialogLineSliderControl( }
/* check if the line name matches */ - if (!wcsicmp(LineName, Line->szName)) + if (!_wcsicmp(LineName, Line->szName)) { /* found matching line name */ wID = (Index + 1) * dwDialogID; diff --git a/base/applications/sndvol32/mixer.c b/base/applications/sndvol32/mixer.c index 1dd4400e905..937e4dade18 100644 --- a/base/applications/sndvol32/mixer.c +++ b/base/applications/sndvol32/mixer.c @@ -628,7 +628,7 @@ SndMixerGetLineByName(PSND_MIXER Mixer, { if (Line->DisplayControls != 0) { - if (wcsicmp(Line->Info.szName, LineName) == 0) + if (_wcsicmp(Line->Info.szName, LineName) == 0) { return &Line->Info; } @@ -636,7 +636,7 @@ SndMixerGetLineByName(PSND_MIXER Mixer,
for (Connection = Line->Connections; Connection != NULL; Connection = Connection->Next) { - if (wcsicmp(Connection->Info.szName, LineName) == 0) + if (_wcsicmp(Connection->Info.szName, LineName) == 0) { return &Connection->Info; } diff --git a/base/applications/sndvol32/sndvol32.c b/base/applications/sndvol32/sndvol32.c index 53d55d70d7b..e6a991d05c0 100644 --- a/base/applications/sndvol32/sndvol32.c +++ b/base/applications/sndvol32/sndvol32.c @@ -636,7 +636,7 @@ SetVolumeCallback(PSND_MIXER Mixer, DWORD LineID, LPMIXERLINE Line, PVOID Ctx) PSET_VOLUME_CONTEXT Context = (PSET_VOLUME_CONTEXT)Ctx;
/* check if the line name is equal */ - if (wcsicmp(Line->szName, Context->LineName)) + if (_wcsicmp(Line->szName, Context->LineName)) { /* it is not */ return TRUE; diff --git a/base/services/dhcpcsvc/dhcp/adapter.c b/base/services/dhcpcsvc/dhcp/adapter.c index ef839dc1b7d..1feab088276 100644 --- a/base/services/dhcpcsvc/dhcp/adapter.c +++ b/base/services/dhcpcsvc/dhcp/adapter.c @@ -517,7 +517,7 @@ PDHCP_ADAPTER AdapterFindName( const WCHAR *name ) { ListEntry != &AdapterList; ListEntry = ListEntry->Flink ) { Adapter = CONTAINING_RECORD( ListEntry, DHCP_ADAPTER, ListEntry ); - if( !wcsicmp( Adapter->IfMib.wszName, name ) ) return Adapter; + if( !_wcsicmp( Adapter->IfMib.wszName, name ) ) return Adapter; }
return NULL; diff --git a/base/setup/lib/bootsup.c b/base/setup/lib/bootsup.c index 313c006b93f..228376348b4 100644 --- a/base/setup/lib/bootsup.c +++ b/base/setup/lib/bootsup.c @@ -946,7 +946,7 @@ InstallFatBootcodeToPartition( /* Install new bootcode into a file */ CombinePaths(DstPath, ARRAYSIZE(DstPath), 2, SystemRootPath->Buffer, L"bootsect.ros");
- if (wcsicmp(FileSystemName, L"FAT32") == 0) + if (_wcsicmp(FileSystemName, L"FAT32") == 0) { /* Install FAT32 bootcode */ CombinePaths(SrcPath, ARRAYSIZE(SrcPath), 2, SourceRootPath->Buffer, L"\loader\fat32.bin"); @@ -1139,7 +1139,7 @@ InstallFatBootcodeToPartition( }
/* Install new bootsector on the disk */ - if (wcsicmp(FileSystemName, L"FAT32") == 0) + if (_wcsicmp(FileSystemName, L"FAT32") == 0) { /* Install FAT32 bootcode */ CombinePaths(SrcPath, ARRAYSIZE(SrcPath), 2, SourceRootPath->Buffer, L"\loader\fat32.bin"); @@ -1384,30 +1384,30 @@ InstallVBRToPartition( IN PUNICODE_STRING DestinationArcPath, IN PCWSTR FileSystemName) { - if (wcsicmp(FileSystemName, L"FAT") == 0 || - wcsicmp(FileSystemName, L"FAT32") == 0) + if (_wcsicmp(FileSystemName, L"FAT") == 0 || + _wcsicmp(FileSystemName, L"FAT32") == 0) { return InstallFatBootcodeToPartition(SystemRootPath, SourceRootPath, DestinationArcPath, FileSystemName); } - else if (wcsicmp(FileSystemName, L"NTFS") == 0) + else if (_wcsicmp(FileSystemName, L"NTFS") == 0) { return InstallNtfsBootcodeToPartition(SystemRootPath, SourceRootPath, DestinationArcPath); } - else if (wcsicmp(FileSystemName, L"BTRFS") == 0) + else if (_wcsicmp(FileSystemName, L"BTRFS") == 0) { return InstallBtrfsBootcodeToPartition(SystemRootPath, SourceRootPath, DestinationArcPath); } /* - else if (wcsicmp(FileSystemName, L"EXT2") == 0 || - wcsicmp(FileSystemName, L"EXT3") == 0 || - wcsicmp(FileSystemName, L"EXT4") == 0) + else if (_wcsicmp(FileSystemName, L"EXT2") == 0 || + _wcsicmp(FileSystemName, L"EXT3") == 0 || + _wcsicmp(FileSystemName, L"EXT4") == 0) { return STATUS_NOT_SUPPORTED; } diff --git a/base/setup/lib/utils/partlist.c b/base/setup/lib/utils/partlist.c index 4f077440ab2..8c8c597e084 100644 --- a/base/setup/lib/utils/partlist.c +++ b/base/setup/lib/utils/partlist.c @@ -3121,10 +3121,10 @@ IsSupportedActivePartition( ASSERT(*Volume->Info.FileSystem);
/* NOTE: Please keep in sync with the RegisteredFileSystems list! */ - if (wcsicmp(Volume->Info.FileSystem, L"FAT") == 0 || - wcsicmp(Volume->Info.FileSystem, L"FAT32") == 0 || - // wcsicmp(Volume->Info.FileSystem, L"NTFS") == 0 || - wcsicmp(Volume->Info.FileSystem, L"BTRFS") == 0) + if (_wcsicmp(Volume->Info.FileSystem, L"FAT") == 0 || + _wcsicmp(Volume->Info.FileSystem, L"FAT32") == 0 || + // _wcsicmp(Volume->Info.FileSystem, L"NTFS") == 0 || + _wcsicmp(Volume->Info.FileSystem, L"BTRFS") == 0) { return TRUE; } diff --git a/base/setup/reactos/reactos.c b/base/setup/reactos/reactos.c index 4c0b3d64f80..aab095cc61d 100644 --- a/base/setup/reactos/reactos.c +++ b/base/setup/reactos/reactos.c @@ -1656,7 +1656,7 @@ FileCopyCallback(PVOID Context, else DstFileName = FilePathInfo->Target;
// STRING_MOVING or STRING_RENAMING - if (!wcsicmp(SrcFileName, DstFileName)) + if (!_wcsicmp(SrcFileName, DstFileName)) StringCchPrintfW(Status, ARRAYSIZE(Status), L"Moving %s to %s", SrcFileName, DstFileName); else StringCchPrintfW(Status, ARRAYSIZE(Status), L"Renaming %s to %s", SrcFileName, DstFileName); @@ -2260,7 +2260,7 @@ BOOL LoadSetupData( ListEntry = GetNextListEntry(ListEntry)) { PCWSTR LocaleId = ((PGENENTRY)GetListEntryData(ListEntry))->Id; - if (!wcsicmp(pSetupData->DefaultLanguage, LocaleId)) + if (!_wcsicmp(pSetupData->DefaultLanguage, LocaleId)) { DPRINT("found %S in LanguageList\n", LocaleId); SetCurrentListEntry(LanguageList, ListEntry); @@ -2273,7 +2273,7 @@ BOOL LoadSetupData( ListEntry = GetNextListEntry(ListEntry)) { PCWSTR pszLayoutId = ((PGENENTRY)GetListEntryData(ListEntry))->Id; - if (!wcsicmp(pSetupData->DefaultKBLayout, pszLayoutId)) + if (!_wcsicmp(pSetupData->DefaultKBLayout, pszLayoutId)) { DPRINT("Found %S in LayoutList\n", pszLayoutId); SetCurrentListEntry(LayoutList, ListEntry); diff --git a/base/setup/usetup/cmdcons.c b/base/setup/usetup/cmdcons.c index e1cd5c74e3f..a4cb6afe5bd 100644 --- a/base/setup/usetup/cmdcons.c +++ b/base/setup/usetup/cmdcons.c @@ -531,7 +531,7 @@ CommandHelp( { for (cmdptr = Commands; cmdptr->name != NULL; cmdptr++) { - if (!stricmp(param, cmdptr->name)) + if (!_stricmp(param, cmdptr->name)) { if (cmdptr->help != NULL) { @@ -1122,7 +1122,7 @@ DoCommand( break; }
- if (stricmp(com, cmdptr->name) == 0) + if (_stricmp(com, cmdptr->name) == 0) { cmdptr->func(State, rest); break; diff --git a/base/setup/usetup/usetup.c b/base/setup/usetup/usetup.c index 3f51e531caf..8eb4864091a 100644 --- a/base/setup/usetup/usetup.c +++ b/base/setup/usetup/usetup.c @@ -104,22 +104,22 @@ DoWatchDestFileName(LPCWSTR FileName) { if (FileName[0] == 'm' || FileName[0] == 'M') { - if (wcsicmp(FileName, L"mingliu.ttc") == 0) + if (_wcsicmp(FileName, L"mingliu.ttc") == 0) { DPRINT("mingliu.ttc found\n"); s_SubstSettings.bFoundFontMINGLIU = TRUE; } - else if (wcsicmp(FileName, L"msgothic.ttc") == 0) + else if (_wcsicmp(FileName, L"msgothic.ttc") == 0) { DPRINT("msgothic.ttc found\n"); s_SubstSettings.bFoundFontMSGOTHIC = TRUE; } - else if (wcsicmp(FileName, L"msmincho.ttc") == 0) + else if (_wcsicmp(FileName, L"msmincho.ttc") == 0) { DPRINT("msmincho.ttc found\n"); s_SubstSettings.bFoundFontMSMINCHO = TRUE; } - else if (wcsicmp(FileName, L"mssong.ttf") == 0) + else if (_wcsicmp(FileName, L"mssong.ttf") == 0) { DPRINT("mssong.ttf found\n"); s_SubstSettings.bFoundFontMSSONG = TRUE; @@ -127,17 +127,17 @@ DoWatchDestFileName(LPCWSTR FileName) } else { - if (wcsicmp(FileName, L"simsun.ttc") == 0) + if (_wcsicmp(FileName, L"simsun.ttc") == 0) { DPRINT("simsun.ttc found\n"); s_SubstSettings.bFoundFontSIMSUN = TRUE; } - else if (wcsicmp(FileName, L"gulim.ttc") == 0) + else if (_wcsicmp(FileName, L"gulim.ttc") == 0) { DPRINT("gulim.ttc found\n"); s_SubstSettings.bFoundFontGULIM = TRUE; } - else if (wcsicmp(FileName, L"batang.ttc") == 0) + else if (_wcsicmp(FileName, L"batang.ttc") == 0) { DPRINT("batang.ttc found\n"); s_SubstSettings.bFoundFontBATANG = TRUE; @@ -607,7 +607,7 @@ SetupStartPage(PINPUT_RECORD Ir) ListEntry = GetNextListEntry(ListEntry)) { LocaleId = ((PGENENTRY)GetListEntryData(ListEntry))->Id; - if (!wcsicmp(USetupData.LocaleID, LocaleId)) + if (!_wcsicmp(USetupData.LocaleID, LocaleId)) { DPRINT("found %S in LanguageList\n", LocaleId); SetCurrentListEntry(USetupData.LanguageList, ListEntry); @@ -620,7 +620,7 @@ SetupStartPage(PINPUT_RECORD Ir) ListEntry = GetNextListEntry(ListEntry)) { LocaleId = ((PGENENTRY)GetListEntryData(ListEntry))->Id; - if (!wcsicmp(USetupData.LocaleID, LocaleId)) + if (!_wcsicmp(USetupData.LocaleID, LocaleId)) { DPRINT("found %S in LayoutList\n", LocaleId); SetCurrentListEntry(USetupData.LayoutList, ListEntry); @@ -3219,7 +3219,7 @@ FileCopyCallback(PVOID Context, if (DstFileName) ++DstFileName; else DstFileName = FilePathInfo->Target;
- if (!wcsicmp(SrcFileName, DstFileName)) + if (!_wcsicmp(SrcFileName, DstFileName)) Param2 = STRING_MOVING; else Param2 = STRING_RENAMING; diff --git a/base/system/diskpart/help.c b/base/system/diskpart/help.c index 0e20175e10c..75dd218f4bb 100644 --- a/base/system/diskpart/help.c +++ b/base/system/diskpart/help.c @@ -60,7 +60,7 @@ HelpCommand( { if (pCommand->cmd1 != NULL && pCommand->cmd2 == NULL && pCommand->cmd3 == NULL) { - if ((cmdptr->cmd1 != NULL && wcsicmp(pCommand->cmd1, cmdptr->cmd1) == 0) && + if ((cmdptr->cmd1 != NULL && _wcsicmp(pCommand->cmd1, cmdptr->cmd1) == 0) && (cmdptr->cmd2 != NULL) && (cmdptr->cmd3 == NULL) && (cmdptr->help != IDS_NONE)) @@ -72,8 +72,8 @@ HelpCommand( } else if (pCommand->cmd1 != NULL && pCommand->cmd2 != NULL && pCommand->cmd3 == NULL) { - if ((cmdptr->cmd1 != NULL && wcsicmp(pCommand->cmd1, cmdptr->cmd1) == 0) && - (cmdptr->cmd2 != NULL && wcsicmp(pCommand->cmd2, cmdptr->cmd2) == 0) && + if ((cmdptr->cmd1 != NULL && _wcsicmp(pCommand->cmd1, cmdptr->cmd1) == 0) && + (cmdptr->cmd2 != NULL && _wcsicmp(pCommand->cmd2, cmdptr->cmd2) == 0) && (cmdptr->cmd3 != NULL) && (cmdptr->help != IDS_NONE)) { @@ -84,9 +84,9 @@ HelpCommand( } else if (pCommand->cmd1 != NULL && pCommand->cmd2 != NULL && pCommand->cmd3 != NULL) { - if ((cmdptr->cmd1 != NULL && wcsicmp(pCommand->cmd1, cmdptr->cmd1) == 0) && - (cmdptr->cmd2 != NULL && wcsicmp(pCommand->cmd2, cmdptr->cmd2) == 0) && - (cmdptr->cmd3 != NULL && wcsicmp(pCommand->cmd3, cmdptr->cmd3) == 0) && + if ((cmdptr->cmd1 != NULL && _wcsicmp(pCommand->cmd1, cmdptr->cmd1) == 0) && + (cmdptr->cmd2 != NULL && _wcsicmp(pCommand->cmd2, cmdptr->cmd2) == 0) && + (cmdptr->cmd3 != NULL && _wcsicmp(pCommand->cmd3, cmdptr->cmd3) == 0) && (cmdptr->help_detail != MSG_NONE)) { ConMsgPuts(StdOut, @@ -134,24 +134,24 @@ BOOL help_main(INT argc, LPWSTR *argv) for (cmdptr = cmds; cmdptr->cmd1; cmdptr++) { if ((cmdptr1 == NULL) && - (cmdptr->cmd1 != NULL && wcsicmp(argv[1], cmdptr->cmd1) == 0)) + (cmdptr->cmd1 != NULL && _wcsicmp(argv[1], cmdptr->cmd1) == 0)) { cmdptr1 = cmdptr; }
if ((cmdptr2 == NULL) && (argc >= 3) && - (cmdptr->cmd1 != NULL && wcsicmp(argv[1], cmdptr->cmd1) == 0) && - (cmdptr->cmd2 != NULL && wcsicmp(argv[2], cmdptr->cmd2) == 0)) + (cmdptr->cmd1 != NULL && _wcsicmp(argv[1], cmdptr->cmd1) == 0) && + (cmdptr->cmd2 != NULL && _wcsicmp(argv[2], cmdptr->cmd2) == 0)) { cmdptr2 = cmdptr; } - + if ((cmdptr3 == NULL) && (argc >= 4) && - (cmdptr->cmd1 != NULL && wcsicmp(argv[1], cmdptr->cmd1) == 0) && - (cmdptr->cmd2 != NULL && wcsicmp(argv[2], cmdptr->cmd2) == 0) && - (cmdptr->cmd3 != NULL && wcsicmp(argv[3], cmdptr->cmd3) == 0)) + (cmdptr->cmd1 != NULL && _wcsicmp(argv[1], cmdptr->cmd1) == 0) && + (cmdptr->cmd2 != NULL && _wcsicmp(argv[2], cmdptr->cmd2) == 0) && + (cmdptr->cmd3 != NULL && _wcsicmp(argv[3], cmdptr->cmd3) == 0)) { cmdptr3 = cmdptr; } diff --git a/base/system/diskpart/interpreter.c b/base/system/diskpart/interpreter.c index bc18f9f2402..2e6750ac0ee 100644 --- a/base/system/diskpart/interpreter.c +++ b/base/system/diskpart/interpreter.c @@ -120,30 +120,30 @@ InterpretCmd(
/* First, determine if the user wants to exit or to use a comment */ - if (wcsicmp(argv[0], L"exit") == 0) + if (_wcsicmp(argv[0], L"exit") == 0) return FALSE;
- if (wcsicmp(argv[0], L"rem") == 0) + if (_wcsicmp(argv[0], L"rem") == 0) return TRUE;
/* Scan internal command table */ for (cmdptr = cmds; cmdptr->cmd1; cmdptr++) { if ((cmdptr1 == NULL) && - (cmdptr->cmd1 != NULL) && (wcsicmp(argv[0], cmdptr->cmd1) == 0)) + (cmdptr->cmd1 != NULL) && (_wcsicmp(argv[0], cmdptr->cmd1) == 0)) cmdptr1 = cmdptr;
if ((cmdptr2 == NULL) && (argc >= 2) && - (cmdptr->cmd1 != NULL) && (wcsicmp(argv[0], cmdptr->cmd1) == 0) && - (cmdptr->cmd2 != NULL) && (wcsicmp(argv[1], cmdptr->cmd2) == 0)) + (cmdptr->cmd1 != NULL) && (_wcsicmp(argv[0], cmdptr->cmd1) == 0) && + (cmdptr->cmd2 != NULL) && (_wcsicmp(argv[1], cmdptr->cmd2) == 0)) cmdptr2 = cmdptr;
if ((cmdptr3 == NULL) && (argc >= 3) && - (cmdptr->cmd1 != NULL) && (wcsicmp(argv[0], cmdptr->cmd1) == 0) && - (cmdptr->cmd2 != NULL) && (wcsicmp(argv[1], cmdptr->cmd2) == 0) && - (cmdptr->cmd3 != NULL) && (wcsicmp(argv[2], cmdptr->cmd3) == 0)) + (cmdptr->cmd1 != NULL) && (_wcsicmp(argv[0], cmdptr->cmd1) == 0) && + (cmdptr->cmd2 != NULL) && (_wcsicmp(argv[1], cmdptr->cmd2) == 0) && + (cmdptr->cmd3 != NULL) && (_wcsicmp(argv[2], cmdptr->cmd3) == 0)) cmdptr3 = cmdptr; }
diff --git a/base/system/services/rpcserver.c b/base/system/services/rpcserver.c index fa0aae805f7..5bf4537c7d2 100644 --- a/base/system/services/rpcserver.c +++ b/base/system/services/rpcserver.c @@ -2390,7 +2390,7 @@ RCreateServiceW( (lpServiceStartName)) { /* We allow LocalSystem to run interactive. */ - if (wcsicmp(lpServiceStartName, L"LocalSystem")) + if (_wcsicmp(lpServiceStartName, L"LocalSystem")) { return ERROR_INVALID_PARAMETER; } diff --git a/dll/appcompat/apphelp/hsdb.c b/dll/appcompat/apphelp/hsdb.c index 236394e6ad0..9e2726d905e 100644 --- a/dll/appcompat/apphelp/hsdb.c +++ b/dll/appcompat/apphelp/hsdb.c @@ -84,7 +84,7 @@ static BOOL SdbpMatchFileAttributes(PDB pdb, TAGID matching_file, PATTRINFO attr break; case TAG_TYPE_STRINGREF: lpval = SdbGetStringTagPtr(pdb, child); - if (!lpval || wcsicmp(attr->lpattr, lpval)) + if (!lpval || _wcsicmp(attr->lpattr, lpval)) return FALSE; break; case TAG_TYPE_QWORD: @@ -519,7 +519,7 @@ BOOL WINAPI SdbGetMatchingExe(HSDB hsdb, LPCWSTR path, LPCWSTR module_name, name = SdbFindFirstTag(pdb, iter, TAG_NAME); /* If this is a malformed DB, (no TAG_NAME), we should not crash. */ foundName = SdbGetStringTagPtr(pdb, name); - if (foundName && !wcsicmp(foundName, file_name)) + if (foundName && !_wcsicmp(foundName, file_name)) { /* Get information about executable required to match it with database entry */ if (!attribs) diff --git a/dll/appcompat/apphelp/layer.c b/dll/appcompat/apphelp/layer.c index 9c35c3f19fa..bfa8ae5f9b4 100644 --- a/dll/appcompat/apphelp/layer.c +++ b/dll/appcompat/apphelp/layer.c @@ -287,7 +287,7 @@ BOOL SdbpMatchLayer(PCWSTR start, PCWSTR end, PCWSTR compare) { size_t len; if (!end) - return !wcsicmp(start, compare); + return !_wcsicmp(start, compare); len = end - start; return wcslen(compare) == len && !_wcsnicmp(start, compare, len); } diff --git a/dll/appcompat/apphelp/sdbapi.c b/dll/appcompat/apphelp/sdbapi.c index 28762d71ca0..76fc51d6e2a 100644 --- a/dll/appcompat/apphelp/sdbapi.c +++ b/dll/appcompat/apphelp/sdbapi.c @@ -553,7 +553,7 @@ TAGID WINAPI SdbFindFirstNamedTag(PDB pdb, TAGID root, TAGID find, TAGID nametag if (tmp != TAGID_NULL) { LPCWSTR name = SdbGetStringTagPtr(pdb, tmp); - if (name && !wcsicmp(name, find_name)) + if (name && !_wcsicmp(name, find_name)) return iter; } iter = SdbFindNextTag(pdb, root, iter); diff --git a/dll/appcompat/shims/genral/ignorefreelib.c b/dll/appcompat/shims/genral/ignorefreelib.c index 1d7c771382d..f7049d70029 100644 --- a/dll/appcompat/shims/genral/ignorefreelib.c +++ b/dll/appcompat/shims/genral/ignorefreelib.c @@ -51,7 +51,7 @@ BOOL WINAPI SHIM_OBJ_NAME(FreeLibrary)(HMODULE hModule) } for (n = 0; n < g_NameCount; ++n) { - if (!stricmp(g_Names[n], ModuleName)) + if (!_stricmp(g_Names[n], ModuleName)) { SHIM_INFO("Prevented unload of %s\n", ModuleName); if (Ptr && Ptr != Buffer) diff --git a/dll/cpl/appwiz/createlink.c b/dll/cpl/appwiz/createlink.c index 516a140539a..768bdbcebd0 100644 --- a/dll/cpl/appwiz/createlink.c +++ b/dll/cpl/appwiz/createlink.c @@ -31,7 +31,7 @@ IsShortcut(HKEY hKey) if (Type != REG_SZ) return FALSE;
- return (wcsicmp(Value, L"yes") == 0); + return (_wcsicmp(Value, L"yes") == 0); }
BOOL diff --git a/dll/cpl/desk/desk.c b/dll/cpl/desk/desk.c index ce780332d91..0dc2bad30b9 100644 --- a/dll/cpl/desk/desk.c +++ b/dll/cpl/desk/desk.c @@ -236,7 +236,7 @@ DisplayApplet(HWND hwnd, UINT uMsg, LPARAM wParam, LPARAM lParam)
for (i = 0; i < _countof(PropPages); i++) { - if (pwszSelectedTab && wcsicmp(pwszSelectedTab, PropPages[i].Name) == 0) + if (pwszSelectedTab && _wcsicmp(pwszSelectedTab, PropPages[i].Name) == 0) psh.nStartPage = i;
/* Override the background page if requested by a shell extension */ diff --git a/dll/cpl/sysdm/smbios.c b/dll/cpl/sysdm/smbios.c index 08d40fb9ef4..c49c25cd931 100644 --- a/dll/cpl/sysdm/smbios.c +++ b/dll/cpl/sysdm/smbios.c @@ -365,7 +365,7 @@ BOOL IsGenericSystemName(PCWSTR ven, PCWSTR dev, BOOL * bRemove) } else { - bMatch = !wcsicmp(ven, Vendors[i].pwName); + bMatch = !_wcsicmp(ven, Vendors[i].pwName); } if (bMatch) { @@ -389,7 +389,7 @@ BOOL IsGenericSystemName(PCWSTR ven, PCWSTR dev, BOOL * bRemove) } else { - bMatch = !wcsicmp(dev, Devices[i].pwName); + bMatch = !_wcsicmp(dev, Devices[i].pwName); } if (bMatch) { @@ -430,7 +430,7 @@ void AppendSystemFamily(PWSTR pBuf, SIZE_T cchBuf, PCHAR * DmiStrings, PWSTR dev if (wcsistr(dev, wideStr) == NULL && (!Aliases[i] || wcsistr(dev, Aliases[i]) == NULL) && DmiStrings[SYS_FAMILY] != NULL && - !stricmp(DmiStrings[SYS_FAMILY], KnownFamilies[i])) + !_stricmp(DmiStrings[SYS_FAMILY], KnownFamilies[i])) { if (wcslen(pBuf) > 0 && wcslen(dev) > 0) { @@ -746,7 +746,7 @@ BOOL GetSystemName(PWSTR pBuf, SIZE_T cchBuf) }
// workaround for LENOVO notebooks - if (!wcsicmp(ven, L"LENOVO")) + if (!_wcsicmp(ven, L"LENOVO")) { StringCchCopyW(ven, _countof(ven), L"Lenovo");
@@ -812,9 +812,9 @@ BOOL GetSystemName(PWSTR pBuf, SIZE_T cchBuf) { if (DmiStrings[SYS_PRODUCT] != NULL && DmiStrings[SYS_VERSION] != NULL && - (!stricmp(DmiStrings[SYS_PRODUCT], "Tablet PC") || - !stricmp(DmiStrings[SYS_PRODUCT], "Notebook") || - !stricmp(DmiStrings[SYS_PRODUCT], "Decktop"))) + (!_stricmp(DmiStrings[SYS_PRODUCT], "Tablet PC") || + !_stricmp(DmiStrings[SYS_PRODUCT], "Notebook") || + !_stricmp(DmiStrings[SYS_PRODUCT], "Decktop"))) { GetSMBiosStringW(DmiStrings[SYS_VERSION], dev, _countof(dev), TRUE); } diff --git a/dll/ntdll/rtl/libsupp.c b/dll/ntdll/rtl/libsupp.c index f4a1bbdbd49..75618a76951 100644 --- a/dll/ntdll/rtl/libsupp.c +++ b/dll/ntdll/rtl/libsupp.c @@ -761,7 +761,7 @@ NTSTATUS find_actctx_dll( PUNICODE_STRING pnameW, LPWSTR *fullname, PUNICODE_STR DWORD dirlen = info->ulAssemblyDirectoryNameLength / sizeof(WCHAR);
p++; - if (!info->lpAssemblyDirectoryName || _wcsnicmp( p, info->lpAssemblyDirectoryName, dirlen ) || wcsicmp( p + dirlen, dotManifestW )) + if (!info->lpAssemblyDirectoryName || _wcsnicmp( p, info->lpAssemblyDirectoryName, dirlen ) || _wcsicmp( p + dirlen, dotManifestW )) { /* manifest name does not match directory name, so it's not a global * windows/winsxs manifest; use the manifest directory name instead */ @@ -1072,7 +1072,7 @@ LdrpApplyFileNameRedirection( }
*RedirectedDll = FALSE; - + PCUNICODE_STRING PrevNewName = *NewName; UNICODE_STRING ApisetName = {0}; NTSTATUS Status = STATUS_SUCCESS; diff --git a/dll/shellext/acppage/CLayerUIPropPage.cpp b/dll/shellext/acppage/CLayerUIPropPage.cpp index 2f74b0d31f5..cea07e24e66 100644 --- a/dll/shellext/acppage/CLayerUIPropPage.cpp +++ b/dll/shellext/acppage/CLayerUIPropPage.cpp @@ -72,7 +72,7 @@ BOOL IsBuiltinLayer(PCWSTR Name)
for (n = 0; g_Layers[n].Name; ++n) { - if (!wcsicmp(g_Layers[n].Name, Name)) + if (!_wcsicmp(g_Layers[n].Name, Name)) { return TRUE; } @@ -80,7 +80,7 @@ BOOL IsBuiltinLayer(PCWSTR Name)
for (n = 0; g_CompatModes[n].Name; ++n) { - if (!wcsicmp(g_CompatModes[n].Name, Name)) + if (!_wcsicmp(g_CompatModes[n].Name, Name)) { return TRUE; } @@ -159,7 +159,7 @@ HRESULT CLayerUIPropPage::InitFile(PCWSTR Filename) ACDBG(L"Failed to find an extension: '%s'\r\n", (PCWSTR)ExpandedFilename); return E_FAIL; } - if (!wcsicmp(pwszExt, L".lnk")) + if (!_wcsicmp(pwszExt, L".lnk")) { WCHAR Buffer[MAX_PATH]; if (!GetExeFromLnk(ExpandedFilename, Buffer, _countof(Buffer))) @@ -167,7 +167,7 @@ HRESULT CLayerUIPropPage::InitFile(PCWSTR Filename) ACDBG(L"Failed to read link target from: '%s'\r\n", (PCWSTR)ExpandedFilename); return E_FAIL; } - if (!wcsicmp(Buffer, ExpandedFilename)) + if (!_wcsicmp(Buffer, ExpandedFilename)) { ACDBG(L"Link redirects to itself: '%s'\r\n", (PCWSTR)ExpandedFilename); return E_FAIL; @@ -197,7 +197,7 @@ HRESULT CLayerUIPropPage::InitFile(PCWSTR Filename)
for (size_t n = 0; g_AllowedExtensions[n]; ++n) { - if (!wcsicmp(g_AllowedExtensions[n], pwszExt)) + if (!_wcsicmp(g_AllowedExtensions[n], pwszExt)) { m_Filename = ExpandedFilename; ACDBG(L"Got: %s\r\n", (PCWSTR)ExpandedFilename); @@ -225,7 +225,7 @@ static BOOL GetLayerInfo(PCWSTR Filename, DWORD QueryFlags, PDWORD OSMode, PDWOR size_t n; for (n = 0; g_Layers[n].Name; ++n) { - if (!wcsicmp(g_Layers[n].Name, Layer)) + if (!_wcsicmp(g_Layers[n].Name, Layer)) { *Enabledlayers |= (1<<n); break; @@ -237,7 +237,7 @@ static BOOL GetLayerInfo(PCWSTR Filename, DWORD QueryFlags, PDWORD OSMode, PDWOR
for (n = 0; g_CompatModes[n].Name; ++n) { - if (!wcsicmp(g_CompatModes[n].Name, Layer)) + if (!_wcsicmp(g_CompatModes[n].Name, Layer)) { *OSMode = n+1; break; diff --git a/dll/shellext/fontext/CFontExt.cpp b/dll/shellext/fontext/CFontExt.cpp index d5a5970618c..3a011bb3f77 100644 --- a/dll/shellext/fontext/CFontExt.cpp +++ b/dll/shellext/fontext/CFontExt.cpp @@ -285,7 +285,7 @@ STDMETHODIMP CFontExt::CompareIDs(LPARAM lParam, PCUIDLIST_RELATIVE pidl1, PCUID result = (int)fontEntry1->Index - (int)fontEntry2->Index; break; case FONTEXT_COL_FILENAME: - result = wcsicmp(PathFindFileNameW(info1->File()), PathFindFileNameW(info2->File())); + result = _wcsicmp(PathFindFileNameW(info1->File()), PathFindFileNameW(info2->File())); break; case FONTEXT_COL_SIZE: result = (int)info1->FileSize().HighPart - info2->FileSize().HighPart; diff --git a/dll/win32/dnsapi/query.c b/dll/win32/dnsapi/query.c index 8006a3f60bd..099fea39123 100644 --- a/dll/win32/dnsapi/query.c +++ b/dll/win32/dnsapi/query.c @@ -605,7 +605,7 @@ CheckForCurrentHostname(CONST CHAR * Name, PFIXED_INFO network_info) TempName = RtlAllocateHeap(RtlGetProcessHeap(), 0, 1); TempName[0] = 0; } - Found = !stricmp(Name, network_info->HostName) || !stricmp(Name, TempName); + Found = !_stricmp(Name, network_info->HostName) || !_stricmp(Name, TempName); RtlFreeHeap(RtlGetProcessHeap(), 0, TempName); if (!Found) { diff --git a/dll/win32/fmifs/format.c b/dll/win32/fmifs/format.c index ecab033f98e..1531cbbdb92 100644 --- a/dll/win32/fmifs/format.c +++ b/dll/win32/fmifs/format.c @@ -5,7 +5,7 @@ * PURPOSE: Volume format * * PROGRAMMERS: Emanuele Aliberti - * Herv� Poussineau (hpoussin@reactos.org) + * Hervé Poussineau (hpoussin@reactos.org) */
#include "precomp.h" @@ -91,7 +91,7 @@ FormatEx( RtlInitUnicodeString(&usLabel, Label);
/* Set the BackwardCompatible flag in case we format with older FAT12/16 */ - if (wcsicmp(Format, L"FAT") == 0) + if (_wcsicmp(Format, L"FAT") == 0) BackwardCompatible = TRUE; // else if (wcsicmp(Format, L"FAT32") == 0) // BackwardCompatible = FALSE; diff --git a/dll/win32/framedyn/chstring.cpp b/dll/win32/framedyn/chstring.cpp index df2eacc65c1..89d1b0ed332 100644 --- a/dll/win32/framedyn/chstring.cpp +++ b/dll/win32/framedyn/chstring.cpp @@ -430,7 +430,7 @@ int CHString::CompareNoCase(CHSTRING_LPCWSTR lpsz) const { // Just call the deprecated function here - no matter we are null terminated // Did you read my statement about how safe is this implementation? - return wcsicmp(reinterpret_cast<LPCWSTR>(m_pchData), reinterpret_cast<LPCWSTR>(lpsz)); + return _wcsicmp(reinterpret_cast<LPCWSTR>(m_pchData), reinterpret_cast<LPCWSTR>(lpsz)); }
/* diff --git a/dll/win32/iphlpapi/ipstats_reactos.c b/dll/win32/iphlpapi/ipstats_reactos.c index d5ceaacde88..0bbd27d2535 100644 --- a/dll/win32/iphlpapi/ipstats_reactos.c +++ b/dll/win32/iphlpapi/ipstats_reactos.c @@ -219,11 +219,11 @@ DWORD getICMPStats(MIB_ICMP *stats)
do { ptr = fgets(buf, sizeof(buf), fp); - } while (ptr && strncasecmp(buf, hdr, sizeof(hdr) - 1)); + } while (ptr && _strnicmp(buf, hdr, sizeof(hdr) - 1)); if (ptr) { /* last line was a header, get another */ ptr = fgets(buf, sizeof(buf), fp); - if (ptr && strncasecmp(buf, hdr, sizeof(hdr) - 1) == 0) { + if (ptr && _strnicmp(buf, hdr, sizeof(hdr) - 1) == 0) { char *endPtr;
ptr += sizeof(hdr); diff --git a/dll/win32/msgina/msgina.c b/dll/win32/msgina/msgina.c index 0d58899c6d8..bc1143a5705 100644 --- a/dll/win32/msgina/msgina.c +++ b/dll/win32/msgina/msgina.c @@ -21,7 +21,7 @@ * FILE: dll/win32/msgina/msgina.c * PURPOSE: ReactOS Logon GINA DLL * PROGRAMMER: Thomas Weidenmueller (w3seek@users.sourceforge.net) - * Herv� Poussineau (hpoussin@reactos.org) + * Hervé Poussineau (hpoussin@reactos.org) */
#include "msgina.h" @@ -141,7 +141,7 @@ ChooseGinaUI(VOID) NextOption = wcschr(CurrentOption, L' '); if (NextOption) *NextOption = L'\0'; - if (wcsicmp(CurrentOption, L"CONSOLE") == 0) + if (_wcsicmp(CurrentOption, L"CONSOLE") == 0) { TRACE("Found %S. Switching to console boot\n", CurrentOption); ConsoleBoot = TRUE; diff --git a/dll/win32/netid/netid.c b/dll/win32/netid/netid.c index 1e2b08740c8..7171d2c1009 100644 --- a/dll/win32/netid/netid.c +++ b/dll/win32/netid/netid.c @@ -413,8 +413,8 @@ CheckForChangedNames( { INT nShow = SW_HIDE;
- if ((wcsicmp(pNetIdData->szOldHostName, pNetIdData->szHostName) != 0) || - (wcsicmp(pNetIdData->szOldDomainName, pNetIdData->szDomainName) != 0)) + if ((_wcsicmp(pNetIdData->szOldHostName, pNetIdData->szHostName) != 0) || + (_wcsicmp(pNetIdData->szOldDomainName, pNetIdData->szDomainName) != 0)) { nShow = SW_SHOW; } diff --git a/dll/win32/ntmarta/ntmarta.c b/dll/win32/ntmarta/ntmarta.c index c519feabb94..ec7c5f814cb 100644 --- a/dll/win32/ntmarta/ntmarta.c +++ b/dll/win32/ntmarta/ntmarta.c @@ -1063,7 +1063,7 @@ AccpOpenNamedObject(LPWSTR pObjectName, i != sizeof(AccRegRootKeys) / sizeof(AccRegRootKeys[0]); i++) { - if (!wcsicmp(lpRootKeyName, + if (!_wcsicmp(lpRootKeyName, AccRegRootKeys[i].szRootKey)) { hRootKey = AccRegRootKeys[i].hRootKey; diff --git a/dll/win32/shell32/CDefaultContextMenu.cpp b/dll/win32/shell32/CDefaultContextMenu.cpp index 93d6ebe3bd4..6b83bd8a069 100644 --- a/dll/win32/shell32/CDefaultContextMenu.cpp +++ b/dll/win32/shell32/CDefaultContextMenu.cpp @@ -334,7 +334,7 @@ void CDefaultContextMenu::AddStaticEntry(const HKEY hkeyClass, const WCHAR *szVe
TRACE("adding verb %s\n", debugstr_w(szVerb));
- if (!wcsicmp(szVerb, L"open") && !(uFlags & CMF_NODEFAULT)) + if (!_wcsicmp(szVerb, L"open") && !(uFlags & CMF_NODEFAULT)) { /* open verb is always inserted in front */ m_StaticEntries.AddHead({ szVerb, hkeyClass }); diff --git a/dll/win32/shell32/CNewMenu.cpp b/dll/win32/shell32/CNewMenu.cpp index b86f6ecc0c8..bef93ea9860 100644 --- a/dll/win32/shell32/CNewMenu.cpp +++ b/dll/win32/shell32/CNewMenu.cpp @@ -194,7 +194,7 @@ CNewMenu::CacheItems() if (pNewItem) { dwSize += wcslen(wszName) + 1; - if (!m_pLinkItem && wcsicmp(pNewItem->pwszExt, L".lnk") == 0) + if (!m_pLinkItem && _wcsicmp(pNewItem->pwszExt, L".lnk") == 0) { /* The unique link handler */ m_pLinkItem = pNewItem; @@ -277,7 +277,7 @@ CNewMenu::LoadCachedItems() pNewItem = LoadItem(wszName); if (pNewItem) { - if (!m_pLinkItem && wcsicmp(pNewItem->pwszExt, L".lnk") == 0) + if (!m_pLinkItem && _wcsicmp(pNewItem->pwszExt, L".lnk") == 0) { /* The unique link handler */ m_pLinkItem = pNewItem; diff --git a/dll/win32/shell32/COpenWithMenu.cpp b/dll/win32/shell32/COpenWithMenu.cpp index 918d629d524..6fc45cc153b 100644 --- a/dll/win32/shell32/COpenWithMenu.cpp +++ b/dll/win32/shell32/COpenWithMenu.cpp @@ -204,7 +204,7 @@ BOOL COpenWithList::SaveApp(SApp *pApp) COpenWithList::SApp *COpenWithList::Find(LPCWSTR pwszFilename) { for (UINT i = 0; i < m_cApp; ++i) - if (wcsicmp(m_pApp[i].wszFilename, pwszFilename) == 0) + if (_wcsicmp(m_pApp[i].wszFilename, pwszFilename) == 0) return &m_pApp[i]; return NULL; } diff --git a/dll/win32/shell32/CShellLink.cpp b/dll/win32/shell32/CShellLink.cpp index bf2b5be44d5..685391a9262 100644 --- a/dll/win32/shell32/CShellLink.cpp +++ b/dll/win32/shell32/CShellLink.cpp @@ -2989,7 +2989,7 @@ LRESULT CShellLink::OnNotify(HWND hwndDlg, int idFrom, LPNMHDR pnmhdr) PathUnquoteSpacesW(unquoted);
WCHAR *pwszExt = PathFindExtensionW(unquoted); - if (!wcsicmp(pwszExt, L".lnk")) + if (!_wcsicmp(pwszExt, L".lnk")) { // FIXME load localized error msg MessageBoxW(hwndDlg, L"You cannot create a link to a shortcut", L"Error", MB_ICONERROR); diff --git a/dll/win32/shell32/dialogs/dialogs.cpp b/dll/win32/shell32/dialogs/dialogs.cpp index e0689bcfc53..a01a442a500 100644 --- a/dll/win32/shell32/dialogs/dialogs.cpp +++ b/dll/win32/shell32/dialogs/dialogs.cpp @@ -925,7 +925,7 @@ Continue:
if (pszLatest) { - if (wcsicmp(pszCmd, pszLatest) == 0) + if (_wcsicmp(pszCmd, pszLatest) == 0) { SendMessageW(hCb, CB_INSERTSTRING, 0, (LPARAM)pszCmd); SetWindowTextW(hCb, pszCmd); diff --git a/dll/win32/shell32/dialogs/drive.cpp b/dll/win32/shell32/dialogs/drive.cpp index 3bb5fe58c4f..8bade5d68c8 100644 --- a/dll/win32/shell32/dialogs/drive.cpp +++ b/dll/win32/shell32/dialogs/drive.cpp @@ -58,7 +58,7 @@ IsSystemDrive(PFORMAT_DRIVE_CONTEXT pContext) if (!GetEnvironmentVariableW(L"SystemDrive", wszSystemDrv, _countof(wszSystemDrv))) return FALSE;
- if (!wcsicmp(wszDriveLetter, wszSystemDrv)) + if (!_wcsicmp(wszDriveLetter, wszSystemDrv)) return TRUE;
return FALSE; @@ -69,8 +69,8 @@ GetDefaultClusterSize(LPWSTR szFs, PDWORD pClusterSize, PULARGE_INTEGER TotalNum { DWORD ClusterSize;
- if (!wcsicmp(szFs, L"FAT16") || - !wcsicmp(szFs, L"FAT")) // REACTOS HACK + if (!_wcsicmp(szFs, L"FAT16") || + !_wcsicmp(szFs, L"FAT")) // REACTOS HACK { if (TotalNumberOfBytes->QuadPart <= (16 * 1024 * 1024)) ClusterSize = 2048; @@ -93,7 +93,7 @@ GetDefaultClusterSize(LPWSTR szFs, PDWORD pClusterSize, PULARGE_INTEGER TotalNum else return FALSE; } - else if (!wcsicmp(szFs, L"FAT32")) + else if (!_wcsicmp(szFs, L"FAT32")) { if (TotalNumberOfBytes->QuadPart <= (64 * 1024 * 1024)) ClusterSize = 512; @@ -110,7 +110,7 @@ GetDefaultClusterSize(LPWSTR szFs, PDWORD pClusterSize, PULARGE_INTEGER TotalNum else return FALSE; } - else if (!wcsicmp(szFs, L"FATX")) + else if (!_wcsicmp(szFs, L"FATX")) { if (TotalNumberOfBytes->QuadPart <= (16 * 1024 * 1024)) ClusterSize = 2048; @@ -131,7 +131,7 @@ GetDefaultClusterSize(LPWSTR szFs, PDWORD pClusterSize, PULARGE_INTEGER TotalNum else return FALSE; } - else if (!wcsicmp(szFs, L"NTFS")) + else if (!_wcsicmp(szFs, L"NTFS")) { if (TotalNumberOfBytes->QuadPart <= (512 * 1024 * 1024)) ClusterSize = 512; @@ -142,12 +142,12 @@ GetDefaultClusterSize(LPWSTR szFs, PDWORD pClusterSize, PULARGE_INTEGER TotalNum else ClusterSize = 2048; } - else if (!wcsicmp(szFs, L"EXT2")) + else if (!_wcsicmp(szFs, L"EXT2")) { // auto block size calculation ClusterSize = 0; } - else if (!wcsicmp(szFs, L"BtrFS")) + else if (!_wcsicmp(szFs, L"BtrFS")) { // auto block size calculation ClusterSize = 0; @@ -304,24 +304,24 @@ InsertDefaultClusterSizeForFs(HWND hwndDlg, PFORMAT_DRIVE_CONTEXT pContext) if (!GetDiskFreeSpaceExW(szDrive, &FreeBytesAvailableUser, &TotalNumberOfBytes, NULL)) return;
- if (!wcsicmp(wszBuf, L"FAT16") || - !wcsicmp(wszBuf, L"FAT")) // REACTOS HACK + if (!_wcsicmp(wszBuf, L"FAT16") || + !_wcsicmp(wszBuf, L"FAT")) // REACTOS HACK { pwszFsSizeLimit = L"4GB"; } - else if (!wcsicmp(wszBuf, L"FAT32")) + else if (!_wcsicmp(wszBuf, L"FAT32")) { pwszFsSizeLimit = L"32GB"; } - else if (!wcsicmp(wszBuf, L"FATX")) + else if (!_wcsicmp(wszBuf, L"FATX")) { pwszFsSizeLimit = L"1GB/32GB"; } - else if (!wcsicmp(wszBuf, L"NTFS")) + else if (!_wcsicmp(wszBuf, L"NTFS")) { pwszFsSizeLimit = L"256TB"; } - else if (!wcsicmp(wszBuf, L"EXT2")) + else if (!_wcsicmp(wszBuf, L"EXT2")) { pwszFsSizeLimit = L"32TB"; } @@ -330,13 +330,13 @@ InsertDefaultClusterSizeForFs(HWND hwndDlg, PFORMAT_DRIVE_CONTEXT pContext) pwszFsSizeLimit = L"16EB"; }
- if (!wcsicmp(wszBuf, L"FAT16") || - !wcsicmp(wszBuf, L"FAT") || // REACTOS HACK - !wcsicmp(wszBuf, L"FAT32") || - !wcsicmp(wszBuf, L"FATX") || - !wcsicmp(wszBuf, L"NTFS") || - !wcsicmp(wszBuf, L"EXT2") || - !wcsicmp(wszBuf, L"BtrFS")) + if (!_wcsicmp(wszBuf, L"FAT16") || + !_wcsicmp(wszBuf, L"FAT") || // REACTOS HACK + !_wcsicmp(wszBuf, L"FAT32") || + !_wcsicmp(wszBuf, L"FATX") || + !_wcsicmp(wszBuf, L"NTFS") || + !_wcsicmp(wszBuf, L"EXT2") || + !_wcsicmp(wszBuf, L"BtrFS")) { if (!GetDefaultClusterSize(wszBuf, &ClusterSize, &TotalNumberOfBytes)) { @@ -355,7 +355,7 @@ InsertDefaultClusterSizeForFs(HWND hwndDlg, PFORMAT_DRIVE_CONTEXT pContext) SendMessageW(hDlgCtrl, CB_SETCURSEL, 0, 0); }
- if (!wcsicmp(wszBuf, L"NTFS")) + if (!_wcsicmp(wszBuf, L"NTFS")) { ClusterSize = 512; for (lIndex = 0; lIndex < 4; lIndex++) @@ -372,9 +372,9 @@ InsertDefaultClusterSizeForFs(HWND hwndDlg, PFORMAT_DRIVE_CONTEXT pContext) }
SendMessageW(GetDlgItem(hwndDlg, 28675), BM_SETCHECK, BST_UNCHECKED, 0); - if (!wcsicmp(wszBuf, L"EXT2") || - !wcsicmp(wszBuf, L"BtrFS") || - !wcsicmp(wszBuf, L"NTFS")) + if (!_wcsicmp(wszBuf, L"EXT2") || + !_wcsicmp(wszBuf, L"BtrFS") || + !_wcsicmp(wszBuf, L"NTFS")) { /* Enable the "Enable Compression" button */ EnableWindow(GetDlgItem(hwndDlg, 28675), TRUE); @@ -454,7 +454,7 @@ InitializeFormatDriveDlg(HWND hwndDlg, PFORMAT_DRIVE_CONTEXT pContext)
while(QueryAvailableFileSystemFormat(dwIndex, szText, &uMajor, &uMinor, &Latest)) { - if (!wcsicmp(szText, szFs)) + if (!_wcsicmp(szText, szFs)) dwDefault = dwIndex;
SendMessageW(hwndFileSystems, CB_ADDSTRING, 0, (LPARAM)szText); diff --git a/dll/win32/shell32/droptargets/CFSDropTarget.cpp b/dll/win32/shell32/droptargets/CFSDropTarget.cpp index 00c056acd8e..fce1a88d5b8 100644 --- a/dll/win32/shell32/droptargets/CFSDropTarget.cpp +++ b/dll/win32/shell32/droptargets/CFSDropTarget.cpp @@ -613,7 +613,7 @@ HRESULT CFSDropTarget::_DoDrop(IDataObject *pDataObject,
// Check to see if the source is a link BOOL fSourceIsLink = FALSE; - if (!wcsicmp(PathFindExtensionW(targetName), L".lnk") && (att & (SFGAO_FOLDER | SFGAO_STREAM)) != SFGAO_FOLDER) + if (!_wcsicmp(PathFindExtensionW(targetName), L".lnk") && (att & (SFGAO_FOLDER | SFGAO_STREAM)) != SFGAO_FOLDER) { fSourceIsLink = TRUE; PathRemoveExtensionW(wszCombined); diff --git a/dll/win32/shell32/folders/CControlPanelFolder.cpp b/dll/win32/shell32/folders/CControlPanelFolder.cpp index 729112d68e8..f66018e9fd0 100644 --- a/dll/win32/shell32/folders/CControlPanelFolder.cpp +++ b/dll/win32/shell32/folders/CControlPanelFolder.cpp @@ -345,10 +345,10 @@ HRESULT WINAPI CControlPanelFolder::CompareIDs(LPARAM lParam, PCUIDLIST_RELATIVE switch(LOWORD(lParam)) { case CONTROLPANEL_COL_NAME: - result = wcsicmp(pData1->szName + pData1->offsDispName, pData2->szName + pData2->offsDispName); + result = _wcsicmp(pData1->szName + pData1->offsDispName, pData2->szName + pData2->offsDispName); break; case CONTROLPANEL_COL_COMMENT: - result = wcsicmp(pData1->szName + pData1->offsComment, pData2->szName + pData2->offsComment); + result = _wcsicmp(pData1->szName + pData1->offsComment, pData2->szName + pData2->offsComment); break; default: ERR("Got wrong lParam!\n"); diff --git a/dll/win32/shell32/folders/CDrivesFolder.cpp b/dll/win32/shell32/folders/CDrivesFolder.cpp index 56422f83946..83f3d684e98 100644 --- a/dll/win32/shell32/folders/CDrivesFolder.cpp +++ b/dll/win32/shell32/folders/CDrivesFolder.cpp @@ -847,7 +847,7 @@ HRESULT WINAPI CDrivesFolder::CompareIDs(LPARAM lParam, PCUIDLIST_RELATIVE pidl1 { case IDS_SHV_COLUMN_NAME: { - result = stricmp(pszDrive1, pszDrive2); + result = _stricmp(pszDrive1, pszDrive2); hres = MAKE_COMPARE_HRESULT(result); break; } diff --git a/dll/win32/shell32/folders/CFSFolder.cpp b/dll/win32/shell32/folders/CFSFolder.cpp index b3437febae5..25e4a021928 100644 --- a/dll/win32/shell32/folders/CFSFolder.cpp +++ b/dll/win32/shell32/folders/CFSFolder.cpp @@ -1086,7 +1086,7 @@ HRESULT WINAPI CFSFolder::CompareIDs(LPARAM lParam, switch (LOWORD(lParam)) { case SHFSF_COL_NAME: - result = wcsicmp(pDataW1->wszName, pDataW2->wszName); + result = _wcsicmp(pDataW1->wszName, pDataW2->wszName); break; case SHFSF_COL_SIZE: if (pData1->u.file.dwFileSize > pData2->u.file.dwFileSize) @@ -1099,7 +1099,7 @@ HRESULT WINAPI CFSFolder::CompareIDs(LPARAM lParam, case SHFSF_COL_TYPE: pExtension1 = PathFindExtensionW(pDataW1->wszName); pExtension2 = PathFindExtensionW(pDataW2->wszName); - result = wcsicmp(pExtension1, pExtension2); + result = _wcsicmp(pExtension1, pExtension2); break; case SHFSF_COL_MDATE: result = pData1->u.file.uFileDate - pData2->u.file.uFileDate; diff --git a/dll/win32/shell32/folders/CRecycleBin.cpp b/dll/win32/shell32/folders/CRecycleBin.cpp index 32f51b3ba8a..78b3d033ba2 100644 --- a/dll/win32/shell32/folders/CRecycleBin.cpp +++ b/dll/win32/shell32/folders/CRecycleBin.cpp @@ -546,10 +546,10 @@ HRESULT WINAPI CRecycleBin::CompareIDs(LPARAM lParam, PCUIDLIST_RELATIVE pidl1, case 0: /* Name */ pName1 = PathFindFileNameW(pData1->szName); pName2 = PathFindFileNameW(pData2->szName); - result = wcsicmp(pName1, pName2); + result = _wcsicmp(pName1, pName2); break; case 1: /* Orig. Location */ - result = wcsicmp(pData1->szName, pData2->szName); + result = _wcsicmp(pData1->szName, pData2->szName); break; case 2: /* Date Deleted */ result = CompareFileTime(&pData1->DeletionTime, &pData2->DeletionTime); @@ -560,7 +560,7 @@ HRESULT WINAPI CRecycleBin::CompareIDs(LPARAM lParam, PCUIDLIST_RELATIVE pidl1, case 4: /* Type */ pName1 = PathFindExtensionW(pData1->szName); pName2 = PathFindExtensionW(pData2->szName); - result = wcsicmp(pName1, pName2); + result = _wcsicmp(pName1, pName2); break; case 5: /* Modified */ result = CompareFileTime(&pData1->LastModification, &pData2->LastModification); diff --git a/dll/win32/shell32/iconcache.cpp b/dll/win32/shell32/iconcache.cpp index 99af8f91eab..9fb41f9389c 100644 --- a/dll/win32/shell32/iconcache.cpp +++ b/dll/win32/shell32/iconcache.cpp @@ -74,7 +74,7 @@ static INT CALLBACK SIC_CompareEntries( LPVOID p1, LPVOID p2, LPARAM lparam) if ((e1->dwFlags & GIL_FORSHORTCUT) != (e2->dwFlags & GIL_FORSHORTCUT)) return ((e1->dwFlags & GIL_FORSHORTCUT) < (e2->dwFlags & GIL_FORSHORTCUT)) ? -1 : 1;
- return wcsicmp(e1->sSourceFile,e2->sSourceFile); + return _wcsicmp(e1->sSourceFile,e2->sSourceFile); }
/* declare SIC_LoadOverlayIcon() */ diff --git a/dll/win32/shell32/shlexec.cpp b/dll/win32/shell32/shlexec.cpp index 087bce23a18..2e1d0e2a443 100644 --- a/dll/win32/shell32/shlexec.cpp +++ b/dll/win32/shell32/shlexec.cpp @@ -844,7 +844,7 @@ static UINT SHELL_FindExecutable(LPCWSTR lpPath, LPCWSTR lpFile, LPCWSTR lpVerb, while (*p == ' ' || *p == '\t') p++; }
- if (wcsicmp(tok, &extension[1]) == 0) /* have to skip the leading "." */ + if (_wcsicmp(tok, &extension[1]) == 0) /* have to skip the leading "." */ { wcscpy(lpResult, xlpFile); /* Need to perhaps check that the file has a path diff --git a/dll/win32/shell32/shlfolder.cpp b/dll/win32/shell32/shlfolder.cpp index 1d32793d746..37658ced2aa 100644 --- a/dll/win32/shell32/shlfolder.cpp +++ b/dll/win32/shell32/shlfolder.cpp @@ -295,7 +295,7 @@ HRESULT SHELL32_CompareDetails(IShellFolder2* isf, LPARAM lParam, LPCITEMIDLIST if (FAILED(hres)) return MAKE_COMPARE_HRESULT(1);
- int ret = wcsicmp(wszItem1, wszItem2); + int ret = _wcsicmp(wszItem1, wszItem2); if (ret == 0) return SHELL32_CompareChildren(isf, lParam, pidl1, pidl2);
diff --git a/dll/win32/syssetup/install.c b/dll/win32/syssetup/install.c index fe2ccf89394..e7ba620479a 100644 --- a/dll/win32/syssetup/install.c +++ b/dll/win32/syssetup/install.c @@ -848,7 +848,7 @@ IsConsoleBoot(VOID) pwszNextOption = wcschr(pwszCurrentOption, L' '); if (pwszNextOption) *pwszNextOption = L'\0'; - if (wcsicmp(pwszCurrentOption, L"CONSOLE") == 0) + if (_wcsicmp(pwszCurrentOption, L"CONSOLE") == 0) { DPRINT("Found %S. Switching to console boot\n", pwszCurrentOption); bConsoleBoot = TRUE; diff --git a/dll/win32/winmm/registry.c b/dll/win32/winmm/registry.c index 563c63f84bb..f548bdd7691 100644 --- a/dll/win32/winmm/registry.c +++ b/dll/win32/winmm/registry.c @@ -60,7 +60,7 @@ BOOL LoadRegistryMMEDrivers(char* key) /* We look for mappers first so they don't match something else later on! */
- if ( ! stricmp("wavemapper", value_name) ) + if ( ! _stricmp("wavemapper", value_name) ) { TRACE("Found a Wave-mapper: %s\n", value_data); /* Delay loading Wave mapper driver */ @@ -68,7 +68,7 @@ BOOL LoadRegistryMMEDrivers(char* key) is_mapper = TRUE; driver_count ++; } - else if ( ! stricmp("midimapper", value_name) ) + else if ( ! _stricmp("midimapper", value_name) ) { TRACE("Found a MIDI-mapper: %s\n", value_data); /* Delay loading MIDI mapper driver */ diff --git a/drivers/ksfilter/ks/api.c b/drivers/ksfilter/ks/api.c index d32b54e2535..cc1fd3dd7c7 100644 --- a/drivers/ksfilter/ks/api.c +++ b/drivers/ksfilter/ks/api.c @@ -777,7 +777,7 @@ KspAddObjectCreateItemToList( return STATUS_SUCCESS; }
- if (!wcsicmp(ObjectClass, CreateEntry->CreateItem->ObjectClass.Buffer)) + if (!_wcsicmp(ObjectClass, CreateEntry->CreateItem->ObjectClass.Buffer)) { /* the same object class already exists */ return STATUS_OBJECT_NAME_COLLISION; diff --git a/drivers/ksfilter/ks/swenum.c b/drivers/ksfilter/ks/swenum.c index 1e5738f8581..c4e05151f6d 100644 --- a/drivers/ksfilter/ks/swenum.c +++ b/drivers/ksfilter/ks/swenum.c @@ -372,7 +372,7 @@ KspCreateDeviceReference( DeviceEntry = (PBUS_DEVICE_ENTRY)CONTAINING_RECORD(Entry, BUS_DEVICE_ENTRY, Entry);
/* check if name matches */ - if (!wcsicmp(DeviceEntry->DeviceName, DeviceName)) + if (!_wcsicmp(DeviceEntry->DeviceName, DeviceName)) { /* item already exists */ ItemExists = TRUE; @@ -1941,7 +1941,7 @@ KsServiceBusEnumCreateRequest( DeviceEntry = (PBUS_DEVICE_ENTRY)CONTAINING_RECORD(Entry, BUS_DEVICE_ENTRY, Entry);
/* check if name matches */ - if (!wcsicmp(DeviceEntry->DeviceName, IoStack->FileObject->FileName.Buffer + 1)) + if (!_wcsicmp(DeviceEntry->DeviceName, IoStack->FileObject->FileName.Buffer + 1)) { /* item already exists */ ItemExists = TRUE; diff --git a/drivers/sac/driver/chanmgr.c b/drivers/sac/driver/chanmgr.c index cf2947f9165..1eeb7386096 100644 --- a/drivers/sac/driver/chanmgr.c +++ b/drivers/sac/driver/chanmgr.c @@ -179,7 +179,7 @@ ChanMgrGetChannelByName(IN PWCHAR Name, ASSERT(NT_SUCCESS(Status1));
/* Check if this is the name that was passed in */ - Found = wcsicmp(Name, ChannelName); + Found = _wcsicmp(Name, ChannelName); SacFreePool(ChannelName); if (Found) { diff --git a/modules/rosapps/applications/cmdutils/gflags/imagefile.c b/modules/rosapps/applications/cmdutils/gflags/imagefile.c index ba51c501d6e..3f6657218b7 100644 --- a/modules/rosapps/applications/cmdutils/gflags/imagefile.c +++ b/modules/rosapps/applications/cmdutils/gflags/imagefile.c @@ -122,7 +122,7 @@ static DWORD FindFlag(PCWSTR Name, WORD Dest) { if (g_Flags[n].wDest & Dest) { - if (!wcsicmp(Name, g_Flags[n].szAbbr)) + if (!_wcsicmp(Name, g_Flags[n].szAbbr)) { return g_Flags[n].dwFlag; } diff --git a/modules/rosapps/applications/devutils/shlextdbg/shlextdbg.cpp b/modules/rosapps/applications/devutils/shlextdbg/shlextdbg.cpp index 090c0b501bc..233d661bbeb 100644 --- a/modules/rosapps/applications/devutils/shlextdbg/shlextdbg.cpp +++ b/modules/rosapps/applications/devutils/shlextdbg/shlextdbg.cpp @@ -314,15 +314,15 @@ static HRESULT AssocQ(int argc, WCHAR **argv) return ErrMsg(hr);
DWORD size = maxSize; - if (!wcsicmp(argv[1], L"string")) + if (!_wcsicmp(argv[1], L"string")) { - if (!wcsicmp(argv[2], L"COMMAND")) + if (!_wcsicmp(argv[2], L"COMMAND")) qtype = ASSOCSTR_COMMAND; - if (!wcsicmp(argv[2], L"EXECUTABLE")) + if (!_wcsicmp(argv[2], L"EXECUTABLE")) qtype = ASSOCSTR_EXECUTABLE; - if (!wcsicmp(argv[2], L"FRIENDLYDOCNAME") || !wcsicmp(argv[2], L"FriendlyTypeName")) + if (!_wcsicmp(argv[2], L"FRIENDLYDOCNAME") || !_wcsicmp(argv[2], L"FriendlyTypeName")) qtype = ASSOCSTR_FRIENDLYDOCNAME; - if (!wcsicmp(argv[2], L"DEFAULTICON")) + if (!_wcsicmp(argv[2], L"DEFAULTICON")) qtype = ASSOCSTR_DEFAULTICON;
buf[0] = UNICODE_NULL; @@ -340,11 +340,11 @@ static HRESULT AssocQ(int argc, WCHAR **argv) ErrMsg(hr); } } - else if (!wcsicmp(argv[1], L"data")) + else if (!_wcsicmp(argv[1], L"data")) { - if (!wcsicmp(argv[2], L"EDITFLAGS")) + if (!_wcsicmp(argv[2], L"EDITFLAGS")) qtype = ASSOCDATA_EDITFLAGS; - if (!wcsicmp(argv[2], L"VALUE")) + if (!_wcsicmp(argv[2], L"VALUE")) qtype = ASSOCDATA_VALUE;
hr = qa->GetData(qflags, (ASSOCDATA)qtype, extra, buf, &size); @@ -359,7 +359,7 @@ static HRESULT AssocQ(int argc, WCHAR **argv) ErrMsg(hr); } } - else if (!wcsicmp(argv[1], L"key")) + else if (!_wcsicmp(argv[1], L"key")) { HKEY hKey = NULL; hr = qa->GetKey(qflags, (ASSOCKEY)qtype, extra, &hKey); @@ -632,7 +632,7 @@ static bool isCmdWithArg(int argc, WCHAR** argv, int& n, PCWSTR check, PCWSTR &a
static bool isCmd(int argc, WCHAR** argv, int n, PCWSTR check) { - return !wcsicmp(argv[n] + 1, check); + return !_wcsicmp(argv[n] + 1, check); }
extern "C" // and another hack for gcc diff --git a/modules/rosapps/applications/sysutils/utils/pnpdump/pnpdump.c b/modules/rosapps/applications/sysutils/utils/pnpdump/pnpdump.c index 542eb0c461e..3fa8fd6b52b 100644 --- a/modules/rosapps/applications/sysutils/utils/pnpdump/pnpdump.c +++ b/modules/rosapps/applications/sysutils/utils/pnpdump/pnpdump.c @@ -301,7 +301,7 @@ GetPnpKey(PHKEY PnpKey) return lError; }
- if (dwType == REG_SZ && stricmp(szBuffer, "pnp bios") == 0) + if (dwType == REG_SZ && _stricmp(szBuffer, "pnp bios") == 0) { *PnpKey = hBusKey; RegCloseKey(hAdapterKey); diff --git a/modules/rostests/apitests/apphelp/db.cpp b/modules/rostests/apitests/apphelp/db.cpp index 7dc5427846b..cc7116af530 100644 --- a/modules/rostests/apitests/apphelp/db.cpp +++ b/modules/rostests/apitests/apphelp/db.cpp @@ -574,7 +574,7 @@ static void test_stringtable() size = pSdbGetTagDataSize(pdb, tagstr); ok(size == 4, "Expected datasize to be 4, was %u for %u/%u\n", size, j, n); data = pSdbGetStringTagPtr(pdb, tagstr); - ok(data && !wcsicmp(data, all[j]), "Expected data to be %s was %s for %u/%u\n", wine_dbgstr_w(all[j]), wine_dbgstr_w(data), j, n); + ok(data && !_wcsicmp(data, all[j]), "Expected data to be %s was %s for %u/%u\n", wine_dbgstr_w(all[j]), wine_dbgstr_w(data), j, n); } tagstr = pSdbFindNextTag(pdb, TAGID_ROOT, tagstr); } @@ -600,7 +600,7 @@ static void test_stringtable() expected_size = (lstrlenW(all[j])+1) * 2; ok(size == expected_size, "Expected datasize to be %u, was %u for %u/%u\n", expected_size, size, j, n); data = pSdbGetStringTagPtr(pdb, tagstr); - ok(data && !wcsicmp(data, all[j]), "Expected data to be %s was %s for %u/%u\n", wine_dbgstr_w(all[j]), wine_dbgstr_w(data), j, n); + ok(data && !_wcsicmp(data, all[j]), "Expected data to be %s was %s for %u/%u\n", wine_dbgstr_w(all[j]), wine_dbgstr_w(data), j, n); } tagstr = pSdbFindNextTag(pdb, TAGID_ROOT, tagstr); } @@ -1489,8 +1489,8 @@ static void test_match_ex(const WCHAR* workdir, HSDB hsdb) Vendor = pSdbGetStringTagPtr(pdb, tagid); if (!Vendor) continue; - Succeed = !wcsicmp(Vendor, L"Succeed"); - if (!Succeed && wcsicmp(Vendor, L"Fail")) + Succeed = !_wcsicmp(Vendor, L"Succeed"); + if (!Succeed && _wcsicmp(Vendor, L"Fail")) continue; tagid = pSdbFindFirstTag(pdb, exetag, TAG_APP_NAME); AppName = pSdbGetStringTagPtr(pdb, tagid); diff --git a/modules/rostests/apitests/browseui/SHExplorerParseCmdLine.c b/modules/rostests/apitests/browseui/SHExplorerParseCmdLine.c index 408d9574343..652c481fbca 100644 --- a/modules/rostests/apitests/browseui/SHExplorerParseCmdLine.c +++ b/modules/rostests/apitests/browseui/SHExplorerParseCmdLine.c @@ -164,7 +164,7 @@ _Out_opt_ PUINT PWriteEnd)
if (ExpectedCsidl == PIDL_PATH_EQUALS_PATH) { - ok(wcsicmp(pidlPathName, pidlPathTest) == 0, "Line %lu: Path from pidl does not match; pidlPathName=%S\n", TestLine, pidlPathName); + ok(_wcsicmp(pidlPathName, pidlPathTest) == 0, "Line %lu: Path from pidl does not match; pidlPathName=%S\n", TestLine, pidlPathName); } else if (ExpectedCsidl == PIDL_IS_EMPTY) { diff --git a/modules/rostests/apitests/com/com_apitest.c b/modules/rostests/apitests/com/com_apitest.c index 1241f823fa5..7130728b89b 100644 --- a/modules/rostests/apitests/com/com_apitest.c +++ b/modules/rostests/apitests/com/com_apitest.c @@ -688,7 +688,7 @@ TestModuleRegistry( // TODO: Use SearchPath (or assume everything's in system32) and do a proper full path compare PathStripPathW(data); PathRemoveExtensionW(data); - ok(!wcsicmp(data, ModuleName), "Server is %ls, expected %ls for %s\n", data, ModuleName, class->name); + ok(!_wcsicmp(data, ModuleName), "Server is %ls, expected %ls for %s\n", data, ModuleName, class->name); }
dataSize = sizeof(data); @@ -703,7 +703,7 @@ TestModuleRegistry( expectedThreadingModel = class->ThreadingModel; if (!expectedThreadingModel) expectedThreadingModel = L"Apartment"; - ok(!wcsicmp(data, expectedThreadingModel), "Server is %ls, expected %ls for %s\n", data, expectedThreadingModel, class->name); + ok(!_wcsicmp(data, expectedThreadingModel), "Server is %ls, expected %ls for %s\n", data, expectedThreadingModel, class->name); }
RegCloseKey(hKeyServer); @@ -829,7 +829,7 @@ TestInterfaceRegistry( expectedName++; else expectedName = iface->wname; - ok(!wcsicmp(data, expectedName), "Name is %ls, expected %ls\n", data, expectedName); + ok(!_wcsicmp(data, expectedName), "Name is %ls, expected %ls\n", data, expectedName); }
RegCloseKey(hKey); diff --git a/modules/rostests/apitests/kernel32/dosdev.c b/modules/rostests/apitests/kernel32/dosdev.c index 3d68d812ba3..f7526cc078b 100644 --- a/modules/rostests/apitests/kernel32/dosdev.c +++ b/modules/rostests/apitests/kernel32/dosdev.c @@ -360,7 +360,7 @@ static void test_QueryDosDeviceA(void) Result = QueryDosDeviceA(SUBST_DRIVE, Buffer, MAX_PATH); ok(Result, "failed to get target path\n"); ok(_strnicmp(Buffer, "\??\", 4) == 0, "The target returned does have correct prefix set\n"); - ok(stricmp(&Buffer[4], Target) == 0, "The target returned does not match the one set\n"); + ok(_stricmp(&Buffer[4], Target) == 0, "The target returned does not match the one set\n"); Result = DefineDosDeviceA(DDD_REMOVE_DEFINITION | DDD_EXACT_MATCH_ON_REMOVE, SUBST_DRIVE, Target); ok(Result, "Failed to remove subst drive using lowercase drive letter\n"); Result = QueryDosDeviceA(SUBST_DRIVE, Buffer, MAX_PATH); diff --git a/modules/rostests/apitests/localspl/service.c b/modules/rostests/apitests/localspl/service.c index 3a114d4c5cc..db05dcc3b44 100644 --- a/modules/rostests/apitests/localspl/service.c +++ b/modules/rostests/apitests/localspl/service.c @@ -73,7 +73,7 @@ _DoDLLInjection() do { // Check if this is the spooler server process. - if (wcsicmp(pe.szExeFile, L"spoolsv.exe") != 0) + if (_wcsicmp(pe.szExeFile, L"spoolsv.exe") != 0) continue;
// Open a handle to the process. diff --git a/modules/rostests/apitests/shell32/CIDLData.cpp b/modules/rostests/apitests/shell32/CIDLData.cpp index 28fa0d2aef8..100b0ed2ef6 100644 --- a/modules/rostests/apitests/shell32/CIDLData.cpp +++ b/modules/rostests/apitests/shell32/CIDLData.cpp @@ -61,7 +61,7 @@ static void TestAdviseAndCanonical(PCIDLIST_ABSOLUTE pidlFolder, UINT cidl, PCUI
#define ok_wstri(x, y) \ - ok(wcsicmp(x, y) == 0, "Wrong string. Expected '%S', got '%S'\n", y, x) + ok(_wcsicmp(x, y) == 0, "Wrong string. Expected '%S', got '%S'\n", y, x)
static void TestHIDA(PVOID pData, SIZE_T Size, LPCWSTR ExpectRoot, LPCWSTR ExpectPath1, LPCWSTR ExpectPath2) { diff --git a/modules/rostests/apitests/shell32/CShellLink.cpp b/modules/rostests/apitests/shell32/CShellLink.cpp index 43a8d645449..d7a826d8d0d 100644 --- a/modules/rostests/apitests/shell32/CShellLink.cpp +++ b/modules/rostests/apitests/shell32/CShellLink.cpp @@ -148,7 +148,7 @@ static WCHAR evVar[MAX_PATH]; ok(hr == expectedHr, "IShellLink::GetPath(%d), flags 0x%lx, got hr = 0x%lx, expected 0x%lx\n", i, flags, hr, expectedHr); - ok(wcsicmp(wPathOut, expectedPathOut) == 0, + ok(_wcsicmp(wPathOut, expectedPathOut) == 0, "IShellLink::GetPath(%d), flags 0x%lx, in %S, got %S, expected %S\n", i, flags, testDef->pathIn, wPathOut, expectedPathOut); } diff --git a/modules/rostests/apitests/shell32/SHCreateDataObject.cpp b/modules/rostests/apitests/shell32/SHCreateDataObject.cpp index 847986171b2..4247e555a0e 100644 --- a/modules/rostests/apitests/shell32/SHCreateDataObject.cpp +++ b/modules/rostests/apitests/shell32/SHCreateDataObject.cpp @@ -64,7 +64,7 @@ static void TestAdviseAndCanonical(PCIDLIST_ABSOLUTE pidlFolder, UINT cidl, PCUI
#define ok_wstri(x, y) \ - ok(wcsicmp(x, y) == 0, "Wrong string. Expected '%S', got '%S'\n", y, x) + ok(_wcsicmp(x, y) == 0, "Wrong string. Expected '%S', got '%S'\n", y, x)
static void TestHIDA(PVOID pData, SIZE_T Size, LPCWSTR ExpectRoot, LPCWSTR ExpectPath1, LPCWSTR ExpectPath2) { diff --git a/modules/rostests/apitests/shell32/SHCreateFileDataObject.cpp b/modules/rostests/apitests/shell32/SHCreateFileDataObject.cpp index 697650d51d2..6262b013476 100644 --- a/modules/rostests/apitests/shell32/SHCreateFileDataObject.cpp +++ b/modules/rostests/apitests/shell32/SHCreateFileDataObject.cpp @@ -66,7 +66,7 @@ static void TestAdviseAndCanonical(PCIDLIST_ABSOLUTE pidlFolder, UINT cidl, PCUI
#define ok_wstri(x, y) \ - ok(wcsicmp(x, y) == 0, "Wrong string. Expected '%S', got '%S'\n", y, x) + ok(_wcsicmp(x, y) == 0, "Wrong string. Expected '%S', got '%S'\n", y, x)
static void TestHIDA(PVOID pData, SIZE_T Size, LPCWSTR ExpectRoot, LPCWSTR ExpectPath1, LPCWSTR ExpectPath2) { diff --git a/modules/rostests/apitests/zipfldr/EnumParentDir.cpp b/modules/rostests/apitests/zipfldr/EnumParentDir.cpp index 71f0352dad4..e5a4b70fc9f 100644 --- a/modules/rostests/apitests/zipfldr/EnumParentDir.cpp +++ b/modules/rostests/apitests/zipfldr/EnumParentDir.cpp @@ -40,7 +40,7 @@ void FindExpectedFile(FileInfo* Array, size_t len, IShellFolder* pFolder, PCUITE
for (size_t n = 0; n < len; ++n) { - if (!wcsicmp(Array[n].Name, DisplayName) && !Array[n].Found) + if (!_wcsicmp(Array[n].Name, DisplayName) && !Array[n].Found) { Array[n].Found = true; ExpectedName = Array[n].Name; @@ -98,7 +98,7 @@ test_EnumDirFiles(const WCHAR *TestFolder, BOOL EnumFolders) SFGAOF Attributes = SFGAO_FILESYSANCESTOR | SFGAO_FOLDER | SFGAO_FILESYSTEM | SFGAO_HASSUBFOLDER; hr = spFolder->GetAttributesOf(1, &child, &Attributes);
- if (!wcsicmp(ExpectedName, L"TMP0.zip")) + if (!_wcsicmp(ExpectedName, L"TMP0.zip")) { // We allow both .zip files being a 'file' (2k3) or a 'folder' (win10) if (Attributes & SFGAO_FOLDER) diff --git a/sdk/lib/drivers/sound/mmixer/sup.c b/sdk/lib/drivers/sound/mmixer/sup.c index cfd5ab8b0b1..9b6852a4d23 100644 --- a/sdk/lib/drivers/sound/mmixer/sup.c +++ b/sdk/lib/drivers/sound/mmixer/sup.c @@ -202,7 +202,7 @@ MMixerGetMixerByName( MixerInfo = (LPMIXER_INFO)CONTAINING_RECORD(Entry, MIXER_INFO, Entry);
DPRINT1("MixerName %S MixerName %S\n", MixerInfo->MixCaps.szPname, MixerName); - if (wcsicmp(MixerInfo->MixCaps.szPname, MixerName) == 0) + if (_wcsicmp(MixerInfo->MixCaps.szPname, MixerName) == 0) { *OutMixerInfo = MixerInfo; return MM_STATUS_SUCCESS; @@ -764,7 +764,7 @@ MMixerGetDataByDeviceName( while(Entry != &MixerList->MixerData) { MixerData = (LPMIXER_DATA)CONTAINING_RECORD(Entry, MIXER_DATA, Entry); - if (wcsicmp(&DeviceName[2], &MixerData->DeviceName[2]) == 0) + if (_wcsicmp(&DeviceName[2], &MixerData->DeviceName[2]) == 0) { /* found entry */ return MixerData; diff --git a/win32ss/gdi/ntgdi/gdikdbgext.c b/win32ss/gdi/ntgdi/gdikdbgext.c index 53c7e04eb01..70db4b48e73 100644 --- a/win32ss/gdi/ntgdi/gdikdbgext.c +++ b/win32ss/gdi/ntgdi/gdikdbgext.c @@ -119,7 +119,7 @@ KdbCommand_Gdi_dumpht(ULONG argc, char *argv[]) for (i = 0; i <= GDIObjType_MAX_TYPE + 1; i++) { /* Check if this object type was requested */ - if (stricmp(argv[0], gpszObjectTypes[i]) == 0) break; + if (_stricmp(argv[0], gpszObjectTypes[i]) == 0) break; }
/* Check if we didn't find it yet */ @@ -327,28 +327,28 @@ DbgGdiKdbgCliCallback( IN PCH argv[]) {
- if (stricmp(argv[0], "!gdi.help") == 0) + if (_stricmp(argv[0], "!gdi.help") == 0) { KdbCommand_Gdi_help(); } - else if (stricmp(argv[0], "!gdi.dumpht") == 0) + else if (_stricmp(argv[0], "!gdi.dumpht") == 0) { KdbCommand_Gdi_dumpht(argc - 1, argv + 1); } - else if (stricmp(argv[0], "!gdi.handle") == 0) + else if (_stricmp(argv[0], "!gdi.handle") == 0) { KdbCommand_Gdi_handle(argv[1]); } - else if (stricmp(argv[0], "!gdi.entry") == 0) + else if (_stricmp(argv[0], "!gdi.entry") == 0) { KdbCommand_Gdi_entry(argv[1]); } - else if (stricmp(argv[0], "!gdi.baseobject") == 0) + else if (_stricmp(argv[0], "!gdi.baseobject") == 0) { KdbCommand_Gdi_baseobject(argv[1]); } #if DBG_ENABLE_EVENT_LOGGING - else if (stricmp(argv[0], "!gdi.eventlist") == 0) + else if (_stricmp(argv[0], "!gdi.eventlist") == 0) { KdbCommand_Gdi_eventlist(argv[1]); } diff --git a/win32ss/gdi/ntgdi/text.c b/win32ss/gdi/ntgdi/text.c index 3b348a371d7..3fe1ceec466 100644 --- a/win32ss/gdi/ntgdi/text.c +++ b/win32ss/gdi/ntgdi/text.c @@ -42,14 +42,14 @@ IntTMWFixUp( * out the problematic TrueType and Vector bits. * Our list below checks for Raster Font Facenames. */ DPRINT("Font Facename is '%S'.\n", lf.lfFaceName); - if ((wcsicmp(lf.lfFaceName, L"Courier") == 0) || - (wcsicmp(lf.lfFaceName, L"FixedSys") == 0) || - (wcsicmp(lf.lfFaceName, L"Helv") == 0) || - (wcsicmp(lf.lfFaceName, L"MS Sans Serif") == 0) || - (wcsicmp(lf.lfFaceName, L"MS Serif") == 0) || - (wcsicmp(lf.lfFaceName, L"System") == 0) || - (wcsicmp(lf.lfFaceName, L"Terminal") == 0) || - (wcsicmp(lf.lfFaceName, L"Tms Rmn") == 0)) + if ((_wcsicmp(lf.lfFaceName, L"Courier") == 0) || + (_wcsicmp(lf.lfFaceName, L"FixedSys") == 0) || + (_wcsicmp(lf.lfFaceName, L"Helv") == 0) || + (_wcsicmp(lf.lfFaceName, L"MS Sans Serif") == 0) || + (_wcsicmp(lf.lfFaceName, L"MS Serif") == 0) || + (_wcsicmp(lf.lfFaceName, L"System") == 0) || + (_wcsicmp(lf.lfFaceName, L"Terminal") == 0) || + (_wcsicmp(lf.lfFaceName, L"Tms Rmn") == 0)) { ptm->TextMetric.tmPitchAndFamily &= ~(TMPF_TRUETYPE | TMPF_VECTOR); } diff --git a/win32ss/printing/base/winspool/printerdata.c b/win32ss/printing/base/winspool/printerdata.c index d49733d0438..c113cf4c840 100644 --- a/win32ss/printing/base/winspool/printerdata.c +++ b/win32ss/printing/base/winspool/printerdata.c @@ -399,12 +399,12 @@ GetPrinterDataExA(HANDLE hPrinter, LPCSTR pKeyName, LPCSTR pValueName, LPDWORD p } else if (*pType == REG_NONE) { - if (cbUnicodeData == sizeof(OSVERSIONINFOW) && wcsicmp(pwszValueName, SPLREG_OS_VERSION) == 0) + if (cbUnicodeData == sizeof(OSVERSIONINFOW) && _wcsicmp(pwszValueName, SPLREG_OS_VERSION) == 0) { // This is a Unicode OSVERSIONINFOW structure that needs to be converted to an ANSI OSVERSIONINFOA. *pcbNeeded = sizeof(OSVERSIONINFOA); } - else if (cbUnicodeData == sizeof(OSVERSIONINFOEXW) && wcsicmp(pwszValueName, SPLREG_OS_VERSIONEX) == 0) + else if (cbUnicodeData == sizeof(OSVERSIONINFOEXW) && _wcsicmp(pwszValueName, SPLREG_OS_VERSIONEX) == 0) { // This is a Unicode OSVERSIONINFOEXW structure that needs to be converted to an ANSI OSVERSIONINFOEXA. *pcbNeeded = sizeof(OSVERSIONINFOEXA); diff --git a/win32ss/printing/base/winspool/printers.c b/win32ss/printing/base/winspool/printers.c index 6f22ce57bc0..8e10c2e682e 100644 --- a/win32ss/printing/base/winspool/printers.c +++ b/win32ss/printing/base/winspool/printers.c @@ -3600,7 +3600,7 @@ StartDocDlgW( HANDLE hPrinter, DOCINFOW *doc ) }
GetPrinterW(hPrinter, 5, (LPBYTE)pi5, len, &len); - if (!pi5->pPortName || wcsicmp(pi5->pPortName, FILE_Port)) + if (!pi5->pPortName || _wcsicmp(pi5->pPortName, FILE_Port)) { HeapFree(GetProcessHeap(), 0, pi5); return NULL; @@ -3608,7 +3608,7 @@ StartDocDlgW( HANDLE hPrinter, DOCINFOW *doc ) HeapFree(GetProcessHeap(), 0, pi5); }
- if (doc->lpszOutput == NULL || !wcsicmp(doc->lpszOutput, FILE_Port)) + if (doc->lpszOutput == NULL || !_wcsicmp(doc->lpszOutput, FILE_Port)) { LPWSTR name;
diff --git a/win32ss/printing/monitors/localmon/tools.c b/win32ss/printing/monitors/localmon/tools.c index 93422250f24..e4c15e81125 100644 --- a/win32ss/printing/monitors/localmon/tools.c +++ b/win32ss/printing/monitors/localmon/tools.c @@ -64,7 +64,7 @@ DoesPortExist(PCWSTR pwszPortName) for (i = 0; i < dwReturned; i++) { // Check if this existing port matches our queried one. - if (wcsicmp(p->pName, pwszPortName) == 0) + if (_wcsicmp(p->pName, pwszPortName) == 0) { bReturnValue = TRUE; goto Cleanup; diff --git a/win32ss/printing/monitors/localmon/ui/localui.c b/win32ss/printing/monitors/localmon/ui/localui.c index f548f55c2e8..cc49f777698 100644 --- a/win32ss/printing/monitors/localmon/ui/localui.c +++ b/win32ss/printing/monitors/localmon/ui/localui.c @@ -424,7 +424,7 @@ static DWORD get_type_from_name(LPCWSTR name) if (!_wcsnicmp(name, portname_COM, ARRAY_SIZE(portname_COM) -1)) return PORT_IS_COM;
- if (!wcsicmp(name, portname_FILE)) + if (!_wcsicmp(name, portname_FILE)) return PORT_IS_FILE;
if (name[0] == '/') diff --git a/win32ss/printing/processors/winprint/main.c b/win32ss/printing/processors/winprint/main.c index 4bbe3d6cc54..8f92219e9a3 100644 --- a/win32ss/printing/processors/winprint/main.c +++ b/win32ss/printing/processors/winprint/main.c @@ -206,7 +206,7 @@ OpenPrintProcessor(PWSTR pPrinterName, PPRINTPROCESSOROPENDATA pPrintProcessorOp pHandle = DllAllocSplMem(sizeof(WINPRINT_HANDLE));
// Check what datatype was given. - if (wcsicmp(pPrintProcessorOpenData->pDatatype, L"RAW") == 0) + if (_wcsicmp(pPrintProcessorOpenData->pDatatype, L"RAW") == 0) { pHandle->Datatype = RAW; } diff --git a/win32ss/printing/providers/localspl/jobs.c b/win32ss/printing/providers/localspl/jobs.c index d47736d152a..99e326ab815 100644 --- a/win32ss/printing/providers/localspl/jobs.c +++ b/win32ss/printing/providers/localspl/jobs.c @@ -205,7 +205,7 @@ InitializeGlobalJobList(void) if (!IS_VALID_JOB_ID(dwJobID)) continue;
- if (wcsicmp(p, L".SHD") != 0) + if (_wcsicmp(p, L".SHD") != 0) continue;
// This shadow file has a valid name. Construct the full path and try to load it. diff --git a/win32ss/printing/providers/localspl/printerdata.c b/win32ss/printing/providers/localspl/printerdata.c index 27c0f7228e1..a9f53fc68b7 100644 --- a/win32ss/printing/providers/localspl/printerdata.c +++ b/win32ss/printing/providers/localspl/printerdata.c @@ -83,17 +83,17 @@ _LocalGetPrintServerHandleData(PCWSTR pValueName, PDWORD pType, PBYTE pData, DWO { DWORD dwErrorCode;
- if (wcsicmp(pValueName, SPLREG_DEFAULT_SPOOL_DIRECTORY) == 0 || - wcsicmp(pValueName, SPLREG_PORT_THREAD_PRIORITY) == 0 || - wcsicmp(pValueName, SPLREG_SCHEDULER_THREAD_PRIORITY) == 0 || - wcsicmp(pValueName, SPLREG_BEEP_ENABLED) == 0 || - wcsicmp(pValueName, SPLREG_ALLOW_USER_MANAGEFORMS) == 0) + if (_wcsicmp(pValueName, SPLREG_DEFAULT_SPOOL_DIRECTORY) == 0 || + _wcsicmp(pValueName, SPLREG_PORT_THREAD_PRIORITY) == 0 || + _wcsicmp(pValueName, SPLREG_SCHEDULER_THREAD_PRIORITY) == 0 || + _wcsicmp(pValueName, SPLREG_BEEP_ENABLED) == 0 || + _wcsicmp(pValueName, SPLREG_ALLOW_USER_MANAGEFORMS) == 0) { *pcbNeeded = nSize; return (DWORD)RegQueryValueExW(hPrintersKey, pValueName, NULL, pType, pData, pcbNeeded); } - else if (wcsicmp(pValueName, SPLREG_PORT_THREAD_PRIORITY_DEFAULT) == 0 || - wcsicmp(pValueName, SPLREG_SCHEDULER_THREAD_PRIORITY_DEFAULT) == 0) + else if (_wcsicmp(pValueName, SPLREG_PORT_THREAD_PRIORITY_DEFAULT) == 0 || + _wcsicmp(pValueName, SPLREG_SCHEDULER_THREAD_PRIORITY_DEFAULT) == 0) { // Store a DWORD value as REG_NONE. *pType = REG_NONE; @@ -105,12 +105,12 @@ _LocalGetPrintServerHandleData(PCWSTR pValueName, PDWORD pType, PBYTE pData, DWO *((PDWORD)pData) = 0; return ERROR_SUCCESS; } - else if (wcsicmp(pValueName, SPLREG_NET_POPUP) == 0 || - wcsicmp(pValueName, SPLREG_RETRY_POPUP) == 0 || - wcsicmp(pValueName, SPLREG_NET_POPUP_TO_COMPUTER) == 0 || - wcsicmp(pValueName, SPLREG_EVENT_LOG) == 0 || - wcsicmp(pValueName, SPLREG_RESTART_JOB_ON_POOL_ERROR) == 0 || - wcsicmp(pValueName, SPLREG_RESTART_JOB_ON_POOL_ENABLED) == 0) + else if (_wcsicmp(pValueName, SPLREG_NET_POPUP) == 0 || + _wcsicmp(pValueName, SPLREG_RETRY_POPUP) == 0 || + _wcsicmp(pValueName, SPLREG_NET_POPUP_TO_COMPUTER) == 0 || + _wcsicmp(pValueName, SPLREG_EVENT_LOG) == 0 || + _wcsicmp(pValueName, SPLREG_RESTART_JOB_ON_POOL_ERROR) == 0 || + _wcsicmp(pValueName, SPLREG_RESTART_JOB_ON_POOL_ENABLED) == 0) { HKEY hKey;
@@ -126,7 +126,7 @@ _LocalGetPrintServerHandleData(PCWSTR pValueName, PDWORD pType, PBYTE pData, DWO RegCloseKey(hKey); return dwErrorCode; } - else if (wcsicmp(pValueName, SPLREG_MAJOR_VERSION) == 0) + else if (_wcsicmp(pValueName, SPLREG_MAJOR_VERSION) == 0) { // Store a DWORD value as REG_NONE. *pType = REG_NONE; @@ -138,7 +138,7 @@ _LocalGetPrintServerHandleData(PCWSTR pValueName, PDWORD pType, PBYTE pData, DWO *((PDWORD)pData) = dwSpoolerMajorVersion; return ERROR_SUCCESS; } - else if (wcsicmp(pValueName, SPLREG_MINOR_VERSION) == 0) + else if (_wcsicmp(pValueName, SPLREG_MINOR_VERSION) == 0) { // Store a DWORD value as REG_NONE. *pType = REG_NONE; @@ -150,7 +150,7 @@ _LocalGetPrintServerHandleData(PCWSTR pValueName, PDWORD pType, PBYTE pData, DWO *((PDWORD)pData) = dwSpoolerMinorVersion; return ERROR_SUCCESS; } - else if (wcsicmp(pValueName, SPLREG_ARCHITECTURE) == 0) + else if (_wcsicmp(pValueName, SPLREG_ARCHITECTURE) == 0) { // Store a string as REG_NONE with the length of the environment name string. *pType = REG_NONE; @@ -162,7 +162,7 @@ _LocalGetPrintServerHandleData(PCWSTR pValueName, PDWORD pType, PBYTE pData, DWO CopyMemory(pData, wszCurrentEnvironment, cbCurrentEnvironment); return ERROR_SUCCESS; } - else if (wcsicmp(pValueName, SPLREG_OS_VERSION) == 0) + else if (_wcsicmp(pValueName, SPLREG_OS_VERSION) == 0) { POSVERSIONINFOW pInfo = (POSVERSIONINFOW)pData;
@@ -177,7 +177,7 @@ _LocalGetPrintServerHandleData(PCWSTR pValueName, PDWORD pType, PBYTE pData, DWO GetVersionExW(pInfo); return ERROR_SUCCESS; } - else if (wcsicmp(pValueName, SPLREG_OS_VERSIONEX) == 0) + else if (_wcsicmp(pValueName, SPLREG_OS_VERSIONEX) == 0) { POSVERSIONINFOEXW pInfo = (POSVERSIONINFOEXW)pData;
@@ -192,7 +192,7 @@ _LocalGetPrintServerHandleData(PCWSTR pValueName, PDWORD pType, PBYTE pData, DWO GetVersionExW((POSVERSIONINFOW)pInfo); return ERROR_SUCCESS; } - else if (wcsicmp(pValueName, SPLREG_DS_PRESENT) == 0) + else if (_wcsicmp(pValueName, SPLREG_DS_PRESENT) == 0) { PDSROLE_PRIMARY_DOMAIN_INFO_BASIC pInfo;
@@ -215,7 +215,7 @@ _LocalGetPrintServerHandleData(PCWSTR pValueName, PDWORD pType, PBYTE pData, DWO DsRoleFreeMemory(pInfo); return ERROR_SUCCESS; } - else if (wcsicmp(pValueName, SPLREG_DS_PRESENT_FOR_USER) == 0) + else if (_wcsicmp(pValueName, SPLREG_DS_PRESENT_FOR_USER) == 0) { DWORD cch; PWSTR p; @@ -258,7 +258,7 @@ _LocalGetPrintServerHandleData(PCWSTR pValueName, PDWORD pType, PBYTE pData, DWO *((PDWORD)pData) = (wcscmp(wszUserSam, wszComputerName) != 0); return ERROR_SUCCESS; } - else if (wcsicmp(pValueName, SPLREG_REMOTE_FAX) == 0) + else if (_wcsicmp(pValueName, SPLREG_REMOTE_FAX) == 0) { // Store a DWORD value as REG_NONE. *pType = REG_NONE; @@ -270,7 +270,7 @@ _LocalGetPrintServerHandleData(PCWSTR pValueName, PDWORD pType, PBYTE pData, DWO *((PDWORD)pData) = 1; return ERROR_SUCCESS; } - else if (wcsicmp(pValueName, SPLREG_DNS_MACHINE_NAME) == 0) + else if (_wcsicmp(pValueName, SPLREG_DNS_MACHINE_NAME) == 0) { DWORD cchDnsName = 0;
@@ -405,21 +405,21 @@ _LocalSetPrintServerHandleData(PCWSTR pValueName, DWORD Type, PBYTE pData, DWORD { DWORD dwErrorCode;
- if (wcsicmp(pValueName, SPLREG_DEFAULT_SPOOL_DIRECTORY) == 0 || - wcsicmp(pValueName, SPLREG_PORT_THREAD_PRIORITY) == 0 || - wcsicmp(pValueName, SPLREG_SCHEDULER_THREAD_PRIORITY) == 0 || - wcsicmp(pValueName, SPLREG_BEEP_ENABLED) == 0 || - wcsicmp(pValueName, SPLREG_ALLOW_USER_MANAGEFORMS) == 0) + if (_wcsicmp(pValueName, SPLREG_DEFAULT_SPOOL_DIRECTORY) == 0 || + _wcsicmp(pValueName, SPLREG_PORT_THREAD_PRIORITY) == 0 || + _wcsicmp(pValueName, SPLREG_SCHEDULER_THREAD_PRIORITY) == 0 || + _wcsicmp(pValueName, SPLREG_BEEP_ENABLED) == 0 || + _wcsicmp(pValueName, SPLREG_ALLOW_USER_MANAGEFORMS) == 0) { return (DWORD)RegSetValueExW(hPrintersKey, pValueName, 0, Type, pData, cbData); } - else if (wcsicmp(pValueName, SPLREG_NET_POPUP) == 0 || - wcsicmp(pValueName, SPLREG_RETRY_POPUP) == 0 || - wcsicmp(pValueName, SPLREG_NET_POPUP_TO_COMPUTER) == 0 || - wcsicmp(pValueName, SPLREG_EVENT_LOG) == 0 || - wcsicmp(pValueName, SPLREG_RESTART_JOB_ON_POOL_ERROR) == 0 || - wcsicmp(pValueName, SPLREG_RESTART_JOB_ON_POOL_ENABLED) == 0 || - wcsicmp(pValueName, L"NoRemotePrinterDrivers") == 0) + else if (_wcsicmp(pValueName, SPLREG_NET_POPUP) == 0 || + _wcsicmp(pValueName, SPLREG_RETRY_POPUP) == 0 || + _wcsicmp(pValueName, SPLREG_NET_POPUP_TO_COMPUTER) == 0 || + _wcsicmp(pValueName, SPLREG_EVENT_LOG) == 0 || + _wcsicmp(pValueName, SPLREG_RESTART_JOB_ON_POOL_ERROR) == 0 || + _wcsicmp(pValueName, SPLREG_RESTART_JOB_ON_POOL_ENABLED) == 0 || + _wcsicmp(pValueName, L"NoRemotePrinterDrivers") == 0) { HKEY hKey;
@@ -434,7 +434,7 @@ _LocalSetPrintServerHandleData(PCWSTR pValueName, DWORD Type, PBYTE pData, DWORD RegCloseKey(hKey); return dwErrorCode; } - else if (wcsicmp(pValueName, SPLREG_WEBSHAREMGMT) == 0) + else if (_wcsicmp(pValueName, SPLREG_WEBSHAREMGMT) == 0) { WARN("Attempting to set WebShareMgmt, which is based on IIS and therefore not supported. Returning fake success!\n"); return ERROR_SUCCESS; diff --git a/win32ss/printing/providers/localspl/printers.c b/win32ss/printing/providers/localspl/printers.c index 9bab1ba22ff..f323599e3b0 100644 --- a/win32ss/printing/providers/localspl/printers.c +++ b/win32ss/printing/providers/localspl/printers.c @@ -93,7 +93,7 @@ _PrinterListCompareRoutine(PVOID FirstStruct, PVOID SecondStruct) PLOCAL_PRINTER A = (PLOCAL_PRINTER)FirstStruct; PLOCAL_PRINTER B = (PLOCAL_PRINTER)SecondStruct;
- return wcsicmp(A->pwszPrinterName, B->pwszPrinterName); + return _wcsicmp(A->pwszPrinterName, B->pwszPrinterName); }
/** @@ -406,7 +406,7 @@ _LocalEnumPrintersCheckName(DWORD Flags, PCWSTR Name, PWSTR pwszComputerName, PD // Print Provider Name or the local Computer Name.
// Compare with the Print Provider Name. - if (wcsicmp(Name, wszPrintProviderInfo[0]) == 0) + if (_wcsicmp(Name, wszPrintProviderInfo[0]) == 0) return ERROR_SUCCESS;
// Dismiss anything else. diff --git a/win32ss/printing/providers/localspl/printprocessors.c b/win32ss/printing/providers/localspl/printprocessors.c index fcb1fd7c252..3540b560e06 100644 --- a/win32ss/printing/providers/localspl/printprocessors.c +++ b/win32ss/printing/providers/localspl/printprocessors.c @@ -89,7 +89,7 @@ FindDatatype(const PLOCAL_PRINT_PROCESSOR pPrintProcessor, PCWSTR pwszDatatype)
for (i = 0; i < pPrintProcessor->dwDatatypeCount; i++) { - if (wcsicmp(pCurrentDatatype->pName, pwszDatatype) == 0) + if (_wcsicmp(pCurrentDatatype->pName, pwszDatatype) == 0) return TRUE;
++pCurrentDatatype; @@ -113,7 +113,7 @@ FindPrintProcessor(PCWSTR pwszName) { pPrintProcessor = CONTAINING_RECORD(pEntry, LOCAL_PRINT_PROCESSOR, Entry);
- if (wcsicmp(pPrintProcessor->pwszName, pwszName) == 0) + if (_wcsicmp(pPrintProcessor->pwszName, pwszName) == 0) return pPrintProcessor; }
diff --git a/win32ss/user/ntuser/message.c b/win32ss/user/ntuser/message.c index d28f35e3c79..e0f4f987678 100644 --- a/win32ss/user/ntuser/message.c +++ b/win32ss/user/ntuser/message.c @@ -2771,7 +2771,7 @@ NtUserMessageCall( HWND hWnd, } ExFreePoolWithTag(List, USERTAG_WINDOWLIST); } - if (lParam && !wParam && wcsicmp((WCHAR*)lParam, L"Environment") == 0) + if (lParam && !wParam && _wcsicmp((WCHAR*)lParam, L"Environment") == 0) { /* Handle Broadcast of WM_SETTINGCHAGE for Environment */ co_IntDoSendMessage(HWND_BROADCAST, WM_SETTINGCHANGE, diff --git a/win32ss/user/winsrv/consrv/console.c b/win32ss/user/winsrv/consrv/console.c index 3209e3b4a83..20ccd02f257 100644 --- a/win32ss/user/winsrv/consrv/console.c +++ b/win32ss/user/winsrv/consrv/console.c @@ -397,7 +397,7 @@ LoadShellLinkConsoleInfo(IN OUT PCONSOLE_STATE_INFO ConsoleInfo,
/* 2- Check for the link extension. The name ".lnk" is considered invalid. */ Length = wcslen(LinkName); - if ( (Length <= 4) || (wcsicmp(LinkName + (Length - 4), L".lnk") != 0) ) + if ( (Length <= 4) || (_wcsicmp(LinkName + (Length - 4), L".lnk") != 0) ) return FALSE;
/* 3- It may be a link. Try to retrieve some properties */
-
Timo Kreuzer