Changeset 42232 in vbox

Timestamp:

Jul 19, 2012 4:06:17 PM (13 years ago)

Author:

vboxsync

Message:

fAnyX basics (not impl for xpdm miniport yet)

Location:

trunk/src/VBox/Additions/WINNT

Files:

• Graphics/Video/disp/xpdm/VBoxDispDriver.cpp (modified) (1 diff)
• Graphics/Video/mp/wddm/VBoxMPWddm.cpp (modified) (1 diff)
• VBoxTray/VBoxDispIf.cpp (modified) (2 diffs)
• VBoxTray/VBoxDispIf.h (modified) (1 diff)
• VBoxTray/VBoxDisplay.cpp (modified) (3 diffs)
• include/VBoxDisplay.h (modified) (2 diffs)

trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/xpdm/VBoxDispDriver.cpp

@@ -1001 +1001 @@
             break;
         }
+        case VBOXESC_ISANYX:
+        {
+            if (pvOut && cjOut == sizeof(DWORD))
+            {
+                /* @todo: impl */
+                *(DWORD *)pvOut = TRUE;
+                return 1;
+            }
+            else
+            {
+                WARN(("VBOXESC_ISANYX invalid parms"));
+                return 0;
+            }
+            break;
+        }
         default:
         {

trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/VBoxMPWddm.cpp

@@ -4267 +4267 @@
                 break;
             }
+            case VBOXESC_ISANYX:
+            {
+                if (pEscape->PrivateDriverDataSize != sizeof (VBOXDISPIFESCAPE_ISANYX))
+                {
+                    WARN(("invalid private driver size %d", pEscape->PrivateDriverDataSize));
+                    Status = STATUS_INVALID_PARAMETER;
+                    break;
+                }
+
+                PVBOXDISPIFESCAPE_ISANYX pIsAnyX = (PVBOXDISPIFESCAPE_ISANYX)pEscapeHdr;
+                pIsAnyX->u32IsAnyX = pDevExt->fAnyX;
+                Status = STATUS_SUCCESS;
+                break;
+            }
             case VBOXESC_DBGPRINT:
             {

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

@@ -55 +55 @@
 }
 
