Changeset 3416 in vbox for trunk/src/VBox/Additions

Timestamp:

Jul 4, 2007 3:25:16 PM (18 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

22622

Message:

Added DrvEscape support and OPENGL_GETINFO (disabled by default)

Location:

trunk/src/VBox/Additions/WINNT/Graphics/Display

Files:

• driver.h (modified) (1 diff)
• enable.c (modified) (3 diffs)

trunk/src/VBox/Additions/WINNT/Graphics/Display/driver.h

@@ -104 +104 @@
 };
 
+#ifdef VBOX_WITH_OPENGL
+typedef struct
+{
+    DWORD dwVersion;
+    DWORD dwDriverVersion;
+    WCHAR szDriverName[256];
+} OPENGL_INFO, *POPENGL_INFO;
+#endif
+
 /* The global semaphore handle for all driver instances. */
 extern HSEMAPHORE ghsemHwBuffer;

trunk/src/VBox/Additions/WINNT/Graphics/Display/enable.c

@@ -39 +39 @@
     {   INDEX_DrvSetPalette,            (PFN) DrvSetPalette         },  // 22
     {   INDEX_DrvTextOut,               (PFN) DrvTextOut            },  // 23
+    {   INDEX_DrvEscape,                (PFN) DrvEscape             },  // 24
     {   INDEX_DrvSetPointerShape,       (PFN) DrvSetPointerShape    },  // 29
     {   INDEX_DrvMovePointer,           (PFN) DrvMovePointer        },  // 30
@@ -73 +74 @@
 }
 
-ULONG APIENTRY DrvEscape(
-    SURFOBJ *pso,
-    ULONG    iEsc,
-    ULONG    cjIn,
-    PVOID    pvIn,
-    ULONG    cjOut,
-    PVOID    pvOut
-    )
-{
-    DISPDBG((0, "Experimental %s: %p, %p, %p, %p, %p, %p\n", __FUNCTION__, pso, iEsc, cjIn, pvIn, cjOut, pvOut));
+ULONG APIENTRY DrvEscape(SURFOBJ *pso, ULONG iEsc, ULONG cjIn, PVOID pvIn, ULONG cjOut, PVOID pvOut)
+{
+    DISPDBG((0, "%s: %p, %p, %p, %p, %p, %p\n", __FUNCTION__, pso, iEsc, cjIn, pvIn, cjOut, pvOut));
+
+    switch(iEsc)
+    {
+#ifdef VBOX_WITH_OPENGL
+    case OPENGL_GETINFO:
+    {
+        if (    cjOut == sizeof(OPENGL_INFO)
+            &&  pvOut)
+        {
+            POPENGL_INFO pInfo = (POPENGL_INFO)pvOut;
+
+            pInfo->dwVersion        = 2;
+            pInfo->dwDriverVersion  = 1;
+            pInfo->szDriverName[0]  = 'V';
+            pInfo->szDriverName[1]  = 'B';
+            pInfo->szDriverName[2]  = 'o';
+            pInfo->szDriverName[3]  = 'x';
+            pInfo->szDriverName[4]  = 'O';
+            pInfo->szDriverName[5]  = 'G';
+            pInfo->szDriverName[6]  = 'L';
+            pInfo->szDriverName[7]  = 0;
+
+            DISPDBG((0, "OPENGL_GETINFO\n"));
+            return cjOut;
+        }
+        else
+            DISPDBG((0, "OPENGL_GETINFO invalid size %d\n", cjOut));
+
+        break;
+    }
+#endif
+
+    default:
+        DISPDBG((0, "Unsupported Escape %d\n", iEsc));
+        break;
+    }
     return 0;
 }
@@ -138 +168 @@
     {   INDEX_DrvSetPalette,            (PFN) DrvSetPalette         },  // 22 0x16
     {   INDEX_DrvTextOut,               (PFN) DrvTextOut            },  // 23 0x17
+    {   INDEX_DrvEscape,                (PFN) DrvEscape             },  // 24 0x18
     {   INDEX_DrvSetPointerShape,       (PFN) DrvSetPointerShape    },  // 29 0x1d
     {   INDEX_DrvMovePointer,           (PFN) DrvMovePointer        },  // 30 0x1e