Changeset 39570 in vbox for trunk/src/VBox/Additions/WINNT/Graphics/Wine/include

Timestamp:

Dec 9, 2011 2:02:53 PM (13 years ago)

Author:

vboxsync

Message:

wine: IDirect3D9Impl_QueryInterface fix, getd3dcaps9 fix, debug tooling

File:

• trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wine/debug.h (modified) (2 diffs)

trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wine/debug.h

@@ -41 +41 @@
 #endif
 
-#ifdef VBOX_WITH_WDDM
-# ifdef VBOX_WINE_WITH_IPRT
-#  include <iprt/assert.h>
-# else
-#  define AssertBreakpoint() do { } while (0)
-#  define Assert(_expr) do { } while (0)
-#  define RT_BREAKPOINT()
-# endif
+#ifdef VBOX_WINE_WITH_IPRT
+# include <iprt/assert.h>
+#else
+# define AssertBreakpoint() do { } while (0)
+# define Assert(_expr) do { } while (0)
+# define RT_BREAKPOINT()
 #endif
 
@@ -60 +58 @@
 
 struct _GUID;
+
+#ifdef DEBUG
+# define VBOX_WINE_DEBUG
+#endif
+
+#ifdef VBOX_WINE_DEBUG
+# ifndef VBOX_WINE_DEBUG_DEFINES
+extern DWORD g_VBoxVDbgBreakOnD3DErr;
+# else
+#  ifdef DEBUG_misha
+#   define _ERR_BREAK_DEFAULT 1
+#  else
+#   define _ERR_BREAK_DEFAULT 0
+#  endif
+DWORD g_VBoxVDbgBreakOnD3DErr = _ERR_BREAK_DEFAULT;
+# endif
+
+# define _ERR_BREAK() Assert(0)
+# define _ERR_ASSERT(_e) Assert((_e))
+# define _ERR_CHECK_BREAK(_t) do { \
+        if (g_VBoxVDbgBreakOn##_t) { _ERR_BREAK(); } \
+    } while (0)
+# define _ERR_CHECK_ASSERT(_t, _e) do { \
+        if (g_VBoxVDbgBreakOn##_t) { _ERR_ASSERT(_e); } \
+    } while (0)
+
+# define ERR_D3D() _ERR_CHECK_BREAK(D3DErr)
+# define ASSERT_D3D(_e) _ERR_CHECK_ASSERT(D3DErr, _e)
+#else
+# define ERR_D3D() do {} while (0)
+# define ASSERT_D3D(_e) do {} while (0)
+#endif /* #ifdef VBOX_WINE_DEBUG */
 
 /*