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

Timestamp:

Jul 7, 2010 10:47:26 PM (14 years ago)

Author:

vboxsync

Message:

wddm/3d: err handling fix

Location:

trunk/src/VBox/Additions/WINNT/Graphics

Files:

• Display/wddm/VBoxDispD3D.cpp (modified) (1 diff)
• Wine/Makefile.kmk (modified) (3 diffs)
• Wine/wined3d/context.c (modified) (1 diff)

trunk/src/VBox/Additions/WINNT/Graphics/Display/wddm/VBoxDispD3D.cpp

@@ -3482 +3482 @@
                 hr = E_OUTOFMEMORY;
             }
-
-            if (hr == S_OK)
-                pResource->hResource = pRc;
-            else
-                vboxResourceFree(pRc);
         }
 

trunk/src/VBox/Additions/WINNT/Graphics/Wine/Makefile.kmk

@@ -126 +126 @@
     LIB_TO_DATADIR=\"\" \
     BIN_TO_DATADIR=\"\"
-ifneq ($(KBUILD_TYPE),debug)
+#ifneq ($(KBUILD_TYPE),debug)
  wined3d_DEFS        += WINE_NO_DEBUG_MSGS
-endif
+#endif
 ifdef VBOXWDDM
  wined3d_DEFS        += VBOXWDDM 
@@ -183 +183 @@
     LIB_TO_DATADIR=\"\" \
     BIN_TO_DATADIR=\"\"
-ifneq ($(KBUILD_TYPE),debug)
+#ifneq ($(KBUILD_TYPE),debug)
  VBoxD3D8_DEFS       += WINE_NO_DEBUG_MSGS
-endif
+#endif
 VBoxD3D8_INCS         := $(PATH_SUB_CURRENT)/include
 VBoxD3D8_SOURCES      := \
@@ -218 +218 @@
     LIB_TO_DATADIR=\"\" \
     BIN_TO_DATADIR=\"\"
-ifneq ($(KBUILD_TYPE),debug)
+#ifneq ($(KBUILD_TYPE),debug)
  VBoxD3D9_DEFS       += WINE_NO_DEBUG_MSGS
-endif
+#endif
 VBoxD3D9_INCS         := $(PATH_SUB_CURRENT)/include
 VBoxD3D9_SOURCES      := \

trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/context.c

@@ -484 +484 @@
     }
 
-#ifdef DEBUG
+#if defined(DEBUG) && !defined(DEBUG_misha)
     context_check_fbo_status(context);
 #endif