summaryrefslogtreecommitdiff
path: root/dbeditorpp/knownmodules.cpp
diff options
context:
space:
mode:
authorgeorge.hazan <george.hazan@e753b5eb-9565-29b2-b5c5-2cc6f99dfbcb>2011-05-26 20:18:42 +0000
committergeorge.hazan <george.hazan@e753b5eb-9565-29b2-b5c5-2cc6f99dfbcb>2011-05-26 20:18:42 +0000
commit2ebb53adcd4663ac2f1da74972b7b21d53b0ce53 (patch)
tree0c11a849c6bd2cff094017e8de6895a54363c586 /dbeditorpp/knownmodules.cpp
parent4b6195fe205b03838ce334893e1141bf43f9fc6d (diff)
patch for dbeditorpp: C++ support, other improvements
git-svn-id: http://miranda-plugins.googlecode.com/svn/trunk@122 e753b5eb-9565-29b2-b5c5-2cc6f99dfbcb
Diffstat (limited to 'dbeditorpp/knownmodules.cpp')
-rw-r--r--dbeditorpp/knownmodules.cpp20
1 files changed, 11 insertions, 9 deletions
diff --git a/dbeditorpp/knownmodules.cpp b/dbeditorpp/knownmodules.cpp
index ecf95b3..13c4379 100644
--- a/dbeditorpp/knownmodules.cpp
+++ b/dbeditorpp/knownmodules.cpp
@@ -1,24 +1,26 @@
#include "headers.h"
+BYTE UseKnownModList;
+
#define MAXMODS 1024
char *KnownModules[MAXMODS];
int KnownModulesCount = 0;
-int RegisterModule(WPARAM wParam, LPARAM lParam)
+INT_PTR RegisterModule(WPARAM wParam, LPARAM lParam)
{
char **mods = (char**)wParam;
int count = lParam;
int i;
for (i=0;i<count && KnownModulesCount<MAXMODS;i++)
- KnownModules[KnownModulesCount++] = strdup(mods[i]);
+ KnownModules[KnownModulesCount++] = mir_tstrdup(mods[i]);
return 0;
}
-int RegisterSingleModule(WPARAM wParam, LPARAM lParam)
+INT_PTR RegisterSingleModule(WPARAM wParam, LPARAM lParam)
{
char *mods = (char*)wParam;
if (KnownModulesCount<MAXMODS)
- KnownModules[KnownModulesCount++] = strdup(mods);
+ KnownModules[KnownModulesCount++] = mir_tstrdup(mods);
return 0;
}
@@ -42,7 +44,7 @@ void FreeKnownModuleList()
int i;
for(i=0;i<KnownModulesCount;i++)
{
- safe_free(KnownModules[i]);
+ mir_free(KnownModules[i]);
}
}
@@ -60,7 +62,7 @@ void doOldKnownModulesList()
{
if (!DBGetContactSetting(NULL,"KnownModules",setting->name,&dbv) && dbv.type == DBVT_ASCIIZ)
{
- temp = (char*)malloc(strlen(dbv.pszVal)+5);
+ temp = (char*)mir_alloc((strlen(dbv.pszVal)+5)*sizeof(char));
if (!temp) break;
strcpy(temp,dbv.pszVal);
strcat(temp,",\0");
@@ -68,15 +70,15 @@ void doOldKnownModulesList()
while (var)
{
if (KnownModulesCount<MAXMODS)
- KnownModules[KnownModulesCount++] = strdup(var);
+ KnownModules[KnownModulesCount++] = mir_tstrdup(var);
var = strtok(NULL,", ");
}
- safe_free(temp);
+ mir_free(temp);
}
DBFreeVariant(&dbv);
setting = (struct ModSetLinkLinkItem *)setting->next;
}
FreeModuleSettingLL(&msll);
- UseKnownModList = DBGetContactSettingByte(NULL,modname,"UseKnownModList",1);
+ UseKnownModList = DBGetContactSettingByte(NULL,modname,"UseKnownModList",0);
}