summaryrefslogtreecommitdiff
path: root/plugins/AssocMgr/utils.cpp
diff options
context:
space:
mode:
authorKirill Volinsky <mataes2007@gmail.com>2012-06-06 20:43:53 +0000
committerKirill Volinsky <mataes2007@gmail.com>2012-06-06 20:43:53 +0000
commit74aabf4bccef1ebe3eace60a9694f44e9a0499ec (patch)
tree2bdb722b706c0a688fb5141ef4197827e61f747c /plugins/AssocMgr/utils.cpp
parent83246d23d9e1c1feeaee267b9a1b68c4766e7114 (diff)
that's all changes
git-svn-id: http://svn.miranda-ng.org/main/trunk@341 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/AssocMgr/utils.cpp')
-rw-r--r--plugins/AssocMgr/utils.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/plugins/AssocMgr/utils.cpp b/plugins/AssocMgr/utils.cpp
index 89e0867a59..663484142a 100644
--- a/plugins/AssocMgr/utils.cpp
+++ b/plugins/AssocMgr/utils.cpp
@@ -112,7 +112,7 @@ static int EnumPrefixSettingsProc(const char *pszSetting,LPARAM lParam)
if (!strncmp(pszSetting,param->pszPrefix,param->nPrefixLen)) {
char **buf;
/* resize storage array */
- buf=mir_realloc(param->settings,(param->nSettingsCount+1)*sizeof(char*));
+ buf = (char**)mir_realloc(param->settings,(param->nSettingsCount+1)*sizeof(char*));
if(buf!=NULL) {
param->settings=buf;
buf[param->nSettingsCount]=mir_strdup(pszSetting);
@@ -142,8 +142,9 @@ BOOL EnumDbPrefixSettings(const char *pszModule,const char *pszSettingPrefix,cha
/************************* Error Output ***************************/
-static void MessageBoxIndirectFree(MSGBOXPARAMSA *mbp)
+static void MessageBoxIndirectFree(void *param)
{
+ MSGBOXPARAMSA *mbp = (MSGBOXPARAMSA*)param;
MessageBoxIndirectA(mbp);
mir_free((char*)mbp->lpszCaption); /* does NULL check */
mir_free((char*)mbp->lpszText); /* does NULL check */
@@ -184,7 +185,7 @@ void ShowInfoMessage(BYTE flags,const char *pszTitle,const char *pszTextFmt,...)
case NIIF_WARNING: mbp->dwStyle|=MB_ICONWARNING; break;
case NIIF_ERROR: mbp->dwStyle|=MB_ICONERROR;
}
- mir_forkthread(MessageBoxIndirectFree,mbp);
+ mir_forkthread(MessageBoxIndirectFree, mbp);
}
// LocalFree() the return value