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

Timestamp:

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

Author:

vboxsync

Message:

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

Location:

trunk/src/VBox/Main

Files:

• ConsoleImpl2.cpp (modified) (2 diffs)
• idl/VirtualBox.xidl (modified) (1 diff)

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>