From 8b4f9196a35b053ef8d37d811eaf51f6e70ca887 Mon Sep 17 00:00:00 2001 From: mataes2007 Date: Thu, 28 Apr 2011 10:59:22 +0000 Subject: w7ui: added vc9 project compilation fix git-svn-id: http://miranda-plugins.googlecode.com/svn/trunk@59 e753b5eb-9565-29b2-b5c5-2cc6f99dfbcb --- w7ui/W7UI_10.sln | 20 --- w7ui/W7UI_10.vcxproj | 190 +++++++++++++++------- w7ui/w7ui_9.vcproj | 438 +++++++++++++++++++++++++++++++++++++++++++++++++++ w7ui/win7api.h | 35 +--- 4 files changed, 575 insertions(+), 108 deletions(-) delete mode 100644 w7ui/W7UI_10.sln create mode 100644 w7ui/w7ui_9.vcproj diff --git a/w7ui/W7UI_10.sln b/w7ui/W7UI_10.sln deleted file mode 100644 index 744f6a0..0000000 --- a/w7ui/W7UI_10.sln +++ /dev/null @@ -1,20 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual C++ Express 2010 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "W7UI_10", "W7UI_10.vcxproj", "{E4631327-7B4C-457C-870E-BF94EA034AD0}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Release|Win32 = Release|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {E4631327-7B4C-457C-870E-BF94EA034AD0}.Debug|Win32.ActiveCfg = Debug|Win32 - {E4631327-7B4C-457C-870E-BF94EA034AD0}.Debug|Win32.Build.0 = Debug|Win32 - {E4631327-7B4C-457C-870E-BF94EA034AD0}.Release|Win32.ActiveCfg = Release|Win32 - {E4631327-7B4C-457C-870E-BF94EA034AD0}.Release|Win32.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/w7ui/W7UI_10.vcxproj b/w7ui/W7UI_10.vcxproj index c599b2b..c909ded 100644 --- a/w7ui/W7UI_10.vcxproj +++ b/w7ui/W7UI_10.vcxproj @@ -1,93 +1,187 @@  + + Debug Unicode + Win32 + Debug Win32 + + Release Unicode + Win32 + Release Win32 - {E4631327-7B4C-457C-870E-BF94EA034AD0} - W7UI - W7UI + w7ui + {86704897-EABF-439D-BE0E-52CEA67C2C43} + w7ui + Win32Proj - - Application - true - MultiByte + + DynamicLibrary + Unicode + true + + + DynamicLibrary + Unicode DynamicLibrary - false + MultiByte true - Unicode - v100 + + + DynamicLibrary + MultiByte - + + + + + + + - + - - .dll - false - $(SolutionDir)$(Configuration)/Plugins\ - $(SolutionDir)$(Configuration)/Obj/$(ProjectName)\ - - - $(SolutionDir)$(Configuration)/Plugins\ - - - $(SolutionDir)$(Configuration)/Obj/$(ProjectName)\ + + <_ProjectFileVersion>10.0.40219.1 + $(SolutionDir)$(Configuration)/Plugins\ + $(SolutionDir)$(Configuration)/Obj/$(ProjectName)\ + true + $(SolutionDir)$(Configuration)/Plugins\ + $(SolutionDir)$(Configuration)/Obj/$(ProjectName)\ + false + $(SolutionDir)$(Configuration)/Plugins\ + $(SolutionDir)$(Configuration)/Obj/$(ProjectName)\ + $(SolutionDir)$(Configuration)/Plugins\ + $(SolutionDir)$(Configuration)/Obj/$(ProjectName)\ + false + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + - Level3 Disabled + ../../include;../ExternalAPI + WIN32;_DEBUG;_WINDOWS;_USRDLL;W7UI_EXPORTS;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + EditAndContinue + msimg32.lib;dwmapi.lib;comctl32.lib;shlwapi.lib;%(AdditionalDependencies) true + Windows + MachineX86 - Level3 - MinSpace - true + MaxSpeed true - Disabled - Size - true - true - Fast - ../../include;../ExternalAPI;%(AdditionalIncludeDirectories) + ../../include;../ExternalAPI WIN32;NDEBUG;_WINDOWS;_USRDLL;W7UI_EXPORTS;%(PreprocessorDefinitions) + MultiThreadedDLL + true + + + Level3 + ProgramDatabase + msimg32.lib;dwmapi.lib;comctl32.lib;shlwapi.lib;%(AdditionalDependencies) true - true + Windows true - $(IntDir)$(TargetName).pdb - $(IntDir)\(TargetName).lib + true + MachineX86 + + + + + Disabled + ../../include;../ExternalAPI + WIN32;_DEBUG;_WINDOWS;_USRDLL;W7UI_EXPORTS;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + + + Level3 + EditAndContinue + + msimg32.lib;dwmapi.lib;comctl32.lib;shlwapi.lib;%(AdditionalDependencies) + true + Windows + MachineX86 + $(IntDir)$(TargetName).lib + + + + + Full + Size + ../../include;../ExternalAPI + WIN32;NDEBUG;_WINDOWS;_USRDLL;W7UI_EXPORTS;%(PreprocessorDefinitions) + MultiThreadedDLL + true + + + Level3 + ProgramDatabase + + + msimg32.lib;dwmapi.lib;comctl32.lib;shlwapi.lib;%(AdditionalDependencies) + true + Windows + true + true + MachineX86 - - $(IntDir)$(TargetName).xml - - - $(IntDir)$(TargetName).bsc - + + + + + + + + + + + + @@ -104,18 +198,6 @@ - - - - - - - - - - - - diff --git a/w7ui/w7ui_9.vcproj b/w7ui/w7ui_9.vcproj new file mode 100644 index 0000000..8ee4132 --- /dev/null +++ b/w7ui/w7ui_9.vcproj @@ -0,0 +1,438 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/w7ui/win7api.h b/w7ui/win7api.h index 2a2c005..f9fa806 100644 --- a/w7ui/win7api.h +++ b/w7ui/win7api.h @@ -7,45 +7,12 @@ #define DWMWA_HAS_ICONIC_BITMAP 10 #define DWM_SIT_DISPLAYFRAME 0x00000001 -/* -enum TBPFLAG -{ TBPF_NOPROGRESS = 0, - TBPF_INDETERMINATE = 0x1, - TBPF_NORMAL = 0x2, - TBPF_ERROR = 0x4, - TBPF_PAUSED = 0x8 -}; -*/ + enum TBATFLAG { TBATF_USEMDITHUMBNAIL = 0x1, TBATF_USEMDILIVEPREVIEW = 0x2 }; -/*typedef enum THUMBBUTTONMASK { - THB_BITMAP = 0x00000001, - THB_ICON = 0x00000002, - THB_TOOLTIP = 0x00000004, - THB_FLAGS = 0x00000008 -} THUMBBUTTONMASK; - -typedef enum THUMBBUTTONFLAGS { - THBF_ENABLED = 0x00000000, - THBF_DISABLED = 0x00000001, - THBF_DISMISSONCLICK = 0x00000002, - THBF_NOBACKGROUND = 0x00000004, - THBF_HIDDEN = 0x00000008, - THBF_NONINTERACTIVE = 0x00000010 -} THUMBBUTTONFLAGS; - -typedef struct THUMBBUTTON { - THUMBBUTTONMASK dwMask; - UINT iId; - UINT iBitmap; - HICON hIcon; - WCHAR szTip[260]; - THUMBBUTTONFLAGS dwFlags; -} THUMBBUTTON, *LPTHUMBBUTTON;*/ - #define THBN_CLICKED 0x1800 extern HRESULT (WINAPI *dwmInvalidateIconicBitmaps)(HWND); -- cgit v1.2.3