From 46879a24aa0e45ec0ea1ddf27f28ce68edd5e561 Mon Sep 17 00:00:00 2001 From: watcherhd Date: Sun, 27 Nov 2011 22:52:32 +0000 Subject: another part of small project fixes git-svn-id: http://miranda-plugins.googlecode.com/svn/trunk@224 e753b5eb-9565-29b2-b5c5-2cc6f99dfbcb --- BuddyExpectator/BuddyExpectator.cpp | 12 ++-- BuddyExpectator/BuddyExpectator10.sln | 6 ++ BuddyExpectator/BuddyExpectator10.vcxproj | 112 ++++++++++++++++++++++++++++++ BuddyExpectator/options.cpp | 6 +- 4 files changed, 127 insertions(+), 9 deletions(-) (limited to 'BuddyExpectator') diff --git a/BuddyExpectator/BuddyExpectator.cpp b/BuddyExpectator/BuddyExpectator.cpp index 6af9724..ca6c9b4 100644 --- a/BuddyExpectator/BuddyExpectator.cpp +++ b/BuddyExpectator/BuddyExpectator.cpp @@ -412,7 +412,7 @@ void GoneNotify(HANDLE hContact, char *message) * when called from popup, wParam = (HANDLE)hContact and lParam == 0, * when called from clist event, wParam = hWndCList, lParam = &CLISTEVENT */ -int MissYouAction(WPARAM wParam, LPARAM lParam) +INT_PTR MissYouAction(WPARAM wParam, LPARAM lParam) { HANDLE hContact; if (lParam) @@ -432,7 +432,7 @@ int MissYouAction(WPARAM wParam, LPARAM lParam) * when called from popup, wParam = (HANDLE)hContact and lParam == 0, * when called from clist event, wParam = hWndCList, lParam = &CLISTEVENT */ -int ContactReturnedAction(WPARAM wParam, LPARAM lParam) +INT_PTR ContactReturnedAction(WPARAM wParam, LPARAM lParam) { HANDLE hContact; if (lParam) @@ -462,7 +462,7 @@ int ContactReturnedAction(WPARAM wParam, LPARAM lParam) * when called from popup, wParam = (HANDLE)hContact and lParam == 0, * when called from clist event, wParam = hWndCList, lParam = &CLISTEVENT */ -int ContactStillAbsentAction(WPARAM wParam, LPARAM lParam) +INT_PTR ContactStillAbsentAction(WPARAM wParam, LPARAM lParam) { HANDLE hContact; if (lParam) @@ -510,7 +510,7 @@ int onIconsChanged(WPARAM wParam, LPARAM lParam) /** * Menu item click action */ -int MenuMissYouClick(WPARAM wParam, LPARAM lParam) +INT_PTR MenuMissYouClick(WPARAM wParam, LPARAM lParam) { if (DBGetContactSettingByte((HANDLE)wParam, MODULE_NAME, "MissYou", 0)) { @@ -843,7 +843,7 @@ int 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.szUpdateURL = UPDATER_AUTOREGISTER; @@ -856,7 +856,7 @@ int ModulesLoaded(WPARAM wParam, LPARAM lParam) update.szBetaChangelogURL = "http://thief.miranda.im"; update.pbBetaVersionPrefix = (BYTE *)"Buddy Expectator "; - update.cpbBetaVersionPrefix = strlen((char *)update.pbBetaVersionPrefix); + update.cpbBetaVersionPrefix = (int)strlen((char *)update.pbBetaVersionPrefix); CallService(MS_UPDATE_REGISTER, 0, (WPARAM)&update); } diff --git a/BuddyExpectator/BuddyExpectator10.sln b/BuddyExpectator/BuddyExpectator10.sln index cf4b219..5811f4d 100644 --- a/BuddyExpectator/BuddyExpectator10.sln +++ b/BuddyExpectator/BuddyExpectator10.sln @@ -6,13 +6,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 {8CEBD7AC-CD02-4BEC-B889-A7243F3E5DD8}.Debug|Win32.ActiveCfg = Release|Win32 {8CEBD7AC-CD02-4BEC-B889-A7243F3E5DD8}.Debug|Win32.Build.0 = Release|Win32 + {8CEBD7AC-CD02-4BEC-B889-A7243F3E5DD8}.Debug|x64.ActiveCfg = Debug|x64 + {8CEBD7AC-CD02-4BEC-B889-A7243F3E5DD8}.Debug|x64.Build.0 = Debug|x64 {8CEBD7AC-CD02-4BEC-B889-A7243F3E5DD8}.Release|Win32.ActiveCfg = Release|Win32 {8CEBD7AC-CD02-4BEC-B889-A7243F3E5DD8}.Release|Win32.Build.0 = Release|Win32 + {8CEBD7AC-CD02-4BEC-B889-A7243F3E5DD8}.Release|x64.ActiveCfg = Release|x64 + {8CEBD7AC-CD02-4BEC-B889-A7243F3E5DD8}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/BuddyExpectator/BuddyExpectator10.vcxproj b/BuddyExpectator/BuddyExpectator10.vcxproj index 8389aa4..20081d9 100644 --- a/BuddyExpectator/BuddyExpectator10.vcxproj +++ b/BuddyExpectator/BuddyExpectator10.vcxproj @@ -5,10 +5,18 @@ Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + BuddyExpectator @@ -21,11 +29,21 @@ false MultiByte + + DynamicLibrary + false + MultiByte + DynamicLibrary false MultiByte + + DynamicLibrary + false + MultiByte + @@ -33,24 +51,43 @@ + + + + + + + + <_ProjectFileVersion>10.0.30319.1 $(SolutionDir)$(Configuration)/Plugins\ + $(SolutionDir)\$(Configuration) $(Platform)/Plugins\ $(SolutionDir)$(Configuration)/Obj/$(ProjectName)\ + $(SolutionDir)\$(Configuration) $(Platform)/Obj/$(ProjectName)\ true + true $(SolutionDir)$(Configuration)/Plugins\ + $(SolutionDir)\$(Configuration) $(Platform)/Plugins\ $(SolutionDir)$(Configuration)/Obj/$(ProjectName)\ + $(SolutionDir)\$(Configuration) $(Platform)/Obj/$(ProjectName)\ AllRules.ruleset + AllRules.ruleset + + AllRules.ruleset + AllRules.ruleset + + @@ -88,6 +125,39 @@ true + + + _DEBUG;%(PreprocessorDefinitions) + true + true + .\Debug/BuddyExpectator.tlb + + + + + Disabled + ../include;../ExternalAPI;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;BUDDYEXPECTATOR_EXPORTS;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug + Level3 + true + ProgramDatabase + 4996;%(DisableSpecificWarnings) + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + true + true + $(IntDir)$(TargetName).lib + + + true + + NDEBUG;%(PreprocessorDefinitions) @@ -128,17 +198,59 @@ true + + + NDEBUG;%(PreprocessorDefinitions) + true + true + .\Release/BuddyExpectator.tlb + + + + + Full + ../include;../ExternalAPI;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;BUDDYEXPECTATOR_EXPORTS;%(PreprocessorDefinitions) + true + MultiThreaded + true + Level3 + true + 4996;%(DisableSpecificWarnings) + Size + true + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + true + true + true + true + $(IntDir)$(TargetName).lib + UseLinkTimeCodeGeneration + + + true + + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) diff --git a/BuddyExpectator/options.cpp b/BuddyExpectator/options.cpp index 6ebe7f3..d190cd5 100644 --- a/BuddyExpectator/options.cpp +++ b/BuddyExpectator/options.cpp @@ -91,7 +91,7 @@ void SavePopupOptions() /** * Options panel function */ -static int CALLBACK OptionsFrameProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) +static INT_PTR CALLBACK OptionsFrameProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) { switch (uMsg) { @@ -291,7 +291,7 @@ static int CALLBACK OptionsFrameProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPA /** * PopUp Options panel function */ -static int CALLBACK PopUpOptionsFrameProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) +static INT_PTR CALLBACK PopUpOptionsFrameProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) { static int ChangeLock = 0; switch (uMsg) @@ -511,7 +511,7 @@ static int OptionsInit(WPARAM wParam, LPARAM lParam) return 0; } -BOOL CALLBACK UserinfoDlgProc(HWND hdlg, UINT msg, WPARAM wparam, LPARAM lparam) +INT_PTR CALLBACK UserinfoDlgProc(HWND hdlg, UINT msg, WPARAM wparam, LPARAM lparam) { switch (msg) { -- cgit v1.2.3