Get the project to build again

malensek · Apr 8, 2019 · cb895be · cb895be
1 parent 7607cf9
commit cb895be
Show file tree

Hide file tree

Showing 7 changed files with 40 additions and 23 deletions.
diff --git a/3RVX/3RVX.vcxproj b/3RVX/3RVX.vcxproj
@@ -29,7 +29,7 @@
   <PropertyGroup Label="Globals">
     <ProjectGuid>{CC4D05DB-E255-4F26-B71C-455CC100ED54}</ProjectGuid>
     <RootNamespace>My3RVX</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.15063.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -107,7 +107,7 @@
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>comsuppw.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <PostBuildEvent>
       <Command>mklink /j "$(TargetDir)\Skins" "$(ProjectDir)\..\Skins" || mklink /j "$(TargetDir)\Languages" "$(ProjectDir)\..\Languages" || exit /B 0</Command>
@@ -127,7 +127,7 @@
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>comsuppw.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <PostBuildEvent>
       <Command>mklink /j "$(TargetDir)\Skins" "$(ProjectDir)\..\Skins" || mklink /j "$(TargetDir)\Languages" "$(ProjectDir)\..\Languages" || exit /B 0</Command>
@@ -148,7 +148,7 @@
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>comsuppw.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <PostBuildEvent>
       <Command>mklink /j "$(TargetDir)\Skins" "$(ProjectDir)\..\Skins" || mklink /j "$(TargetDir)\Languages" "$(ProjectDir)\..\Languages" || exit /B 0</Command>
@@ -168,7 +168,7 @@
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>comsuppw.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <PostBuildEvent>
       <Command>mklink /j "$(TargetDir)\Skins" "$(ProjectDir)\..\Skins" || mklink /j "$(TargetDir)\Languages" "$(ProjectDir)\..\Languages" || exit /B 0</Command>
@@ -187,7 +187,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>comsuppw.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <PostBuildEvent>
       <Command>mklink /j "$(TargetDir)\Skins" "$(ProjectDir)\..\Skins" || mklink /j "$(TargetDir)\Languages" "$(ProjectDir)\..\Languages" || exit /B 0</Command>
@@ -206,7 +206,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>comsuppw.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <PostBuildEvent>
       <Command>mklink /j "$(TargetDir)\Skins" "$(ProjectDir)\..\Skins" || mklink /j "$(TargetDir)\Languages" "$(ProjectDir)\..\Languages" || exit /B 0</Command>
@@ -216,6 +216,8 @@
     <ClInclude Include="3RVX.h" />
     <ClInclude Include="CommCtl.h" />
     <ClInclude Include="Controllers\BrightnessController.h" />
+    <ClInclude Include="Controllers\Brightness\DDCBrightnessController.h" />
+    <ClInclude Include="Controllers\Brightness\WMIBrightnessController.h" />
     <ClInclude Include="Controllers\Volume\CoreAudio.h" />
     <ClInclude Include="Controllers\Volume\CurveTransformer.h" />
     <ClInclude Include="Controllers\Volume\VolumeLimiter.h" />
@@ -286,12 +288,14 @@
   <ItemGroup>
     <ClCompile Include="3RVX.cpp" />
     <ClCompile Include="3RVXConsts.cpp" />
-    <ClCompile Include="Controllers\BrightnessController.cpp" />
+    <ClCompile Include="Controllers\Brightness\DDCBrightnessController.cpp" />
+    <ClCompile Include="Controllers\Brightness\WMIBrightnessController.cpp" />
     <ClCompile Include="Controllers\Volume\CoreAudio.cpp" />
     <ClCompile Include="D3DDevice.cpp" />
     <ClCompile Include="DriveInfo.cpp" />
     <ClCompile Include="DisplayManager.cpp" />
     <ClCompile Include="Error.cpp" />
+    <ClCompile Include="HideWin10VolumeOSD.cpp" />
     <ClCompile Include="MeterWnd\Meters\HorizontalSliderKnob.cpp" />
     <ClCompile Include="MeterWnd\Meters\SliderKnob.cpp" />
     <ClCompile Include="MeterWnd\Meters\VerticalSliderKnob.cpp" />

