Skip to content

Commit

Permalink
Test of GitHub Actions workflow
Browse files Browse the repository at this point in the history
  • Loading branch information
Aemony committed Jul 19, 2024
1 parent ccba91b commit 26aaafc
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 7 deletions.
6 changes: 3 additions & 3 deletions SKIV.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -82,20 +82,20 @@
<LinkIncremental>true</LinkIncremental>
<IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);.\resources\;.\packages_misc\;.\packages_misc\gsl\</IncludePath>
<TargetName>$(ProjectName)32</TargetName>
<OutDir>C:\Users\amcol\Documents\My Mods\SpecialK\</OutDir>
<OutDir>Builds\</OutDir>
<IntDir>Builds\$(Platform)-$(Configuration)\</IntDir>
<PreBuildEventUseInBuild>false</PreBuildEventUseInBuild>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<LinkIncremental>true</LinkIncremental>
<IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);.\resources\;.\packages_misc\;.\packages_misc\gsl\</IncludePath>
<OutDir>C:\Users\amcol\Documents\My Mods\SpecialK\</OutDir>
<OutDir>Builds\</OutDir>
<IntDir>Builds\$(Platform)-$(Configuration)\</IntDir>
<PreBuildEventUseInBuild>false</PreBuildEventUseInBuild>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>false</LinkIncremental>
<OutDir>C:\Users\amcol\Documents\My Mods\SpecialK\</OutDir>
<OutDir>Builds\</OutDir>
<IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);.\resources\;.\packages_misc\;.\packages_misc\gsl\</IncludePath>
<TargetName>$(ProjectName)32</TargetName>
<RunCodeAnalysis>false</RunCodeAnalysis>
Expand Down
9 changes: 5 additions & 4 deletions src/utility/utility.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2699,7 +2699,7 @@ typedef enum EFFECTIVE_POWER_MODE {
#define EffectivePowerModeNone -1
#endif

std::atomic<int> enumEffectivePowerMode = EffectivePowerModeNone;
std::atomic<int> enumEffectivePowerMode = EffectivePowerModeNone;

typedef VOID WINAPI EFFECTIVE_POWER_MODE_CALLBACK (
_In_ EFFECTIVE_POWER_MODE Mode,
Expand Down Expand Up @@ -2803,12 +2803,11 @@ void SKIF_Util_SetEffectivePowerModeNotifications (bool enable)

// High Dynamic Range (HDR)

//#if (NTDDI_VERSION >= NTDDI_WIN10_NI)
#include <winrt/Windows.Graphics.Display.h>
#include <winrt/Windows.Devices.Display.Core.h>

#if (NTDDI_VERSION >= NTDDI_WIN10_NI)
#include <Windows.Graphics.Display.Interop.h>
#endif
//#endif

// This actually updates the underlying vector
static void
Expand Down Expand Up @@ -2926,6 +2925,7 @@ SKIF_UtilInt_UpdateMonitors (void)
monitor.path_targetInfo.adapterId = path.targetInfo.adapterId;

// Windows 10 1803+ (Build 17134) or newer
//#if (NTDDI_VERSION >= NTDDI_WIN10_NI)
if (SKIF_Util_IsWindows10v1803OrGreater ( ))
{
using namespace winrt::Windows::Devices::Display::Core;
Expand Down Expand Up @@ -2954,6 +2954,7 @@ SKIF_UtilInt_UpdateMonitors (void)
}
}
}
//#endif

// Windows 10 1709+ (Build 16299) fallback
if (! success || (! SKIF_Util_IsWindows10v1803OrGreater ( ) && SKIF_Util_IsWindows10v1709OrGreater ( )))
Expand Down

0 comments on commit 26aaafc

Please sign in to comment.