Fixed monitor enumeration on Win32.

src/win32_monitor.c

@@ -202,8 +202,10 @@ _GLFWmonitor** _glfwPlatformGetMonitors(int* count)
     {
         // Enumerate display adapters
 
-        DISPLAY_DEVICE adapter;
+        DISPLAY_DEVICE adapter, monitor;
-        DWORD monitorIndex = 0;
+        DEVMODE settings;
+        const char* name;
+        HDC dc;
 
         ZeroMemory(&adapter, sizeof(DISPLAY_DEVICE));
         adapter.cb = sizeof(DISPLAY_DEVICE);
@@ -219,77 +221,64 @@ _GLFWmonitor** _glfwPlatformGetMonitors(int* count)
             continue;
         }
 
-        for (;;)
+        ZeroMemory(&settings, sizeof(DEVMODE));
-        {
+        settings.dmSize = sizeof(DEVMODE);
-            // Enumerate monitors for the display adapter
-
-            DISPLAY_DEVICE monitor;
-            DEVMODE settings;
-            const char* name;
-            HDC dc;
-
-            ZeroMemory(&monitor, sizeof(DISPLAY_DEVICE));
-            monitor.cb = sizeof(DISPLAY_DEVICE);
 
-            if (!EnumDisplayDevices(adapter.DeviceName, monitorIndex, &monitor, 0))
+        EnumDisplaySettingsEx(adapter.DeviceName,
-                break;
+                              ENUM_CURRENT_SETTINGS,
-
+                              &settings,
-            monitorIndex++;
+                              EDS_ROTATEDMODE);
 
-            ZeroMemory(&settings, sizeof(DEVMODE));
+        name = _glfwCreateUTF8FromWideString(adapter.DeviceName);
-            settings.dmSize = sizeof(DEVMODE);
+        if (!name)
+        {
+            // TODO: wat
+            return NULL;
+        }
 
-            EnumDisplaySettingsEx(adapter.DeviceName,
+        if (found == size)
-                                  ENUM_CURRENT_SETTINGS,
+        {
-                                  &settings,
+            if (size)
-                                  EDS_ROTATEDMODE);
+                size *= 2;
+            else
+                size = 4;
 
-            name = _glfwCreateUTF8FromWideString(monitor.DeviceName);
+            monitors = (_GLFWmonitor**) realloc(monitors, sizeof(_GLFWmonitor*) * size);
-            if (!name)
+            if (!monitors)
             {
                 // TODO: wat
                 return NULL;
             }
+        }
 
-            dc = CreateDC(L"DISPLAY", monitor.DeviceString, NULL, NULL);
+        ZeroMemory(&monitor, sizeof(DISPLAY_DEVICE));
-            if (!dc)
+        monitor.cb = sizeof(DISPLAY_DEVICE);
-            {
-                // TODO: wat
-                return NULL;
-            }
 
-            if (found == size)
+        EnumDisplayDevices(adapter.DeviceName, 0, &monitor, 0);
-            {
-                if (size)
-                    size *= 2;
-                else
-                    size = 4;
-
-                monitors = (_GLFWmonitor**) realloc(monitors, sizeof(_GLFWmonitor*) * size);
-                if (!monitors)
-                {
-                    // TODO: wat
-                    return NULL;
-                }
-            }
 
-            monitors[found] = _glfwCreateMonitor(name,
+        dc = CreateDC(L"DISPLAY", monitor.DeviceString, NULL, NULL);
-                                                 GetDeviceCaps(dc, HORZSIZE),
+        if (!dc)
-                                                 GetDeviceCaps(dc, VERTSIZE),
+        {
-                                                 settings.dmPosition.x,
+            // TODO: wat
-                                                 settings.dmPosition.y);
+            return NULL;
+        }
 
-            DeleteDC(dc);
+        monitors[found] = _glfwCreateMonitor(name,
+                                             GetDeviceCaps(dc, HORZSIZE),
+                                             GetDeviceCaps(dc, VERTSIZE),
+                                             settings.dmPosition.x,
+                                             settings.dmPosition.y);
 
-            if (!monitors[found])
+        DeleteDC(dc);
-            {
-                // TODO: wat
-                return NULL;
-            }
 
-            monitors[found]->Win32.name = wcsdup(monitor.DeviceName);
+        if (!monitors[found])
-            found++;
+        {
+            // TODO: wat
+            return NULL;
         }
+
+        monitors[found]->Win32.name = wcsdup(adapter.DeviceName);
+        found++;
     }
 
     *count = found;