Changeset 44040 in vbox for trunk/src/VBox/Additions

Timestamp:

Dec 5, 2012 1:56:15 PM (12 years ago)

Author:

vboxsync

Message:

wddm & vboxtray: better logging for autoresize

Location:

trunk/src/VBox/Additions/WINNT

Files:

• Graphics/Video/mp/common/VBoxMPVidModes.cpp (modified) (5 diffs)
• Graphics/Video/mp/wddm/VBoxMPVidPn.cpp (modified) (3 diffs)
• Graphics/Video/mp/wddm/VBoxMPWddm.cpp (modified) (8 diffs)
• VBoxTray/VBoxDispIf.cpp (modified) (7 diffs)

trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/common/VBoxMPVidModes.cpp

@@ -545 +545 @@
 
     if (!VBoxMPValidateVideoModeParamsGuest(pExt, iDisplay, xres, yres, bpp))
+    {
+        WARN_NOBP(("GUEST does not like special mode %dx%d:%d for display %d", xres, yres, bpp, iDisplay));
         return FALSE;
+    }
 
     /* Check if host likes this mode */
     if (!VBoxLikesVideoMode(iDisplay, xres, yres, bpp))
     {
-        WARN_NOBP(("host does not like special mode %dx%d:%d for display %d", xres, yres, bpp, iDisplay));
+        WARN_NOBP(("HOST does not like special mode %dx%d:%d for display %d", xres, yres, bpp, iDisplay));
         return FALSE;
     }
@@ -616 +619 @@
         {
             /*display = RT_ELEMENTS(g_CustomVideoModes) - 1;*/
+            WARN(("VBoxQueryDisplayRequest returned invalid display number %d", display));
             return FALSE;
         }
@@ -621 +625 @@
     else
     {
+        LOG(("no pending request"));
         return FALSE;
     }
@@ -1105 +1110 @@
             return;
         }
+        LOG(("invalidating videomede info for screen %d", VidPnTargetId));
         g_aVBoxVideoModeInfos[VidPnTargetId].cModes = 0;
         return;
     }
+
+    LOG(("invalidating ALL videomede infos"));
 
     for (UINT i = 0; i < RT_ELEMENTS(g_aVBoxVideoModeInfos); ++i)
@@ -1246 +1254 @@
     if (VidPnTargetId >= (D3DDDI_VIDEO_PRESENT_TARGET_ID)VBoxCommonFromDeviceExt(pExt)->cDisplays)
     {
+        WARN(("video mode info for invalid screen (%d) requested", VidPnTargetId));
         return NULL;
     }

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

@@ -553 +553 @@
         pInfo->fMatched = FALSE;
 
+    if (!pInfo->fMatched)
+        LOG(("Found non-matching mode (%d X %d)",
+                pMonitorSMI->VideoSignalInfo.ActiveSize.cx, pMonitorSMI->VideoSignalInfo.ActiveSize.cy));
+
     pMonitorSMSIf->pfnReleaseModeInfo(hMonitorSMS, pMonitorSMI);
 
@@ -597 +601 @@
     {
         if (cModes < cResolutions)
+        {
             *pfMatch = FALSE;
+            LOG(("num modes(%d) and resolutions(%d) do not match, treat as not matched..", cModes, cResolutions));
+        }
         else
         {
@@ -607 +614 @@
             Status = vboxVidPnEnumMonitorSourceModes(hMonitorSMS, pMonitorSMSIf, vboxFidPnMatchMonitorModesEnum, &Info);
             if (NT_SUCCESS(Status))
+            {
                 *pfMatch = Info.fMatched;
+                LOG(("modes %smatched", Info.fMatched ? "" : "NOT "));
+            }
+            else
+                WARN(("vboxVidPnEnumMonitorSourceModes failed, Status 0x%x", Status));
         }
     }

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

@@ -462 +462 @@
             DdiChildStatus.ChildUid = pChildStatus->iChild;
         }
+        LOG(("Reporting DISCONNECT to child %d", DdiChildStatus.ChildUid));
         DdiChildStatus.HotPlug.Connected = FALSE;
         NTSTATUS Status = pDevExt->u.primary.DxgkInterface.DxgkCbIndicateChildStatus(pDevExt->u.primary.DxgkInterface.DeviceHandle, &DdiChildStatus);
@@ -488 +489 @@
             DdiChildStatus.ChildUid = pChildStatus->iChild;
         }
+        LOG(("Reporting CONNECT to child %d", DdiChildStatus.ChildUid));
         DdiChildStatus.HotPlug.Connected = TRUE;
         NTSTATUS Status = pDevExt->u.primary.DxgkInterface.DxgkCbIndicateChildStatus(pDevExt->u.primary.DxgkInterface.DeviceHandle, &DdiChildStatus);
@@ -514 +516 @@
             DdiChildStatus.ChildUid = pChildStatus->iChild;
         }
