Changeset 107086 in vbox for trunk/src/VBox/Additions/WINNT/Graphics

Timestamp:

Nov 21, 2024 2:03:37 PM (2 months ago)

Author:

vboxsync

Message:

*: Windows asan build fixes after the change to VS2022. jiraref:VBP-1439

Location:

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

Files:

• Makefile.kmk (modified) (4 diffs)
• wddm/dx/VBoxDX.cpp (modified) (2 diffs)

trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/Makefile.kmk

@@ -143 +143 @@
         wddm/VBoxDispD3D.def
  VBoxDispD3D_LIBS    = \
-        $(VBOX_LIB_IPRT_GUEST_R3) \
-        $(VBOX_LIB_VBGL_R3) \
+        $(VBOX_LIB_IPRT_GUEST_R3_SHARED) \
+        $(VBOX_LIB_VBGL_R3_SHARED) \
+        $(VBOX_LIB_IPRT_GUEST_R3_SHARED) \
         Psapi.lib \
         $(VBOX_PATH_ADDITIONS_LIB)/VBoxDispMpLogger$(VBOX_SUFF_LIB) \
@@ -194 +195 @@
  VBoxDispD3D-x86_BLD_TRG_ARCH = x86
  VBoxDispD3D-x86_LIBS = \
-        $(VBOX_LIB_IPRT_GUEST_R3_X86) \
-        $(VBOX_LIB_VBGL_R3_X86) \
+        $(VBOX_LIB_IPRT_GUEST_R3_X86_SHARED) \
+        $(VBOX_LIB_VBGL_R3_X86_SHARED) \
+        $(VBOX_LIB_IPRT_GUEST_R3_X86_SHARED) \
         Psapi.lib \
         $(VBOX_PATH_ADDITIONS_LIB)/VBoxDispMpLogger-x86$(VBOX_SUFF_LIB) \
@@ -226 +228 @@
         wddm/dx/VBoxDX.def
   VBoxDX_LIBS   = \
-        $(VBOX_LIB_IPRT_GUEST_R3) \
+        $(VBOX_LIB_IPRT_GUEST_R3_SHARED) \
+        $(VBOX_LIB_VBGL_R3_SHARED) \
+        $(VBOX_LIB_IPRT_GUEST_R3_SHARED) \
         Psapi.lib \
         $(VBOX_PATH_ADDITIONS_LIB)/VBoxWddmUmHlp$(VBOX_SUFF_LIB)
@@ -235 +239 @@
   VBoxDX-x86_BLD_TRG_ARCH = x86
   VBoxDX-x86_LIBS = \
-        $(VBOX_LIB_IPRT_GUEST_R3_X86) \
-        $(VBOX_LIB_VBGL_R3_X86) \
+        $(VBOX_LIB_IPRT_GUEST_R3_SHARED_X86) \
+        $(VBOX_LIB_VBGL_R3_SHARED_X86) \
+        $(VBOX_LIB_IPRT_GUEST_R3_SHARED_X86) \
         Psapi.lib \
         $(VBOX_PATH_ADDITIONS_LIB)/VBoxWddmUmHlp-x86$(VBOX_SUFF_LIB)

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

@@ -30 +30 @@
 #include <iprt/thread.h>
 #include <VBox/log.h>
+#include <VBox/cdefs.h> /* VBOX_STRICT */
 
 #include <iprt/win/windows.h>
@@ -2025 +2026 @@
 
 
-#ifdef DEBUG
+#ifdef VBOX_STRICT
 static bool isBeginDisabled(D3D10DDI_QUERY q)
 {