Changeset 51436 in vbox for trunk/src/VBox/HostServices/SharedOpenGL

Timestamp:

May 28, 2014 9:12:15 AM (11 years ago)

Author:

vboxsync

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

93991

Message:

Main,Frontends: IDisplay provides the guest screen bitmap to frontends.

File:

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

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

@@ -231 +231 @@
     ComPtr<IDisplay> pDisplay;
     ComPtr<IFramebuffer> pFramebuffer;
-    LONG xo, yo;
 
     if (!g_pConsole)
@@ -241 +240 @@
     CHECK_ERROR2_STMT(g_pConsole, COMGETTER(Display)(pDisplay.asOutParam()), return);
 
-    CHECK_ERROR2_STMT(pDisplay, GetFramebuffer(screenId, pFramebuffer.asOutParam(), &xo, &yo), return);
+    CHECK_ERROR2_STMT(pDisplay, QueryFramebuffer(screenId, pFramebuffer.asOutParam()), return);
 
     if (!pFramebuffer)
@@ -1106 +1105 @@
                     for (i=0; i<monitorCount; ++i)
                     {
-                        CHECK_ERROR_RET(pDisplay, GetFramebuffer(i, pFramebuffer.asOutParam(), &xo, &yo), rc);
+                        CHECK_ERROR_RET(pDisplay, QueryFramebuffer(i, pFramebuffer.asOutParam()), rc);
 
                         if (!pFramebuffer)
@@ -1118 +1117 @@
                             CHECK_ERROR_RET(pFramebuffer, COMGETTER(Width)(&w), rc);
                             CHECK_ERROR_RET(pFramebuffer, COMGETTER(Height)(&h), rc);
+                            CHECK_ERROR_RET(pDisplay, GetScreenResolution(i, NULL, NULL, NULL, &xo, &yo), rc);
 
                             rc = crVBoxServerMapScreen(i, xo, yo, w, h, winId);
@@ -1213 +1213 @@
                 Assert(g_pConsole);
                 CHECK_ERROR_RET(g_pConsole, COMGETTER(Display)(pDisplay.asOutParam()), rc);
-                CHECK_ERROR_RET(pDisplay, GetFramebuffer(screenId, pFramebuffer.asOutParam(), &xo, &yo), rc);
+                CHECK_ERROR_RET(pDisplay, QueryFramebuffer(screenId, pFramebuffer.asOutParam()), rc);
 
                 crServerVBoxCompositionSetEnableStateGlobal(GL_FALSE);
@@ -1245 +1245 @@
                             CHECK_ERROR_BREAK(pFramebuffer, COMGETTER(Width)(&w));
                             CHECK_ERROR_BREAK(pFramebuffer, COMGETTER(Height)(&h));
+                            CHECK_ERROR_BREAK(pDisplay, GetScreenResolution(screenId, NULL, NULL, NULL, &xo, &yo));
 
                             rc = crVBoxServerMapScreen(screenId, xo, yo, w, h, winId);