diff options
| -rw-r--r-- | metacontacts/MetaContacts_9.sln | 6 | ||||
| -rw-r--r-- | metacontacts/MetaContacts_9.vcproj | 397 | ||||
| -rw-r--r-- | metacontacts/addto.c | 6 | ||||
| -rw-r--r-- | metacontacts/edit.c | 2 | ||||
| -rw-r--r-- | metacontacts/meta_api.c | 36 | ||||
| -rw-r--r-- | metacontacts/meta_menu.c | 54 | ||||
| -rw-r--r-- | metacontacts/meta_options.c | 4 | ||||
| -rw-r--r-- | metacontacts/meta_services.c | 44 | ||||
| -rw-r--r-- | metacontacts/meta_utils.c | 8 | ||||
| -rw-r--r-- | metacontacts/metacontacts.h | 169 |
10 files changed, 561 insertions, 165 deletions
diff --git a/metacontacts/MetaContacts_9.sln b/metacontacts/MetaContacts_9.sln index 29ed923..6847058 100644 --- a/metacontacts/MetaContacts_9.sln +++ b/metacontacts/MetaContacts_9.sln @@ -5,13 +5,19 @@ EndProject Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
+ Debug|x64 = Debug|x64
Release|Win32 = Release|Win32
+ Release|x64 = Release|x64
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{8B5D2F98-8F24-4F26-8E8B-00857F37530E}.Debug|Win32.ActiveCfg = Debug|Win32
{8B5D2F98-8F24-4F26-8E8B-00857F37530E}.Debug|Win32.Build.0 = Debug|Win32
+ {8B5D2F98-8F24-4F26-8E8B-00857F37530E}.Debug|x64.ActiveCfg = Debug|x64
+ {8B5D2F98-8F24-4F26-8E8B-00857F37530E}.Debug|x64.Build.0 = Debug|x64
{8B5D2F98-8F24-4F26-8E8B-00857F37530E}.Release|Win32.ActiveCfg = Release|Win32
{8B5D2F98-8F24-4F26-8E8B-00857F37530E}.Release|Win32.Build.0 = Release|Win32
+ {8B5D2F98-8F24-4F26-8E8B-00857F37530E}.Release|x64.ActiveCfg = Release|x64
+ {8B5D2F98-8F24-4F26-8E8B-00857F37530E}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/metacontacts/MetaContacts_9.vcproj b/metacontacts/MetaContacts_9.vcproj index bbd2de5..2e0db61 100644 --- a/metacontacts/MetaContacts_9.vcproj +++ b/metacontacts/MetaContacts_9.vcproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="Windows-1252"?>
+<?xml version="1.0" encoding="windows-1251"?>
<VisualStudioProject
ProjectType="Visual C++"
Version="9.00"
@@ -12,6 +12,9 @@ <Platform
Name="Win32"
/>
+ <Platform
+ Name="x64"
+ />
</Platforms>
<ToolFiles>
</ToolFiles>
@@ -49,7 +52,7 @@ <Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="../../include"
+ AdditionalIncludeDirectories="../../../include"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;METACONTACTS_EXPORTS"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
@@ -77,8 +80,8 @@ />
<Tool
Name="VCLinkerTool"
- AdditionalOptions="/MACHINE:I386"
AdditionalDependencies="unicows.lib user32.lib gdi32.lib comctl32.lib"
+ OutputFile="c:\miranda im\Plugins\$(ProjectName).dll"
LinkIncremental="1"
SuppressStartupBanner="true"
GenerateDebugInformation="true"
@@ -86,6 +89,7 @@ RandomizedBaseAddress="1"
DataExecutionPrevention="0"
ImportLibrary="$(IntDir)/$(TargetName).lib"
+ TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
@@ -143,11 +147,18 @@ 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"
UsePrecompiledHeader="2"
PrecompiledHeaderThrough="metacontacts.h"
AssemblerListingLocation=".\Release/"
@@ -171,16 +182,216 @@ />
<Tool
Name="VCLinkerTool"
- AdditionalOptions="/MACHINE:I386"
AdditionalDependencies="unicows.lib user32.lib gdi32.lib comctl32.lib"
LinkIncremental="1"
SuppressStartupBanner="true"
GenerateManifest="false"
ProgramDatabaseFile=".\Release/MetaContacts.pdb"
+ OptimizeReferences="2"
+ EnableCOMDATFolding="2"
+ BaseAddress="0x22010000"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ ImportLibrary="$(IntDir)/$(TargetName).lib"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug|x64"
+ OutputDirectory="$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="2"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"
+ UseOfMFC="2"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ PreprocessorDefinitions="_DEBUG"
+ MkTypLibCompatible="true"
+ SuppressStartupBanner="true"
+ TargetEnvironment="3"
+ TypeLibraryName=".\Debug/MetaContacts.tlb"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="../../../include"
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;METACONTACTS_EXPORTS"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="1"
+ UsePrecompiledHeader="2"
+ PrecompiledHeaderThrough="metacontacts.h"
+ AssemblerListingLocation=".\Debug/"
+ ObjectFile=".\Debug/"
+ ProgramDataBaseFileName=".\Debug/"
+ BrowseInformation="1"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ ShowIncludes="false"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_AFXDLL;_DEBUG"
+ Culture="3081"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="user32.lib gdi32.lib comctl32.lib"
+ OutputFile="c:\miranda im\Plugins\$(ProjectName).dll"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile=".\Debug/MetaContacts.pdb"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ ImportLibrary="$(IntDir)/$(TargetName).lib"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|x64"
+ OutputDirectory="$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="2"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"
+ UseOfMFC="2"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ PreprocessorDefinitions="NDEBUG"
+ MkTypLibCompatible="true"
+ SuppressStartupBanner="true"
+ TargetEnvironment="3"
+ TypeLibraryName=".\Release/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"
+ UsePrecompiledHeader="2"
+ PrecompiledHeaderThrough="metacontacts.h"
+ AssemblerListingLocation=".\Release/"
+ ObjectFile=".\Release/"
+ ProgramDataBaseFileName=".\Release/"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="0"
+ ShowIncludes="false"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_AFXDLL;NDEBUG"
+ Culture="3081"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="user32.lib gdi32.lib comctl32.lib"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ GenerateManifest="false"
+ ProgramDatabaseFile=".\Release/MetaContacts.pdb"
+ OptimizeReferences="2"
+ EnableCOMDATFolding="2"
BaseAddress="0x22010000"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
ImportLibrary="$(IntDir)/$(TargetName).lib"
+ TargetMachine="17"
/>
<Tool
Name="VCALinkTool"
@@ -233,6 +444,24 @@ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;METACONTACTS_EXPORTS;_MBCS;_WINDLL;_AFXDLL;$(NoInherit)"
/>
</FileConfiguration>
+ <FileConfiguration
+ Name="Debug|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;METACONTACTS_EXPORTS;_MBCS;_WINDLL;_AFXDLL;$(NoInherit)"
+ BasicRuntimeChecks="3"
+ BrowseInformation="1"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;METACONTACTS_EXPORTS;_MBCS;_WINDLL;_AFXDLL;$(NoInherit)"
+ />
+ </FileConfiguration>
</File>
<File
RelativePath="edit.c"
@@ -255,6 +484,24 @@ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;METACONTACTS_EXPORTS;_MBCS;_WINDLL;_AFXDLL;$(NoInherit)"
/>
</FileConfiguration>
+ <FileConfiguration
+ Name="Debug|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;METACONTACTS_EXPORTS;_MBCS;_WINDLL;_AFXDLL;$(NoInherit)"
+ BasicRuntimeChecks="3"
+ BrowseInformation="1"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;METACONTACTS_EXPORTS;_MBCS;_WINDLL;_AFXDLL;$(NoInherit)"
+ />
+ </FileConfiguration>
</File>
<File
RelativePath=".\icons.c"
@@ -281,6 +528,24 @@ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;METACONTACTS_EXPORTS;_MBCS;_WINDLL;_AFXDLL;$(NoInherit)"
/>
</FileConfiguration>
+ <FileConfiguration
+ Name="Debug|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;METACONTACTS_EXPORTS;_MBCS;_WINDLL;_AFXDLL;$(NoInherit)"
+ BasicRuntimeChecks="3"
+ BrowseInformation="1"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;METACONTACTS_EXPORTS;_MBCS;_WINDLL;_AFXDLL;$(NoInherit)"
+ />
+ </FileConfiguration>
</File>
<File
RelativePath="meta_main.c"
@@ -305,6 +570,26 @@ UsePrecompiledHeader="1"
/>
</FileConfiguration>
+ <FileConfiguration
+ Name="Debug|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;METACONTACTS_EXPORTS;_MBCS;_WINDLL;_AFXDLL;$(NoInherit)"
+ BasicRuntimeChecks="3"
+ UsePrecompiledHeader="1"
+ BrowseInformation="1"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;METACONTACTS_EXPORTS;_MBCS;_WINDLL;_AFXDLL;$(NoInherit)"
+ UsePrecompiledHeader="1"
+ />
+ </FileConfiguration>
</File>
<File
RelativePath="meta_menu.c"
@@ -327,6 +612,24 @@ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;METACONTACTS_EXPORTS;_MBCS;_WINDLL;_AFXDLL;$(NoInherit)"
/>
</FileConfiguration>
+ <FileConfiguration
+ Name="Debug|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;METACONTACTS_EXPORTS;_MBCS;_WINDLL;_AFXDLL;$(NoInherit)"
+ BasicRuntimeChecks="3"
+ BrowseInformation="1"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;METACONTACTS_EXPORTS;_MBCS;_WINDLL;_AFXDLL;$(NoInherit)"
+ />
+ </FileConfiguration>
</File>
<File
RelativePath="meta_options.c"
@@ -349,6 +652,24 @@ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;METACONTACTS_EXPORTS;_MBCS;_WINDLL;_AFXDLL;$(NoInherit)"
/>
</FileConfiguration>
+ <FileConfiguration
+ Name="Debug|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;METACONTACTS_EXPORTS;_MBCS;_WINDLL;_AFXDLL;$(NoInherit)"
+ BasicRuntimeChecks="3"
+ BrowseInformation="1"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;METACONTACTS_EXPORTS;_MBCS;_WINDLL;_AFXDLL;$(NoInherit)"
+ />
+ </FileConfiguration>
</File>
<File
RelativePath="meta_services.c"
@@ -371,6 +692,24 @@ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;METACONTACTS_EXPORTS;_MBCS;_WINDLL;_AFXDLL;$(NoInherit)"
/>
</FileConfiguration>
+ <FileConfiguration
+ Name="Debug|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;METACONTACTS_EXPORTS;_MBCS;_WINDLL;_AFXDLL;$(NoInherit)"
+ BasicRuntimeChecks="3"
+ BrowseInformation="1"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;METACONTACTS_EXPORTS;_MBCS;_WINDLL;_AFXDLL;$(NoInherit)"
+ />
+ </FileConfiguration>
</File>
<File
RelativePath="meta_utils.c"
@@ -393,6 +732,24 @@ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;METACONTACTS_EXPORTS;_MBCS;_WINDLL;_AFXDLL;$(NoInherit)"
/>
</FileConfiguration>
+ <FileConfiguration
+ Name="Debug|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;METACONTACTS_EXPORTS;_MBCS;_WINDLL;_AFXDLL;$(NoInherit)"
+ BasicRuntimeChecks="3"
+ BrowseInformation="1"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;METACONTACTS_EXPORTS;_MBCS;_WINDLL;_AFXDLL;$(NoInherit)"
+ />
+ </FileConfiguration>
</File>
</Filter>
<Filter
@@ -467,6 +824,22 @@ Name="VCResourceCompilerTool"
/>
</FileConfiguration>
+ <FileConfiguration
+ Name="Debug|x64"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|x64"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ </FileConfiguration>
</File>
<File
RelativePath="resource.h"
@@ -495,6 +868,22 @@ Name="VCResourceCompilerTool"
/>
</FileConfiguration>
+ <FileConfiguration
+ Name="Debug|x64"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|x64"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ </FileConfiguration>
</File>
</Filter>
<Filter
diff --git a/metacontacts/addto.c b/metacontacts/addto.c index ef40eaa..9f04088 100644 --- a/metacontacts/addto.c +++ b/metacontacts/addto.c @@ -163,7 +163,7 @@ int BuildList(HWND list, BOOL sort) *
* @return \c TRUE if the dialog processed the message, \c FALSE if it did not.
*/
-BOOL CALLBACK Meta_SelectDialogProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
+INT_PTR CALLBACK Meta_SelectDialogProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
{
switch(msg)
{
@@ -187,7 +187,7 @@ BOOL CALLBACK Meta_SelectDialogProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA return TRUE;
}
- SetWindowLong(hwndDlg, GWL_USERDATA, lParam); // user data is contact handle
+ SetWindowLongPtr(hwndDlg, GWLP_USERDATA, lParam); // user data is contact handle
SendMessage(hwndDlg, WM_SETICON, ICON_BIG, (LPARAM)LoadIconEx(I_ADD));
//SendMessage(GetDlgItem(hwndDlg,IDC_METALIST),LVM_SETEXTENDEDLISTVIEWSTYLE,0,LVS_EX_FULLROWSELECT);
@@ -255,7 +255,7 @@ BOOL CALLBACK Meta_SelectDialogProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA {
case IDOK:
{
- HANDLE hMeta, hContact = (HANDLE)GetWindowLong(hwndDlg, GWL_USERDATA);
+ HANDLE hMeta, hContact = (HANDLE)GetWindowLongPtr(hwndDlg, GWLP_USERDATA);
int item; // Get the index of the selected metacontact
if((item = SendMessage(GetDlgItem(hwndDlg, IDC_METALIST),LB_GETCURSEL, 0, 0))==-1)
return IDOK == MessageBox(hwndDlg,Translate("Please select a MetaContact"),Translate("No MetaContact selected"),MB_ICONHAND);
diff --git a/metacontacts/edit.c b/metacontacts/edit.c index 2ff323e..8fcff80 100644 --- a/metacontacts/edit.c +++ b/metacontacts/edit.c @@ -275,7 +275,7 @@ LRESULT ProcessCustomDraw (LPARAM lParam) */
#define WMU_SETTITLE (WM_USER + 1)
-BOOL CALLBACK Meta_EditDialogProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
+INT_PTR CALLBACK Meta_EditDialogProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
{
HWND hwnd;
char *str;
diff --git a/metacontacts/meta_api.c b/metacontacts/meta_api.c index d84e469..bf3aed5 100644 --- a/metacontacts/meta_api.c +++ b/metacontacts/meta_api.c @@ -31,7 +31,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. //wParam=(HANDLE)hSubContact
//lParam=0
//returns a handle to the parent metacontact, or null if this contact is not a subcontact
-int MetaAPI_GetMeta(WPARAM wParam, LPARAM lParam) {
+INT_PTR MetaAPI_GetMeta(WPARAM wParam, LPARAM lParam) {
return (int)(HANDLE)DBGetContactSettingDword((HANDLE)wParam, META_PROTO, "Handle", 0);
}
@@ -39,7 +39,7 @@ int MetaAPI_GetMeta(WPARAM wParam, LPARAM lParam) { //wParam=(HANDLE)hMetaContact
//lParam=0
//returns a handle to the default contact, or null on failure
-int MetaAPI_GetDefault(WPARAM wParam, LPARAM lParam) {
+INT_PTR MetaAPI_GetDefault(WPARAM wParam, LPARAM lParam) {
DWORD default_contact_number = DBGetContactSettingDword((HANDLE)wParam, META_PROTO, "Default", -1);
if(default_contact_number != -1) {
return (int)Meta_GetContactHandle((HANDLE)wParam, default_contact_number);
@@ -51,7 +51,7 @@ int MetaAPI_GetDefault(WPARAM wParam, LPARAM lParam) { //wParam=(HANDLE)hMetaContact
//lParam=0
//returns a DWORD contact number, or -1 on failure
-int MetaAPI_GetDefaultNum(WPARAM wParam, LPARAM lParam) {
+INT_PTR MetaAPI_GetDefaultNum(WPARAM wParam, LPARAM lParam) {
return DBGetContactSettingDword((HANDLE)wParam, META_PROTO, "Default", -1);
}
@@ -59,7 +59,7 @@ int MetaAPI_GetDefaultNum(WPARAM wParam, LPARAM lParam) { //wParam=(HANDLE)hMetaContact
//lParam=0
//returns a handle to the 'most online' contact
-int MetaAPI_GetMostOnline(WPARAM wParam, LPARAM lParam) {
+INT_PTR MetaAPI_GetMostOnline(WPARAM wParam, LPARAM lParam) {
return (int)Meta_GetMostOnline((HANDLE)wParam);
}
@@ -67,7 +67,7 @@ int MetaAPI_GetMostOnline(WPARAM wParam, LPARAM lParam) { //wParam=(HANDLE)hMetaContact
//lParam=0
//returns a DWORD representing the number of subcontacts for the given metacontact
-int MetaAPI_GetNumContacts(WPARAM wParam, LPARAM lParam) {
+INT_PTR MetaAPI_GetNumContacts(WPARAM wParam, LPARAM lParam) {
DWORD num_contacts = DBGetContactSettingDword((HANDLE)wParam, META_PROTO, "NumContacts", -1);
return num_contacts;
}
@@ -76,7 +76,7 @@ int MetaAPI_GetNumContacts(WPARAM wParam, LPARAM lParam) { //wParam=(HANDLE)hMetaContact
//lParam=(DWORD)contact number
//returns a handle to the specified subcontact
-int MetaAPI_GetContact(WPARAM wParam, LPARAM lParam) {
+INT_PTR MetaAPI_GetContact(WPARAM wParam, LPARAM lParam) {
return (int)Meta_GetContactHandle((HANDLE)wParam, (DWORD)lParam);
}
@@ -84,7 +84,7 @@ int MetaAPI_GetContact(WPARAM wParam, LPARAM lParam) { //wParam=(HANDLE)hMetaContact
//lParam=(DWORD)contact number
//returns 0 on success
-int MetaAPI_SetDefaultContactNum(WPARAM wParam, LPARAM lParam) {
+INT_PTR MetaAPI_SetDefaultContactNum(WPARAM wParam, LPARAM lParam) {
DWORD num_contacts = DBGetContactSettingDword((HANDLE)wParam, META_PROTO, "NumContacts", -1);
if(num_contacts == -1)
return 1;
@@ -101,7 +101,7 @@ int MetaAPI_SetDefaultContactNum(WPARAM wParam, LPARAM lParam) { //wParam=(HANDLE)hMetaContact
//lParam=(HANDLE)hSubcontact
//returns 0 on success
-int MetaAPI_SetDefaultContact(WPARAM wParam, LPARAM lParam) {
+INT_PTR MetaAPI_SetDefaultContact(WPARAM wParam, LPARAM lParam) {
HANDLE hMeta = (HANDLE)DBGetContactSettingDword((HANDLE)lParam, META_PROTO, "Handle", 0);
DWORD contact_number = Meta_GetContactNumber((HANDLE)lParam);
if(contact_number == -1 || !hMeta || hMeta != (HANDLE)wParam)
@@ -117,7 +117,7 @@ int MetaAPI_SetDefaultContact(WPARAM wParam, LPARAM lParam) { //wParam=(HANDLE)hMetaContact
//lParam=(DWORD)contact number
//returns 0 on success
-int MetaAPI_ForceSendContactNum(WPARAM wParam, LPARAM lParam) {
+INT_PTR MetaAPI_ForceSendContactNum(WPARAM wParam, LPARAM lParam) {
HANDLE hContact = Meta_GetContactHandle((HANDLE)wParam, (int)lParam);
HANDLE hMeta = (HANDLE)DBGetContactSettingDword(hContact, META_PROTO, "Handle", 0);
if(!hContact || !hMeta || hMeta != (HANDLE)wParam || DBGetContactSettingByte(hMeta, META_PROTO, "ForceDefault", 0))
@@ -133,7 +133,7 @@ int MetaAPI_ForceSendContactNum(WPARAM wParam, LPARAM lParam) { //wParam=(HANDLE)hMetaContact
//lParam=(HANDLE)hSubcontact
//returns 0 on success (will fail if 'force default' is in effect)
-int MetaAPI_ForceSendContact(WPARAM wParam, LPARAM lParam) {
+INT_PTR MetaAPI_ForceSendContact(WPARAM wParam, LPARAM lParam) {
HANDLE hContact = (HANDLE)lParam;
HANDLE hMeta = (HANDLE)DBGetContactSettingDword(hContact, META_PROTO, "Handle", 0);
if(!hContact || !hMeta || hMeta != (HANDLE)wParam || DBGetContactSettingByte(hMeta, META_PROTO, "ForceDefault", 0))
@@ -149,7 +149,7 @@ int MetaAPI_ForceSendContact(WPARAM wParam, LPARAM lParam) { //wParam=(HANDLE)hMetaContact
//lParam=0
//returns 0 on success (will fail if 'force default' is in effect)
-int MetaAPI_UnforceSendContact(WPARAM wParam, LPARAM lParam) {
+INT_PTR MetaAPI_UnforceSendContact(WPARAM wParam, LPARAM lParam) {
if(DBGetContactSettingByte((HANDLE)wParam, META_PROTO, "ForceDefault", 0))
return 1;
@@ -166,7 +166,7 @@ int MetaAPI_UnforceSendContact(WPARAM wParam, LPARAM lParam) { //wParam=(HANDLE)hMetaContact
//lParam=0
//returns 1(true) or 0(false) representing new state of 'force default'
-int MetaAPI_ForceDefault(WPARAM wParam, LPARAM lParam) {
+INT_PTR MetaAPI_ForceDefault(WPARAM wParam, LPARAM lParam) {
// forward to menu function
Meta_ForceDefault(wParam, lParam);
return DBGetContactSettingByte((HANDLE)wParam, META_PROTO, "ForceDefault", 0);
@@ -178,7 +178,7 @@ int MetaAPI_ForceDefault(WPARAM wParam, LPARAM lParam) { // if lparam supplied, the contact_number of the contatct 'in force' will be copied to the address it points to,
// or if none is in force, the value (DWORD)-1 will be copied
// (v0.8.0.8+ returns 1 if 'force default' is true with *lParam == default contact number, else returns 0 with *lParam as above)
-int MetaAPI_GetForceState(WPARAM wParam, LPARAM lParam) {
+INT_PTR MetaAPI_GetForceState(WPARAM wParam, LPARAM lParam) {
HANDLE hMeta = (HANDLE)wParam;
HANDLE hContact;
@@ -202,7 +202,7 @@ int MetaAPI_GetForceState(WPARAM wParam, LPARAM lParam) { // method to get protocol name - used to be sure you're dealing with a "real" metacontacts plugin :)
// wParam=lParam=0
-int MetaAPI_GetProtoName(WPARAM wParam, LPARAM lParam) {
+INT_PTR MetaAPI_GetProtoName(WPARAM wParam, LPARAM lParam) {
return (int)META_PROTO;
}
@@ -210,7 +210,7 @@ int MetaAPI_GetProtoName(WPARAM wParam, LPARAM lParam) { // wParam=(HANDLE)hContact
// lParam=0
// convert a given contact into a metacontact
-int MetaAPI_ConvertToMeta(WPARAM wParam, LPARAM lParam) {
+INT_PTR MetaAPI_ConvertToMeta(WPARAM wParam, LPARAM lParam) {
return Meta_Convert(wParam, lParam);
}
@@ -218,7 +218,7 @@ int MetaAPI_ConvertToMeta(WPARAM wParam, LPARAM lParam) { // wParam=(HANDLE)hContact
// lParam=(HANDLE)hMeta
// add an existing contact to a metacontact
-int MetaAPI_AddToMeta(WPARAM wParam, LPARAM lParam) {
+INT_PTR MetaAPI_AddToMeta(WPARAM wParam, LPARAM lParam) {
return Meta_Assign((HANDLE)wParam, (HANDLE)lParam, FALSE);
}
@@ -226,7 +226,7 @@ int MetaAPI_AddToMeta(WPARAM wParam, LPARAM lParam) { // wParam=0
// lParam=(HANDLE)hContact
// remove a contact from a metacontact
-int MetaAPI_RemoveFromMeta(WPARAM wParam, LPARAM lParam) {
+INT_PTR MetaAPI_RemoveFromMeta(WPARAM wParam, LPARAM lParam) {
// notice we switch args - to keep the API function consistent with the others
return Meta_Delete((WPARAM)lParam, (LPARAM)wParam);
}
@@ -239,7 +239,7 @@ int MetaAPI_RemoveFromMeta(WPARAM wParam, LPARAM lParam) { BOOL meta_group_hack_disabled = FALSE; // this global flag is used in utils 'SetGroup' function
-int MetaAPI_DisableHiddenGroup(WPARAM wParam, LPARAM lParam) {
+INT_PTR MetaAPI_DisableHiddenGroup(WPARAM wParam, LPARAM lParam) {
meta_group_hack_disabled = (BOOL)wParam;
return 0;
}
diff --git a/metacontacts/meta_menu.c b/metacontacts/meta_menu.c index 4165c3b..36caabf 100644 --- a/metacontacts/meta_menu.c +++ b/metacontacts/meta_menu.c @@ -35,7 +35,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * @param wParam : \c HANDLE to the contact that has been chosen.
* @param lParam : Allways set to 0.
*/
-int Meta_Convert(WPARAM wParam,LPARAM lParam)
+INT_PTR Meta_Convert(WPARAM wParam,LPARAM lParam)
{
HANDLE hMetaContact;
DBVARIANT dbv;
@@ -97,7 +97,7 @@ int Meta_Convert(WPARAM wParam,LPARAM lParam) * @param wParam : \c HANDLE to the contact that has been chosen.
* @param lParam : Allways set to 0.
*/
-int Meta_AddTo(WPARAM wParam, LPARAM lParam)
+INT_PTR Meta_AddTo(WPARAM wParam, LPARAM lParam)
{
HWND clui = (HWND)CallService(MS_CLUI_GETHWND,0,0);
DialogBoxParam(hInstance,MAKEINTRESOURCE(IDD_METASELECT),clui,&Meta_SelectDialogProc,(LPARAM)wParam);
@@ -111,7 +111,7 @@ int Meta_AddTo(WPARAM wParam, LPARAM lParam) * @param wParam : \c HANDLE to the MetaContact to be edited.
* @param lParam : Allways set to 0.
*/
-int Meta_Edit(WPARAM wParam,LPARAM lParam)
+INT_PTR Meta_Edit(WPARAM wParam,LPARAM lParam)
{
HWND clui = (HWND)CallService(MS_CLUI_GETHWND,0,0);
DialogBoxParam(hInstance,MAKEINTRESOURCE(IDD_METAEDIT),clui,Meta_EditDialogProc,(LPARAM)wParam);
@@ -245,7 +245,7 @@ void Meta_RemoveContactNumber(HANDLE hMeta, int number) { * @param wParam : \c HANDLE to the MetaContact to be deleted, or to the subcontact to be removed from the MetaContact
* @param lParam : \c BOOL flag indicating whether to ask 'are you sure' when deleting a MetaContact
*/
-int Meta_Delete(WPARAM wParam,LPARAM lParam)
+INT_PTR Meta_Delete(WPARAM wParam,LPARAM lParam)
{
DWORD metaID;
HANDLE hContact;
@@ -323,7 +323,7 @@ int Meta_Delete(WPARAM wParam,LPARAM lParam) * @param lParam : \c HWND to the clist window
(This means the function has been called via the contact menu).
*/
-int Meta_Default(WPARAM wParam,LPARAM lParam)
+INT_PTR Meta_Default(WPARAM wParam,LPARAM lParam)
{
HANDLE hMeta;
@@ -343,7 +343,7 @@ int Meta_Default(WPARAM wParam,LPARAM lParam) * @param lParam : \c HWND to the clist window
(This means the function has been called via the contact menu).
*/
-int Meta_ForceDefault(WPARAM wParam,LPARAM lParam)
+INT_PTR Meta_ForceDefault(WPARAM wParam,LPARAM lParam)
{
if(DBGetContactSettingDword((HANDLE)wParam,META_PROTO, META_ID, (DWORD)-1) != (DWORD)-1)
{ // the wParam is a MetaContact
@@ -360,30 +360,30 @@ int Meta_ForceDefault(WPARAM wParam,LPARAM lParam) return 0;
}
-int MenuFunc0(WPARAM wParam, LPARAM lParam) {return TranslateMenuFunc((HANDLE)wParam, 0);}
-int MenuFunc1(WPARAM wParam, LPARAM lParam) {return TranslateMenuFunc((HANDLE)wParam, 1);}
-int MenuFunc2(WPARAM wParam, LPARAM lParam) {return TranslateMenuFunc((HANDLE)wParam, 2);}
-int MenuFunc3(WPARAM wParam, LPARAM lParam) {return TranslateMenuFunc((HANDLE)wParam, 3);}
-int MenuFunc4(WPARAM wParam, LPARAM lParam) {return TranslateMenuFunc((HANDLE)wParam, 4);}
-int MenuFunc5(WPARAM wParam, LPARAM lParam) {return TranslateMenuFunc((HANDLE)wParam, 5);}
-int MenuFunc6(WPARAM wParam, LPARAM lParam) {return TranslateMenuFunc((HANDLE)wParam, 6);}
-int MenuFunc7(WPARAM wParam, LPARAM lParam) {return TranslateMenuFunc((HANDLE)wParam, 7);}
-int MenuFunc8(WPARAM wParam, LPARAM lParam) {return TranslateMenuFunc((HANDLE)wParam, 8);}
-int MenuFunc9(WPARAM wParam, LPARAM lParam) {return TranslateMenuFunc((HANDLE)wParam, 9);}
-int MenuFunc10(WPARAM wParam, LPARAM lParam) {return TranslateMenuFunc((HANDLE)wParam, 10);}
-int MenuFunc11(WPARAM wParam, LPARAM lParam) {return TranslateMenuFunc((HANDLE)wParam, 11);}
-int MenuFunc12(WPARAM wParam, LPARAM lParam) {return TranslateMenuFunc((HANDLE)wParam, 12);}
-int MenuFunc13(WPARAM wParam, LPARAM lParam) {return TranslateMenuFunc((HANDLE)wParam, 13);}
-int MenuFunc14(WPARAM wParam, LPARAM lParam) {return TranslateMenuFunc((HANDLE)wParam, 14);}
-int MenuFunc15(WPARAM wParam, LPARAM lParam) {return TranslateMenuFunc((HANDLE)wParam, 15);}
-int MenuFunc16(WPARAM wParam, LPARAM lParam) {return TranslateMenuFunc((HANDLE)wParam, 16);}
-int MenuFunc17(WPARAM wParam, LPARAM lParam) {return TranslateMenuFunc((HANDLE)wParam, 17);}
-int MenuFunc18(WPARAM wParam, LPARAM lParam) {return TranslateMenuFunc((HANDLE)wParam, 18);}
-int MenuFunc19(WPARAM wParam, LPARAM lParam) {return TranslateMenuFunc((HANDLE)wParam, 19);}
+INT_PTR MenuFunc0(WPARAM wParam, LPARAM lParam) {return TranslateMenuFunc((HANDLE)wParam, 0);}
+INT_PTR MenuFunc1(WPARAM wParam, LPARAM lParam) {return TranslateMenuFunc((HANDLE)wParam, 1);}
+INT_PTR MenuFunc2(WPARAM wParam, LPARAM lParam) {return TranslateMenuFunc((HANDLE)wParam, 2);}
+INT_PTR MenuFunc3(WPARAM wParam, LPARAM lParam) {return TranslateMenuFunc((HANDLE)wParam, 3);}
+INT_PTR MenuFunc4(WPARAM wParam, LPARAM lParam) {return TranslateMenuFunc((HANDLE)wParam, 4);}
+INT_PTR MenuFunc5(WPARAM wParam, LPARAM lParam) {return TranslateMenuFunc((HANDLE)wParam, 5);}
+INT_PTR MenuFunc6(WPARAM wParam, LPARAM lParam) {return TranslateMenuFunc((HANDLE)wParam, 6);}
+INT_PTR MenuFunc7(WPARAM wParam, LPARAM lParam) {return TranslateMenuFunc((HANDLE)wParam, 7);}
+INT_PTR MenuFunc8(WPARAM wParam, LPARAM lParam) {return TranslateMenuFunc((HANDLE)wParam, 8);}
+INT_PTR MenuFunc9(WPARAM wParam, LPARAM lParam) {return TranslateMenuFunc((HANDLE)wParam, 9);}
+INT_PTR MenuFunc10(WPARAM wParam, LPARAM lParam) {return TranslateMenuFunc((HANDLE)wParam, 10);}
+INT_PTR MenuFunc11(WPARAM wParam, LPARAM lParam) {return TranslateMenuFunc((HANDLE)wParam, 11);}
+INT_PTR MenuFunc12(WPARAM wParam, LPARAM lParam) {return TranslateMenuFunc((HANDLE)wParam, 12);}
+INT_PTR MenuFunc13(WPARAM wParam, LPARAM lParam) {return TranslateMenuFunc((HANDLE)wParam, 13);}
+INT_PTR MenuFunc14(WPARAM wParam, LPARAM lParam) {return TranslateMenuFunc((HANDLE)wParam, 14);}
+INT_PTR MenuFunc15(WPARAM wParam, LPARAM lParam) {return TranslateMenuFunc((HANDLE)wParam, 15);}
+INT_PTR MenuFunc16(WPARAM wParam, LPARAM lParam) {return TranslateMenuFunc((HANDLE)wParam, 16);}
+INT_PTR MenuFunc17(WPARAM wParam, LPARAM lParam) {return TranslateMenuFunc((HANDLE)wParam, 17);}
+INT_PTR MenuFunc18(WPARAM wParam, LPARAM lParam) {return TranslateMenuFunc((HANDLE)wParam, 18);}
+INT_PTR MenuFunc19(WPARAM wParam, LPARAM lParam) {return TranslateMenuFunc((HANDLE)wParam, 19);}
HANDLE hMenuContact[MAX_CONTACTS];
-int TranslateMenuFunc(HANDLE hMeta, int contact_number) {
+INT_PTR TranslateMenuFunc(HANDLE hMeta, int contact_number) {
return Meta_ContactMenuFunc((WPARAM)hMeta, (LPARAM) contact_number);
}
diff --git a/metacontacts/meta_options.c b/metacontacts/meta_options.c index b6f7c57..0540bd0 100644 --- a/metacontacts/meta_options.c +++ b/metacontacts/meta_options.c @@ -30,7 +30,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. MetaOptions options;
MetaOptions options_changes;
-BOOL CALLBACK DlgProcOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
+INT_PTR CALLBACK DlgProcOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
{
HWND hw;
char buff[512];
@@ -468,7 +468,7 @@ void ResetPriorities() { #define WMU_FILLSTATUSCMB (WM_USER + 0x100)
#define WMU_FILLPRIODATA (WM_USER + 0x101)
-BOOL CALLBACK DlgProcOptsPriorities(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
+INT_PTR CALLBACK DlgProcOptsPriorities(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
{
HWND hw;
diff --git a/metacontacts/meta_services.c b/metacontacts/meta_services.c index 456bd9e..91422bd 100644 --- a/metacontacts/meta_services.c +++ b/metacontacts/meta_services.c @@ -80,7 +80,7 @@ BOOL firstSetOnline = TRUE; // see Meta_SetStatus function *
* @return Depending on the \c WPARAM.
*/
-int Meta_GetCaps(WPARAM wParam,LPARAM lParam)
+INT_PTR Meta_GetCaps(WPARAM wParam,LPARAM lParam)
{
int ret = 0;
switch (wParam) {
@@ -126,7 +126,7 @@ int Meta_GetCaps(WPARAM wParam,LPARAM lParam) * @param wParam : max size of the name
* @param lParam : reference to a char *, which will hold the name
*/
-int Meta_GetName(WPARAM wParam,LPARAM lParam)
+INT_PTR Meta_GetName(WPARAM wParam,LPARAM lParam)
{
char *name = (char *)Translate(META_PROTO);
size_t size = min(strlen(name),wParam-1); // copy only the first size bytes.
@@ -142,7 +142,7 @@ int Meta_GetName(WPARAM wParam,LPARAM lParam) <tt>PLI_PROTOCOL | PLI_ONLINE | PLI_OFFLINE</tt>
* @return an \c HICON in which the icon has been loaded.
*/
-int Meta_LoadIcon(WPARAM wParam,LPARAM lParam)
+INT_PTR Meta_LoadIcon(WPARAM wParam,LPARAM lParam)
{
UINT id;
switch (wParam & 0xFFFF)
@@ -186,7 +186,7 @@ void CALLBACK SetStatusThread(HWND hWnd, UINT msg, UINT_PTR id, DWORD dw) * @param wParam : The new mode
* @param lParam : Allways set to 0.
*/
-int Meta_SetStatus(WPARAM wParam,LPARAM lParam)
+INT_PTR Meta_SetStatus(WPARAM wParam,LPARAM lParam)
{
// firstSetOnline starts out true - used to delay metacontact's 'onlineness' to prevent double status notifications on startup
if(mcStatus == ID_STATUS_OFFLINE && firstSetOnline) {
@@ -204,7 +204,7 @@ int Meta_SetStatus(WPARAM wParam,LPARAM lParam) /** Returns the current status
*/
-int Meta_GetStatus(WPARAM wParam,LPARAM lParam)
+INT_PTR Meta_GetStatus(WPARAM wParam,LPARAM lParam)
{
return mcStatus;
}
@@ -258,7 +258,7 @@ static DWORD CALLBACK sttFakeAckFail( LPVOID param ) * @return 0 on success, 1 otherwise.
*/
-int MetaFilter_SendMessage(WPARAM wParam,LPARAM lParam)
+INT_PTR MetaFilter_SendMessage(WPARAM wParam,LPARAM lParam)
{
DBEVENTINFO dbei;
CCSDATA *ccs = (CCSDATA *) lParam;
@@ -299,7 +299,7 @@ int MetaFilter_SendMessage(WPARAM wParam,LPARAM lParam) return CallService(MS_PROTO_CHAINSEND, wParam, lParam);
}
-int Meta_SendNudge(WPARAM wParam,LPARAM lParam)
+INT_PTR Meta_SendNudge(WPARAM wParam,LPARAM lParam)
{
HANDLE hMeta = (HANDLE)wParam,
hSubContact = Meta_GetMostOnline(hMeta);
@@ -325,7 +325,7 @@ int Meta_SendNudge(WPARAM wParam,LPARAM lParam) *
* @return 0 on success, 1 otherwise.
*/
-int Meta_SendMessage(WPARAM wParam,LPARAM lParam)
+INT_PTR Meta_SendMessage(WPARAM wParam,LPARAM lParam)
{
DBEVENTINFO dbei;
CCSDATA *ccs = (CCSDATA *) lParam;
@@ -419,7 +419,7 @@ int Meta_SendMessage(WPARAM wParam,LPARAM lParam) *
* @return 0 on success, 1 otherwise.
*/
-int MetaFilter_RecvMessage(WPARAM wParam,LPARAM lParam)
+INT_PTR MetaFilter_RecvMessage(WPARAM wParam,LPARAM lParam)
{
DBEVENTINFO dbei;
CCSDATA *ccs = (CCSDATA *) lParam;
@@ -557,7 +557,7 @@ int MetaFilter_RecvMessage(WPARAM wParam,LPARAM lParam) *
* @return 0
*/
-int Meta_RecvMessage(WPARAM wParam, LPARAM lParam)
+INT_PTR Meta_RecvMessage(WPARAM wParam, LPARAM lParam)
{
DBEVENTINFO dbei;
CCSDATA *ccs = (CCSDATA *) lParam;
@@ -962,7 +962,7 @@ int Meta_ContactDeleted(WPARAM wParam, LPARAM lParam) { * @param wParam \c HANDLE to the contact that we are typing to
* @param lParam either PROTOTYPE_SELFTYPING_ON or PROTOTYPE_SELFTYPING_OFF
*/
-int Meta_UserIsTyping(WPARAM wParam, LPARAM lParam)
+INT_PTR Meta_UserIsTyping(WPARAM wParam, LPARAM lParam)
{
char *proto;
char buff[512];
@@ -1221,7 +1221,7 @@ int Meta_ClistDoubleClicked(WPARAM wParam, LPARAM lParam) { return 0;
}
-int Meta_ClistMessageEventClicked(WPARAM wParam, LPARAM lParam) {
+INT_PTR Meta_ClistMessageEventClicked(WPARAM wParam, LPARAM lParam) {
HANDLE hContact = ((CLISTEVENT *)lParam)->hContact;
@@ -1444,7 +1444,7 @@ static DWORD CALLBACK sttMenuThread( LPVOID param ) return 0;
}
-int Meta_ContactMenuFunc(WPARAM wParam, LPARAM lParam) {
+INT_PTR Meta_ContactMenuFunc(WPARAM wParam, LPARAM lParam) {
HANDLE hContact;
hContact = Meta_GetContactHandle((HANDLE)wParam, (int)lParam);
@@ -1490,7 +1490,7 @@ int Meta_ContactMenuFunc(WPARAM wParam, LPARAM lParam) { // file transfer support - mostly not required, since subcontacts do the receiving
////////////////////
/*
-int Meta_FileResume(WPARAM wParam, LPARAM lParam)
+INT_PTR Meta_FileResume(WPARAM wParam, LPARAM lParam)
{
DBVARIANT dbv;
CCSDATA *ccs = (CCSDATA *) lParam;
@@ -1527,7 +1527,7 @@ int Meta_FileResume(WPARAM wParam, LPARAM lParam) return 1; // fail
}
-int Meta_FileAllow(WPARAM wParam, LPARAM lParam)
+INT_PTR Meta_FileAllow(WPARAM wParam, LPARAM lParam)
{
DBVARIANT dbv;
CCSDATA *ccs = (CCSDATA *) lParam;
@@ -1563,7 +1563,7 @@ int Meta_FileAllow(WPARAM wParam, LPARAM lParam) return 0; // fail
}
-int Meta_FileDeny(WPARAM wParam, LPARAM lParam)
+INT_PTR Meta_FileDeny(WPARAM wParam, LPARAM lParam)
{
DBVARIANT dbv;
CCSDATA *ccs = (CCSDATA *) lParam;
@@ -1600,7 +1600,7 @@ int Meta_FileDeny(WPARAM wParam, LPARAM lParam) return 1; // fail
}
-int Meta_FileRecv(WPARAM wParam, LPARAM lParam)
+INT_PTR Meta_FileRecv(WPARAM wParam, LPARAM lParam)
{
DBVARIANT dbv;
CCSDATA *ccs = (CCSDATA *) lParam;
@@ -1676,7 +1676,7 @@ int Meta_FileCancel(WPARAM wParam, LPARAM lParam) }
*/
-int Meta_FileSend(WPARAM wParam, LPARAM lParam)
+INT_PTR Meta_FileSend(WPARAM wParam, LPARAM lParam)
{
CCSDATA *ccs = (CCSDATA *) lParam;
char *proto = 0;
@@ -1722,7 +1722,7 @@ int Meta_FileSend(WPARAM wParam, LPARAM lParam) return 0; // fail
}
-int Meta_GetAwayMsg(WPARAM wParam, LPARAM lParam) {
+INT_PTR Meta_GetAwayMsg(WPARAM wParam, LPARAM lParam) {
CCSDATA *ccs = (CCSDATA *) lParam;
char *proto = 0;
DWORD default_contact_number;
@@ -1755,7 +1755,7 @@ int Meta_GetAwayMsg(WPARAM wParam, LPARAM lParam) { return 0; // fail
}
-int Meta_GetAvatarInfo(WPARAM wParam, LPARAM lParam) {
+INT_PTR Meta_GetAvatarInfo(WPARAM wParam, LPARAM lParam) {
PROTO_AVATAR_INFORMATION *AI = (PROTO_AVATAR_INFORMATION *) lParam;
char *proto = 0;
DWORD default_contact_number;
@@ -1791,7 +1791,7 @@ int Meta_GetAvatarInfo(WPARAM wParam, LPARAM lParam) { return GAIR_NOAVATAR; // fail
}
-int Meta_GetInfo(WPARAM wParam, LPARAM lParam) {
+INT_PTR Meta_GetInfo(WPARAM wParam, LPARAM lParam) {
CCSDATA *ccs = (CCSDATA *) lParam;
char *proto = 0;
DWORD default_contact_number;
@@ -1890,7 +1890,7 @@ int Meta_CallMostOnline(WPARAM wParam, LPARAM lParam) { }
-int Meta_OnOff(WPARAM wParam, LPARAM lParam) {
+INT_PTR Meta_OnOff(WPARAM wParam, LPARAM lParam) {
CLISTMENUITEM menu;
menu.cbSize = sizeof(CLISTMENUITEM);
// just write to db - the rest is handled in the Meta_SettingChanged function
diff --git a/metacontacts/meta_utils.c b/metacontacts/meta_utils.c index 6077117..a61db7e 100644 --- a/metacontacts/meta_utils.c +++ b/metacontacts/meta_utils.c @@ -28,7 +28,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. HANDLE invisiGroup;
POINT menuMousePoint;
-int MyDBWriteContactSetting(HANDLE hContact, const char *szModule, const char *szSetting, DBVARIANT *dbv) {
+INT_PTR MyDBWriteContactSetting(HANDLE hContact, const char *szModule, const char *szSetting, DBVARIANT *dbv) {
DBCONTACTWRITESETTING dcws;
dcws.szModule = szModule;
dcws.szSetting = szSetting;
@@ -36,7 +36,7 @@ int MyDBWriteContactSetting(HANDLE hContact, const char *szModule, const char *s return CallService(MS_DB_CONTACT_WRITESETTING, (WPARAM)hContact, (LPARAM)&dcws);
}
-int MyDBGetContactSetting(HANDLE hContact, const char *szModule, const char *szSetting, DBVARIANT *dbv) {
+INT_PTR MyDBGetContactSetting(HANDLE hContact, const char *szModule, const char *szSetting, DBVARIANT *dbv) {
static BOOL strsvc, strsvcset = FALSE;
memset(dbv, 0, sizeof(DBVARIANT));
@@ -1486,7 +1486,7 @@ int Meta_SwapContacts(HANDLE hMeta, DWORD contact_number1, DWORD contact_number2 return 0;
}
-BOOL CALLBACK DlgProcNull(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
+INT_PTR CALLBACK DlgProcNull(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
{
switch(msg) {
case WM_INITDIALOG:
@@ -1709,7 +1709,7 @@ void Meta_FixStatus(HANDLE hMeta) { }
-int Meta_IsEnabled() {
+INT_PTR Meta_IsEnabled() {
return DBGetContactSettingByte(0, META_PROTO, "Enabled", 1) && (meta_group_hack_disabled || DBGetContactSettingByte(NULL, "CList", "UseGroups", 1));
}
diff --git a/metacontacts/metacontacts.h b/metacontacts/metacontacts.h index 9cf64bc..4f0ab1d 100644 --- a/metacontacts/metacontacts.h +++ b/metacontacts/metacontacts.h @@ -24,13 +24,14 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
#define _CRT_SECURE_NO_DEPRECATE
-#define _USE_32BIT_TIME_T
#define _WIN32_WINNT 0x0400
#define _WIN32_IE 0x0300
#define MIRANDA_VER 0x0800
+#include <m_stdhdr.h>
+
#include <windows.h>
#include <winsock.h>
#include <winbase.h>
@@ -45,29 +46,29 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "resource.h"
#include "m_metacontacts.h"
-#include "../../include/m_icolib.h"
-
-#include "../../include/newpluginapi.h"
-#include "../../include/m_clist.h"
-#include "../../include/m_clui.h"
-#include "../../include/m_skin.h"
-#include "../../include/m_langpack.h"
-#include "../../include/m_protomod.h"
-#include "../../include/m_database.h"
-#include "../../include/m_system.h"
-#include "../../include/m_protocols.h"
-#include "../../include/m_userinfo.h"
-#include "../../include/m_options.h"
-#include "../../include/m_protosvc.h"
-#include "../../include/m_utils.h"
-#include "../../include/m_ignore.h"
-#include "../../include/m_clc.h"
-#include "../../include/m_contacts.h"
-#include "../../include/m_message.h"
-#include "../../include/m_ignore.h"
-#include "../../include/m_langpack.h"
-#include "../../include/m_popup.h"
-#include "../../include/m_cluiframes.h"
+#include "m_icolib.h"
+
+#include "newpluginapi.h"
+#include "m_clist.h"
+#include "m_clui.h"
+#include "m_skin.h"
+#include "m_langpack.h"
+#include "m_protomod.h"
+#include "m_database.h"
+#include "m_system.h"
+#include "m_protocols.h"
+#include "m_userinfo.h"
+#include "m_options.h"
+#include "m_protosvc.h"
+#include "m_utils.h"
+#include "m_ignore.h"
+#include "m_clc.h"
+#include "m_contacts.h"
+#include "m_message.h"
+#include "m_ignore.h"
+#include "m_langpack.h"
+#include "m_popup.h"
+#include "m_cluiframes.h"
#include "../updater/m_updater.h"
#define META_PROTO "MetaContacts"
@@ -81,29 +82,29 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. // I can't think of a way around this - mental block
-int TranslateMenuFunc(HANDLE hContact, int i);
+INT_PTR TranslateMenuFunc(HANDLE hContact, int i);
extern HANDLE hMenuContact[MAX_CONTACTS];
-int MenuFunc0(WPARAM wParam, LPARAM lParam);
-int MenuFunc1(WPARAM wParam, LPARAM lParam);
-int MenuFunc2(WPARAM wParam, LPARAM lParam);
-int MenuFunc3(WPARAM wParam, LPARAM lParam);
-int MenuFunc4(WPARAM wParam, LPARAM lParam);
-int MenuFunc5(WPARAM wParam, LPARAM lParam);
-int MenuFunc6(WPARAM wParam, LPARAM lParam);
-int MenuFunc7(WPARAM wParam, LPARAM lParam);
-int MenuFunc8(WPARAM wParam, LPARAM lParam);
-int MenuFunc9(WPARAM wParam, LPARAM lParam);
-int MenuFunc10(WPARAM wParam, LPARAM lParam);
-int MenuFunc11(WPARAM wParam, LPARAM lParam);
-int MenuFunc12(WPARAM wParam, LPARAM lParam);
-int MenuFunc13(WPARAM wParam, LPARAM lParam);
-int MenuFunc14(WPARAM wParam, LPARAM lParam);
-int MenuFunc15(WPARAM wParam, LPARAM lParam);
-int MenuFunc16(WPARAM wParam, LPARAM lParam);
-int MenuFunc17(WPARAM wParam, LPARAM lParam);
-int MenuFunc18(WPARAM wParam, LPARAM lParam);
-int MenuFunc19(WPARAM wParam, LPARAM lParam);
+INT_PTR MenuFunc0(WPARAM wParam, LPARAM lParam);
+INT_PTR MenuFunc1(WPARAM wParam, LPARAM lParam);
+INT_PTR MenuFunc2(WPARAM wParam, LPARAM lParam);
+INT_PTR MenuFunc3(WPARAM wParam, LPARAM lParam);
+INT_PTR MenuFunc4(WPARAM wParam, LPARAM lParam);
+INT_PTR MenuFunc5(WPARAM wParam, LPARAM lParam);
+INT_PTR MenuFunc6(WPARAM wParam, LPARAM lParam);
+INT_PTR MenuFunc7(WPARAM wParam, LPARAM lParam);
+INT_PTR MenuFunc8(WPARAM wParam, LPARAM lParam);
+INT_PTR MenuFunc9(WPARAM wParam, LPARAM lParam);
+INT_PTR MenuFunc10(WPARAM wParam, LPARAM lParam);
+INT_PTR MenuFunc11(WPARAM wParam, LPARAM lParam);
+INT_PTR MenuFunc12(WPARAM wParam, LPARAM lParam);
+INT_PTR MenuFunc13(WPARAM wParam, LPARAM lParam);
+INT_PTR MenuFunc14(WPARAM wParam, LPARAM lParam);
+INT_PTR MenuFunc15(WPARAM wParam, LPARAM lParam);
+INT_PTR MenuFunc16(WPARAM wParam, LPARAM lParam);
+INT_PTR MenuFunc17(WPARAM wParam, LPARAM lParam);
+INT_PTR MenuFunc18(WPARAM wParam, LPARAM lParam);
+INT_PTR MenuFunc19(WPARAM wParam, LPARAM lParam);
extern HINSTANCE hInstance;
extern PLUGININFOEX pluginInfo;
@@ -124,15 +125,15 @@ extern int mcStatus; extern HANDLE metaMainThread;
-int Meta_Convert(WPARAM wParam,LPARAM lParam);
-int Meta_AddTo(WPARAM wParam,LPARAM lParam);
-int Meta_Edit(WPARAM wParam,LPARAM lParam);
+INT_PTR Meta_Convert(WPARAM wParam,LPARAM lParam);
+INT_PTR Meta_AddTo(WPARAM wParam,LPARAM lParam);
+INT_PTR Meta_Edit(WPARAM wParam,LPARAM lParam);
void Meta_RemoveContactNumber(HANDLE hMeta, int number);
-int Meta_Delete(WPARAM wParam,LPARAM lParam);
-int Meta_Default(WPARAM wParam,LPARAM lParam);
-int Meta_ForceDefault(WPARAM wParam,LPARAM lParam);
+INT_PTR Meta_Delete(WPARAM wParam,LPARAM lParam);
+INT_PTR Meta_Default(WPARAM wParam,LPARAM lParam);
+INT_PTR Meta_ForceDefault(WPARAM wParam,LPARAM lParam);
-int Meta_IsEnabled();
+INT_PTR Meta_IsEnabled();
int Meta_EqualDBV(DBVARIANT *dbv, DBVARIANT *id);
int Meta_ModifyMenu(WPARAM wParam,LPARAM lParam);
@@ -164,17 +165,17 @@ void Meta_FixStatus(HANDLE hMeta); char *Meta_GetUniqueIdentifier(HANDLE hContact, DWORD *pused);
-int Meta_GetCaps(WPARAM wParam,LPARAM lParam);
-int Meta_GetName(WPARAM wParam,LPARAM lParam);
-int Meta_LoadIcon(WPARAM wParam,LPARAM lParam);
-int Meta_SetStatus(WPARAM wParam,LPARAM lParam);
-int Meta_GetStatus(WPARAM wParam,LPARAM lParam);
-int Meta_SendMessage(WPARAM wParam,LPARAM lParam);
-int Meta_RecvMessage(WPARAM wParam,LPARAM lParam);
-int Meta_ContactMenuFunc(WPARAM wParam, LPARAM lParam);
+INT_PTR Meta_GetCaps(WPARAM wParam,LPARAM lParam);
+INT_PTR Meta_GetName(WPARAM wParam,LPARAM lParam);
+INT_PTR Meta_LoadIcon(WPARAM wParam,LPARAM lParam);
+INT_PTR Meta_SetStatus(WPARAM wParam,LPARAM lParam);
+INT_PTR Meta_GetStatus(WPARAM wParam,LPARAM lParam);
+INT_PTR Meta_SendMessage(WPARAM wParam,LPARAM lParam);
+INT_PTR Meta_RecvMessage(WPARAM wParam,LPARAM lParam);
+INT_PTR Meta_ContactMenuFunc(WPARAM wParam, LPARAM lParam);
-BOOL CALLBACK Meta_SelectDialogProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
-BOOL CALLBACK Meta_EditDialogProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
+INT_PTR CALLBACK Meta_SelectDialogProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
+INT_PTR CALLBACK Meta_EditDialogProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
void Meta_InitServices();
void Meta_CloseHandles();
@@ -207,8 +208,8 @@ typedef struct tag_MetaOptions { extern MetaOptions options;
-BOOL CALLBACK DlgProcOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam);
-BOOL CALLBACK DlgProcOptsPriorities(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam);
+INT_PTR CALLBACK DlgProcOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam);
+INT_PTR CALLBACK DlgProcOptsPriorities(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam);
int Meta_WriteOptions(MetaOptions *opt);
int Meta_ReadOptions(MetaOptions *opt);
@@ -216,28 +217,28 @@ int GetDefaufaultPrio(int status); int GetRealPriority(char *proto, int status);
// API function headers
-int MetaAPI_GetMeta(WPARAM wParam, LPARAM lParam);
-int MetaAPI_GetDefault(WPARAM wParam, LPARAM lParam);
-int MetaAPI_GetDefaultNum(WPARAM wParam, LPARAM lParam);
-int MetaAPI_GetMostOnline(WPARAM wParam, LPARAM lParam);
-int MetaAPI_GetNumContacts(WPARAM wParam, LPARAM lParam);
-int MetaAPI_GetContact(WPARAM wParam, LPARAM lParam);
-int MetaAPI_SetDefaultContactNum(WPARAM wParam, LPARAM lParam);
-int MetaAPI_SetDefaultContact(WPARAM wParam, LPARAM lParam);
-int MetaAPI_ForceSendContactNum(WPARAM wParam, LPARAM lParam);
-int MetaAPI_ForceSendContact(WPARAM wParam, LPARAM lParam);
-int MetaAPI_UnforceSendContact(WPARAM wParam, LPARAM lParam);
-int MetaAPI_ForceDefault(WPARAM wParam, LPARAM lParam);
-int MetaAPI_GetForceState(WPARAM wParam, LPARAM lParam);
-int MetaAPI_GetProtoName(WPARAM wParam, LPARAM lParam);
-int MetaAPI_ConvertToMeta(WPARAM wParam, LPARAM lParam);
-int MetaAPI_AddToMeta(WPARAM wParam, LPARAM lParam);
-int MetaAPI_RemoveFromMeta(WPARAM wParam, LPARAM lParam);
-int MetaAPI_DisableHiddenGroup(WPARAM wParam, LPARAM lParam);
+INT_PTR MetaAPI_GetMeta(WPARAM wParam, LPARAM lParam);
+INT_PTR MetaAPI_GetDefault(WPARAM wParam, LPARAM lParam);
+INT_PTR MetaAPI_GetDefaultNum(WPARAM wParam, LPARAM lParam);
+INT_PTR MetaAPI_GetMostOnline(WPARAM wParam, LPARAM lParam);
+INT_PTR MetaAPI_GetNumContacts(WPARAM wParam, LPARAM lParam);
+INT_PTR MetaAPI_GetContact(WPARAM wParam, LPARAM lParam);
+INT_PTR MetaAPI_SetDefaultContactNum(WPARAM wParam, LPARAM lParam);
+INT_PTR MetaAPI_SetDefaultContact(WPARAM wParam, LPARAM lParam);
+INT_PTR MetaAPI_ForceSendContactNum(WPARAM wParam, LPARAM lParam);
+INT_PTR MetaAPI_ForceSendContact(WPARAM wParam, LPARAM lParam);
+INT_PTR MetaAPI_UnforceSendContact(WPARAM wParam, LPARAM lParam);
+INT_PTR MetaAPI_ForceDefault(WPARAM wParam, LPARAM lParam);
+INT_PTR MetaAPI_GetForceState(WPARAM wParam, LPARAM lParam);
+INT_PTR MetaAPI_GetProtoName(WPARAM wParam, LPARAM lParam);
+INT_PTR MetaAPI_ConvertToMeta(WPARAM wParam, LPARAM lParam);
+INT_PTR MetaAPI_AddToMeta(WPARAM wParam, LPARAM lParam);
+INT_PTR MetaAPI_RemoveFromMeta(WPARAM wParam, LPARAM lParam);
+INT_PTR MetaAPI_DisableHiddenGroup(WPARAM wParam, LPARAM lParam);
// extended db get/write setting functions, that handle unicode
-int MyDBWriteContactSetting(HANDLE hContact, const char *szModule, const char *szSetting, DBVARIANT *dbv);
-int MyDBGetContactSetting(HANDLE hContact, const char *szModule, const char *szSetting, DBVARIANT *dbv);
+INT_PTR MyDBWriteContactSetting(HANDLE hContact, const char *szModule, const char *szSetting, DBVARIANT *dbv);
+INT_PTR MyDBGetContactSetting(HANDLE hContact, const char *szModule, const char *szSetting, DBVARIANT *dbv);
// IcoLib support
void InitIcons(void);
|