[vlc-commits] contrib:wine-headers: remove unused D3D9 features

[Steve Lhomme]

vlc | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Mon Apr 15 10:29:34 2019 +0200| [0f54074ac751448e835892b668d3138c8768f627] | committer: Steve Lhomme

contrib:wine-headers: remove unused D3D9 features

We don't use IDirect3D9ExOverlayExtension or D3DOVERLAYCAPS anymore.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=0f54074ac751448e835892b668d3138c8768f627
---

 contrib/src/wine-headers/d3d9.patch     | 45 ---------------------------------
 contrib/src/wine-headers/d3d9caps.patch | 17 -------------
 contrib/src/wine-headers/rules.mak      |  2 --
 3 files changed, 64 deletions(-)

diff --git a/contrib/src/wine-headers/d3d9.patch b/contrib/src/wine-headers/d3d9.patch
deleted file mode 100644
index 55ae38ed8a..0000000000
--- a/contrib/src/wine-headers/d3d9.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- a/include/d3d9.h	2016-04-17 11:41:20.676521300 +0300
-+++ b/include/d3d9.h	2016-04-17 12:12:13.637219200 +0300
-@@ -2185,6 +2185,42 @@ __CRT_UUID_DECL(IDirect3DDevice9Ex,
- #define IDirect3DDevice9Ex_GetDisplayModeEx(p,a,b,c)                     (p)->GetDisplayModeEx(a,b,c)
- #endif
- 
-+/*****************************************************************************
-+ * IDirect3D9ExOverlayExtension interface
-+ */
-+#define INTERFACE IDirect3D9ExOverlayExtension
-+DECLARE_INTERFACE_(IDirect3D9ExOverlayExtension,IUnknown)
-+{
-+    /*** IUnknown methods ***/
-+    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE;
-+    STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-+    STDMETHOD_(ULONG,Release)(THIS) PURE;
-+    /*** IDirect3D9ExOverlayExtension methods ***/
-+    STDMETHOD(CheckDeviceOverlayType)(THIS_ UINT Adapter, D3DDEVTYPE DevType, UINT OverlayWidth, UINT OverlayHeight,
-+            D3DFORMAT OverlayFormat, D3DDISPLAYMODEEX* pDisplayMode, D3DDISPLAYROTATION DisplayRotation, D3DOVERLAYCAPS* pOverlayCaps) PURE;
-+};
-+#undef INTERFACE
-+
-+#ifdef __CRT_UUID_DECL
-+__CRT_UUID_DECL(IDirect3D9ExOverlayExtension,                   0x187aeb13, 0xaaf5, 0x4c59, 0x87, 0x6d, 0xe0, 0x59, 0x8, 0x8c, 0xd, 0xf8);
-+#endif
-+
-+#if !defined(__cplusplus) || defined(CINTERFACE)
-+/*** IUnknown methods ***/
-+#define IDirect3D9ExOverlayExtension_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
-+#define IDirect3D9ExOverlayExtension_AddRef(p) (p)->lpVtbl->AddRef(p)
-+#define IDirect3D9ExOverlayExtension_Release(p) (p)->lpVtbl->Release(p)
-+/*** IDirect3D9ExOverlayExtension ***/
-+#define IDirect3D9ExOverlayExtension_CheckDeviceOverlayType(p,a,b,c,d,e,f,g,h) (p)->lpVtbl->CheckDeviceOverlayType(p,a,b,c,d,e,f,g,h)
-+#else
-+/*** IUnknown methods ***/
-+#define IDirect3D9ExOverlayExtension_QueryInterface(p,a,b) (p)->QueryInterface(a,b)
-+#define IDirect3D9ExOverlayExtension_AddRef(p) (p)->AddRef()
-+#define IDirect3D9ExOverlayExtension_Release(p) (p)->Release()
-+/*** IDirect3D9ExOverlayExtension ***/
-+#define IDirect3D9ExOverlayExtension_CheckDeviceOverlayType(p,a,b,c,d,e,f,g,h) (p)->CheckDeviceOverlayType(a,b,c,d,e,f,g,h)
-+#endif
-+
- #ifdef __cplusplus
- extern "C" {
- #endif  /* defined(__cplusplus) */
diff --git a/contrib/src/wine-headers/d3d9caps.patch b/contrib/src/wine-headers/d3d9caps.patch
deleted file mode 100644
index e38673b087..0000000000
--- a/contrib/src/wine-headers/d3d9caps.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/include/d3d9caps.h	2016-04-17 11:41:20.681535900 +0300
-+++ b/include/d3d9caps.h	2016-04-17 11:49:14.065736000 +0300
-@@ -399,6 +399,14 @@ typedef struct _D3DCAPS9 {
- 
- } D3DCAPS9;
- 
-+typedef struct _D3DOVERLAYCAPS {
-+  UINT                Caps;
-+  UINT                MaxOverlayDisplayWidth;
-+  UINT                MaxOverlayDisplayHeight;
-+
-+} D3DOVERLAYCAPS;
-+
-+
- #ifdef __i386__
- #include <poppack.h>
- #endif
diff --git a/contrib/src/wine-headers/rules.mak b/contrib/src/wine-headers/rules.mak
index 1f083cee4c..9705a1ce21 100644
--- a/contrib/src/wine-headers/rules.mak
+++ b/contrib/src/wine-headers/rules.mak
@@ -28,8 +28,6 @@ $(TARBALLS)/wine-$(WINE_VERSION).tar.xz:
 
 wine-headers: wine-$(WINE_VERSION).tar.xz .sum-wine-headers
 	$(UNPACK)
-	$(APPLY) $(SRC)/wine-headers/d3d9caps.patch
-	$(APPLY) $(SRC)/wine-headers/d3d9.patch
 	$(APPLY) $(SRC)/wine-headers/dxva2api.patch
 	$(APPLY) $(SRC)/wine-headers/dxgidebug.patch
 	$(APPLY) $(SRC)/wine-headers/processor_format.patch