mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2025-01-28 22:04:43 -08:00
Rebase against 1c8c9308e74abe5e5d85dfe722dea10e60092e7c
This commit is contained in:
Alistair Leslie-Hughes
parent
cea60071d1
commit
ebe4142fc3
@ -1,364 +0,0 @@
|
||||
From 3048fef5403918b832bbc75770067551d40e8851 Mon Sep 17 00:00:00 2001
|
||||
From: Sebastian Lackner <sebastian@fds-team.de>
|
||||
Date: Sat, 14 Mar 2015 04:48:38 +0100
|
||||
Subject: [PATCH] d3dx9_*: Adjust ID3DXEffect interface based on DLL version.
|
||||
|
||||
---
|
||||
dlls/d3dx9_24/Makefile.in | 1 +
|
||||
dlls/d3dx9_25/Makefile.in | 1 +
|
||||
dlls/d3dx9_26/Makefile.in | 1 +
|
||||
dlls/d3dx9_27/Makefile.in | 1 +
|
||||
dlls/d3dx9_28/Makefile.in | 1 +
|
||||
dlls/d3dx9_29/Makefile.in | 1 +
|
||||
dlls/d3dx9_30/Makefile.in | 1 +
|
||||
dlls/d3dx9_31/Makefile.in | 1 +
|
||||
dlls/d3dx9_32/Makefile.in | 1 +
|
||||
dlls/d3dx9_33/Makefile.in | 1 +
|
||||
dlls/d3dx9_34/Makefile.in | 1 +
|
||||
dlls/d3dx9_35/Makefile.in | 1 +
|
||||
dlls/d3dx9_36/Makefile.in | 1 +
|
||||
dlls/d3dx9_36/effect.c | 8 ++++++++
|
||||
dlls/d3dx9_37/Makefile.in | 1 +
|
||||
dlls/d3dx9_38/Makefile.in | 1 +
|
||||
dlls/d3dx9_39/Makefile.in | 1 +
|
||||
dlls/d3dx9_40/Makefile.in | 1 +
|
||||
dlls/d3dx9_41/Makefile.in | 1 +
|
||||
dlls/d3dx9_42/Makefile.in | 1 +
|
||||
dlls/d3dx9_43/Makefile.in | 1 +
|
||||
include/d3dx9effect.h | 12 ++++++++++++
|
||||
22 files changed, 40 insertions(+)
|
||||
|
||||
diff --git a/dlls/d3dx9_24/Makefile.in b/dlls/d3dx9_24/Makefile.in
|
||||
index 482c92d..6810b79 100644
|
||||
--- a/dlls/d3dx9_24/Makefile.in
|
||||
+++ b/dlls/d3dx9_24/Makefile.in
|
||||
@@ -1,6 +1,7 @@
|
||||
EXTRADEFS = -DD3DX_SDK_VERSION=24
|
||||
MODULE = d3dx9_24.dll
|
||||
IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
|
||||
+EXTRADEFS = -D_D3DX9_VER=24
|
||||
PARENTSRC = ../d3dx9_36
|
||||
|
||||
C_SRCS = \
|
||||
diff --git a/dlls/d3dx9_25/Makefile.in b/dlls/d3dx9_25/Makefile.in
|
||||
index be4c769..ba16d3d 100644
|
||||
--- a/dlls/d3dx9_25/Makefile.in
|
||||
+++ b/dlls/d3dx9_25/Makefile.in
|
||||
@@ -1,6 +1,7 @@
|
||||
EXTRADEFS = -DD3DX_SDK_VERSION=25
|
||||
MODULE = d3dx9_25.dll
|
||||
IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
|
||||
+EXTRADEFS = -D_D3DX9_VER=25
|
||||
PARENTSRC = ../d3dx9_36
|
||||
|
||||
C_SRCS = \
|
||||
diff --git a/dlls/d3dx9_26/Makefile.in b/dlls/d3dx9_26/Makefile.in
|
||||
index c5e9e85..dffc238 100644
|
||||
--- a/dlls/d3dx9_26/Makefile.in
|
||||
+++ b/dlls/d3dx9_26/Makefile.in
|
||||
@@ -1,6 +1,7 @@
|
||||
EXTRADEFS = -DD3DX_SDK_VERSION=26
|
||||
MODULE = d3dx9_26.dll
|
||||
IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
|
||||
+EXTRADEFS = -D_D3DX9_VER=26
|
||||
PARENTSRC = ../d3dx9_36
|
||||
|
||||
C_SRCS = \
|
||||
diff --git a/dlls/d3dx9_27/Makefile.in b/dlls/d3dx9_27/Makefile.in
|
||||
index ee7f0e2..a422308 100644
|
||||
--- a/dlls/d3dx9_27/Makefile.in
|
||||
+++ b/dlls/d3dx9_27/Makefile.in
|
||||
@@ -1,6 +1,7 @@
|
||||
EXTRADEFS = -DD3DX_SDK_VERSION=27
|
||||
MODULE = d3dx9_27.dll
|
||||
IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
|
||||
+EXTRADEFS = -D_D3DX9_VER=27
|
||||
PARENTSRC = ../d3dx9_36
|
||||
|
||||
C_SRCS = \
|
||||
diff --git a/dlls/d3dx9_28/Makefile.in b/dlls/d3dx9_28/Makefile.in
|
||||
index 0944200..73e486f 100644
|
||||
--- a/dlls/d3dx9_28/Makefile.in
|
||||
+++ b/dlls/d3dx9_28/Makefile.in
|
||||
@@ -1,6 +1,7 @@
|
||||
EXTRADEFS = -DD3DX_SDK_VERSION=28
|
||||
MODULE = d3dx9_28.dll
|
||||
IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
|
||||
+EXTRADEFS = -D_D3DX9_VER=28
|
||||
PARENTSRC = ../d3dx9_36
|
||||
|
||||
C_SRCS = \
|
||||
diff --git a/dlls/d3dx9_29/Makefile.in b/dlls/d3dx9_29/Makefile.in
|
||||
index 88cb110..5c3cf37 100644
|
||||
--- a/dlls/d3dx9_29/Makefile.in
|
||||
+++ b/dlls/d3dx9_29/Makefile.in
|
||||
@@ -1,6 +1,7 @@
|
||||
EXTRADEFS = -DD3DX_SDK_VERSION=29
|
||||
MODULE = d3dx9_29.dll
|
||||
IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
|
||||
+EXTRADEFS = -D_D3DX9_VER=29
|
||||
PARENTSRC = ../d3dx9_36
|
||||
|
||||
C_SRCS = \
|
||||
diff --git a/dlls/d3dx9_30/Makefile.in b/dlls/d3dx9_30/Makefile.in
|
||||
index 6ab2ff2..285ae2c 100644
|
||||
--- a/dlls/d3dx9_30/Makefile.in
|
||||
+++ b/dlls/d3dx9_30/Makefile.in
|
||||
@@ -1,6 +1,7 @@
|
||||
EXTRADEFS = -DD3DX_SDK_VERSION=30
|
||||
MODULE = d3dx9_30.dll
|
||||
IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
|
||||
+EXTRADEFS = -D_D3DX9_VER=30
|
||||
PARENTSRC = ../d3dx9_36
|
||||
|
||||
C_SRCS = \
|
||||
diff --git a/dlls/d3dx9_31/Makefile.in b/dlls/d3dx9_31/Makefile.in
|
||||
index 3d44da1..bc66d2f 100644
|
||||
--- a/dlls/d3dx9_31/Makefile.in
|
||||
+++ b/dlls/d3dx9_31/Makefile.in
|
||||
@@ -1,6 +1,7 @@
|
||||
EXTRADEFS = -DD3DX_SDK_VERSION=31
|
||||
MODULE = d3dx9_31.dll
|
||||
IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
|
||||
+EXTRADEFS = -D_D3DX9_VER=31
|
||||
PARENTSRC = ../d3dx9_36
|
||||
|
||||
C_SRCS = \
|
||||
diff --git a/dlls/d3dx9_32/Makefile.in b/dlls/d3dx9_32/Makefile.in
|
||||
index 37cc279..a4a9ecb 100644
|
||||
--- a/dlls/d3dx9_32/Makefile.in
|
||||
+++ b/dlls/d3dx9_32/Makefile.in
|
||||
@@ -1,6 +1,7 @@
|
||||
EXTRADEFS = -DD3DX_SDK_VERSION=32
|
||||
MODULE = d3dx9_32.dll
|
||||
IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
|
||||
+EXTRADEFS = -D_D3DX9_VER=32
|
||||
PARENTSRC = ../d3dx9_36
|
||||
|
||||
C_SRCS = \
|
||||
diff --git a/dlls/d3dx9_33/Makefile.in b/dlls/d3dx9_33/Makefile.in
|
||||
index 5b03ec1..32a78c3 100644
|
||||
--- a/dlls/d3dx9_33/Makefile.in
|
||||
+++ b/dlls/d3dx9_33/Makefile.in
|
||||
@@ -1,6 +1,7 @@
|
||||
EXTRADEFS = -DD3DX_SDK_VERSION=33
|
||||
MODULE = d3dx9_33.dll
|
||||
IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
|
||||
+EXTRADEFS = -D_D3DX9_VER=33
|
||||
PARENTSRC = ../d3dx9_36
|
||||
|
||||
C_SRCS = \
|
||||
diff --git a/dlls/d3dx9_34/Makefile.in b/dlls/d3dx9_34/Makefile.in
|
||||
index b7f9c46..714518e 100644
|
||||
--- a/dlls/d3dx9_34/Makefile.in
|
||||
+++ b/dlls/d3dx9_34/Makefile.in
|
||||
@@ -1,6 +1,7 @@
|
||||
EXTRADEFS = -DD3DX_SDK_VERSION=34
|
||||
MODULE = d3dx9_34.dll
|
||||
IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
|
||||
+EXTRADEFS = -D_D3DX9_VER=34
|
||||
PARENTSRC = ../d3dx9_36
|
||||
|
||||
C_SRCS = \
|
||||
diff --git a/dlls/d3dx9_35/Makefile.in b/dlls/d3dx9_35/Makefile.in
|
||||
index 9c196ea..0a1b681 100644
|
||||
--- a/dlls/d3dx9_35/Makefile.in
|
||||
+++ b/dlls/d3dx9_35/Makefile.in
|
||||
@@ -1,6 +1,7 @@
|
||||
EXTRADEFS = -DD3DX_SDK_VERSION=35
|
||||
MODULE = d3dx9_35.dll
|
||||
IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
|
||||
+EXTRADEFS = -D_D3DX9_VER=35
|
||||
PARENTSRC = ../d3dx9_36
|
||||
|
||||
C_SRCS = \
|
||||
diff --git a/dlls/d3dx9_36/Makefile.in b/dlls/d3dx9_36/Makefile.in
|
||||
index da8098d..6bb605d 100644
|
||||
--- a/dlls/d3dx9_36/Makefile.in
|
||||
+++ b/dlls/d3dx9_36/Makefile.in
|
||||
@@ -2,6 +2,7 @@ EXTRADEFS = -DD3DX_SDK_VERSION=36
|
||||
MODULE = d3dx9_36.dll
|
||||
IMPORTLIB = d3dx9
|
||||
IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
|
||||
+EXTRADEFS = -D_D3DX9_VER=36
|
||||
|
||||
C_SRCS = \
|
||||
animation.c \
|
||||
diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c
|
||||
index f8c4803..cd6c00f 100644
|
||||
--- a/dlls/d3dx9_36/effect.c
|
||||
+++ b/dlls/d3dx9_36/effect.c
|
||||
@@ -4351,6 +4351,7 @@ static HRESULT WINAPI ID3DXEffectImpl_ApplyParameterBlock(ID3DXEffect* iface, D3
|
||||
return E_NOTIMPL;
|
||||
}
|
||||
|
||||
+#if _D3DX9_VER >= 26
|
||||
static HRESULT WINAPI ID3DXEffectImpl_DeleteParameterBlock(ID3DXEffect* iface, D3DXHANDLE parameter_block)
|
||||
{
|
||||
struct ID3DXEffectImpl *This = impl_from_ID3DXEffect(iface);
|
||||
@@ -4359,6 +4360,7 @@ static HRESULT WINAPI ID3DXEffectImpl_DeleteParameterBlock(ID3DXEffect* iface, D
|
||||
|
||||
return E_NOTIMPL;
|
||||
}
|
||||
+#endif
|
||||
|
||||
static HRESULT WINAPI ID3DXEffectImpl_CloneEffect(ID3DXEffect *iface,
|
||||
struct IDirect3DDevice9 *device, struct ID3DXEffect **effect)
|
||||
@@ -4370,6 +4372,7 @@ static HRESULT WINAPI ID3DXEffectImpl_CloneEffect(ID3DXEffect *iface,
|
||||
return E_NOTIMPL;
|
||||
}
|
||||
|
||||
+#if _D3DX9_VER >= 27
|
||||
static HRESULT WINAPI ID3DXEffectImpl_SetRawValue(ID3DXEffect *iface,
|
||||
D3DXHANDLE parameter, const void *data, UINT byte_offset, UINT bytes)
|
||||
{
|
||||
@@ -4378,6 +4381,7 @@ static HRESULT WINAPI ID3DXEffectImpl_SetRawValue(ID3DXEffect *iface,
|
||||
|
||||
return E_NOTIMPL;
|
||||
}
|
||||
+#endif
|
||||
|
||||
static const struct ID3DXEffectVtbl ID3DXEffect_Vtbl =
|
||||
{
|
||||
@@ -4460,9 +4464,13 @@ static const struct ID3DXEffectVtbl ID3DXEffect_Vtbl =
|
||||
ID3DXEffectImpl_BeginParameterBlock,
|
||||
ID3DXEffectImpl_EndParameterBlock,
|
||||
ID3DXEffectImpl_ApplyParameterBlock,
|
||||
+#if _D3DX9_VER >= 26
|
||||
ID3DXEffectImpl_DeleteParameterBlock,
|
||||
+#endif
|
||||
ID3DXEffectImpl_CloneEffect,
|
||||
+#if _D3DX9_VER >= 27
|
||||
ID3DXEffectImpl_SetRawValue
|
||||
+#endif
|
||||
};
|
||||
|
||||
static inline struct ID3DXEffectCompilerImpl *impl_from_ID3DXEffectCompiler(ID3DXEffectCompiler *iface)
|
||||
diff --git a/dlls/d3dx9_37/Makefile.in b/dlls/d3dx9_37/Makefile.in
|
||||
index ab790a4..01df6b4 100644
|
||||
--- a/dlls/d3dx9_37/Makefile.in
|
||||
+++ b/dlls/d3dx9_37/Makefile.in
|
||||
@@ -1,6 +1,7 @@
|
||||
EXTRADEFS = -DD3DX_SDK_VERSION=37
|
||||
MODULE = d3dx9_37.dll
|
||||
IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
|
||||
+EXTRADEFS = -D_D3DX9_VER=37
|
||||
PARENTSRC = ../d3dx9_36
|
||||
|
||||
C_SRCS = \
|
||||
diff --git a/dlls/d3dx9_38/Makefile.in b/dlls/d3dx9_38/Makefile.in
|
||||
index 6125c2d..089abd5 100644
|
||||
--- a/dlls/d3dx9_38/Makefile.in
|
||||
+++ b/dlls/d3dx9_38/Makefile.in
|
||||
@@ -1,6 +1,7 @@
|
||||
EXTRADEFS = -DD3DX_SDK_VERSION=38
|
||||
MODULE = d3dx9_38.dll
|
||||
IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
|
||||
+EXTRADEFS = -D_D3DX9_VER=38
|
||||
PARENTSRC = ../d3dx9_36
|
||||
|
||||
C_SRCS = \
|
||||
diff --git a/dlls/d3dx9_39/Makefile.in b/dlls/d3dx9_39/Makefile.in
|
||||
index d97a787..21071cc 100644
|
||||
--- a/dlls/d3dx9_39/Makefile.in
|
||||
+++ b/dlls/d3dx9_39/Makefile.in
|
||||
@@ -1,6 +1,7 @@
|
||||
EXTRADEFS = -DD3DX_SDK_VERSION=39
|
||||
MODULE = d3dx9_39.dll
|
||||
IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
|
||||
+EXTRADEFS = -D_D3DX9_VER=39
|
||||
PARENTSRC = ../d3dx9_36
|
||||
|
||||
C_SRCS = \
|
||||
diff --git a/dlls/d3dx9_40/Makefile.in b/dlls/d3dx9_40/Makefile.in
|
||||
index 36c5a21..6f08759 100644
|
||||
--- a/dlls/d3dx9_40/Makefile.in
|
||||
+++ b/dlls/d3dx9_40/Makefile.in
|
||||
@@ -1,6 +1,7 @@
|
||||
EXTRADEFS = -DD3DX_SDK_VERSION=40
|
||||
MODULE = d3dx9_40.dll
|
||||
IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
|
||||
+EXTRADEFS = -D_D3DX9_VER=40
|
||||
PARENTSRC = ../d3dx9_36
|
||||
|
||||
C_SRCS = \
|
||||
diff --git a/dlls/d3dx9_41/Makefile.in b/dlls/d3dx9_41/Makefile.in
|
||||
index d4552cf..9c1baab 100644
|
||||
--- a/dlls/d3dx9_41/Makefile.in
|
||||
+++ b/dlls/d3dx9_41/Makefile.in
|
||||
@@ -1,6 +1,7 @@
|
||||
EXTRADEFS = -DD3DX_SDK_VERSION=41
|
||||
MODULE = d3dx9_41.dll
|
||||
IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
|
||||
+EXTRADEFS = -D_D3DX9_VER=41
|
||||
PARENTSRC = ../d3dx9_36
|
||||
|
||||
C_SRCS = \
|
||||
diff --git a/dlls/d3dx9_42/Makefile.in b/dlls/d3dx9_42/Makefile.in
|
||||
index 5806fce..a843d1b 100644
|
||||
--- a/dlls/d3dx9_42/Makefile.in
|
||||
+++ b/dlls/d3dx9_42/Makefile.in
|
||||
@@ -1,6 +1,7 @@
|
||||
EXTRADEFS = -DD3DX_SDK_VERSION=42
|
||||
MODULE = d3dx9_42.dll
|
||||
IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
|
||||
+EXTRADEFS = -D_D3DX9_VER=42
|
||||
PARENTSRC = ../d3dx9_36
|
||||
|
||||
C_SRCS = \
|
||||
diff --git a/dlls/d3dx9_43/Makefile.in b/dlls/d3dx9_43/Makefile.in
|
||||
index 72ba8b4..d0f1b9f 100644
|
||||
--- a/dlls/d3dx9_43/Makefile.in
|
||||
+++ b/dlls/d3dx9_43/Makefile.in
|
||||
@@ -1,6 +1,7 @@
|
||||
EXTRADEFS = -DD3DX_SDK_VERSION=43
|
||||
MODULE = d3dx9_43.dll
|
||||
IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
|
||||
+EXTRADEFS = -D_D3DX9_VER=43
|
||||
PARENTSRC = ../d3dx9_36
|
||||
|
||||
C_SRCS = \
|
||||
diff --git a/include/d3dx9effect.h b/include/d3dx9effect.h
|
||||
index 8235794..83e19cf 100644
|
||||
--- a/include/d3dx9effect.h
|
||||
+++ b/include/d3dx9effect.h
|
||||
@@ -1,5 +1,6 @@
|
||||
/*
|
||||
* Copyright 2010 Christian Costa
|
||||
+ * Copyright 2015 Sebastian Lackner
|
||||
*
|
||||
* This library is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU Lesser General Public
|
||||
@@ -197,7 +198,13 @@ DECLARE_INTERFACE_(ID3DXEffectStateManager, IUnknown)
|
||||
|
||||
typedef struct ID3DXEffect *LPD3DXEFFECT;
|
||||
|
||||
+#if defined(_D3DX9_VER) && _D3DX9_VER <= 25
|
||||
+DEFINE_GUID(IID_ID3DXEffect, 0xd165ccb1, 0x62b0, 0x4a33, 0xb3, 0xfa, 0xa9, 0x23, 0x0, 0x30, 0x5a, 0x11);
|
||||
+#elif defined(_D3DX9_VER) && _D3DX9_VER == 26
|
||||
+DEFINE_GUID(IID_ID3DXEffect, 0xc7b17651, 0x5420, 0x490e, 0x8a, 0x7f, 0x92, 0x36, 0x75, 0xa2, 0xd6, 0x87);
|
||||
+#else
|
||||
DEFINE_GUID(IID_ID3DXEffect, 0xf6ceb4b3, 0x4e4c, 0x40dd, 0xb8, 0x83, 0x8d, 0x8d, 0xe5, 0xea, 0xc, 0xd5);
|
||||
+#endif
|
||||
|
||||
#define INTERFACE ID3DXEffect
|
||||
|
||||
@@ -282,10 +289,15 @@ DECLARE_INTERFACE_(ID3DXEffect, ID3DXBaseEffect)
|
||||
STDMETHOD(BeginParameterBlock)(THIS) PURE;
|
||||
STDMETHOD_(D3DXHANDLE, EndParameterBlock)(THIS) PURE;
|
||||
STDMETHOD(ApplyParameterBlock)(THIS_ D3DXHANDLE parameter_block) PURE;
|
||||
+#if !defined(_D3DX9_VER) || _D3DX9_VER >= 26
|
||||
STDMETHOD(DeleteParameterBlock)(THIS_ D3DXHANDLE parameter_block) PURE;
|
||||
+#endif
|
||||
STDMETHOD(CloneEffect)(THIS_ struct IDirect3DDevice9 *device, struct ID3DXEffect **effect) PURE;
|
||||
+#if !defined(_D3DX9_VER) || _D3DX9_VER >= 27
|
||||
STDMETHOD(SetRawValue)(THIS_ D3DXHANDLE parameter, const void *data, UINT byte_offset, UINT bytes) PURE;
|
||||
+#endif
|
||||
};
|
||||
+
|
||||
#undef INTERFACE
|
||||
|
||||
typedef struct ID3DXEffectCompiler *LPD3DXEFFECTCOMPILER;
|
||||
--
|
||||
1.9.1
|
||||
|
||||
@ -1,2 +0,0 @@
|
||||
Fixes: [25138] Fix wrong version of ID3DXEffect interface for d3dx9_25
|
||||
Fixes: Fix wrong version of ID3DXEffect interface for d3dx9_24
|
||||
@ -1,4 +1,4 @@
|
||||
From 9d0ef03a1986a1dc29ff6b509d21183725617e93 Mon Sep 17 00:00:00 2001
|
||||
From a625d57a2c3d125604ec3c8fe1381ed2df3d72ac Mon Sep 17 00:00:00 2001
|
||||
From: Sebastian Lackner <sebastian@fds-team.de>
|
||||
Date: Mon, 16 Mar 2015 08:18:33 +0100
|
||||
Subject: [PATCH] d3dx9_36: Improve stub for ID3DXEffectImpl_CloneEffect.
|
||||
@ -8,10 +8,10 @@ Subject: [PATCH] d3dx9_36: Improve stub for ID3DXEffectImpl_CloneEffect.
|
||||
1 file changed, 3 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c
|
||||
index 965caa8..5160f3a 100644
|
||||
index 87eaf86..fd4635e 100644
|
||||
--- a/dlls/d3dx9_36/effect.c
|
||||
+++ b/dlls/d3dx9_36/effect.c
|
||||
@@ -4378,7 +4378,9 @@ static HRESULT WINAPI ID3DXEffectImpl_CloneEffect(ID3DXEffect *iface,
|
||||
@@ -4381,7 +4381,9 @@ static HRESULT WINAPI ID3DXEffectImpl_CloneEffect(ID3DXEffect *iface,
|
||||
if (!device)
|
||||
return D3DERR_INVALIDCALL;
|
||||
|
||||
@ -21,7 +21,7 @@ index 965caa8..5160f3a 100644
|
||||
+ return S_OK;
|
||||
}
|
||||
|
||||
#if _D3DX9_VER >= 27
|
||||
#if D3DX_SDK_VERSION >= 27
|
||||
--
|
||||
1.9.1
|
||||
|
||||
|
||||
@ -1,2 +1 @@
|
||||
Fixes: [44635] Improve stub for ID3DXEffectImpl_CloneEffect
|
||||
Depends: d3dx9_25-ID3DXEffect
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From 33854851913e9046eb6ea4cd765a2f0026729f07 Mon Sep 17 00:00:00 2001
|
||||
From 46fa101a9cab46e4a0ed28e8cb9e4e199b0a0f81 Mon Sep 17 00:00:00 2001
|
||||
From: Christian Costa <titan.costa@gmail.com>
|
||||
Date: Sat, 1 Nov 2014 13:08:05 +0100
|
||||
Subject: d3dx9_36: Add dxtn support.
|
||||
Subject: [PATCH] d3dx9_36: Add dxtn support.
|
||||
|
||||
---
|
||||
dlls/d3dx9_24/Makefile.in | 2 +-
|
||||
@ -29,7 +29,7 @@ Subject: d3dx9_36: Add dxtn support.
|
||||
22 files changed, 120 insertions(+), 31 deletions(-)
|
||||
|
||||
diff --git a/dlls/d3dx9_24/Makefile.in b/dlls/d3dx9_24/Makefile.in
|
||||
index 6810b79..6a9e51e 100644
|
||||
index 482c92d..d969a55 100644
|
||||
--- a/dlls/d3dx9_24/Makefile.in
|
||||
+++ b/dlls/d3dx9_24/Makefile.in
|
||||
@@ -1,6 +1,6 @@
|
||||
@ -37,11 +37,11 @@ index 6810b79..6a9e51e 100644
|
||||
MODULE = d3dx9_24.dll
|
||||
-IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
|
||||
+IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 wined3d
|
||||
EXTRADEFS = -D_D3DX9_VER=24
|
||||
PARENTSRC = ../d3dx9_36
|
||||
|
||||
C_SRCS = \
|
||||
diff --git a/dlls/d3dx9_25/Makefile.in b/dlls/d3dx9_25/Makefile.in
|
||||
index ba16d3d..bdaf982 100644
|
||||
index be4c769..b232290 100644
|
||||
--- a/dlls/d3dx9_25/Makefile.in
|
||||
+++ b/dlls/d3dx9_25/Makefile.in
|
||||
@@ -1,6 +1,6 @@
|
||||
@ -49,11 +49,11 @@ index ba16d3d..bdaf982 100644
|
||||
MODULE = d3dx9_25.dll
|
||||
-IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
|
||||
+IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 wined3d
|
||||
EXTRADEFS = -D_D3DX9_VER=25
|
||||
PARENTSRC = ../d3dx9_36
|
||||
|
||||
C_SRCS = \
|
||||
diff --git a/dlls/d3dx9_26/Makefile.in b/dlls/d3dx9_26/Makefile.in
|
||||
index dffc238..f62fda5 100644
|
||||
index c5e9e85..525009d 100644
|
||||
--- a/dlls/d3dx9_26/Makefile.in
|
||||
+++ b/dlls/d3dx9_26/Makefile.in
|
||||
@@ -1,6 +1,6 @@
|
||||
@ -61,11 +61,11 @@ index dffc238..f62fda5 100644
|
||||
MODULE = d3dx9_26.dll
|
||||
-IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
|
||||
+IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 wined3d
|
||||
EXTRADEFS = -D_D3DX9_VER=26
|
||||
PARENTSRC = ../d3dx9_36
|
||||
|
||||
C_SRCS = \
|
||||
diff --git a/dlls/d3dx9_27/Makefile.in b/dlls/d3dx9_27/Makefile.in
|
||||
index a422308..dc6a8e3 100644
|
||||
index ee7f0e2..da98482 100644
|
||||
--- a/dlls/d3dx9_27/Makefile.in
|
||||
+++ b/dlls/d3dx9_27/Makefile.in
|
||||
@@ -1,6 +1,6 @@
|
||||
@ -73,11 +73,11 @@ index a422308..dc6a8e3 100644
|
||||
MODULE = d3dx9_27.dll
|
||||
-IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
|
||||
+IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 wined3d
|
||||
EXTRADEFS = -D_D3DX9_VER=27
|
||||
PARENTSRC = ../d3dx9_36
|
||||
|
||||
C_SRCS = \
|
||||
diff --git a/dlls/d3dx9_28/Makefile.in b/dlls/d3dx9_28/Makefile.in
|
||||
index 73e486f..f331b3a 100644
|
||||
index 0944200..d50e035 100644
|
||||
--- a/dlls/d3dx9_28/Makefile.in
|
||||
+++ b/dlls/d3dx9_28/Makefile.in
|
||||
@@ -1,6 +1,6 @@
|
||||
@ -85,11 +85,11 @@ index 73e486f..f331b3a 100644
|
||||
MODULE = d3dx9_28.dll
|
||||
-IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
|
||||
+IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 wined3d
|
||||
EXTRADEFS = -D_D3DX9_VER=28
|
||||
PARENTSRC = ../d3dx9_36
|
||||
|
||||
C_SRCS = \
|
||||
diff --git a/dlls/d3dx9_29/Makefile.in b/dlls/d3dx9_29/Makefile.in
|
||||
index 5c3cf37..98038a1 100644
|
||||
index 88cb110..cfc1a15 100644
|
||||
--- a/dlls/d3dx9_29/Makefile.in
|
||||
+++ b/dlls/d3dx9_29/Makefile.in
|
||||
@@ -1,6 +1,6 @@
|
||||
@ -97,11 +97,11 @@ index 5c3cf37..98038a1 100644
|
||||
MODULE = d3dx9_29.dll
|
||||
-IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
|
||||
+IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 wined3d
|
||||
EXTRADEFS = -D_D3DX9_VER=29
|
||||
PARENTSRC = ../d3dx9_36
|
||||
|
||||
C_SRCS = \
|
||||
diff --git a/dlls/d3dx9_30/Makefile.in b/dlls/d3dx9_30/Makefile.in
|
||||
index 285ae2c..8d04f99 100644
|
||||
index 6ab2ff2..726c92e 100644
|
||||
--- a/dlls/d3dx9_30/Makefile.in
|
||||
+++ b/dlls/d3dx9_30/Makefile.in
|
||||
@@ -1,6 +1,6 @@
|
||||
@ -109,11 +109,11 @@ index 285ae2c..8d04f99 100644
|
||||
MODULE = d3dx9_30.dll
|
||||
-IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
|
||||
+IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 wined3d
|
||||
EXTRADEFS = -D_D3DX9_VER=30
|
||||
PARENTSRC = ../d3dx9_36
|
||||
|
||||
C_SRCS = \
|
||||
diff --git a/dlls/d3dx9_31/Makefile.in b/dlls/d3dx9_31/Makefile.in
|
||||
index bc66d2f..4142f42 100644
|
||||
index 3d44da1..2014301 100644
|
||||
--- a/dlls/d3dx9_31/Makefile.in
|
||||
+++ b/dlls/d3dx9_31/Makefile.in
|
||||
@@ -1,6 +1,6 @@
|
||||
@ -121,11 +121,11 @@ index bc66d2f..4142f42 100644
|
||||
MODULE = d3dx9_31.dll
|
||||
-IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
|
||||
+IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 wined3d
|
||||
EXTRADEFS = -D_D3DX9_VER=31
|
||||
PARENTSRC = ../d3dx9_36
|
||||
|
||||
C_SRCS = \
|
||||
diff --git a/dlls/d3dx9_32/Makefile.in b/dlls/d3dx9_32/Makefile.in
|
||||
index a4a9ecb..75a7b18 100644
|
||||
index 37cc279..442258d 100644
|
||||
--- a/dlls/d3dx9_32/Makefile.in
|
||||
+++ b/dlls/d3dx9_32/Makefile.in
|
||||
@@ -1,6 +1,6 @@
|
||||
@ -133,11 +133,11 @@ index a4a9ecb..75a7b18 100644
|
||||
MODULE = d3dx9_32.dll
|
||||
-IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
|
||||
+IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 wined3d
|
||||
EXTRADEFS = -D_D3DX9_VER=32
|
||||
PARENTSRC = ../d3dx9_36
|
||||
|
||||
C_SRCS = \
|
||||
diff --git a/dlls/d3dx9_33/Makefile.in b/dlls/d3dx9_33/Makefile.in
|
||||
index 32a78c3..ffe9bdb 100644
|
||||
index 5b03ec1..cc98ed2 100644
|
||||
--- a/dlls/d3dx9_33/Makefile.in
|
||||
+++ b/dlls/d3dx9_33/Makefile.in
|
||||
@@ -1,6 +1,6 @@
|
||||
@ -145,11 +145,11 @@ index 32a78c3..ffe9bdb 100644
|
||||
MODULE = d3dx9_33.dll
|
||||
-IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
|
||||
+IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 wined3d
|
||||
EXTRADEFS = -D_D3DX9_VER=33
|
||||
PARENTSRC = ../d3dx9_36
|
||||
|
||||
C_SRCS = \
|
||||
diff --git a/dlls/d3dx9_34/Makefile.in b/dlls/d3dx9_34/Makefile.in
|
||||
index 714518e..74eea4a 100644
|
||||
index b7f9c46..4862fe9 100644
|
||||
--- a/dlls/d3dx9_34/Makefile.in
|
||||
+++ b/dlls/d3dx9_34/Makefile.in
|
||||
@@ -1,6 +1,6 @@
|
||||
@ -157,11 +157,11 @@ index 714518e..74eea4a 100644
|
||||
MODULE = d3dx9_34.dll
|
||||
-IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
|
||||
+IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 wined3d
|
||||
EXTRADEFS = -D_D3DX9_VER=34
|
||||
PARENTSRC = ../d3dx9_36
|
||||
|
||||
C_SRCS = \
|
||||
diff --git a/dlls/d3dx9_35/Makefile.in b/dlls/d3dx9_35/Makefile.in
|
||||
index 0a1b681..be66d97 100644
|
||||
index 9c196ea..3f529c9 100644
|
||||
--- a/dlls/d3dx9_35/Makefile.in
|
||||
+++ b/dlls/d3dx9_35/Makefile.in
|
||||
@@ -1,6 +1,6 @@
|
||||
@ -169,11 +169,11 @@ index 0a1b681..be66d97 100644
|
||||
MODULE = d3dx9_35.dll
|
||||
-IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
|
||||
+IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 wined3d
|
||||
EXTRADEFS = -D_D3DX9_VER=35
|
||||
PARENTSRC = ../d3dx9_36
|
||||
|
||||
C_SRCS = \
|
||||
diff --git a/dlls/d3dx9_36/Makefile.in b/dlls/d3dx9_36/Makefile.in
|
||||
index 6bb605d..74c8cae 100644
|
||||
index da8098d..166031e 100644
|
||||
--- a/dlls/d3dx9_36/Makefile.in
|
||||
+++ b/dlls/d3dx9_36/Makefile.in
|
||||
@@ -1,7 +1,7 @@
|
||||
@ -182,11 +182,11 @@ index 6bb605d..74c8cae 100644
|
||||
IMPORTLIB = d3dx9
|
||||
-IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
|
||||
+IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 wined3d
|
||||
EXTRADEFS = -D_D3DX9_VER=36
|
||||
|
||||
C_SRCS = \
|
||||
animation.c \
|
||||
diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c
|
||||
index fc747799d6d..f851e74ee76 100644
|
||||
index d1af90c..a1e56bd 100644
|
||||
--- a/dlls/d3dx9_36/surface.c
|
||||
+++ b/dlls/d3dx9_36/surface.c
|
||||
@@ -27,6 +27,8 @@
|
||||
@ -198,7 +198,7 @@ index fc747799d6d..f851e74ee76 100644
|
||||
WINE_DEFAULT_DEBUG_CHANNEL(d3dx);
|
||||
|
||||
|
||||
@@ -1715,6 +1717,27 @@ void point_filter_argb_pixels(const BYTE *src, UINT src_row_pitch, UINT src_slic
|
||||
@@ -1817,6 +1819,27 @@ void point_filter_argb_pixels(const BYTE *src, UINT src_row_pitch, UINT src_slic
|
||||
}
|
||||
}
|
||||
|
||||
@ -226,7 +226,7 @@ index fc747799d6d..f851e74ee76 100644
|
||||
/************************************************************
|
||||
* D3DXLoadSurfaceFromMemory
|
||||
*
|
||||
@@ -1756,6 +1779,7 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(IDirect3DSurface9 *dst_surface,
|
||||
@@ -1858,6 +1881,7 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(IDirect3DSurface9 *dst_surface,
|
||||
D3DSURFACE_DESC surfdesc;
|
||||
D3DLOCKED_RECT lockrect;
|
||||
struct volume src_size, dst_size;
|
||||
@ -234,7 +234,7 @@ index fc747799d6d..f851e74ee76 100644
|
||||
|
||||
TRACE("(%p, %p, %s, %p, %#x, %u, %p, %s, %#x, 0x%08x)\n",
|
||||
dst_surface, dst_palette, wine_dbgstr_rect(dst_rect), src_memory, src_format,
|
||||
@@ -1837,8 +1861,15 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(IDirect3DSurface9 *dst_surface,
|
||||
@@ -1939,8 +1963,15 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(IDirect3DSurface9 *dst_surface,
|
||||
}
|
||||
else /* Stretching or format conversion. */
|
||||
{
|
||||
@ -252,7 +252,7 @@ index fc747799d6d..f851e74ee76 100644
|
||||
{
|
||||
FIXME("Unsupported format conversion %#x -> %#x.\n", src_format, surfdesc.Format);
|
||||
return E_NOTIMPL;
|
||||
@@ -1847,10 +1878,52 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(IDirect3DSurface9 *dst_surface,
|
||||
@@ -1949,10 +1980,52 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(IDirect3DSurface9 *dst_surface,
|
||||
if (FAILED(IDirect3DSurface9_LockRect(dst_surface, &lockrect, dst_rect, 0)))
|
||||
return D3DXERR_INVALIDDATA;
|
||||
|
||||
@ -307,7 +307,7 @@ index fc747799d6d..f851e74ee76 100644
|
||||
}
|
||||
else /* if ((filter & 0xf) == D3DX_FILTER_POINT) */
|
||||
{
|
||||
@@ -1859,14 +1932,30 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(IDirect3DSurface9 *dst_surface,
|
||||
@@ -1961,14 +2034,30 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(IDirect3DSurface9 *dst_surface,
|
||||
|
||||
/* Always apply a point filter until D3DX_FILTER_LINEAR,
|
||||
* D3DX_FILTER_TRIANGLE and D3DX_FILTER_BOX are implemented. */
|
||||
@ -342,10 +342,10 @@ index fc747799d6d..f851e74ee76 100644
|
||||
|
||||
/************************************************************
|
||||
diff --git a/dlls/d3dx9_36/tests/surface.c b/dlls/d3dx9_36/tests/surface.c
|
||||
index f2855e8ddb8..2be48dfddab 100644
|
||||
index 753b302..680f59c 100644
|
||||
--- a/dlls/d3dx9_36/tests/surface.c
|
||||
+++ b/dlls/d3dx9_36/tests/surface.c
|
||||
@@ -1174,7 +1174,7 @@ static void test_D3DXLoadSurface(IDirect3DDevice9 *device)
|
||||
@@ -1205,7 +1205,7 @@ static void test_D3DXLoadSurface(IDirect3DDevice9 *device)
|
||||
hr = IDirect3DTexture9_GetSurfaceLevel(tex, 0, &newsurf);
|
||||
ok(SUCCEEDED(hr), "Failed to get the surface, hr %#x.\n", hr);
|
||||
hr = D3DXLoadSurfaceFromSurface(newsurf, NULL, NULL, surf, NULL, NULL, D3DX_FILTER_NONE, 0);
|
||||
@ -354,7 +354,7 @@ index f2855e8ddb8..2be48dfddab 100644
|
||||
check_release((IUnknown*)newsurf, 1);
|
||||
check_release((IUnknown*)tex, 0);
|
||||
}
|
||||
@@ -1200,7 +1200,7 @@ static void test_D3DXLoadSurface(IDirect3DDevice9 *device)
|
||||
@@ -1231,7 +1231,7 @@ static void test_D3DXLoadSurface(IDirect3DDevice9 *device)
|
||||
hr = IDirect3DTexture9_GetSurfaceLevel(tex, 0, &newsurf);
|
||||
ok(SUCCEEDED(hr), "Failed to get the surface, hr %#x.\n", hr);
|
||||
hr = D3DXLoadSurfaceFromSurface(newsurf, NULL, NULL, surf, NULL, NULL, D3DX_FILTER_NONE, 0);
|
||||
@ -363,7 +363,7 @@ index f2855e8ddb8..2be48dfddab 100644
|
||||
check_release((IUnknown*)newsurf, 1);
|
||||
check_release((IUnknown*)tex, 0);
|
||||
}
|
||||
@@ -1213,10 +1213,10 @@ static void test_D3DXLoadSurface(IDirect3DDevice9 *device)
|
||||
@@ -1244,10 +1244,10 @@ static void test_D3DXLoadSurface(IDirect3DDevice9 *device)
|
||||
hr = IDirect3DTexture9_GetSurfaceLevel(tex, 0, &newsurf);
|
||||
ok(SUCCEEDED(hr), "Failed to get the surface, hr %#x.\n", hr);
|
||||
hr = D3DXLoadSurfaceFromSurface(newsurf, NULL, NULL, surf, NULL, NULL, D3DX_FILTER_NONE, 0);
|
||||
@ -377,7 +377,7 @@ index f2855e8ddb8..2be48dfddab 100644
|
||||
check_release((IUnknown*)newsurf, 1);
|
||||
check_release((IUnknown*)tex, 0);
|
||||
diff --git a/dlls/d3dx9_37/Makefile.in b/dlls/d3dx9_37/Makefile.in
|
||||
index 01df6b4..9aaf338 100644
|
||||
index ab790a4..51382c7 100644
|
||||
--- a/dlls/d3dx9_37/Makefile.in
|
||||
+++ b/dlls/d3dx9_37/Makefile.in
|
||||
@@ -1,6 +1,6 @@
|
||||
@ -385,11 +385,11 @@ index 01df6b4..9aaf338 100644
|
||||
MODULE = d3dx9_37.dll
|
||||
-IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
|
||||
+IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 wined3d
|
||||
EXTRADEFS = -D_D3DX9_VER=37
|
||||
PARENTSRC = ../d3dx9_36
|
||||
|
||||
C_SRCS = \
|
||||
diff --git a/dlls/d3dx9_38/Makefile.in b/dlls/d3dx9_38/Makefile.in
|
||||
index 089abd5..86d9846 100644
|
||||
index 6125c2d..f6257cb 100644
|
||||
--- a/dlls/d3dx9_38/Makefile.in
|
||||
+++ b/dlls/d3dx9_38/Makefile.in
|
||||
@@ -1,6 +1,6 @@
|
||||
@ -397,11 +397,11 @@ index 089abd5..86d9846 100644
|
||||
MODULE = d3dx9_38.dll
|
||||
-IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
|
||||
+IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 wined3d
|
||||
EXTRADEFS = -D_D3DX9_VER=38
|
||||
PARENTSRC = ../d3dx9_36
|
||||
|
||||
C_SRCS = \
|
||||
diff --git a/dlls/d3dx9_39/Makefile.in b/dlls/d3dx9_39/Makefile.in
|
||||
index 21071cc..0431693 100644
|
||||
index d97a787..a68ee9f 100644
|
||||
--- a/dlls/d3dx9_39/Makefile.in
|
||||
+++ b/dlls/d3dx9_39/Makefile.in
|
||||
@@ -1,6 +1,6 @@
|
||||
@ -409,11 +409,11 @@ index 21071cc..0431693 100644
|
||||
MODULE = d3dx9_39.dll
|
||||
-IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
|
||||
+IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 wined3d
|
||||
EXTRADEFS = -D_D3DX9_VER=39
|
||||
PARENTSRC = ../d3dx9_36
|
||||
|
||||
C_SRCS = \
|
||||
diff --git a/dlls/d3dx9_40/Makefile.in b/dlls/d3dx9_40/Makefile.in
|
||||
index 6f08759..ecb4af5 100644
|
||||
index 36c5a21..7f2cfe1 100644
|
||||
--- a/dlls/d3dx9_40/Makefile.in
|
||||
+++ b/dlls/d3dx9_40/Makefile.in
|
||||
@@ -1,6 +1,6 @@
|
||||
@ -421,11 +421,11 @@ index 6f08759..ecb4af5 100644
|
||||
MODULE = d3dx9_40.dll
|
||||
-IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
|
||||
+IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 wined3d
|
||||
EXTRADEFS = -D_D3DX9_VER=40
|
||||
PARENTSRC = ../d3dx9_36
|
||||
|
||||
C_SRCS = \
|
||||
diff --git a/dlls/d3dx9_41/Makefile.in b/dlls/d3dx9_41/Makefile.in
|
||||
index d4552cf608..077dd8d378 100644
|
||||
index d4552cf..c5c3ab1 100644
|
||||
--- a/dlls/d3dx9_41/Makefile.in
|
||||
+++ b/dlls/d3dx9_41/Makefile.in
|
||||
@@ -1,6 +1,6 @@
|
||||
@ -433,11 +433,11 @@ index d4552cf608..077dd8d378 100644
|
||||
MODULE = d3dx9_41.dll
|
||||
-IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
|
||||
+IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 wined3d
|
||||
EXTRADEFS = -D_D3DX9_VER=41
|
||||
PARENTSRC = ../d3dx9_36
|
||||
|
||||
C_SRCS = \
|
||||
diff --git a/dlls/d3dx9_42/Makefile.in b/dlls/d3dx9_42/Makefile.in
|
||||
index 5806fce66c..f8ab072d34 100644
|
||||
index 5806fce..e9a8e89 100644
|
||||
--- a/dlls/d3dx9_42/Makefile.in
|
||||
+++ b/dlls/d3dx9_42/Makefile.in
|
||||
@@ -1,6 +1,6 @@
|
||||
@ -445,11 +445,11 @@ index 5806fce66c..f8ab072d34 100644
|
||||
MODULE = d3dx9_42.dll
|
||||
-IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
|
||||
+IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 wined3d
|
||||
EXTRADEFS = -D_D3DX9_VER=42
|
||||
PARENTSRC = ../d3dx9_36
|
||||
|
||||
C_SRCS = \
|
||||
diff --git a/dlls/d3dx9_43/Makefile.in b/dlls/d3dx9_43/Makefile.in
|
||||
index 72ba8b4c1e..b1c7c77740 100644
|
||||
index 72ba8b4..33185bf 100644
|
||||
--- a/dlls/d3dx9_43/Makefile.in
|
||||
+++ b/dlls/d3dx9_43/Makefile.in
|
||||
@@ -1,6 +1,6 @@
|
||||
@ -457,8 +457,9 @@ index 72ba8b4c1e..b1c7c77740 100644
|
||||
MODULE = d3dx9_43.dll
|
||||
-IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
|
||||
+IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 wined3d
|
||||
EXTRADEFS = -D_D3DX9_VER=43
|
||||
PARENTSRC = ../d3dx9_36
|
||||
|
||||
C_SRCS = \
|
||||
--
|
||||
2.11.0
|
||||
1.9.1
|
||||
|
||||
|
||||
@ -1,5 +1,4 @@
|
||||
Depends: wined3d-DXTn
|
||||
Depends: d3dx9_25-ID3DXEffect
|
||||
Fixes: [33768] Fix texture corruption in CSI: Fatal Conspiracy
|
||||
Fixes: [37391] Exception during start of fr-043 caused by missing DXTn support
|
||||
Fixes: [34692] Fix wrong colors in Wolfenstein (2009)
|
||||
|
||||
@ -1,78 +0,0 @@
|
||||
From 700f06e65a7f0aa474d40ad238138866e2c51ca0 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
|
||||
Date: Sun, 18 Oct 2015 03:27:41 +0200
|
||||
Subject: mpr: Return correct error code for non network paths and
|
||||
REMOTE_NAME_INFO_LEVEL in WNetGetUniversalName.
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Signed-off-by: Michael Müller <michael@fds-team.de>
|
||||
---
|
||||
dlls/mpr/tests/mpr.c | 9 +++------
|
||||
dlls/mpr/wnet.c | 2 +-
|
||||
2 files changed, 4 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/dlls/mpr/tests/mpr.c b/dlls/mpr/tests/mpr.c
|
||||
index a6af1b57f8d..1b16369d514 100644
|
||||
--- a/dlls/mpr/tests/mpr.c
|
||||
+++ b/dlls/mpr/tests/mpr.c
|
||||
@@ -101,25 +101,23 @@ static void test_WNetGetRemoteName(void)
|
||||
info_size = sizeof(buffer);
|
||||
ret = WNetGetUniversalNameA(driveA, REMOTE_NAME_INFO_LEVEL,
|
||||
buffer, &info_size);
|
||||
- todo_wine{
|
||||
if(drive_type == DRIVE_REMOTE)
|
||||
+ todo_wine
|
||||
ok(ret == WN_NO_ERROR, "WNetGetUniversalNameA failed: %08x\n", ret);
|
||||
else
|
||||
ok(ret == WN_NOT_CONNECTED || ret == WN_NO_NET_OR_BAD_PATH,
|
||||
"(%s) WNetGetUniversalNameA gave wrong error: %u\n", driveA, ret);
|
||||
- }
|
||||
ok(info_size == sizeof(buffer), "Got wrong size: %u\n", info_size);
|
||||
|
||||
fail_size = 0;
|
||||
ret = WNetGetUniversalNameA(driveA, REMOTE_NAME_INFO_LEVEL,
|
||||
buffer, &fail_size);
|
||||
- todo_wine{
|
||||
if(drive_type == DRIVE_REMOTE)
|
||||
+ todo_wine
|
||||
ok(ret == WN_BAD_VALUE || ret == WN_MORE_DATA, "WNetGetUniversalNameA failed: %08x\n", ret);
|
||||
else
|
||||
ok(ret == WN_NOT_CONNECTED || ret == WN_NO_NET_OR_BAD_PATH,
|
||||
"(%s) WNetGetUniversalNameA gave wrong error: %u\n", driveA, ret);
|
||||
- }
|
||||
ret = WNetGetUniversalNameA(driveA, REMOTE_NAME_INFO_LEVEL,
|
||||
buffer, NULL);
|
||||
todo_wine ok(ret == WN_BAD_POINTER, "WNetGetUniversalNameA failed: %08x\n", ret);
|
||||
@@ -127,13 +125,12 @@ static void test_WNetGetRemoteName(void)
|
||||
ret = WNetGetUniversalNameA(driveA, REMOTE_NAME_INFO_LEVEL,
|
||||
NULL, &info_size);
|
||||
|
||||
- todo_wine {
|
||||
if(drive_type == DRIVE_REMOTE)
|
||||
+ todo_wine
|
||||
ok(ret == WN_BAD_POINTER || ret == WN_BAD_VALUE, "WNetGetUniversalNameA failed: %08x\n", ret);
|
||||
else
|
||||
ok(ret == WN_NOT_CONNECTED || ret == WN_BAD_VALUE,
|
||||
"(%s) WNetGetUniversalNameA gave wrong error: %u\n", driveA, ret);
|
||||
- }
|
||||
|
||||
fail_size = sizeof(driveA) / sizeof(char) - 1;
|
||||
ret = WNetGetUniversalNameA(driveA, REMOTE_NAME_INFO_LEVEL,
|
||||
diff --git a/dlls/mpr/wnet.c b/dlls/mpr/wnet.c
|
||||
index 7b24693e0e8..78759ecb152 100644
|
||||
--- a/dlls/mpr/wnet.c
|
||||
+++ b/dlls/mpr/wnet.c
|
||||
@@ -2348,7 +2348,7 @@ DWORD WINAPI WNetGetUniversalNameA ( LPCSTR lpLocalPath, DWORD dwInfoLevel,
|
||||
break;
|
||||
}
|
||||
case REMOTE_NAME_INFO_LEVEL:
|
||||
- err = WN_NO_NETWORK;
|
||||
+ err = WN_NOT_CONNECTED;
|
||||
break;
|
||||
|
||||
default:
|
||||
--
|
||||
2.14.2
|
||||
|
||||
@ -1 +0,0 @@
|
||||
Fixes: [39452] Return WN_NOT_CONNECTED from WNetGetUniversalName REMOTE_NAME_INFO_LEVEL stub
|
||||
@ -52,7 +52,7 @@ usage()
|
||||
# Get the upstream commit sha
|
||||
upstream_commit()
|
||||
{
|
||||
echo "c21c8525f9e69cfd48906ecc33b909490bd82783"
|
||||
echo "1c8c9308e74abe5e5d85dfe722dea10e60092e7c"
|
||||
}
|
||||
|
||||
# Show version information
|
||||
@ -118,7 +118,6 @@ patch_enable_all ()
|
||||
enable_d3d8_ValidateShader="$1"
|
||||
enable_d3d9_DesktopWindow="$1"
|
||||
enable_d3d9_Tests="$1"
|
||||
enable_d3dx9_25_ID3DXEffect="$1"
|
||||
enable_d3dx9_36_32bpp_Alpha_Channel="$1"
|
||||
enable_d3dx9_36_BumpLuminance="$1"
|
||||
enable_d3dx9_36_CloneEffect="$1"
|
||||
@ -203,7 +202,6 @@ patch_enable_all ()
|
||||
enable_makedep_PARENTSPEC="$1"
|
||||
enable_mmsystem_dll16_MIDIHDR_Refcount="$1"
|
||||
enable_mountmgr_DosDevices="$1"
|
||||
enable_mpr_WNetGetUniversalNameW="$1"
|
||||
enable_mscoree_CorValidateImage="$1"
|
||||
enable_mshtml_HTMLLocation_put_hash="$1"
|
||||
enable_msi_Dummy_Thread="$1"
|
||||
@ -568,9 +566,6 @@ patch_enable ()
|
||||
d3d9-Tests)
|
||||
enable_d3d9_Tests="$2"
|
||||
;;
|
||||
d3dx9_25-ID3DXEffect)
|
||||
enable_d3dx9_25_ID3DXEffect="$2"
|
||||
;;
|
||||
d3dx9_36-32bpp_Alpha_Channel)
|
||||
enable_d3dx9_36_32bpp_Alpha_Channel="$2"
|
||||
;;
|
||||
@ -823,9 +818,6 @@ patch_enable ()
|
||||
mountmgr-DosDevices)
|
||||
enable_mountmgr_DosDevices="$2"
|
||||
;;
|
||||
mpr-WNetGetUniversalNameW)
|
||||
enable_mpr_WNetGetUniversalNameW="$2"
|
||||
;;
|
||||
mscoree-CorValidateImage)
|
||||
enable_mscoree_CorValidateImage="$2"
|
||||
;;
|
||||
@ -2472,23 +2464,12 @@ if test "$enable_dsound_EAX" -eq 1; then
|
||||
fi
|
||||
|
||||
if test "$enable_d3dx9_36_DXTn" -eq 1; then
|
||||
if test "$enable_d3dx9_25_ID3DXEffect" -gt 1; then
|
||||
abort "Patchset d3dx9_25-ID3DXEffect disabled, but d3dx9_36-DXTn depends on that."
|
||||
fi
|
||||
if test "$enable_wined3d_DXTn" -gt 1; then
|
||||
abort "Patchset wined3d-DXTn disabled, but d3dx9_36-DXTn depends on that."
|
||||
fi
|
||||
enable_d3dx9_25_ID3DXEffect=1
|
||||
enable_wined3d_DXTn=1
|
||||
fi
|
||||
|
||||
if test "$enable_d3dx9_36_CloneEffect" -eq 1; then
|
||||
if test "$enable_d3dx9_25_ID3DXEffect" -gt 1; then
|
||||
abort "Patchset d3dx9_25-ID3DXEffect disabled, but d3dx9_36-CloneEffect depends on that."
|
||||
fi
|
||||
enable_d3dx9_25_ID3DXEffect=1
|
||||
fi
|
||||
|
||||
if test "$enable_d3d11_ID3D11Texture1D" -eq 1; then
|
||||
if test "$enable_wined3d_1DTextures" -gt 1; then
|
||||
abort "Patchset wined3d-1DTextures disabled, but d3d11-ID3D11Texture1D depends on that."
|
||||
@ -3543,26 +3524,6 @@ if test "$enable_d3d9_Tests" -eq 1; then
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset d3dx9_25-ID3DXEffect
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
# | * [#25138] Fix wrong version of ID3DXEffect interface for d3dx9_25
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * dlls/d3dx9_24/Makefile.in, dlls/d3dx9_25/Makefile.in, dlls/d3dx9_26/Makefile.in, dlls/d3dx9_27/Makefile.in,
|
||||
# | dlls/d3dx9_28/Makefile.in, dlls/d3dx9_29/Makefile.in, dlls/d3dx9_30/Makefile.in, dlls/d3dx9_31/Makefile.in,
|
||||
# | dlls/d3dx9_32/Makefile.in, dlls/d3dx9_33/Makefile.in, dlls/d3dx9_34/Makefile.in, dlls/d3dx9_35/Makefile.in,
|
||||
# | dlls/d3dx9_36/Makefile.in, dlls/d3dx9_36/effect.c, dlls/d3dx9_37/Makefile.in, dlls/d3dx9_38/Makefile.in,
|
||||
# | dlls/d3dx9_39/Makefile.in, dlls/d3dx9_40/Makefile.in, dlls/d3dx9_41/Makefile.in, dlls/d3dx9_42/Makefile.in,
|
||||
# | dlls/d3dx9_43/Makefile.in, include/d3dx9effect.h
|
||||
# |
|
||||
if test "$enable_d3dx9_25_ID3DXEffect" -eq 1; then
|
||||
patch_apply d3dx9_25-ID3DXEffect/0001-d3dx9_-Adjust-ID3DXEffect-interface-based-on-DLL-ver.patch
|
||||
(
|
||||
printf '%s\n' '+ { "Sebastian Lackner", "d3dx9_*: Adjust ID3DXEffect interface based on DLL version.", 1 },';
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset d3dx9_36-32bpp_Alpha_Channel
|
||||
# |
|
||||
# | Modified files:
|
||||
@ -3591,9 +3552,6 @@ fi
|
||||
|
||||
# Patchset d3dx9_36-CloneEffect
|
||||
# |
|
||||
# | This patchset has the following (direct or indirect) dependencies:
|
||||
# | * d3dx9_25-ID3DXEffect
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
# | * [#44635] Improve stub for ID3DXEffectImpl_CloneEffect
|
||||
# |
|
||||
@ -3721,7 +3679,7 @@ fi
|
||||
# Patchset d3dx9_36-DXTn
|
||||
# |
|
||||
# | This patchset has the following (direct or indirect) dependencies:
|
||||
# | * d3dx9_25-ID3DXEffect, wined3d-DXTn
|
||||
# | * wined3d-DXTn
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
# | * [#33768] Fix texture corruption in CSI: Fatal Conspiracy
|
||||
@ -5091,21 +5049,6 @@ if test "$enable_mountmgr_DosDevices" -eq 1; then
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset mpr-WNetGetUniversalNameW
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
# | * [#39452] Return WN_NOT_CONNECTED from WNetGetUniversalName REMOTE_NAME_INFO_LEVEL stub
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * dlls/mpr/tests/mpr.c, dlls/mpr/wnet.c
|
||||
# |
|
||||
if test "$enable_mpr_WNetGetUniversalNameW" -eq 1; then
|
||||
patch_apply mpr-WNetGetUniversalNameW/0001-mpr-Return-correct-error-code-for-non-network-paths-.patch
|
||||
(
|
||||
printf '%s\n' '+ { "Michael Müller", "mpr: Return correct error code for non network paths and REMOTE_NAME_INFO_LEVEL in WNetGetUniversalName.", 1 },';
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset mscoree-CorValidateImage
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
|
||||
@ -1,12 +1,12 @@
|
||||
From e9f05f59ca4858a809dc21dee963ca8835515a4d Mon Sep 17 00:00:00 2001
|
||||
From 8c57d27baaddc04866fcebda9040bc1b521d1fe0 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
|
||||
Date: Thu, 25 Aug 2016 19:24:47 +0200
|
||||
Subject: [PATCH] wined3d: Create dummy 1d textures and surfaces.
|
||||
|
||||
---
|
||||
dlls/wined3d/resource.c | 1 +
|
||||
dlls/wined3d/texture.c | 163 ++++++++++++++++++++++++++++++++++++++++++++++++
|
||||
2 files changed, 164 insertions(+)
|
||||
dlls/wined3d/texture.c | 162 ++++++++++++++++++++++++++++++++++++++++++++++++
|
||||
2 files changed, 163 insertions(+)
|
||||
|
||||
diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c
|
||||
index 97f7aec..f340217 100644
|
||||
@ -21,7 +21,7 @@ index 97f7aec..f340217 100644
|
||||
{WINED3D_RTYPE_TEXTURE_2D, 0, WINED3D_GL_RES_TYPE_TEX_RECT},
|
||||
{WINED3D_RTYPE_TEXTURE_2D, 0, WINED3D_GL_RES_TYPE_RB},
|
||||
diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c
|
||||
index c520995..e901c32 100644
|
||||
index 6323f87..2371df9 100644
|
||||
--- a/dlls/wined3d/texture.c
|
||||
+++ b/dlls/wined3d/texture.c
|
||||
@@ -1776,6 +1776,45 @@ void wined3d_texture_upload_data(struct wined3d_texture *texture, unsigned int s
|
||||
@ -70,7 +70,7 @@ index c520995..e901c32 100644
|
||||
static void texture2d_upload_data(struct wined3d_texture *texture, unsigned int sub_resource_idx,
|
||||
const struct wined3d_context *context, const struct wined3d_box *box,
|
||||
const struct wined3d_const_bo_address *data, unsigned int row_pitch, unsigned int slice_pitch)
|
||||
@@ -2182,6 +2221,126 @@ static const struct wined3d_resource_ops texture_resource_ops =
|
||||
@@ -2182,6 +2221,125 @@ static const struct wined3d_resource_ops texture_resource_ops =
|
||||
texture_resource_sub_resource_unmap,
|
||||
};
|
||||
|
||||
@ -170,7 +170,6 @@ index c520995..e901c32 100644
|
||||
+ struct wined3d_surface *surface;
|
||||
+
|
||||
+ surface = &surfaces[idx];
|
||||
+ surface->container = texture;
|
||||
+
|
||||
+ sub_resource = &texture->sub_resources[idx];
|
||||
+ sub_resource->locations = WINED3D_LOCATION_DISCARDED;
|
||||
@ -197,7 +196,7 @@ index c520995..e901c32 100644
|
||||
static HRESULT texture_init(struct wined3d_texture *texture, const struct wined3d_resource_desc *desc,
|
||||
unsigned int layer_count, unsigned int level_count, DWORD flags, struct wined3d_device *device,
|
||||
void *parent, const struct wined3d_parent_ops *parent_ops)
|
||||
@@ -3090,6 +3249,10 @@ HRESULT CDECL wined3d_texture_create(struct wined3d_device *device, const struct
|
||||
@@ -3089,6 +3247,10 @@ HRESULT CDECL wined3d_texture_create(struct wined3d_device *device, const struct
|
||||
|
||||
switch (desc->resource_type)
|
||||
{
|
||||
@ -209,5 +208,5 @@ index c520995..e901c32 100644
|
||||
hr = texture_init(object, desc, layer_count, level_count, flags, device, parent, parent_ops);
|
||||
break;
|
||||
--
|
||||
2.7.4
|
||||
1.9.1
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user