-static DWORD vboxDispIfEscapeXPDM(PCVBOXDISPIF pIf, PVBOXDISPIFESCAPE pEscape, int cbData)
+static DWORD vboxDispIfEscapeXPDM(PCVBOXDISPIF pIf, PVBOXDISPIFESCAPE pEscape, int cbData, int iDirection)
 {
     HDC  hdc = GetDC(HWND_DESKTOP);
     VOID *pvData = cbData ? VBOXDISPIFESCAPE_DATA(pEscape, VOID) : NULL;
-    int iRet = ExtEscape(hdc, pEscape->escapeCode, cbData, (LPCSTR)pvData, 0, NULL);
+    int iRet = ExtEscape(hdc, pEscape->escapeCode,
+            iDirection >= 0 ? cbData : 0,
+            iDirection >= 0 ? (LPSTR)pvData : NULL,
+            iDirection <= 0 ? cbData : 0,
+            iDirection <= 0 ? (LPSTR)pvData : NULL);
     ReleaseDC(HWND_DESKTOP, hdc);
     if (iRet > 0)
@@ -353 +357 @@
         case VBOXDISPIF_MODE_XPDM_NT4:
         case VBOXDISPIF_MODE_XPDM:
-            return vboxDispIfEscapeXPDM(pIf, pEscape, cbData);
+            return vboxDispIfEscapeXPDM(pIf, pEscape, cbData, 1);
+#ifdef VBOX_WITH_WDDM
+        case VBOXDISPIF_MODE_WDDM:
+            return vboxDispIfEscapeWDDM(pIf, pEscape, cbData, TRUE /* BOOL fHwAccess */);
+#endif
+        default:
+            Log((__FUNCTION__": unknown mode (%d)\n", pIf->enmMode));
+            return ERROR_INVALID_PARAMETER;
+    }
+}
+
+DWORD VBoxDispIfEscapeInOut(PCVBOXDISPIF const pIf, PVBOXDISPIFESCAPE pEscape, int cbData)
+{
+    switch (pIf->enmMode)
+    {
+        case VBOXDISPIF_MODE_XPDM_NT4:
+        case VBOXDISPIF_MODE_XPDM:
+            return vboxDispIfEscapeXPDM(pIf, pEscape, cbData, 0);
 #ifdef VBOX_WITH_WDDM
         case VBOXDISPIF_MODE_WDDM:

trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxDispIf.h

@@ -82 +82 @@
 DWORD VBoxDispIfTerm(PVBOXDISPIF pIf);
 DWORD VBoxDispIfEscape(PCVBOXDISPIF const pIf, PVBOXDISPIFESCAPE pEscape, int cbData);
+DWORD VBoxDispIfEscapeInOut(PCVBOXDISPIF const pIf, PVBOXDISPIFESCAPE pEscape, int cbData);
 DWORD VBoxDispIfResize(PCVBOXDISPIF const pIf, ULONG Id, DWORD Width, DWORD Height, DWORD BitsPerPixel);
 DWORD VBoxDispIfResizeModes(PCVBOXDISPIF const pIf, UINT iChangedMode, DISPLAY_DEVICE *paDisplayDevices, DEVMODE *paDeviceModes, UINT cDevModes);

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

@@ -33 +33 @@
     const VBOXSERVICEENV *pEnv;
 
+    BOOL fAnyX;
+
     /* ChangeDisplaySettingsEx does not exist in NT. ResizeDisplayDevice uses the function. */
     LONG (WINAPI * pfnChangeDisplaySettingsEx)(LPCTSTR lpszDeviceName, LPDEVMODE lpDevMode, HWND hwnd, DWORD dwflags, LPVOID lParam);
@@ -107 +109 @@
     }
 
+    VBOXDISPIFESCAPE_ISANYX IsAnyX = {0};
+    IsAnyX.EscapeHdr.escapeCode = VBOXESC_ISANYX;
+    DWORD err = VBoxDispIfEscapeInOut(&pEnv->dispIf, &IsAnyX.EscapeHdr, sizeof (uint32_t));
+    if (err == NO_ERROR)
+        gCtx.fAnyX = !!IsAnyX.u32IsAnyX;
+    else
+        gCtx.fAnyX = TRUE;
+
     Log(("VBoxTray: VBoxDisplayInit: Display init successful\n"));
 
@@ -208 +218 @@
 {
     BOOL fModeReset = (Width == 0 && Height == 0 && BitsPerPixel == 0);
+
+    if (!gCtx.fAnyX)
+        Width &= 0xFFF8;
 
     DISPLAY_DEVICE DisplayDevice;

trunk/src/VBox/Additions/WINNT/include/VBoxDisplay.h

@@ -37 +37 @@
 # define VBOXESC_REINITVIDEOMODESBYMASK     0xABCD9010
 # define VBOXESC_ADJUSTVIDEOMODES           0xABCD9011
+#endif /* #ifdef VBOX_WITH_WDDM */
 
-/* for VBOX_VIDEO_MAX_SCREENS definition */
-#include <VBox/Hardware/VBoxVideoVBE.h>
-
-#endif /* #ifdef VBOX_WITH_WDDM */
+# define VBOXESC_ISANYX                     0xABCD9200
 
 typedef struct VBOXDISPIFESCAPE
@@ -60 +58 @@
     CTL_CODE(FILE_DEVICE_VIDEO, 0xA01, METHOD_BUFFERED, FILE_ANY_ACCESS)
 
+#define IOCTL_VIDEO_VBOX_ISANYX \
+    CTL_CODE(FILE_DEVICE_VIDEO, 0xA02, METHOD_BUFFERED, FILE_ANY_ACCESS)
+
+typedef struct VBOXDISPIFESCAPE_ISANYX
+{
+    VBOXDISPIFESCAPE EscapeHdr;
+    uint32_t u32IsAnyX;
+} VBOXDISPIFESCAPE_ISANYX, *PVBOXDISPIFESCAPE_ISANYX;
+
 #ifdef VBOX_WITH_WDDM
+
+/* for VBOX_VIDEO_MAX_SCREENS definition */
+#include <VBox/Hardware/VBoxVideoVBE.h>
 
 typedef struct