diff --git a/3RVX/3RVX.vcxproj.filters b/3RVX/3RVX.vcxproj.filters
@@ -222,6 +222,12 @@
     <ClInclude Include="D3DDevice.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="Controllers\Brightness\DDCBrightnessController.h">
+      <Filter>Source Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Controllers\Brightness\WMIBrightnessController.h">
+      <Filter>Source Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="Controllers\Volume\CoreAudio.cpp">
@@ -362,9 +368,6 @@
     <ClCompile Include="OSD\BrightnessOSD.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Controllers\BrightnessController.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="Skin\ErrorSkin.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -386,6 +389,15 @@
     <ClCompile Include="D3DDevice.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="Controllers\Brightness\DDCBrightnessController.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Controllers\Brightness\WMIBrightnessController.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="HideWin10VolumeOSD.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="3RVX.rc">

diff --git a/3RVX/COMUtil.h b/3RVX/COMUtil.h
@@ -2,14 +2,14 @@
 
 class COMUtil {
 public:
-    template <class T> static void COMUtil::SafeRelease(T *p) {
+    template <class T> static void SafeRelease(T *p) {
         if (p) {
             p->Release();
             p = NULL;
         }
     }
 
-    template <class T> static void COMUtil::SafeRelease(T **ppT) {
+    template <class T> static void SafeRelease(T **ppT) {
         if (*ppT) {
             (*ppT)->Release();
             *ppT = NULL;

diff --git a/3RVX/Controllers/Brightness/DDCBrightnessController.h b/3RVX/Controllers/Brightness/DDCBrightnessController.h
@@ -7,16 +7,17 @@
 
 #include <Windows.h>
 #include <HighLevelMonitorConfigurationAPI.h>
+#include "BrightnessController.h"
 
 class Monitor;
 
-class DDCBrightnessController {
+class DDCBrightnessController : public BrightnessController{
 public:
     DDCBrightnessController(HMONITOR monitor);
     DDCBrightnessController(Monitor &monitor);
 
-    float Brightness();
-    void Brightness(float level);
+    float Brightness() override;
+    void Brightness(float level) override;
 
 private:
     HANDLE _monitorHandle;

diff --git a/Settings/Controls/Control.cpp b/Settings/Controls/Control.cpp
@@ -207,22 +207,22 @@ BOOL Control::Scroll(bool horizontal, WORD request, WORD position) {
     return FALSE;
 }
 
-long Control::WindowAttributes(int index) {
+LONG_PTR Control::WindowAttributes(int index) {
     return GetWindowLongPtr(_hWnd, index);
 }
 
-void Control::WindowAttributes(int index, long value) {
+void Control::WindowAttributes(int index, LONG_PTR value) {
     SetWindowLongPtr(_hWnd, index, value);
 }
 
 void Control::AddWindowAttribute(int index, long attribute) {
-    long attr = WindowAttributes(index);
+	LONG_PTR attr = WindowAttributes(index);
     attr |= attribute;
     WindowAttributes(index, attr);
 }
 
 void Control::RemoveWindowAttribute(int index, long attribute) {
-    long attr = WindowAttributes(index);
+	LONG_PTR attr = WindowAttributes(index);
     attr &= ~attribute;
     WindowAttributes(index, attr);
 }
diff --git a/Settings/Controls/Control.h b/Settings/Controls/Control.h
@@ -78,7 +78,7 @@ class Control {
     /// The index of the attribute to retrieve. Common indexes include
     /// GWL_STYLE, GWL_EXSTYLE, etc.
     /// </param>
-    long WindowAttributes(int index);
+	LONG_PTR WindowAttributes(int index);
 
     /// <summary>
     /// Sets the window attributes of this control. See the SetWindowLongPtr
@@ -89,7 +89,7 @@ class Control {
     /// GWL_STYLE, GWL_EXSTYLE, etc.
     /// </param>
     /// <param name="value">New value of the attribute</param>
-    void WindowAttributes(int index, long value);
+    void WindowAttributes(int index, LONG_PTR value);
 
     /// <summary>
     /// Adds a window attribute to this control; same as retrieving the window

diff --git a/Settings/Settings.vcxproj b/Settings/Settings.vcxproj
@@ -30,7 +30,7 @@
     <ProjectGuid>{302FD0A1-5C6B-4370-847A-496A762EA0CF}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>Settings</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.15063.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">