diff options
Diffstat (limited to 'plugins/AssocMgr/src')
| -rw-r--r-- | plugins/AssocMgr/src/assoclist.cpp | 4 | ||||
| -rw-r--r-- | plugins/AssocMgr/src/dde.cpp | 4 | ||||
| -rw-r--r-- | plugins/AssocMgr/src/reg.cpp | 8 | ||||
| -rw-r--r-- | plugins/AssocMgr/src/test.cpp | 14 |
4 files changed, 15 insertions, 15 deletions
diff --git a/plugins/AssocMgr/src/assoclist.cpp b/plugins/AssocMgr/src/assoclist.cpp index 7d12f4686f..9380ebfd69 100644 --- a/plugins/AssocMgr/src/assoclist.cpp +++ b/plugins/AssocMgr/src/assoclist.cpp @@ -147,7 +147,7 @@ void CleanupMimeTypeAddedSettings(void) for(i = 0;i<nSettingsCount;++i) {
pszSuffix = &ppszSettings[i][5];
for(j = 0;j<nAssocListCount;++j)
- if (!lstrcmpA(pszSuffix, pAssocList[j].pszMimeType))
+ if (!mir_strcmp(pszSuffix, pAssocList[j].pszMimeType))
break; /* mime type in current list */
if(j == nAssocListCount) { /* mime type not in current list */
if (!db_get(NULL, "AssocMgr", ppszSettings[i], &dbv)) {
@@ -199,7 +199,7 @@ static int FindAssocItem(const char *pszClassName) {
int i;
for(i = 0;i<nAssocListCount;++i)
- if (!lstrcmpA(pszClassName, pAssocList[i].pszClassName))
+ if (!mir_strcmp(pszClassName, pAssocList[i].pszClassName))
return i;
return -1;
}
diff --git a/plugins/AssocMgr/src/dde.cpp b/plugins/AssocMgr/src/dde.cpp index 641e193359..e66cfe8892 100644 --- a/plugins/AssocMgr/src/dde.cpp +++ b/plugins/AssocMgr/src/dde.cpp @@ -120,9 +120,9 @@ static LRESULT CALLBACK DdeMessageWindow(HWND hwnd,UINT msg,WPARAM wParam,LPARAM if(pszArg!=NULL) {
/* we are inside miranda here, we make it async so the shell does
* not timeout regardless what the plugins try to do. */
- if (!lstrcmpi(pszAction,_T("file")))
+ if (!mir_tstrcmpi(pszAction,_T("file")))
CallFunctionAsync(FileActionAsync,pszArg);
- else if (!lstrcmpi(pszAction,_T("url")))
+ else if (!mir_tstrcmpi(pszAction,_T("url")))
CallFunctionAsync(UrlActionAsync,pszArg);
}
GlobalUnlock(hCommand);
diff --git a/plugins/AssocMgr/src/reg.cpp b/plugins/AssocMgr/src/reg.cpp index ded3aca55b..865349301c 100644 --- a/plugins/AssocMgr/src/reg.cpp +++ b/plugins/AssocMgr/src/reg.cpp @@ -178,7 +178,7 @@ static BOOL IsValidRunCommand(const TCHAR *pszRunCmd) }
if (SearchPath(NULL,pexe,_T(".exe"),SIZEOF(szFullExe),szFullExe,&pszFilePart)) {
if (pszFilePart!=NULL)
- if (!lstrcmpi(pszFilePart,_T("rundll32.exe")) || !lstrcmpi(pszFilePart,_T("rundll.exe"))) {
+ if (!mir_tstrcmpi(pszFilePart,_T("rundll32.exe")) || !mir_tstrcmpi(pszFilePart,_T("rundll.exe"))) {
/* split into dll path and arguments */
if (pargs[0]==_T('\"')) {
++pargs;
@@ -306,7 +306,7 @@ static BOOL IsRegStrValue(HKEY hKey,const TCHAR *pszValName,const TCHAR *pszCmpV BOOL fSame=FALSE;
TCHAR *pszVal=GetRegStrValue(hKey,pszValName);
if (pszVal!=NULL) {
- fSame=!lstrcmp(pszVal,pszCmpVal);
+ fSame=!mir_tstrcmp(pszVal,pszCmpVal);
mir_free(pszVal);
}
return fSame;
@@ -321,7 +321,7 @@ static BOOL IsRegStrValueA(HKEY hKey,const TCHAR *pszValName,const char *pszCmpV if (pszVal!=NULL) {
pszValA=t2a(pszVal);
if (pszValA!=NULL)
- fSame=!lstrcmpA(pszValA,pszCmpVal);
+ fSame=!mir_strcmp(pszValA,pszCmpVal);
mir_free(pszValA); /* does NULL check */
mir_free(pszVal);
}
@@ -546,7 +546,7 @@ void CleanupRegTreeBackupSettings(void) for(int j=i+1; j < nSettingsCount; ++j) {
pszBuf = strchr(&ppszSettings[j][4],'\\');
if (pszBuf != NULL) *pszBuf='\0';
- if (lstrcmpA(pszClassName, &ppszSettings[j][4])){
+ if (mir_strcmp(pszClassName, &ppszSettings[j][4])){
if (pszBuf != NULL) *pszBuf='\\';
continue;
}
diff --git a/plugins/AssocMgr/src/test.cpp b/plugins/AssocMgr/src/test.cpp index 41cb0548de..29a9f5d8d0 100644 --- a/plugins/AssocMgr/src/test.cpp +++ b/plugins/AssocMgr/src/test.cpp @@ -338,9 +338,9 @@ static int IcqOpenFile(WPARAM wParam,LPARAM lParam) if(IsEmpty(line)) continue;
if(line[0]=='[') {
ZeroMemory(&info,sizeof(info));
- if (!lstrcmpiA(line,"[ICQ Message User]"))
+ if (!mir_strcmpi(line,"[ICQ Message User]"))
info.type=ICQFILE_MESSAGEUSER;
- else if (!lstrcmpiA(line,"[ICQ User]"))
+ else if (!mir_strcmpi(line,"[ICQ User]"))
info.type=ICQFILE_ADDUSER;
continue;
}
@@ -348,11 +348,11 @@ static int IcqOpenFile(WPARAM wParam,LPARAM lParam) sep=strchr(line,'=');
if(sep==NULL) { info.type=0; break; } /* format error */
*(sep++)='\0';
- if (!lstrcmpA("UIN",line)) mir_strncpy(info.uin,sep,sizeof(info.uin)); /* buffer safe */
- else if (!lstrcmpA("Email",line)) mir_strncpy(info.email,sep,sizeof(info.email)); /* buffer safe */
- else if (!lstrcmpA("NickName",line)) mir_strncpy(info.nick,sep,sizeof(info.nick)); /* buffer safe */
- else if (!lstrcmpA("FirstName",line)) mir_strncpy(info.firstName,sep,sizeof(info.firstName)); /* buffer safe */
- else if (!lstrcmpA("LastName",line)) mir_strncpy(info.lastName,sep,sizeof(info.lastName)); /* buffer safe */
+ if (!mir_strcmp("UIN",line)) mir_strncpy(info.uin,sep,sizeof(info.uin)); /* buffer safe */
+ else if (!mir_strcmp("Email",line)) mir_strncpy(info.email,sep,sizeof(info.email)); /* buffer safe */
+ else if (!mir_strcmp("NickName",line)) mir_strncpy(info.nick,sep,sizeof(info.nick)); /* buffer safe */
+ else if (!mir_strcmp("FirstName",line)) mir_strncpy(info.firstName,sep,sizeof(info.firstName)); /* buffer safe */
+ else if (!mir_strcmp("LastName",line)) mir_strncpy(info.lastName,sep,sizeof(info.lastName)); /* buffer safe */
}
fclose(fp);
switch(info.type) {
|