Changeset 60531 in vbox for trunk/src/VBox/Additions/WINNT/VBoxTray

Timestamp:

Apr 18, 2016 9:15:38 AM (9 years ago)

Author:

vboxsync

Message:

bugref:8250: Extraneous files removed.

Location:

trunk/src/VBox/Additions/WINNT/VBoxTray

Files:

• Makefile.kmk (modified) (1 diff)
• VBoxDispIf.cpp (modified) (6 diffs)
• VBoxTray.cpp (modified) (1 diff)

trunk/src/VBox/Additions/WINNT/VBoxTray/Makefile.kmk

@@ -68 +68 @@
 ifdef VBOX_WITH_WDDM
  VBoxTray_DEFS   += VBOX_WITH_WDDM
- VBoxTray_DEFS   += LOG_ENABLED
+ # VBoxTray_DEFS   += LOG_ENABLED
  VBoxTray_SOURCES += ../Graphics/Video/disp/wddm/VBoxDispKmt.cpp
 endif

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

@@ -35 +35 @@
 #else
 #define WARN(_m) do { \
-            LogRel(_m); \
+            Log(_m); \
         } while (0)
 #define WARN_FUNC(_m) do { \
-            LogRelFunc(_m); \
+            LogFunc(_m); \
         } while (0)
 #endif
@@ -1314 +1314 @@
 static DWORD vboxDispIfUpdateModesWDDM(VBOXDISPIF_OP *pOp, uint32_t u32TargetId, const RTRECTSIZE *pSize)
 {
-        LogRel(("VBoxTray: vboxDispIfUpdateModesWDDM Enter, u32TargetId %d\n", u32TargetId));
     DWORD winEr = ERROR_SUCCESS;
     VBOXDISPIFESCAPE_UPDATEMODES EscData = {0};
@@ -1400 +1399 @@
     DWORD winEr = NO_ERROR;
 
-    LogRel(("VBoxTray: vboxDispIfResizeModesWDDM fEnable %d, iChanged %d, cDevModes %d\n", fEnable, iChangedMode, cDevModes));
+    Log(("VBoxTray: vboxDispIfResizeModesWDDM iChanged %d cDevModes %d\n", iChangedMode, cDevModes));
     VBoxRrRetryStop();
 
@@ -1438 +1437 @@
 
     NTSTATUS Status = Op.pIf->modeData.wddm.KmtCallbacks.pfnD3DKMTInvalidateActiveVidPn(&DdiData);
-    LogRel(("VBoxTray: InvalidateActiveVidPn cElements %d, returns 0x%08x\n", cElements, Status));
+    LogFunc(("InvalidateActiveVidPn 0x%08x\n", Status));
 
     /* Resize displays always to keep the display layout because
@@ -1453 +1452 @@
             winEr = vboxDispIfUpdateModesWDDM(&Op, iChangedMode, &Size);
             if (winEr != NO_ERROR)
-                WARN(("VBoxTray: vboxDispIfUpdateModesWDDM failed %d\n", winEr));
-            else
-                LogRel(("VBoxTray: vboxDispIfUpdateModesWDDM is OK for iChangedMode %d\n", iChangedMode));
+                WARN(("vboxDispIfUpdateModesWDDM failed %d\n", winEr));
         }
 
@@ -1462 +1459 @@
             winEr = vboxDispIfResizePerform(pIf, iChangedMode, fEnable, fExtDispSup, paDisplayDevices, paDeviceModes, cDevModes);
 
-            LogRel(("VBoxTray: vboxDispIfResizePerform returned 0x%08x for iChangedMode %d\n", winEr, iChangedMode));
             if (winEr == ERROR_RETRY)
             {

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

@@ -1004 +1004 @@
     }
 
-    RTLogGroupSettings(NULL, "+all.e.l.f");
-
     if (RT_SUCCESS(rc))
     {