mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2024-09-13 09:17:20 -07:00
Rebase against f7187ecbd62f778649e055af61cd2c6786ead7f1.
This commit is contained in:
Sebastian Lackner
parent
8682bdd67a
commit
e3182b014c
@ -1,4 +1,4 @@
|
||||
From 4d240f9f1d7b50a2a0206fe965986c967bbacfd7 Mon Sep 17 00:00:00 2001
|
||||
From 0f53f98831d1dcc1030467c1f736fbe0b7f4fb80 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 456a638..dc1f2ac 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)
|
||||
@@ -3018,6 +3018,7 @@ WINE_CONFIG_DLL(ext-ms-win-ntuser-uicontext-ext-l1-1-0)
|
||||
WINE_CONFIG_DLL(ext-ms-win-ntuser-window-l1-1-1)
|
||||
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 45055d28aa803d6dcd9fc74da0b1432b05e23abe Mon Sep 17 00:00:00 2001
|
||||
From 2ac5a2b7834581439ac86301f52d99615be5ed7b 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 c9f0c5f..2f33428 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -3015,6 +3015,7 @@ WINE_CONFIG_DLL(ext-ms-win-gdi-dc-create-l1-1-1)
|
||||
@@ -3016,6 +3016,7 @@ 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-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 3af936d..3414560 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 3fe011af661f4a7ecd91f63e8b924b52513de5fd 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 2f33428..0f011a8 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)
|
||||
@@ -3023,6 +3023,7 @@ WINE_CONFIG_DLL(ext-ms-win-ntuser-uicontext-ext-l1-1-0)
|
||||
WINE_CONFIG_DLL(ext-ms-win-ntuser-window-l1-1-1)
|
||||
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 3414560..787cadb 100755
|
||||
--- a/tools/make_specfiles
|
||||
+++ b/tools/make_specfiles
|
||||
@@ -317,6 +317,10 @@ my @dll_groups =
|
||||
@@ -322,6 +322,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 3a9f17ff8dce1e9005b63fea1e9577a44b1089e8 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 0f011a8..8925496 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)
|
||||
@@ -2791,6 +2791,7 @@ 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)
|
||||
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 787cadb..48f5be8 100755
|
||||
--- a/tools/make_specfiles
|
||||
+++ b/tools/make_specfiles
|
||||
@@ -284,6 +284,7 @@ my @dll_groups =
|
||||
"api-ms-win-core-string-l2-1-0",
|
||||
@@ -285,6 +285,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 ece581793994baf72c3da6a6eb53d96473f616ad 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 8925496..ebe0713 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)
|
||||
@@ -3023,6 +3023,7 @@ 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-ntuser-window-l1-1-1)
|
||||
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 48f5be8..e2e5463 100755
|
||||
--- a/tools/make_specfiles
|
||||
+++ b/tools/make_specfiles
|
||||
@@ -289,6 +289,7 @@ my @dll_groups =
|
||||
"ext-ms-win-ntuser-mouse-l1-1-0",
|
||||
@@ -293,6 +293,7 @@ my @dll_groups =
|
||||
"ext-ms-win-ntuser-uicontext-ext-l1-1-0",
|
||||
"ext-ms-win-ntuser-window-l1-1-1",
|
||||
"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 27fa802e9493edee0395b5de81a2e2b53ee41df3 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,7 +13,7 @@ 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 ebe0713..c703f0f 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -2790,6 +2790,7 @@ WINE_CONFIG_DLL(api-ms-win-eventing-controller-l1-1-0)
|
||||
@ -21,9 +21,9 @@ index e348625..7bd2367 100644
|
||||
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-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,7 +39,7 @@ 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 e2e5463..ab70e99 100755
|
||||
--- a/tools/make_specfiles
|
||||
+++ b/tools/make_specfiles
|
||||
@@ -284,6 +284,7 @@ my @dll_groups =
|
||||
@ -47,9 +47,9 @@ index e192572..466099d 100755
|
||||
"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
|
||||
|
||||
@ -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
|
||||
|
||||
|
||||
@ -1,92 +0,0 @@
|
||||
From 98ab81eabd3554ba3d5d8f95f50530b2a3dd1169 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
|
||||
Date: Sun, 17 Jan 2016 03:02:57 +0100
|
||||
Subject: ntdll: Move EventRegister from advapi32 to ntdll.
|
||||
|
||||
---
|
||||
dlls/advapi32/advapi32.spec | 2 +-
|
||||
dlls/advapi32/eventlog.c | 11 -----------
|
||||
dlls/ntdll/misc.c | 12 ++++++++++++
|
||||
dlls/ntdll/ntdll.spec | 1 +
|
||||
4 files changed, 14 insertions(+), 12 deletions(-)
|
||||
|
||||
diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec
|
||||
index 3f32aa3..fa1c777 100644
|
||||
--- a/dlls/advapi32/advapi32.spec
|
||||
+++ b/dlls/advapi32/advapi32.spec
|
||||
@@ -272,7 +272,7 @@
|
||||
@ stdcall EventActivityIdControl(long ptr)
|
||||
@ stdcall EventEnabled(int64 ptr)
|
||||
@ stdcall EventProviderEnabled(int64 long int64)
|
||||
-@ stdcall EventRegister(ptr ptr ptr ptr)
|
||||
+@ stdcall EventRegister(ptr ptr ptr ptr) ntdll.EtwEventRegister
|
||||
@ stdcall EventSetInformation(int64 long ptr long)
|
||||
@ stdcall EventUnregister(int64)
|
||||
@ stdcall EventWrite(int64 ptr long ptr)
|
||||
diff --git a/dlls/advapi32/eventlog.c b/dlls/advapi32/eventlog.c
|
||||
index 93c164d..4beda0f 100644
|
||||
--- a/dlls/advapi32/eventlog.c
|
||||
+++ b/dlls/advapi32/eventlog.c
|
||||
@@ -815,17 +815,6 @@ ULONG WINAPI UnregisterTraceGuids( TRACEHANDLE RegistrationHandle )
|
||||
}
|
||||
|
||||
/******************************************************************************
|
||||
- * EventRegister [ADVAPI32.@]
|
||||
- */
|
||||
-ULONG WINAPI EventRegister( LPCGUID provider, PENABLECALLBACK callback, PVOID context, PREGHANDLE handle )
|
||||
-{
|
||||
- FIXME("%s, %p, %p, %p\n", debugstr_guid(provider), callback, context, handle);
|
||||
-
|
||||
- *handle = 0xdeadbeef;
|
||||
- return ERROR_SUCCESS;
|
||||
-}
|
||||
-
|
||||
-/******************************************************************************
|
||||
* EventUnregister [ADVAPI32.@]
|
||||
*/
|
||||
ULONG WINAPI EventUnregister( REGHANDLE handle )
|
||||
diff --git a/dlls/ntdll/misc.c b/dlls/ntdll/misc.c
|
||||
index f540c4b..6d22b08 100644
|
||||
--- a/dlls/ntdll/misc.c
|
||||
+++ b/dlls/ntdll/misc.c
|
||||
@@ -34,6 +34,7 @@
|
||||
#include "ntdll_misc.h"
|
||||
#include "wmistr.h"
|
||||
#include "evntrace.h"
|
||||
+#include "evntprov.h"
|
||||
|
||||
WINE_DEFAULT_DEBUG_CHANNEL(ntdll);
|
||||
|
||||
@@ -358,6 +359,17 @@ HANDLE WINAPI WinSqmStartSession(GUID *sessionguid, DWORD sessionid, DWORD unkno
|
||||
return INVALID_HANDLE_VALUE;
|
||||
}
|
||||
|
||||
+/*********************************************************************
|
||||
+ * EtwEventRegister (NTDLL.@)
|
||||
+ */
|
||||
+ULONG WINAPI EtwEventRegister( LPCGUID provider, PENABLECALLBACK callback, PVOID context, PREGHANDLE handle )
|
||||
+{
|
||||
+ FIXME("%s, %p, %p, %p\n", debugstr_guid(provider), callback, context, handle);
|
||||
+
|
||||
+ *handle = 0xdeadbeef;
|
||||
+ return ERROR_SUCCESS;
|
||||
+}
|
||||
+
|
||||
/******************************************************************************
|
||||
* EtwRegisterTraceGuidsW (NTDLL.@)
|
||||
*
|
||||
diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec
|
||||
index 4737b06..e528c49 100644
|
||||
--- a/dlls/ntdll/ntdll.spec
|
||||
+++ b/dlls/ntdll/ntdll.spec
|
||||
@@ -41,6 +41,7 @@
|
||||
# @ stub DbgUiStopDebugging
|
||||
@ stub DbgUiWaitStateChange
|
||||
@ stdcall DbgUserBreakPoint()
|
||||
+@ stdcall EtwEventRegister(ptr ptr ptr ptr)
|
||||
@ stdcall EtwRegisterTraceGuidsA(ptr ptr ptr long ptr str str ptr)
|
||||
@ stdcall EtwRegisterTraceGuidsW(ptr ptr ptr long ptr wstr wstr ptr)
|
||||
# @ stub KiFastSystemCall
|
||||
--
|
||||
2.8.0
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From 6aab8cc223633eeef84ce54d999f540b513c1a13 Mon Sep 17 00:00:00 2001
|
||||
From 7d12e333f83b5cec23a07dd9bf2dad1f8fc5dec0 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
|
||||
Date: Sun, 17 Jan 2016 03:08:07 +0100
|
||||
Subject: ntdll: Move EventSetInformation from advapi32 to ntdll.
|
||||
@ -11,7 +11,7 @@ Subject: ntdll: Move EventSetInformation from advapi32 to ntdll.
|
||||
4 files changed, 12 insertions(+), 11 deletions(-)
|
||||
|
||||
diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec
|
||||
index 6a015e4..e38093e 100644
|
||||
index 4868841..0ecd4e9 100644
|
||||
--- a/dlls/advapi32/advapi32.spec
|
||||
+++ b/dlls/advapi32/advapi32.spec
|
||||
@@ -273,7 +273,7 @@
|
||||
@ -20,14 +20,14 @@ index 6a015e4..e38093e 100644
|
||||
@ stdcall EventRegister(ptr ptr ptr ptr) ntdll.EtwEventRegister
|
||||
-@ stdcall EventSetInformation(int64 long ptr long)
|
||||
+@ stdcall EventSetInformation(int64 long ptr long) ntdll.EtwEventSetInformation
|
||||
@ stdcall EventUnregister(int64)
|
||||
@ stdcall EventUnregister(int64) ntdll.EtwEventUnregister
|
||||
@ stdcall EventWrite(int64 ptr long ptr)
|
||||
# @ stub EventWriteEndScenario
|
||||
diff --git a/dlls/advapi32/eventlog.c b/dlls/advapi32/eventlog.c
|
||||
index 4beda0f..a48e016 100644
|
||||
index 9bd75e8..c1dbb99 100644
|
||||
--- a/dlls/advapi32/eventlog.c
|
||||
+++ b/dlls/advapi32/eventlog.c
|
||||
@@ -864,16 +864,6 @@ ULONG WINAPI EventWrite( REGHANDLE handle, PCEVENT_DESCRIPTOR descriptor, ULONG
|
||||
@@ -880,16 +880,6 @@ ULONG WINAPI EventWriteTransfer( REGHANDLE handle, PCEVENT_DESCRIPTOR descriptor
|
||||
}
|
||||
|
||||
/******************************************************************************
|
||||
@ -45,10 +45,10 @@ index 4beda0f..a48e016 100644
|
||||
*/
|
||||
ULONG WINAPI QueryTraceW( TRACEHANDLE handle, LPCWSTR sessionname, PEVENT_TRACE_PROPERTIES properties )
|
||||
diff --git a/dlls/ntdll/misc.c b/dlls/ntdll/misc.c
|
||||
index fadba20..b087319 100644
|
||||
index ccece31..c7dfd2b 100644
|
||||
--- a/dlls/ntdll/misc.c
|
||||
+++ b/dlls/ntdll/misc.c
|
||||
@@ -350,6 +350,16 @@ ULONG WINAPI EtwEventRegister( LPCGUID provider, PENABLECALLBACK callback, PVOID
|
||||
@@ -388,6 +388,16 @@ ULONG WINAPI EtwEventUnregister( REGHANDLE handle )
|
||||
return ERROR_SUCCESS;
|
||||
}
|
||||
|
||||
@ -66,7 +66,7 @@ index fadba20..b087319 100644
|
||||
* EtwRegisterTraceGuidsW (NTDLL.@)
|
||||
*
|
||||
diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec
|
||||
index 57a11b6..1a3b724 100644
|
||||
index 0e19dc7..042e34c 100644
|
||||
--- a/dlls/ntdll/ntdll.spec
|
||||
+++ b/dlls/ntdll/ntdll.spec
|
||||
@@ -42,6 +42,7 @@
|
||||
@ -74,9 +74,9 @@ index 57a11b6..1a3b724 100644
|
||||
@ stdcall DbgUserBreakPoint()
|
||||
@ stdcall EtwEventRegister(ptr ptr ptr ptr)
|
||||
+@ stdcall EtwEventSetInformation(int64 long ptr long)
|
||||
@ stdcall EtwEventUnregister(int64)
|
||||
@ stdcall EtwRegisterTraceGuidsA(ptr ptr ptr long ptr str str ptr)
|
||||
@ stdcall EtwRegisterTraceGuidsW(ptr ptr ptr long ptr wstr wstr ptr)
|
||||
# @ stub KiFastSystemCall
|
||||
--
|
||||
2.7.1
|
||||
2.9.0
|
||||
|
||||
|
||||
@ -1 +0,0 @@
|
||||
FIxes: [33021] Move implementation of EtwEventRegister to ntdll
|
||||
@ -52,13 +52,13 @@ usage()
|
||||
# Get the upstream commit sha
|
||||
upstream_commit()
|
||||
{
|
||||
echo "1316520a8029c0a99b358d1cd754294634d1855a"
|
||||
echo "f7187ecbd62f778649e055af61cd2c6786ead7f1"
|
||||
}
|
||||
|
||||
# Show version information
|
||||
version()
|
||||
{
|
||||
echo "Wine Staging 1.9.22"
|
||||
echo "Wine Staging 1.9.23 (unreleased)"
|
||||
echo "Copyright (C) 2014-2016 the Wine Staging project authors."
|
||||
echo ""
|
||||
echo "Patchset to be applied on upstream Wine:"
|
||||
@ -134,7 +134,6 @@ patch_enable_all ()
|
||||
enable_ddraw_IDirect3DTexture2_Load="$1"
|
||||
enable_ddraw_Rendering_Targets="$1"
|
||||
enable_ddraw_Write_Vtable="$1"
|
||||
enable_ddraw_d3d_execute_buffer="$1"
|
||||
enable_dinput_Initialize="$1"
|
||||
enable_dmusic_SynthPort_IKsControl="$1"
|
||||
enable_dsound_EAX="$1"
|
||||
@ -368,10 +367,8 @@ patch_enable_all ()
|
||||
enable_wined3d_1DTextures="$1"
|
||||
enable_wined3d_Accounting="$1"
|
||||
enable_wined3d_CSMT_Helper="$1"
|
||||
enable_wined3d_CSMT_Main="$1"
|
||||
enable_wined3d_DXTn="$1"
|
||||
enable_wined3d_GTX_560M="$1"
|
||||
enable_wined3d_Invalidate_INDEXBUFFER="$1"
|
||||
enable_wined3d_Limit_Vram="$1"
|
||||
enable_wined3d_QUERY_Stubs="$1"
|
||||
enable_wined3d_Revert_Pixel_Center_Offset="$1"
|
||||
@ -587,9 +584,6 @@ patch_enable ()
|
||||
ddraw-Write_Vtable)
|
||||
enable_ddraw_Write_Vtable="$2"
|
||||
;;
|
||||
ddraw-d3d_execute_buffer)
|
||||
enable_ddraw_d3d_execute_buffer="$2"
|
||||
;;
|
||||
dinput-Initialize)
|
||||
enable_dinput_Initialize="$2"
|
||||
;;
|
||||
@ -1289,18 +1283,12 @@ patch_enable ()
|
||||
wined3d-CSMT_Helper)
|
||||
enable_wined3d_CSMT_Helper="$2"
|
||||
;;
|
||||
wined3d-CSMT_Main)
|
||||
enable_wined3d_CSMT_Main="$2"
|
||||
;;
|
||||
wined3d-DXTn)
|
||||
enable_wined3d_DXTn="$2"
|
||||
;;
|
||||
wined3d-GTX_560M)
|
||||
enable_wined3d_GTX_560M="$2"
|
||||
;;
|
||||
wined3d-Invalidate_INDEXBUFFER)
|
||||
enable_wined3d_Invalidate_INDEXBUFFER="$2"
|
||||
;;
|
||||
wined3d-Limit_Vram)
|
||||
enable_wined3d_Limit_Vram="$2"
|
||||
;;
|
||||
@ -2018,13 +2006,6 @@ if test "$enable_wpcap_Dynamic_Linking" -eq 1; then
|
||||
enable_wpcap_Several_Fixes=1
|
||||
fi
|
||||
|
||||
if test "$enable_wined3d_CSMT_Main" -eq 1; then
|
||||
if test "$enable_wined3d_CSMT_Helper" -gt 1; then
|
||||
abort "Patchset wined3d-CSMT_Helper disabled, but wined3d-CSMT_Main depends on that."
|
||||
fi
|
||||
enable_wined3d_CSMT_Helper=1
|
||||
fi
|
||||
|
||||
if test "$enable_wined3d_CSMT_Helper" -eq 1; then
|
||||
if test "$enable_makedep_PARENTSPEC" -gt 1; then
|
||||
abort "Patchset makedep-PARENTSPEC disabled, but wined3d-CSMT_Helper depends on that."
|
||||
@ -2041,9 +2022,6 @@ if test "$enable_wined3d_CSMT_Helper" -eq 1; then
|
||||
if test "$enable_wined3d_DXTn" -gt 1; then
|
||||
abort "Patchset wined3d-DXTn disabled, but wined3d-CSMT_Helper depends on that."
|
||||
fi
|
||||
if test "$enable_wined3d_Invalidate_INDEXBUFFER" -gt 1; then
|
||||
abort "Patchset wined3d-Invalidate_INDEXBUFFER disabled, but wined3d-CSMT_Helper depends on that."
|
||||
fi
|
||||
if test "$enable_wined3d_QUERY_Stubs" -gt 1; then
|
||||
abort "Patchset wined3d-QUERY_Stubs disabled, but wined3d-CSMT_Helper depends on that."
|
||||
fi
|
||||
@ -2058,7 +2036,6 @@ if test "$enable_wined3d_CSMT_Helper" -eq 1; then
|
||||
enable_wined3d_1DTextures=1
|
||||
enable_wined3d_Accounting=1
|
||||
enable_wined3d_DXTn=1
|
||||
enable_wined3d_Invalidate_INDEXBUFFER=1
|
||||
enable_wined3d_QUERY_Stubs=1
|
||||
enable_wined3d_Revert_Pixel_Center_Offset=1
|
||||
enable_wined3d_Silence_FIXMEs=1
|
||||
@ -2695,16 +2672,14 @@ fi
|
||||
# | usercontext-l1-1-0/ext-ms-win-appmodel-usercontext-l1-1-0.spec, dlls/ext-ms-win-appmodel-usercontext-l1-1-0/main.c, dlls
|
||||
# | /ext-ms-win-ntuser-mouse-l1-1-0/Makefile.in, dlls/ext-ms-win-ntuser-mouse-l1-1-0/ext-ms-win-ntuser-mouse-l1-1-0.spec,
|
||||
# | dlls/ext-ms-win-rtcore-ntuser-syscolors-l1-1-0/Makefile.in, dlls/ext-ms-win-rtcore-ntuser-syscolors-l1-1-0/ext-ms-win-
|
||||
# | rtcore-ntuser-syscolors-l1-1-0.spec, dlls/ext-ms-win-rtcore-ntuser-sysparams-l1-1-0/Makefile.in, dlls/ext-ms-win-rtcore-
|
||||
# | ntuser-sysparams-l1-1-0/ext-ms-win-rtcore-ntuser-sysparams-l1-1-0.spec, dlls/ext-ms-win-uxtheme-
|
||||
# | themes-l1-1-0/Makefile.in, dlls/ext-ms-win-uxtheme-themes-l1-1-0/ext-ms-win-uxtheme-themes-l1-1-0.spec, dlls/ext-ms-win-
|
||||
# | xaml-pal-l1-1-0/Makefile.in, dlls/ext-ms-win-xaml-pal-l1-1-0/ext-ms-win-xaml-pal-l1-1-0.spec, dlls/ext-ms-win-xaml-
|
||||
# | pal-l1-1-0/main.c, dlls/feclient/Makefile.in, dlls/feclient/feclient.spec, dlls/feclient/main.c,
|
||||
# | dlls/iertutil/Makefile.in, dlls/iertutil/iertutil.spec, dlls/iertutil/main.c, dlls/kernelbase/Makefile.in,
|
||||
# | dlls/kernelbase/kernelbase.spec, dlls/kernelbase/misc.c, dlls/shcore/Makefile.in, dlls/shcore/main.c,
|
||||
# | dlls/shcore/shcore.spec, dlls/shlwapi/shlwapi.spec, dlls/uiautomationcore/Makefile.in, dlls/uiautomationcore/main.c,
|
||||
# | dlls/uiautomationcore/uiautomationcore.spec, include/Makefile.in, include/shellscalingapi.h,
|
||||
# | include/uiautomationcoreapi.h, tools/make_specfiles
|
||||
# | rtcore-ntuser-syscolors-l1-1-0.spec, dlls/ext-ms-win-uxtheme-themes-l1-1-0/Makefile.in, dlls/ext-ms-win-uxtheme-
|
||||
# | themes-l1-1-0/ext-ms-win-uxtheme-themes-l1-1-0.spec, dlls/ext-ms-win-xaml-pal-l1-1-0/Makefile.in, dlls/ext-ms-win-xaml-
|
||||
# | pal-l1-1-0/ext-ms-win-xaml-pal-l1-1-0.spec, dlls/ext-ms-win-xaml-pal-l1-1-0/main.c, dlls/feclient/Makefile.in,
|
||||
# | dlls/feclient/feclient.spec, dlls/feclient/main.c, dlls/iertutil/Makefile.in, dlls/iertutil/iertutil.spec,
|
||||
# | dlls/iertutil/main.c, dlls/kernelbase/Makefile.in, dlls/kernelbase/kernelbase.spec, dlls/kernelbase/misc.c,
|
||||
# | dlls/shcore/Makefile.in, dlls/shcore/main.c, dlls/shcore/shcore.spec, dlls/shlwapi/shlwapi.spec,
|
||||
# | dlls/uiautomationcore/Makefile.in, dlls/uiautomationcore/main.c, dlls/uiautomationcore/uiautomationcore.spec,
|
||||
# | include/Makefile.in, include/shellscalingapi.h, include/uiautomationcoreapi.h, tools/make_specfiles
|
||||
# |
|
||||
if test "$enable_api_ms_win_Stub_DLLs" -eq 1; then
|
||||
patch_apply api-ms-win-Stub_DLLs/0001-kernelbase-Add-dll-and-add-stub-for-QuirkIsEnabled.patch
|
||||
@ -2724,7 +2699,6 @@ if test "$enable_api_ms_win_Stub_DLLs" -eq 1; then
|
||||
patch_apply api-ms-win-Stub_DLLs/0017-api-ms-win-rtcore-ntuser-window-l1-1-0-Add-dll.patch
|
||||
patch_apply api-ms-win-Stub_DLLs/0018-ext-ms-win-rtcore-ntuser-syscolors-l1-1-0-Add-dll.patch
|
||||
patch_apply api-ms-win-Stub_DLLs/0019-api-ms-win-rtcore-ntuser-draw-l1-1-0-Add-dll.patch
|
||||
patch_apply api-ms-win-Stub_DLLs/0020-ext-ms-win-rtcore-ntuser-sysparams-l1-1-0-Add-dll.patch
|
||||
patch_apply api-ms-win-Stub_DLLs/0022-shcore-Add-SetProcessDpiAwareness-stub.patch
|
||||
patch_apply api-ms-win-Stub_DLLs/0023-shcore-Implement-stub-for-GetDpiForMonitor.patch
|
||||
patch_apply api-ms-win-Stub_DLLs/0024-kernelbase-Add-stub-for-QuirkIsEnabled3.patch
|
||||
@ -2749,7 +2723,6 @@ if test "$enable_api_ms_win_Stub_DLLs" -eq 1; then
|
||||
echo '+ { "Michael Müller", "api-ms-win-rtcore-ntuser-window-l1-1-0: Add dll.", 1 },';
|
||||
echo '+ { "Michael Müller", "ext-ms-win-rtcore-ntuser-syscolors-l1-1-0: Add dll.", 1 },';
|
||||
echo '+ { "Michael Müller", "api-ms-win-rtcore-ntuser-draw-l1-1-0: Add dll.", 1 },';
|
||||
echo '+ { "Michael Müller", "ext-ms-win-rtcore-ntuser-sysparams-l1-1-0: Add dll.", 1 },';
|
||||
echo '+ { "Sebastian Lackner", "shcore: Add SetProcessDpiAwareness stub.", 1 },';
|
||||
echo '+ { "Sebastian Lackner", "shcore: Implement stub for GetDpiForMonitor.", 1 },';
|
||||
echo '+ { "Michael Müller", "kernelbase: Add stub for QuirkIsEnabled3.", 1 },';
|
||||
@ -3537,18 +3510,6 @@ if test "$enable_ddraw_Write_Vtable" -eq 1; then
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset ddraw-d3d_execute_buffer
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * dlls/ddraw/executebuffer.c
|
||||
# |
|
||||
if test "$enable_ddraw_d3d_execute_buffer" -eq 1; then
|
||||
patch_apply ddraw-d3d_execute_buffer/0001-ddraw-Don-t-call-IDirect3DDevice7_DrawIndexedPrimiti.patch
|
||||
(
|
||||
echo '+ { "Christian Costa", "ddraw: Don'\''t call IDirect3DDevice7_DrawIndexedPrimitive if there is no primitive.", 1 },';
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset dinput-Initialize
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
@ -4814,17 +4775,12 @@ fi
|
||||
|
||||
# Patchset ntdll-EtwRegisterTraceGuids
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
# | * [#33021] Move implementation of EtwEventRegister to ntdll
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * dlls/advapi32/advapi32.spec, dlls/advapi32/eventlog.c, dlls/ntdll/misc.c, dlls/ntdll/ntdll.spec
|
||||
# |
|
||||
if test "$enable_ntdll_EtwRegisterTraceGuids" -eq 1; then
|
||||
patch_apply ntdll-EtwRegisterTraceGuids/0001-ntdll-Move-EventRegister-from-advapi32-to-ntdll.patch
|
||||
patch_apply ntdll-EtwRegisterTraceGuids/0002-ntdll-Move-EventSetInformation-from-advapi32-to-ntdl.patch
|
||||
(
|
||||
echo '+ { "Michael Müller", "ntdll: Move EventRegister from advapi32 to ntdll.", 1 },';
|
||||
echo '+ { "Michael Müller", "ntdll: Move EventSetInformation from advapi32 to ntdll.", 1 },';
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
@ -7549,18 +7505,6 @@ if test "$enable_wined3d_Accounting" -eq 1; then
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset wined3d-Invalidate_INDEXBUFFER
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * dlls/wined3d/buffer.c
|
||||
# |
|
||||
if test "$enable_wined3d_Invalidate_INDEXBUFFER" -eq 1; then
|
||||
patch_apply wined3d-Invalidate_INDEXBUFFER/0001-wined3d-Invalidate-INDEXBUFFER-device-state-when-bou.patch
|
||||
(
|
||||
echo '+ { "Józef Kucia", "wined3d: Invalidate INDEXBUFFER device state when bound index buffer is unloaded.", 1 },';
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset wined3d-QUERY_Stubs
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
@ -7616,8 +7560,8 @@ fi
|
||||
# |
|
||||
# | This patchset has the following (direct or indirect) dependencies:
|
||||
# | * makedep-PARENTSPEC, ntdll-Attach_Process_DLLs, ntdll-DllOverrides_WOW64, ntdll-Loader_Machine_Type, ntdll-DllRedirects,
|
||||
# | wined3d-1DTextures, wined3d-Accounting, wined3d-DXTn, wined3d-Invalidate_INDEXBUFFER, wined3d-QUERY_Stubs, wined3d-
|
||||
# | Revert_Pixel_Center_Offset, wined3d-Silence_FIXMEs
|
||||
# | wined3d-1DTextures, wined3d-Accounting, wined3d-DXTn, wined3d-QUERY_Stubs, wined3d-Revert_Pixel_Center_Offset, wined3d-
|
||||
# | Silence_FIXMEs
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * configure.ac, dlls/wined3d-csmt/Makefile.in, dlls/wined3d-csmt/version.rc
|
||||
@ -7693,151 +7637,6 @@ if test "$enable_wined3d_check_format_support" -eq 1; then
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset wined3d-CSMT_Main
|
||||
# |
|
||||
# | This patchset has the following (direct or indirect) dependencies:
|
||||
# | * makedep-PARENTSPEC, ntdll-Attach_Process_DLLs, ntdll-DllOverrides_WOW64, ntdll-Loader_Machine_Type, ntdll-DllRedirects,
|
||||
# | wined3d-1DTextures, wined3d-Accounting, wined3d-DXTn, wined3d-Invalidate_INDEXBUFFER, wined3d-QUERY_Stubs, wined3d-
|
||||
# | Revert_Pixel_Center_Offset, wined3d-Silence_FIXMEs, wined3d-CSMT_Helper
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
# | * [#11674] Support for CSMT (command stream) to increase graphic performance
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * dlls/wined3d/arb_program_shader.c, dlls/wined3d/buffer.c, dlls/wined3d/context.c, dlls/wined3d/cs.c,
|
||||
# | dlls/wined3d/device.c, dlls/wined3d/drawprim.c, dlls/wined3d/glsl_shader.c, dlls/wined3d/query.c,
|
||||
# | dlls/wined3d/resource.c, dlls/wined3d/sampler.c, dlls/wined3d/shader.c, dlls/wined3d/state.c, dlls/wined3d/stateblock.c,
|
||||
# | dlls/wined3d/surface.c, dlls/wined3d/swapchain.c, dlls/wined3d/texture.c, dlls/wined3d/utils.c,
|
||||
# | dlls/wined3d/wined3d_main.c, dlls/wined3d/wined3d_private.h
|
||||
# |
|
||||
if test "$enable_wined3d_CSMT_Main" -eq 1; then
|
||||
patch_apply wined3d-CSMT_Main/9999-IfDefined.patch
|
||||
(
|
||||
echo '+ { "Sebastian Lackner", "Revert \"wined3d: Use buffer_bind() in buffer_conversion_upload().\".", 1 },';
|
||||
echo '+ { "Sebastian Lackner", "Revert \"wined3d: Fix index offset for immediate mode draws.\".", 1 },';
|
||||
echo '+ { "Sebastian Lackner", "Revert \"wined3d: Introduce buffer_conversion_upload() helper function.\".", 1 },';
|
||||
echo '+ { "Sebastian Lackner", "Revert \"wined3d: Replace wined3d_buffer_load_sysmem() calls with wined3d_buffer_load_location().\".", 1 },';
|
||||
echo '+ { "Sebastian Lackner", "Revert \"wined3d: Prefer current locations to WINED3D_LOCATION_SYSMEM in wined3d_buffer_copy().\".", 1 },';
|
||||
echo '+ { "Sebastian Lackner", "Revert \"wined3d: Introduce wined3d_buffer_get_memory().\".", 1 },';
|
||||
echo '+ { "Sebastian Lackner", "Revert \"wined3d: Implement wined3d_buffer_prepare_location() for WINED3D_LOCATION_BUFFER.\".", 1 },';
|
||||
echo '+ { "Sebastian Lackner", "Revert \"wined3d: Move buffer_get_memory() under wined3d_buffer_load_sysmem().\".", 1 },';
|
||||
echo '+ { "Sebastian Lackner", "Revert \"wined3d: Do not assume that WINED3D_LOCATION_SYSMEM is always valid for double buffered buffers.\".", 1 },';
|
||||
echo '+ { "Sebastian Lackner", "Revert \"wined3d: Introduce wined3d_buffer_load_location().\".", 1 },';
|
||||
echo '+ { "Sebastian Lackner", "Revert \"wined3d: Introduce wined3d_buffer_prepapre_location().\".", 1 },';
|
||||
echo '+ { "Sebastian Lackner", "Revert \"wined3d: Explicitly track locations for buffers.\".", 1 },';
|
||||
echo '+ { "Sebastian Lackner", "Revert \"wined3d: Clean up buffer_internal_preload().\".", 1 },';
|
||||
echo '+ { "Sebastian Lackner", "Revert \"wined3d: Let buffer_direct_upload() invalidate STATE_INDEXBUFFER if needed.\".", 1 },';
|
||||
echo '+ { "Sebastian Lackner", "Revert \"wined3d: Sanitise resource map flags in wined3d_resource_map().\".", 1 },';
|
||||
echo '+ { "Sebastian Lackner", "Revert \"wined3d: Send resource unmaps through the command stream.\".", 1 },';
|
||||
echo '+ { "Sebastian Lackner", "Revert \"wined3d: Send resource maps through the command stream.\".", 1 },';
|
||||
echo '+ { "Sebastian Lackner", "Revert \"wined3d: Send shader constant updates through the command stream.\".", 1 },';
|
||||
echo '+ { "Stefan Dösinger", "wined3d: Make surface_load_location return nothing.", 1 },';
|
||||
echo '+ { "Stefan Dösinger", "wined3d: Call texture_load_location instead of surface_load_location.", 1 },';
|
||||
echo '+ { "Stefan Dösinger", "wined3d: Share surface and volume system memory loading code.", 1 },';
|
||||
echo '+ { "Stefan Dösinger", "wined3d: Don'\''t call the public map function in surface_convert_format.", 1 },';
|
||||
echo '+ { "Stefan Dösinger", "wined3d: Don'\''t call the public map function in surface_cpu_blt.", 1 },';
|
||||
echo '+ { "Stefan Dösinger", "wined3d: Move the framebuffer into wined3d_state.", 1 },';
|
||||
echo '+ { "Stefan Dösinger", "wined3d: Preload buffers if streamsrc is not dirty.", 1 },';
|
||||
echo '+ { "Stefan Dösinger", "wined3d: Hackily introduce a multithreaded command stream.", 1 },';
|
||||
echo '+ { "Henri Verbeet", "wined3d: Wait for resource updates to finish when using the multithreaded command stream.", 1 },';
|
||||
echo '+ { "Stefan Dösinger", "wined3d: Wait for the cs before destroying objects.", 1 },';
|
||||
echo '+ { "Stefan Dösinger", "wined3d: Give the cs its own state.", 1 },';
|
||||
echo '+ { "Stefan Dösinger", "wined3d: Send float constant updates through the command stream.", 1 },';
|
||||
echo '+ { "Stefan Dösinger", "wined3d: Request a glFinish before modifying resources outside the cs.", 1 },';
|
||||
echo '+ { "Stefan Dösinger", "wined3d: Finish the cs before changing the texture lod.", 1 },';
|
||||
echo '+ { "Stefan Dösinger", "wined3d: Don'\''t call glFinish after clears.", 1 },';
|
||||
echo '+ { "Stefan Dösinger", "wined3d: Don'\''t call glFinish after draws.", 1 },';
|
||||
echo '+ { "Stefan Dösinger", "wined3d: Pass the depth stencil to swapchain->present.", 1 },';
|
||||
echo '+ { "Stefan Dösinger", "wined3d: Keep track of the onscreen depth stencil in the command stream instead of the device.", 1 },';
|
||||
echo '+ { "Stefan Dösinger", "wined3d: Send base vertex index updates through the cs.", 1 },';
|
||||
echo '+ { "Stefan Dösinger", "wined3d: Send primitive type updates through the command stream.", 1 },';
|
||||
echo '+ { "Stefan Dösinger", "wined3d: Send bool constant updates through the command stream.", 1 },';
|
||||
echo '+ { "Stefan Dösinger", "wined3d: Send int constant updates through the command stream.", 1 },';
|
||||
echo '+ { "Stefan Dösinger", "wined3d: Send light updates through the command stream.", 1 },';
|
||||
echo '+ { "Stefan Dösinger", "wined3d: Prevent the command stream from running ahead too far.", 1 },';
|
||||
echo '+ { "Stefan Dösinger", "wined3d: Wait for the cs to finish before destroying the device.", 1 },';
|
||||
echo '+ { "Stefan Dösinger", "wined3d: Run the cs asynchronously.", 1 },';
|
||||
echo '+ { "Stefan Dösinger", "wined3d: Send blits through the command stream.", 1 },';
|
||||
echo '+ { "Stefan Dösinger", "wined3d: Hack to reject unsupported color fills.", 1 },';
|
||||
echo '+ { "Stefan Dösinger", "wined3d: Restore some wined3d_device_copy_sub_resource_region checks.", 1 },';
|
||||
echo '+ { "Stefan Dösinger", "wined3d: Don'\''t force strict draw ordering for multithreaded CS.", 1 },';
|
||||
echo '+ { "Stefan Dösinger", "wined3d: Send render target view clears through the command stream.", 1 },';
|
||||
echo '+ { "Stefan Dösinger", "wined3d: Send texture maps through the command stream.", 1 },';
|
||||
echo '+ { "Stefan Dösinger", "wined3d: Get rid of the end_scene flush and finish.", 1 },';
|
||||
echo '+ { "Stefan Dösinger", "wined3d: Replace the linked lists with a ringbuffer.", 1 },';
|
||||
echo '+ { "Stefan Dösinger", "wined3d: Don'\''t preload buffers on unmap.", 1 },';
|
||||
echo '+ { "Stefan Dösinger", "wined3d: Don'\''t call glFinish before swapping.", 1 },';
|
||||
echo '+ { "Stefan Dösinger", "wined3d: Add query support to the command stream.", 1 },';
|
||||
echo '+ { "Stefan Dösinger", "wined3d: Check our CS state to find out if a query is done.", 1 },';
|
||||
echo '+ { "Stefan Dösinger", "wined3d: Poll queries automatically in the CS.", 1 },';
|
||||
echo '+ { "Stefan Dösinger", "wined3d: Introduce a separate queue for priority commands.", 1 },';
|
||||
echo '+ { "Stefan Dösinger", "wined3d: Don'\''t poll queries that failed to start.", 1 },';
|
||||
echo '+ { "Stefan Dösinger", "wined3d: Remove restated queries from the poll list.", 1 },';
|
||||
echo '+ { "Stefan Dösinger", "wined3d: Put this into the query poll patch.", 1 },';
|
||||
echo '+ { "Stefan Dösinger", "wined3d: Don'\''t access device state in clears.", 1 },';
|
||||
echo '+ { "Stefan Dösinger", "wined3d: Avoid destroying views in color and depth fills.", 1 },';
|
||||
echo '+ { "Matteo Bruni", "wined3d: Avoid calling wined3d_surface_blt() from surface_upload_from_surface().", 1 },';
|
||||
echo '+ { "Stefan Dösinger", "wined3d: Send update_texture calls through the CS.", 1 },';
|
||||
echo '+ { "Stefan Dösinger", "wined3d: Get rid of the surface_upload_data glFinish.", 1 },';
|
||||
echo '+ { "Stefan Dösinger", "wined3d: Don'\''t lock the src volume in device_update_volume.", 1 },';
|
||||
echo '+ { "Stefan Dösinger", "wined3d: Fence update_texture calls.", 1 },';
|
||||
echo '+ { "Stefan Dösinger", "wined3d: Dirtify resources on unmap.", 1 },';
|
||||
echo '+ { "Stefan Dösinger", "wined3d: Fence render targets and depth stencils.", 1 },';
|
||||
echo '+ { "Stefan Dösinger", "wined3d: Fence blit operations.", 1 },';
|
||||
echo '+ { "Stefan Dösinger", "wined3d: Fence color_fill operations.", 1 },';
|
||||
echo '+ { "Stefan Dösinger", "wined3d: Make resource maps and unmaps a priority command.", 1 },';
|
||||
echo '+ { "Stefan Dösinger", "wined3d: Send update_sub_resource calls through the command stream.", 1 },';
|
||||
echo '+ { "Stefan Dösinger", "wined3d: Dirtify changed textures through the command stream.", 1 },';
|
||||
echo '+ { "Stefan Dösinger", "wined3d: Wrap GL BOs in a structure.", 1 },';
|
||||
echo '+ { "Stefan Dösinger", "wined3d: Separate resource map and draw buffers.", 1 },';
|
||||
echo '+ { "Stefan Dösinger", "wined3d: Implement DISCARD texture maps with PBOs.", 1 },';
|
||||
echo '+ { "Stefan Dösinger", "wined3d: Implement DISCARD resource maps with heap memory.", 1 },';
|
||||
echo '+ { "Stefan Dösinger", "wined3d: Unset some objects in state_init_default.", 1 },';
|
||||
echo '+ { "Stefan Dösinger", "wined3d: Use double-buffered buffers for multithreaded CS.", 1 },';
|
||||
echo '+ { "Stefan Dösinger", "wined3d: Don'\''t synchronize NOOVERWRITE buffer maps.", 1 },';
|
||||
echo '+ { "Stefan Dösinger", "wined3d: Separate buffer map write and draw read memory pointers.", 1 },';
|
||||
echo '+ { "Stefan Dösinger", "wined3d: Accelerate DISCARD buffer maps.", 1 },';
|
||||
echo '+ { "Stefan Dösinger", "wined3d: Accelerate READONLY buffer maps.", 1 },';
|
||||
echo '+ { "Stefan Dösinger", "wined3d: Access the buffer dirty areas through the CS.", 1 },';
|
||||
echo '+ { "Stefan Dösinger", "wined3d: Ignore buffer->resource.map_count in the CS.", 1 },';
|
||||
echo '+ { "Stefan Dösinger", "wined3d: Use glBufferSubData instead of glMapBufferRange.", 1 },';
|
||||
echo '+ { "Stefan Dösinger", "wined3d: Separate GL buffer discard control from ignoring MAP_DISCARD.", 1 },';
|
||||
echo '+ { "Stefan Dösinger", "wined3d: Create buffers before mapping them.", 1 },';
|
||||
echo '+ { "Stefan Dösinger", "wined3d: Remove another glFinish.", 1 },';
|
||||
echo '+ { "Stefan Dösinger", "wined3d: Create VBOs through the command stream.", 1 },';
|
||||
echo '+ { "Stefan Dösinger", "Swapchain waits.", 1 },';
|
||||
echo '+ { "Stefan Dösinger", "wined3d: Unload resources through the CS in uninit_3d.", 1 },';
|
||||
echo '+ { "Stefan Dösinger", "wined3d: Unload resources through the CS in device_reset.", 1 },';
|
||||
echo '+ { "Stefan Dösinger", "wined3d: Don'\''t glFinish after a depth buffer blit.", 1 },';
|
||||
echo '+ { "Stefan Dösinger", "wined3d: Use surface_blt_ugly in swapchain_gl_present.", 1 },';
|
||||
echo '+ { "Stefan Dösinger", "wined3d: Use an event to block the worker thread when it is idle.", 1 },';
|
||||
echo '+ { "Stefan Dösinger", "wined3d: Set map_heap_memory = NULL when allocating a PBO.", 1 },';
|
||||
echo '+ { "Stefan Dösinger", "wined3d: Wait only for the buffer to be idle.", 1 },';
|
||||
echo '+ { "Stefan Dösinger", "wined3d: Put GL_APPLE_flush_buffer_range syncing back in place.", 1 },';
|
||||
echo '+ { "Stefan Dösinger", "wined3d: Don'\''t sync on redundant discard calls.", 1 },';
|
||||
echo '+ { "Stefan Dösinger", "wined3d: Don'\''t discard new buffers.", 1 },';
|
||||
echo '+ { "Stefan Dösinger", "wined3d: Don'\''t try to sync VBOs manually on OSX with CSMT.", 1 },';
|
||||
echo '+ { "Stefan Dösinger", "wined3d: Only discard buffers that are in use.", 1 },';
|
||||
echo '+ { "Stefan Dösinger", "wined3d: Send getdc and releasedc through the command stream.", 1 },';
|
||||
echo '+ { "Stefan Dösinger", "wined3d: Ignore WINED3D_MAP_NO_DIRTY_UPDATE in resource_map.", 1 },';
|
||||
echo '+ { "Stefan Dösinger", "wined3d: Create dummy textures through the CS.", 1 },';
|
||||
echo '+ { "Stefan Dösinger", "wined3d: Create the initial context through the CS.", 1 },';
|
||||
echo '+ { "Stefan Dösinger", "wined3d: Recreate ctx and dummy textures through the CS after resets.", 1 },';
|
||||
echo '+ { "Stefan Dösinger", "wined3d: Call create_default_sampler from create_dummy_textures.", 1 },';
|
||||
echo '+ { "Stefan Dösinger", "wined3d: Delete GL contexts through the CS in reset.", 1 },';
|
||||
echo '+ { "Stefan Dösinger", "wined3d: Delete GL contexts through the CS in uninit_3d.", 1 },';
|
||||
echo '+ { "Stefan Dösinger", "wined3d: Update the swap interval through the CS in reset.", 1 },';
|
||||
echo '+ { "Stefan Dösinger", "wined3d: Do the sampler GL init through the CS.", 1 },';
|
||||
echo '+ { "Stefan Dösinger", "wined3d: Create initial DCs through the CS.", 1 },';
|
||||
echo '+ { "Stefan Dösinger", "wined3d: Assign a read buffer when discarding a new texture.", 1 },';
|
||||
echo '+ { "Sebastian Lackner", "wined3d: Do not query available GPU memory on main thread when CSMT is enabled.", 1 },';
|
||||
echo '+ { "Nils Kuhnhenn", "wined3d: Fix incorrect return value in wined3d_cs_exec_set_light.", 1 },';
|
||||
echo '+ { "Nils Kuhnhenn", "wined3d: Fix context_acquire not being called from the command thread in wined3d_texture_add_dirty_region.", 1 },';
|
||||
echo '+ { "Sebastian Lackner", "wined3d: Do not signal CS event when we manage to unset waiting_for_event quickly enough.", 1 },';
|
||||
echo '+ { "Sebastian Lackner", "wined3d: Enable CSMT by default, print a winediag message informing about this patchset.", 1 },';
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset winedevice-Fix_Relocation
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From f6f04f14bb73690b6a45299469c52391699a6e88 Mon Sep 17 00:00:00 2001
|
||||
From d7161fbc798020e8cc462e44660e448ddf8f585d Mon Sep 17 00:00:00 2001
|
||||
From: Dmitry Timoshkov <dmitry@baikal.ru>
|
||||
Date: Wed, 20 Jul 2016 14:30:09 +0800
|
||||
Subject: gdiplus: Implement GdipInitializePalette. (v2)
|
||||
@ -10,7 +10,7 @@ Subject: gdiplus: Implement GdipInitializePalette. (v2)
|
||||
3 files changed, 110 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec
|
||||
index c163ef9..d380146 100644
|
||||
index 40c19e6..4186b5b 100644
|
||||
--- a/dlls/gdiplus/gdiplus.spec
|
||||
+++ b/dlls/gdiplus/gdiplus.spec
|
||||
@@ -615,7 +615,7 @@
|
||||
@ -21,14 +21,14 @@ index c163ef9..d380146 100644
|
||||
+618 stdcall GdipInitializePalette(ptr long long long ptr)
|
||||
619 stdcall GdipBitmapCreateApplyEffect(ptr long ptr ptr ptr ptr long ptr ptr)
|
||||
620 stdcall GdipBitmapApplyEffect(ptr ptr ptr long ptr ptr)
|
||||
621 stub GdipBitmapGetHistogram
|
||||
621 stdcall GdipBitmapGetHistogram(ptr long long ptr ptr ptr ptr)
|
||||
diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c
|
||||
index 1cee84b..7135eb4 100644
|
||||
index 31cdc7c..42d30cf 100644
|
||||
--- a/dlls/gdiplus/image.c
|
||||
+++ b/dlls/gdiplus/image.c
|
||||
@@ -5423,3 +5423,111 @@ GpStatus WINGDIPAPI GdipBitmapConvertFormat(GpBitmap *bitmap, PixelFormat format
|
||||
FIXME("(%p, 0x%08x, %d, %d, %p, %f): stub\n", bitmap, format, dithertype, palettetype, palette, alphathreshold);
|
||||
return NotImplemented;
|
||||
@@ -5567,3 +5567,111 @@ GpStatus WINGDIPAPI GdipBitmapGetHistogramSize(HistogramFormat format, UINT *num
|
||||
*num_of_entries = 256;
|
||||
return Ok;
|
||||
}
|
||||
+
|
||||
+static GpStatus create_optimal_palette(ColorPalette *palette, INT desired,
|
||||
@ -139,10 +139,10 @@ index 1cee84b..7135eb4 100644
|
||||
+ return InvalidParameter;
|
||||
+}
|
||||
diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h
|
||||
index c6f16c4..4849104 100644
|
||||
index 0c40223..0d6d9ea 100644
|
||||
--- a/include/gdiplusflat.h
|
||||
+++ b/include/gdiplusflat.h
|
||||
@@ -262,6 +262,7 @@ GpStatus WINGDIPAPI GdipGetWorldTransform(GpGraphics*,GpMatrix*);
|
||||
@@ -264,6 +264,7 @@ GpStatus WINGDIPAPI GdipGetWorldTransform(GpGraphics*,GpMatrix*);
|
||||
GpStatus WINGDIPAPI GdipGraphicsClear(GpGraphics*,ARGB);
|
||||
GpStatus WINGDIPAPI GdipGetVisibleClipBounds(GpGraphics*,GpRectF*);
|
||||
GpStatus WINGDIPAPI GdipGetVisibleClipBoundsI(GpGraphics*,GpRect*);
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From baced9170457ba5c85df39c3c30ae60923a86488 Mon Sep 17 00:00:00 2001
|
||||
From 86a10d59fa0f11717c0194fc0111568f8a948173 Mon Sep 17 00:00:00 2001
|
||||
From: Dmitry Timoshkov <dmitry@baikal.ru>
|
||||
Date: Wed, 20 Jul 2016 14:30:53 +0800
|
||||
Subject: gdiplus/tests: Add some tests for GdipInitializePalette. (v2)
|
||||
@ -8,19 +8,19 @@ Subject: gdiplus/tests: Add some tests for GdipInitializePalette. (v2)
|
||||
1 file changed, 146 insertions(+)
|
||||
|
||||
diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c
|
||||
index 28fd1a7..b74cb50 100644
|
||||
index b3b47b6..4a0ec96 100644
|
||||
--- a/dlls/gdiplus/tests/image.c
|
||||
+++ b/dlls/gdiplus/tests/image.c
|
||||
@@ -30,6 +30,8 @@
|
||||
#include "gdiplus.h"
|
||||
#include "wine/test.h"
|
||||
@@ -34,6 +34,8 @@ static GpStatus (WINAPI *pGdipBitmapGetHistogramSize)(HistogramFormat,UINT*);
|
||||
static GpStatus (WINAPI *pGdipBitmapGetHistogram)(GpBitmap*,HistogramFormat,UINT,UINT*,UINT*,UINT*,UINT*);
|
||||
static GpStatus (WINAPI *pGdipImageSetAbort)(GpImage*,GdiplusAbort*);
|
||||
|
||||
+static GpStatus (WINGDIPAPI *pGdipInitializePalette)(ColorPalette*,PaletteType,INT,BOOL,GpBitmap*);
|
||||
+
|
||||
#define expect(expected, got) ok((got) == (expected), "Expected %d, got %d\n", (UINT)(expected), (UINT)(got))
|
||||
#define expectf(expected, got) ok(fabs((expected) - (got)) < 0.0001, "Expected %f, got %f\n", (expected), (got))
|
||||
|
||||
@@ -4849,6 +4851,149 @@ static void test_png_color_formats(void)
|
||||
@@ -5005,6 +5007,149 @@ static void test_png_color_formats(void)
|
||||
}
|
||||
}
|
||||
|
||||
@ -169,10 +169,10 @@ index 28fd1a7..b74cb50 100644
|
||||
+
|
||||
START_TEST(image)
|
||||
{
|
||||
struct GdiplusStartupInput gdiplusStartupInput;
|
||||
@@ -4861,6 +5006,7 @@ START_TEST(image)
|
||||
|
||||
GdiplusStartup(&gdiplusToken, &gdiplusStartupInput, NULL);
|
||||
HMODULE mod = GetModuleHandleA("gdiplus.dll");
|
||||
@@ -5022,6 +5167,7 @@ START_TEST(image)
|
||||
pGdipBitmapGetHistogram = (void*)GetProcAddress(mod, "GdipBitmapGetHistogram");
|
||||
pGdipImageSetAbort = (void*)GetProcAddress(mod, "GdipImageSetAbort");
|
||||
|
||||
+ test_GdipInitializePalette();
|
||||
test_png_color_formats();
|
||||
|
||||
@ -4,6 +4,5 @@ Depends: wined3d-QUERY_Stubs
|
||||
Depends: wined3d-1DTextures
|
||||
Depends: wined3d-Silence_FIXMEs
|
||||
Depends: wined3d-Revert_Pixel_Center_Offset
|
||||
Depends: wined3d-Invalidate_INDEXBUFFER
|
||||
Depends: makedep-PARENTSPEC
|
||||
Depends: ntdll-DllRedirects
|
||||
|
||||
@ -5,6 +5,7 @@ Fixes: [11674] Support for CSMT (command stream) to increase graphic performance
|
||||
Apply-After: dlls/wined3d/*
|
||||
Depends: wined3d-CSMT_Helper
|
||||
IfDefined: STAGING_CSMT
|
||||
Disabled: true
|
||||
|
||||
# Known issues:
|
||||
# https://bugs.wine-staging.com/buglist.cgi?component=Bugs&keywords=csmt%2C%20&keywords_type=allwords&list_id=3690&query_format=advanced&resolution=---
|
||||
|
||||
@ -1,39 +0,0 @@
|
||||
From cda4f405aae949edf1ad29b2277b28a57c661ad5 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?J=C3=B3zef=20Kucia?= <jkucia@codeweavers.com>
|
||||
Date: Mon, 31 Oct 2016 12:48:31 +0100
|
||||
Subject: wined3d: Invalidate INDEXBUFFER device state when bound index buffer
|
||||
is unloaded.
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Fixes a regression introduced by commit
|
||||
e3a8cd20ced9f33db64a35f60bc8487ae8173e47.
|
||||
|
||||
Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
|
||||
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
|
||||
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
|
||||
---
|
||||
dlls/wined3d/buffer.c | 5 +++++
|
||||
1 file changed, 5 insertions(+)
|
||||
|
||||
diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c
|
||||
index a81cd64..13953c9 100644
|
||||
--- a/dlls/wined3d/buffer.c
|
||||
+++ b/dlls/wined3d/buffer.c
|
||||
@@ -665,7 +665,12 @@ static void buffer_unload(struct wined3d_resource *resource)
|
||||
* happens only once per changed vertexbuffer and should occur rather
|
||||
* rarely. */
|
||||
if (resource->bind_count)
|
||||
+ {
|
||||
device_invalidate_state(device, STATE_STREAMSRC);
|
||||
+
|
||||
+ if (buffer->buffer_type_hint == GL_ELEMENT_ARRAY_BUFFER)
|
||||
+ device_invalidate_state(device, STATE_INDEXBUFFER);
|
||||
+ }
|
||||
}
|
||||
|
||||
resource_unload(resource);
|
||||
--
|
||||
2.9.0
|
||||
|
||||
@ -1 +1 @@
|
||||
Wine Staging 1.9.22
|
||||
Wine Staging 1.9.23 (unreleased)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user