wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2024-11-21 16:46:54 -08:00
Code Issues Packages Projects Releases Wiki Activity

d3dx9_33-Share_Source: Update patchset and make sure ./tools/make_specfiles doesn't corrupt spec file.

Browse Source
This commit is contained in:
Sebastian Lackner 2016-01-20 09:34:02 +01:00
parent 4ffd0d0492
commit a5541ec2e1
2 changed files with 28 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
patches/d3dx9_33-Share_Source/0001-d3dx9_33-Share-the-source-with-d3dx9_36.patch
View File

@ -1,19 +1,20 @@
From ee0c88cdf8f9daad656c55790e4ca8c3fcddd2a9 Mon Sep 17 00:00:00 2001
From 756f4d6d55f13e5112213562d13db7f33adbdf7f Mon Sep 17 00:00:00 2001
From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
Date: Mon, 13 Jul 2015 20:38:04 +1000
Subject: d3dx9_33: Share the source with d3dx9_36
---
dlls/d3dx9_33/Makefile.in | 20 +-
dlls/d3dx9_33/d3dx9_33.spec | 666 +++++++++++++++++++++---------------------
dlls/d3dx9_33/Makefile.in | 21 +-
dlls/d3dx9_33/d3dx9_33.spec | 667 +++++++++++++++++++++---------------------
dlls/d3dx9_33/d3dx9_33_main.c | 19 ++
3 files changed, 370 insertions(+), 335 deletions(-)
tools/make_specfiles | 1 -
4 files changed, 372 insertions(+), 336 deletions(-)
diff --git a/dlls/d3dx9_33/Makefile.in b/dlls/d3dx9_33/Makefile.in
index 0934eab..c3c1ed4 100644
index 0934eab..7b0151d 100644
--- a/dlls/d3dx9_33/Makefile.in
+++ b/dlls/d3dx9_33/Makefile.in
@@ -1,7 +1,23 @@
@@ -1,7 +1,24 @@
MODULE = d3dx9_33.dll
-IMPORTS = d3d9
+IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 wined3d
@ -21,6 +22,7 @@ index 0934eab..c3c1ed4 100644
C_SRCS = \
- d3dx9_33_main.c
+ animation.c \
+ core.c \
+ d3dx9_33_main.c \
+ effect.c \
@ -40,10 +42,10 @@ index 0934eab..c3c1ed4 100644
RC_SRCS = version.rc
diff --git a/dlls/d3dx9_33/d3dx9_33.spec b/dlls/d3dx9_33/d3dx9_33.spec
index 35cb0b6..d0f1f5c 100644
index 35cb0b6..2790d1a 100644
--- a/dlls/d3dx9_33/d3dx9_33.spec
+++ b/dlls/d3dx9_33/d3dx9_33.spec
@@ -1,334 +1,334 @@
@@ -1,334 +1,335 @@
-@ stdcall D3DXAssembleShader(ptr long ptr ptr long ptr ptr) d3dx9_36.D3DXAssembleShader
-@ stdcall D3DXAssembleShaderFromFileA(str ptr ptr long ptr ptr) d3dx9_36.D3DXAssembleShaderFromFileA
-@ stdcall D3DXAssembleShaderFromFileW(wstr ptr ptr long ptr ptr) d3dx9_36.D3DXAssembleShaderFromFileW
@ -407,9 +409,9 @@ index 35cb0b6..d0f1f5c 100644
+@ stub D3DXComputeTangentFrame(ptr long)
+@ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr)
+@ stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr)
+@ stub D3DXConvertMeshSubsetToSingleStrip(ptr long long ptr ptr)
+@ stdcall D3DXConvertMeshSubsetToSingleStrip(ptr long long ptr ptr)
+@ stub D3DXConvertMeshSubsetToStrips(ptr long long ptr ptr ptr ptr)
+@ stub D3DXCreateAnimationController(long long long long ptr)
+@ stdcall D3DXCreateAnimationController(long long long long ptr)
+@ stdcall D3DXCreateBox(ptr float float float ptr ptr)
+@ stdcall D3DXCreateBuffer(long ptr)
+@ stub D3DXCreateCompressedAnimationSet(ptr long long ptr long ptr ptr)
@ -445,7 +447,7 @@ index 35cb0b6..d0f1f5c 100644
+@ stdcall D3DXCreateFontIndirectA(ptr ptr ptr)
+@ stdcall D3DXCreateFontIndirectW(ptr ptr ptr)
+@ stdcall D3DXCreateFontW(ptr long long long long long long long long long wstr ptr)
+@ stub D3DXCreateFragmentLinker(ptr long ptr)
+@ stdcall D3DXCreateFragmentLinker(ptr long ptr)
+@ stub D3DXCreateKeyframedAnimationSet(ptr long long long long ptr ptr)
+@ stdcall D3DXCreateLine(ptr ptr)
+@ stdcall D3DXCreateMatrixStack(long ptr)
@ -536,6 +538,7 @@ index 35cb0b6..d0f1f5c 100644
+@ stdcall D3DXGetImageInfoFromResourceW(long wstr ptr)
+@ stdcall D3DXGetPixelShaderProfile(ptr)
+@ stdcall D3DXGetShaderConstantTable(ptr ptr)
+@ stdcall D3DXGetShaderConstantTableEx(ptr long ptr)
+@ stub D3DXGetShaderInputSemantics(ptr ptr ptr)
+@ stub D3DXGetShaderOutputSemantics(ptr ptr ptr)
+@ stdcall D3DXGetShaderSamplers(ptr ptr ptr)
@ -745,6 +748,18 @@ index 1b65a84..92f1772 100644
+{
+ return 900;
+}
diff --git a/tools/make_specfiles b/tools/make_specfiles
index 16db908..9367107 100755
--- a/tools/make_specfiles
+++ b/tools/make_specfiles
@@ -83,7 +83,6 @@ my @dll_groups =
"d3dx9_37",
"d3dx9_35",
"d3dx9_34",
- "d3dx9_33",
"d3dx9_32",
"d3dx9_31",
"d3dx9_30",
--
2.4.5
2.6.4

2
patches/patchinstall.sh
View File

@ -2893,7 +2893,7 @@ fi
# | * [#21817] Share source of d3dx9_36 with d3dx9_33 to avoid Wine DLL forwards
# |
# | Modified files:
# | * dlls/d3dx9_33/Makefile.in, dlls/d3dx9_33/d3dx9_33.spec, dlls/d3dx9_33/d3dx9_33_main.c
# | * dlls/d3dx9_33/Makefile.in, dlls/d3dx9_33/d3dx9_33.spec, dlls/d3dx9_33/d3dx9_33_main.c, tools/make_specfiles
# |
if test "$enable_d3dx9_33_Share_Source" -eq 1; then
patch_apply d3dx9_33-Share_Source/0001-d3dx9_33-Share-the-source-with-d3dx9_36.patch