mirror/glfw
1
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2024-11-14 18:34:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add early return if OS doesn't support accurate monitor name fetching

Browse Source
This commit is contained in:
Scr3amer 2023-09-04 02:02:01 -04:00 committed by GitHub
parent b792ee1325
commit 8c515ce8ef
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/win32_monitor.c
View File

@ -31,6 +31,7 @@
#if defined(_GLFW_WIN32) #if defined(_GLFW_WIN32)
#include <assert.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <limits.h> #include <limits.h>
@ -58,6 +59,13 @@ static char * getAccurateMonitorName(const WCHAR *deviceName)
i = 0; i = 0;
rc = 0; rc = 0;
if(QueryDisplayConfig == NULL)
return NULL;
// If QueryDisplayConfig is present then GetDisplayConfigBufferSizes and DisplayConfigGetDeviceInfo also should be present.
assert(GetDisplayConfigBufferSizes != NULL);
assert(DisplayConfigGetDeviceInfo != NULL);
do do
{ {
rc = GetDisplayConfigBufferSizes(QDC_ONLY_ACTIVE_PATHS, &pathCount, &modeCount); rc = GetDisplayConfigBufferSizes(QDC_ONLY_ACTIVE_PATHS, &pathCount, &modeCount);
@ -83,7 +91,7 @@ static char * getAccurateMonitorName(const WCHAR *deviceName)
DISPLAYCONFIG_TARGET_DEVICE_NAME targetName; DISPLAYCONFIG_TARGET_DEVICE_NAME targetName;
ZeroMemory(&sourceName, sizeof(sourceName)); ZeroMemory(&sourceName, sizeof(sourceName));
sourceName.header.adapterId = paths[i].targetInfo.adapterId; sourceName.header.adapterId = paths[i].sourceInfo.adapterId;
sourceName.header.type = DISPLAYCONFIG_DEVICE_INFO_GET_SOURCE_NAME; sourceName.header.type = DISPLAYCONFIG_DEVICE_INFO_GET_SOURCE_NAME;
sourceName.header.size = sizeof (sourceName); sourceName.header.size = sizeof (sourceName);
sourceName.header.id = paths[i].sourceInfo.id; sourceName.header.id = paths[i].sourceInfo.id;