Changeset 44576 in vbox

Timestamp:

Feb 6, 2013 6:28:05 PM (12 years ago)

Author:

vboxsync

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

83646

Message:

VBoxTray/autoresize/wddm: better logging

File:

• trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxDispIf.cpp (modified) (15 diffs)

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

@@ -549 +549 @@
     if (!pMon->idTimer)
     {
-        Log(("SetTimer failed!, err %d", GetLastError()));
+        Log(("VBoxTray: SetTimer failed!, err %d\n", GetLastError()));
         vboxRrRetryStopLocked();
     }
@@ -581 +581 @@
         case WM_DISPLAYCHANGE:
         {
+            Log(("VBoxTray: WM_DISPLAYCHANGE\n"));
             VBoxRrRetryStop();
             return 0;
@@ -588 +589 @@
             if (wParam == VBOXRR_TIMER_ID)
             {
+                Log(("VBoxTray: VBOXRR_TIMER_ID\n"));
                 vboxRrRetryPerform();
                 return 0;
@@ -720 +722 @@
         {
             hr = S_FALSE;
+            Log(("VBoxTray: GetMessage returned FALSE\n"));
             VBoxRrRetryStop();
             break;
@@ -734 +737 @@
             if (hr == S_OK || hr == S_FALSE)
                 hr = E_FAIL;
+            Log(("VBoxTray: GetMessage returned -1, err %d\n", winEr));
             VBoxRrRetryStop();
             break;
@@ -743 +747 @@
             case WM_CLOSE:
             {
+                Log(("VBoxTray: closing Rr %d\n", Msg.message));
                 VBoxRrRetryStop();
                 PostQuitMessage(0);
@@ -1032 +1037 @@
     {
         if (status == DISP_CHANGE_SUCCESSFUL)
+        {
+            Log(("VBoxTray: resize succeeded\n"));
             return NO_ERROR;
+        }
     }
     else
@@ -1040 +1048 @@
     }
 
-    return status == DISP_CHANGE_FAILED ? ERROR_RETRY : ERROR_GEN_FAILURE;
+    if (status == DISP_CHANGE_FAILED)
+    {
+        Log(("VBoxTray: DISP_CHANGE_FAILED, retrying..\n"));
+        return ERROR_RETRY;
+    }
+
+    Log(("VBoxTray: resize failed with status %d\n", status));
+
+    return ERROR_GEN_FAILURE;
 }
 
@@ -1116 +1132 @@
 DWORD vboxDispIfCancelPendingResizeWDDM(PCVBOXDISPIF const pIf)
 {
+    Log(("VBoxTray: cancelling pending resize\n"));
     VBoxRrRetryStop();
     return NO_ERROR;
@@ -1205 +1222 @@
     UINT i = 0;
 
+    Log(("VBoxTray: vboxDispIfResizeModesWDDM\n"));
     VBoxRrRetryStop();
 
@@ -1215 +1233 @@
         {
             winEr = GetLastError();
-            Log(("WARNING: Failed to get dc for display device %s, winEr %d\n", paDisplayDevices[i].DeviceName, winEr));
+            Log(("VBoxTray: WARNING: Failed to get dc for display device %s, winEr %d\n", paDisplayDevices[i].DeviceName, winEr));
             break;
         }
@@ -1224 +1242 @@
         {
             winEr = ERROR_GEN_FAILURE;
-            Log(("WARNING: Failed to open adapter from dc, Status 0x%x\n", Status));
+            Log(("VBoxTray: WARNING: Failed to open adapter from dc, Status 0x%x\n", Status));
             break;
         }
@@ -1251 +1269 @@
             Status = pIf->modeData.wddm.pfnD3DKMTCloseAdapter(&ClosaAdapterData);
             if (Status)
-                Log(("WARNING: Failed to close adapter, Status 0x%x\n", Status));
+                Log(("VBoxTray: WARNING: Failed to close adapter, Status 0x%x\n", Status));
         }
     }
@@ -1286 +1304 @@
         Status = pIf->modeData.wddm.pfnD3DKMTCloseAdapter(&ClosaAdapterData);
         if (Status)
-            Log(("WARNING: Failed to close adapter[2], Status 0x%x\n", Status));
+            Log(("VBoxTray: WARNING: Failed to close adapter[2], Status 0x%x\n", Status));
     }
 
@@ -1296 +1314 @@
     if (fAbleToInvalidateVidPn)
     {
-        Log(("Invalidating VidPn Worked!\n"));
+        Log(("VBoxTray: Invalidating VidPn Worked!\n"));
         winEr = vboxDispIfWddmValidateFixResize(pIf, paDisplayDevices, paDeviceModes, cDevModes);
     }
     else
     {
-        Log(("Falling back to monitor mode reinit\n"));
+        Log(("VBoxTray: Falling back to monitor mode reinit\n"));
         /* fallback impl needed for display-only driver
          * since D3DKMTInvalidateActiveVidPn is not available for WDDM > 1.0: