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

Timestamp:

Oct 12, 2011 8:20:21 PM (13 years ago)

Author:

vboxsync

Message:

wddm: proper ie rendering under win8 (shared resource open & destroy fixes, zero-init resources on creaate, etc.)

Location:

trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wine

Files:

• debug.h (modified) (2 diffs)
• wined3d.h (modified) (10 diffs)

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

@@ -31 +31 @@
 #define __WINE_WINE_DEBUG_H
 
+#if defined(VBOX_WITH_WDDM) || defined(VBOX_WINE_WITHOUT_LIBWINE)
+# error "unexpected include!!"
+#endif
+
 #include <stdarg.h>
 #include <windef.h>
@@ -317 +321 @@
 #endif
 
+
+#ifdef DEBUG_misha
+//# define VBOXWINEDBG_SHADERS
+#endif
+
+#ifdef VBOXWINEDBG_SHADERS
+
+void vboxWDbgPrintF(char * szString, ...);
+
+# define WDLOG(_m) do {\
+        vboxWDbgPrintF _m ; \
+    } while (0)
+#else
+
+# define WDLOG(_m) do { } while (0)
+#endif
+
 #endif  /* __WINE_WINE_DEBUG_H */

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

@@ -6 +6 @@
 #ifndef __WIDL_WINED3D_H
 #define __WIDL_WINED3D_H
+
+#if defined(VBOX_WITH_WDDM) || defined(VBOX_WINE_WITHOUT_LIBWINE)
+# error "unexpected include!!"
+#endif
 
 #ifdef __cplusplus
@@ -3429 +3433 @@
         IWineD3DResource* This);
 
+#ifdef VBOX_WITH_WDDM
+    HRESULT (STDMETHODCALLTYPE *SetDontDeleteGl)(
+        IWineD3DResource* This);
+#endif
+
     END_INTERFACE
 } IWineD3DResourceVtbl;
@@ -3451 +3460 @@
 #define IWineD3DResource_UnLoad(This) (This)->lpVtbl->UnLoad(This)
 #define IWineD3DResource_GetType(This) (This)->lpVtbl->GetType(This)
+# ifdef VBOX_WITH_WDDM
+#  define IWineD3DResource_SetDontDeleteGl(This) (This)->lpVtbl->SetDontDeleteGl(This)
+# endif
 #endif
 
@@ -4055 +4067 @@
     WINED3DRESOURCETYPE (STDMETHODCALLTYPE *GetType)(
         IWineD3DSurface* This);
+
+#ifdef VBOX_WITH_WDDM
+    HRESULT (STDMETHODCALLTYPE *SetDontDeleteGl)(
+        IWineD3DResource* This);
+#endif
 
     /*** IWineD3DSurface methods ***/
@@ -4671 +4688 @@
         IWineD3DVolume* This);
 
+#ifdef VBOX_WITH_WDDM
+    HRESULT (STDMETHODCALLTYPE *SetDontDeleteGl)(
+        IWineD3DResource* This);
+#endif
+
     /*** IWineD3DVolume methods ***/
     HRESULT (STDMETHODCALLTYPE *GetContainer)(
@@ -4884 +4906 @@
     WINED3DRESOURCETYPE (STDMETHODCALLTYPE *GetType)(
         IWineD3DBaseTexture* This);
+
+#ifdef VBOX_WITH_WDDM
+    HRESULT (STDMETHODCALLTYPE *SetDontDeleteGl)(
+        IWineD3DResource* This);
+#endif
 
     /*** IWineD3DBaseTexture methods ***/
@@ -5130 +5157 @@
     WINED3DRESOURCETYPE (STDMETHODCALLTYPE *GetType)(
         IWineD3DTexture* This);
+
+#ifdef VBOX_WITH_WDDM
+    HRESULT (STDMETHODCALLTYPE *SetDontDeleteGl)(
+        IWineD3DTexture* This);
+#endif
 
     /*** IWineD3DBaseTexture methods ***/
@@ -5377 +5409 @@
         IWineD3DCubeTexture* This);
 
+#ifdef VBOX_WITH_WDDM
+    HRESULT (STDMETHODCALLTYPE *SetDontDeleteGl)(
+        IWineD3DCubeTexture* This);
+#endif
+
     /*** IWineD3DBaseTexture methods ***/
     DWORD (STDMETHODCALLTYPE *SetLOD)(
@@ -5627 +5664 @@
         IWineD3DVolumeTexture* This);
 
+#ifdef VBOX_WITH_WDDM
+    HRESULT (STDMETHODCALLTYPE *SetDontDeleteGl)(
+        IWineD3DResource* This);
+#endif
+
     /*** IWineD3DBaseTexture methods ***/
     DWORD (STDMETHODCALLTYPE *SetLOD)(
@@ -6382 +6424 @@
     WINED3DRESOURCETYPE (STDMETHODCALLTYPE *GetType)(
         IWineD3DBuffer* This);
+
+#ifdef VBOX_WITH_WDDM
+    HRESULT (STDMETHODCALLTYPE *SetDontDeleteGl)(
+        IWineD3DResource* This);
+#endif
 
     /*** IWineD3DBuffer methods ***/