summaryrefslogtreecommitdiff
path: root/metacontacts
diff options
context:
space:
mode:
Diffstat (limited to 'metacontacts')
-rw-r--r--metacontacts/MetaContacts_9.vcproj212
-rw-r--r--metacontacts/addto.c4
-rw-r--r--metacontacts/edit.c4
-rw-r--r--metacontacts/meta_services.c22
-rw-r--r--metacontacts/meta_utils.c2
5 files changed, 122 insertions, 122 deletions
diff --git a/metacontacts/MetaContacts_9.vcproj b/metacontacts/MetaContacts_9.vcproj
index 2e0db61..60e1cbd 100644
--- a/metacontacts/MetaContacts_9.vcproj
+++ b/metacontacts/MetaContacts_9.vcproj
@@ -114,9 +114,9 @@
/>
</Configuration>
<Configuration
- Name="Release|Win32"
- OutputDirectory=".\Release"
- IntermediateDirectory=".\Release"
+ Name="Debug|x64"
+ OutputDirectory="$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"
UseOfMFC="2"
@@ -137,36 +137,28 @@
/>
<Tool
Name="VCMIDLTool"
- PreprocessorDefinitions="NDEBUG"
+ PreprocessorDefinitions="_DEBUG"
MkTypLibCompatible="true"
SuppressStartupBanner="true"
- TargetEnvironment="1"
- TypeLibraryName=".\Release/MetaContacts.tlb"
+ TargetEnvironment="3"
+ TypeLibraryName=".\Debug/MetaContacts.tlb"
/>
<Tool
Name="VCCLCompilerTool"
- Optimization="1"
- InlineFunctionExpansion="1"
- EnableIntrinsicFunctions="true"
- FavorSizeOrSpeed="2"
- WholeProgramOptimization="true"
- AdditionalIncludeDirectories="../../include"
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;METACONTACTS_EXPORTS"
- StringPooling="true"
- ExceptionHandling="0"
- RuntimeLibrary="0"
- BufferSecurityCheck="false"
- EnableFunctionLevelLinking="true"
- FloatingPointModel="2"
- RuntimeTypeInfo="false"
+ Optimization="0"
+ AdditionalIncludeDirectories="../../../include"
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;METACONTACTS_EXPORTS"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="1"
UsePrecompiledHeader="2"
PrecompiledHeaderThrough="metacontacts.h"
- AssemblerListingLocation=".\Release/"
- ObjectFile=".\Release/"
- ProgramDataBaseFileName=".\Release/"
+ AssemblerListingLocation=".\Debug/"
+ ObjectFile=".\Debug/"
+ ProgramDataBaseFileName=".\Debug/"
+ BrowseInformation="1"
WarningLevel="3"
SuppressStartupBanner="true"
- DebugInformationFormat="0"
+ DebugInformationFormat="3"
ShowIncludes="false"
/>
<Tool
@@ -174,7 +166,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_AFXDLL;NDEBUG"
+ PreprocessorDefinitions="_AFXDLL;_DEBUG"
Culture="3081"
/>
<Tool
@@ -182,18 +174,16 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="unicows.lib user32.lib gdi32.lib comctl32.lib"
+ AdditionalDependencies="user32.lib gdi32.lib comctl32.lib"
+ OutputFile="c:\miranda im\Plugins\$(ProjectName).dll"
LinkIncremental="1"
SuppressStartupBanner="true"
- GenerateManifest="false"
- ProgramDatabaseFile=".\Release/MetaContacts.pdb"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- BaseAddress="0x22010000"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile=".\Debug/MetaContacts.pdb"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
ImportLibrary="$(IntDir)/$(TargetName).lib"
- TargetMachine="1"
+ TargetMachine="17"
/>
<Tool
Name="VCALinkTool"
@@ -218,9 +208,9 @@
/>
</Configuration>
<Configuration
- Name="Debug|x64"
- OutputDirectory="$(PlatformName)\$(ConfigurationName)"
- IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ Name="Release|Win32"
+ OutputDirectory=".\Release"
+ IntermediateDirectory=".\Release"
ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"
UseOfMFC="2"
@@ -241,28 +231,36 @@
/>
<Tool
Name="VCMIDLTool"
- PreprocessorDefinitions="_DEBUG"
+ PreprocessorDefinitions="NDEBUG"
MkTypLibCompatible="true"
SuppressStartupBanner="true"
- TargetEnvironment="3"
- TypeLibraryName=".\Debug/MetaContacts.tlb"
+ TargetEnvironment="1"
+ TypeLibraryName=".\Release/MetaContacts.tlb"
/>
<Tool
Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="../../../include"
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;METACONTACTS_EXPORTS"
- BasicRuntimeChecks="3"
- RuntimeLibrary="1"
+ Optimization="1"
+ InlineFunctionExpansion="1"
+ EnableIntrinsicFunctions="true"
+ FavorSizeOrSpeed="2"
+ WholeProgramOptimization="true"
+ AdditionalIncludeDirectories="../../include"
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;METACONTACTS_EXPORTS"
+ StringPooling="true"
+ ExceptionHandling="0"
+ RuntimeLibrary="0"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="true"
+ FloatingPointModel="2"
+ RuntimeTypeInfo="false"
UsePrecompiledHeader="2"
PrecompiledHeaderThrough="metacontacts.h"
- AssemblerListingLocation=".\Debug/"
- ObjectFile=".\Debug/"
- ProgramDataBaseFileName=".\Debug/"
- BrowseInformation="1"
+ AssemblerListingLocation=".\Release/"
+ ObjectFile=".\Release/"
+ ProgramDataBaseFileName=".\Release/"
WarningLevel="3"
SuppressStartupBanner="true"
- DebugInformationFormat="3"
+ DebugInformationFormat="0"
ShowIncludes="false"
/>
<Tool
@@ -270,7 +268,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_AFXDLL;_DEBUG"
+ PreprocessorDefinitions="_AFXDLL;NDEBUG"
Culture="3081"
/>
<Tool
@@ -278,16 +276,18 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="user32.lib gdi32.lib comctl32.lib"
- OutputFile="c:\miranda im\Plugins\$(ProjectName).dll"
+ AdditionalDependencies="unicows.lib user32.lib gdi32.lib comctl32.lib"
LinkIncremental="1"
SuppressStartupBanner="true"
- GenerateDebugInformation="true"
- ProgramDatabaseFile=".\Debug/MetaContacts.pdb"
+ GenerateManifest="false"
+ ProgramDatabaseFile=".\Release/MetaContacts.pdb"
+ OptimizeReferences="2"
+ EnableCOMDATFolding="2"
+ BaseAddress="0x22010000"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
ImportLibrary="$(IntDir)/$(TargetName).lib"
- TargetMachine="17"
+ TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
@@ -437,21 +437,21 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Release|Win32"
+ Name="Debug|x64"
>
<Tool
Name="VCCLCompilerTool"
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;METACONTACTS_EXPORTS;_MBCS;_WINDLL;_AFXDLL;$(NoInherit)"
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;METACONTACTS_EXPORTS;_MBCS;_WINDLL;_AFXDLL;$(NoInherit)"
+ BasicRuntimeChecks="3"
+ BrowseInformation="1"
/>
</FileConfiguration>
<FileConfiguration
- Name="Debug|x64"
+ Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;METACONTACTS_EXPORTS;_MBCS;_WINDLL;_AFXDLL;$(NoInherit)"
- BasicRuntimeChecks="3"
- BrowseInformation="1"
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;METACONTACTS_EXPORTS;_MBCS;_WINDLL;_AFXDLL;$(NoInherit)"
/>
</FileConfiguration>
<FileConfiguration
@@ -477,21 +477,21 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Release|Win32"
+ Name="Debug|x64"
>
<Tool
Name="VCCLCompilerTool"
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;METACONTACTS_EXPORTS;_MBCS;_WINDLL;_AFXDLL;$(NoInherit)"
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;METACONTACTS_EXPORTS;_MBCS;_WINDLL;_AFXDLL;$(NoInherit)"
+ BasicRuntimeChecks="3"
+ BrowseInformation="1"
/>
</FileConfiguration>
<FileConfiguration
- Name="Debug|x64"
+ Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;METACONTACTS_EXPORTS;_MBCS;_WINDLL;_AFXDLL;$(NoInherit)"
- BasicRuntimeChecks="3"
- BrowseInformation="1"
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;METACONTACTS_EXPORTS;_MBCS;_WINDLL;_AFXDLL;$(NoInherit)"
/>
</FileConfiguration>
<FileConfiguration
@@ -521,21 +521,21 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Release|Win32"
+ Name="Debug|x64"
>
<Tool
Name="VCCLCompilerTool"
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;METACONTACTS_EXPORTS;_MBCS;_WINDLL;_AFXDLL;$(NoInherit)"
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;METACONTACTS_EXPORTS;_MBCS;_WINDLL;_AFXDLL;$(NoInherit)"
+ BasicRuntimeChecks="3"
+ BrowseInformation="1"
/>
</FileConfiguration>
<FileConfiguration
- Name="Debug|x64"
+ Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;METACONTACTS_EXPORTS;_MBCS;_WINDLL;_AFXDLL;$(NoInherit)"
- BasicRuntimeChecks="3"
- BrowseInformation="1"
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;METACONTACTS_EXPORTS;_MBCS;_WINDLL;_AFXDLL;$(NoInherit)"
/>
</FileConfiguration>
<FileConfiguration
@@ -562,23 +562,23 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Release|Win32"
+ Name="Debug|x64"
>
<Tool
Name="VCCLCompilerTool"
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;METACONTACTS_EXPORTS;_MBCS;_WINDLL;_AFXDLL;$(NoInherit)"
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;METACONTACTS_EXPORTS;_MBCS;_WINDLL;_AFXDLL;$(NoInherit)"
+ BasicRuntimeChecks="3"
UsePrecompiledHeader="1"
+ BrowseInformation="1"
/>
</FileConfiguration>
<FileConfiguration
- Name="Debug|x64"
+ Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;METACONTACTS_EXPORTS;_MBCS;_WINDLL;_AFXDLL;$(NoInherit)"
- BasicRuntimeChecks="3"
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;METACONTACTS_EXPORTS;_MBCS;_WINDLL;_AFXDLL;$(NoInherit)"
UsePrecompiledHeader="1"
- BrowseInformation="1"
/>
</FileConfiguration>
<FileConfiguration
@@ -605,21 +605,21 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Release|Win32"
+ Name="Debug|x64"
>
<Tool
Name="VCCLCompilerTool"
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;METACONTACTS_EXPORTS;_MBCS;_WINDLL;_AFXDLL;$(NoInherit)"
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;METACONTACTS_EXPORTS;_MBCS;_WINDLL;_AFXDLL;$(NoInherit)"
+ BasicRuntimeChecks="3"
+ BrowseInformation="1"
/>
</FileConfiguration>
<FileConfiguration
- Name="Debug|x64"
+ Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;METACONTACTS_EXPORTS;_MBCS;_WINDLL;_AFXDLL;$(NoInherit)"
- BasicRuntimeChecks="3"
- BrowseInformation="1"
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;METACONTACTS_EXPORTS;_MBCS;_WINDLL;_AFXDLL;$(NoInherit)"
/>
</FileConfiguration>
<FileConfiguration
@@ -645,21 +645,21 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Release|Win32"
+ Name="Debug|x64"
>
<Tool
Name="VCCLCompilerTool"
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;METACONTACTS_EXPORTS;_MBCS;_WINDLL;_AFXDLL;$(NoInherit)"
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;METACONTACTS_EXPORTS;_MBCS;_WINDLL;_AFXDLL;$(NoInherit)"
+ BasicRuntimeChecks="3"
+ BrowseInformation="1"
/>
</FileConfiguration>
<FileConfiguration
- Name="Debug|x64"
+ Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;METACONTACTS_EXPORTS;_MBCS;_WINDLL;_AFXDLL;$(NoInherit)"
- BasicRuntimeChecks="3"
- BrowseInformation="1"
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;METACONTACTS_EXPORTS;_MBCS;_WINDLL;_AFXDLL;$(NoInherit)"
/>
</FileConfiguration>
<FileConfiguration
@@ -685,21 +685,21 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Release|Win32"
+ Name="Debug|x64"
>
<Tool
Name="VCCLCompilerTool"
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;METACONTACTS_EXPORTS;_MBCS;_WINDLL;_AFXDLL;$(NoInherit)"
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;METACONTACTS_EXPORTS;_MBCS;_WINDLL;_AFXDLL;$(NoInherit)"
+ BasicRuntimeChecks="3"
+ BrowseInformation="1"
/>
</FileConfiguration>
<FileConfiguration
- Name="Debug|x64"
+ Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;METACONTACTS_EXPORTS;_MBCS;_WINDLL;_AFXDLL;$(NoInherit)"
- BasicRuntimeChecks="3"
- BrowseInformation="1"
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;METACONTACTS_EXPORTS;_MBCS;_WINDLL;_AFXDLL;$(NoInherit)"
/>
</FileConfiguration>
<FileConfiguration
@@ -725,21 +725,21 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Release|Win32"
+ Name="Debug|x64"
>
<Tool
Name="VCCLCompilerTool"
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;METACONTACTS_EXPORTS;_MBCS;_WINDLL;_AFXDLL;$(NoInherit)"
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;METACONTACTS_EXPORTS;_MBCS;_WINDLL;_AFXDLL;$(NoInherit)"
+ BasicRuntimeChecks="3"
+ BrowseInformation="1"
/>
</FileConfiguration>
<FileConfiguration
- Name="Debug|x64"
+ Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;METACONTACTS_EXPORTS;_MBCS;_WINDLL;_AFXDLL;$(NoInherit)"
- BasicRuntimeChecks="3"
- BrowseInformation="1"
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;METACONTACTS_EXPORTS;_MBCS;_WINDLL;_AFXDLL;$(NoInherit)"
/>
</FileConfiguration>
<FileConfiguration
@@ -817,7 +817,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Release|Win32"
+ Name="Debug|x64"
ExcludedFromBuild="true"
>
<Tool
@@ -825,7 +825,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Debug|x64"
+ Name="Release|Win32"
ExcludedFromBuild="true"
>
<Tool
@@ -861,7 +861,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Release|Win32"
+ Name="Debug|x64"
ExcludedFromBuild="true"
>
<Tool
@@ -869,7 +869,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Debug|x64"
+ Name="Release|Win32"
ExcludedFromBuild="true"
>
<Tool
diff --git a/metacontacts/addto.c b/metacontacts/addto.c
index 9f04088..3fcfcd2 100644
--- a/metacontacts/addto.c
+++ b/metacontacts/addto.c
@@ -84,7 +84,7 @@ int FillList(HWND list, BOOL sort)
// no? convert to unicode
if(szCDN) {
swzContactDisplayName = (wchar_t *) _alloca(sizeof(wchar_t) * (strlen(szCDN) + 1));
- MultiByteToWideChar(CP_ACP, 0, (char *) szCDN, -1, swzContactDisplayName, strlen((char *)szCDN) + 1);
+ MultiByteToWideChar(CP_ACP, 0, (char *) szCDN, -1, swzContactDisplayName, (int)strlen((char *)szCDN) + 1);
} else {
swzContactDisplayName = TranslateW(L"(Unknown Contact)");
}
@@ -223,7 +223,7 @@ INT_PTR CALLBACK Meta_SelectDialogProc(HWND hwndDlg, UINT msg, WPARAM wParam, LP
// no? convert to unicode
if(szCDN) {
swzContactDisplayName = (wchar_t *) _alloca(sizeof(wchar_t) * (strlen(szCDN) + 1));
- MultiByteToWideChar(CP_ACP, 0, (char *) szCDN, -1, swzContactDisplayName, strlen((char *)szCDN) + 1);
+ MultiByteToWideChar(CP_ACP, 0, (char *) szCDN, -1, swzContactDisplayName, (int)strlen((char *)szCDN) + 1);
} else {
swzContactDisplayName = TranslateW(L"a contact");
}
diff --git a/metacontacts/edit.c b/metacontacts/edit.c
index 8fcff80..9a5f55d 100644
--- a/metacontacts/edit.c
+++ b/metacontacts/edit.c
@@ -84,7 +84,7 @@ void FillContactList(HWND hWndDlg, CHANGES *chg) {
// no? convert to unicode
if(szCDN) {
swzContactDisplayName = (wchar_t *) _alloca(sizeof(wchar_t) * (strlen(szCDN) + 1));
- MultiByteToWideChar(CP_ACP, 0, (char *) szCDN, -1, swzContactDisplayName, strlen((char *)szCDN) + 1);
+ MultiByteToWideChar(CP_ACP, 0, (char *) szCDN, -1, swzContactDisplayName, (int)strlen((char *)szCDN) + 1);
} else {
swzContactDisplayName = TranslateW(L"(Unknown Contact)");
}
@@ -372,7 +372,7 @@ INT_PTR CALLBACK Meta_EditDialogProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPAR
// no? convert to unicode
if(szCDN) {
swzContactDisplayName = (wchar_t *) _alloca(sizeof(wchar_t) * (strlen(szCDN) + 1));
- MultiByteToWideChar(CP_ACP, 0, (char *) szCDN, -1, swzContactDisplayName, strlen((char *)szCDN) + 1);
+ MultiByteToWideChar(CP_ACP, 0, (char *) szCDN, -1, swzContactDisplayName, (int)strlen((char *)szCDN) + 1);
} else {
swzContactDisplayName = TranslateW(L"(Unknown Contact)");
}
diff --git a/metacontacts/meta_services.c b/metacontacts/meta_services.c
index 3676803..c008021 100644
--- a/metacontacts/meta_services.c
+++ b/metacontacts/meta_services.c
@@ -110,13 +110,13 @@ INT_PTR Meta_GetCaps(WPARAM wParam,LPARAM lParam)
| PF2_HEAVYDND | PF2_FREECHAT | PF2_OUTTOLUNCH | PF2_ONTHEPHONE;
break;
case PFLAG_UNIQUEIDTEXT:
- ret = (int) Translate("Meta ID");
+ ret = (INT_PTR) Translate("Meta ID");
break;
case PFLAG_MAXLENOFMESSAGE:
ret = 2000;
break;
case PFLAG_UNIQUEIDSETTING:
- ret = (int) META_ID;
+ ret = (INT_PTR) META_ID;
break;
}
return ret;
@@ -288,7 +288,7 @@ INT_PTR MetaFilter_SendMessage(WPARAM wParam,LPARAM lParam)
dbei.eventType = EVENTTYPE_MESSAGE;
if(ccs->wParam & PREF_RTL) dbei.flags |= DBEF_RTL;
if(ccs->wParam & PREF_UTF) dbei.flags |= DBEF_UTF;
- dbei.cbBlob = strlen((char *)ccs->lParam) + 1;
+ dbei.cbBlob = (DWORD)strlen((char *)ccs->lParam) + 1;
if ( ccs->wParam & PREF_UNICODE )
dbei.cbBlob *= ( sizeof( wchar_t )+1 );
dbei.pBlob = (PBYTE)ccs->lParam;
@@ -393,7 +393,7 @@ INT_PTR Meta_SendMessage(WPARAM wParam,LPARAM lParam)
dbei.eventType = EVENTTYPE_MESSAGE;
if(ccs->wParam & PREF_RTL) dbei.flags |= DBEF_RTL;
if(ccs->wParam & PREF_UTF) dbei.flags |= DBEF_UTF;
- dbei.cbBlob = strlen((char *)ccs->lParam) + 1;
+ dbei.cbBlob = (DWORD)strlen((char *)ccs->lParam) + 1;
if ( ccs->wParam & PREF_UNICODE )
dbei.cbBlob *= ( sizeof( wchar_t )+1 );
dbei.pBlob = (PBYTE)ccs->lParam;
@@ -404,7 +404,7 @@ INT_PTR Meta_SendMessage(WPARAM wParam,LPARAM lParam)
// prevent send filter from adding another copy of this send event to the db
ccs->wParam |= PREF_METANODB;
- return (int)(HANDLE)CallContactService(ccs->hContact, szServiceName, ccs->wParam, ccs->lParam);
+ return CallContactService(ccs->hContact, szServiceName, ccs->wParam, ccs->lParam);
}
}
@@ -501,7 +501,7 @@ INT_PTR MetaFilter_RecvMessage(WPARAM wParam,LPARAM lParam)
if(pre->flags & PREF_RTL) dbei.flags |= DBEF_RTL;
if(pre->flags & PREF_UTF) dbei.flags |= DBEF_UTF;
dbei.eventType = EVENTTYPE_MESSAGE;
- dbei.cbBlob = strlen(pre->szMessage) + 1;
+ dbei.cbBlob = (DWORD)strlen(pre->szMessage) + 1;
if ( pre->flags & PREF_UNICODE ) {
dbei.cbBlob *= ( sizeof( wchar_t )+1 );
}
@@ -595,7 +595,7 @@ INT_PTR Meta_RecvMessage(WPARAM wParam, LPARAM lParam)
if(pre->flags & PREF_RTL) dbei.flags |= DBEF_RTL;
if(pre->flags & PREF_UTF) dbei.flags |= DBEF_UTF;
dbei.eventType = EVENTTYPE_MESSAGE;
- dbei.cbBlob = strlen(pre->szMessage) + 1;
+ dbei.cbBlob = (DWORD)strlen(pre->szMessage) + 1;
if ( pre->flags & PREF_UNICODE )
dbei.cbBlob *= ( sizeof( wchar_t )+1 );
dbei.pBlob = (PBYTE) pre->szMessage;
@@ -1264,7 +1264,7 @@ int Meta_ModulesLoaded(WPARAM wParam, LPARAM lParam)
update.szComponentName = pluginInfo.shortName;
update.pbVersion = (BYTE *)CreateVersionString(pluginInfo.version, szVersion);
- update.cpbVersion = strlen((char *)update.pbVersion);
+ update.cpbVersion = (int)strlen((char *)update.pbVersion);
update.szBetaChangelogURL = "https://server.scottellis.com.au/wsvn/mim_plugs/metacontacts/?op=log&rev=0&sc=0&isdir=1";
update.szUpdateURL = UPDATER_AUTOREGISTER;
@@ -1277,7 +1277,7 @@ int Meta_ModulesLoaded(WPARAM wParam, LPARAM lParam)
update.szBetaVersionURL = "http://www.scottellis.com.au/miranda_plugins/ver_MetaContacts.html";
update.pbBetaVersionPrefix = (BYTE *)"MetaContacts Plugin, version ";
- update.cpbBetaVersionPrefix = strlen((char *)update.pbBetaVersionPrefix);
+ update.cpbBetaVersionPrefix = (int)strlen((char *)update.pbBetaVersionPrefix);
CallService(MS_UPDATE_REGISTER, 0, (WPARAM)&update);
}
@@ -1424,7 +1424,7 @@ int Meta_ModulesLoaded(WPARAM wParam, LPARAM lParam)
return 0;
}
-static DWORD CALLBACK sttMenuThread( LPVOID param )
+static DWORD CALLBACK sttMenuThread( DWORD_PTR param )
{
HMENU hMenu;
TPMPARAMS tpmp;
@@ -1477,7 +1477,7 @@ INT_PTR Meta_ContactMenuFunc(WPARAM wParam, LPARAM lParam) {
} else if(options.menu_function == FT_MENU) {
// show contact's context menu
- QueueUserAPC((PAPCFUNC)sttMenuThread, metaMainThread, (ULONG)hContact);
+ QueueUserAPC(sttMenuThread, metaMainThread, (ULONG_PTR)hContact);
} else if(options.menu_function == FT_INFO) {
// show user info for subcontact
CallService(MS_USERINFO_SHOWDIALOG, (WPARAM)hContact, 0);
diff --git a/metacontacts/meta_utils.c b/metacontacts/meta_utils.c
index a61db7e..38a9e69 100644
--- a/metacontacts/meta_utils.c
+++ b/metacontacts/meta_utils.c
@@ -1193,7 +1193,7 @@ void Meta_SetGroup(HANDLE hContact) {
if (proto)
uid = (char *)CallProtoService(proto, PS_GETCAPS, PFLAG_UNIQUEIDSETTING, 0);
- if(proto && uid && (int)uid != CALLSERVICE_NOTFOUND && !strcmp(JABBER_UNIQUE_ID_SETTING, uid)) {
+ if(proto && uid && (INT_PTR)uid != CALLSERVICE_NOTFOUND && !strcmp(JABBER_UNIQUE_ID_SETTING, uid)) {
// if it's a jabber contact, hide it, and record the fact that it was us who did
DBWriteContactSettingByte(hContact, META_PROTO, "Hidden", 1);
DBWriteContactSettingByte(hContact, "CList", "Hidden", 1);