Use lstrcmpiA in preference to strcasecmp.
This commit is contained in:
parent
b92f1431a5
commit
2c8367a3de
|
@ -283,7 +283,7 @@ void FillList (HWND hCb, char *pszLatest)
|
||||||
|
|
||||||
if (NULL != pszLatest)
|
if (NULL != pszLatest)
|
||||||
{
|
{
|
||||||
if (!strcasecmp (pszCmd, pszLatest))
|
if (!lstrcmpiA(pszCmd, pszLatest))
|
||||||
{
|
{
|
||||||
/*
|
/*
|
||||||
sprintf (szDbgMsg, "Found existing (%d).\n", Nix) ;
|
sprintf (szDbgMsg, "Found existing (%d).\n", Nix) ;
|
||||||
|
|
|
@ -328,7 +328,7 @@ static HRESULT WINAPI IExtractIconW_fnGetIconLocation(
|
||||||
|
|
||||||
found = TRUE;
|
found = TRUE;
|
||||||
}
|
}
|
||||||
else if (!strcasecmp(sTemp, "lnkfile"))
|
else if (!lstrcmpiA(sTemp, "lnkfile"))
|
||||||
{
|
{
|
||||||
/* extract icon from shell shortcut */
|
/* extract icon from shell shortcut */
|
||||||
IShellFolder* dsf;
|
IShellFolder* dsf;
|
||||||
|
|
|
@ -365,7 +365,7 @@ static BOOL PathIsExeA (LPCSTR lpszPath)
|
||||||
TRACE("path=%s\n",lpszPath);
|
TRACE("path=%s\n",lpszPath);
|
||||||
|
|
||||||
for(i=0; lpszExtensions[i]; i++)
|
for(i=0; lpszExtensions[i]; i++)
|
||||||
if (!strcasecmp(lpszExtension,lpszExtensions[i])) return TRUE;
|
if (!lstrcmpiA(lpszExtension,lpszExtensions[i])) return TRUE;
|
||||||
|
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
|
|
@ -422,7 +422,7 @@ HRESULT SHELL32_GetItemAttributes (IShellFolder * psf, LPCITEMIDLIST pidl, LPDWO
|
||||||
if (SFGAO_LINK & *pdwAttributes) {
|
if (SFGAO_LINK & *pdwAttributes) {
|
||||||
char ext[MAX_PATH];
|
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;
|
*pdwAttributes &= ~SFGAO_LINK;
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
|
@ -469,7 +469,7 @@ HRESULT SHELL32_CompareIDs (IShellFolder * iface, LPARAM lParam, LPCITEMIDLIST p
|
||||||
/* test for name of pidl */
|
/* test for name of pidl */
|
||||||
_ILSimpleGetText (pidl1, szTemp1, MAX_PATH);
|
_ILSimpleGetText (pidl1, szTemp1, MAX_PATH);
|
||||||
_ILSimpleGetText (pidl2, szTemp2, MAX_PATH);
|
_ILSimpleGetText (pidl2, szTemp2, MAX_PATH);
|
||||||
nReturn = strcasecmp (szTemp1, szTemp2);
|
nReturn = lstrcmpiA (szTemp1, szTemp2);
|
||||||
if (nReturn < 0)
|
if (nReturn < 0)
|
||||||
return MAKE_HRESULT( SEVERITY_SUCCESS, 0, (WORD)-1 );
|
return MAKE_HRESULT( SEVERITY_SUCCESS, 0, (WORD)-1 );
|
||||||
else if (nReturn > 0)
|
else if (nReturn > 0)
|
||||||
|
|
|
@ -454,7 +454,7 @@ static INT CALLBACK ShellView_ListViewCompareItems(LPVOID lParam1, LPVOID lParam
|
||||||
{
|
{
|
||||||
_ILGetFileAttributes(pItemIdList1, strName1, MAX_PATH);
|
_ILGetFileAttributes(pItemIdList1, strName1, MAX_PATH);
|
||||||
_ILGetFileAttributes(pItemIdList2, strName2, MAX_PATH);
|
_ILGetFileAttributes(pItemIdList2, strName2, MAX_PATH);
|
||||||
nDiff = strcasecmp(strName1, strName2);
|
nDiff = lstrcmpiA(strName1, strName2);
|
||||||
}
|
}
|
||||||
/* Sort by FileName: Folder or Files can be sorted */
|
/* Sort by FileName: Folder or Files can be sorted */
|
||||||
else if(pSortInfo->nHeaderID == LISTVIEW_COLUMN_NAME || bIsBothFolder)
|
else if(pSortInfo->nHeaderID == LISTVIEW_COLUMN_NAME || bIsBothFolder)
|
||||||
|
@ -462,7 +462,7 @@ static INT CALLBACK ShellView_ListViewCompareItems(LPVOID lParam1, LPVOID lParam
|
||||||
/* Sort by Text */
|
/* Sort by Text */
|
||||||
_ILSimpleGetText(pItemIdList1, strName1, MAX_PATH);
|
_ILSimpleGetText(pItemIdList1, strName1, MAX_PATH);
|
||||||
_ILSimpleGetText(pItemIdList2, strName2, MAX_PATH);
|
_ILSimpleGetText(pItemIdList2, strName2, MAX_PATH);
|
||||||
nDiff = strcasecmp(strName1, strName2);
|
nDiff = lstrcmpiA(strName1, strName2);
|
||||||
}
|
}
|
||||||
/* Sort by File Size, Only valid for Files */
|
/* Sort by File Size, Only valid for Files */
|
||||||
else if(pSortInfo->nHeaderID == LISTVIEW_COLUMN_SIZE)
|
else if(pSortInfo->nHeaderID == LISTVIEW_COLUMN_SIZE)
|
||||||
|
@ -475,7 +475,7 @@ static INT CALLBACK ShellView_ListViewCompareItems(LPVOID lParam1, LPVOID lParam
|
||||||
/* Sort by Type */
|
/* Sort by Type */
|
||||||
_ILGetFileType(pItemIdList1, strName1, MAX_PATH);
|
_ILGetFileType(pItemIdList1, strName1, MAX_PATH);
|
||||||
_ILGetFileType(pItemIdList2, strName2, 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 */
|
/* 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(pItemIdList1, strName1, MAX_PATH);
|
||||||
_ILSimpleGetText(pItemIdList2, strName2, MAX_PATH);
|
_ILSimpleGetText(pItemIdList2, strName2, MAX_PATH);
|
||||||
nDiff = strcasecmp(strName1, strName2);
|
nDiff = lstrcmpiA(strName1, strName2);
|
||||||
}
|
}
|
||||||
|
|
||||||
if(!pSortInfo->bIsAscending)
|
if(!pSortInfo->bIsAscending)
|
||||||
|
|
Loading…
Reference in New Issue