diff options
| -rw-r--r-- | plugins/Import/mirabilis.cpp | 2 | ||||
| -rw-r--r-- | plugins/Import/miranda.cpp | 10 | ||||
| -rw-r--r-- | plugins/SeenPlugin/utils.cpp | 2 | ||||
| -rw-r--r-- | protocols/MSN/msn_proto.h | 2 |
4 files changed, 9 insertions, 7 deletions
diff --git a/plugins/Import/mirabilis.cpp b/plugins/Import/mirabilis.cpp index 3b6bbeeb6e..1f032827af 100644 --- a/plugins/Import/mirabilis.cpp +++ b/plugins/Import/mirabilis.cpp @@ -1056,7 +1056,7 @@ BOOL ImportExtendedMessage(DWORD dwOffset) // Convert timestamp
dbei.timestamp = footer->timestamp + nUCTOffset;
dbei.cbBlob = wLength;
- dbei.pBlob = (PBYTE)mir_calloc(wLength,1);
+ dbei.pBlob = (PBYTE)calloc(wLength,1);
CopyMemory(dbei.pBlob, pszText, dbei.cbBlob);
dbei.pBlob[dbei.cbBlob - 1] = 0;
diff --git a/plugins/Import/miranda.cpp b/plugins/Import/miranda.cpp index 220f902467..e83eaae869 100644 --- a/plugins/Import/miranda.cpp +++ b/plugins/Import/miranda.cpp @@ -478,7 +478,7 @@ struct DBHeader* GetHeader(HANDLE hDbFile) struct DBHeader* pdbHeader;
DWORD dwBytesRead;
- if (( pdbHeader = (DBHeader*)mir_calloc(1, sizeof(struct DBHeader))) == NULL )
+ if (( pdbHeader = (DBHeader*)calloc(1, sizeof(struct DBHeader))) == NULL )
return NULL;
// Goto start of file
@@ -675,7 +675,7 @@ BOOL GetSettingsGroup(HANDLE hDbFile, DWORD dwOffset, struct DBContactSettings** // ** Read the struct and the following blob
dwBlobSize = pSettings.cbBlob;
- if (!(*pDbSettings = (DBContactSettings *)mir_calloc(1, sizeof(struct DBContactSettings) + dwBlobSize)))
+ if (!(*pDbSettings = (DBContactSettings *)calloc(1, sizeof(struct DBContactSettings) + dwBlobSize)))
return FALSE;
memcpy(*pDbSettings, &pSettings, dwHead );
@@ -772,7 +772,7 @@ int GetSettingValue(char* pBlob, DBVARIANT* dbv) {
#ifdef _LOGGING
{
- char* pszName = mir_calloc((*pBlob)+1, 1);
+ char* pszName = calloc((*pBlob)+1, 1);
memcpy(pszName, pBlob+1, *pBlob);
AddMessage( LPGEN("Getting type %u value for setting: %s"), (BYTE)*(pBlob+(*pBlob)+1), pszName );
free(pszName);
@@ -800,7 +800,7 @@ int GetSettingValue(char* pBlob, DBVARIANT* dbv) case DBVT_ASCIIZ:
case DBVT_UTF8:
dbv->cchVal = *(WORD*)pBlob;
- dbv->pszVal = (char *)mir_calloc( dbv->cchVal+1, sizeof( char ));
+ dbv->pszVal = (char *)calloc( dbv->cchVal+1, sizeof( char ));
memcpy( dbv->pszVal, pBlob+2, dbv->cchVal );
dbv->pszVal[ dbv->cchVal ] = 0;
return TRUE;
@@ -808,7 +808,7 @@ int GetSettingValue(char* pBlob, DBVARIANT* dbv) case DBVTF_VARIABLELENGTH:
case DBVT_BLOB:
dbv->cpbVal = *(WORD*)pBlob;
- dbv->pbVal = (BYTE *)mir_calloc( dbv->cpbVal+1, sizeof( char ));
+ dbv->pbVal = (BYTE *)calloc( dbv->cpbVal+1, sizeof( char ));
memcpy( dbv->pbVal, pBlob+2, dbv->cpbVal );
dbv->pbVal[ dbv->cpbVal ] = 0;
return TRUE;
diff --git a/plugins/SeenPlugin/utils.cpp b/plugins/SeenPlugin/utils.cpp index 33cb50bc37..533882977e 100644 --- a/plugins/SeenPlugin/utils.cpp +++ b/plugins/SeenPlugin/utils.cpp @@ -615,6 +615,8 @@ static DWORD __stdcall waitThread(logthread_info* infoParam) return 0;
}
+
+
int UpdateValues(WPARAM wparam,LPARAM lparam)
{
DBCONTACTWRITESETTING *cws;
diff --git a/protocols/MSN/msn_proto.h b/protocols/MSN/msn_proto.h index baf43545de..8f6ddfbfd4 100644 --- a/protocols/MSN/msn_proto.h +++ b/protocols/MSN/msn_proto.h @@ -34,7 +34,7 @@ struct CMsnProto : public PROTO_INTERFACE ~CMsnProto();
__inline void* operator new(size_t size)
- { return mir_calloc(1, size);
+ { return calloc(1, size);
}
__inline void operator delete(void* p)
{ free(p);
|