From e750e8644fb332c5cb9cc11a7a7cb6c2778e53e8 Mon Sep 17 00:00:00 2001 From: watcherhd Date: Tue, 29 Nov 2011 16:23:03 +0000 Subject: another part of small project fixes and x64 adaptation in some cases git-svn-id: http://miranda-plugins.googlecode.com/svn/trunk@229 e753b5eb-9565-29b2-b5c5-2cc6f99dfbcb --- Nudge/main.cpp | 14 +++++++------- Nudge/nudge_10.suo | Bin 0 -> 9216 bytes Nudge/nudge_10.vcxproj | 47 ++++++++++++++++++++++++++++------------------- 3 files changed, 35 insertions(+), 26 deletions(-) create mode 100644 Nudge/nudge_10.suo (limited to 'Nudge') diff --git a/Nudge/main.cpp b/Nudge/main.cpp index 0e5fc3f..28c10c4 100644 --- a/Nudge/main.cpp +++ b/Nudge/main.cpp @@ -104,7 +104,7 @@ void RegisterToUpdate(void) update.szComponentName = pluginInfo.shortName; update.pbVersion = (BYTE *)CreateVersionStringPluginEx(&pluginInfo, szVersion); - update.cpbVersion = strlen((char *)update.pbVersion); + update.cpbVersion = (int)strlen((char *)update.pbVersion); update.szUpdateURL = UPDATER_AUTOREGISTER; update.szVersionURL = "http://addons.miranda-im.org/details.php?action=viewfile&id=2708"; update.pbVersionPrefix = (BYTE *)"Nudge "; @@ -112,8 +112,8 @@ void RegisterToUpdate(void) update.szBetaVersionURL = "http://www.miranda-fr.net/tweety/Nudge/Nudge_beta.html"; update.pbBetaVersionPrefix = (BYTE *)"Nudge version "; - update.cpbVersionPrefix = strlen((char *)update.pbVersionPrefix); - update.cpbBetaVersionPrefix = strlen((char *)update.pbBetaVersionPrefix); + update.cpbVersionPrefix = (int)strlen((char *)update.pbVersionPrefix); + update.cpbBetaVersionPrefix = (int)strlen((char *)update.pbBetaVersionPrefix); CallService(MS_UPDATE_REGISTER, 0, (WPARAM)&update); @@ -832,7 +832,7 @@ void Nudge_SentEvent(CNudgeElement n, HANDLE hCont) char buff[TEXT_LEN]; WideCharToMultiByte(code_page, 0, n.senText, -1, buff, TEXT_LEN, 0, 0); buff[TEXT_LEN] = 0; - NudgeEvent.cbBlob = strlen(buff) + 1; + NudgeEvent.cbBlob = (DWORD)strlen(buff) + 1; NudgeEvent.pBlob = ( PBYTE ) buff; #else NudgeEvent.cbBlob = _tcsclen(n.senText) + 1; @@ -865,7 +865,7 @@ void Nudge_SentStatus(CNudgeElement n, HANDLE hCont) char buff[TEXT_LEN]; WideCharToMultiByte(code_page, 0, n.senText, -1, buff, TEXT_LEN, 0, 0); buff[TEXT_LEN] = 0; - NudgeEvent.cbBlob = strlen(buff) + 1; + NudgeEvent.cbBlob = (DWORD)strlen(buff) + 1; NudgeEvent.pBlob = ( PBYTE ) buff; #else NudgeEvent.cbBlob = _tcsclen(n.senText) + 1; @@ -898,7 +898,7 @@ void Nudge_ShowStatus(CNudgeElement n, HANDLE hCont, DWORD timestamp) char buff[TEXT_LEN]; WideCharToMultiByte(code_page, 0, n.recText, -1, buff, TEXT_LEN, 0, 0); buff[TEXT_LEN] = 0; - NudgeEvent.cbBlob = strlen(buff) + 1; + NudgeEvent.cbBlob = (DWORD)strlen(buff) + 1; NudgeEvent.pBlob = ( PBYTE ) buff; #else NudgeEvent.cbBlob = _tcsclen(n.recText) + 1; @@ -934,7 +934,7 @@ void Nudge_ShowEvent(CNudgeElement n, HANDLE hCont, DWORD timestamp) char buff[TEXT_LEN]; WideCharToMultiByte(code_page, 0, n.recText, -1, buff, TEXT_LEN, 0, 0); buff[TEXT_LEN] = 0; - NudgeEvent.cbBlob = strlen(buff) + 1; + NudgeEvent.cbBlob = (DWORD)strlen(buff) + 1; NudgeEvent.pBlob = ( PBYTE ) buff; #else NudgeEvent.cbBlob = _tcsclen(n.recText) + 1; diff --git a/Nudge/nudge_10.suo b/Nudge/nudge_10.suo new file mode 100644 index 0000000..1b57fcb Binary files /dev/null and b/Nudge/nudge_10.suo differ diff --git a/Nudge/nudge_10.vcxproj b/Nudge/nudge_10.vcxproj index 32e6e5f..2c951c7 100644 --- a/Nudge/nudge_10.vcxproj +++ b/Nudge/nudge_10.vcxproj @@ -93,21 +93,19 @@ <_ProjectFileVersion>10.0.30319.1 $(SolutionDir)$(Configuration)/Plugins\ - $(SolutionDir)$(Configuration)64/Plugins\ + $(SolutionDir)\$(Configuration) $(Platform)/Plugins\ $(SolutionDir)$(Configuration)/Obj/$(ProjectName)\ - $(SolutionDir)$(Configuration)64/Obj/$(ProjectName)\ + $(SolutionDir)\$(Configuration) $(Platform)/Obj/$(ProjectName)\ $(SolutionDir)$(Configuration)/Plugins\ - $(SolutionDir)$(Configuration)64/Plugins\ + $(SolutionDir)\$(Configuration) $(Platform)/Plugins\ $(SolutionDir)$(Configuration)/Obj/$(ProjectName)\ - $(SolutionDir)$(Configuration)64/Obj/$(ProjectName)\ - true - true - true - true + $(SolutionDir)\$(Configuration) $(Platform)/Obj/$(ProjectName)\ $(SolutionDir)$(Configuration)/Obj/$(ProjectName)\ $(SolutionDir)$(Configuration)/Plugins\ + $(SolutionDir)\$(Configuration) $(Platform)/Plugins\ + $(SolutionDir)\$(Configuration) $(Platform)/Obj/$(ProjectName)\ @@ -121,10 +119,10 @@ Disabled - ../../include;../ExternalAPI;%(AdditionalIncludeDirectories) + ../include;../ExternalAPI;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;nudge_EXPORTS;%(PreprocessorDefinitions) EnableFastChecks - MultiThreadedDebugDLL + MultiThreadedDebug true @@ -142,7 +140,7 @@ true true .\Debug/nudge.pdb - .\Debug/nudge.lib + $(IntDir)$(TargetName).lib MachineX86 @@ -157,10 +155,10 @@ Disabled - ../../../include;%(AdditionalIncludeDirectories) + ../include;../ExternalAPI;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;nudge_EXPORTS;%(PreprocessorDefinitions) EnableFastChecks - MultiThreadedDebugDLL + MultiThreadedDebug true @@ -178,7 +176,7 @@ true true .\Debug/nudge.pdb - .\Debug/nudge.lib + $(IntDir)$(TargetName).lib @@ -196,7 +194,7 @@ OnlyExplicitInline Size false - ../../include;../ExternalAPI;%(AdditionalIncludeDirectories) + ../include;../ExternalAPI;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;_UNICODE;UNICODE;MICROSOFT_LAYER_FOR_UNICODE=1;%(PreprocessorDefinitions) true MultiThreaded @@ -209,6 +207,7 @@ ProgramDatabase Default 4996;%(DisableSpecificWarnings) + true NDEBUG;%(PreprocessorDefinitions) @@ -225,6 +224,8 @@ true true MachineX86 + UseLinkTimeCodeGeneration + $(IntDir)$(TargetName).lib @@ -241,7 +242,7 @@ OnlyExplicitInline Size false - ../../../include;%(AdditionalIncludeDirectories) + ../include;../ExternalAPI;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;_UNICODE;UNICODE;MICROSOFT_LAYER_FOR_UNICODE=1;%(PreprocessorDefinitions) true MultiThreaded @@ -254,6 +255,7 @@ ProgramDatabase Default 4996;%(DisableSpecificWarnings) + true NDEBUG;%(PreprocessorDefinitions) @@ -261,7 +263,6 @@ unicows.lib;comctl32.lib;Delayimp.lib;gdiplus.lib;version.lib;%(AdditionalDependencies) - $(SolutionDir)Release/Plugins/nudge.dll true false %(DelayLoadDLLs) @@ -270,6 +271,8 @@ true true + UseLinkTimeCodeGeneration + $(IntDir)$(TargetName).lib @@ -287,7 +290,7 @@ OnlyExplicitInline Size false - ../../include;../ExternalAPI;%(AdditionalIncludeDirectories) + ../include;../ExternalAPI;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;_UNICODE;UNICODE;MICROSOFT_LAYER_FOR_UNICODE=1;%(PreprocessorDefinitions) true MultiThreaded @@ -300,6 +303,7 @@ ProgramDatabase Default 4996;%(DisableSpecificWarnings) + true NDEBUG;%(PreprocessorDefinitions) @@ -316,6 +320,8 @@ true true MachineX86 + UseLinkTimeCodeGeneration + $(IntDir)$(TargetName).lib @@ -332,7 +338,7 @@ OnlyExplicitInline Size false - ../../../include;%(AdditionalIncludeDirectories) + ../include;../ExternalAPI;%(AdditionalIncludeDirectories) _WIN64;_DEBUG;_WINDOWS;_USRDLL;_UNICODE;UNICODE;MICROSOFT_LAYER_FOR_UNICODE=1;%(PreprocessorDefinitions) true MultiThreaded @@ -345,6 +351,7 @@ ProgramDatabase Default 4996;%(DisableSpecificWarnings) + true NDEBUG;%(PreprocessorDefinitions) @@ -360,6 +367,8 @@ true true + UseLinkTimeCodeGeneration + $(IntDir)$(TargetName).lib -- cgit v1.2.3