Changeset 27991 in vbox for trunk/src/VBox/Additions/WINNT/VBoxTray

Timestamp:

Apr 5, 2010 7:12:43 PM (15 years ago)

Author:

vboxsync

Message:

yet another burn fix (sorry)

File:

• trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxTray.cpp (modified) (3 diffs)

trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxTray.cpp

@@ -868 +868 @@
 }
 
-static DWORD vboxDispIfResizeXPDM(PCVBOXDISPIF const pIf, LPCSTR lpszDeviceName, LPDEVMODE lpDevMode, LONG *pResult)
+static DWORD vboxDispIfResizeXPDM(PCVBOXDISPIF const pIf, ULONG Id, DWORD Width, DWORD Height, DWORD BitsPerPixel)
 {
     return ERROR_NOT_SUPPORTED;
@@ -880 +880 @@
             return ERROR_NOT_SUPPORTED;
         case VBOXDISPIF_MODE_XPDM:
-            return vboxDispIfResizeXPDM(pIf, lpszDeviceName, lpDevMode, pResult);
+            return vboxDispIfResizeXPDM(pIf, Id, Width, Height, BitsPerPixel);
 #ifdef VBOXWDDM
         case VBOXDISPIF_MODE_WDDM:
@@ -900 +900 @@
     DWORD err = NO_ERROR;
     AssertBreakpoint();
-//    OSVERSIONINFO OSinfo;
-//    OSinfo.dwOSVersionInfoSize = sizeof (OSinfo);
-//    GetVersionEx (&OSinfo);
-//    if (OSinfo.dwMajorVersion >= 5)
-//    {
-//        bool bSupported = true;
-//        *(uintptr_t *)&pIf->modeData.xpdm.pfnChangeDisplaySettingsEx = (uintptr_t)GetProcAddress(hUser, "ChangeDisplaySettingsExA");
-//        Log((__FUNCTION__": pfnChangeDisplaySettingsEx = %p\n", pIf->modeData.xpdm.pfnChangeDisplaySettingsEx));
-//        bSupported &= !!(pIf->modeData.xpdm.pfnChangeDisplaySettingsEx);
-//
-//        if (!bSupported)
-//        {
-//            Log((__FUNCTION__": pfnChangeDisplaySettingsEx function pointer failed to initialize\n"));
-//            err = ERROR_NOT_SUPPORTED;
-//        }
-//    }
-//    else
-//    {
-//        Log((__FUNCTION__": can not switch to VBOXDISPIF_MODE_XPDM, because os is not >= w2k\n"));
-//        err = ERROR_NOT_SUPPORTED;
-//    }
+    OSVERSIONINFO OSinfo;
+    OSinfo.dwOSVersionInfoSize = sizeof (OSinfo);
+    GetVersionEx (&OSinfo);
+    if (OSinfo.dwMajorVersion >= 5)
+    {
+        HMODULE hUser = GetModuleHandle("USER32");
+        if (NULL != hUser)
+        {
+            bool bSupported = true;
+            *(uintptr_t *)&pIf->modeData.xpdm.pfnChangeDisplaySettingsEx = (uintptr_t)GetProcAddress(hUser, "ChangeDisplaySettingsExA");
+            Log((__FUNCTION__": pfnChangeDisplaySettingsEx = %p\n", pIf->modeData.xpdm.pfnChangeDisplaySettingsEx));
+            bSupported &= !!(pIf->modeData.xpdm.pfnChangeDisplaySettingsEx);
+
+            if (!bSupported)
+            {
+                Log((__FUNCTION__": pfnChangeDisplaySettingsEx function pointer failed to initialize\n"));
+                err = ERROR_NOT_SUPPORTED;
+            }
+        }
+        else
+        {
+            Log((__FUNCTION__": failed to get USER32 handle, err (%d)\n", GetLastError()));
+            err = ERROR_NOT_SUPPORTED;
+        }
+    }
+    else
+    {
+        Log((__FUNCTION__": can not switch to VBOXDISPIF_MODE_XPDM, because os is not >= w2k\n"));
+        err = ERROR_NOT_SUPPORTED;
+    }
 
     return err;