mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2024-11-21 16:46:54 -08:00
Rebase against 1316520a8029c0a99b358d1cd754294634d1855a.
[ntoskrnl-METHOD_OUT_DIRECT] Removed patch to implement support for METHOD_OUT_DIRECT ioctls (accepted upstream). [wined3d-CSMT_Main] Temporarily disable patchset.
This commit is contained in:
Sebastian Lackner
parent
6997fa0121
commit
5c0d70c70e
@ -1,39 +0,0 @@
|
||||
From 0cd3973a47317aff488c63eeb33ddedb2cba2b50 Mon Sep 17 00:00:00 2001
|
||||
From: Hans Leidekker <hans@codeweavers.com>
|
||||
Date: Sat, 15 Oct 2016 17:27:41 +0200
|
||||
Subject: include: Avoid duplicate definition of PEVENT_FILTER_DESCRIPTOR.
|
||||
|
||||
---
|
||||
include/evntrace.h | 14 ++++++--------
|
||||
1 file changed, 6 insertions(+), 8 deletions(-)
|
||||
|
||||
diff --git a/include/evntrace.h b/include/evntrace.h
|
||||
index b54cd11..bb1ce03 100644
|
||||
--- a/include/evntrace.h
|
||||
+++ b/include/evntrace.h
|
||||
@@ -248,16 +248,14 @@ typedef struct _EVENT_TRACE_PROPERTIES
|
||||
ULONG LoggerNameOffset;
|
||||
} EVENT_TRACE_PROPERTIES, *PEVENT_TRACE_PROPERTIES;
|
||||
|
||||
-typedef struct _EVENT_FILTER_DESCRIPTOR *PEVENT_FILTER_DESCRIPTOR;
|
||||
-
|
||||
typedef struct _ENABLE_TRACE_PARAMETERS
|
||||
{
|
||||
- ULONG Version;
|
||||
- ULONG EnableProperty;
|
||||
- ULONG ControlFlags;
|
||||
- GUID SourceId;
|
||||
- PEVENT_FILTER_DESCRIPTOR EnableFilterDesc;
|
||||
- ULONG FilterDescCount;
|
||||
+ ULONG Version;
|
||||
+ ULONG EnableProperty;
|
||||
+ ULONG ControlFlags;
|
||||
+ GUID SourceId;
|
||||
+ struct _EVENT_FILTER_DESCRIPTOR *EnableFilterDesc;
|
||||
+ ULONG FilterDescCount;
|
||||
} ENABLE_TRACE_PARAMETERS, *PENABLE_TRACE_PARAMETERS;
|
||||
|
||||
#define INVALID_PROCESSTRACE_HANDLE ((TRACEHANDLE)~(ULONG_PTR)0)
|
||||
--
|
||||
2.9.0
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From 88298227180510b5eee8b129ae964f14bf565d64 Mon Sep 17 00:00:00 2001
|
||||
From 97744349e9a23aa024910d87a89bd94652db4914 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
|
||||
Date: Fri, 15 Jan 2016 13:07:09 +0100
|
||||
Subject: api-ms-win-core-quirks-l1-1-0: Add dll.
|
||||
@ -13,13 +13,13 @@ Subject: api-ms-win-core-quirks-l1-1-0: Add dll.
|
||||
create mode 100644 dlls/api-ms-win-core-quirks-l1-1-0/api-ms-win-core-quirks-l1-1-0.spec
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index e97cd17..6d51b3f 100644
|
||||
index 84316f9..e826dd0 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -2717,6 +2717,7 @@ WINE_CONFIG_DLL(api-ms-win-core-processthreads-l1-1-1)
|
||||
WINE_CONFIG_DLL(api-ms-win-core-processthreads-l1-1-2)
|
||||
@@ -2720,6 +2720,7 @@ WINE_CONFIG_DLL(api-ms-win-core-processthreads-l1-1-2)
|
||||
WINE_CONFIG_DLL(api-ms-win-core-profile-l1-1-0)
|
||||
WINE_CONFIG_DLL(api-ms-win-core-psapi-l1-1-0)
|
||||
WINE_CONFIG_DLL(api-ms-win-core-psapi-obsolete-l1-1-0)
|
||||
+WINE_CONFIG_DLL(api-ms-win-core-quirks-l1-1-0)
|
||||
WINE_CONFIG_DLL(api-ms-win-core-realtime-l1-1-0)
|
||||
WINE_CONFIG_DLL(api-ms-win-core-registry-l1-1-0)
|
||||
@ -46,10 +46,10 @@ index 0000000..54ce373
|
||||
+@ stub QuirkIsEnabledForPackage2
|
||||
+@ stub QuirkIsEnabledForProcess
|
||||
diff --git a/tools/make_specfiles b/tools/make_specfiles
|
||||
index 8a7e514..3316f76 100755
|
||||
index eba8548..609f7a0 100755
|
||||
--- a/tools/make_specfiles
|
||||
+++ b/tools/make_specfiles
|
||||
@@ -236,6 +236,10 @@ my @dll_groups =
|
||||
@@ -239,6 +239,10 @@ my @dll_groups =
|
||||
"api-ms-win-core-bem-l1-1-0",
|
||||
],
|
||||
[
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From faddf206cfe8bb34fb7f56c881723229b0d3e8e4 Mon Sep 17 00:00:00 2001
|
||||
From 4d240f9f1d7b50a2a0206fe965986c967bbacfd7 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 999a457..d099029 100644
|
||||
index 647ea2fe..f3cb281 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -3008,6 +3008,7 @@ WINE_CONFIG_DLL(explorerframe,,[clean])
|
||||
WINE_CONFIG_TEST(dlls/explorerframe/tests)
|
||||
WINE_CONFIG_DLL(ext-ms-win-gdi-devcaps-l1-1-0)
|
||||
WINE_CONFIG_DLL(ext-ms-win-kernel32-package-current-l1-1-0)
|
||||
@@ -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)
|
||||
WINE_CONFIG_DLL(ext-ms-win-rtcore-ntuser-dpi-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 84ff59cbefcd2a4c5c5625a99fdbf06ebee7bba6 Mon Sep 17 00:00:00 2001
|
||||
From db1db629d2bce149edc99cd534d5e1b5e17a1e82 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 d099029..e2d7b8e 100644
|
||||
index f3cb281..7566ca4 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -3006,6 +3006,7 @@ WINE_CONFIG_DLL(esent)
|
||||
@@ -3007,6 +3007,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-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-xaml-pal-l1-1-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 275174ba45b57fa9f65d2199700cab3a5cfea397 Mon Sep 17 00:00:00 2001
|
||||
From 45055d28aa803d6dcd9fc74da0b1432b05e23abe 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 4afa294..b4572d3 100644
|
||||
index c1799d1..1200547 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -3012,6 +3012,7 @@ WINE_CONFIG_TEST(dlls/explorerframe/tests)
|
||||
WINE_CONFIG_DLL(ext-ms-win-appmodel-usercontext-l1-1-0)
|
||||
@@ -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)
|
||||
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-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)
|
||||
WINE_CONFIG_DLL(faultrep,,[implib])
|
||||
WINE_CONFIG_TEST(dlls/faultrep/tests)
|
||||
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 542e207..4b53feb 100755
|
||||
index a43d5dc..6cb5f53 100755
|
||||
--- a/tools/make_specfiles
|
||||
+++ b/tools/make_specfiles
|
||||
@@ -283,6 +283,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",
|
||||
"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-rtcore-ntuser-dpi-l1-1-0",
|
||||
],
|
||||
[
|
||||
"version",
|
||||
--
|
||||
2.9.0
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From 4af99f6f4d4e56d5cc7adfa52263b71232807f2a Mon Sep 17 00:00:00 2001
|
||||
From 85c838f8a6f00f53ddc753c4aea2d288c9f9b599 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 b4572d3..20d799a 100644
|
||||
index 1200547..b9920fb 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -3013,6 +3013,7 @@ WINE_CONFIG_DLL(ext-ms-win-appmodel-usercontext-l1-1-0)
|
||||
WINE_CONFIG_DLL(ext-ms-win-gdi-devcaps-l1-1-0)
|
||||
WINE_CONFIG_DLL(ext-ms-win-kernel32-package-current-l1-1-0)
|
||||
@@ -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)
|
||||
WINE_CONFIG_DLL(ext-ms-win-rtcore-ntuser-dpi-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 4b53feb..e7d6c74 100755
|
||||
index 6cb5f53..0aa6233 100755
|
||||
--- a/tools/make_specfiles
|
||||
+++ b/tools/make_specfiles
|
||||
@@ -312,6 +312,10 @@ my @dll_groups =
|
||||
@@ -317,6 +317,10 @@ my @dll_groups =
|
||||
"api-ms-win-core-winrt-string-l1-1-0",
|
||||
],
|
||||
[
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From 11664cbe8489c457a4b286253155ba6837269953 Mon Sep 17 00:00:00 2001
|
||||
From 2d8ce357a32cf96f732338eb5625c1cc88532355 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,10 +13,10 @@ 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 6685769..356dd05 100644
|
||||
index b9920fb..4308010 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -2782,6 +2782,7 @@ WINE_CONFIG_DLL(api-ms-win-eventing-controller-l1-1-0)
|
||||
@@ -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)
|
||||
@ -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 1b1e722..56c813a 100755
|
||||
index 0aa6233..3afaea4 100755
|
||||
--- a/tools/make_specfiles
|
||||
+++ b/tools/make_specfiles
|
||||
@@ -269,6 +269,7 @@ my @dll_groups =
|
||||
@@ -284,6 +284,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-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",
|
||||
--
|
||||
2.9.0
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From b2c7de654c69a9d0aedb4c1d40cd4218df1869bb Mon Sep 17 00:00:00 2001
|
||||
From b86c534df0ffdfcbe823eed592e88d242733204a 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,13 +13,13 @@ 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 9a621f7..99cf576 100644
|
||||
index 4308010..e348625 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -3014,6 +3014,7 @@ WINE_CONFIG_DLL(ext-ms-win-appmodel-usercontext-l1-1-0)
|
||||
WINE_CONFIG_DLL(ext-ms-win-gdi-devcaps-l1-1-0)
|
||||
WINE_CONFIG_DLL(ext-ms-win-kernel32-package-current-l1-1-0)
|
||||
@@ -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)
|
||||
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-uxtheme-themes-l1-1-0)
|
||||
WINE_CONFIG_DLL(ext-ms-win-xaml-pal-l1-1-0)
|
||||
@ -40,13 +40,13 @@ 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 276e3b3..976dcb4 100755
|
||||
index 3afaea4..e192572 100755
|
||||
--- a/tools/make_specfiles
|
||||
+++ b/tools/make_specfiles
|
||||
@@ -285,6 +285,7 @@ my @dll_groups =
|
||||
"api-ms-win-ntuser-dc-access-l1-1-0",
|
||||
"api-ms-win-rtcore-ntuser-window-l1-1-0",
|
||||
@@ -289,6 +289,7 @@ my @dll_groups =
|
||||
"ext-ms-win-ntuser-mouse-l1-1-0",
|
||||
"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",
|
||||
],
|
||||
[
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From c67410351d98e086e96dba69cc1a5f351939c017 Mon Sep 17 00:00:00 2001
|
||||
From 50e5a8cff7cfb80c56df1ece4376caa1b4c158e6 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,10 +13,10 @@ 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 c6914fa..78bbc39 100644
|
||||
index e348625..7bd2367 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -2782,6 +2782,7 @@ WINE_CONFIG_DLL(api-ms-win-eventing-controller-l1-1-0)
|
||||
@@ -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)
|
||||
@ -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 d222f88..e175d2e 100755
|
||||
index e192572..466099d 100755
|
||||
--- a/tools/make_specfiles
|
||||
+++ b/tools/make_specfiles
|
||||
@@ -269,6 +269,7 @@ my @dll_groups =
|
||||
@@ -284,6 +284,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-window-l1-1-0",
|
||||
"ext-ms-win-ntuser-message-l1-1-1",
|
||||
"ext-ms-win-ntuser-mouse-l1-1-0",
|
||||
"ext-ms-win-rtcore-ntuser-syscolors-l1-1-0",
|
||||
--
|
||||
2.9.0
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From c8663fed050b92db5376d4b9892f783b3c3fa2de Mon Sep 17 00:00:00 2001
|
||||
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.
|
||||
@ -13,12 +13,12 @@ Subject: ext-ms-win-rtcore-ntuser-sysparams-l1-1-0: Add dll.
|
||||
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 9ff6713..0436524 100644
|
||||
index 7bd2367..302a94d 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -3016,6 +3016,7 @@ 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-mouse-l1-1-0)
|
||||
@@ -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)
|
||||
@ -58,12 +58,12 @@ index 0000000..ffb8f5b
|
||||
+@ 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 da114a5..758e4df 100755
|
||||
index 466099d..238feb1 100755
|
||||
--- a/tools/make_specfiles
|
||||
+++ b/tools/make_specfiles
|
||||
@@ -287,6 +287,7 @@ my @dll_groups =
|
||||
"api-ms-win-rtcore-ntuser-window-l1-1-0",
|
||||
"ext-ms-win-ntuser-mouse-l1-1-0",
|
||||
@@ -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",
|
||||
],
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From f31780d39178e9e4aa98962d04a51e4f7440757d Mon Sep 17 00:00:00 2001
|
||||
From 01f63c1b25a7b0f964e9558d1054a613d1cd90e8 Mon Sep 17 00:00:00 2001
|
||||
From: Sebastian Lackner <sebastian@fds-team.de>
|
||||
Date: Sat, 6 Jun 2015 01:21:05 +0200
|
||||
Subject: server: Return correct error codes for NtWriteFile when pipes are
|
||||
@ -12,7 +12,7 @@ Subject: server: Return correct error codes for NtWriteFile when pipes are
|
||||
4 files changed, 46 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c
|
||||
index 3035dd4..9986337 100644
|
||||
index db2d49d..a2a425d 100644
|
||||
--- a/dlls/kernel32/tests/pipe.c
|
||||
+++ b/dlls/kernel32/tests/pipe.c
|
||||
@@ -1909,7 +1909,7 @@ static void test_CloseHandle(void)
|
||||
@ -25,10 +25,10 @@ index 3035dd4..9986337 100644
|
||||
CloseHandle(hfile);
|
||||
|
||||
diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c
|
||||
index a925899..af4b64e 100644
|
||||
index d1dd1e7..1b97ef0 100644
|
||||
--- a/dlls/ntdll/file.c
|
||||
+++ b/dlls/ntdll/file.c
|
||||
@@ -1211,6 +1211,9 @@ static NTSTATUS write_unix_fd(int fd, const char *buf, ULONG *total, ULONG lengt
|
||||
@@ -1240,6 +1240,9 @@ static NTSTATUS write_unix_fd(int fd, const char *buf, ULONG *total, ULONG lengt
|
||||
return STATUS_SUCCESS;
|
||||
else if (errno == EFAULT)
|
||||
return STATUS_INVALID_USER_BUFFER;
|
||||
@ -39,7 +39,7 @@ index a925899..af4b64e 100644
|
||||
}
|
||||
}
|
||||
diff --git a/server/named_pipe.c b/server/named_pipe.c
|
||||
index 55c0db7..e4dbf26 100644
|
||||
index 6e627bd..69293a9 100644
|
||||
--- a/server/named_pipe.c
|
||||
+++ b/server/named_pipe.c
|
||||
@@ -147,6 +147,7 @@ static const struct object_ops named_pipe_ops =
|
||||
@ -85,7 +85,7 @@ index 55c0db7..e4dbf26 100644
|
||||
static void named_pipe_dump( struct object *obj, int verbose )
|
||||
{
|
||||
fputs( "Named pipe\n", stderr );
|
||||
@@ -394,6 +398,23 @@ static void do_disconnect( struct pipe_server *server )
|
||||
@@ -393,6 +397,23 @@ static void do_disconnect( struct pipe_server *server )
|
||||
server->fd = NULL;
|
||||
}
|
||||
|
||||
@ -109,7 +109,7 @@ index 55c0db7..e4dbf26 100644
|
||||
static void pipe_server_destroy( struct object *obj)
|
||||
{
|
||||
struct pipe_server *server = (struct pipe_server *)obj;
|
||||
@@ -420,6 +441,24 @@ static void pipe_server_destroy( struct object *obj)
|
||||
@@ -419,6 +440,24 @@ static void pipe_server_destroy( struct object *obj)
|
||||
release_object( server->pipe );
|
||||
}
|
||||
|
||||
@ -121,7 +121,7 @@ index 55c0db7..e4dbf26 100644
|
||||
+ int unix_fd;
|
||||
+
|
||||
+ assert( obj->ops == &pipe_client_ops );
|
||||
+ if (obj->handle_count == 1 && server && server->fd && server->state != ps_disconnected_server &&
|
||||
+ if (obj->handle_count == 1 && server && server->fd &&
|
||||
+ server->state != ps_wait_connect && (unix_fd = get_unix_fd( server->fd )) != -1)
|
||||
+ {
|
||||
+ /* set the NAMED_PIPE_CLOSED_HANDLE flag, to distinguish disconnect / closing pipe */
|
||||
@ -135,10 +135,10 @@ index 55c0db7..e4dbf26 100644
|
||||
{
|
||||
struct pipe_client *client = (struct pipe_client *)obj;
|
||||
diff --git a/server/protocol.def b/server/protocol.def
|
||||
index 2d87f03..1dc70d4 100644
|
||||
index 29f3a52..2dd44dd 100644
|
||||
--- a/server/protocol.def
|
||||
+++ b/server/protocol.def
|
||||
@@ -2378,6 +2378,7 @@ enum message_type
|
||||
@@ -2428,6 +2428,7 @@ enum message_type
|
||||
#define NAMED_PIPE_MESSAGE_STREAM_WRITE 0x0001
|
||||
#define NAMED_PIPE_MESSAGE_STREAM_READ 0x0002
|
||||
#define NAMED_PIPE_NONBLOCKING_MODE 0x0004
|
||||
@ -147,5 +147,5 @@ index 2d87f03..1dc70d4 100644
|
||||
|
||||
/* Get named pipe information by handle */
|
||||
--
|
||||
2.7.0
|
||||
2.9.0
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From 40564f426aea608e9925d332e15eca8e9f2e3ea1 Mon Sep 17 00:00:00 2001
|
||||
From a34d16145d16d83aa3edc0d8cbf59dfd40268738 Mon Sep 17 00:00:00 2001
|
||||
From: Dmitry Timoshkov <dtimoshkov@codeweavers.com>
|
||||
Date: Mon, 28 Jul 2003 07:39:25 -0500
|
||||
Subject: libs: Fix most problems with CompareString.
|
||||
@ -9,10 +9,10 @@ Subject: libs: Fix most problems with CompareString.
|
||||
2 files changed, 34 insertions(+), 35 deletions(-)
|
||||
|
||||
diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c
|
||||
index 20f52d2..015bfad 100644
|
||||
index 07d6f8c..97ed611 100644
|
||||
--- a/dlls/kernel32/tests/locale.c
|
||||
+++ b/dlls/kernel32/tests/locale.c
|
||||
@@ -1766,13 +1766,13 @@ static void test_CompareStringA(void)
|
||||
@@ -1956,13 +1956,13 @@ static void test_CompareStringA(void)
|
||||
todo_wine ok(ret != CSTR_EQUAL, "\\2 vs \\1 expected unequal\n");
|
||||
|
||||
ret = CompareStringA(lcid, NORM_IGNORECASE | LOCALE_USE_CP_ACP, "#", -1, ".", -1);
|
||||
@ -29,10 +29,10 @@ index 20f52d2..015bfad 100644
|
||||
|
||||
lcid = MAKELCID(MAKELANGID(LANG_POLISH, SUBLANG_DEFAULT), SORT_DEFAULT);
|
||||
|
||||
@@ -4842,6 +4842,5 @@ START_TEST(locale)
|
||||
test_invariant();
|
||||
@@ -5302,6 +5302,5 @@ START_TEST(locale)
|
||||
test_GetSystemPreferredUILanguages();
|
||||
test_GetThreadPreferredUILanguages();
|
||||
test_GetUserPreferredUILanguages();
|
||||
- /* this requires collation table patch to make it MS compatible */
|
||||
- if (0) test_sorting();
|
||||
+ test_sorting();
|
||||
@ -168,5 +168,5 @@ index 465d740..f354a75 100644
|
||||
0x0a130121, 0x0a140121, 0x02370121, 0x02350121, 0x03a30121, 0x03a40121, 0x03a50121, 0x024e0121,
|
||||
0x02a10121, 0x0a150161, 0x0a290151, 0x0a3d0161, 0x0a490161, 0x0a650161, 0x0a910161, 0x0a990161,
|
||||
--
|
||||
2.8.0
|
||||
2.9.0
|
||||
|
||||
|
||||
@ -1,44 +0,0 @@
|
||||
From b7076ee4183b3e1da97374eabe04344569c55a66 Mon Sep 17 00:00:00 2001
|
||||
From: Sebastian Lackner <sebastian@fds-team.de>
|
||||
Date: Sun, 16 Oct 2016 08:59:23 +0200
|
||||
Subject: hidclass.sys: Use MmGetSystemAddressForMdlSafe to access MDL data.
|
||||
|
||||
Signed-off-by: Sebastian Lackner <sebastian@fds-team.de>
|
||||
---
|
||||
dlls/hidclass.sys/device.c | 6 +++---
|
||||
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/dlls/hidclass.sys/device.c b/dlls/hidclass.sys/device.c
|
||||
index d2a4710..189cd2e 100644
|
||||
--- a/dlls/hidclass.sys/device.c
|
||||
+++ b/dlls/hidclass.sys/device.c
|
||||
@@ -419,7 +419,7 @@ static NTSTATUS handle_minidriver_string(DEVICE_OBJECT *device, IRP *irp, SHORT
|
||||
|
||||
if (status == STATUS_SUCCESS)
|
||||
{
|
||||
- WCHAR *out_buffer = (WCHAR*)(((BYTE*)irp->MdlAddress->StartVa) + irp->MdlAddress->ByteOffset);
|
||||
+ WCHAR *out_buffer = MmGetSystemAddressForMdlSafe(irp->MdlAddress, NormalPagePriority);
|
||||
int length = irpsp->Parameters.DeviceIoControl.OutputBufferLength/sizeof(WCHAR);
|
||||
TRACE("got string %s from minidriver\n",debugstr_w(buffer));
|
||||
lstrcpynW(out_buffer, buffer, length);
|
||||
@@ -440,7 +440,7 @@ static NTSTATUS HID_get_feature(DEVICE_OBJECT *device, IRP *irp)
|
||||
|
||||
irp->IoStatus.Information = 0;
|
||||
|
||||
- out_buffer = (((BYTE*)irp->MdlAddress->StartVa) + irp->MdlAddress->ByteOffset);
|
||||
+ out_buffer = MmGetSystemAddressForMdlSafe(irp->MdlAddress, NormalPagePriority);
|
||||
TRACE_(hid_report)("Device %p Buffer length %i Buffer %p\n", device, irpsp->Parameters.DeviceIoControl.OutputBufferLength, out_buffer);
|
||||
|
||||
len = sizeof(*packet) + irpsp->Parameters.DeviceIoControl.OutputBufferLength;
|
||||
@@ -569,7 +569,7 @@ NTSTATUS WINAPI HID_Device_ioctl(DEVICE_OBJECT *device, IRP *irp)
|
||||
case IOCTL_HID_GET_INPUT_REPORT:
|
||||
{
|
||||
HID_XFER_PACKET packet;
|
||||
- BYTE* buffer = ((BYTE*)irp->MdlAddress->StartVa) + irp->MdlAddress->ByteOffset;
|
||||
+ BYTE *buffer = MmGetSystemAddressForMdlSafe(irp->MdlAddress, NormalPagePriority);
|
||||
|
||||
if (extension->preparseData->InputReports[0].reportID)
|
||||
packet.reportId = buffer[0];
|
||||
--
|
||||
2.9.0
|
||||
|
||||
@ -1 +0,0 @@
|
||||
Fixes: Support for METHOD_OUT_DIRECT ioctls
|
||||
@ -52,7 +52,7 @@ usage()
|
||||
# Get the upstream commit sha
|
||||
upstream_commit()
|
||||
{
|
||||
echo "ddfc5275af0081cba6e834bf9d9e35dcaa17d256"
|
||||
echo "1316520a8029c0a99b358d1cd754294634d1855a"
|
||||
}
|
||||
|
||||
# Show version information
|
||||
@ -246,7 +246,6 @@ patch_enable_all ()
|
||||
enable_ntdll_Zero_mod_name="$1"
|
||||
enable_ntdll_call_thread_func_wrapper="$1"
|
||||
enable_ntoskrnl_DriverTest="$1"
|
||||
enable_ntoskrnl_METHOD_OUT_DIRECT="$1"
|
||||
enable_ntoskrnl_Stubs="$1"
|
||||
enable_nvapi_Stub_DLL="$1"
|
||||
enable_nvcuda_CUDA_Support="$1"
|
||||
@ -270,7 +269,6 @@ patch_enable_all ()
|
||||
enable_rasapi32_RasEnumDevicesA="$1"
|
||||
enable_riched20_Class_Tests="$1"
|
||||
enable_riched20_IText_Interface="$1"
|
||||
enable_rpcrt4_RpcBindingServerFromClient="$1"
|
||||
enable_secur32_Zero_Buffer_Length="$1"
|
||||
enable_server_ClipCursor="$1"
|
||||
enable_server_CreateProcess_ACLs="$1"
|
||||
@ -368,7 +366,6 @@ 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_Limit_Vram="$1"
|
||||
@ -922,9 +919,6 @@ patch_enable ()
|
||||
ntoskrnl-DriverTest)
|
||||
enable_ntoskrnl_DriverTest="$2"
|
||||
;;
|
||||
ntoskrnl-METHOD_OUT_DIRECT)
|
||||
enable_ntoskrnl_METHOD_OUT_DIRECT="$2"
|
||||
;;
|
||||
ntoskrnl-Stubs)
|
||||
enable_ntoskrnl_Stubs="$2"
|
||||
;;
|
||||
@ -994,9 +988,6 @@ patch_enable ()
|
||||
riched20-IText_Interface)
|
||||
enable_riched20_IText_Interface="$2"
|
||||
;;
|
||||
rpcrt4-RpcBindingServerFromClient)
|
||||
enable_rpcrt4_RpcBindingServerFromClient="$2"
|
||||
;;
|
||||
secur32-Zero_Buffer_Length)
|
||||
enable_secur32_Zero_Buffer_Length="$2"
|
||||
;;
|
||||
@ -1288,9 +1279,6 @@ patch_enable ()
|
||||
wined3d-CSMT_Helper)
|
||||
enable_wined3d_CSMT_Helper="$2"
|
||||
;;
|
||||
wined3d-CSMT_Main)
|
||||
enable_wined3d_CSMT_Main="$2"
|
||||
;;
|
||||
wined3d-DXTn)
|
||||
enable_wined3d_DXTn="$2"
|
||||
;;
|
||||
@ -2014,13 +2002,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."
|
||||
@ -2414,11 +2395,10 @@ fi
|
||||
# | * dlls/amstream/mediastreamfilter.c, dlls/d2d1/brush.c, dlls/d2d1/geometry.c, dlls/d3d11/view.c, dlls/d3d8/texture.c,
|
||||
# | dlls/d3d9/tests/visual.c, dlls/d3d9/texture.c, dlls/ddraw/viewport.c, dlls/dsound/primary.c, dlls/dwrite/layout.c,
|
||||
# | dlls/msxml3/schema.c, dlls/netapi32/netapi32.c, dlls/oleaut32/oleaut.c, dlls/rpcrt4/cstub.c, dlls/vbscript/vbdisp.c,
|
||||
# | dlls/winealsa.drv/mmdevdrv.c, dlls/wined3d/glsl_shader.c, include/d3dtypes.h, include/evntrace.h, include/wine/list.h,
|
||||
# | dlls/winealsa.drv/mmdevdrv.c, dlls/wined3d/glsl_shader.c, include/d3dtypes.h, include/wine/list.h,
|
||||
# | include/wine/rbtree.h, include/winnt.h, tools/makedep.c
|
||||
# |
|
||||
if test "$enable_Compiler_Warnings" -eq 1; then
|
||||
patch_apply Compiler_Warnings/0001-include-Avoid-duplicate-definition-of-PEVENT_FILTER_.patch
|
||||
patch_apply Compiler_Warnings/0015-include-Avoid-shift-overflow-warning.patch
|
||||
patch_apply Compiler_Warnings/0018-Appease-the-blessed-version-of-gcc-4.5-when-Werror-i.patch
|
||||
patch_apply Compiler_Warnings/0019-dsound-Avoid-implicit-cast-of-interface-pointer.patch
|
||||
@ -2435,7 +2415,6 @@ if test "$enable_Compiler_Warnings" -eq 1; then
|
||||
patch_apply Compiler_Warnings/0030-vbscript-Avoid-implicit-cast-of-interface-pointer.patch
|
||||
patch_apply Compiler_Warnings/0031-include-Check-element-type-in-CONTAINING_RECORD-and-.patch
|
||||
(
|
||||
echo '+ { "Hans Leidekker", "include: Avoid duplicate definition of PEVENT_FILTER_DESCRIPTOR.", 1 },';
|
||||
echo '+ { "Sebastian Lackner", "include: Avoid shift overflow warning.", 1 },';
|
||||
echo '+ { "Erich E. Hoover", "Appease the blessed version of gcc (4.5) when -Werror is enabled.", 1 },';
|
||||
echo '+ { "Sebastian Lackner", "dsound: Avoid implicit cast of interface pointer.", 1 },';
|
||||
@ -5459,18 +5438,6 @@ if test "$enable_ntoskrnl_DriverTest" -eq 1; then
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset ntoskrnl-METHOD_OUT_DIRECT
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * dlls/hidclass.sys/device.c
|
||||
# |
|
||||
if test "$enable_ntoskrnl_METHOD_OUT_DIRECT" -eq 1; then
|
||||
patch_apply ntoskrnl-METHOD_OUT_DIRECT/0005-hidclass.sys-Use-MmGetSystemAddressForMdlSafe-to-acc.patch
|
||||
(
|
||||
echo '+ { "Sebastian Lackner", "hidclass.sys: Use MmGetSystemAddressForMdlSafe to access MDL data.", 1 },';
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset ntoskrnl-Stubs
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
@ -5932,18 +5899,6 @@ if test "$enable_riched20_IText_Interface" -eq 1; then
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset rpcrt4-RpcBindingServerFromClient
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * dlls/rpcrt4/rpc_binding.c
|
||||
# |
|
||||
if test "$enable_rpcrt4_RpcBindingServerFromClient" -eq 1; then
|
||||
patch_apply rpcrt4-RpcBindingServerFromClient/0001-rpcrt4-Fix-prototype-of-RpcBindingServerFromClient.patch
|
||||
(
|
||||
echo '+ { "Sebastian Lackner", "rpcrt4: Fix prototype of RpcBindingServerFromClient.", 1 },';
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset secur32-Zero_Buffer_Length
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
@ -6552,7 +6507,7 @@ fi
|
||||
# | * [#35630] Support for SHCreateSessionKey
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * dlls/shell32/shell32.spec, dlls/shell32/shellreg.c, dlls/shell32/tests/shellole.c
|
||||
# | * dlls/shell32/shellreg.c, dlls/shell32/tests/shellole.c
|
||||
# |
|
||||
if test "$enable_shell32_SHCreateSessionKey" -eq 1; then
|
||||
patch_apply shell32-SHCreateSessionKey/0001-shell32-Implement-SHCreateSessionKey.patch
|
||||
@ -7628,137 +7583,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-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: 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,27 +0,0 @@
|
||||
From e96dbcea16b0f61eeb3547688613774e2c8b778e Mon Sep 17 00:00:00 2001
|
||||
From: Sebastian Lackner <sebastian@fds-team.de>
|
||||
Date: Thu, 14 Jan 2016 19:08:08 +0100
|
||||
Subject: rpcrt4: Fix prototype of RpcBindingServerFromClient.
|
||||
|
||||
---
|
||||
dlls/rpcrt4/rpc_binding.c | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/dlls/rpcrt4/rpc_binding.c b/dlls/rpcrt4/rpc_binding.c
|
||||
index 7212a18..2503d31 100644
|
||||
--- a/dlls/rpcrt4/rpc_binding.c
|
||||
+++ b/dlls/rpcrt4/rpc_binding.c
|
||||
@@ -1636,8 +1636,8 @@ RpcBindingInqAuthClientExW( RPC_BINDING_HANDLE ClientBinding, RPC_AUTHZ_HANDLE *
|
||||
/***********************************************************************
|
||||
* RpcBindingServerFromClient (RPCRT4.@)
|
||||
*/
|
||||
-
|
||||
-RPC_STATUS RPC_ENTRY RpcBindingServerFromClient(RPC_BINDING_HANDLE ClientBinding, RPC_BINDING_HANDLE *ServerBinding)
|
||||
+RPCRTAPI RPC_STATUS RPC_ENTRY
|
||||
+RpcBindingServerFromClient( RPC_BINDING_HANDLE ClientBinding, RPC_BINDING_HANDLE *ServerBinding )
|
||||
{
|
||||
FIXME("%p %p: stub\n", ClientBinding, ServerBinding);
|
||||
return RPC_S_INVALID_BINDING;
|
||||
--
|
||||
2.6.4
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From d23845620d8b2a4d9b4a8683d764b03ee2683068 Mon Sep 17 00:00:00 2001
|
||||
From b91e77db01f842164dd0ec593ad6bf433ad46c5e Mon Sep 17 00:00:00 2001
|
||||
From: Dmitry Timoshkov <dmitry@baikal.ru>
|
||||
Date: Mon, 17 Feb 2014 11:52:46 +0900
|
||||
Subject: shell32: Implement SHCreateSessionKey.
|
||||
@ -6,32 +6,18 @@ Subject: shell32: Implement SHCreateSessionKey.
|
||||
This implementation is based on the Geoff Chappell description,
|
||||
and it seems to be enough for the application I have here.
|
||||
---
|
||||
dlls/shell32/shell32.spec | 1 +
|
||||
dlls/shell32/shellreg.c | 41 +++++++++++++++++++++++++++++++++++++++++
|
||||
dlls/shell32/tests/shellole.c | 4 ++--
|
||||
3 files changed, 44 insertions(+), 2 deletions(-)
|
||||
dlls/shell32/shellreg.c | 36 +++++++++++++++++++++++++++++++++---
|
||||
dlls/shell32/tests/shellole.c | 8 ++++----
|
||||
2 files changed, 37 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/dlls/shell32/shell32.spec b/dlls/shell32/shell32.spec
|
||||
index 93fd449..abbe6d2 100644
|
||||
--- a/dlls/shell32/shell32.spec
|
||||
+++ b/dlls/shell32/shell32.spec
|
||||
@@ -261,6 +261,7 @@
|
||||
704 stdcall -noname GUIDFromStringW(wstr ptr)
|
||||
709 stdcall SHGetSetFolderCustomSettings(ptr str long)
|
||||
714 stdcall @(ptr) SHELL32_714 # PathIsTemporaryW
|
||||
+ 723 stdcall SHCreateSessionKey(long ptr)
|
||||
727 stdcall SHGetImageList(long ptr ptr)
|
||||
730 stdcall -noname RestartDialogEx(long wstr long long)
|
||||
743 stdcall SHCreateFileExtractIconW(wstr long ptr ptr)
|
||||
diff --git a/dlls/shell32/shellreg.c b/dlls/shell32/shellreg.c
|
||||
index 37f3d9e..96a450e 100644
|
||||
index 356ec4e..fff1b91 100644
|
||||
--- a/dlls/shell32/shellreg.c
|
||||
+++ b/dlls/shell32/shellreg.c
|
||||
@@ -147,3 +147,44 @@ HRESULT WINAPI SHRegCloseKey (HKEY hkey)
|
||||
TRACE("%p\n",hkey);
|
||||
@@ -148,13 +148,43 @@ HRESULT WINAPI SHRegCloseKey (HKEY hkey)
|
||||
return RegCloseKey( hkey );
|
||||
}
|
||||
+
|
||||
|
||||
+static const char session_reg_key[] = "Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\SessionInfo\\";
|
||||
+
|
||||
+static BOOL WINAPI create_session_key(INIT_ONCE *once, void *param, void **context)
|
||||
@ -58,12 +44,15 @@ index 37f3d9e..96a450e 100644
|
||||
+ return TRUE;
|
||||
+}
|
||||
+
|
||||
+/*************************************************************************
|
||||
+ * SHCreateSessionKey [SHELL32.723]
|
||||
+ *
|
||||
+ */
|
||||
+HRESULT WINAPI SHCreateSessionKey(REGSAM access, HKEY *hkey)
|
||||
+{
|
||||
/*************************************************************************
|
||||
* SHCreateSessionKey [SHELL32.723]
|
||||
*
|
||||
*/
|
||||
HRESULT WINAPI SHCreateSessionKey(REGSAM access, HKEY *hkey)
|
||||
{
|
||||
- FIXME("stub: %d %p\n", access, hkey);
|
||||
- *hkey = NULL;
|
||||
- return E_NOTIMPL;
|
||||
+ static INIT_ONCE init_once = INIT_ONCE_STATIC_INIT;
|
||||
+ static WCHAR session_reg_str[sizeof(session_reg_key) + 39];
|
||||
+
|
||||
@ -71,22 +60,30 @@ index 37f3d9e..96a450e 100644
|
||||
+
|
||||
+ TRACE("using session key %s\n", debugstr_w(session_reg_str));
|
||||
+ return RegOpenKeyExW(HKEY_CURRENT_USER, session_reg_str, 0, access, hkey);
|
||||
+}
|
||||
}
|
||||
diff --git a/dlls/shell32/tests/shellole.c b/dlls/shell32/tests/shellole.c
|
||||
index e8cf744..91125c0 100644
|
||||
index be10733..72e0f31 100644
|
||||
--- a/dlls/shell32/tests/shellole.c
|
||||
+++ b/dlls/shell32/tests/shellole.c
|
||||
@@ -876,8 +876,8 @@ if (0) /* crashes on native */
|
||||
|
||||
@@ -877,14 +877,14 @@ static void test_SHCreateSessionKey(void)
|
||||
hkey = (HKEY)0xdeadbeef;
|
||||
hr = pSHCreateSessionKey(0, &hkey);
|
||||
- ok(hr == E_ACCESSDENIED, "got 0x%08x\n", hr);
|
||||
todo_wine ok(hr == E_ACCESSDENIED, "got 0x%08x\n", hr);
|
||||
- ok(hkey == NULL, "got %p\n", hkey);
|
||||
+ todo_wine ok(hr == E_ACCESSDENIED, "got 0x%08x\n", hr);
|
||||
+ todo_wine ok(hkey == NULL, "got %p\n", hkey);
|
||||
|
||||
hr = pSHCreateSessionKey(KEY_READ, &hkey);
|
||||
ok(hr == S_OK, "got 0x%08x\n", hr);
|
||||
- todo_wine ok(hr == S_OK, "got 0x%08x\n", hr);
|
||||
+ ok(hr == S_OK, "got 0x%08x\n", hr);
|
||||
|
||||
hr = pSHCreateSessionKey(KEY_READ, &hkey2);
|
||||
- todo_wine ok(hr == S_OK, "got 0x%08x\n", hr);
|
||||
- todo_wine ok(hkey != hkey2, "got %p, %p\n", hkey, hkey2);
|
||||
+ ok(hr == S_OK, "got 0x%08x\n", hr);
|
||||
+ ok(hkey != hkey2, "got %p, %p\n", hkey, hkey2);
|
||||
|
||||
RegCloseKey(hkey);
|
||||
RegCloseKey(hkey2);
|
||||
--
|
||||
2.6.4
|
||||
2.9.0
|
||||
|
||||
|
||||
@ -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=---
|
||||
|
||||
Loading…
Reference in New Issue
Block a user