Index: /trunk/src/VBox/Additions/WINNT/Graphics/Miniport/wddm/VBoxVideoWddm.cpp
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Miniport/wddm/VBoxVideoWddm.cpp	(revision 27425)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Miniport/wddm/VBoxVideoWddm.cpp	(revision 27426)
@@ -772,5 +772,5 @@
     dfprintf(("==> "__FUNCTION__ ", context(0x%p), msg(0x%x)\n", MiniportDeviceContext, MessageNumber));
 
-    vboxVDbgBreakF();
+    vboxVDbgBreakFv();
 
     PDEVICE_EXTENSION pDevExt = (PDEVICE_EXTENSION)MiniportDeviceContext;
@@ -901,5 +901,5 @@
     dfprintf(("==> "__FUNCTION__ ", context(0x%p)\n", MiniportDeviceContext));
 
-    vboxVDbgBreakF();
+    vboxVDbgBreakFv();
 
     PDEVICE_EXTENSION pDevExt = (PDEVICE_EXTENSION)MiniportDeviceContext;
@@ -1481,5 +1481,5 @@
     dfprintf(("==> "__FUNCTION__ ", hAdapter(0x%x)\n", hAdapter));
 
-    vboxVDbgBreakF();
+    vboxVDbgBreakFv();
 
     PVBOXWDDM_ALLOCATION pAllocation = (PVBOXWDDM_ALLOCATION)pDescribeAllocation->hAllocation;
@@ -1653,5 +1653,5 @@
     dfprintf(("==> "__FUNCTION__ ", context(0x%x)\n", hAdapter));
 
-    vboxVDbgBreakF();
+    vboxVDbgBreakFv();
 
     /* Value == 2 is Present
@@ -1695,5 +1695,5 @@
     dfprintf(("==> "__FUNCTION__ ", context(0x%x)\n", hAdapter));
 
-    vboxVDbgBreakF();
+    vboxVDbgBreakFv();
 
     PDEVICE_EXTENSION pDevExt = (PDEVICE_EXTENSION)hAdapter;
@@ -1768,5 +1768,5 @@
     PAGED_CODE();
 
-    vboxVDbgBreakF();
+    vboxVDbgBreakFv();
 
     NTSTATUS Status = STATUS_SUCCESS;
@@ -2155,5 +2155,5 @@
     PAGED_CODE();
 
-    vboxVDbgBreakF();
+    vboxVDbgBreakFv();
 
     dfprintf(("==> "__FUNCTION__ ", context(0x%x)\n", hAdapter));
@@ -2222,5 +2222,5 @@
     PAGED_CODE();
 
-    vboxVDbgBreakF();
+    vboxVDbgBreakFv();
 
     dfprintf(("==> "__FUNCTION__ ", context(0x%x)\n", hAdapter));
@@ -2274,5 +2274,5 @@
     PDEVICE_EXTENSION pDevExt = (PDEVICE_EXTENSION)hAdapter;
 
-    vboxVDbgBreakF();
+    vboxVDbgBreakFv();
 
     const DXGK_VIDPN_INTERFACE* pVidPnInterface = NULL;
@@ -2665,5 +2665,5 @@
     dfprintf(("==> "__FUNCTION__ ", hContext(0x%x)\n", hContext));
 
-    vboxVDbgBreakF();
+    vboxVDbgBreakFv();
 
     NTSTATUS Status = STATUS_SUCCESS;
Index: /trunk/src/VBox/Devices/Graphics/DevVGA_VDMA.cpp
===================================================================
--- /trunk/src/VBox/Devices/Graphics/DevVGA_VDMA.cpp	(revision 27425)
+++ /trunk/src/VBox/Devices/Graphics/DevVGA_VDMA.cpp	(revision 27426)
@@ -140,14 +140,16 @@
     else
     {
-        uint32_t offDstStart = pDstDesc->pitch * pDstRectl->top + pDstRectl->left;
-        uint32_t cbDstLine = pDstDesc->bpp * pDstRectl->width;
-        cbDstLine = !(cbDstLine & 7) ? cbDstLine >> 3 : (cbDstLine >> 3) + 1;
+        uint32_t offDstLineStart = pDstRectl->left * pDstDesc->bpp >> 3;
+        uint32_t offDstLineEnd = ((pDstRectl->left * pDstDesc->bpp + 7) >> 3) + ((pDstDesc->bpp * pDstRectl->width + 7) >> 3);
+        uint32_t cbDstLine = offDstLineEnd - offDstLineStart;
+        uint32_t offDstStart = pDstDesc->pitch * pDstRectl->top + offDstLineStart;
         Assert(cbDstLine <= pDstDesc->pitch);
         uint32_t cbDstSkip = pDstDesc->pitch;
         uint8_t * pvDstStart = pvDstSurf + offDstStart;
 
-        uint32_t offSrcStart = pSrcDesc->pitch * pSrcRectl->top + pSrcRectl->left;
-        uint32_t cbSrcLine = pSrcDesc->bpp * pSrcRectl->width;
-        cbSrcLine = !(cbSrcLine & 7) ? cbSrcLine >> 3 : (cbSrcLine >> 3) + 1;
+        uint32_t offSrcLineStart = pSrcRectl->left * pSrcDesc->bpp >> 3;
+        uint32_t offSrcLineEnd = ((pSrcRectl->left * pSrcDesc->bpp + 7) >> 3) + ((pSrcDesc->bpp * pSrcRectl->width + 7) >> 3);
+        uint32_t cbSrcLine = offSrcLineEnd - offSrcLineStart;
+        uint32_t offSrcStart = pSrcDesc->pitch * pSrcRectl->top + offSrcLineStart;
         Assert(cbSrcLine <= pSrcDesc->pitch);
         uint32_t cbSrcSkip = pSrcDesc->pitch;