Changeset 12449 in vbox for trunk/src/VBox/Frontends/VBoxSDL

Timestamp:

Sep 15, 2008 8:16:14 AM (17 years ago)

Author:

vboxsync

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

36526

Message:

+changed IFramebuffer interface to report id of associated window if there's one
+changed sdl/qt3/qt4 frontends's interface implementations to report this id
+added VBoxSharedCrOpenGL hgcm service
(VBoxManage.exe setextradata lvm_winxp_sp2 VBoxInternal/Devices/VMMDev/0/LUN#0/Config/crOpenGLEnabled 1)
+changed crserver to be launched from vmmdev by guest request
+added hgcm call to supply desired window id to render spu
+changed guest icd driver to initialize hgcm and cause tcpip listener startup on host
+fixed spu finalization
+fixed q3 startup, again :)

Location:

trunk/src/VBox/Frontends/VBoxSDL

Files:

• Framebuffer.cpp (modified) (2 diffs)
• Framebuffer.h (modified) (4 diffs)
• VBoxSDL.cpp (modified) (3 diffs)
• VBoxSDL.h (modified) (1 diff)

trunk/src/VBox/Frontends/VBoxSDL/Framebuffer.cpp

@@ -379 +379 @@
 
 /**
+ * Returns handle of window where framebuffer context is being drawn
+ *
+ * @returns COM status code.
+ * @param   winId Handle of associated window.
+ */
+STDMETHODIMP VBoxSDLFB::COMGETTER(WinId)(uint64_t *winId)
+{
+    if (!winId)
+        return E_POINTER;
+    *winId = mWinId;
+    return S_OK;
+}
+
+/**
  * Notify framebuffer of an update.
  *
@@ -1403 +1417 @@
 
 /**
+ * Returns associated window handle. We return NULL here.
+ *
+ * @returns COM status code
+ * @param   winId Address of result buffer.
+ */
+STDMETHODIMP VBoxSDLFBOverlay::COMGETTER(WinId)(ULONG64 *winId)
+{
+    LogFlow(("VBoxSDLFBOverlay::GetWinId\n"));
+    if (!winId)
+        return E_INVALIDARG;
+    *winId = 0;
+    return S_OK;
+}
+
+
+/**
  * Lock the overlay.  This should not be used - lock the parent IFramebuffer instead.
  *

trunk/src/VBox/Frontends/VBoxSDL/Framebuffer.h

@@ -99 +99 @@
     STDMETHOD(COMGETTER(HeightReduction)) (ULONG *heightReduction);
     STDMETHOD(COMGETTER(Overlay)) (IFramebufferOverlay **aOverlay);
+    STDMETHOD(COMGETTER(WinId)) (uint64_t *winId);
 
     STDMETHOD(NotifyUpdate)(ULONG x, ULONG y,
@@ -135 +136 @@
 #endif
     void uninit();
+    void setWinId(uint64_t winId) { mWinId = winId; }
 
 private:
@@ -176 +178 @@
     /** flag whether we print out SDL information */
     bool mfShowSDLConfig;
+    /** handle to window where framebuffer context is being drawn*/
+    uint64_t mWinId;
 #ifdef VBOX_SECURELABEL
     /** current secure label text */
@@ -263 +267 @@
     STDMETHOD(COMGETTER(HeightReduction)) (ULONG *heightReduction);
     STDMETHOD(COMGETTER(Overlay)) (IFramebufferOverlay **aOverlay);
+    STDMETHOD(COMGETTER(WinId)) (ULONG64 *winId);
 
     STDMETHOD(Lock)();

trunk/src/VBox/Frontends/VBoxSDL/VBoxSDL.cpp

@@ -1057 +1057 @@
 #endif
 #ifdef VBOX_WIN32_UI
-    bool fWin32UI = false;
+    bool fWin32UI = true;
+    uint64_t winId = 0;
 #endif
     bool fShowSDLConfig    = false;
@@ -1920 +1921 @@
     {
         /* initialize the Win32 user interface inside which SDL will be embedded */
-        if (initUI(fResizable))
+        if (initUI(fResizable, winId))
             return 1;
     }
@@ -1934 +1935 @@
         goto leave;
     }
+
+#ifdef VBOX_WIN32_UI
+    gpFrameBuffer->setWinId(winId);
+#endif
+
     if (!gpFrameBuffer->initialized())
         goto leave;

trunk/src/VBox/Frontends/VBoxSDL/VBoxSDL.h

@@ -66 +66 @@
 
 #ifdef VBOX_WIN32_UI
-int initUI(bool fResizable);
+int initUI(bool fResizable, uint64_t &winId);
 int uninitUI(void);
 int resizeUI(uint16_t width, uint16_t height);