From ca793fe9ff364647361a22331446524853e428fa Mon Sep 17 00:00:00 2001 From: kreol13 Date: Tue, 31 May 2011 06:42:05 +0000 Subject: added x64 support git-svn-id: http://miranda-plugins.googlecode.com/svn/trunk@132 e753b5eb-9565-29b2-b5c5-2cc6f99dfbcb --- console/Console.c | 10 +- console/Console.sln | 14 ++- console/Console.vcxproj | 286 ++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 304 insertions(+), 6 deletions(-) (limited to 'console') diff --git a/console/Console.c b/console/Console.c index 52f892e..7a05aed 100644 --- a/console/Console.c +++ b/console/Console.c @@ -371,7 +371,7 @@ static LRESULT CALLBACK SubclassProc(HWND hwnd,UINT msg,WPARAM wParam,LPARAM lPa } break; } - return CallWindowProc((WNDPROC)GetWindowLong(hwnd, GWL_USERDATA),hwnd,msg,wParam,lParam); + return CallWindowProc((WNDPROC)GetWindowLong(hwnd, GWLP_USERDATA),hwnd,msg,wParam,lParam); } //////////////////////////////////////////////////////////////////////////////// @@ -379,7 +379,7 @@ static LRESULT CALLBACK SubclassProc(HWND hwnd,UINT msg,WPARAM wParam,LPARAM lPa static BOOL CALLBACK LogDlgProc(HWND hwndDlg,UINT message,WPARAM wParam,LPARAM lParam) { - LOGWIN *dat = (LOGWIN*)GetWindowLong(hwndDlg, GWL_USERDATA); + LOGWIN *dat = (LOGWIN*)GetWindowLong(hwndDlg, GWLP_USERDATA); switch(message) { case WM_INITDIALOG: @@ -391,8 +391,8 @@ static BOOL CALLBACK LogDlgProc(HWND hwndDlg,UINT message,WPARAM wParam,LPARAM l dat->Paused = 0; dat->hList = GetDlgItem(hwndDlg, IDC_LIST); - SetWindowLong(hwndDlg, GWL_USERDATA, (LONG)dat); - SetWindowLong(dat->hList, GWL_USERDATA, SetWindowLong(dat->hList,GWL_WNDPROC,(LONG)SubclassProc)); + SetWindowLong(hwndDlg, GWLP_USERDATA, (LONG)dat); + SetWindowLong(dat->hList, GWLP_USERDATA, SetWindowLong(dat->hList,GWLP_WNDPROC,(LONG)SubclassProc)); // init buttons { @@ -689,7 +689,7 @@ static BOOL CALLBACK LogDlgProc(HWND hwndDlg,UINT message,WPARAM wParam,LPARAM l DestroyWindow(hwndDlg); break; case WM_DESTROY: - SetWindowLong(dat->hList, GWL_WNDPROC, GetWindowLong(dat->hList,GWL_USERDATA)); + SetWindowLong(dat->hList, GWLP_WNDPROC, GetWindowLong(dat->hList,GWLP_USERDATA)); SendMessage(hwndConsole, HM_REMOVE, 0, (LPARAM)dat); break; } diff --git a/console/Console.sln b/console/Console.sln index 04d0cb6..8387889 100644 --- a/console/Console.sln +++ b/console/Console.sln @@ -1,23 +1,35 @@ Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual C++ Express 2010 +# Visual Studio 2010 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Console", "Console.vcxproj", "{A231E008-2D1A-4F24-95DD-59F56F85A499}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug Unicode|Win32 = Debug Unicode|Win32 + Debug Unicode|x64 = Debug Unicode|x64 Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 Release Unicode|Win32 = Release Unicode|Win32 + Release Unicode|x64 = Release Unicode|x64 Release|Win32 = Release|Win32 + Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {A231E008-2D1A-4F24-95DD-59F56F85A499}.Debug Unicode|Win32.ActiveCfg = Debug Unicode|Win32 {A231E008-2D1A-4F24-95DD-59F56F85A499}.Debug Unicode|Win32.Build.0 = Debug Unicode|Win32 + {A231E008-2D1A-4F24-95DD-59F56F85A499}.Debug Unicode|x64.ActiveCfg = Debug Unicode|x64 + {A231E008-2D1A-4F24-95DD-59F56F85A499}.Debug Unicode|x64.Build.0 = Debug Unicode|x64 {A231E008-2D1A-4F24-95DD-59F56F85A499}.Debug|Win32.ActiveCfg = Debug|Win32 {A231E008-2D1A-4F24-95DD-59F56F85A499}.Debug|Win32.Build.0 = Debug|Win32 + {A231E008-2D1A-4F24-95DD-59F56F85A499}.Debug|x64.ActiveCfg = Debug|x64 + {A231E008-2D1A-4F24-95DD-59F56F85A499}.Debug|x64.Build.0 = Debug|x64 {A231E008-2D1A-4F24-95DD-59F56F85A499}.Release Unicode|Win32.ActiveCfg = Release Unicode|Win32 {A231E008-2D1A-4F24-95DD-59F56F85A499}.Release Unicode|Win32.Build.0 = Release Unicode|Win32 + {A231E008-2D1A-4F24-95DD-59F56F85A499}.Release Unicode|x64.ActiveCfg = Release Unicode|x64 + {A231E008-2D1A-4F24-95DD-59F56F85A499}.Release Unicode|x64.Build.0 = Release Unicode|x64 {A231E008-2D1A-4F24-95DD-59F56F85A499}.Release|Win32.ActiveCfg = Release|Win32 {A231E008-2D1A-4F24-95DD-59F56F85A499}.Release|Win32.Build.0 = Release|Win32 + {A231E008-2D1A-4F24-95DD-59F56F85A499}.Release|x64.ActiveCfg = Release|x64 + {A231E008-2D1A-4F24-95DD-59F56F85A499}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/console/Console.vcxproj b/console/Console.vcxproj index a694abb..5b6c61b 100644 --- a/console/Console.vcxproj +++ b/console/Console.vcxproj @@ -5,18 +5,34 @@ Debug Unicode Win32 + + Debug Unicode + x64 + Debug Win32 + + Debug + x64 + Release Unicode Win32 + + Release Unicode + x64 + Release Win32 + + Release + x64 + {A231E008-2D1A-4F24-95DD-59F56F85A499} @@ -32,21 +48,41 @@ false Unicode + + DynamicLibrary + false + Unicode + DynamicLibrary false Unicode + + DynamicLibrary + false + Unicode + DynamicLibrary false MultiByte + + DynamicLibrary + false + MultiByte + DynamicLibrary false MultiByte + + DynamicLibrary + false + MultiByte + @@ -54,33 +90,61 @@ + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 .\Debug\ + .\Debug\ .\Debug\ + .\Debug\ false + false .\Release\ + .\Release\ .\Release\ + .\Release\ false + false $(Configuration)\ + $(Configuration)\ $(Configuration)\ + $(Configuration)\ false + false $(SolutionDir)$(Configuration)/Plugins\ + $(SolutionDir)$(Configuration)/Plugins\ $(SolutionDir)$(Configuration)/Obj/$(ProjectName)\ + $(SolutionDir)$(Configuration)/Obj/$(ProjectName)\ false + false @@ -131,6 +195,53 @@ + + + _DEBUG;%(PreprocessorDefinitions) + true + true + .\Debug/Console.tlb + + + + + Disabled + ../../include;../ExternalAPI;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;Console_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL + Use + Commonheaders.h + .\Debug/Console.pch + .\Debug/ + .\Debug/ + .\Debug/ + true + Level3 + true + ProgramDatabase + Default + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + ../../include;../ExternalAPI;%(AdditionalIncludeDirectories) + + + ../../Bin/Debug/plugins/Console.dll + true + true + .\Debug/Console.pdb + true + .\Debug/Console.map + false + + + .\Debug/Console.lib + + + + NDEBUG;%(PreprocessorDefinitions) @@ -179,6 +290,52 @@ + + + NDEBUG;%(PreprocessorDefinitions) + true + true + .\Release/Console.tlb + + + + + Full + AnySuitable + ../../include;../ExternalAPI;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;Console_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + Use + Commonheaders.h + .\Release/Console.pch + .\Release/ + .\Release/ + .\Release/ + true + Level3 + true + Default + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + ../../include;../ExternalAPI;%(AdditionalIncludeDirectories) + + + ../../bin/release/plugins/Console.dll + true + .\Release/Console.pdb + true + false + + + .\Release/Console.lib + + + + _DEBUG;%(PreprocessorDefinitions) @@ -228,6 +385,53 @@ + + + _DEBUG;%(PreprocessorDefinitions) + true + true + .\Debug/Console.tlb + + + + + Disabled + ../../include;../ExternalAPI;%(AdditionalIncludeDirectories) + _UNICODE;WIN32;_DEBUG;_WINDOWS;_USRDLL;Console_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL + Use + Commonheaders.h + .\Debug/Console.pch + .\Debug/ + .\Debug/ + .\Debug/ + true + Level3 + true + ProgramDatabase + Default + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + ../../include;../ExternalAPI;%(AdditionalIncludeDirectories) + + + ../../Bin/Debug Unicode/plugins/Console.dll + true + true + .\Debug/Console.pdb + true + .\Debug/Console.map + false + + + .\Debug/Console.lib + + + + NDEBUG;%(PreprocessorDefinitions) @@ -275,46 +479,128 @@ + + + NDEBUG;%(PreprocessorDefinitions) + true + true + .\Release/Console.tlb + + + + + Full + AnySuitable + ../../include;../ExternalAPI;%(AdditionalIncludeDirectories) + _UNICODE;WIN32;NDEBUG;_WINDOWS;_USRDLL;Console_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + true + MultiThreaded + true + Use + Commonheaders.h + .\Release/Console.pch + .\Release/ + .\Release/ + .\Release/ + true + Level3 + true + Default + true + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + ../../include;../ExternalAPI;%(AdditionalIncludeDirectories) + + + true + .\Release/Console.pdb + true + false + + + .\Release/Console.lib + + + + Disabled + Disabled %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) EnableFastChecks + EnableFastChecks Create + Create true + true Disabled + Disabled %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;Console_EXPORTS + WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;Console_EXPORTS EnableFastChecks + EnableFastChecks Create + Create true + true MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) Create + Create true + true MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;Console_EXPORTS + WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;Console_EXPORTS Create + Create true + true Disabled + Disabled %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) EnableFastChecks + EnableFastChecks true + true Disabled + Disabled %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;Console_EXPORTS + WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;Console_EXPORTS EnableFastChecks + EnableFastChecks true + true MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) true + true MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;Console_EXPORTS + WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;Console_EXPORTS true + true -- cgit v1.2.3