diff --git a/patches/dxdiag-new-dlls/0010-dxapi.sys-add-stub-dll.patch b/patches/dxdiag-new-dlls/0010-dxapi.sys-add-stub-dll.patch index 053c0be6..83ee3d0a 100644 --- a/patches/dxdiag-new-dlls/0010-dxapi.sys-add-stub-dll.patch +++ b/patches/dxdiag-new-dlls/0010-dxapi.sys-add-stub-dll.patch @@ -1,4 +1,4 @@ -From c4e663329366c37bca65a0beb83d656afea45ecc Mon Sep 17 00:00:00 2001 +From 338fc447537dd45e07a3c2d9ef8069af910c936f Mon Sep 17 00:00:00 2001 From: Austin English Date: Tue, 13 Oct 2020 04:42:03 -0500 Subject: [PATCH] dxapi.sys: add stub dll @@ -9,17 +9,16 @@ Signed-off-by: Austin English dlls/dxapi.sys/Makefile.in | 6 ++++++ dlls/dxapi.sys/dxapi.sys.spec | 7 +++++++ dlls/dxapi.sys/version.rc | 26 ++++++++++++++++++++++++++ - loader/wine.inf.in | 2 ++ - 5 files changed, 42 insertions(+) + 4 files changed, 40 insertions(+) create mode 100644 dlls/dxapi.sys/Makefile.in create mode 100644 dlls/dxapi.sys/dxapi.sys.spec create mode 100644 dlls/dxapi.sys/version.rc diff --git a/configure.ac b/configure.ac -index da6ada3013b..47e8427f6b8 100644 +index d3cb3ed1fd6..86d6912b4e0 100644 --- a/configure.ac +++ b/configure.ac -@@ -3248,6 +3248,7 @@ WINE_CONFIG_MAKEFILE(dlls/dwmapi/tests) +@@ -3274,6 +3274,7 @@ WINE_CONFIG_MAKEFILE(dlls/dwmapi/tests) WINE_CONFIG_MAKEFILE(dlls/dwrite) WINE_CONFIG_MAKEFILE(dlls/dwrite/tests) WINE_CONFIG_MAKEFILE(dlls/dx8vb) @@ -84,26 +83,6 @@ index 00000000000..7ecd1565052 +#define WINE_PRODUCTVERSION_STR "5.0.2180.1" + +#include "wine/wine_common_ver.rc" -diff --git a/loader/wine.inf.in b/loader/wine.inf.in -index 20d5243aa4b..b4052b146b4 100644 ---- a/loader/wine.inf.in -+++ b/loader/wine.inf.in -@@ -2632,6 +2632,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" - 10,syswow64,stdole2.tlb - 11,,iexplore.exe - 11,,winetest.exe,- -+12,,dxapi.sys,- - 12,,dxgkrnl.sys,- - 12,,dxgmms1.sys,- - 12,,fltmgr.sys,- -@@ -2689,6 +2690,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" - 11,,iexplore.exe - 11,,notepad.exe - 11,,winetest.exe,- -+12,,dxapi.sys,- - 12,,dxgkrnl.sys - 12,,dxgmms1.sys - 12,,fltmgr.sys -- -2.20.1 +2.30.1 diff --git a/patches/eventfd_synchronization/0011-server-Add-an-object-operation-to-grab-the-esync-fil.patch b/patches/eventfd_synchronization/0011-server-Add-an-object-operation-to-grab-the-esync-fil.patch index 065b4a61..a66b515a 100644 --- a/patches/eventfd_synchronization/0011-server-Add-an-object-operation-to-grab-the-esync-fil.patch +++ b/patches/eventfd_synchronization/0011-server-Add-an-object-operation-to-grab-the-esync-fil.patch @@ -1,4 +1,4 @@ -From 3a159edee2db7634475ee665e3ab0cf56c5425f6 Mon Sep 17 00:00:00 2001 +From 1ecb2712f80d52480a8204824df6b56a88c062b8 Mon Sep 17 00:00:00 2001 From: Zebediah Figura Date: Fri, 8 Jun 2018 18:51:40 -0500 Subject: [PATCH] server: Add an object operation to grab the esync file @@ -42,10 +42,10 @@ Split off to decrease patch size. 33 files changed, 67 insertions(+) diff --git a/server/async.c b/server/async.c -index 81d575b52bd..bdd68663ab9 100644 +index 1ac5117edb9..e52707a4929 100644 --- a/server/async.c +++ b/server/async.c -@@ -70,6 +70,7 @@ static const struct object_ops async_ops = +@@ -72,6 +72,7 @@ static const struct object_ops async_ops = add_queue, /* add_queue */ remove_queue, /* remove_queue */ async_signaled, /* signaled */ @@ -53,7 +53,7 @@ index 81d575b52bd..bdd68663ab9 100644 async_satisfied, /* satisfied */ no_signal, /* signal */ no_get_fd, /* get_fd */ -@@ -484,6 +485,7 @@ static const struct object_ops iosb_ops = +@@ -499,6 +500,7 @@ static const struct object_ops iosb_ops = no_add_queue, /* add_queue */ NULL, /* remove_queue */ NULL, /* signaled */ @@ -62,7 +62,7 @@ index 81d575b52bd..bdd68663ab9 100644 no_signal, /* signal */ no_get_fd, /* get_fd */ diff --git a/server/atom.c b/server/atom.c -index b61fa276661..73d858fef82 100644 +index 8d0ffbb05f3..ff0d8b5d87b 100644 --- a/server/atom.c +++ b/server/atom.c @@ -80,6 +80,7 @@ static const struct object_ops atom_table_ops = @@ -74,10 +74,10 @@ index b61fa276661..73d858fef82 100644 no_signal, /* signal */ no_get_fd, /* get_fd */ diff --git a/server/change.c b/server/change.c -index 8e4a272bc8b..a79b6d61939 100644 +index ff8c3ad1037..30b4c9776e1 100644 --- a/server/change.c +++ b/server/change.c -@@ -115,6 +115,7 @@ static const struct object_ops dir_ops = +@@ -114,6 +114,7 @@ static const struct object_ops dir_ops = add_queue, /* add_queue */ remove_queue, /* remove_queue */ default_fd_signaled, /* signaled */ @@ -86,7 +86,7 @@ index 8e4a272bc8b..a79b6d61939 100644 no_signal, /* signal */ dir_get_fd, /* get_fd */ diff --git a/server/clipboard.c b/server/clipboard.c -index e4546832620..54a5fb683cc 100644 +index 1c4875ff726..e21663b5a94 100644 --- a/server/clipboard.c +++ b/server/clipboard.c @@ -77,6 +77,7 @@ static const struct object_ops clipboard_ops = @@ -98,10 +98,10 @@ index e4546832620..54a5fb683cc 100644 no_signal, /* signal */ no_get_fd, /* get_fd */ diff --git a/server/completion.c b/server/completion.c -index 0bad4d7a260..176cf1b817e 100644 +index eb0d256ad09..5a8bb8fb47f 100644 --- a/server/completion.c +++ b/server/completion.c -@@ -64,6 +64,7 @@ static const struct object_ops completion_ops = +@@ -76,6 +76,7 @@ static const struct object_ops completion_ops = add_queue, /* add_queue */ remove_queue, /* remove_queue */ completion_signaled, /* signaled */ @@ -110,7 +110,7 @@ index 0bad4d7a260..176cf1b817e 100644 no_signal, /* signal */ no_get_fd, /* get_fd */ diff --git a/server/console.c b/server/console.c -index d1f948b23a6..cc534e8c9c1 100644 +index 848ee6e8d98..a7f122adacd 100644 --- a/server/console.c +++ b/server/console.c @@ -81,6 +81,7 @@ static const struct object_ops console_ops = @@ -137,7 +137,7 @@ index d1f948b23a6..cc534e8c9c1 100644 NULL, /* satisfied */ no_signal, /* signal */ screen_buffer_get_fd, /* get_fd */ -@@ -273,6 +276,7 @@ static const struct object_ops console_device_ops = +@@ -272,6 +275,7 @@ static const struct object_ops console_device_ops = no_add_queue, /* add_queue */ NULL, /* remove_queue */ NULL, /* signaled */ @@ -145,7 +145,7 @@ index d1f948b23a6..cc534e8c9c1 100644 no_satisfied, /* satisfied */ no_signal, /* signal */ no_get_fd, /* get_fd */ -@@ -310,6 +314,7 @@ static const struct object_ops console_input_ops = +@@ -309,6 +313,7 @@ static const struct object_ops console_input_ops = console_input_add_queue, /* add_queue */ NULL, /* remove_queue */ NULL, /* signaled */ @@ -153,7 +153,7 @@ index d1f948b23a6..cc534e8c9c1 100644 no_satisfied, /* satisfied */ no_signal, /* signal */ console_input_get_fd, /* get_fd */ -@@ -366,6 +371,7 @@ static const struct object_ops console_output_ops = +@@ -365,6 +370,7 @@ static const struct object_ops console_output_ops = console_output_add_queue, /* add_queue */ NULL, /* remove_queue */ NULL, /* signaled */ @@ -161,7 +161,7 @@ index d1f948b23a6..cc534e8c9c1 100644 no_satisfied, /* satisfied */ no_signal, /* signal */ console_output_get_fd, /* get_fd */ -@@ -423,6 +429,7 @@ static const struct object_ops console_connection_ops = +@@ -422,6 +428,7 @@ static const struct object_ops console_connection_ops = no_add_queue, /* add_queue */ NULL, /* remove_queue */ NULL, /* signaled */ @@ -170,10 +170,10 @@ index d1f948b23a6..cc534e8c9c1 100644 no_signal, /* signal */ console_connection_get_fd, /* get_fd */ diff --git a/server/debugger.c b/server/debugger.c -index 9531a4b6909..7eb7847a9da 100644 +index 2a2839f42ee..aee4bebb147 100644 --- a/server/debugger.c +++ b/server/debugger.c -@@ -73,6 +73,7 @@ static const struct object_ops debug_event_ops = +@@ -87,6 +87,7 @@ static const struct object_ops debug_event_ops = add_queue, /* add_queue */ remove_queue, /* remove_queue */ debug_event_signaled, /* signaled */ @@ -181,7 +181,7 @@ index 9531a4b6909..7eb7847a9da 100644 no_satisfied, /* satisfied */ no_signal, /* signal */ no_get_fd, /* get_fd */ -@@ -103,6 +104,7 @@ static const struct object_ops debug_obj_ops = +@@ -115,6 +116,7 @@ static const struct object_ops debug_obj_ops = add_queue, /* add_queue */ remove_queue, /* remove_queue */ debug_obj_signaled, /* signaled */ @@ -190,7 +190,7 @@ index 9531a4b6909..7eb7847a9da 100644 no_signal, /* signal */ no_get_fd, /* get_fd */ diff --git a/server/device.c b/server/device.c -index 652da83e1e2..cc9aa2358a4 100644 +index 6400751e339..6f8a65c6c41 100644 --- a/server/device.c +++ b/server/device.c @@ -68,6 +68,7 @@ static const struct object_ops irp_call_ops = @@ -209,7 +209,7 @@ index 652da83e1e2..cc9aa2358a4 100644 no_satisfied, /* satisfied */ no_signal, /* signal */ no_get_fd, /* get_fd */ -@@ -152,6 +154,7 @@ static const struct object_ops device_ops = +@@ -165,6 +167,7 @@ static const struct object_ops device_ops = no_add_queue, /* add_queue */ NULL, /* remove_queue */ NULL, /* signaled */ @@ -217,7 +217,7 @@ index 652da83e1e2..cc9aa2358a4 100644 no_satisfied, /* satisfied */ no_signal, /* signal */ no_get_fd, /* get_fd */ -@@ -203,6 +206,7 @@ static const struct object_ops device_file_ops = +@@ -217,6 +220,7 @@ static const struct object_ops device_file_ops = add_queue, /* add_queue */ remove_queue, /* remove_queue */ default_fd_signaled, /* signaled */ @@ -226,10 +226,10 @@ index 652da83e1e2..cc9aa2358a4 100644 no_signal, /* signal */ device_file_get_fd, /* get_fd */ diff --git a/server/directory.c b/server/directory.c -index ca9f978ff7f..2d25667106e 100644 +index 30d69459984..1f2e7d28302 100644 --- a/server/directory.c +++ b/server/directory.c -@@ -57,6 +57,7 @@ static const struct object_ops object_type_ops = +@@ -70,6 +70,7 @@ static const struct object_ops object_type_ops = no_add_queue, /* add_queue */ NULL, /* remove_queue */ NULL, /* signaled */ @@ -237,7 +237,7 @@ index ca9f978ff7f..2d25667106e 100644 NULL, /* satisfied */ no_signal, /* signal */ no_get_fd, /* get_fd */ -@@ -94,6 +95,7 @@ static const struct object_ops directory_ops = +@@ -120,6 +121,7 @@ static const struct object_ops directory_ops = no_add_queue, /* add_queue */ NULL, /* remove_queue */ NULL, /* signaled */ @@ -246,7 +246,7 @@ index ca9f978ff7f..2d25667106e 100644 no_signal, /* signal */ no_get_fd, /* get_fd */ diff --git a/server/esync.c b/server/esync.c -index b9e0a455629..d646cb52bc2 100644 +index f89f29150ea..631908d335e 100644 --- a/server/esync.c +++ b/server/esync.c @@ -124,6 +124,7 @@ static const struct object_ops esync_ops = @@ -258,10 +258,10 @@ index b9e0a455629..d646cb52bc2 100644 no_signal, /* signal */ no_get_fd, /* get_fd */ diff --git a/server/event.c b/server/event.c -index cba9472aa3d..06655fc7dd6 100644 +index ccdd465dd5b..3d869037bf5 100644 --- a/server/event.c +++ b/server/event.c -@@ -60,6 +60,7 @@ static const struct object_ops event_ops = +@@ -72,6 +72,7 @@ static const struct object_ops event_ops = add_queue, /* add_queue */ remove_queue, /* remove_queue */ event_signaled, /* signaled */ @@ -269,7 +269,7 @@ index cba9472aa3d..06655fc7dd6 100644 event_satisfied, /* satisfied */ event_signal, /* signal */ no_get_fd, /* get_fd */ -@@ -95,6 +96,7 @@ static const struct object_ops keyed_event_ops = +@@ -119,6 +120,7 @@ static const struct object_ops keyed_event_ops = add_queue, /* add_queue */ remove_queue, /* remove_queue */ keyed_event_signaled, /* signaled */ @@ -278,10 +278,10 @@ index cba9472aa3d..06655fc7dd6 100644 no_signal, /* signal */ no_get_fd, /* get_fd */ diff --git a/server/fd.c b/server/fd.c -index 673055718f8..5b76e3a876e 100644 +index 43c0d36dff9..819cd059547 100644 --- a/server/fd.c +++ b/server/fd.c -@@ -216,6 +216,7 @@ static const struct object_ops fd_ops = +@@ -218,6 +218,7 @@ static const struct object_ops fd_ops = no_add_queue, /* add_queue */ NULL, /* remove_queue */ NULL, /* signaled */ @@ -289,7 +289,7 @@ index 673055718f8..5b76e3a876e 100644 NULL, /* satisfied */ no_signal, /* signal */ no_get_fd, /* get_fd */ -@@ -257,6 +258,7 @@ static const struct object_ops device_ops = +@@ -259,6 +260,7 @@ static const struct object_ops device_ops = no_add_queue, /* add_queue */ NULL, /* remove_queue */ NULL, /* signaled */ @@ -297,7 +297,7 @@ index 673055718f8..5b76e3a876e 100644 NULL, /* satisfied */ no_signal, /* signal */ no_get_fd, /* get_fd */ -@@ -297,6 +299,7 @@ static const struct object_ops inode_ops = +@@ -299,6 +301,7 @@ static const struct object_ops inode_ops = no_add_queue, /* add_queue */ NULL, /* remove_queue */ NULL, /* signaled */ @@ -305,7 +305,7 @@ index 673055718f8..5b76e3a876e 100644 NULL, /* satisfied */ no_signal, /* signal */ no_get_fd, /* get_fd */ -@@ -339,6 +342,7 @@ static const struct object_ops file_lock_ops = +@@ -341,6 +344,7 @@ static const struct object_ops file_lock_ops = add_queue, /* add_queue */ remove_queue, /* remove_queue */ file_lock_signaled, /* signaled */ @@ -314,10 +314,10 @@ index 673055718f8..5b76e3a876e 100644 no_signal, /* signal */ no_get_fd, /* get_fd */ diff --git a/server/file.c b/server/file.c -index d7e1af5841a..308d19cec31 100644 +index ccac535e50f..70aa784fa21 100644 --- a/server/file.c +++ b/server/file.c -@@ -85,6 +85,7 @@ static const struct object_ops file_ops = +@@ -97,6 +97,7 @@ static const struct object_ops file_ops = add_queue, /* add_queue */ remove_queue, /* remove_queue */ default_fd_signaled, /* signaled */ @@ -326,10 +326,10 @@ index d7e1af5841a..308d19cec31 100644 no_signal, /* signal */ file_get_fd, /* get_fd */ diff --git a/server/handle.c b/server/handle.c -index 2556a03901e..4d7e4231a07 100644 +index 6e0848eedf0..65176c0be30 100644 --- a/server/handle.c +++ b/server/handle.c -@@ -123,6 +123,7 @@ static const struct object_ops handle_table_ops = +@@ -126,6 +126,7 @@ static const struct object_ops handle_table_ops = no_add_queue, /* add_queue */ NULL, /* remove_queue */ NULL, /* signaled */ @@ -338,7 +338,7 @@ index 2556a03901e..4d7e4231a07 100644 no_signal, /* signal */ no_get_fd, /* get_fd */ diff --git a/server/hook.c b/server/hook.c -index 2a3da247313..61b5014c442 100644 +index c048908c295..f5450b5a870 100644 --- a/server/hook.c +++ b/server/hook.c @@ -81,6 +81,7 @@ static const struct object_ops hook_table_ops = @@ -350,7 +350,7 @@ index 2a3da247313..61b5014c442 100644 no_signal, /* signal */ no_get_fd, /* get_fd */ diff --git a/server/mailslot.c b/server/mailslot.c -index 5d26c606080..2e09bab22fa 100644 +index 5597a21dd29..eec27a89dfc 100644 --- a/server/mailslot.c +++ b/server/mailslot.c @@ -78,6 +78,7 @@ static const struct object_ops mailslot_ops = @@ -369,7 +369,7 @@ index 5d26c606080..2e09bab22fa 100644 NULL, /* satisfied */ no_signal, /* signal */ mail_writer_get_fd, /* get_fd */ -@@ -199,6 +201,7 @@ static const struct object_ops mailslot_device_ops = +@@ -198,6 +200,7 @@ static const struct object_ops mailslot_device_ops = no_add_queue, /* add_queue */ NULL, /* remove_queue */ NULL, /* signaled */ @@ -377,7 +377,7 @@ index 5d26c606080..2e09bab22fa 100644 no_satisfied, /* satisfied */ no_signal, /* signal */ no_get_fd, /* get_fd */ -@@ -229,6 +232,7 @@ static const struct object_ops mailslot_device_file_ops = +@@ -228,6 +231,7 @@ static const struct object_ops mailslot_device_file_ops = add_queue, /* add_queue */ remove_queue, /* remove_queue */ default_fd_signaled, /* signaled */ @@ -386,7 +386,7 @@ index 5d26c606080..2e09bab22fa 100644 no_signal, /* signal */ mailslot_device_file_get_fd, /* get_fd */ diff --git a/server/mapping.c b/server/mapping.c -index 9c51aa3bec7..70395b804b0 100644 +index 3a162eae76b..f182ac10b47 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -68,6 +68,7 @@ static const struct object_ops ranges_ops = @@ -405,7 +405,7 @@ index 9c51aa3bec7..70395b804b0 100644 NULL, /* satisfied */ no_signal, /* signal */ no_get_fd, /* get_fd */ -@@ -162,6 +164,7 @@ static const struct object_ops mapping_ops = +@@ -177,6 +179,7 @@ static const struct object_ops mapping_ops = no_add_queue, /* add_queue */ NULL, /* remove_queue */ NULL, /* signaled */ @@ -414,10 +414,10 @@ index 9c51aa3bec7..70395b804b0 100644 no_signal, /* signal */ mapping_get_fd, /* get_fd */ diff --git a/server/mutex.c b/server/mutex.c -index 823ad54ffc3..fc236b3e623 100644 +index 75ff5117d3f..681cbc3e759 100644 --- a/server/mutex.c +++ b/server/mutex.c -@@ -61,6 +61,7 @@ static const struct object_ops mutex_ops = +@@ -73,6 +73,7 @@ static const struct object_ops mutex_ops = add_queue, /* add_queue */ remove_queue, /* remove_queue */ mutex_signaled, /* signaled */ @@ -426,7 +426,7 @@ index 823ad54ffc3..fc236b3e623 100644 mutex_signal, /* signal */ no_get_fd, /* get_fd */ diff --git a/server/named_pipe.c b/server/named_pipe.c -index ff1fdbe3f07..cbf7cdf9874 100644 +index a3ce9d463f1..74348b45dc9 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -119,6 +119,7 @@ static const struct object_ops named_pipe_ops = @@ -453,7 +453,7 @@ index ff1fdbe3f07..cbf7cdf9874 100644 no_satisfied, /* satisfied */ no_signal, /* signal */ pipe_end_get_fd, /* get_fd */ -@@ -257,6 +260,7 @@ static const struct object_ops named_pipe_device_ops = +@@ -256,6 +259,7 @@ static const struct object_ops named_pipe_device_ops = no_add_queue, /* add_queue */ NULL, /* remove_queue */ NULL, /* signaled */ @@ -461,7 +461,7 @@ index ff1fdbe3f07..cbf7cdf9874 100644 no_satisfied, /* satisfied */ no_signal, /* signal */ no_get_fd, /* get_fd */ -@@ -288,6 +292,7 @@ static const struct object_ops named_pipe_device_file_ops = +@@ -287,6 +291,7 @@ static const struct object_ops named_pipe_device_file_ops = add_queue, /* add_queue */ remove_queue, /* remove_queue */ default_fd_signaled, /* signaled */ @@ -470,10 +470,10 @@ index ff1fdbe3f07..cbf7cdf9874 100644 no_signal, /* signal */ named_pipe_device_file_get_fd, /* get_fd */ diff --git a/server/object.h b/server/object.h -index 73058fd3f99..02878ef0e0e 100644 +index 1aef43018b2..a4b5523866c 100644 --- a/server/object.h +++ b/server/object.h -@@ -68,6 +68,8 @@ struct object_ops +@@ -81,6 +81,8 @@ struct object_ops void (*remove_queue)(struct object *,struct wait_queue_entry *); /* is object signaled? */ int (*signaled)(struct object *,struct wait_queue_entry *); @@ -483,10 +483,10 @@ index 73058fd3f99..02878ef0e0e 100644 void (*satisfied)(struct object *,struct wait_queue_entry *); /* signal an object */ diff --git a/server/process.c b/server/process.c -index 3dabe0e6cfa..a8b11686315 100644 +index f65d7abe2af..af7aef0cdac 100644 --- a/server/process.c +++ b/server/process.c -@@ -78,6 +78,7 @@ static const struct object_ops process_ops = +@@ -91,6 +91,7 @@ static const struct object_ops process_ops = add_queue, /* add_queue */ remove_queue, /* remove_queue */ process_signaled, /* signaled */ @@ -494,7 +494,7 @@ index 3dabe0e6cfa..a8b11686315 100644 no_satisfied, /* satisfied */ no_signal, /* signal */ no_get_fd, /* get_fd */ -@@ -129,6 +130,7 @@ static const struct object_ops startup_info_ops = +@@ -142,6 +143,7 @@ static const struct object_ops startup_info_ops = add_queue, /* add_queue */ remove_queue, /* remove_queue */ startup_info_signaled, /* signaled */ @@ -502,7 +502,7 @@ index 3dabe0e6cfa..a8b11686315 100644 no_satisfied, /* satisfied */ no_signal, /* signal */ no_get_fd, /* get_fd */ -@@ -175,6 +177,7 @@ static const struct object_ops job_ops = +@@ -200,6 +202,7 @@ static const struct object_ops job_ops = add_queue, /* add_queue */ remove_queue, /* remove_queue */ job_signaled, /* signaled */ @@ -511,7 +511,7 @@ index 3dabe0e6cfa..a8b11686315 100644 no_signal, /* signal */ no_get_fd, /* get_fd */ diff --git a/server/queue.c b/server/queue.c -index a552fed57bb..263bb46ea00 100644 +index 2c7ad2de9eb..0bd84fb7223 100644 --- a/server/queue.c +++ b/server/queue.c @@ -172,6 +172,7 @@ static const struct object_ops msg_queue_ops = @@ -531,10 +531,10 @@ index a552fed57bb..263bb46ea00 100644 no_signal, /* signal */ no_get_fd, /* get_fd */ diff --git a/server/registry.c b/server/registry.c -index 64aec1d83c9..49a3c679207 100644 +index 74da4d1d9a4..e9f7bf761e8 100644 --- a/server/registry.c +++ b/server/registry.c -@@ -161,6 +161,7 @@ static const struct object_ops key_ops = +@@ -174,6 +174,7 @@ static const struct object_ops key_ops = no_add_queue, /* add_queue */ NULL, /* remove_queue */ NULL, /* signaled */ @@ -543,7 +543,7 @@ index 64aec1d83c9..49a3c679207 100644 no_signal, /* signal */ no_get_fd, /* get_fd */ diff --git a/server/request.c b/server/request.c -index 24cfda26110..72166ce2d33 100644 +index 29b63600f15..a70584ab001 100644 --- a/server/request.c +++ b/server/request.c @@ -97,6 +97,7 @@ static const struct object_ops master_socket_ops = @@ -555,10 +555,10 @@ index 24cfda26110..72166ce2d33 100644 no_signal, /* signal */ no_get_fd, /* get_fd */ diff --git a/server/semaphore.c b/server/semaphore.c -index cbcf4a4f942..ff94e42576b 100644 +index 543d5883ec8..9f37e2d8aa6 100644 --- a/server/semaphore.c +++ b/server/semaphore.c -@@ -58,6 +58,7 @@ static const struct object_ops semaphore_ops = +@@ -70,6 +70,7 @@ static const struct object_ops semaphore_ops = add_queue, /* add_queue */ remove_queue, /* remove_queue */ semaphore_signaled, /* signaled */ @@ -567,7 +567,7 @@ index cbcf4a4f942..ff94e42576b 100644 semaphore_signal, /* signal */ no_get_fd, /* get_fd */ diff --git a/server/serial.c b/server/serial.c -index 30fe6e8380f..a50ace9903f 100644 +index ba8402c5935..ba5d470704e 100644 --- a/server/serial.c +++ b/server/serial.c @@ -92,6 +92,7 @@ static const struct object_ops serial_ops = @@ -579,7 +579,7 @@ index 30fe6e8380f..a50ace9903f 100644 no_signal, /* signal */ serial_get_fd, /* get_fd */ diff --git a/server/signal.c b/server/signal.c -index 7c2bf2cc154..b6d6dcfc4b6 100644 +index 0c22c157f2b..45d176de46c 100644 --- a/server/signal.c +++ b/server/signal.c @@ -67,6 +67,7 @@ static const struct object_ops handler_ops = @@ -591,26 +591,26 @@ index 7c2bf2cc154..b6d6dcfc4b6 100644 no_signal, /* signal */ no_get_fd, /* get_fd */ diff --git a/server/sock.c b/server/sock.c -index 8c146a0a8f8..57d994ee332 100644 +index 775ec6edf32..651736a2280 100644 --- a/server/sock.c +++ b/server/sock.c -@@ -188,6 +188,7 @@ static const struct object_ops sock_ops = +@@ -189,6 +189,7 @@ static const struct object_ops sock_ops = add_queue, /* add_queue */ remove_queue, /* remove_queue */ - sock_signaled, /* signaled */ + default_fd_signaled, /* signaled */ + NULL, /* get_esync_fd */ no_satisfied, /* satisfied */ no_signal, /* signal */ sock_get_fd, /* get_fd */ -@@ -1533,6 +1534,7 @@ static const struct object_ops ifchange_ops = - add_queue, /* add_queue */ +@@ -1526,6 +1527,7 @@ static const struct object_ops ifchange_ops = + no_add_queue, /* add_queue */ NULL, /* remove_queue */ NULL, /* signaled */ + NULL, /* get_esync_fd */ no_satisfied, /* satisfied */ no_signal, /* signal */ ifchange_get_fd, /* get_fd */ -@@ -1754,6 +1756,7 @@ static const struct object_ops socket_device_ops = +@@ -1746,6 +1748,7 @@ static const struct object_ops socket_device_ops = no_add_queue, /* add_queue */ NULL, /* remove_queue */ NULL, /* signaled */ @@ -619,10 +619,10 @@ index 8c146a0a8f8..57d994ee332 100644 no_signal, /* signal */ no_get_fd, /* get_fd */ diff --git a/server/symlink.c b/server/symlink.c -index 0b85350e1a5..c7212618cac 100644 +index 3879bb685f7..5ebe35636e1 100644 --- a/server/symlink.c +++ b/server/symlink.c -@@ -60,6 +60,7 @@ static const struct object_ops symlink_ops = +@@ -72,6 +72,7 @@ static const struct object_ops symlink_ops = no_add_queue, /* add_queue */ NULL, /* remove_queue */ NULL, /* signaled */ @@ -631,7 +631,7 @@ index 0b85350e1a5..c7212618cac 100644 no_signal, /* signal */ no_get_fd, /* get_fd */ diff --git a/server/thread.c b/server/thread.c -index f493b7b2aa8..29a692361f8 100644 +index b78ffe558de..62f9a3f877a 100644 --- a/server/thread.c +++ b/server/thread.c @@ -110,6 +110,7 @@ static const struct object_ops thread_apc_ops = @@ -650,7 +650,7 @@ index f493b7b2aa8..29a692361f8 100644 no_satisfied, /* satisfied */ no_signal, /* signal */ no_get_fd, /* get_fd */ -@@ -182,6 +184,7 @@ static const struct object_ops thread_ops = +@@ -196,6 +198,7 @@ static const struct object_ops thread_ops = add_queue, /* add_queue */ remove_queue, /* remove_queue */ thread_signaled, /* signaled */ @@ -659,10 +659,10 @@ index f493b7b2aa8..29a692361f8 100644 no_signal, /* signal */ no_get_fd, /* get_fd */ diff --git a/server/timer.c b/server/timer.c -index d4e5c56267c..319b9d142db 100644 +index 49483d9ae13..23d03aa3582 100644 --- a/server/timer.c +++ b/server/timer.c -@@ -65,6 +65,7 @@ static const struct object_ops timer_ops = +@@ -77,6 +77,7 @@ static const struct object_ops timer_ops = add_queue, /* add_queue */ remove_queue, /* remove_queue */ timer_signaled, /* signaled */ @@ -671,10 +671,10 @@ index d4e5c56267c..319b9d142db 100644 no_signal, /* signal */ no_get_fd, /* get_fd */ diff --git a/server/token.c b/server/token.c -index 30320851436..fafa86f292c 100644 +index 089f1c5c61e..d08539084bd 100644 --- a/server/token.c +++ b/server/token.c -@@ -147,6 +147,7 @@ static const struct object_ops token_ops = +@@ -161,6 +161,7 @@ static const struct object_ops token_ops = no_add_queue, /* add_queue */ NULL, /* remove_queue */ NULL, /* signaled */ @@ -683,10 +683,10 @@ index 30320851436..fafa86f292c 100644 no_signal, /* signal */ no_get_fd, /* get_fd */ diff --git a/server/winstation.c b/server/winstation.c -index 95e5c0c7d0d..22228d6f987 100644 +index 1c7552f0687..86d82619433 100644 --- a/server/winstation.c +++ b/server/winstation.c -@@ -64,6 +64,7 @@ static const struct object_ops winstation_ops = +@@ -75,6 +75,7 @@ static const struct object_ops winstation_ops = no_add_queue, /* add_queue */ NULL, /* remove_queue */ NULL, /* signaled */ @@ -694,7 +694,7 @@ index 95e5c0c7d0d..22228d6f987 100644 NULL, /* satisfied */ no_signal, /* signal */ no_get_fd, /* get_fd */ -@@ -89,6 +90,7 @@ static const struct object_ops desktop_ops = +@@ -115,6 +116,7 @@ static const struct object_ops desktop_ops = no_add_queue, /* add_queue */ NULL, /* remove_queue */ NULL, /* signaled */ @@ -703,5 +703,5 @@ index 95e5c0c7d0d..22228d6f987 100644 no_signal, /* signal */ no_get_fd, /* get_fd */ -- -2.29.2 +2.30.1 diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index 7035467e..fe594c9a 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -51,7 +51,7 @@ usage() # Get the upstream commit sha upstream_commit() { - echo "2828d0820a1661e46f606f28db090d710cef11f4" + echo "6d26689484070b2c4ad4e0e16812c6eb8176cd40" } # Show version information @@ -250,8 +250,6 @@ patch_enable_all () enable_uxtheme_CloseThemeClass="$1" enable_version_VerQueryValue="$1" enable_widl_SLTG_Typelib_Support="$1" - enable_windows_gaming_input_dll="$1" - enable_windows_globalization_dll="$1" enable_windowscodecs_GIF_Encoder="$1" enable_windowscodecs_TIFF_Support="$1" enable_wine_inf_Directory_ContextMenuHandlers="$1" @@ -817,12 +815,6 @@ patch_enable () widl-SLTG_Typelib_Support) enable_widl_SLTG_Typelib_Support="$2" ;; - windows.gaming.input-dll) - enable_windows_gaming_input_dll="$2" - ;; - windows.globalization-dll) - enable_windows_globalization_dll="$2" - ;; windowscodecs-GIF_Encoder) enable_windowscodecs_GIF_Encoder="$2" ;; @@ -1360,13 +1352,6 @@ if test "$enable_wineboot_ProxySettings" -eq 1; then enable_wineboot_drivers_etc_Stubs=1 fi -if test "$enable_windows_globalization_dll" -eq 1; then - if test "$enable_windows_gaming_input_dll" -gt 1; then - abort "Patchset windows.gaming.input-dll disabled, but windows.globalization-dll depends on that." - fi - enable_windows_gaming_input_dll=1 -fi - if test "$enable_user32_rawinput_mouse_experimental" -eq 1; then if test "$enable_user32_rawinput_mouse" -gt 1; then abort "Patchset user32-rawinput-mouse disabled, but user32-rawinput-mouse-experimental depends on that." @@ -4059,52 +4044,6 @@ if test "$enable_version_VerQueryValue" -eq 1; then patch_apply version-VerQueryValue/0001-version-Test-for-VerQueryValueA-try-2.patch fi -# Patchset windows.gaming.input-dll -# | -# | This patchset fixes the following Wine bugs: -# | * [#49756] windows.gaming.input: New DLL -# | -# | Modified files: -# | * configure.ac, dlls/windows.gaming.input.dll/Makefile.in, dlls/windows.gaming.input.dll/windows.gaming.input.spec, -# | dlls/windows.gaming.input.dll/windows.gaming.input_main.c, include/Makefile.in, include/asyncinfo.idl, -# | include/windows.foundation.collections.idl, include/windows.foundation.idl, -# | include/windows.gaming.input.forcefeedback.idl, include/windows.gaming.input.idl, include/windows.system.idl, -# | loader/wine.inf.in -# | -if test "$enable_windows_gaming_input_dll" -eq 1; then - patch_apply windows.gaming.input-dll/0001-windows.gaming.input-Add-stub-dll.patch - patch_apply windows.gaming.input-dll/0002-windows.gaming.input-Implement-IGamepadStatics-stubs.patch - patch_apply windows.gaming.input-dll/0003-windows.gaming.input-Implement-IGamepadStatics-Gamep.patch - patch_apply windows.gaming.input-dll/0004-windows.gaming.input-Fake-empty-IGamepadStatics-Game.patch - patch_apply windows.gaming.input-dll/0005-windows.gaming.input-Fake-IEventHandler_Gamepad-supp.patch - patch_apply windows.gaming.input-dll/0006-windows.gaming.input-Implement-IRawGameControllerSta.patch - patch_apply windows.gaming.input-dll/0007-windows.gaming.input-Implement-IRawGameControllerSta.patch - patch_apply windows.gaming.input-dll/0008-windows.gaming.input-Fake-empty-IRawGameControllerSt.patch - patch_apply windows.gaming.input-dll/0009-windows.gaming.input-Fake-IEventHandler_RawGameContr.patch -fi - -# Patchset windows.globalization-dll -# | -# | This patchset has the following (direct or indirect) dependencies: -# | * windows.gaming.input-dll -# | -# | This patchset fixes the following Wine bugs: -# | * [#49740] windows.globalization: New DLL -# | * [#49998] windows.globalization: New DLL -# | -# | Modified files: -# | * configure.ac, dlls/windows.globalization.dll/Makefile.in, dlls/windows.globalization.dll/windows.globalization.spec, -# | dlls/windows.globalization.dll/windows.globalization_main.c, include/Makefile.in, include/windows.foundation.idl, -# | include/windows.globalization.idl, include/windows.system.userprofile.idl, loader/wine.inf.in -# | -if test "$enable_windows_globalization_dll" -eq 1; then - patch_apply windows.globalization-dll/0001-windows.globalization-Add-stub-dll.patch - patch_apply windows.globalization-dll/0002-windows.globalization-Implement-IGlobalizationPrefer.patch - patch_apply windows.globalization-dll/0003-windows.globalization-Implement-IGlobalizationPrefer.patch - patch_apply windows.globalization-dll/0004-windows.globalization-Implement-IGlobalizationPrefer.patch - patch_apply windows.globalization-dll/0005-windows.globalization-Fake-empty-IGlobalizationPrefe.patch -fi - # Patchset windowscodecs-GIF_Encoder # | # | Modified files: diff --git a/patches/windows.gaming.input-dll/definition b/patches/windows.gaming.input-dll/definition index f79028c8..82940149 100644 --- a/patches/windows.gaming.input-dll/definition +++ b/patches/windows.gaming.input-dll/definition @@ -5,3 +5,4 @@ # https://source.winehq.org/patches/data/191192 # To support Death Stranding Fixes: [49756] windows.gaming.input: New DLL +Disabled: True diff --git a/patches/windows.globalization-dll/definition b/patches/windows.globalization-dll/definition index d2a356f4..778ef073 100644 --- a/patches/windows.globalization-dll/definition +++ b/patches/windows.globalization-dll/definition @@ -1,3 +1,4 @@ Fixes: [49740] windows.globalization: New DLL Fixes: [49998] windows.globalization: New DLL Depends: windows.gaming.input-dll +Disabled: True diff --git a/patches/winedevice-Default_Drivers/0002-dxgkrnl.sys-Add-stub-driver.patch b/patches/winedevice-Default_Drivers/0002-dxgkrnl.sys-Add-stub-driver.patch index 584b88a2..11f41d68 100644 --- a/patches/winedevice-Default_Drivers/0002-dxgkrnl.sys-Add-stub-driver.patch +++ b/patches/winedevice-Default_Drivers/0002-dxgkrnl.sys-Add-stub-driver.patch @@ -1,4 +1,4 @@ -From 547a512a92e719ea5dc1c812e4505680c006b2a0 Mon Sep 17 00:00:00 2001 +From fb48a8c56b8d7007f4dfc2771c142efc72c432c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Thu, 8 Jun 2017 23:41:02 +0200 Subject: [PATCH] dxgkrnl.sys: Add stub driver. @@ -8,17 +8,16 @@ Subject: [PATCH] dxgkrnl.sys: Add stub driver. dlls/dxgkrnl.sys/Makefile.in | 6 +++++ dlls/dxgkrnl.sys/dxgkrnl.sys.spec | 26 +++++++++++++++++++++ dlls/dxgkrnl.sys/main.c | 39 +++++++++++++++++++++++++++++++ - loader/wine.inf.in | 2 ++ - 5 files changed, 74 insertions(+) + 4 files changed, 72 insertions(+) create mode 100644 dlls/dxgkrnl.sys/Makefile.in create mode 100644 dlls/dxgkrnl.sys/dxgkrnl.sys.spec create mode 100644 dlls/dxgkrnl.sys/main.c diff --git a/configure.ac b/configure.ac -index 27ab432a44a..0a6d1b0639e 100644 +index f52cfc1e2b6..4eff254d273 100644 --- a/configure.ac +++ b/configure.ac -@@ -3282,6 +3282,7 @@ WINE_CONFIG_MAKEFILE(dlls/dxerr8) +@@ -3271,6 +3271,7 @@ WINE_CONFIG_MAKEFILE(dlls/dxerr8) WINE_CONFIG_MAKEFILE(dlls/dxerr9) WINE_CONFIG_MAKEFILE(dlls/dxgi) WINE_CONFIG_MAKEFILE(dlls/dxgi/tests) @@ -115,26 +114,6 @@ index 00000000000..c5639c237c8 + TRACE( "(%p, %s)\n", driver, debugstr_w(path->Buffer) ); + return STATUS_SUCCESS; +} -diff --git a/loader/wine.inf.in b/loader/wine.inf.in -index 0a43cc779cb..f524f917243 100644 ---- a/loader/wine.inf.in -+++ b/loader/wine.inf.in -@@ -2611,6 +2611,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" - 10,syswow64,stdole2.tlb - 11,,iexplore.exe - 11,,winetest.exe,- -+12,,dxgkrnl.sys,- - 12,,fltmgr.sys,- - 12,,hidclass.sys,- - 12,,http.sys,- -@@ -2667,6 +2668,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" - 11,,iexplore.exe - 11,,notepad.exe - 11,,winetest.exe,- -+12,,dxgkrnl.sys - 12,,fltmgr.sys - 12,,hidclass.sys - 12,,http.sys -- -2.26.2 +2.30.1 diff --git a/patches/winedevice-Default_Drivers/0003-dxgmms1.sys-Add-stub-driver.patch b/patches/winedevice-Default_Drivers/0003-dxgmms1.sys-Add-stub-driver.patch index 7036da7a..bd41cc39 100644 --- a/patches/winedevice-Default_Drivers/0003-dxgmms1.sys-Add-stub-driver.patch +++ b/patches/winedevice-Default_Drivers/0003-dxgmms1.sys-Add-stub-driver.patch @@ -1,4 +1,4 @@ -From 747017a3787d4ad68f26b1047cc097afe53133be Mon Sep 17 00:00:00 2001 +From dc0b6c029501ccaaaf558136280de80fd846b762 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Thu, 8 Jun 2017 23:42:32 +0200 Subject: [PATCH] dxgmms1.sys: Add stub driver. @@ -8,17 +8,16 @@ Subject: [PATCH] dxgmms1.sys: Add stub driver. dlls/dxgmms1.sys/Makefile.in | 6 +++++ dlls/dxgmms1.sys/dxgmms1.sys.spec | 2 ++ dlls/dxgmms1.sys/main.c | 39 +++++++++++++++++++++++++++++++ - loader/wine.inf.in | 2 ++ - 5 files changed, 50 insertions(+) + 4 files changed, 48 insertions(+) create mode 100644 dlls/dxgmms1.sys/Makefile.in create mode 100644 dlls/dxgmms1.sys/dxgmms1.sys.spec create mode 100644 dlls/dxgmms1.sys/main.c diff --git a/configure.ac b/configure.ac -index 0a6d1b0639e..6966f95ce88 100644 +index 4eff254d273..0a3a89e7720 100644 --- a/configure.ac +++ b/configure.ac -@@ -3283,6 +3283,7 @@ WINE_CONFIG_MAKEFILE(dlls/dxerr9) +@@ -3272,6 +3272,7 @@ WINE_CONFIG_MAKEFILE(dlls/dxerr9) WINE_CONFIG_MAKEFILE(dlls/dxgi) WINE_CONFIG_MAKEFILE(dlls/dxgi/tests) WINE_CONFIG_MAKEFILE(dlls/dxgkrnl.sys) @@ -91,26 +90,6 @@ index 00000000000..686493d3296 + TRACE( "(%p, %s)\n", driver, debugstr_w(path->Buffer) ); + return STATUS_SUCCESS; +} -diff --git a/loader/wine.inf.in b/loader/wine.inf.in -index f524f917243..c62a360e1c1 100644 ---- a/loader/wine.inf.in -+++ b/loader/wine.inf.in -@@ -2612,6 +2612,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" - 11,,iexplore.exe - 11,,winetest.exe,- - 12,,dxgkrnl.sys,- -+12,,dxgmms1.sys,- - 12,,fltmgr.sys,- - 12,,hidclass.sys,- - 12,,http.sys,- -@@ -2669,6 +2670,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" - 11,,notepad.exe - 11,,winetest.exe,- - 12,,dxgkrnl.sys -+12,,dxgmms1.sys - 12,,fltmgr.sys - 12,,hidclass.sys - 12,,http.sys -- -2.26.2 +2.30.1 diff --git a/staging/upstream-commit b/staging/upstream-commit index b84ed306..a5241bb1 100644 --- a/staging/upstream-commit +++ b/staging/upstream-commit @@ -1 +1 @@ -2828d0820a1661e46f606f28db090d710cef11f4 +6d26689484070b2c4ad4e0e16812c6eb8176cd40