From 2c8367a3de808241aeb13749c16f278f0182bcbf Mon Sep 17 00:00:00 2001 From: Mike McCormack Date: Mon, 7 Mar 2005 11:05:03 +0000 Subject: [PATCH] Use lstrcmpiA in preference to strcasecmp. --- dlls/shell32/dialogs.c | 2 +- dlls/shell32/folders.c | 2 +- dlls/shell32/shellpath.c | 2 +- dlls/shell32/shlfolder.c | 4 ++-- dlls/shell32/shlview.c | 8 ++++---- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/shell32/dialogs.c b/dlls/shell32/dialogs.c index c00c155427..a243768bb6 100644 --- a/dlls/shell32/dialogs.c +++ b/dlls/shell32/dialogs.c @@ -283,7 +283,7 @@ void FillList (HWND hCb, char *pszLatest) if (NULL != pszLatest) { - if (!strcasecmp (pszCmd, pszLatest)) + if (!lstrcmpiA(pszCmd, pszLatest)) { /* sprintf (szDbgMsg, "Found existing (%d).\n", Nix) ; diff --git a/dlls/shell32/folders.c b/dlls/shell32/folders.c index 12b6fe4d52..efa3b2bdcb 100644 --- a/dlls/shell32/folders.c +++ b/dlls/shell32/folders.c @@ -328,7 +328,7 @@ static HRESULT WINAPI IExtractIconW_fnGetIconLocation( found = TRUE; } - else if (!strcasecmp(sTemp, "lnkfile")) + else if (!lstrcmpiA(sTemp, "lnkfile")) { /* extract icon from shell shortcut */ IShellFolder* dsf; diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index a096ca8fdf..dd31b1aa29 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -365,7 +365,7 @@ static BOOL PathIsExeA (LPCSTR lpszPath) TRACE("path=%s\n",lpszPath); for(i=0; lpszExtensions[i]; i++) - if (!strcasecmp(lpszExtension,lpszExtensions[i])) return TRUE; + if (!lstrcmpiA(lpszExtension,lpszExtensions[i])) return TRUE; return FALSE; } diff --git a/dlls/shell32/shlfolder.c b/dlls/shell32/shlfolder.c index 1f5841906d..e6734ebcc6 100644 --- a/dlls/shell32/shlfolder.c +++ b/dlls/shell32/shlfolder.c @@ -422,7 +422,7 @@ HRESULT SHELL32_GetItemAttributes (IShellFolder * psf, LPCITEMIDLIST pidl, LPDWO if (SFGAO_LINK & *pdwAttributes) { char ext[MAX_PATH]; - if (!_ILGetExtension(pidl, ext, MAX_PATH) || strcasecmp(ext, "lnk")) + if (!_ILGetExtension(pidl, ext, MAX_PATH) || lstrcmpiA(ext, "lnk")) *pdwAttributes &= ~SFGAO_LINK; } } else { @@ -469,7 +469,7 @@ HRESULT SHELL32_CompareIDs (IShellFolder * iface, LPARAM lParam, LPCITEMIDLIST p /* test for name of pidl */ _ILSimpleGetText (pidl1, szTemp1, MAX_PATH); _ILSimpleGetText (pidl2, szTemp2, MAX_PATH); - nReturn = strcasecmp (szTemp1, szTemp2); + nReturn = lstrcmpiA (szTemp1, szTemp2); if (nReturn < 0) return MAKE_HRESULT( SEVERITY_SUCCESS, 0, (WORD)-1 ); else if (nReturn > 0) diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c index 6dc5e5f92c..eb5ad7b767 100644 --- a/dlls/shell32/shlview.c +++ b/dlls/shell32/shlview.c @@ -454,7 +454,7 @@ static INT CALLBACK ShellView_ListViewCompareItems(LPVOID lParam1, LPVOID lParam { _ILGetFileAttributes(pItemIdList1, strName1, MAX_PATH); _ILGetFileAttributes(pItemIdList2, strName2, MAX_PATH); - nDiff = strcasecmp(strName1, strName2); + nDiff = lstrcmpiA(strName1, strName2); } /* Sort by FileName: Folder or Files can be sorted */ else if(pSortInfo->nHeaderID == LISTVIEW_COLUMN_NAME || bIsBothFolder) @@ -462,7 +462,7 @@ static INT CALLBACK ShellView_ListViewCompareItems(LPVOID lParam1, LPVOID lParam /* Sort by Text */ _ILSimpleGetText(pItemIdList1, strName1, MAX_PATH); _ILSimpleGetText(pItemIdList2, strName2, MAX_PATH); - nDiff = strcasecmp(strName1, strName2); + nDiff = lstrcmpiA(strName1, strName2); } /* Sort by File Size, Only valid for Files */ else if(pSortInfo->nHeaderID == LISTVIEW_COLUMN_SIZE) @@ -475,7 +475,7 @@ static INT CALLBACK ShellView_ListViewCompareItems(LPVOID lParam1, LPVOID lParam /* Sort by Type */ _ILGetFileType(pItemIdList1, strName1, MAX_PATH); _ILGetFileType(pItemIdList2, strName2, MAX_PATH); - nDiff = strcasecmp(strName1, strName2); + nDiff = lstrcmpiA(strName1, strName2); } } /* If the Date, FileSize, FileType, Attrib was the same, sort by FileName */ @@ -484,7 +484,7 @@ static INT CALLBACK ShellView_ListViewCompareItems(LPVOID lParam1, LPVOID lParam { _ILSimpleGetText(pItemIdList1, strName1, MAX_PATH); _ILSimpleGetText(pItemIdList2, strName2, MAX_PATH); - nDiff = strcasecmp(strName1, strName2); + nDiff = lstrcmpiA(strName1, strName2); } if(!pSortInfo->bIsAscending) -- 2.32.0.93.g670b81a890