From 8978ac1fbb26efc1a4c4099e47d5daeaa054043c Mon Sep 17 00:00:00 2001 From: Gluzskiy Alexandr Date: Wed, 3 Nov 2010 06:47:38 +0200 Subject: x64 config modified: init.cpp modified: main.cpp modified: messages.cpp modified: new_gpg.sln modified: new_gpg.vcxproj modified: options.cpp --- init.cpp | 18 +- main.cpp | 12 +- messages.cpp | 2 +- new_gpg.sln | 46 ++- new_gpg.vcxproj | 988 ++++++++++++++++++++++++++++++++++++++++++++++++++------ options.cpp | 8 +- 6 files changed, 952 insertions(+), 122 deletions(-) diff --git a/init.cpp b/init.cpp index 45fb967..cd4342d 100644 --- a/init.cpp +++ b/init.cpp @@ -103,9 +103,9 @@ extern "C" int __declspec(dllexport) Load(PLUGINLINK *link) mir_getMMI(&mmi); mir_getUTFI(&utfi); mir_getXI(&xi); //TODO: check if we have access to api - CreateServiceFunction("/LoadPubKey",LoadKey); - CreateServiceFunction("/ToggleEncryption",ToggleEncryption); - CreateServiceFunction("/SendKey",SendKey); + CreateServiceFunction("/LoadPubKey",(MIRANDASERVICE)LoadKey); + CreateServiceFunction("/ToggleEncryption",(MIRANDASERVICE)ToggleEncryption); + CreateServiceFunction("/SendKey",(MIRANDASERVICE)SendKey); CLISTMENUITEM mi = {0}; mi.cbSize=sizeof(mi); mi.position=-0x7FFFFFFF; @@ -214,13 +214,13 @@ static int OnModulesLoaded(WPARAM wParam,LPARAM lParam) pd.type=PROTOTYPE_ENCRYPTION; CallService(MS_PROTO_REGISTERMODULE,0,(LPARAM)&pd); - CreateProtoServiceFunction(szGPGModuleName, PSR_MESSAGE, RecvMsgSvc); - CreateProtoServiceFunction(szGPGModuleName, PSS_MESSAGE, SendMsgSvc); - CreateProtoServiceFunction(szGPGModuleName, PSR_MESSAGE"W", RecvMsgSvc); - CreateProtoServiceFunction(szGPGModuleName, PSS_MESSAGE"W", SendMsgSvc); + CreateProtoServiceFunction(szGPGModuleName, PSR_MESSAGE, (MIRANDASERVICE)RecvMsgSvc); + CreateProtoServiceFunction(szGPGModuleName, PSS_MESSAGE, (MIRANDASERVICE)SendMsgSvc); + CreateProtoServiceFunction(szGPGModuleName, PSR_MESSAGE"W", (MIRANDASERVICE)RecvMsgSvc); + CreateProtoServiceFunction(szGPGModuleName, PSS_MESSAGE"W", (MIRANDASERVICE)SendMsgSvc); - CreateProtoServiceFunction(szGPGModuleName, PSS_FILE, onSendFile); - CreateProtoServiceFunction(szGPGModuleName, PSS_FILE"W", onSendFile); + CreateProtoServiceFunction(szGPGModuleName, PSS_FILE, (MIRANDASERVICE)onSendFile); + CreateProtoServiceFunction(szGPGModuleName, PSS_FILE"W", (MIRANDASERVICE)onSendFile); for (HANDLE hContact = (HANDLE)CallService(MS_DB_CONTACT_FINDFIRST, 0, 0); hContact; hContact = (HANDLE)CallService(MS_DB_CONTACT_FINDNEXT, (WPARAM)hContact, 0)) if (!CallService(MS_PROTO_ISPROTOONCONTACT, (WPARAM)hContact, (LPARAM)szGPGModuleName)) diff --git a/main.cpp b/main.cpp index 6a95b83..c5567ac 100644 --- a/main.cpp +++ b/main.cpp @@ -1598,7 +1598,7 @@ void ShowFirstRunDialog() { if (hwndFirstRun == NULL) { - hwndFirstRun = CreateDialog(hInst, MAKEINTRESOURCE(IDD_FIRST_RUN), NULL, DlgProcFirstRun); + hwndFirstRun = CreateDialog(hInst, MAKEINTRESOURCE(IDD_FIRST_RUN), NULL, (DLGPROC)DlgProcFirstRun); } SetForegroundWindow(hwndFirstRun); } @@ -1608,14 +1608,14 @@ void ShowSetDirsDialog() { if (hwndSetDirs == NULL) { - hwndSetDirs = CreateDialog(hInst, MAKEINTRESOURCE(IDD_BIN_PATH), NULL, DlgProcGpgBinOpts); + hwndSetDirs = CreateDialog(hInst, MAKEINTRESOURCE(IDD_BIN_PATH), NULL, (DLGPROC)DlgProcGpgBinOpts); } SetForegroundWindow(hwndSetDirs); } void ShowNewKeyDialog() { - hwndNewKey = CreateDialog(hInst, MAKEINTRESOURCE(IDD_NEW_KEY), NULL, DlgProcNewKeyDialog); + hwndNewKey = CreateDialog(hInst, MAKEINTRESOURCE(IDD_NEW_KEY), NULL, (DLGPROC)DlgProcNewKeyDialog); SetForegroundWindow(hwndNewKey); } @@ -1623,7 +1623,7 @@ void ShowKeyGenDialog() { if (hwndKeyGen == NULL) { - hwndKeyGen = CreateDialog(hInst, MAKEINTRESOURCE(IDD_KEY_GEN), NULL, DlgProcKeyGenDialog); + hwndKeyGen = CreateDialog(hInst, MAKEINTRESOURCE(IDD_KEY_GEN), NULL, (DLGPROC)DlgProcKeyGenDialog); } SetForegroundWindow(hwndKeyGen); } @@ -1632,14 +1632,14 @@ void ShowSelectExistingKeyDialog() { if (hwndSelectExistingKey == NULL) { - hwndSelectExistingKey = CreateDialog(hInst, MAKEINTRESOURCE(IDD_LOAD_EXISTING_KEY), NULL, DlgProcLoadExistingKey); + hwndSelectExistingKey = CreateDialog(hInst, MAKEINTRESOURCE(IDD_LOAD_EXISTING_KEY), NULL, (DLGPROC)DlgProcLoadExistingKey); } SetForegroundWindow(hwndSelectExistingKey); } void ShowImportKeyDialog() { - CreateDialog(hInst, MAKEINTRESOURCE(IDD_IMPORT_KEY), NULL, DlgProcImportKeyDialog); + CreateDialog(hInst, MAKEINTRESOURCE(IDD_IMPORT_KEY), NULL, (DLGPROC)DlgProcImportKeyDialog); } diff --git a/messages.cpp b/messages.cpp index 6d502f4..1509958 100644 --- a/messages.cpp +++ b/messages.cpp @@ -911,5 +911,5 @@ static BOOL CALLBACK DlgProcKeyPassword(HWND hwndDlg, UINT msg, WPARAM wParam, L void ShowLoadKeyPasswordWindow() { extern HINSTANCE hInst; - DialogBox(hInst, MAKEINTRESOURCE(IDD_KEY_PASSWD), NULL, DlgProcKeyPassword); + DialogBox(hInst, MAKEINTRESOURCE(IDD_KEY_PASSWD), NULL, (DLGPROC)DlgProcKeyPassword); } diff --git a/new_gpg.sln b/new_gpg.sln index 40d016c..9d68c4c 100644 --- a/new_gpg.sln +++ b/new_gpg.sln @@ -5,26 +5,48 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "new_gpg", "new_gpg.vcxproj" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug x64|Win32 = Debug x64|Win32 + Debug x64|x64 = Debug x64|x64 Debug(service)|Win32 = Debug(service)|Win32 + Debug(service)|x64 = Debug(service)|x64 Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 Release Unicode (service only)(static)|Win32 = Release Unicode (service only)(static)|Win32 + Release Unicode (service only)(static)|x64 = Release Unicode (service only)(static)|x64 Release Unicode (service only)|Win32 = Release Unicode (service only)|Win32 + Release Unicode (service only)|x64 = Release Unicode (service only)|x64 + Release Unicode (static) x64|Win32 = Release Unicode (static) x64|Win32 + Release Unicode (static) x64|x64 = Release Unicode (static) x64|x64 Release Unicode (static)|Win32 = Release Unicode (static)|Win32 + Release Unicode (static)|x64 = Release Unicode (static)|x64 Release Unicode|Win32 = Release Unicode|Win32 + Release Unicode|x64 = Release Unicode|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {F29D0C8D-141A-43CF-86B2-34A04653F8D4}.Debug(service)|Win32.ActiveCfg = Debug(service)|Win32 - {F29D0C8D-141A-43CF-86B2-34A04653F8D4}.Debug(service)|Win32.Build.0 = Debug(service)|Win32 - {F29D0C8D-141A-43CF-86B2-34A04653F8D4}.Debug|Win32.ActiveCfg = Debug|Win32 - {F29D0C8D-141A-43CF-86B2-34A04653F8D4}.Debug|Win32.Build.0 = Debug|Win32 - {F29D0C8D-141A-43CF-86B2-34A04653F8D4}.Release Unicode (service only)(static)|Win32.ActiveCfg = Release Unicode (service only)(static)|Win32 - {F29D0C8D-141A-43CF-86B2-34A04653F8D4}.Release Unicode (service only)(static)|Win32.Build.0 = Release Unicode (service only)(static)|Win32 - {F29D0C8D-141A-43CF-86B2-34A04653F8D4}.Release Unicode (service only)|Win32.ActiveCfg = Release Unicode (service only)|Win32 - {F29D0C8D-141A-43CF-86B2-34A04653F8D4}.Release Unicode (service only)|Win32.Build.0 = Release Unicode (service only)|Win32 - {F29D0C8D-141A-43CF-86B2-34A04653F8D4}.Release Unicode (static)|Win32.ActiveCfg = Release Unicode (static)|Win32 - {F29D0C8D-141A-43CF-86B2-34A04653F8D4}.Release Unicode (static)|Win32.Build.0 = Release Unicode (static)|Win32 - {F29D0C8D-141A-43CF-86B2-34A04653F8D4}.Release Unicode|Win32.ActiveCfg = Release Unicode|Win32 - {F29D0C8D-141A-43CF-86B2-34A04653F8D4}.Release Unicode|Win32.Build.0 = Release Unicode|Win32 + {F29D0C8D-141A-43CF-86B2-34A04653F8D4}.Debug x64|Win32.ActiveCfg = Debug x64|x64 + {F29D0C8D-141A-43CF-86B2-34A04653F8D4}.Debug x64|x64.ActiveCfg = Debug x64|x64 + {F29D0C8D-141A-43CF-86B2-34A04653F8D4}.Debug x64|x64.Build.0 = Debug x64|x64 + {F29D0C8D-141A-43CF-86B2-34A04653F8D4}.Debug(service)|Win32.ActiveCfg = Debug(service)|x64 + {F29D0C8D-141A-43CF-86B2-34A04653F8D4}.Debug(service)|x64.ActiveCfg = Debug(service)|x64 + {F29D0C8D-141A-43CF-86B2-34A04653F8D4}.Debug(service)|x64.Build.0 = Debug(service)|x64 + {F29D0C8D-141A-43CF-86B2-34A04653F8D4}.Debug|Win32.ActiveCfg = Debug|x64 + {F29D0C8D-141A-43CF-86B2-34A04653F8D4}.Debug|x64.ActiveCfg = Debug|x64 + {F29D0C8D-141A-43CF-86B2-34A04653F8D4}.Debug|x64.Build.0 = Debug|x64 + {F29D0C8D-141A-43CF-86B2-34A04653F8D4}.Release Unicode (service only)(static)|Win32.ActiveCfg = Release Unicode (service only)(static)|x64 + {F29D0C8D-141A-43CF-86B2-34A04653F8D4}.Release Unicode (service only)(static)|x64.ActiveCfg = Release Unicode (service only)(static)|x64 + {F29D0C8D-141A-43CF-86B2-34A04653F8D4}.Release Unicode (service only)(static)|x64.Build.0 = Release Unicode (service only)(static)|x64 + {F29D0C8D-141A-43CF-86B2-34A04653F8D4}.Release Unicode (service only)|Win32.ActiveCfg = Release Unicode (service only)|x64 + {F29D0C8D-141A-43CF-86B2-34A04653F8D4}.Release Unicode (service only)|x64.ActiveCfg = Release Unicode (service only)|x64 + {F29D0C8D-141A-43CF-86B2-34A04653F8D4}.Release Unicode (service only)|x64.Build.0 = Release Unicode (service only)|x64 + {F29D0C8D-141A-43CF-86B2-34A04653F8D4}.Release Unicode (static) x64|Win32.ActiveCfg = Release Unicode (static) x64|x64 + {F29D0C8D-141A-43CF-86B2-34A04653F8D4}.Release Unicode (static) x64|x64.ActiveCfg = Release Unicode (static) x64|x64 + {F29D0C8D-141A-43CF-86B2-34A04653F8D4}.Release Unicode (static) x64|x64.Build.0 = Release Unicode (static) x64|x64 + {F29D0C8D-141A-43CF-86B2-34A04653F8D4}.Release Unicode (static)|Win32.ActiveCfg = Release Unicode (static)|x64 + {F29D0C8D-141A-43CF-86B2-34A04653F8D4}.Release Unicode (static)|x64.ActiveCfg = Release Unicode (static)|x64 + {F29D0C8D-141A-43CF-86B2-34A04653F8D4}.Release Unicode (static)|x64.Build.0 = Release Unicode (static)|x64 + {F29D0C8D-141A-43CF-86B2-34A04653F8D4}.Release Unicode|Win32.ActiveCfg = Release Unicode|x64 + {F29D0C8D-141A-43CF-86B2-34A04653F8D4}.Release Unicode|x64.ActiveCfg = Release Unicode|x64 + {F29D0C8D-141A-43CF-86B2-34A04653F8D4}.Release Unicode|x64.Build.0 = Release Unicode|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/new_gpg.vcxproj b/new_gpg.vcxproj index 358cd1e..d91288d 100644 --- a/new_gpg.vcxproj +++ b/new_gpg.vcxproj @@ -1,61 +1,151 @@  + + Debug x64 + Win32 + + + Debug x64 + x64 + Debug(service) Win32 + + Debug(service) + x64 + Debug Win32 + + Debug + x64 + Release Unicode (service only)(static) Win32 + + Release Unicode (service only)(static) + x64 + Release Unicode (service only) Win32 + + Release Unicode (service only) + x64 + + + Release Unicode (static) x64 + Win32 + + + Release Unicode (static) x64 + x64 + Release Unicode (static) Win32 + + Release Unicode (static) + x64 + Release Unicode Win32 + + Release Unicode + x64 + {F29D0C8D-141A-43CF-86B2-34A04653F8D4} new_gpg + + DynamicLibrary + false + Unicode + DynamicLibrary false Unicode + + DynamicLibrary + false + Unicode + DynamicLibrary false Unicode + + DynamicLibrary + false + Unicode + DynamicLibrary false Unicode + + DynamicLibrary + false + Unicode + DynamicLibrary false Unicode + + DynamicLibrary + false + Unicode + + + DynamicLibrary + false + Unicode + + + DynamicLibrary + false + Unicode + DynamicLibrary false Unicode + + DynamicLibrary + false + Unicode + + + DynamicLibrary + false + Unicode + + + DynamicLibrary + false + Unicode + DynamicLibrary false @@ -64,26 +154,66 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -91,49 +221,155 @@ <_ProjectFileVersion>10.0.30319.1 + $(SolutionDir)$(Configuration)\ $(SolutionDir)$(Configuration)\ + $(Configuration)\ $(Configuration)\ + false false + .\Debug\ .\Debug\ + .\Debug\ .\Debug\ + true true + true + true + $(SolutionDir)$(Configuration)\ $(SolutionDir)$(Configuration)\ + $(SolutionDir)$(Configuration)\ + $(SolutionDir)$(Configuration)\ + $(Configuration)\ $(Configuration)\ + $(Configuration)\ + $(Configuration)\ + false false + false + false + $(SolutionDir)$(Configuration)\ $(SolutionDir)$(Configuration)\ + $(Configuration)\ $(Configuration)\ + false false + $(SolutionDir)$(Configuration)\ $(SolutionDir)$(Configuration)\ + $(Configuration)\ $(Configuration)\ + false false + $(Configuration)\ $(Configuration)\ + $(Configuration)\ $(Configuration)\ + true true + AllRules.ruleset AllRules.ruleset + + + AllRules.ruleset AllRules.ruleset + AllRules.ruleset + AllRules.ruleset + + + + + + + AllRules.ruleset AllRules.ruleset + + + AllRules.ruleset AllRules.ruleset + + + AllRules.ruleset AllRules.ruleset + AllRules.ruleset + AllRules.ruleset + + + + + + + AllRules.ruleset AllRules.ruleset + + + + + NDEBUG;%(PreprocessorDefinitions) + true + true + .\Release Unicode/testplug.tlb + + + + + Full + OnlyExplicitInline + Size + true + true + X:\install\git\miranda\mim_plugs;X:\install\git\miranda\miranda-im\miranda\include;../../include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_UNICODE;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + StreamingSIMDExtensions + Precise + .\Release Unicode/testplug.pch + .\Release Unicode/ + .\Release Unicode/ + .\Release Unicode/ + Level3 + true + + + NDEBUG;%(PreprocessorDefinitions) + 0x0809 + + + libgpgme-11.lib;libgcrypt-11.lib;libksba-8.lib;%(AdditionalDependencies) + true + X:\install\git\miranda\mim_plugs\lib;%(AdditionalLibraryDirectories) + true + true + true + UseLinkTimeCodeGeneration + false + + + .\Release Unicode/testplug.lib + + + true + .\Release Unicode/testplug.bsc + + NDEBUG;%(PreprocessorDefinitions) true true - Win32 .\Release Unicode/testplug.tlb @@ -174,19 +410,17 @@ .\Release Unicode/testplug.lib - MachineX86 true .\Release Unicode/testplug.bsc - + _DEBUG;%(PreprocessorDefinitions) true true - Win32 .\Debug/testplug.tlb @@ -195,7 +429,6 @@ Disabled x:\temp\windows\libs\utf8cpp\include;x:\temp\windows\libs\boost;x:\install\git\miranda\miranda-im\miranda\include;x:\install\git\miranda\mim_plugs;../../include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;TESTPLUG_EXPORTS;_CRT_SECURE_NO_WARNINGS;_UNICODE;UNICODE;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - true EnableFastChecks MultiThreadedDebug Use @@ -209,7 +442,7 @@ true Level3 true - EditAndContinue + ProgramDatabase _DEBUG;%(PreprocessorDefinitions) @@ -227,148 +460,552 @@ .\Debug/testplug.lib - MachineX86 true .\Debug/testplug.bsc - + - NDEBUG;%(PreprocessorDefinitions) + _DEBUG;%(PreprocessorDefinitions) true true - Win32 - .\Release Unicode (static)/testplug.tlb + .\Debug/testplug.tlb - MinSpace - OnlyExplicitInline - Size - true - true - x:\temp\windows\libs\utf8cpp\include;x:\temp\windows\libs\boost;x:\install\git\miranda\miranda-im\miranda\include;x:\install\git\miranda\mim_plugs;../../include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_UNICODE;%(PreprocessorDefinitions) - true - MultiThreaded - true - StreamingSIMDExtensions - Precise + Disabled + x:\temp\windows\libs\utf8cpp\include;C:\Boost\include\boost-1_45;x:\install\git\miranda\miranda-im\miranda\include;x:\install\git\miranda\mim_plugs;../../include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;TESTPLUG_EXPORTS;_CRT_SECURE_NO_WARNINGS;_UNICODE;UNICODE;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug Use commonheaders.h c:\temp\new_gpg.pch - .\Release Unicode (static)/ - .\Release Unicode (static)/ - .\Release Unicode (static)/ + + + .\Debug/ + .\Debug/ + .\Debug/ + true Level3 true + ProgramDatabase - NDEBUG;%(PreprocessorDefinitions) + _DEBUG;%(PreprocessorDefinitions) 0x0809 - shlwapi.lib;%(AdditionalDependencies) + shlwapi.lib;%(AdditionalDependencies) libboost_thread-vc100-mt-sgd-1_45.lib true - x:\temp\windows\libs\boost\lib;%(AdditionalLibraryDirectories) - false - NotSet - true - true - UseLinkTimeCodeGeneration + C:\Boost\lib-debug;%(AdditionalLibraryDirectories) + true + true + false + false false - .\Release Unicode (static)/testplug.lib - MachineX86 + .\Debug/testplug.lib true - .\Release Unicode (static)/testplug.bsc + .\Debug/testplug.bsc - + - NDEBUG;%(PreprocessorDefinitions) + _DEBUG;%(PreprocessorDefinitions) true true - Win32 - .\Release Unicode (static)/testplug.tlb + .\Debug/testplug.tlb - Full - OnlyExplicitInline - Size - true - true - ../../include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - MultiThreaded - true - StreamingSIMDExtensions - Precise - .\Release Unicode (static)/testplug.pch - .\Release Unicode (static)/ - .\Release Unicode (static)/ - .\Release Unicode (static)/ + Disabled + x:\temp\windows\libs\utf8cpp\include;C:\Boost\include\boost-1_45;x:\install\git\miranda\miranda-im\miranda\include;x:\install\git\miranda\mim_plugs;../../include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;TESTPLUG_EXPORTS;_CRT_SECURE_NO_WARNINGS;_UNICODE;UNICODE;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug + Use + commonheaders.h + c:\temp\new_gpg.pch + + + .\Debug/ + .\Debug/ + .\Debug/ + true Level3 true + ProgramDatabase - NDEBUG;%(PreprocessorDefinitions) + _DEBUG;%(PreprocessorDefinitions) 0x0809 + shlwapi.lib;%(AdditionalDependencies) true + C:\Boost\lib-debug-x64;%(AdditionalLibraryDirectories) true - true - true - UseLinkTimeCodeGeneration + true + false + false false - .\Release Unicode (static)/testplug.lib - MachineX86 + .\Debug/testplug.lib true - .\Release Unicode (static)/testplug.bsc + .\Debug/testplug.bsc - + - NDEBUG;%(PreprocessorDefinitions) + _DEBUG;%(PreprocessorDefinitions) true true - Win32 - .\Release Unicode (static)/testplug.tlb + .\Debug/testplug.tlb - Full - OnlyExplicitInline - Size - true - true - ../../include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - StreamingSIMDExtensions - Precise - .\Release Unicode (static)/testplug.pch - .\Release Unicode (static)/ - .\Release Unicode (static)/ - .\Release Unicode (static)/ - Level3 + Disabled + x:\temp\windows\libs\utf8cpp\include;x:\temp\windows\libs\boost;x:\install\git\miranda\miranda-im\miranda\include;x:\install\git\miranda\mim_plugs;../../include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;TESTPLUG_EXPORTS;_CRT_SECURE_NO_WARNINGS;_UNICODE;UNICODE;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug + Use + commonheaders.h + c:\temp\new_gpg.pch + + + .\Debug/ + .\Debug/ + .\Debug/ + true + Level3 + true + ProgramDatabase + + + _DEBUG;%(PreprocessorDefinitions) + 0x0809 + + + shlwapi.lib;%(AdditionalDependencies) libboost_thread-vc100-mt-sgd-1_45-64.lib + true + x:\temp\windows\libs\boost\lib;%(AdditionalLibraryDirectories) + true + true + false + false + false + + + .\Debug/testplug.lib + + + true + .\Debug/testplug.bsc + + + + + NDEBUG;%(PreprocessorDefinitions) + true + true + .\Release Unicode (static)/testplug.tlb + + + + + MinSpace + OnlyExplicitInline + Size + true + true + x:\temp\windows\libs\utf8cpp\include;C:\Boost\include\boost-1_45;x:\install\git\miranda\miranda-im\miranda\include;x:\install\git\miranda\mim_plugs;../../include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_UNICODE;%(PreprocessorDefinitions) + true + MultiThreaded + true + StreamingSIMDExtensions + Precise + Use + commonheaders.h + c:\temp\new_gpg.pch + .\Release Unicode (static)/ + .\Release Unicode (static)/ + .\Release Unicode (static)/ + Level3 + true + + + NDEBUG;%(PreprocessorDefinitions) + 0x0809 + + + shlwapi.lib;%(AdditionalDependencies) + true + x:\temp\windows\libs\boost\lib;%(AdditionalLibraryDirectories) + false + NotSet + true + true + UseLinkTimeCodeGeneration + false + + + .\Release Unicode (static)/testplug.lib + + + true + .\Release Unicode (static)/testplug.bsc + + + + + NDEBUG;%(PreprocessorDefinitions) + true + true + .\Release Unicode (static)/testplug.tlb + + + + + MinSpace + OnlyExplicitInline + Size + true + true + x:\temp\windows\libs\utf8cpp\include;C:\Boost\include\boost-1_45;x:\install\git\miranda\miranda-im\miranda\include;x:\install\git\miranda\mim_plugs;../../include + WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_UNICODE;%(PreprocessorDefinitions) + true + MultiThreaded + true + StreamingSIMDExtensions + Precise + Use + commonheaders.h + c:\temp\new_gpg.pch + .\Release Unicode (static)/ + .\Release Unicode (static)/ + .\Release Unicode (static)/ + Level3 + true + + + NDEBUG;%(PreprocessorDefinitions) + 0x0809 + + + shlwapi.lib;%(AdditionalDependencies) + true + C:\Boost\lib-release;%(AdditionalLibraryDirectories) + false + NotSet + true + true + UseLinkTimeCodeGeneration + false + + + .\Release Unicode (static)/testplug.lib + + + true + .\Release Unicode (static)/testplug.bsc + + + + + NDEBUG;%(PreprocessorDefinitions) + true + true + .\Release Unicode (static)/testplug.tlb + + + + + MinSpace + OnlyExplicitInline + Size + true + true + x:\temp\windows\libs\utf8cpp\include;C:\Boost\include\boost-1_45;x:\install\git\miranda\miranda-im\miranda\include;x:\install\git\miranda\mim_plugs;../../include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_UNICODE;%(PreprocessorDefinitions) + true + MultiThreaded + true + StreamingSIMDExtensions + Precise + Use + commonheaders.h + c:\temp\new_gpg.pch + .\Release Unicode (static)/ + .\Release Unicode (static)/ + .\Release Unicode (static)/ + Level3 + true + + + NDEBUG;%(PreprocessorDefinitions) + 0x0809 + + + shlwapi.lib;%(AdditionalDependencies) + true + x:\temp\windows\libs\boost\lib;%(AdditionalLibraryDirectories) + false + NotSet + true + true + UseLinkTimeCodeGeneration + false + + + .\Release Unicode (static)/testplug.lib + + + true + .\Release Unicode (static)/testplug.bsc + + + + + NDEBUG;%(PreprocessorDefinitions) + true + true + .\Release Unicode (static)/testplug.tlb + + + + + MinSpace + OnlyExplicitInline + Size + true + true + x:\temp\windows\libs\utf8cpp\include;x:\temp\windows\libs\boost;x:\install\git\miranda\miranda-im\miranda\include;x:\install\git\miranda\mim_plugs;../../include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_UNICODE;%(PreprocessorDefinitions) + true + MultiThreaded + true + StreamingSIMDExtensions + Precise + Use + commonheaders.h + c:\temp\new_gpg.pch + .\Release Unicode (static)/ + .\Release Unicode (static)/ + .\Release Unicode (static)/ + Level3 + true + + + NDEBUG;%(PreprocessorDefinitions) + 0x0809 + + + shlwapi.lib;%(AdditionalDependencies) + true + x:\temp\windows\libs\boost\lib;%(AdditionalLibraryDirectories) + false + NotSet + true + true + UseLinkTimeCodeGeneration + false + + + .\Release Unicode (static)/testplug.lib + + + true + .\Release Unicode (static)/testplug.bsc + + + + + NDEBUG;%(PreprocessorDefinitions) + true + true + .\Release Unicode (static)/testplug.tlb + + + + + Full + OnlyExplicitInline + Size + true + true + ../../include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + true + MultiThreaded + true + StreamingSIMDExtensions + Precise + .\Release Unicode (static)/testplug.pch + .\Release Unicode (static)/ + .\Release Unicode (static)/ + .\Release Unicode (static)/ + Level3 + true + + + NDEBUG;%(PreprocessorDefinitions) + 0x0809 + + + true + true + true + true + UseLinkTimeCodeGeneration + false + + + .\Release Unicode (static)/testplug.lib + + + true + .\Release Unicode (static)/testplug.bsc + + + + + NDEBUG;%(PreprocessorDefinitions) + true + true + .\Release Unicode (static)/testplug.tlb + + + + + Full + OnlyExplicitInline + Size + true + true + ../../include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + true + MultiThreaded + true + StreamingSIMDExtensions + Precise + .\Release Unicode (static)/testplug.pch + .\Release Unicode (static)/ + .\Release Unicode (static)/ + .\Release Unicode (static)/ + Level3 + true + + + NDEBUG;%(PreprocessorDefinitions) + 0x0809 + + + true + true + true + true + UseLinkTimeCodeGeneration + false + + + .\Release Unicode (static)/testplug.lib + + + true + .\Release Unicode (static)/testplug.bsc + + + + + NDEBUG;%(PreprocessorDefinitions) + true + true + .\Release Unicode (static)/testplug.tlb + + + + + Full + OnlyExplicitInline + Size + true + true + ../../include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + StreamingSIMDExtensions + Precise + .\Release Unicode (static)/testplug.pch + .\Release Unicode (static)/ + .\Release Unicode (static)/ + .\Release Unicode (static)/ + Level3 + true + + + NDEBUG;%(PreprocessorDefinitions) + 0x0809 + + + true + true + true + true + UseLinkTimeCodeGeneration + false + + + .\Release Unicode (static)/testplug.lib + + + true + .\Release Unicode (static)/testplug.bsc + + + + + NDEBUG;%(PreprocessorDefinitions) + true + true + .\Release Unicode (static)/testplug.tlb + + + + + Full + OnlyExplicitInline + Size + true + true + ../../include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + StreamingSIMDExtensions + Precise + .\Release Unicode (static)/testplug.pch + .\Release Unicode (static)/ + .\Release Unicode (static)/ + .\Release Unicode (static)/ + Level3 true @@ -385,19 +1022,57 @@ .\Release Unicode (static)/testplug.lib - MachineX86 true .\Release Unicode (static)/testplug.bsc + + + _DEBUG;%(PreprocessorDefinitions) + true + true + .\Debug/testplug.tlb + + + + + Disabled + ../../include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;TESTPLUG_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug + .\Debug/testplug.pch + .\Debug/ + .\Debug/ + .\Debug/ + Level3 + true + ProgramDatabase + + + _DEBUG;%(PreprocessorDefinitions) + 0x0809 + + + true + true + false + + + .\Debug/testplug.lib + + + true + .\Debug/testplug.bsc + + _DEBUG;%(PreprocessorDefinitions) true true - Win32 .\Debug/testplug.tlb @@ -406,7 +1081,6 @@ Disabled ../../include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;TESTPLUG_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true EnableFastChecks MultiThreadedDebug .\Debug/testplug.pch @@ -415,7 +1089,7 @@ .\Debug/ Level3 true - EditAndContinue + ProgramDatabase _DEBUG;%(PreprocessorDefinitions) @@ -428,7 +1102,6 @@ .\Debug/testplug.lib - MachineX86 true @@ -437,72 +1110,207 @@ + Use Use + Use + Use + Use Use + Use + Use + commonheaders.h commonheaders.h + commonheaders.h + commonheaders.h + c:\temp\new_gpg.pch c:\temp\new_gpg.pch + c:\temp\new_gpg.pch + c:\temp\new_gpg.pch + Use Use + Use + Use + Use Use + Use + Use + commonheaders.h commonheaders.h + commonheaders.h + commonheaders.h + c:\temp\new_gpg.pch c:\temp\new_gpg.pch + c:\temp\new_gpg.pch + c:\temp\new_gpg.pch + Use Use + Use + Use + Use Use + Use + Use + commonheaders.h commonheaders.h + commonheaders.h + commonheaders.h + c:\temp\new_gpg.pch c:\temp\new_gpg.pch + c:\temp\new_gpg.pch + c:\temp\new_gpg.pch + Create Create + Create + Create + commonheaders.h commonheaders.h + commonheaders.h + commonheaders.h + Create Create + Create + Create + commonheaders.h commonheaders.h + commonheaders.h + commonheaders.h + c:\temp\new_gpg.pch c:\temp\new_gpg.pch + c:\temp\new_gpg.pch + c:\temp\new_gpg.pch + Use Use + Use + Use + Use Use + Use + Use + commonheaders.h commonheaders.h + commonheaders.h + commonheaders.h + c:\temp\new_gpg.pch c:\temp\new_gpg.pch + c:\temp\new_gpg.pch + c:\temp\new_gpg.pch + Use Use + Use + Use + Use Use + Use + Use + commonheaders.h commonheaders.h + commonheaders.h + commonheaders.h + c:\temp\new_gpg.pch c:\temp\new_gpg.pch + c:\temp\new_gpg.pch + c:\temp\new_gpg.pch + Use Use + Use + Use + Use Use + Use + Use + commonheaders.h commonheaders.h + commonheaders.h + commonheaders.h + c:\temp\new_gpg.pch c:\temp\new_gpg.pch + c:\temp\new_gpg.pch + c:\temp\new_gpg.pch + Use Use + Use + Use + Use Use + Use + Use + commonheaders.h commonheaders.h + commonheaders.h + commonheaders.h + c:\temp\new_gpg.pch c:\temp\new_gpg.pch + c:\temp\new_gpg.pch + c:\temp\new_gpg.pch + Use Use + Use + Use + Use Use + Use + Use + commonheaders.h commonheaders.h + commonheaders.h + commonheaders.h + c:\temp\new_gpg.pch c:\temp\new_gpg.pch + c:\temp\new_gpg.pch + c:\temp\new_gpg.pch + Use Use + Use + Use + Use Use + Use + Use + commonheaders.h commonheaders.h + commonheaders.h + commonheaders.h + c:\temp\new_gpg.pch c:\temp\new_gpg.pch + c:\temp\new_gpg.pch + c:\temp\new_gpg.pch + Use Use + Use + Use + Use Use + Use + Use + commonheaders.h commonheaders.h + commonheaders.h + commonheaders.h + c:\temp\new_gpg.pch c:\temp\new_gpg.pch + c:\temp\new_gpg.pch + c:\temp\new_gpg.pch diff --git a/options.cpp b/options.cpp index ab12158..90fc4f4 100644 --- a/options.cpp +++ b/options.cpp @@ -47,7 +47,7 @@ int GpgOptInit(WPARAM wParam,LPARAM lParam) odp.pszGroup = "Services"; odp.pszTab = "Main"; odp.flags=ODPF_BOLDGROUPS; - odp.pfnDlgProc = DlgProcGpgOpts; + odp.pfnDlgProc = (DLGPROC)DlgProcGpgOpts; CallService(MS_OPT_ADDPAGE,wParam,(LPARAM)&odp); ZeroMemory(&odp, sizeof(odp)); @@ -59,7 +59,7 @@ int GpgOptInit(WPARAM wParam,LPARAM lParam) odp.pszGroup = "Services"; odp.pszTab = "GnuPG Variables"; odp.flags=ODPF_BOLDGROUPS; - odp.pfnDlgProc = DlgProcGpgBinOpts; + odp.pfnDlgProc = (DLGPROC)DlgProcGpgBinOpts; CallService(MS_OPT_ADDPAGE,wParam,(LPARAM)&odp); ZeroMemory(&odp, sizeof(odp)); @@ -71,7 +71,7 @@ int GpgOptInit(WPARAM wParam,LPARAM lParam) odp.pszGroup = "Services"; odp.pszTab = "Messages"; odp.flags=ODPF_BOLDGROUPS; - odp.pfnDlgProc = DlgProcGpgMsgOpts; + odp.pfnDlgProc = (DLGPROC)DlgProcGpgMsgOpts; CallService(MS_OPT_ADDPAGE,wParam,(LPARAM)&odp); return 0; @@ -1230,5 +1230,5 @@ static BOOL CALLBACK DlgProcLoadPublicKey(HWND hwndDlg,UINT msg,WPARAM wParam,LP void ShowLoadPublicKeyDialog() { - DialogBox(hInst, MAKEINTRESOURCE(IDD_LOAD_PUBLIC_KEY), NULL, DlgProcLoadPublicKey); + DialogBox(hInst, MAKEINTRESOURCE(IDD_LOAD_PUBLIC_KEY), NULL, (DLGPROC)DlgProcLoadPublicKey); } -- cgit v1.2.3