+        LOG(("Reporting ROTATED to child %d", DdiChildStatus.ChildUid));
         DdiChildStatus.Rotation.Angle = pChildStatus->u8RotationAngle;
         NTSTATUS Status = pDevExt->u.primary.DxgkInterface.DxgkCbIndicateChildStatus(pDevExt->u.primary.DxgkInterface.DeviceHandle, &DdiChildStatus);
@@ -665 +668 @@
     int i;
 
+    LOG(("checking child status.."));
+
     for (i = 0; i < VBoxCommonFromDeviceExt(pDevExt)->cDisplays; ++i)
     {
         if (pMask && !ASMBitTest(pMask, i))
             continue;
+
+        LOG(("requested to change child status for display %d", i));
 
         /* @todo: check that we actually need the current source->target */
@@ -695 +702 @@
         if (bChanged[i])
         {
+            LOG(("modes changed for display %d", i));
+
             NTSTATUS tmpStatus = vboxWddmChildStatusReportReconnected(pDevExt, i);
             if (!NT_SUCCESS(tmpStatus))
@@ -4186 +4195 @@
                     break;
                 }
+                LOG(("=> VBOXESC_REINITVIDEOMODESBYMASK"));
                 PVBOXDISPIFESCAPE_REINITVIDEOMODESBYMASK pData = (PVBOXDISPIFESCAPE_REINITVIDEOMODESBYMASK)pEscapeHdr;
                 PVBOXWDDM_VIDEOMODES_INFO pInfos = VBoxWddmUpdateVideoModesInfoByMask(pDevExt, pData->ScreenMask);
@@ -4196 +4206 @@
                     }
                 }
+                LOG(("<= VBOXESC_REINITVIDEOMODESBYMASK"));
                 break;
             }
@@ -6692 +6703 @@
     vboxVDbgBreakFv();
 
-#ifdef DEBUG_misha
+#if 0//def DEBUG_misha
     RTLogGroupSettings(0, "+default.e.l.f.l2.l3");
 #endif
 
 #ifdef VBOX_WDDM_WIN8
-    LOGREL(("VBox WDDM Driver for Windows 8; Built %s %s", __DATE__, __TIME__));
+    LOGREL(("VBox WDDM Driver for Windows 8, %d bit; Built %s %s", (sizeof (void*) << 3), __DATE__, __TIME__));
 #else
-    LOGREL(("VBox WDDM Driver for Windows Vista and 7; Built %s %s", __DATE__, __TIME__));
+    LOGREL(("VBox WDDM Driver for Windows Vista and 7, %d bit; Built %s %s", (sizeof (void*) << 3), __DATE__, __TIME__));
 #endif
 

trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxDispIf.cpp

@@ -175 +175 @@
                 {
                     winEr = GetLastError();
-                    Assert(0);
+                    Log(("CreateDC failed %d", winEr));
                     break;
                 }
             }
+            Log(("display data no match display(%d): i(%d), flags(%d)", iDisplay, i, pDev->StateFlags));
         }
         else
         {
             winEr = GetLastError();
-            Assert(0);
+            Log(("EnumDisplayDevices failed %d", winEr));
             break;
         }
     }
 
+    Log(("vboxDispIfWDDMAdpHdcCreate failure branch %d", winEr));
     return winEr;
 }
@@ -227 +229 @@
         DeleteDC(OpenAdapterData.hDc);
     }
+    else
+        Log((__FUNCTION__": vboxDispIfWDDMAdpHdcCreate failed, winEr (%d)\n", err));
 
     return err;
@@ -1047 +1051 @@
         {
             winEr = GetLastError();
-            Assert(0);
+            Log(("WARNING: Failed to get dc for display device %s, winEr %d\n", paDisplayDevices[i].DeviceName, winEr));
             break;
         }
@@ -1056 +1060 @@
         {
             winEr = ERROR_GEN_FAILURE;
-            Assert(0);
+            Log(("WARNING: Failed to open adapter from dc, Status 0x%x\n", Status));
             break;
         }
@@ -1074 +1078 @@
             ClosaAdapterData.hAdapter = OpenAdapterData.hAdapter;
             Status = pIf->modeData.wddm.pfnD3DKMTCloseAdapter(&ClosaAdapterData);
-            Assert(!Status);
+            if (Status)
+                Log(("WARNING: Failed to close adapter, Status 0x%x\n", Status));
         }
     }
@@ -1108 +1113 @@
         ClosaAdapterData.hAdapter = hAdapter;
         Status = pIf->modeData.wddm.pfnD3DKMTCloseAdapter(&ClosaAdapterData);
-        Assert(!Status);
+        if (Status)
+            Log(("WARNING: Failed to close adapter[2], Status 0x%x\n", Status));
     }
 
@@ -1118 +1124 @@
     if (fAbleToInvalidateVidPn)
     {
+        Log(("Invalidating VidPn Worked!\n"));
         winEr = vboxDispIfWddmValidateFixResize(pIf, paDisplayDevices, paDeviceModes, cDevModes);
     }
     else
     {
+        Log(("Falling back to monitor mode reinit\n"));
         /* fallback impl needed for display-only driver
          * since D3DKMTInvalidateActiveVidPn is not available for WDDM > 1.0: