mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2024-09-13 09:17:20 -07:00
Rebase against 5b3681f62ddd2977924424d6f326ce729de9102a.
This commit is contained in:
Sebastian Lackner
parent
c43b0d8ac0
commit
a1621d692a
@ -1,20 +1,20 @@
|
||||
From 756f4d6d55f13e5112213562d13db7f33adbdf7f Mon Sep 17 00:00:00 2001
|
||||
From 1b67c1863bd891d9949d0e391306135519e722b5 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 | 21 +-
|
||||
dlls/d3dx9_33/Makefile.in | 22 +-
|
||||
dlls/d3dx9_33/d3dx9_33.spec | 667 +++++++++++++++++++++---------------------
|
||||
dlls/d3dx9_33/d3dx9_33_main.c | 19 ++
|
||||
tools/make_specfiles | 1 -
|
||||
4 files changed, 372 insertions(+), 336 deletions(-)
|
||||
4 files changed, 373 insertions(+), 336 deletions(-)
|
||||
|
||||
diff --git a/dlls/d3dx9_33/Makefile.in b/dlls/d3dx9_33/Makefile.in
|
||||
index 0934eab..7b0151d 100644
|
||||
index 0934eab..1106d11 100644
|
||||
--- a/dlls/d3dx9_33/Makefile.in
|
||||
+++ b/dlls/d3dx9_33/Makefile.in
|
||||
@@ -1,7 +1,24 @@
|
||||
@@ -1,7 +1,25 @@
|
||||
MODULE = d3dx9_33.dll
|
||||
-IMPORTS = d3d9
|
||||
+IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 wined3d
|
||||
@ -30,6 +30,7 @@ index 0934eab..7b0151d 100644
|
||||
+ line.c \
|
||||
+ math.c \
|
||||
+ mesh.c \
|
||||
+ preshader.c \
|
||||
+ render.c \
|
||||
+ shader.c \
|
||||
+ skin.c \
|
||||
@ -749,7 +750,7 @@ index 1b65a84..92f1772 100644
|
||||
+ return 900;
|
||||
+}
|
||||
diff --git a/tools/make_specfiles b/tools/make_specfiles
|
||||
index 16db908..9367107 100755
|
||||
index b0a7b0a..75be4b3 100755
|
||||
--- a/tools/make_specfiles
|
||||
+++ b/tools/make_specfiles
|
||||
@@ -83,7 +83,6 @@ my @dll_groups =
|
||||
@ -761,5 +762,5 @@ index 16db908..9367107 100755
|
||||
"d3dx9_31",
|
||||
"d3dx9_30",
|
||||
--
|
||||
2.6.4
|
||||
2.7.1
|
||||
|
||||
|
||||
@ -1,31 +1,31 @@
|
||||
From 95b6016b7cfb62a70ec9bbcc39117f68259aa93b Mon Sep 17 00:00:00 2001
|
||||
From 7aca17433be04df15990308c3a081feb2f3a97f6 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
|
||||
Date: Tue, 28 Jul 2015 17:26:09 +0200
|
||||
Subject: d3dx9_36: Return dummy skininfo interface in D3DXLoadSkinMeshFromXof
|
||||
when skin information is unavailable.
|
||||
|
||||
---
|
||||
dlls/d3dx9_36/d3dx9_private.h | 2 ++
|
||||
dlls/d3dx9_36/mesh.c | 7 +++++++
|
||||
dlls/d3dx9_36/skin.c | 22 +++++++++++++++++++++-
|
||||
dlls/d3dx9_36/d3dx9_private.h | 2 ++
|
||||
dlls/d3dx9_36/mesh.c | 7 +++++++
|
||||
dlls/d3dx9_36/skin.c | 22 +++++++++++++++++++++-
|
||||
3 files changed, 30 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/dlls/d3dx9_36/d3dx9_private.h b/dlls/d3dx9_36/d3dx9_private.h
|
||||
index 79f3b76..b6707f6 100644
|
||||
index 5ba93ac..f4cdabc 100644
|
||||
--- a/dlls/d3dx9_36/d3dx9_private.h
|
||||
+++ b/dlls/d3dx9_36/d3dx9_private.h
|
||||
@@ -110,4 +110,6 @@ const char *debug_d3dxparameter_registerset(D3DXREGISTER_SET r) DECLSPEC_HIDDEN;
|
||||
void set_number(void *outdata, D3DXPARAMETER_TYPE outtype,
|
||||
const void *indata, D3DXPARAMETER_TYPE intype) DECLSPEC_HIDDEN;
|
||||
@@ -144,4 +144,6 @@ HRESULT d3dx_create_param_eval(struct d3dx9_base_effect *base_effect, void *byte
|
||||
unsigned int byte_code_size, D3DXPARAMETER_TYPE type, struct d3dx_param_eval **peval) DECLSPEC_HIDDEN;
|
||||
void d3dx_free_param_eval(struct d3dx_param_eval *peval) DECLSPEC_HIDDEN;
|
||||
|
||||
+HRESULT create_dummy_skin(ID3DXSkinInfo **iface) DECLSPEC_HIDDEN;
|
||||
+
|
||||
#endif /* __WINE_D3DX9_PRIVATE_H */
|
||||
diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c
|
||||
index 4aeac26..3cd85a3 100644
|
||||
index 3204ea7..61dd203 100644
|
||||
--- a/dlls/d3dx9_36/mesh.c
|
||||
+++ b/dlls/d3dx9_36/mesh.c
|
||||
@@ -3334,6 +3334,13 @@ static HRESULT parse_mesh(ID3DXFileData *filedata, struct mesh_data *mesh_data,
|
||||
@@ -3332,6 +3332,13 @@ static HRESULT parse_mesh(ID3DXFileData *filedata, struct mesh_data *mesh_data,
|
||||
goto end;
|
||||
}
|
||||
|
||||
@ -40,10 +40,10 @@ index 4aeac26..3cd85a3 100644
|
||||
|
||||
end:
|
||||
diff --git a/dlls/d3dx9_36/skin.c b/dlls/d3dx9_36/skin.c
|
||||
index 9b93af6..3d68829 100644
|
||||
index f197d33..bed4b9f 100644
|
||||
--- a/dlls/d3dx9_36/skin.c
|
||||
+++ b/dlls/d3dx9_36/skin.c
|
||||
@@ -92,7 +92,7 @@ static ULONG WINAPI d3dx9_skin_info_Release(ID3DXSkinInfo *iface)
|
||||
@@ -94,7 +94,7 @@ static ULONG WINAPI d3dx9_skin_info_Release(ID3DXSkinInfo *iface)
|
||||
HeapFree(GetProcessHeap(), 0, skin->bones[i].vertices);
|
||||
HeapFree(GetProcessHeap(), 0, skin->bones[i].weights);
|
||||
}
|
||||
@ -52,7 +52,7 @@ index 9b93af6..3d68829 100644
|
||||
HeapFree(GetProcessHeap(), 0, skin);
|
||||
}
|
||||
|
||||
@@ -493,3 +493,23 @@ HRESULT WINAPI D3DXCreateSkinInfoFVF(DWORD num_vertices, DWORD fvf, DWORD num_bo
|
||||
@@ -495,3 +495,23 @@ HRESULT WINAPI D3DXCreateSkinInfoFVF(DWORD num_vertices, DWORD fvf, DWORD num_bo
|
||||
|
||||
return D3DXCreateSkinInfo(num_vertices, declaration, num_bones, skin_info);
|
||||
}
|
||||
@ -77,5 +77,5 @@ index 9b93af6..3d68829 100644
|
||||
+ return D3D_OK;
|
||||
+}
|
||||
--
|
||||
2.4.5
|
||||
2.7.1
|
||||
|
||||
|
||||
@ -51,7 +51,7 @@ usage()
|
||||
# Get the upstream commit sha
|
||||
upstream_commit()
|
||||
{
|
||||
echo "d04a54857cc84f881393e4bc794185650a302084"
|
||||
echo "5b3681f62ddd2977924424d6f326ce729de9102a"
|
||||
}
|
||||
|
||||
# Show version information
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From eb8033132c15abb87c53f2e8b52c6fb6622f333b Mon Sep 17 00:00:00 2001
|
||||
From 3d02c5ffcad36616c63a8814fe98f9b531fce27a Mon Sep 17 00:00:00 2001
|
||||
From: Jactry Zeng <wine@jactry.com>
|
||||
Date: Fri, 8 Aug 2014 21:32:57 +0800
|
||||
Subject: riched20: Implement IText{Selection, Range}::Set{Start, End}.
|
||||
@ -8,10 +8,10 @@ Subject: riched20: Implement IText{Selection, Range}::Set{Start, End}.
|
||||
1 file changed, 135 insertions(+)
|
||||
|
||||
diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c
|
||||
index fd4d9e8..3be6320 100644
|
||||
index 6da3ce3..8047f4b 100644
|
||||
--- a/dlls/riched20/tests/richole.c
|
||||
+++ b/dlls/riched20/tests/richole.c
|
||||
@@ -3251,6 +3251,137 @@ static void test_ITextSelection_GetDuplicate(void)
|
||||
@@ -3397,6 +3397,137 @@ static void test_Expand(void)
|
||||
ITextRange_Release(range);
|
||||
}
|
||||
|
||||
@ -149,7 +149,7 @@ index fd4d9e8..3be6320 100644
|
||||
START_TEST(richole)
|
||||
{
|
||||
/* Must explicitly LoadLibrary(). The test has no references to functions in
|
||||
@@ -3263,11 +3394,15 @@ START_TEST(richole)
|
||||
@@ -3409,12 +3540,16 @@ START_TEST(richole)
|
||||
test_GetText();
|
||||
test_ITextSelection_GetChar();
|
||||
test_ITextSelection_GetStart_GetEnd();
|
||||
@ -158,6 +158,7 @@ index fd4d9e8..3be6320 100644
|
||||
test_ITextSelection_Collapse();
|
||||
test_ITextDocument_Range();
|
||||
test_ITextRange_GetChar();
|
||||
test_ITextRange_ScrollIntoView();
|
||||
test_ITextRange_GetStart_GetEnd();
|
||||
test_ITextRange_GetDuplicate();
|
||||
+ test_ITextRange_SetStart();
|
||||
@ -166,5 +167,5 @@ index fd4d9e8..3be6320 100644
|
||||
test_GetClientSite();
|
||||
test_IOleWindow_GetWindow();
|
||||
--
|
||||
2.4.2
|
||||
2.7.1
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From fb297f3423e913e7c25e433a0257a12970666d57 Mon Sep 17 00:00:00 2001
|
||||
From c1711e301579aa2469cad8b0d3ba5567edc4611b Mon Sep 17 00:00:00 2001
|
||||
From: Jactry Zeng <wine@jactry.com>
|
||||
Date: Mon, 11 Aug 2014 13:51:55 +0800
|
||||
Subject: riched20: Stub for ITextFont interface and implement
|
||||
@ -10,10 +10,10 @@ Subject: riched20: Stub for ITextFont interface and implement
|
||||
2 files changed, 113 insertions(+)
|
||||
|
||||
diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c
|
||||
index d39bce7..64809cc 100644
|
||||
index 1013e67..9e7d853 100644
|
||||
--- a/dlls/riched20/richole.c
|
||||
+++ b/dlls/riched20/richole.c
|
||||
@@ -2544,6 +2544,10 @@ static HRESULT WINAPI TextFont_SetDuplicate(ITextFont *iface, ITextFont *pFont)
|
||||
@@ -2654,6 +2654,10 @@ static HRESULT WINAPI TextFont_SetDuplicate(ITextFont *iface, ITextFont *pFont)
|
||||
{
|
||||
ITextFontImpl *This = impl_from_ITextFont(iface);
|
||||
FIXME("(%p)->(%p): stub\n", This, pFont);
|
||||
@ -24,7 +24,7 @@ index d39bce7..64809cc 100644
|
||||
return E_NOTIMPL;
|
||||
}
|
||||
|
||||
@@ -2551,6 +2555,10 @@ static HRESULT WINAPI TextFont_CanChange(ITextFont *iface, LONG *ret)
|
||||
@@ -2661,6 +2665,10 @@ static HRESULT WINAPI TextFont_CanChange(ITextFont *iface, LONG *ret)
|
||||
{
|
||||
ITextFontImpl *This = impl_from_ITextFont(iface);
|
||||
FIXME("(%p)->(%p): stub\n", This, ret);
|
||||
@ -35,7 +35,7 @@ index d39bce7..64809cc 100644
|
||||
return E_NOTIMPL;
|
||||
}
|
||||
|
||||
@@ -2558,6 +2566,10 @@ static HRESULT WINAPI TextFont_IsEqual(ITextFont *iface, ITextFont *font, LONG *
|
||||
@@ -2668,6 +2676,10 @@ static HRESULT WINAPI TextFont_IsEqual(ITextFont *iface, ITextFont *font, LONG *
|
||||
{
|
||||
ITextFontImpl *This = impl_from_ITextFont(iface);
|
||||
FIXME("(%p)->(%p %p): stub\n", This, font, ret);
|
||||
@ -46,7 +46,7 @@ index d39bce7..64809cc 100644
|
||||
return E_NOTIMPL;
|
||||
}
|
||||
|
||||
@@ -2731,6 +2743,10 @@ static HRESULT WINAPI TextFont_GetStyle(ITextFont *iface, LONG *value)
|
||||
@@ -2841,6 +2853,10 @@ static HRESULT WINAPI TextFont_GetStyle(ITextFont *iface, LONG *value)
|
||||
{
|
||||
ITextFontImpl *This = impl_from_ITextFont(iface);
|
||||
FIXME("(%p)->(%p): stub\n", This, value);
|
||||
@ -57,7 +57,7 @@ index d39bce7..64809cc 100644
|
||||
return E_NOTIMPL;
|
||||
}
|
||||
|
||||
@@ -2738,6 +2754,10 @@ static HRESULT WINAPI TextFont_SetStyle(ITextFont *iface, LONG value)
|
||||
@@ -2848,6 +2864,10 @@ static HRESULT WINAPI TextFont_SetStyle(ITextFont *iface, LONG value)
|
||||
{
|
||||
ITextFontImpl *This = impl_from_ITextFont(iface);
|
||||
FIXME("(%p)->(%d): stub\n", This, value);
|
||||
@ -69,10 +69,10 @@ index d39bce7..64809cc 100644
|
||||
}
|
||||
|
||||
diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c
|
||||
index 3be6320..5f8e1cc 100644
|
||||
index 8047f4b..851ae9a 100644
|
||||
--- a/dlls/riched20/tests/richole.c
|
||||
+++ b/dlls/riched20/tests/richole.c
|
||||
@@ -3382,6 +3382,97 @@ static void test_ITextSelection_SetEnd(void)
|
||||
@@ -3528,6 +3528,97 @@ static void test_ITextSelection_SetEnd(void)
|
||||
release_interfaces(&w, &reOle, &txtDoc, &txtSel);
|
||||
}
|
||||
|
||||
@ -170,15 +170,15 @@ index 3be6320..5f8e1cc 100644
|
||||
START_TEST(richole)
|
||||
{
|
||||
/* Must explicitly LoadLibrary(). The test has no references to functions in
|
||||
@@ -3397,6 +3488,7 @@ START_TEST(richole)
|
||||
@@ -3543,6 +3634,7 @@ START_TEST(richole)
|
||||
test_ITextSelection_SetStart();
|
||||
test_ITextSelection_SetEnd();
|
||||
test_ITextSelection_Collapse();
|
||||
+ test_ITextSelection_GetFont();
|
||||
test_ITextDocument_Range();
|
||||
test_ITextRange_GetChar();
|
||||
test_ITextRange_GetStart_GetEnd();
|
||||
@@ -3404,6 +3496,7 @@ START_TEST(richole)
|
||||
test_ITextRange_ScrollIntoView();
|
||||
@@ -3551,6 +3643,7 @@ START_TEST(richole)
|
||||
test_ITextRange_SetStart();
|
||||
test_ITextRange_SetEnd();
|
||||
test_ITextRange_Collapse();
|
||||
@ -187,5 +187,5 @@ index 3be6320..5f8e1cc 100644
|
||||
test_IOleWindow_GetWindow();
|
||||
test_IOleInPlaceSite_GetWindow();
|
||||
--
|
||||
2.4.2
|
||||
2.7.1
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From 56bf18bcf782cea24efa378eb3ec58b171083e71 Mon Sep 17 00:00:00 2001
|
||||
From e5dad19d1dbab38b6a6c31bd23fe7dac278e6d1a Mon Sep 17 00:00:00 2001
|
||||
From: Jactry Zeng <wine@jactry.com>
|
||||
Date: Mon, 18 Aug 2014 14:47:14 +0800
|
||||
Subject: riched20: Implement ITextSelection::GetStoryLength.
|
||||
@ -8,10 +8,10 @@ Subject: riched20: Implement ITextSelection::GetStoryLength.
|
||||
1 file changed, 30 insertions(+)
|
||||
|
||||
diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c
|
||||
index 55d27d4..854ec09 100644
|
||||
index c7d6299..38a8f80 100644
|
||||
--- a/dlls/riched20/tests/richole.c
|
||||
+++ b/dlls/riched20/tests/richole.c
|
||||
@@ -3667,6 +3667,35 @@ static void test_ITextRange_GetStoryLength(void)
|
||||
@@ -3813,6 +3813,35 @@ static void test_ITextRange_GetStoryLength(void)
|
||||
release_interfaces(&w, &reOle, &txtDoc, NULL);
|
||||
}
|
||||
|
||||
@ -47,14 +47,14 @@ index 55d27d4..854ec09 100644
|
||||
START_TEST(richole)
|
||||
{
|
||||
/* Must explicitly LoadLibrary(). The test has no references to functions in
|
||||
@@ -3683,6 +3712,7 @@ START_TEST(richole)
|
||||
@@ -3829,6 +3858,7 @@ START_TEST(richole)
|
||||
test_ITextSelection_SetEnd();
|
||||
test_ITextSelection_Collapse();
|
||||
test_ITextSelection_GetFont();
|
||||
+ test_ITextSelection_GetStoryLength();
|
||||
test_ITextDocument_Range();
|
||||
test_ITextRange_GetChar();
|
||||
test_ITextRange_GetStart_GetEnd();
|
||||
test_ITextRange_ScrollIntoView();
|
||||
--
|
||||
2.4.2
|
||||
2.7.1
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user