Changeset 79938 in vbox

Timestamp:

Jul 23, 2019 6:09:28 PM (6 years ago)

Author:

vboxsync

Message:

3D: Build fix for the case when VBOXWDDMDISP_DEBUG_PRINT enables OutputDebugString

Location:

trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm

Files:

• VBoxDispDbg.cpp (modified) (2 diffs)
• VBoxDispDbg.h (modified) (1 diff)

trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm/VBoxDispDbg.cpp

@@ -110 +110 @@
 
 DWORD g_VBoxVDbgCfgCreateSwapchainOnDdiOnce = 0;
-
-void vboxDispLogDbgPrintF(char * szString, ...)
-{
-    char szBuffer[4096] = {0};
-    va_list pArgList;
-    va_start(pArgList, szString);
-    vboxDispLogDbgFormatStringV(szBuffer, sizeof (szBuffer), szString, pArgList);
-    va_end(pArgList);
-
-    OutputDebugStringA(szBuffer);
-}
 
 VOID vboxVDbgDoPrintDmlCmd(const char* pszDesc, const char* pszCmd)
@@ -805 +794 @@
     VBoxDispMpLoggerLog(szBuffer);
 }
+
+void vboxDispLogDbgPrintF(char * szString, ...)
+{
+    char szBuffer[4096] = { 0 };
+    va_list pArgList;
+    va_start(pArgList, szString);
+    vboxDispLogDbgFormatStringV(szBuffer, sizeof(szBuffer), szString, pArgList);
+    va_end(pArgList);
+
+    OutputDebugStringA(szBuffer);
+}
 #endif

trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm/VBoxDispDbg.h

@@ -38 +38 @@
 /* generic debugging facilities & extra data checks */
 # define VBOXWDDMDISP_DEBUG
-# if defined(DEBUG_misha) || defined(DEBUG_leo)
 /* for some reason when debugging with VirtualKD, user-mode DbgPrint's are discarded
  * the workaround so far is to pass the log info to the kernel driver and DbgPrint'ed from there,
  * which is enabled by this define */
 //#  define VBOXWDDMDISP_DEBUG_PRINTDRV
-/* use OutputDebugString */
-//#  define VBOXWDDMDISP_DEBUG_PRINT
+
+/* Uncomment to use OutputDebugString */
+//#define VBOXWDDMDISP_DEBUG_PRINT
+
 /* disable shared resource creation with wine */
 //#  define VBOXWDDMDISP_DEBUG_NOSHARED
 
 //#  define VBOXWDDMDISP_DEBUG_PRINT_SHARED_CREATE
-
 //#  define VBOXWDDMDISP_DEBUG_TIMER
-# endif
 
 # ifndef IN_VBOXCRHGSMI