Changeset 43723 in vbox

Timestamp:

Oct 24, 2012 10:56:20 AM (12 years ago)

Author:

vboxsync

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

81607

Message:

crOpenGL: fix large buffer transfers

Location:

trunk/src/VBox

Files:

• Additions/WINNT/Graphics/Video/common/wddm/VBoxMPIf.h (modified) (1 diff)
• Additions/WINNT/Graphics/Video/disp/wddm/VBoxUhgsmiBase.cpp (modified) (2 diffs)
• Additions/WINNT/Graphics/Video/mp/wddm/VBoxMPWddm.cpp (modified) (1 diff)
• HostServices/SharedOpenGL/crserver/crservice.cpp (modified) (1 diff)

trunk/src/VBox/Additions/WINNT/Graphics/Video/common/wddm/VBoxMPIf.h

@@ -35 +35 @@
 
 /* One would increase this whenever definitions in this file are changed */
-#define VBOXVIDEOIF_VERSION 14
+#define VBOXVIDEOIF_VERSION 15
 
 #define VBOXWDDM_NODE_ID_SYSTEM           0

trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm/VBoxUhgsmiBase.cpp

@@ -234 +234 @@
 
     pBuf->CallHdr.EscapeHdr.escapeCode = VBOXESC_CRHGSMICTLCON_CALL;
-    pBuf->CallHdr.EscapeHdr.u32CmdSpecific = 0;
+    pBuf->CallHdr.EscapeHdr.u32CmdSpecific = (uint32_t)VERR_GENERAL_FAILURE;
     memcpy(&pBuf->CallHdr.CallInfo, pCallInfo, cbCallInfo);
 
@@ -240 +240 @@
     if (RT_SUCCESS(rc))
     {
-        memcpy(pCallInfo, &pBuf->CallHdr.CallInfo, cbCallInfo);
-        rc = VINF_SUCCESS;
-    }
-    else
-    {
+        rc = (int)pBuf->CallHdr.EscapeHdr.u32CmdSpecific;
+        if (RT_SUCCESS(rc))
+        {
+            memcpy(pCallInfo, &pBuf->CallHdr.CallInfo, cbCallInfo);
+            rc = VINF_SUCCESS;
+        }
+        else
+            WARN(("vboxCrHgsmiPrivateEscape u32CmdSpecific failed, rc (%d)", rc));
+    }
+    else
         WARN(("vboxCrHgsmiPrivateEscape failed, rc (%d)", rc));
-   }
+
     /* cleanup */
     if (pBuf != &Buf)

trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/VBoxMPWddm.cpp

@@ -4015 +4015 @@
                     Assert(pEscape->PrivateDriverDataSize > RT_OFFSETOF(VBOXDISPIFESCAPE_CRHGSMICTLCON_CALL, CallInfo));
                     int rc = VBoxMpCrCtlConCallUserData(&pDevExt->CrCtlCon, &pCall->CallInfo, pEscape->PrivateDriverDataSize - RT_OFFSETOF(VBOXDISPIFESCAPE_CRHGSMICTLCON_CALL, CallInfo));
-                    if (RT_SUCCESS(rc))
-                        Status = STATUS_SUCCESS;
-                    else
-                    {
+                    pEscapeHdr->u32CmdSpecific = (uint32_t)rc;
+                    Status = STATUS_SUCCESS; /* <- always return success here, otherwise the private data buffer modifications
+                                              * i.e. rc status stored in u32CmdSpecific will not be copied to user mode */
+                    if (!RT_SUCCESS(rc))
                         WARN(("VBoxMpCrUmCtlConCall failed, rc(%d)", rc));
-                        Status = STATUS_UNSUCCESSFUL;
-                    }
                 }
                 else

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

@@ -473 +473 @@
             if (pBuffer->uiId == iBuffer)
             {
-                if (pBuffer->uiSize!=cbBufferSize)
+                if (cbBufferSize && pBuffer->uiSize!=cbBufferSize)
                 {
                     static int shown=0;