You've already forked wine-staging
mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2025-04-13 14:42:51 -07:00
Compare commits
26 Commits
Author | SHA1 | Date | |
---|---|---|---|
|
1117c77d17 | ||
|
4c4573beff | ||
|
0006045c66 | ||
|
56ed08d2e1 | ||
|
206ef39564 | ||
|
aeb8488db7 | ||
|
a0e9a41f77 | ||
|
7b0d1a2905 | ||
|
6f120f6a56 | ||
|
0d616d719e | ||
|
5403b21e6a | ||
|
c6801a1585 | ||
|
5b403d94e2 | ||
|
dcc28e042c | ||
|
93ef3b46c8 | ||
|
2d0f81b3f6 | ||
|
7234a34ea2 | ||
|
a3fc9d953a | ||
|
a43657f683 | ||
|
ce0c9566c9 | ||
|
fb62a188f4 | ||
|
39bf451aea | ||
|
f6177b7d07 | ||
|
4b12b109c4 | ||
|
30ac478614 | ||
|
e3182b014c |
@@ -1,25 +0,0 @@
|
||||
From 1d2744df97beb00c40ae4c9d307334f4fe0c253d Mon Sep 17 00:00:00 2001
|
||||
From: Sebastian Lackner <sebastian@fds-team.de>
|
||||
Date: Sun, 31 Jul 2016 00:01:52 +0200
|
||||
Subject: include: Avoid shift overflow warning.
|
||||
|
||||
---
|
||||
include/d3dtypes.h | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/include/d3dtypes.h b/include/d3dtypes.h
|
||||
index 75aee55..8a884a8 100644
|
||||
--- a/include/d3dtypes.h
|
||||
+++ b/include/d3dtypes.h
|
||||
@@ -53,7 +53,7 @@ typedef LONG D3DFIXED;
|
||||
#define RGBA_GETRED(rgb) (((rgb) >> 16) & 0xff)
|
||||
#define RGBA_GETGREEN(rgb) (((rgb) >> 8) & 0xff)
|
||||
#define RGBA_GETBLUE(rgb) ((rgb) & 0xff)
|
||||
-#define RGBA_MAKE(r, g, b, a) ((D3DCOLOR) (((a) << 24) | ((r) << 16) | ((g) << 8) | (b)))
|
||||
+#define RGBA_MAKE(r, g, b, a) ((D3DCOLOR) (((DWORD)(a) << 24) | ((r) << 16) | ((g) << 8) | (b)))
|
||||
|
||||
#define D3DRGB(r, g, b) \
|
||||
(0xff000000 | ( ((LONG)((r) * 255)) << 16) | (((LONG)((g) * 255)) << 8) | (LONG)((b) * 255))
|
||||
--
|
||||
2.9.0
|
||||
|
@@ -1,17 +1,41 @@
|
||||
From 869fbc7190eb77e027be4bcd98d938198189c3dd Mon Sep 17 00:00:00 2001
|
||||
From c695e014f25fd613ead12115a715cdb4303d632f Mon Sep 17 00:00:00 2001
|
||||
From: Sebastian Lackner <sebastian@fds-team.de>
|
||||
Date: Tue, 22 Mar 2016 21:58:40 +0100
|
||||
Subject: dwrite: Avoid implicit cast of interface pointer.
|
||||
|
||||
---
|
||||
dlls/dwrite/font.c | 6 +++---
|
||||
dlls/dwrite/layout.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
2 files changed, 4 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c
|
||||
index ba97025..0a90c20 100644
|
||||
--- a/dlls/dwrite/font.c
|
||||
+++ b/dlls/dwrite/font.c
|
||||
@@ -1684,15 +1684,15 @@ static struct dwrite_font *unsafe_impl_from_IDWriteFont(IDWriteFont *iface)
|
||||
if (!iface)
|
||||
return NULL;
|
||||
assert(iface->lpVtbl == (IDWriteFontVtbl*)&dwritefontvtbl);
|
||||
- return CONTAINING_RECORD(iface, struct dwrite_font, IDWriteFont3_iface);
|
||||
+ return CONTAINING_RECORD((IDWriteFont3 *)iface, struct dwrite_font, IDWriteFont3_iface);
|
||||
}
|
||||
|
||||
static struct dwrite_fontface *unsafe_impl_from_IDWriteFontFace(IDWriteFontFace *iface)
|
||||
{
|
||||
if (!iface)
|
||||
return NULL;
|
||||
- assert(iface->lpVtbl = (IDWriteFontFaceVtbl*)&dwritefontfacevtbl);
|
||||
- return CONTAINING_RECORD(iface, struct dwrite_fontface, IDWriteFontFace4_iface);
|
||||
+ assert(iface->lpVtbl == (IDWriteFontFaceVtbl*)&dwritefontfacevtbl);
|
||||
+ return CONTAINING_RECORD((IDWriteFontFace4 *)iface, struct dwrite_fontface, IDWriteFontFace4_iface);
|
||||
}
|
||||
|
||||
void get_logfont_from_font(IDWriteFont *iface, LOGFONTW *lf)
|
||||
diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c
|
||||
index 38b5e32..24f4abc 100644
|
||||
index 706ed4e..c76a909 100644
|
||||
--- a/dlls/dwrite/layout.c
|
||||
+++ b/dlls/dwrite/layout.c
|
||||
@@ -5115,7 +5115,7 @@ static const IDWriteTextFormat2Vtbl dwritetextformatvtbl = {
|
||||
@@ -5196,7 +5196,7 @@ static const IDWriteTextFormat2Vtbl dwritetextformatvtbl = {
|
||||
static struct dwrite_textformat *unsafe_impl_from_IDWriteTextFormat(IDWriteTextFormat *iface)
|
||||
{
|
||||
return (iface->lpVtbl == (IDWriteTextFormatVtbl*)&dwritetextformatvtbl) ?
|
||||
@@ -21,5 +45,5 @@ index 38b5e32..24f4abc 100644
|
||||
|
||||
HRESULT create_textformat(const WCHAR *family_name, IDWriteFontCollection *collection, DWRITE_FONT_WEIGHT weight, DWRITE_FONT_STYLE style,
|
||||
--
|
||||
2.7.1
|
||||
2.9.0
|
||||
|
||||
|
@@ -1,4 +1,4 @@
|
||||
From 4d240f9f1d7b50a2a0206fe965986c967bbacfd7 Mon Sep 17 00:00:00 2001
|
||||
From bfbe1cfd28797365a7341add7a330568b3846e89 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
|
||||
Date: Sun, 17 Jan 2016 17:07:35 +0100
|
||||
Subject: ext-ms-win-xaml-pal-l1-1-0: Add dll and add stub for
|
||||
@@ -15,13 +15,13 @@ Subject: ext-ms-win-xaml-pal-l1-1-0: Add dll and add stub for
|
||||
create mode 100644 dlls/ext-ms-win-xaml-pal-l1-1-0/main.c
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 647ea2fe..f3cb281 100644
|
||||
index 670c2fc..8e44524 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -3013,6 +3013,7 @@ WINE_CONFIG_DLL(ext-ms-win-kernel32-package-current-l1-1-0)
|
||||
WINE_CONFIG_DLL(ext-ms-win-ntuser-message-l1-1-1)
|
||||
WINE_CONFIG_DLL(ext-ms-win-ntuser-uicontext-ext-l1-1-0)
|
||||
@@ -3025,6 +3025,7 @@ WINE_CONFIG_DLL(ext-ms-win-rtcore-gdi-rgn-l1-1-0)
|
||||
WINE_CONFIG_DLL(ext-ms-win-rtcore-ntuser-dc-access-l1-1-0)
|
||||
WINE_CONFIG_DLL(ext-ms-win-rtcore-ntuser-dpi-l1-1-0)
|
||||
WINE_CONFIG_DLL(ext-ms-win-rtcore-ntuser-sysparams-l1-1-0)
|
||||
+WINE_CONFIG_DLL(ext-ms-win-xaml-pal-l1-1-0)
|
||||
WINE_CONFIG_DLL(faultrep,,[implib])
|
||||
WINE_CONFIG_TEST(dlls/faultrep/tests)
|
||||
|
@@ -1,4 +1,4 @@
|
||||
From db1db629d2bce149edc99cd534d5e1b5e17a1e82 Mon Sep 17 00:00:00 2001
|
||||
From 08231829bbfa686e537a0c94f3aa4ede92a7817b Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
|
||||
Date: Sun, 17 Jan 2016 17:12:45 +0100
|
||||
Subject: ext-ms-win-appmodel-usercontext-l1-1-0: Add dll and add stub for
|
||||
@@ -15,17 +15,17 @@ Subject: ext-ms-win-appmodel-usercontext-l1-1-0: Add dll and add stub for
|
||||
create mode 100644 dlls/ext-ms-win-appmodel-usercontext-l1-1-0/main.c
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index f3cb281..7566ca4 100644
|
||||
index bdd390c..6264ede 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -3007,6 +3007,7 @@ WINE_CONFIG_DLL(esent)
|
||||
@@ -3020,6 +3020,7 @@ WINE_CONFIG_DLL(esent)
|
||||
WINE_CONFIG_DLL(evr)
|
||||
WINE_CONFIG_DLL(explorerframe,,[clean])
|
||||
WINE_CONFIG_TEST(dlls/explorerframe/tests)
|
||||
+WINE_CONFIG_DLL(ext-ms-win-appmodel-usercontext-l1-1-0)
|
||||
WINE_CONFIG_DLL(ext-ms-win-domainjoin-netjoin-l1-1-0)
|
||||
WINE_CONFIG_DLL(ext-ms-win-gdi-dc-create-l1-1-1)
|
||||
WINE_CONFIG_DLL(ext-ms-win-gdi-devcaps-l1-1-0)
|
||||
WINE_CONFIG_DLL(ext-ms-win-kernel32-package-current-l1-1-0)
|
||||
WINE_CONFIG_DLL(ext-ms-win-gdi-dc-l1-2-0)
|
||||
diff --git a/dlls/ext-ms-win-appmodel-usercontext-l1-1-0/Makefile.in b/dlls/ext-ms-win-appmodel-usercontext-l1-1-0/Makefile.in
|
||||
new file mode 100644
|
||||
index 0000000..16eee75
|
||||
|
@@ -1,4 +1,4 @@
|
||||
From 45055d28aa803d6dcd9fc74da0b1432b05e23abe Mon Sep 17 00:00:00 2001
|
||||
From 703b9bd81221bd985ec79697e035e60a6fbcbc6d Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
|
||||
Date: Sat, 23 Jan 2016 21:00:39 +0100
|
||||
Subject: ext-ms-win-ntuser-mouse-l1-1-0: Add dll.
|
||||
@@ -13,17 +13,17 @@ Subject: ext-ms-win-ntuser-mouse-l1-1-0: Add dll.
|
||||
create mode 100644 dlls/ext-ms-win-ntuser-mouse-l1-1-0/ext-ms-win-ntuser-mouse-l1-1-0.spec
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index c1799d1..1200547 100644
|
||||
index c5d7a4e..377d146 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -3015,6 +3015,7 @@ WINE_CONFIG_DLL(ext-ms-win-gdi-dc-create-l1-1-1)
|
||||
WINE_CONFIG_DLL(ext-ms-win-gdi-devcaps-l1-1-0)
|
||||
@@ -3020,6 +3020,7 @@ WINE_CONFIG_DLL(ext-ms-win-gdi-draw-l1-1-1)
|
||||
WINE_CONFIG_DLL(ext-ms-win-gdi-render-l1-1-0)
|
||||
WINE_CONFIG_DLL(ext-ms-win-kernel32-package-current-l1-1-0)
|
||||
WINE_CONFIG_DLL(ext-ms-win-ntuser-message-l1-1-1)
|
||||
+WINE_CONFIG_DLL(ext-ms-win-ntuser-mouse-l1-1-0)
|
||||
WINE_CONFIG_DLL(ext-ms-win-ntuser-private-l1-1-1)
|
||||
WINE_CONFIG_DLL(ext-ms-win-ntuser-rectangle-ext-l1-1-0)
|
||||
WINE_CONFIG_DLL(ext-ms-win-ntuser-uicontext-ext-l1-1-0)
|
||||
WINE_CONFIG_DLL(ext-ms-win-rtcore-ntuser-dpi-l1-1-0)
|
||||
WINE_CONFIG_DLL(ext-ms-win-xaml-pal-l1-1-0)
|
||||
diff --git a/dlls/ext-ms-win-ntuser-mouse-l1-1-0/Makefile.in b/dlls/ext-ms-win-ntuser-mouse-l1-1-0/Makefile.in
|
||||
new file mode 100644
|
||||
index 0000000..c408dbb
|
||||
@@ -43,17 +43,17 @@ index 0000000..22128a2
|
||||
+@ stdcall SetCapture(long) user32.SetCapture
|
||||
+@ stdcall TrackMouseEvent(ptr) user32.TrackMouseEvent
|
||||
diff --git a/tools/make_specfiles b/tools/make_specfiles
|
||||
index a43d5dc..6cb5f53 100755
|
||||
index 45fa346..576dc5f 100755
|
||||
--- a/tools/make_specfiles
|
||||
+++ b/tools/make_specfiles
|
||||
@@ -285,6 +285,7 @@ my @dll_groups =
|
||||
"api-ms-win-downlevel-user32-l1-1-0",
|
||||
@@ -286,6 +286,7 @@ my @dll_groups =
|
||||
"api-ms-win-ntuser-dc-access-l1-1-0",
|
||||
"api-ms-win-rtcore-ntuser-private-l1-1-0",
|
||||
"ext-ms-win-ntuser-message-l1-1-1",
|
||||
+ "ext-ms-win-ntuser-mouse-l1-1-0",
|
||||
"ext-ms-win-ntuser-private-l1-1-1",
|
||||
"ext-ms-win-ntuser-rectangle-ext-l1-1-0",
|
||||
"ext-ms-win-ntuser-uicontext-ext-l1-1-0",
|
||||
"ext-ms-win-rtcore-ntuser-dpi-l1-1-0",
|
||||
],
|
||||
--
|
||||
2.9.0
|
||||
|
||||
|
@@ -1,4 +1,4 @@
|
||||
From 85c838f8a6f00f53ddc753c4aea2d288c9f9b599 Mon Sep 17 00:00:00 2001
|
||||
From bc9d6818548e009b387d32677e19d56018a9f59c Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
|
||||
Date: Sat, 23 Jan 2016 21:02:52 +0100
|
||||
Subject: ext-ms-win-uxtheme-themes-l1-1-0: Add dll.
|
||||
@@ -13,13 +13,13 @@ Subject: ext-ms-win-uxtheme-themes-l1-1-0: Add dll.
|
||||
create mode 100644 dlls/ext-ms-win-uxtheme-themes-l1-1-0/ext-ms-win-uxtheme-themes-l1-1-0.spec
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 1200547..b9920fb 100644
|
||||
index 377d146..be65d14 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -3018,6 +3018,7 @@ WINE_CONFIG_DLL(ext-ms-win-ntuser-message-l1-1-1)
|
||||
WINE_CONFIG_DLL(ext-ms-win-ntuser-mouse-l1-1-0)
|
||||
WINE_CONFIG_DLL(ext-ms-win-ntuser-uicontext-ext-l1-1-0)
|
||||
@@ -3030,6 +3030,7 @@ WINE_CONFIG_DLL(ext-ms-win-rtcore-gdi-rgn-l1-1-0)
|
||||
WINE_CONFIG_DLL(ext-ms-win-rtcore-ntuser-dc-access-l1-1-0)
|
||||
WINE_CONFIG_DLL(ext-ms-win-rtcore-ntuser-dpi-l1-1-0)
|
||||
WINE_CONFIG_DLL(ext-ms-win-rtcore-ntuser-sysparams-l1-1-0)
|
||||
+WINE_CONFIG_DLL(ext-ms-win-uxtheme-themes-l1-1-0)
|
||||
WINE_CONFIG_DLL(ext-ms-win-xaml-pal-l1-1-0)
|
||||
WINE_CONFIG_DLL(faultrep,,[implib])
|
||||
@@ -62,10 +62,10 @@ index 0000000..0a96983
|
||||
+@ stdcall OpenThemeDataEx(ptr wstr long) uxtheme.OpenThemeDataEx
|
||||
+@ stdcall SetWindowTheme(ptr wstr wstr) uxtheme.SetWindowTheme
|
||||
diff --git a/tools/make_specfiles b/tools/make_specfiles
|
||||
index 6cb5f53..0aa6233 100755
|
||||
index 576dc5f..1dde434 100755
|
||||
--- a/tools/make_specfiles
|
||||
+++ b/tools/make_specfiles
|
||||
@@ -317,6 +317,10 @@ my @dll_groups =
|
||||
@@ -329,6 +329,10 @@ my @dll_groups =
|
||||
"api-ms-win-core-winrt-string-l1-1-0",
|
||||
],
|
||||
[
|
||||
|
@@ -1,4 +1,4 @@
|
||||
From 2d8ce357a32cf96f732338eb5625c1cc88532355 Mon Sep 17 00:00:00 2001
|
||||
From 3d0de5feeb0cf5863dd355e0e6f271de1665124c Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
|
||||
Date: Sat, 23 Jan 2016 21:05:14 +0100
|
||||
Subject: api-ms-win-rtcore-ntuser-window-l1-1-0: Add dll
|
||||
@@ -13,13 +13,13 @@ Subject: api-ms-win-rtcore-ntuser-window-l1-1-0: Add dll
|
||||
create mode 100644 dlls/api-ms-win-rtcore-ntuser-window-l1-1-0/api-ms-win-rtcore-ntuser-window-l1-1-0.spec
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index b9920fb..4308010 100644
|
||||
index e1dc9f2..82b112b 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -2790,6 +2790,7 @@ WINE_CONFIG_DLL(api-ms-win-eventing-controller-l1-1-0)
|
||||
WINE_CONFIG_DLL(api-ms-win-eventing-provider-l1-1-0)
|
||||
WINE_CONFIG_DLL(api-ms-win-eventlog-legacy-l1-1-0)
|
||||
WINE_CONFIG_DLL(api-ms-win-ntuser-dc-access-l1-1-0)
|
||||
@@ -2800,6 +2800,7 @@ WINE_CONFIG_DLL(api-ms-win-ntuser-dc-access-l1-1-0)
|
||||
WINE_CONFIG_DLL(api-ms-win-power-base-l1-1-0)
|
||||
WINE_CONFIG_DLL(api-ms-win-power-setting-l1-1-0)
|
||||
WINE_CONFIG_DLL(api-ms-win-rtcore-ntuser-private-l1-1-0)
|
||||
+WINE_CONFIG_DLL(api-ms-win-rtcore-ntuser-window-l1-1-0)
|
||||
WINE_CONFIG_DLL(api-ms-win-security-audit-l1-1-1)
|
||||
WINE_CONFIG_DLL(api-ms-win-security-base-l1-1-0)
|
||||
@@ -119,17 +119,17 @@ index 0000000..b7575c6
|
||||
+@ stdcall WaitMessage() user32.WaitMessage
|
||||
+@ stdcall WindowFromPoint(int64) user32.WindowFromPoint
|
||||
diff --git a/tools/make_specfiles b/tools/make_specfiles
|
||||
index 0aa6233..3afaea4 100755
|
||||
index 0fd0420..89b311e 100755
|
||||
--- a/tools/make_specfiles
|
||||
+++ b/tools/make_specfiles
|
||||
@@ -284,6 +284,7 @@ my @dll_groups =
|
||||
"api-ms-win-core-string-l2-1-0",
|
||||
@@ -302,6 +302,7 @@ my @dll_groups =
|
||||
"api-ms-win-downlevel-user32-l1-1-0",
|
||||
"api-ms-win-ntuser-dc-access-l1-1-0",
|
||||
"api-ms-win-rtcore-ntuser-private-l1-1-0",
|
||||
+ "api-ms-win-rtcore-ntuser-window-l1-1-0",
|
||||
"ext-ms-win-ntuser-message-l1-1-1",
|
||||
"ext-ms-win-ntuser-mouse-l1-1-0",
|
||||
"ext-ms-win-ntuser-uicontext-ext-l1-1-0",
|
||||
"ext-ms-win-ntuser-private-l1-1-1",
|
||||
--
|
||||
2.9.0
|
||||
|
||||
|
@@ -1,4 +1,4 @@
|
||||
From b86c534df0ffdfcbe823eed592e88d242733204a Mon Sep 17 00:00:00 2001
|
||||
From 6c31a75359f023d3152378144efdee5f34078147 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
|
||||
Date: Sat, 23 Jan 2016 21:06:59 +0100
|
||||
Subject: ext-ms-win-rtcore-ntuser-syscolors-l1-1-0: Add dll.
|
||||
@@ -13,17 +13,17 @@ Subject: ext-ms-win-rtcore-ntuser-syscolors-l1-1-0: Add dll.
|
||||
create mode 100644 dlls/ext-ms-win-rtcore-ntuser-syscolors-l1-1-0/ext-ms-win-rtcore-ntuser-syscolors-l1-1-0.spec
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 4308010..e348625 100644
|
||||
index e865969..4e7869f 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -3019,6 +3019,7 @@ WINE_CONFIG_DLL(ext-ms-win-ntuser-message-l1-1-1)
|
||||
WINE_CONFIG_DLL(ext-ms-win-ntuser-mouse-l1-1-0)
|
||||
WINE_CONFIG_DLL(ext-ms-win-ntuser-uicontext-ext-l1-1-0)
|
||||
@@ -3030,6 +3030,7 @@ WINE_CONFIG_DLL(ext-ms-win-rtcore-gdi-object-l1-1-0)
|
||||
WINE_CONFIG_DLL(ext-ms-win-rtcore-gdi-rgn-l1-1-0)
|
||||
WINE_CONFIG_DLL(ext-ms-win-rtcore-ntuser-dc-access-l1-1-0)
|
||||
WINE_CONFIG_DLL(ext-ms-win-rtcore-ntuser-dpi-l1-1-0)
|
||||
+WINE_CONFIG_DLL(ext-ms-win-rtcore-ntuser-syscolors-l1-1-0)
|
||||
WINE_CONFIG_DLL(ext-ms-win-rtcore-ntuser-sysparams-l1-1-0)
|
||||
WINE_CONFIG_DLL(ext-ms-win-uxtheme-themes-l1-1-0)
|
||||
WINE_CONFIG_DLL(ext-ms-win-xaml-pal-l1-1-0)
|
||||
WINE_CONFIG_DLL(faultrep,,[implib])
|
||||
diff --git a/dlls/ext-ms-win-rtcore-ntuser-syscolors-l1-1-0/Makefile.in b/dlls/ext-ms-win-rtcore-ntuser-syscolors-l1-1-0/Makefile.in
|
||||
new file mode 100644
|
||||
index 0000000..3e6b6e8
|
||||
@@ -40,17 +40,17 @@ index 0000000..626c778
|
||||
+@ stdcall GetSysColor(long) user32.GetSysColor
|
||||
+@ stdcall SetSysColors(long ptr ptr) user32.SetSysColors
|
||||
diff --git a/tools/make_specfiles b/tools/make_specfiles
|
||||
index 3afaea4..e192572 100755
|
||||
index 40129d0..1230505 100755
|
||||
--- a/tools/make_specfiles
|
||||
+++ b/tools/make_specfiles
|
||||
@@ -289,6 +289,7 @@ my @dll_groups =
|
||||
"ext-ms-win-ntuser-mouse-l1-1-0",
|
||||
"ext-ms-win-ntuser-uicontext-ext-l1-1-0",
|
||||
@@ -294,6 +294,7 @@ my @dll_groups =
|
||||
"ext-ms-win-ntuser-window-l1-1-1",
|
||||
"ext-ms-win-rtcore-ntuser-dc-access-l1-1-0",
|
||||
"ext-ms-win-rtcore-ntuser-dpi-l1-1-0",
|
||||
+ "ext-ms-win-rtcore-ntuser-syscolors-l1-1-0",
|
||||
"ext-ms-win-rtcore-ntuser-sysparams-l1-1-0",
|
||||
],
|
||||
[
|
||||
"version",
|
||||
--
|
||||
2.9.0
|
||||
|
||||
|
@@ -1,4 +1,4 @@
|
||||
From 50e5a8cff7cfb80c56df1ece4376caa1b4c158e6 Mon Sep 17 00:00:00 2001
|
||||
From 3aa4751bd2cd9918733772e4a5a6c418bebfe560 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
|
||||
Date: Sat, 23 Jan 2016 21:08:48 +0100
|
||||
Subject: api-ms-win-rtcore-ntuser-draw-l1-1-0: Add dll.
|
||||
@@ -13,17 +13,17 @@ Subject: api-ms-win-rtcore-ntuser-draw-l1-1-0: Add dll.
|
||||
create mode 100644 dlls/api-ms-win-rtcore-ntuser-draw-l1-1-0/api-ms-win-rtcore-ntuser-draw-l1-1-0.spec
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index e348625..7bd2367 100644
|
||||
index 97dfa5e..cd145dd 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -2790,6 +2790,7 @@ WINE_CONFIG_DLL(api-ms-win-eventing-controller-l1-1-0)
|
||||
WINE_CONFIG_DLL(api-ms-win-eventing-provider-l1-1-0)
|
||||
WINE_CONFIG_DLL(api-ms-win-eventlog-legacy-l1-1-0)
|
||||
@@ -2799,6 +2799,7 @@ WINE_CONFIG_DLL(api-ms-win-eventlog-legacy-l1-1-0)
|
||||
WINE_CONFIG_DLL(api-ms-win-ntuser-dc-access-l1-1-0)
|
||||
WINE_CONFIG_DLL(api-ms-win-power-base-l1-1-0)
|
||||
WINE_CONFIG_DLL(api-ms-win-power-setting-l1-1-0)
|
||||
+WINE_CONFIG_DLL(api-ms-win-rtcore-ntuser-draw-l1-1-0)
|
||||
WINE_CONFIG_DLL(api-ms-win-rtcore-ntuser-private-l1-1-0)
|
||||
WINE_CONFIG_DLL(api-ms-win-rtcore-ntuser-window-l1-1-0)
|
||||
WINE_CONFIG_DLL(api-ms-win-security-audit-l1-1-1)
|
||||
WINE_CONFIG_DLL(api-ms-win-security-base-l1-1-0)
|
||||
diff --git a/dlls/api-ms-win-rtcore-ntuser-draw-l1-1-0/Makefile.in b/dlls/api-ms-win-rtcore-ntuser-draw-l1-1-0/Makefile.in
|
||||
new file mode 100644
|
||||
index 0000000..956f2f3
|
||||
@@ -39,17 +39,17 @@ index 0000000..59900a9
|
||||
@@ -0,0 +1 @@
|
||||
+@ stdcall RedrawWindow(long ptr long long) user32.RedrawWindow
|
||||
diff --git a/tools/make_specfiles b/tools/make_specfiles
|
||||
index e192572..466099d 100755
|
||||
index a37666c..937a92f 100755
|
||||
--- a/tools/make_specfiles
|
||||
+++ b/tools/make_specfiles
|
||||
@@ -284,6 +284,7 @@ my @dll_groups =
|
||||
@@ -301,6 +301,7 @@ my @dll_groups =
|
||||
"api-ms-win-core-string-l2-1-0",
|
||||
"api-ms-win-downlevel-user32-l1-1-0",
|
||||
"api-ms-win-ntuser-dc-access-l1-1-0",
|
||||
+ "api-ms-win-rtcore-ntuser-draw-l1-1-0",
|
||||
"api-ms-win-rtcore-ntuser-private-l1-1-0",
|
||||
"api-ms-win-rtcore-ntuser-window-l1-1-0",
|
||||
"ext-ms-win-ntuser-message-l1-1-1",
|
||||
"ext-ms-win-ntuser-mouse-l1-1-0",
|
||||
--
|
||||
2.9.0
|
||||
|
||||
|
@@ -1,74 +0,0 @@
|
||||
From 623de09b704239ee022242aed2966ece410556c4 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
|
||||
Date: Sat, 23 Jan 2016 21:10:37 +0100
|
||||
Subject: ext-ms-win-rtcore-ntuser-sysparams-l1-1-0: Add dll.
|
||||
|
||||
---
|
||||
configure.ac | 1 +
|
||||
.../Makefile.in | 1 +
|
||||
.../ext-ms-win-rtcore-ntuser-sysparams-l1-1-0.spec | 20 ++++++++++++++++++++
|
||||
tools/make_specfiles | 1 +
|
||||
4 files changed, 23 insertions(+)
|
||||
create mode 100644 dlls/ext-ms-win-rtcore-ntuser-sysparams-l1-1-0/Makefile.in
|
||||
create mode 100644 dlls/ext-ms-win-rtcore-ntuser-sysparams-l1-1-0/ext-ms-win-rtcore-ntuser-sysparams-l1-1-0.spec
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 7bd2367..302a94d 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -3021,6 +3021,7 @@ WINE_CONFIG_DLL(ext-ms-win-ntuser-mouse-l1-1-0)
|
||||
WINE_CONFIG_DLL(ext-ms-win-ntuser-uicontext-ext-l1-1-0)
|
||||
WINE_CONFIG_DLL(ext-ms-win-rtcore-ntuser-dpi-l1-1-0)
|
||||
WINE_CONFIG_DLL(ext-ms-win-rtcore-ntuser-syscolors-l1-1-0)
|
||||
+WINE_CONFIG_DLL(ext-ms-win-rtcore-ntuser-sysparams-l1-1-0)
|
||||
WINE_CONFIG_DLL(ext-ms-win-uxtheme-themes-l1-1-0)
|
||||
WINE_CONFIG_DLL(ext-ms-win-xaml-pal-l1-1-0)
|
||||
WINE_CONFIG_DLL(faultrep,,[implib])
|
||||
diff --git a/dlls/ext-ms-win-rtcore-ntuser-sysparams-l1-1-0/Makefile.in b/dlls/ext-ms-win-rtcore-ntuser-sysparams-l1-1-0/Makefile.in
|
||||
new file mode 100644
|
||||
index 0000000..18a0b1f
|
||||
--- /dev/null
|
||||
+++ b/dlls/ext-ms-win-rtcore-ntuser-sysparams-l1-1-0/Makefile.in
|
||||
@@ -0,0 +1 @@
|
||||
+MODULE = ext-ms-win-rtcore-ntuser-sysparams-l1-1-0.dll
|
||||
diff --git a/dlls/ext-ms-win-rtcore-ntuser-sysparams-l1-1-0/ext-ms-win-rtcore-ntuser-sysparams-l1-1-0.spec b/dlls/ext-ms-win-rtcore-ntuser-sysparams-l1-1-0/ext-ms-win-rtcore-ntuser-sysparams-l1-1-0.spec
|
||||
new file mode 100644
|
||||
index 0000000..ffb8f5b
|
||||
--- /dev/null
|
||||
+++ b/dlls/ext-ms-win-rtcore-ntuser-sysparams-l1-1-0/ext-ms-win-rtcore-ntuser-sysparams-l1-1-0.spec
|
||||
@@ -0,0 +1,20 @@
|
||||
+@ stdcall ChangeDisplaySettingsExW(wstr ptr long long ptr) user32.ChangeDisplaySettingsExW
|
||||
+@ stdcall DisplayConfigGetDeviceInfo(ptr) user32.DisplayConfigGetDeviceInfo
|
||||
+@ stub DisplayConfigSetDeviceInfo
|
||||
+@ stdcall EnumDisplayDevicesW(ptr long ptr long) user32.EnumDisplayDevicesW
|
||||
+@ stdcall EnumDisplayMonitors(long ptr ptr long) user32.EnumDisplayMonitors
|
||||
+@ stdcall EnumDisplaySettingsExW(wstr long ptr long) user32.EnumDisplaySettingsExW
|
||||
+@ stdcall EnumDisplaySettingsW(wstr long ptr ) user32.EnumDisplaySettingsW
|
||||
+@ stdcall GetDisplayConfigBufferSizes(long ptr ptr) user32.GetDisplayConfigBufferSizes
|
||||
+@ stdcall GetMonitorInfoW(long ptr) user32.GetMonitorInfoW
|
||||
+@ stdcall GetSysColor(long) user32.GetSysColor
|
||||
+@ stdcall GetSystemMetrics(long) user32.GetSystemMetrics
|
||||
+@ stdcall IsProcessDPIAware() user32.IsProcessDPIAware
|
||||
+@ stdcall MonitorFromPoint(int64 long) user32.MonitorFromPoint
|
||||
+@ stdcall MonitorFromRect(ptr long) user32.MonitorFromRect
|
||||
+@ stdcall MonitorFromWindow(long long) user32.MonitorFromWindow
|
||||
+@ stdcall QueryDisplayConfig(long ptr ptr ptr ptr ptr) user32.QueryDisplayConfig
|
||||
+@ stdcall SetProcessDPIAware() user32.SetProcessDPIAware
|
||||
+@ stdcall SetSysColors(long ptr ptr) user32.SetSysColors
|
||||
+@ stdcall SystemParametersInfoA(long long ptr long) user32.SystemParametersInfoA
|
||||
+@ stdcall SystemParametersInfoW(long long ptr long) user32.SystemParametersInfoW
|
||||
diff --git a/tools/make_specfiles b/tools/make_specfiles
|
||||
index 466099d..238feb1 100755
|
||||
--- a/tools/make_specfiles
|
||||
+++ b/tools/make_specfiles
|
||||
@@ -291,6 +291,7 @@ my @dll_groups =
|
||||
"ext-ms-win-ntuser-uicontext-ext-l1-1-0",
|
||||
"ext-ms-win-rtcore-ntuser-dpi-l1-1-0",
|
||||
"ext-ms-win-rtcore-ntuser-syscolors-l1-1-0",
|
||||
+ "ext-ms-win-rtcore-ntuser-sysparams-l1-1-0",
|
||||
],
|
||||
[
|
||||
"version",
|
||||
--
|
||||
2.9.0
|
||||
|
@@ -0,0 +1,43 @@
|
||||
From 7b2e5b361ebe380ae671b8f3d2ae4c90167354dc Mon Sep 17 00:00:00 2001
|
||||
From: Sebastian Lackner <sebastian@fds-team.de>
|
||||
Date: Tue, 15 Nov 2016 22:00:38 +0100
|
||||
Subject: uiautomationcore: Add stub for UiaClientsAreListening.
|
||||
|
||||
---
|
||||
dlls/uiautomationcore/main.c | 6 ++++++
|
||||
dlls/uiautomationcore/uiautomationcore.spec | 2 +-
|
||||
2 files changed, 7 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/dlls/uiautomationcore/main.c b/dlls/uiautomationcore/main.c
|
||||
index 71fe84c..6ea1351 100644
|
||||
--- a/dlls/uiautomationcore/main.c
|
||||
+++ b/dlls/uiautomationcore/main.c
|
||||
@@ -99,6 +99,12 @@ LRESULT WINAPI UiaReturnRawElementProvider(HWND hwnd, WPARAM wparam, LPARAM lpar
|
||||
return 0;
|
||||
}
|
||||
|
||||
+BOOL WINAPI UiaClientsAreListening(void)
|
||||
+{
|
||||
+ FIXME("(): stub\n");
|
||||
+ return FALSE;
|
||||
+}
|
||||
+
|
||||
|
||||
BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved)
|
||||
{
|
||||
diff --git a/dlls/uiautomationcore/uiautomationcore.spec b/dlls/uiautomationcore/uiautomationcore.spec
|
||||
index 321cd06..221711c 100644
|
||||
--- a/dlls/uiautomationcore/uiautomationcore.spec
|
||||
+++ b/dlls/uiautomationcore/uiautomationcore.spec
|
||||
@@ -52,7 +52,7 @@
|
||||
@ stub TransformPattern_Resize
|
||||
@ stub TransformPattern_Rotate
|
||||
@ stub UiaAddEvent
|
||||
-@ stub UiaClientsAreListening
|
||||
+@ stdcall UiaClientsAreListening()
|
||||
@ stub UiaDisconnectAllProviders
|
||||
@ stub UiaDisconnectProvider
|
||||
@ stub UiaEventAddWindow
|
||||
--
|
||||
2.9.0
|
||||
|
@@ -0,0 +1,42 @@
|
||||
From 64ce8c391c3706a2b3ce9b5f8f76710d5751a766 Mon Sep 17 00:00:00 2001
|
||||
From: Dmitry Timoshkov <dmitry@baikal.ru>
|
||||
Date: Thu, 20 Oct 2016 17:48:24 +0800
|
||||
Subject: avifil32: AVIFileGetStream should set stream to NULL in case of an
|
||||
error.
|
||||
|
||||
---
|
||||
dlls/avifil32/avifile.c | 1 +
|
||||
dlls/avifil32/tests/api.c | 5 +++++
|
||||
2 files changed, 6 insertions(+)
|
||||
|
||||
diff --git a/dlls/avifil32/avifile.c b/dlls/avifil32/avifile.c
|
||||
index f649d05..7a4caaa 100644
|
||||
--- a/dlls/avifil32/avifile.c
|
||||
+++ b/dlls/avifil32/avifile.c
|
||||
@@ -316,6 +316,7 @@ static HRESULT WINAPI IAVIFile_fnGetStream(IAVIFile *iface, IAVIStream **avis, D
|
||||
}
|
||||
|
||||
/* Sorry, but the specified stream doesn't exist */
|
||||
+ *avis = NULL;
|
||||
return AVIERR_NODATA;
|
||||
}
|
||||
|
||||
diff --git a/dlls/avifil32/tests/api.c b/dlls/avifil32/tests/api.c
|
||||
index b3d822d..8a00865 100644
|
||||
--- a/dlls/avifil32/tests/api.c
|
||||
+++ b/dlls/avifil32/tests/api.c
|
||||
@@ -373,6 +373,11 @@ static void test_default_data(void)
|
||||
res = AVIFileOpenA(&pFile, filename, OF_SHARE_DENY_WRITE, 0L);
|
||||
ok(res == 0, "Unable to open file: error=%u\n", res);
|
||||
|
||||
+ pStream0 = (void *)0xdeadbeef;
|
||||
+ res = AVIFileGetStream(pFile, &pStream0, ~0, 0);
|
||||
+ ok(res == AVIERR_NODATA, "expected AVIERR_NODATA, got %#x\n", res);
|
||||
+ ok(pStream0 == NULL, "AVIFileGetStream should set stream to NULL\n");
|
||||
+
|
||||
res = AVIFileGetStream(pFile, &pStream0, 0, 0);
|
||||
ok(res == 0, "Unable to open video stream: error=%u\n", res);
|
||||
|
||||
--
|
||||
2.9.0
|
||||
|
1
patches/avifil32-AVIFileGetStream/definition
Normal file
1
patches/avifil32-AVIFileGetStream/definition
Normal file
@@ -0,0 +1 @@
|
||||
Fixes: [41579] AVIFileGetStream should set stream to NULL in case of an error
|
@@ -0,0 +1,43 @@
|
||||
From bba53bba66f4ca7b8726424e8215854a657c024a Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
|
||||
Date: Tue, 15 Nov 2016 23:50:23 +0100
|
||||
Subject: crypt32: Properly check root certificate in
|
||||
CERT_CHAIN_REVOCATION_CHECK_CHAIN.
|
||||
|
||||
CA certificates do not have a parent which defines a CRL, but Windows seems to require
|
||||
that CA certificates are self signed. We therefore should set pIssuerCert to the
|
||||
CA certificate itself before calling CertVerifyRevocation. On windows the function
|
||||
does not seem to fail if no CRL could be found, so ignore this error for now.
|
||||
---
|
||||
dlls/crypt32/chain.c | 12 +++++++++++-
|
||||
1 file changed, 11 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c
|
||||
index aab2e91..80b6513 100644
|
||||
--- a/dlls/crypt32/chain.c
|
||||
+++ b/dlls/crypt32/chain.c
|
||||
@@ -2704,10 +2704,20 @@ static void CRYPT_VerifyChainRevocation(PCERT_CHAIN_CONTEXT chain,
|
||||
revocationPara.pIssuerCert =
|
||||
chain->rgpChain[i]->rgpElement[j + 1]->pCertContext;
|
||||
else
|
||||
- revocationPara.pIssuerCert = NULL;
|
||||
+ revocationPara.pIssuerCert = certToCheck;
|
||||
+
|
||||
ret = CertVerifyRevocation(X509_ASN_ENCODING,
|
||||
CERT_CONTEXT_REVOCATION_TYPE, 1, (void **)&certToCheck,
|
||||
revocationFlags, &revocationPara, &revocationStatus);
|
||||
+
|
||||
+ if (!ret && revocationStatus.dwError == CRYPT_E_NO_REVOCATION_CHECK &&
|
||||
+ revocationPara.pIssuerCert == certToCheck)
|
||||
+ {
|
||||
+ FIXME("Unable to find CRL for CA certificate\n");
|
||||
+ ret = TRUE;
|
||||
+ revocationStatus.dwError = 0;
|
||||
+ }
|
||||
+
|
||||
if (!ret)
|
||||
{
|
||||
PCERT_CHAIN_ELEMENT element = CRYPT_FindIthElementInChain(
|
||||
--
|
||||
2.9.0
|
||||
|
1
patches/crypt32-Certificate_Check/definition
Normal file
1
patches/crypt32-Certificate_Check/definition
Normal file
@@ -0,0 +1 @@
|
||||
Fixes: [41652] Fix root certificate check in CERT_CHAIN_REVOCATION_CHECK_CHAIN
|
@@ -1,4 +1,4 @@
|
||||
From 8d6c11843653a41d80831c561672e180b2adefb0 Mon Sep 17 00:00:00 2001
|
||||
From dad1b9f398b041ba706723cc8857fcc2e9cc2669 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:49:52 +0200
|
||||
Subject: d3d11/tests: Add test for creating 1d textures.
|
||||
@@ -8,10 +8,10 @@ Subject: d3d11/tests: Add test for creating 1d textures.
|
||||
1 file changed, 189 insertions(+)
|
||||
|
||||
diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c
|
||||
index 6ce6015..02eeb88 100644
|
||||
index 8ad94af..2b0b6f6 100644
|
||||
--- a/dlls/d3d11/tests/d3d11.c
|
||||
+++ b/dlls/d3d11/tests/d3d11.c
|
||||
@@ -1613,6 +1613,194 @@ static void test_get_immediate_context(void)
|
||||
@@ -1618,6 +1618,194 @@ static void test_get_immediate_context(void)
|
||||
ok(!refcount, "Device has %u references left.\n", refcount);
|
||||
}
|
||||
|
||||
@@ -62,7 +62,7 @@ index 6ce6015..02eeb88 100644
|
||||
+ {DXGI_FORMAT_R16G16B16A16_TYPELESS, 1, D3D11_BIND_SHADER_RESOURCE, 0, TRUE, FALSE},
|
||||
+ {DXGI_FORMAT_R16G16B16A16_TYPELESS, 1, D3D11_BIND_RENDER_TARGET, 0, TRUE, FALSE},
|
||||
+ {DXGI_FORMAT_R32G32_TYPELESS, 1, D3D11_BIND_SHADER_RESOURCE, 0, TRUE, FALSE},
|
||||
+ {DXGI_FORMAT_R32G8X24_TYPELESS, 1, D3D11_BIND_DEPTH_STENCIL, 0, TRUE, TRUE},
|
||||
+ {DXGI_FORMAT_R32G8X24_TYPELESS, 1, D3D11_BIND_DEPTH_STENCIL, 0, TRUE, FALSE},
|
||||
+ {DXGI_FORMAT_R10G10B10A2_TYPELESS, 1, D3D11_BIND_SHADER_RESOURCE, 0, TRUE, FALSE},
|
||||
+ {DXGI_FORMAT_R10G10B10A2_TYPELESS, 1, D3D11_BIND_RENDER_TARGET, 0, TRUE, FALSE},
|
||||
+ {DXGI_FORMAT_R16G16_TYPELESS, 1, D3D11_BIND_SHADER_RESOURCE, 0, TRUE, FALSE},
|
||||
@@ -206,7 +206,7 @@ index 6ce6015..02eeb88 100644
|
||||
static void test_create_texture2d(void)
|
||||
{
|
||||
ULONG refcount, expected_refcount;
|
||||
@@ -10801,6 +10989,7 @@ START_TEST(d3d11)
|
||||
@@ -12282,6 +12470,7 @@ START_TEST(d3d11)
|
||||
test_create_device();
|
||||
run_for_each_feature_level(test_device_interfaces);
|
||||
test_get_immediate_context();
|
||||
|
@@ -0,0 +1,322 @@
|
||||
From 75850ab0bde50806f0d9f43e0353cccd3f35bab5 Mon Sep 17 00:00:00 2001
|
||||
From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
|
||||
Date: Sat, 12 Nov 2016 09:27:49 +1100
|
||||
Subject: d3dx9: Implement D3DXComputeTangent
|
||||
|
||||
Signed-off-by: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
|
||||
---
|
||||
dlls/d3dx9_24/d3dx9_24.spec | 2 +-
|
||||
dlls/d3dx9_25/d3dx9_25.spec | 2 +-
|
||||
dlls/d3dx9_26/d3dx9_26.spec | 2 +-
|
||||
dlls/d3dx9_27/d3dx9_27.spec | 2 +-
|
||||
dlls/d3dx9_28/d3dx9_28.spec | 2 +-
|
||||
dlls/d3dx9_29/d3dx9_29.spec | 2 +-
|
||||
dlls/d3dx9_30/d3dx9_30.spec | 2 +-
|
||||
dlls/d3dx9_31/d3dx9_31.spec | 2 +-
|
||||
dlls/d3dx9_32/d3dx9_32.spec | 2 +-
|
||||
dlls/d3dx9_33/d3dx9_33.spec | 2 +-
|
||||
dlls/d3dx9_34/d3dx9_34.spec | 2 +-
|
||||
dlls/d3dx9_35/d3dx9_35.spec | 2 +-
|
||||
dlls/d3dx9_36/d3dx9_36.spec | 2 +-
|
||||
dlls/d3dx9_36/mesh.c | 18 ++++++++++++++++++
|
||||
dlls/d3dx9_37/d3dx9_37.spec | 2 +-
|
||||
dlls/d3dx9_38/d3dx9_38.spec | 2 +-
|
||||
dlls/d3dx9_39/d3dx9_39.spec | 2 +-
|
||||
dlls/d3dx9_40/d3dx9_40.spec | 2 +-
|
||||
dlls/d3dx9_41/d3dx9_41.spec | 2 +-
|
||||
dlls/d3dx9_42/d3dx9_42.spec | 2 +-
|
||||
dlls/d3dx9_43/d3dx9_43.spec | 2 +-
|
||||
21 files changed, 38 insertions(+), 20 deletions(-)
|
||||
|
||||
diff --git a/dlls/d3dx9_24/d3dx9_24.spec b/dlls/d3dx9_24/d3dx9_24.spec
|
||||
index 1334c13..3ad19db 100644
|
||||
--- a/dlls/d3dx9_24/d3dx9_24.spec
|
||||
+++ b/dlls/d3dx9_24/d3dx9_24.spec
|
||||
@@ -20,7 +20,7 @@
|
||||
@ stdcall D3DXComputeBoundingSphere(ptr long long ptr ptr)
|
||||
@ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float)
|
||||
@ stdcall D3DXComputeNormals(ptr ptr)
|
||||
-@ stub D3DXComputeTangent(ptr long long long long ptr)
|
||||
+@ stdcall D3DXComputeTangent(ptr long long long long ptr)
|
||||
@ 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)
|
||||
diff --git a/dlls/d3dx9_25/d3dx9_25.spec b/dlls/d3dx9_25/d3dx9_25.spec
|
||||
index d05b0ed..5db153e 100644
|
||||
--- a/dlls/d3dx9_25/d3dx9_25.spec
|
||||
+++ b/dlls/d3dx9_25/d3dx9_25.spec
|
||||
@@ -20,7 +20,7 @@
|
||||
@ stdcall D3DXComputeBoundingSphere(ptr long long ptr ptr)
|
||||
@ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float)
|
||||
@ stdcall D3DXComputeNormals(ptr ptr)
|
||||
-@ stub D3DXComputeTangent(ptr long long long long ptr)
|
||||
+@ stdcall D3DXComputeTangent(ptr long long long long ptr)
|
||||
@ 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)
|
||||
diff --git a/dlls/d3dx9_26/d3dx9_26.spec b/dlls/d3dx9_26/d3dx9_26.spec
|
||||
index e948b58..70a8f3d 100644
|
||||
--- a/dlls/d3dx9_26/d3dx9_26.spec
|
||||
+++ b/dlls/d3dx9_26/d3dx9_26.spec
|
||||
@@ -24,7 +24,7 @@
|
||||
@ stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr)
|
||||
@ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float)
|
||||
@ stdcall D3DXComputeNormals(ptr ptr)
|
||||
-@ stub D3DXComputeTangent(ptr long long long long ptr)
|
||||
+@ stdcall D3DXComputeTangent(ptr long long long long ptr)
|
||||
@ 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)
|
||||
diff --git a/dlls/d3dx9_27/d3dx9_27.spec b/dlls/d3dx9_27/d3dx9_27.spec
|
||||
index e948b58..70a8f3d 100644
|
||||
--- a/dlls/d3dx9_27/d3dx9_27.spec
|
||||
+++ b/dlls/d3dx9_27/d3dx9_27.spec
|
||||
@@ -24,7 +24,7 @@
|
||||
@ stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr)
|
||||
@ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float)
|
||||
@ stdcall D3DXComputeNormals(ptr ptr)
|
||||
-@ stub D3DXComputeTangent(ptr long long long long ptr)
|
||||
+@ stdcall D3DXComputeTangent(ptr long long long long ptr)
|
||||
@ 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)
|
||||
diff --git a/dlls/d3dx9_28/d3dx9_28.spec b/dlls/d3dx9_28/d3dx9_28.spec
|
||||
index fe0c096..1f5fa3a 100644
|
||||
--- a/dlls/d3dx9_28/d3dx9_28.spec
|
||||
+++ b/dlls/d3dx9_28/d3dx9_28.spec
|
||||
@@ -24,7 +24,7 @@
|
||||
@ stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr)
|
||||
@ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float)
|
||||
@ stdcall D3DXComputeNormals(ptr ptr)
|
||||
-@ stub D3DXComputeTangent(ptr long long long long ptr)
|
||||
+@ stdcall D3DXComputeTangent(ptr long long long long ptr)
|
||||
@ 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)
|
||||
diff --git a/dlls/d3dx9_29/d3dx9_29.spec b/dlls/d3dx9_29/d3dx9_29.spec
|
||||
index fe0c096..1f5fa3a 100644
|
||||
--- a/dlls/d3dx9_29/d3dx9_29.spec
|
||||
+++ b/dlls/d3dx9_29/d3dx9_29.spec
|
||||
@@ -24,7 +24,7 @@
|
||||
@ stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr)
|
||||
@ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float)
|
||||
@ stdcall D3DXComputeNormals(ptr ptr)
|
||||
-@ stub D3DXComputeTangent(ptr long long long long ptr)
|
||||
+@ stdcall D3DXComputeTangent(ptr long long long long ptr)
|
||||
@ 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)
|
||||
diff --git a/dlls/d3dx9_30/d3dx9_30.spec b/dlls/d3dx9_30/d3dx9_30.spec
|
||||
index 33d30b1..6bc771c 100644
|
||||
--- a/dlls/d3dx9_30/d3dx9_30.spec
|
||||
+++ b/dlls/d3dx9_30/d3dx9_30.spec
|
||||
@@ -24,7 +24,7 @@
|
||||
@ stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr)
|
||||
@ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float)
|
||||
@ stdcall D3DXComputeNormals(ptr ptr)
|
||||
-@ stub D3DXComputeTangent(ptr long long long long ptr)
|
||||
+@ stdcall D3DXComputeTangent(ptr long long long long ptr)
|
||||
@ 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)
|
||||
diff --git a/dlls/d3dx9_31/d3dx9_31.spec b/dlls/d3dx9_31/d3dx9_31.spec
|
||||
index 083a0ec..04b1b43 100644
|
||||
--- a/dlls/d3dx9_31/d3dx9_31.spec
|
||||
+++ b/dlls/d3dx9_31/d3dx9_31.spec
|
||||
@@ -24,7 +24,7 @@
|
||||
@ stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr)
|
||||
@ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float)
|
||||
@ stdcall D3DXComputeNormals(ptr ptr)
|
||||
-@ stub D3DXComputeTangent(ptr long long long long ptr)
|
||||
+@ stdcall D3DXComputeTangent(ptr long long long long ptr)
|
||||
@ 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)
|
||||
diff --git a/dlls/d3dx9_32/d3dx9_32.spec b/dlls/d3dx9_32/d3dx9_32.spec
|
||||
index 687d36b..e18f8cd 100644
|
||||
--- a/dlls/d3dx9_32/d3dx9_32.spec
|
||||
+++ b/dlls/d3dx9_32/d3dx9_32.spec
|
||||
@@ -24,7 +24,7 @@
|
||||
@ stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr)
|
||||
@ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float)
|
||||
@ stdcall D3DXComputeNormals(ptr ptr)
|
||||
-@ stub D3DXComputeTangent(ptr long long long long ptr)
|
||||
+@ stdcall D3DXComputeTangent(ptr long long long long ptr)
|
||||
@ 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)
|
||||
diff --git a/dlls/d3dx9_33/d3dx9_33.spec b/dlls/d3dx9_33/d3dx9_33.spec
|
||||
index 687d36b..e18f8cd 100644
|
||||
--- a/dlls/d3dx9_33/d3dx9_33.spec
|
||||
+++ b/dlls/d3dx9_33/d3dx9_33.spec
|
||||
@@ -24,7 +24,7 @@
|
||||
@ stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr)
|
||||
@ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float)
|
||||
@ stdcall D3DXComputeNormals(ptr ptr)
|
||||
-@ stub D3DXComputeTangent(ptr long long long long ptr)
|
||||
+@ stdcall D3DXComputeTangent(ptr long long long long ptr)
|
||||
@ 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)
|
||||
diff --git a/dlls/d3dx9_34/d3dx9_34.spec b/dlls/d3dx9_34/d3dx9_34.spec
|
||||
index 687d36b..e18f8cd 100644
|
||||
--- a/dlls/d3dx9_34/d3dx9_34.spec
|
||||
+++ b/dlls/d3dx9_34/d3dx9_34.spec
|
||||
@@ -24,7 +24,7 @@
|
||||
@ stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr)
|
||||
@ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float)
|
||||
@ stdcall D3DXComputeNormals(ptr ptr)
|
||||
-@ stub D3DXComputeTangent(ptr long long long long ptr)
|
||||
+@ stdcall D3DXComputeTangent(ptr long long long long ptr)
|
||||
@ 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)
|
||||
diff --git a/dlls/d3dx9_35/d3dx9_35.spec b/dlls/d3dx9_35/d3dx9_35.spec
|
||||
index 687d36b..e18f8cd 100644
|
||||
--- a/dlls/d3dx9_35/d3dx9_35.spec
|
||||
+++ b/dlls/d3dx9_35/d3dx9_35.spec
|
||||
@@ -24,7 +24,7 @@
|
||||
@ stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr)
|
||||
@ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float)
|
||||
@ stdcall D3DXComputeNormals(ptr ptr)
|
||||
-@ stub D3DXComputeTangent(ptr long long long long ptr)
|
||||
+@ stdcall D3DXComputeTangent(ptr long long long long ptr)
|
||||
@ 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)
|
||||
diff --git a/dlls/d3dx9_36/d3dx9_36.spec b/dlls/d3dx9_36/d3dx9_36.spec
|
||||
index 8a95d53..97f6335 100644
|
||||
--- a/dlls/d3dx9_36/d3dx9_36.spec
|
||||
+++ b/dlls/d3dx9_36/d3dx9_36.spec
|
||||
@@ -24,7 +24,7 @@
|
||||
@ stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr)
|
||||
@ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float)
|
||||
@ stdcall D3DXComputeNormals(ptr ptr)
|
||||
-@ stub D3DXComputeTangent(ptr long long long long ptr)
|
||||
+@ stdcall D3DXComputeTangent(ptr long long long long ptr)
|
||||
@ 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)
|
||||
diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c
|
||||
index 984b2f6..a206e06 100644
|
||||
--- a/dlls/d3dx9_36/mesh.c
|
||||
+++ b/dlls/d3dx9_36/mesh.c
|
||||
@@ -7517,6 +7517,24 @@ done:
|
||||
}
|
||||
|
||||
/*************************************************************************
|
||||
+ * D3DXComputeTangent (D3DX9_36.@)
|
||||
+ */
|
||||
+HRESULT WINAPI D3DXComputeTangent(ID3DXMesh *mesh, DWORD stage_idx, DWORD tangent_idx,
|
||||
+ DWORD binorm_idx, DWORD wrap, const DWORD *adjacency)
|
||||
+{
|
||||
+ TRACE("mesh %p, stage_idx %d, tangent_idx %d, binorm_idx %d, wrap %d, adjacency %p.\n",
|
||||
+ mesh, stage_idx, tangent_idx, binorm_idx, wrap, adjacency);
|
||||
+
|
||||
+ return D3DXComputeTangentFrameEx( mesh, D3DDECLUSAGE_TEXCOORD, stage_idx,
|
||||
+ ( binorm_idx == D3DX_DEFAULT ) ? D3DX_DEFAULT : D3DDECLUSAGE_BINORMAL,
|
||||
+ binorm_idx,
|
||||
+ ( tangent_idx == D3DX_DEFAULT ) ? D3DX_DEFAULT : D3DDECLUSAGE_TANGENT,
|
||||
+ tangent_idx, D3DX_DEFAULT, 0,
|
||||
+ ( wrap ? D3DXTANGENT_WRAP_UV : 0 ) | D3DXTANGENT_GENERATE_IN_PLACE | D3DXTANGENT_ORTHOGONALIZE_FROM_U,
|
||||
+ adjacency, -1.01f, -0.01f, -1.01f, NULL, NULL);
|
||||
+}
|
||||
+
|
||||
+/*************************************************************************
|
||||
* D3DXComputeNormals (D3DX9_36.@)
|
||||
*/
|
||||
HRESULT WINAPI D3DXComputeNormals(struct ID3DXBaseMesh *mesh, const DWORD *adjacency)
|
||||
diff --git a/dlls/d3dx9_37/d3dx9_37.spec b/dlls/d3dx9_37/d3dx9_37.spec
|
||||
index 8a95d53..97f6335 100644
|
||||
--- a/dlls/d3dx9_37/d3dx9_37.spec
|
||||
+++ b/dlls/d3dx9_37/d3dx9_37.spec
|
||||
@@ -24,7 +24,7 @@
|
||||
@ stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr)
|
||||
@ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float)
|
||||
@ stdcall D3DXComputeNormals(ptr ptr)
|
||||
-@ stub D3DXComputeTangent(ptr long long long long ptr)
|
||||
+@ stdcall D3DXComputeTangent(ptr long long long long ptr)
|
||||
@ 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)
|
||||
diff --git a/dlls/d3dx9_38/d3dx9_38.spec b/dlls/d3dx9_38/d3dx9_38.spec
|
||||
index 8a95d53..97f6335 100644
|
||||
--- a/dlls/d3dx9_38/d3dx9_38.spec
|
||||
+++ b/dlls/d3dx9_38/d3dx9_38.spec
|
||||
@@ -24,7 +24,7 @@
|
||||
@ stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr)
|
||||
@ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float)
|
||||
@ stdcall D3DXComputeNormals(ptr ptr)
|
||||
-@ stub D3DXComputeTangent(ptr long long long long ptr)
|
||||
+@ stdcall D3DXComputeTangent(ptr long long long long ptr)
|
||||
@ 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)
|
||||
diff --git a/dlls/d3dx9_39/d3dx9_39.spec b/dlls/d3dx9_39/d3dx9_39.spec
|
||||
index 8a95d53..97f6335 100644
|
||||
--- a/dlls/d3dx9_39/d3dx9_39.spec
|
||||
+++ b/dlls/d3dx9_39/d3dx9_39.spec
|
||||
@@ -24,7 +24,7 @@
|
||||
@ stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr)
|
||||
@ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float)
|
||||
@ stdcall D3DXComputeNormals(ptr ptr)
|
||||
-@ stub D3DXComputeTangent(ptr long long long long ptr)
|
||||
+@ stdcall D3DXComputeTangent(ptr long long long long ptr)
|
||||
@ 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)
|
||||
diff --git a/dlls/d3dx9_40/d3dx9_40.spec b/dlls/d3dx9_40/d3dx9_40.spec
|
||||
index 8a95d53..97f6335 100644
|
||||
--- a/dlls/d3dx9_40/d3dx9_40.spec
|
||||
+++ b/dlls/d3dx9_40/d3dx9_40.spec
|
||||
@@ -24,7 +24,7 @@
|
||||
@ stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr)
|
||||
@ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float)
|
||||
@ stdcall D3DXComputeNormals(ptr ptr)
|
||||
-@ stub D3DXComputeTangent(ptr long long long long ptr)
|
||||
+@ stdcall D3DXComputeTangent(ptr long long long long ptr)
|
||||
@ 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)
|
||||
diff --git a/dlls/d3dx9_41/d3dx9_41.spec b/dlls/d3dx9_41/d3dx9_41.spec
|
||||
index 8a95d53..97f6335 100644
|
||||
--- a/dlls/d3dx9_41/d3dx9_41.spec
|
||||
+++ b/dlls/d3dx9_41/d3dx9_41.spec
|
||||
@@ -24,7 +24,7 @@
|
||||
@ stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr)
|
||||
@ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float)
|
||||
@ stdcall D3DXComputeNormals(ptr ptr)
|
||||
-@ stub D3DXComputeTangent(ptr long long long long ptr)
|
||||
+@ stdcall D3DXComputeTangent(ptr long long long long ptr)
|
||||
@ 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)
|
||||
diff --git a/dlls/d3dx9_42/d3dx9_42.spec b/dlls/d3dx9_42/d3dx9_42.spec
|
||||
index 46febf6..e07bcc1 100644
|
||||
--- a/dlls/d3dx9_42/d3dx9_42.spec
|
||||
+++ b/dlls/d3dx9_42/d3dx9_42.spec
|
||||
@@ -24,7 +24,7 @@
|
||||
@ stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr)
|
||||
@ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float)
|
||||
@ stdcall D3DXComputeNormals(ptr ptr)
|
||||
-@ stub D3DXComputeTangent(ptr long long long long ptr)
|
||||
+@ stdcall D3DXComputeTangent(ptr long long long long ptr)
|
||||
@ 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)
|
||||
diff --git a/dlls/d3dx9_43/d3dx9_43.spec b/dlls/d3dx9_43/d3dx9_43.spec
|
||||
index 46febf6..e07bcc1 100644
|
||||
--- a/dlls/d3dx9_43/d3dx9_43.spec
|
||||
+++ b/dlls/d3dx9_43/d3dx9_43.spec
|
||||
@@ -24,7 +24,7 @@
|
||||
@ stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr)
|
||||
@ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float)
|
||||
@ stdcall D3DXComputeNormals(ptr ptr)
|
||||
-@ stub D3DXComputeTangent(ptr long long long long ptr)
|
||||
+@ stdcall D3DXComputeTangent(ptr long long long long ptr)
|
||||
@ 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)
|
||||
--
|
||||
2.9.0
|
||||
|
@@ -1,7 +1,4 @@
|
||||
# Fixes: [31984] Add stub for D3DXComputeTangentFrameEx
|
||||
# Fixes: Add stub for D3DXIntersect
|
||||
# Fixes: [26379] Support for D3DXComputeNormals
|
||||
Fixes: Add stub for D3DXComputeNormalMap
|
||||
Fixes: [38334] Add stub for D3DXFrameFind
|
||||
# Fixes: Add stub for D3DXTessellateNPatches
|
||||
Fixes: [41697] Add stub for D3DXComputeTangent
|
||||
Category: stable
|
||||
|
@@ -1,33 +0,0 @@
|
||||
From da8a88f408a35b22bbd59c41d04e802278628aa2 Mon Sep 17 00:00:00 2001
|
||||
From: Christian Costa <titan.costa@gmail.com>
|
||||
Date: Sat, 27 Dec 2014 17:05:42 +0100
|
||||
Subject: ddraw: Don't call IDirect3DDevice7_DrawIndexedPrimitive if there is
|
||||
no primitive.
|
||||
|
||||
This is allowed to have execute buffer command drawing 0 primitive and this is covered by tests.
|
||||
So just do nothing and avoid a useless error message triggered by the tests.
|
||||
---
|
||||
dlls/ddraw/executebuffer.c | 7 ++++---
|
||||
1 file changed, 4 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/dlls/ddraw/executebuffer.c b/dlls/ddraw/executebuffer.c
|
||||
index 4e9baad..5360c28 100644
|
||||
--- a/dlls/ddraw/executebuffer.c
|
||||
+++ b/dlls/ddraw/executebuffer.c
|
||||
@@ -149,9 +149,10 @@ HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *buffer,
|
||||
buffer->indices[(i * 3) + 2] = ci->u3.v3;
|
||||
instr += size;
|
||||
}
|
||||
- IDirect3DDevice7_DrawIndexedPrimitive(&device->IDirect3DDevice7_iface,
|
||||
- D3DPT_TRIANGLELIST, D3DFVF_TLVERTEX, tl_vx, buffer->nb_vertices,
|
||||
- buffer->indices, count * 3, 0);
|
||||
+ if (count)
|
||||
+ IDirect3DDevice7_DrawIndexedPrimitive(&device->IDirect3DDevice7_iface,
|
||||
+ D3DPT_TRIANGLELIST, D3DFVF_TLVERTEX, tl_vx, buffer->nb_vertices,
|
||||
+ buffer->indices, count * 3, 0);
|
||||
} break;
|
||||
|
||||
case D3DOP_MATRIXLOAD:
|
||||
--
|
||||
2.1.3
|
||||
|
@@ -1,4 +1,4 @@
|
||||
From e567377f438a70ee3c69aed93ac7197ad867d7ad Mon Sep 17 00:00:00 2001
|
||||
From eff83781e6c1be78d1614810902b2b0f38f6045e Mon Sep 17 00:00:00 2001
|
||||
From: Dmitry Timoshkov <dmitry@baikal.ru>
|
||||
Date: Fri, 3 Jun 2016 13:20:14 +0800
|
||||
Subject: gdiplus/tests: Add a test for loading PNG grayscale images.
|
||||
@@ -8,7 +8,7 @@ Subject: gdiplus/tests: Add a test for loading PNG grayscale images.
|
||||
1 file changed, 59 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c
|
||||
index 551d276..ab39dfe 100644
|
||||
index 6abd026..3d123ad 100644
|
||||
--- a/dlls/gdiplus/tests/image.c
|
||||
+++ b/dlls/gdiplus/tests/image.c
|
||||
@@ -2,7 +2,7 @@
|
||||
@@ -20,8 +20,8 @@ index 551d276..ab39dfe 100644
|
||||
*
|
||||
* This library is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU Lesser General Public
|
||||
@@ -4790,6 +4790,63 @@ static void test_getadjustedpalette(void)
|
||||
GdipDisposeImageAttributes(imageattributes);
|
||||
@@ -4941,6 +4941,63 @@ static void test_imageabort(void)
|
||||
GdipDisposeImage((GpImage*)bm);
|
||||
}
|
||||
|
||||
+/* RGB 24 bpp 1x1 pixel PNG image */
|
||||
@@ -83,15 +83,15 @@ index 551d276..ab39dfe 100644
|
||||
+
|
||||
START_TEST(image)
|
||||
{
|
||||
struct GdiplusStartupInput gdiplusStartupInput;
|
||||
@@ -4802,6 +4859,7 @@ START_TEST(image)
|
||||
|
||||
GdiplusStartup(&gdiplusToken, &gdiplusStartupInput, NULL);
|
||||
HMODULE mod = GetModuleHandleA("gdiplus.dll");
|
||||
@@ -4958,6 +5015,7 @@ START_TEST(image)
|
||||
pGdipBitmapGetHistogram = (void*)GetProcAddress(mod, "GdipBitmapGetHistogram");
|
||||
pGdipImageSetAbort = (void*)GetProcAddress(mod, "GdipImageSetAbort");
|
||||
|
||||
+ test_png_color_formats();
|
||||
test_supported_encoders();
|
||||
test_CloneBitmapArea();
|
||||
test_ARGB_conversion();
|
||||
--
|
||||
2.8.0
|
||||
2.9.0
|
||||
|
||||
|
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user