Changeset 42101 in vbox for trunk/src

Timestamp:

Jul 11, 2012 10:25:42 AM (13 years ago)

Author:

vboxsync

Message:

wddm: bugfix

Location:

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

Files:

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

-              r38112
+              r42101
 #define ___VBoxDispD3DCmn_h___
+#       define _InterlockedExchange           _InterlockedExchange_StupidDDKVsCompilerCrap
+#       define _InterlockedExchangeAdd        _InterlockedExchangeAdd_StupidDDKVsCompilerCrap
+#       define _InterlockedCompareExchange    _InterlockedCompareExchange_StupidDDKVsCompilerCrap
+#       define _InterlockedAddLargeStatistic  _InterlockedAddLargeStatistic_StupidDDKVsCompilerCrap
+#       define _interlockedbittestandset      _interlockedbittestandset_StupidDDKVsCompilerCrap
+#       define _interlockedbittestandreset    _interlockedbittestandreset_StupidDDKVsCompilerCrap
+#       define _interlockedbittestandset64    _interlockedbittestandset64_StupidDDKVsCompilerCrap
+#       define _interlockedbittestandreset64  _interlockedbittestandreset64_StupidDDKVsCompilerCrap
+#       pragma warning(disable : 4163)
 #include <windows.h>
+#       pragma warning(default : 4163)
+#       undef  _InterlockedExchange
+#       undef  _InterlockedExchangeAdd
+#       undef  _InterlockedCompareExchange
+#       undef  _InterlockedAddLargeStatistic
+#       undef  _interlockedbittestandset
+#       undef  _interlockedbittestandreset
+#       undef  _interlockedbittestandset64
+#       undef  _interlockedbittestandreset64
 #include <d3d9types.h>
 //#include <d3dtypes.h>

-              r39981
+              r42101
  */
+#include "VBoxDispD3DCmn.h"
 #include "VBoxDispMp.h"
 #include <iprt/thread.h>
 #include <iprt/err.h>
-#include "VBoxDispD3DCmn.h"
 #ifdef VBOXWDDM_TEST_UHGSMI

-              r42091
+              r42101
      $(VBOX_LIB_VBGL_R0) \
      $(VBOX_LIB_IPRT_GUEST_R0_NT4) \
+     $(VBOX_PATH_ADDITIONS_LIB)/HGSMIGuestR0Lib$(VBOX_SUFF_LIB)
+     $(VBOX_PATH_ADDITIONS_LIB)/HGSMIGuestR0Lib$(VBOX_SUFF_LIB)
+  VBoxVideoW8_LIBS.amd64  = $(PATH_SDK_WINDDKW8_LIB)/BufferOverflowK.lib
  endif # VBOX_WDDM_WIN8

r42098	r42101
6600	6600	}
6601	6601
6602		#if~~def DEBUG_misha~~
	6602	#if defined(DEBUG_misha) && defined(VBOX_WDDM_WIN8)
6603	6603	/* force g_VBoxDisplayOnly for debugging purposes */
6604	6604	LOGREL(("Current win8 video driver only supports display-only mode no matter whether or not host 3D is enabled!"));

-              r42083
+              r42101
 #define VBOXWDDM_CFG_STR_LOG_UM L"VBoxLogUm"
 extern DWORD g_VBoxLogUm;
+#ifdef VBOX_WDDM_WIN8
 extern DWORD g_VBoxDisplayOnly;
+#endif
 RT_C_DECLS_BEGIN

Note: See TracChangeset for help on using the changeset viewer.