Changeset 51524 in vbox

Timestamp:

Jun 4, 2014 8:06:12 AM (11 years ago)

Author:

vboxsync

Message:

DevVGA/crOpenGL: bugfixes, logging

Location:

trunk/src/VBox

Files:

• Devices/Graphics/DevVGA_VDMA.cpp (modified) (4 diffs)
• GuestHost/OpenGL/util/blitter.cpp (modified) (1 diff)
• HostServices/SharedOpenGL/crserver/crservice.cpp (modified) (3 diffs)
• HostServices/SharedOpenGL/crserverlib/server_main.c (modified) (8 diffs)
• HostServices/SharedOpenGL/crserverlib/server_misc.c (modified) (5 diffs)
• HostServices/SharedOpenGL/crserverlib/server_presenter.cpp (modified) (1 diff)

trunk/src/VBox/Devices/Graphics/DevVGA_VDMA.cpp

@@ -1622 +1622 @@
 static int vboxVDMACrCmdVbvaProcessPagingEl(PPDMDEVINS pDevIns, VBOXCMDVBVAPAGEIDX iPage, uint8_t *pu8Vram, bool fIn)
 {
-    RTGCPHYS phPage = (RTGCPHYS)(iPage << PAGE_SHIFT);
+    RTGCPHYS phPage = (RTGCPHYS)iPage << PAGE_SHIFT;
     PGMPAGEMAPLOCK Lock;
     int rc;
@@ -1707 +1707 @@
     }
 
-    if (offVRAM + (cPages << PAGE_SHIFT) >= pVGAState->vram_size)
-    {
-        WARN(("invalid cPages"));
+    if (~(~(VBOXCMDVBVAPAGEIDX)0 >> PAGE_SHIFT) & cPages)
+    {
+        WARN(("invalid cPages %d", cPages));
+        return -1;
+    }
+
+    if (offVRAM + ((VBOXCMDVBVAOFFSET)cPages << PAGE_SHIFT) >= pVGAState->vram_size)
+    {
+        WARN(("invalid cPages %d, exceeding vram size", cPages));
         return -1;
     }
@@ -1841 +1847 @@
             const VBOXCMDVBVA_HDR *pRealCmdHdr;
             uint32_t cbRealCmd = pCmd->u8Flags;
-            cbRealCmd |= (pCmd->u.u8PrimaryID << 8);
+            cbRealCmd |= (uint32_t)pCmd->u.u8PrimaryID << 8;
             if (cbRealCmd < sizeof (VBOXCMDVBVA_HDR))
             {
@@ -1957 +1963 @@
 
                         phCmd += PAGE_SIZE;
-                        pu8Vram += (cCurPages << PAGE_SHIFT);
+                        pu8Vram += (VBOXCMDVBVAOFFSET)cCurPages << PAGE_SHIFT;
 
                         rc = PDMDevHlpPhysGCPhys2CCPtrReadOnly(pDevIns, phCmd, 0, &pvCmd, &Lock);

trunk/src/VBox/GuestHost/OpenGL/util/blitter.cpp

@@ -1018 +1018 @@
     }
 
-    crWarning("NOT IMPLEMENTED");
+    WARN(("NOT IMPLEMENTED"));
     return VERR_NOT_IMPLEMENTED;
 }

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

@@ -973 +973 @@
         default:
         {
+            WARN(("svcCall: unexpected u32Function %d", u32Function));
             rc = VERR_NOT_IMPLEMENTED;
         }
@@ -1517 +1518 @@
         }
         default:
+            WARN(("svcHostCallPerform: unexpected u32Function %d", u32Function));
             rc = VERR_NOT_IMPLEMENTED;
             break;
@@ -1592 +1594 @@
                 }
                 default:
-                    WARN(("invalid function"));
+                    WARN(("svcHostCall: invalid function %d", pCtl->enmType));
                     return VERR_INVALID_PARAMETER;
             }

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server_main.c

