Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/Makefile.kmk	(revision 46601)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/Makefile.kmk	(revision 46602)
@@ -172,4 +172,5 @@
 	VBOX_WITH_WINE_FIX_INITCLEAR \
 	VBOX_WITH_WINE_FIX_TEXCLEAR \
+	VBOX_WITH_WINE_FIX_STRINFOBUF \
 	VBOX_WITH_WINE_DBG
 #wined3d_DEFS        += VBOX_WITH_WINE_FIXES
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/wined3d/device.c
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/wined3d/device.c	(revision 46601)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/wined3d/device.c	(revision 46602)
@@ -295,5 +295,9 @@
 
         /* If the preload dropped the buffer object, update the stream info. */
-        if (buffer->buffer_object != element->data.buffer_object)
+        if (
+#ifdef VBOX_WITH_WINE_FIX_STRINFOBUF
+                element->data.buffer_object &&
+#endif
+                buffer->buffer_object != element->data.buffer_object)
         {
             element->data.buffer_object = 0;