Skip to content

Bound the display handle enumeration and stop stranding vibrance (#138) #158

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
SwatX18 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Bound the display handle enumeration and stop stranding vibrance (#138) #158

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e5427c2
Bound the display handle enumeration and stop stranding vibrance (#138)
SwatX18 Aug 25, 2026
f53c867
Add a regression fixture for the stability pass
SwatX18 Aug 25, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
81 changes: 42 additions & 39 deletions vibrance.GUI/AMD/AmdDynamicVibranceProxy.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,51 +107,54 @@ public VibranceInfo GetVibranceInfo()

private void OnWinEventHook(object sender, WinEventHookEventArgs e)
{
if (_applicationSettings.Count > 0)
//an empty list still has to reach the restore branch below. Gating the whole handler on
//Count > 0 stranded vibrance and the resolution change whenever the last entry was
//removed while its game held the foreground, with no way back short of restarting.
ApplicationSetting applicationSetting = _applicationSettings.Count > 0
? _applicationSettings.FirstOrDefault(x => string.Equals(x.Name, e.ProcessName, StringComparison.OrdinalIgnoreCase))
: null;

if (applicationSetting != null)
{
ApplicationSetting applicationSetting = _applicationSettings.FirstOrDefault(x => string.Equals(x.Name, e.ProcessName, StringComparison.OrdinalIgnoreCase));
if (applicationSetting != null)
//test if a resolution change is needed
Screen screen = Screen.FromHandle(e.Handle);
if (_vibranceInfo.neverChangeResolution == false &&
applicationSetting.IsResolutionChangeNeeded &&
IsResolutionChangeNeeded(screen, applicationSetting.ResolutionSettings) &&
_windowsResolutionSettings.ContainsKey(screen.DeviceName) &&
_windowsResolutionSettings[screen.DeviceName].Item2.Contains(applicationSetting.ResolutionSettings))
{
//test if a resolution change is needed
Screen screen = Screen.FromHandle(e.Handle);
if (_vibranceInfo.neverChangeResolution == false &&
applicationSetting.IsResolutionChangeNeeded &&
IsResolutionChangeNeeded(screen, applicationSetting.ResolutionSettings) &&
_windowsResolutionSettings.ContainsKey(screen.DeviceName) &&
_windowsResolutionSettings[screen.DeviceName].Item2.Contains(applicationSetting.ResolutionSettings))
{
_gameScreen = screen;
PerformResolutionChange(screen, applicationSetting.ResolutionSettings);
}

_amdAdapter.SetSaturationOnAllDisplays(_vibranceInfo.userVibranceSettingDefault);
if (_vibranceInfo.affectPrimaryMonitorOnly)
{
_amdAdapter.SetSaturationOnDisplay(applicationSetting.IngameLevel, screen.DeviceName);
}
else
{
_amdAdapter.SetSaturationOnAllDisplays(applicationSetting.IngameLevel);
}
_gameScreen = screen;
PerformResolutionChange(screen, applicationSetting.ResolutionSettings);
}

_amdAdapter.SetSaturationOnAllDisplays(_vibranceInfo.userVibranceSettingDefault);
if (_vibranceInfo.affectPrimaryMonitorOnly)
{
_amdAdapter.SetSaturationOnDisplay(applicationSetting.IngameLevel, screen.DeviceName);
}
else
{
IntPtr processHandle = e.Handle;
if (GetForegroundWindow() != processHandle)
return;

//test if a resolution change is needed
Screen screen = Screen.FromHandle(processHandle);
if (_vibranceInfo.neverChangeResolution == false &&
_gameScreen != null && _gameScreen.Equals(screen) &&
_windowsResolutionSettings.ContainsKey(screen.DeviceName) &&
IsResolutionChangeNeeded(screen, _windowsResolutionSettings[screen.DeviceName].Item1))
{
PerformResolutionChange(screen, _windowsResolutionSettings[screen.DeviceName].Item1);
}

_amdAdapter.SetSaturationOnAllDisplays(_vibranceInfo.userVibranceSettingDefault);
_amdAdapter.SetSaturationOnAllDisplays(applicationSetting.IngameLevel);
}
}
else
{
IntPtr processHandle = e.Handle;
if (GetForegroundWindow() != processHandle)
return;

//test if a resolution change is needed
Screen screen = Screen.FromHandle(processHandle);
if (_vibranceInfo.neverChangeResolution == false &&
_gameScreen != null && _gameScreen.Equals(screen) &&
_windowsResolutionSettings.ContainsKey(screen.DeviceName) &&
IsResolutionChangeNeeded(screen, _windowsResolutionSettings[screen.DeviceName].Item1))
{
PerformResolutionChange(screen, _windowsResolutionSettings[screen.DeviceName].Item1);
}

_amdAdapter.SetSaturationOnAllDisplays(_vibranceInfo.userVibranceSettingDefault);
}
}

Expand Down
154 changes: 101 additions & 53 deletions vibrance.GUI/NVIDIA/NvidiaDynamicVibranceProxy.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,27 @@ class NvidiaDynamicVibranceProxy : IVibranceProxy


public const int NvapiMaxPhysicalGpus = 64;

// Each physical GPU can drive more than one display, so the bound below (issue #138) scales
// by a display-per-GPU headroom - not a quoted nvapi.h constant: no copy of nvapi.h is
// vendored in this repo, so the exact ceiling NvAPI itself uses cannot be confirmed here.
// A bound that must never truncate a real display should over-approximate rather than try
// to match that ceiling exactly.
public const int NvapiAdvancedDisplayHeads = 4;

// The ceiling EnumerateDisplayHandles() (below) loops up to. NvapiMaxPhysicalGpus is
// already trusted to size the GPU handle arrays in InitializeProxy(), so deriving this
// bound from it is internally consistent with the rest of the class.
//
// Pre-fix (issue #138): with no NVIDIA GPU present the prebuilt vibranceDLL.dll never
// returned -1, so the loop spun forever. InitializeProxy() never returned in that state, so
// isInitialized was never set and the constructor never reached the OnWinEventHook
// subscription below - nothing ever "walked" the growing list. In this x86 process it
// instead ran the unbounded List<int> out of address space, throwing OutOfMemoryException,
// which the constructor's catch (Exception) block turns into the "failed to initialize"
// dialog.
public const int NvapiMaxDisplays = NvapiMaxPhysicalGpus * NvapiAdvancedDisplayHeads;

public const int NvapiMaxLevel = 63;
public const int NvapiDefaultLevel = 0;

Expand Down Expand Up @@ -208,62 +229,65 @@ private void InitializeProxy()

private static void OnWinEventHook(object sender, WinEventHookEventArgs e)
{
if (_applicationSettings.Count > 0)
//an empty list still has to reach the restore branch below. Gating the whole handler on
//Count > 0 stranded vibrance and the resolution change whenever the last entry was
//removed while its game held the foreground, with no way back short of restarting.
ApplicationSetting applicationSetting = _applicationSettings.Count > 0
? _applicationSettings.FirstOrDefault(x => string.Equals(x.Name, e.ProcessName, StringComparison.OrdinalIgnoreCase))
: null;

if (applicationSetting != null)
{
ApplicationSetting applicationSetting = _applicationSettings.FirstOrDefault(x => string.Equals(x.Name, e.ProcessName, StringComparison.OrdinalIgnoreCase));
if (applicationSetting != null)
{
int displayHandle = GetApplicationDisplayHandle(e.Handle);
//test if changing the vibrance value is needed
if (displayHandle != -1 && !equalsDVCLevel(displayHandle, applicationSetting.IngameLevel))
int displayHandle = GetApplicationDisplayHandle(e.Handle);
//test if changing the vibrance value is needed
if (displayHandle != -1 && !equalsDVCLevel(displayHandle, applicationSetting.IngameLevel))
{
//test if a resolution change is needed
Screen screen = Screen.FromHandle(e.Handle);
if (_vibranceInfo.neverChangeResolution == false &&
applicationSetting.IsResolutionChangeNeeded &&
IsResolutionChangeNeeded(screen, applicationSetting.ResolutionSettings) &&
_windowsResolutionSettings.ContainsKey(screen.DeviceName) &&
_windowsResolutionSettings[screen.DeviceName].Item2.Contains(applicationSetting.ResolutionSettings))
{
//test if a resolution change is needed
Screen screen = Screen.FromHandle(e.Handle);
if (_vibranceInfo.neverChangeResolution == false &&
applicationSetting.IsResolutionChangeNeeded &&
IsResolutionChangeNeeded(screen, applicationSetting.ResolutionSettings) &&
_windowsResolutionSettings.ContainsKey(screen.DeviceName) &&
_windowsResolutionSettings[screen.DeviceName].Item2.Contains(applicationSetting.ResolutionSettings))
{
PerformResolutionChange(screen, applicationSetting.ResolutionSettings);
}
_gameScreen = screen;
_vibranceInfo.defaultHandle = displayHandle;
setDVCLevel(_vibranceInfo.defaultHandle, applicationSetting.IngameLevel);
PerformResolutionChange(screen, applicationSetting.ResolutionSettings);
}
_gameScreen = screen;
_vibranceInfo.defaultHandle = displayHandle;
setDVCLevel(_vibranceInfo.defaultHandle, applicationSetting.IngameLevel);
}
else
}
else
{
IntPtr processHandle = e.Handle;

if (!isWindowActive(ref processHandle))
return;

//test if a resolution change is needed
Screen currentScreen = Screen.FromHandle(processHandle);
if (_vibranceInfo.neverChangeResolution == false &&
_gameScreen != null &&
_gameScreen.Equals(currentScreen) &&
_windowsResolutionSettings.ContainsKey(currentScreen.DeviceName) &&
IsResolutionChangeNeeded(currentScreen, _windowsResolutionSettings[currentScreen.DeviceName].Item1))
{
IntPtr processHandle = e.Handle;
PerformResolutionChange(currentScreen, _windowsResolutionSettings[currentScreen.DeviceName].Item1);
}

if (!isWindowActive(ref processHandle))
return;

//test if a resolution change is needed
Screen currentScreen = Screen.FromHandle(processHandle);
if (_vibranceInfo.neverChangeResolution == false &&
_gameScreen != null &&
_gameScreen.Equals(currentScreen) &&
_windowsResolutionSettings.ContainsKey(currentScreen.DeviceName) &&
IsResolutionChangeNeeded(currentScreen, _windowsResolutionSettings[currentScreen.DeviceName].Item1))
//test if changing the vibrance value is needed
if (_vibranceInfo.affectPrimaryMonitorOnly && !equalsDVCLevel(_vibranceInfo.defaultHandle, _vibranceInfo.userVibranceSettingDefault))
{
if(_gameScreen != null && !_gameScreen.DeviceName.Equals(currentScreen.DeviceName))
{
PerformResolutionChange(currentScreen, _windowsResolutionSettings[currentScreen.DeviceName].Item1);
return;
}

//test if changing the vibrance value is needed
if (_vibranceInfo.affectPrimaryMonitorOnly && !equalsDVCLevel(_vibranceInfo.defaultHandle, _vibranceInfo.userVibranceSettingDefault))
{
if(_gameScreen != null && !_gameScreen.DeviceName.Equals(currentScreen.DeviceName))
{
return;
}

setDVCLevel(_vibranceInfo.defaultHandle, _vibranceInfo.userVibranceSettingDefault);
}
else if (!_vibranceInfo.affectPrimaryMonitorOnly && !_vibranceInfo.displayHandles.TrueForAll(handle => equalsDVCLevel(handle, _vibranceInfo.userVibranceSettingDefault)))
{
_vibranceInfo.displayHandles.ForEach(handle => setDVCLevel(handle, _vibranceInfo.userVibranceSettingDefault));
}
setDVCLevel(_vibranceInfo.defaultHandle, _vibranceInfo.userVibranceSettingDefault);
}
else if (!_vibranceInfo.affectPrimaryMonitorOnly && !_vibranceInfo.displayHandles.TrueForAll(handle => equalsDVCLevel(handle, _vibranceInfo.userVibranceSettingDefault)))
{
_vibranceInfo.displayHandles.ForEach(handle => setDVCLevel(handle, _vibranceInfo.userVibranceSettingDefault));
}
}
}
Expand All @@ -285,15 +309,39 @@ private static void PerformResolutionChange(Screen screen, ResolutionModeWrapper

private void EnumerateDisplayHandles()
{
for (int i = 0, displayHandle = 0; displayHandle != -1; i++)
_vibranceInfo.displayHandles = EnumerateDisplayHandles(enumerateNvidiaDisplayHandle);
}

// The loop body on its own, taking the enumerator as a delegate instead of calling the
// P/Invoke directly, so StabilityFixture can drive it with a stub and cover the bound and
// the dedupe without the real DLL.
//
// Bounded at NvapiMaxDisplays (issue #138): the prebuilt vibranceDLL.dll never returns -1
// when no NVIDIA GPU is present, so an unbounded loop here spun forever. A legitimate
// enumeration can never reach NvapiMaxDisplays, so the bound never cuts off real displays.
//
// Deduped: a driver stuck returning the same handle repeatedly would otherwise fill the
// list with copies of it, each one then getting its own setDVCLevel call on every restore
// (OnWinEventHook's displayHandles.ForEach(...) below). That is a latent cost on the
// restore path now that the loop above is bounded - it did not cause #138: pre-fix, the
// unbounded loop kept InitializeProxy() from ever returning, so OnWinEventHook was never
// even subscribed and the restore path could not run regardless of duplicates.
//
// Always returns an allocated (possibly empty) list, never null: OnWinEventHook calls
// TrueForAll/ForEach on _vibranceInfo.displayHandles unconditionally on the restore path.
internal static List<int> EnumerateDisplayHandles(Func<int, int> enumerateDisplayHandle)
{
List<int> displayHandles = new List<int>();
for (int i = 0; i < NvapiMaxDisplays; i++)
{
if (_vibranceInfo.displayHandles == null)
_vibranceInfo.displayHandles = new List<int>();
int displayHandle = enumerateDisplayHandle(i);
if (displayHandle == -1)
break;

displayHandle = enumerateNvidiaDisplayHandle(i);
if (displayHandle != -1)
_vibranceInfo.displayHandles.Add(displayHandle);
if (!displayHandles.Contains(displayHandle))
displayHandles.Add(displayHandle);
}
return displayHandles;
}

private static int GetApplicationDisplayHandle(IntPtr hWnd)
Expand Down
11 changes: 11 additions & 0 deletions vibrance.GUI/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ static class Program
private const string ErrorGraphicsAdapterUnknown = "Failed to determine your Graphic GraphicsAdapter type (NVIDIA/AMD). Make sure you have installed a proper GPU driver. Intel laptops are not supported as stated on the website. When installing your GPU driver did not work, please contact @juvlarN at twitter. Press Yes to open twitter in your browser now. Error: ";
private const string ErrorGraphicsAdapterAmbiguous = "Both NVIDIA and AMD graphic drivers have been found on your system. This can happen when you recently switched your graphic card and did not uninstall the old drivers. Make sure to uninstall unused graphic drivers to keep your system safe and stable. Use the program \"Display Driver Uninstaller\" to uninstall your old drivers!\n\nPress Yes to open \"Display Driver Uninstaller\" download website now.\nPress No to quit vibranceGUI.";
private const string MessageBoxCaption = "vibranceGUI Error";
private const string StabilitySelfTestMessageBoxCaption = "vibranceGUI stability fixes self test";

[STAThread]
static void Main(string[] args)
Expand All @@ -31,6 +32,16 @@ static void Main(string[] args)
return;
}

// Placed ahead of GPU vendor detection: the display handle enumeration bound/dedupe is
// driven by a stub, and the restore branch check runs through the AMD proxy's mockable
// adapter interface, so neither one touches a driver or the prebuilt NVIDIA DLL.
if (args.Contains("--selftest-stability"))
{
MessageBox.Show(string.Join(Environment.NewLine, StabilityFixture.Run().ToArray()),
StabilitySelfTestMessageBoxCaption, MessageBoxButtons.OK, MessageBoxIcon.Information);
return;
}

Application.EnableVisualStyles();
Application.SetCompatibleTextRenderingDefault(false);
NativeMethods.SetDllDirectory(CommonUtils.GetVibrance_GUI_AppDataPath());
Expand Down
Loading