@@ -2825 +2825 @@
     {
         if (MAPPED(SCREEN(i)))
-            crWarning("Screen count is changing, but screen[%i] is still mapped", i);
+            WARN(("Screen count is changing, but screen[%i] is still mapped", i));
         return VERR_NOT_IMPLEMENTED;
     }
@@ -3406 +3406 @@
         case SHCRGL_GUEST_FN_SET_VERSION:
         {
-            crWarning("invalid function");
+            WARN(("SHCRGL_GUEST_FN_SET_VERSION: invalid function"));
             rc = VERR_NOT_IMPLEMENTED;
             break;
@@ -3413 +3413 @@
         case SHCRGL_GUEST_FN_SET_PID:
         {
-            crWarning("invalid function");
+            WARN(("SHCRGL_GUEST_FN_SET_PID: invalid function"));
             rc = VERR_NOT_IMPLEMENTED;
             break;
@@ -3420 +3420 @@
         default:
         {
-            crWarning("invalid function");
+            WARN(("invalid function, %d", u32Function));
             rc = VERR_NOT_IMPLEMENTED;
             break;
@@ -3586 +3586 @@
         }
         default:
-            WARN(("invalid function"));
+            WARN(("crVBoxCrCmdGuestCtl: invalid function %d", pCtl->u32Type));
             return VERR_INVALID_PARAMETER;
     }
@@ -4161 +4161 @@
         case SHCRGL_GUEST_FN_SET_VERSION:
         {
-            crWarning("invalid function");
+            WARN(("crVBoxServerCrHgsmiCmd, SHCRGL_GUEST_FN_SET_VERSION: invalid function"));
             rc = VERR_NOT_IMPLEMENTED;
             break;
@@ -4168 +4168 @@
         case SHCRGL_GUEST_FN_SET_PID:
         {
-            crWarning("invalid function");
+            WARN(("crVBoxServerCrHgsmiCmd, SHCRGL_GUEST_FN_SET_PID: invalid function"));
             rc = VERR_NOT_IMPLEMENTED;
             break;
@@ -4175 +4175 @@
         default:
         {
-            crWarning("invalid function");
+            WARN(("crVBoxServerCrHgsmiCmd: invalid functionm %d", u32Function));
             rc = VERR_NOT_IMPLEMENTED;
             break;

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server_misc.c

@@ -728 +728 @@
 
         if (!mural->fRedirected)
+        {
+            WARN(("mural not redirected!"));
             return VERR_NOT_IMPLEMENTED;
+        }
 
         enmBuf = fDraw ? ctx->buffer.drawBuffer : ctx->buffer.readBuffer;
@@ -744 +747 @@
                 break;
             default:
-                crWarning("unsupported enum buf");
+                WARN(("unsupported enum buf %d", enmBuf));
                 return VERR_NOT_IMPLEMENTED;
                 break;
@@ -779 +782 @@
     if (pAp->level)
     {
-        crWarning("non-zero level not implemented");
+        WARN(("non-zero level not implemented"));
         return VERR_NOT_IMPLEMENTED;
     }
@@ -792 +795 @@
     if (tobj->target != GL_TEXTURE_2D && tobj->target != GL_TEXTURE_RECTANGLE_NV)
     {
-        crWarning("non-texture[rect|2d] not implemented");
+        WARN(("non-texture[rect|2d] not implemented"));
         return VERR_NOT_IMPLEMENTED;
     }
@@ -823 +826 @@
     if (mask != GL_COLOR_BUFFER_BIT)
     {
-        crWarning("not supported blit mask %d", mask);
+        WARN(("not supported blit mask %d", mask));
         return VERR_NOT_IMPLEMENTED;
     }

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server_presenter.cpp

@@ -5654 +5654 @@
         if (hSrcFb)
         {
-            WARN(("blit from one framebuffer, wow"));
+            LOG(("blit from one framebuffer, wow"));
 
             int rc = CrFbUpdateBegin(hSrcFb);