Changeset 22165 in vbox for trunk

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)

Location:

trunk

Files:

• include/VBox/HostServices/VBoxCrOpenGLSvc.h (modified) (2 diffs)
• src/VBox/HostServices/SharedOpenGL/crserver/crservice.cpp (modified) (4 diffs)
• src/VBox/Main/ConsoleImpl2.cpp (modified) (2 diffs)
• src/VBox/Main/idl/VirtualBox.xidl (modified) (1 diff)

trunk/include/VBox/HostServices/VBoxCrOpenGLSvc.h

@@ -40 +40 @@
 #define SHCRGL_HOST_FN_SET_FRAMEBUFFER (1)
 #define SHCRGL_HOST_FN_SET_VISIBLE_REGION (5)
+#define SHCRGL_HOST_FN_SET_VM (7)
 /* crOpenGL guest functions */
 #define SHCRGL_GUEST_FN_WRITE       (2)
@@ -48 +49 @@
 /* Parameters count */
 #define SHCRGL_CPARMS_SET_FRAMEBUFFER (1)
+#define SHCRGL_CPARMS_SET_VM (1)
 #define SHCRGL_CPARMS_SET_VISIBLE_REGION (2)
 #define SHCRGL_CPARMS_WRITE      (1)

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;
                 }

trunk/src/VBox/Main/ConsoleImpl2.cpp

@@ -1790 +1790 @@
                 parm.type = VBOX_HGCM_SVC_PARM_PTR;
 
-                //parm.u.pointer.addr = static_cast <IConsole *> (pData->pVMMDev->getParent());
-                parm.u.pointer.addr = pConsole->mVMMDev->getParent()->getDisplay()->getFramebuffer();
+                parm.u.pointer.addr = pConsole->getDisplay()->getFramebuffer();
                 parm.u.pointer.size = sizeof(IFramebuffer *);
 
@@ -1797 +1796 @@
                 if (!RT_SUCCESS(rc))
                     AssertMsgFailed(("SHCRGL_HOST_FN_SET_FRAMEBUFFER failed with %Rrc\n", rc));
-                }
+
+                parm.u.pointer.addr = pVM;
+                parm.u.pointer.size = sizeof(pVM);
+                rc = pConsole->mVMMDev->hgcmHostCall("VBoxSharedCrOpenGL", SHCRGL_HOST_FN_SET_VM, 1, &parm);
+                if (!RT_SUCCESS(rc))
+                    AssertMsgFailed(("SHCRGL_HOST_FN_SET_VM failed with %Rrc\n", rc));
+            }
+
         }
     }

trunk/src/VBox/Main/idl/VirtualBox.xidl

@@ -5781 +5781 @@
           <li><tt>"HostAudioNotResponding"</tt></li>
           <li><tt>"VDIStorageFull"</tt></li>
+          <li><tt>"3DSupportIncompatibleAdditions"</tt></li>
         </ul>