Changeset 22165 in vbox for trunk/src/VBox/HostServices

Timestamp:

Aug 11, 2009 1:50:17 PM (16 years ago)

Author:

vboxsync

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

50941

Message:

crOpenGL: add warning window when additions version is incompatible (#4108)

File:

• trunk/src/VBox/HostServices/SharedOpenGL/crserver/crservice.cpp (modified) (4 diffs)

trunk/src/VBox/HostServices/SharedOpenGL/crserver/crservice.cpp

@@ -60 +60 @@
 PVBOXHGCMSVCHELPERS g_pHelpers;
 static IFramebuffer* g_pFrameBuffer;
+static PVM g_pVM = NULL;
 static ULONG64 g_winId = 0;
 
@@ -234 +235 @@
 {
     LogRel(("SHARED_CROPENGL: unsupported client version %d.%d\n", minor, major));
-    /*todo add warning window*/
+
+    /*MS's opengl32 tryes to load our ICD around 30 times on failure...this is to prevent unnecessary spam*/
+    static int shown = 0;
+    
+    if (g_pVM && !shown)
+    {
+        VMSetRuntimeError(g_pVM, VMSETRTERR_FLAGS_NO_WAIT, "3DSupportIncompatibleAdditions",
+        "Guest application attempt to use hardware 3D acceleration failed, because"
+        " guest additions version doesn't match VirtualBox host version."
+        "Please install appropriate guest additions to fix this issue");
+        shown = 1;
+    }
 }
 
@@ -403 +415 @@
                 if (!RT_SUCCESS(rc))
                 {
-                    /*@todo, add warning window*/
                     svcClientVersionUnsupported(vMajor, vMinor);
                 }
@@ -472 +483 @@
                     /* Execute the function. */
                     g_pFrameBuffer = pFrameBuffer;
+                    rc = VINF_SUCCESS;
+                }
+            }
+            break;
+        }
+        case SHCRGL_HOST_FN_SET_VM:
+        {
+            Log(("svcCall: SHCRGL_HOST_FN_SET_VM\n"));
+
+            /* Verify parameter count and types. */
+            if (cParms != SHCRGL_CPARMS_SET_VM)
+            {
+                rc = VERR_INVALID_PARAMETER;
+            }
+            else if (paParms[0].type != VBOX_HGCM_SVC_PARM_PTR)
+            {
+                rc = VERR_INVALID_PARAMETER;
+            }
+            else
+            {
+                /* Fetch parameters. */
+                PVM pVM = (PVM)paParms[0].u.pointer.addr;
+                uint32_t  cbData = paParms[0].u.pointer.size;
+
+                /* Verify parameters values. */
+                if (cbData != sizeof (PVM))
+                {
+                    rc = VERR_INVALID_PARAMETER;
+                }
+                else
+                {
+                    /* Execute the function. */
+                    g_pVM = pVM;
                     rc = VINF_SUCCESS;
                 }