Navy.gif/glfw
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Win32 display enum nomenclature fix.

Browse Source
This commit is contained in:
Camilla Berglund 2013-02-12 13:43:47 +01:00
parent 823022fdb2
commit c9167ce233
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/win32_monitor.c
View File

@ -107,7 +107,7 @@ _GLFWmonitor** _glfwPlatformGetMonitors(int* count)
{
// Enumerate display adapters
DISPLAY_DEVICE adapter, monitor;
DISPLAY_DEVICE adapter, display;
DEVMODE settings;
char* name;
HDC dc;
@ -150,15 +150,15 @@ _GLFWmonitor** _glfwPlatformGetMonitors(int* count)
}
}
ZeroMemory(&monitor, sizeof(DISPLAY_DEVICE));
monitor.cb = sizeof(DISPLAY_DEVICE);
ZeroMemory(&display, sizeof(DISPLAY_DEVICE));
display.cb = sizeof(DISPLAY_DEVICE);
EnumDisplayDevices(adapter.DeviceName, 0, &monitor, 0);
dc = CreateDC(L"DISPLAY", monitor.DeviceString, NULL, NULL);
EnumDisplayDevices(adapter.DeviceName, 0, &display, 0);
dc = CreateDC(L"DISPLAY", display.DeviceString, NULL, NULL);
primary = adapter.StateFlags & DISPLAY_DEVICE_PRIMARY_DEVICE;
name = _glfwCreateUTF8FromWideString(monitor.DeviceString);
name = _glfwCreateUTF8FromWideString(display.DeviceString);
if (!name)
{
// TODO: wat