Changeset 42027 in vbox for trunk/src/VBox/Additions/WINNT/Graphics/Video

Timestamp:

Jul 5, 2012 3:22:12 PM (13 years ago)

Author:

vboxsync

Message:

wddm: fix release profiling

Location:

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

Files:

• VBoxDispDbg.cpp (modified) (4 diffs)
• VBoxDispDbg.h (modified) (4 diffs)

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

@@ -81 +81 @@
 }
 
+#if defined(VBOXWDDMDISP_DEBUG) || defined(VBOX_WDDMDISP_WITH_PROFILE)
+LONG g_VBoxVDbgFIsDwm = -1;
+
+DWORD g_VBoxVDbgPid = 0;
+#endif
+
 #ifdef VBOXWDDMDISP_DEBUG
 #define VBOXWDDMDISP_DEBUG_DUMP_DEFAULT 0
@@ -109 +115 @@
 DWORD g_VBoxVDbgFLog = 1;
 DWORD g_VBoxVDbgFLogFlow = 0;
-
-LONG g_VBoxVDbgFIsDwm = -1;
-
-DWORD g_VBoxVDbgPid = 0;
 
 DWORD g_VBoxVDbgCfgMaxDirectRts = 0;
@@ -642 +644 @@
 }
 
-BOOL vboxVDbgDoCheckExe(const char * pszName)
-{
-    char *pszModule = vboxVDbgDoGetModuleName();
-    if (!pszModule)
-        return FALSE;
-    DWORD cbModule, cbName;
-    cbModule = strlen(pszModule);
-    cbName = strlen(pszName);
-    if (cbName > cbModule)
-        return FALSE;
-    if (_stricmp(pszName, pszModule + (cbModule - cbName)))
-        return FALSE;
-    return TRUE;
-}
-
 static VOID CALLBACK vboxVDbgTimerCb(__in PVOID lpParameter, __in BOOLEAN TimerOrWaitFired)
 {
@@ -686 +673 @@
     }
     return S_OK;
+}
+#endif
+
+#if defined(VBOXWDDMDISP_DEBUG) || defined(VBOX_WDDMDISP_WITH_PROFILE)
+BOOL vboxVDbgDoCheckExe(const char * pszName)
+{
+    char *pszModule = vboxVDbgDoGetModuleName();
+    if (!pszModule)
+        return FALSE;
+    DWORD cbModule, cbName;
+    cbModule = strlen(pszModule);
+    cbName = strlen(pszName);
+    if (cbName > cbModule)
+        return FALSE;
+    if (_stricmp(pszName, pszModule + (cbModule - cbName)))
+        return FALSE;
+    return TRUE;
 }
 #endif

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

@@ -79 +79 @@
 extern DWORD g_VBoxVDbgFLogFlow;
 
-extern LONG g_VBoxVDbgFIsDwm;
-
 extern DWORD g_VBoxVDbgCfgMaxDirectRts;
 extern DWORD g_VBoxVDbgCfgForceDummyDevCreate;
@@ -170 +168 @@
     } while (0)
 
+#if defined(VBOXWDDMDISP_DEBUG) || defined(VBOX_WDDMDISP_WITH_PROFILE)
+extern DWORD g_VBoxVDbgPid;
+extern LONG g_VBoxVDbgFIsDwm;
+#define VBOXVDBG_CHECK_EXE(_pszName) (vboxVDbgDoCheckExe(_pszName))
+#define VBOXVDBG_IS_DWM() (!!(g_VBoxVDbgFIsDwm >=0 ? g_VBoxVDbgFIsDwm : (g_VBoxVDbgFIsDwm = VBOXVDBG_CHECK_EXE("dwm.exe"))))
+BOOL vboxVDbgDoCheckExe(const char * pszName);
+#endif
 #if defined(VBOXWDDMDISP_DEBUG) || defined(LOG_TO_BACKDOOR_DRV)
 
@@ -259 +264 @@
                             BOOL fBreakOnMismatch);
 
-BOOL vboxVDbgDoCheckExe(const char * pszName);
-
 VOID vboxVDbgDoPrintLopLastCmd(const char* pszDesc);
 
@@ -266 +269 @@
 HRESULT vboxVDbgTimerStop(HANDLE hTimerQueue, HANDLE hTimer);
 
-extern DWORD g_VBoxVDbgPid;
 #define VBOXVDBG_IS_PID(_pid) ((_pid) == (g_VBoxVDbgPid ? g_VBoxVDbgPid : (g_VBoxVDbgPid = GetCurrentProcessId())))
 #define VBOXVDBG_IS_DUMP_ALLOWED_PID(_pid) (((int)(_pid)) > 0 ? VBOXVDBG_IS_PID(_pid) : !VBOXVDBG_IS_PID(-((int)(_pid))))
-
-#define VBOXVDBG_CHECK_EXE(_pszName) (vboxVDbgDoCheckExe(_pszName))
-#define VBOXVDBG_IS_DWM() (!!(g_VBoxVDbgFIsDwm >=0 ? g_VBoxVDbgFIsDwm : (g_VBoxVDbgFIsDwm = VBOXVDBG_CHECK_EXE("dwm.exe"))))
 
 #define VBOXVDBG_ASSERT_IS_DWM(_bDwm) do { \