From cd22a0fb1520ff6cea85844bb20998498c92ab8d Mon Sep 17 00:00:00 2001 From: Alistair Leslie-Hughes Date: Fri, 3 Mar 2023 11:22:41 +1100 Subject: [PATCH] Rebase against 10765f2956d6f9fc2d16bb2bec476b12a31786f6. --- ...-FltBuildDefaultSecurityDescriptor-t.patch | 12 ++--- ...d-Keyboard-Layouts-registry-enteries.patch | 16 +++---- ...hardware_message-flags-for-rawinput-.patch | 36 +++++++-------- ...HWMSG_RAWINPUT-flags-only-when-RAWIN.patch | 44 +++++++++---------- ...ice-Load-some-common-drivers-and-fix.patch | 16 +++---- staging/upstream-commit | 2 +- 6 files changed, 63 insertions(+), 63 deletions(-) diff --git a/patches/fltmgr.sys-FltBuildDefaultSecurityDescriptor/0003-ntoskrnl.exe-Add-FltBuildDefaultSecurityDescriptor-t.patch b/patches/fltmgr.sys-FltBuildDefaultSecurityDescriptor/0003-ntoskrnl.exe-Add-FltBuildDefaultSecurityDescriptor-t.patch index 6aa29e74..c539204a 100644 --- a/patches/fltmgr.sys-FltBuildDefaultSecurityDescriptor/0003-ntoskrnl.exe-Add-FltBuildDefaultSecurityDescriptor-t.patch +++ b/patches/fltmgr.sys-FltBuildDefaultSecurityDescriptor/0003-ntoskrnl.exe-Add-FltBuildDefaultSecurityDescriptor-t.patch @@ -1,4 +1,4 @@ -From 8b6a7baacf0a26c7de7524c5f6da37bf4f4c1120 Mon Sep 17 00:00:00 2001 +From bc1d0962b58a45949c91367e84e6f71beb9f698b Mon Sep 17 00:00:00 2001 From: Alistair Leslie-Hughes Date: Mon, 30 Aug 2021 15:16:06 +1000 Subject: [PATCH] ntoskrnl.exe: Add FltBuildDefaultSecurityDescriptor test @@ -23,7 +23,7 @@ index ab1db85adbb..9c89e44e70a 100644 driver2_IMPORTS = winecrt0 ntoskrnl hal driver2_EXTRADLLFLAGS = -nodefaultlibs -nostartfiles -Wl,--subsystem,native diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c -index de61ed64fa4..a0cdbf0878a 100644 +index 18f2920759d..569007d435e 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -32,6 +32,7 @@ @@ -34,7 +34,7 @@ index de61ed64fa4..a0cdbf0878a 100644 #include "driver.h" -@@ -2338,6 +2339,69 @@ static void test_default_modules(void) +@@ -2374,6 +2375,69 @@ static void test_default_modules(void) ok(dxgmms1, "Failed to find dxgmms1.sys\n"); } @@ -104,14 +104,14 @@ index de61ed64fa4..a0cdbf0878a 100644 static NTSTATUS main_test(DEVICE_OBJECT *device, IRP *irp, IO_STACK_LOCATION *stack) { void *buffer = irp->AssociatedIrp.SystemBuffer; -@@ -2382,6 +2446,7 @@ static NTSTATUS main_test(DEVICE_OBJECT *device, IRP *irp, IO_STACK_LOCATION *st - test_dpc(); +@@ -2419,6 +2483,7 @@ static NTSTATUS main_test(DEVICE_OBJECT *device, IRP *irp, IO_STACK_LOCATION *st test_process_memory(test_input); test_permanence(); + test_driver_object_extension(); + test_default_security(); IoMarkIrpPending(irp); IoQueueWorkItem(work_item, main_test_task, DelayedWorkQueue, irp); -- -2.35.1 +2.39.2 diff --git a/patches/loader-KeyboardLayouts/0001-loader-Add-Keyboard-Layouts-registry-enteries.patch b/patches/loader-KeyboardLayouts/0001-loader-Add-Keyboard-Layouts-registry-enteries.patch index 09878b22..79e2595b 100644 --- a/patches/loader-KeyboardLayouts/0001-loader-Add-Keyboard-Layouts-registry-enteries.patch +++ b/patches/loader-KeyboardLayouts/0001-loader-Add-Keyboard-Layouts-registry-enteries.patch @@ -1,4 +1,4 @@ -From f2347ae7216626d248cfaf9445862561b2b5eef7 Mon Sep 17 00:00:00 2001 +From d1d83243555801226876f651b6f3304d3e595ae4 Mon Sep 17 00:00:00 2001 From: Alistair Leslie-Hughes Date: Mon, 1 Jul 2019 09:58:55 +1000 Subject: [PATCH] loader: Add Keyboard Layouts registry enteries. @@ -9,7 +9,7 @@ Signed-off-by: Alistair Leslie-Hughes 1 file changed, 209 insertions(+) diff --git a/loader/wine.inf.in b/loader/wine.inf.in -index ff601e41b26..6ffb8c56d87 100644 +index d5f943861a8..b07843ff237 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -63,6 +63,7 @@ AddReg=\ @@ -20,7 +20,7 @@ index ff601e41b26..6ffb8c56d87 100644 MCI,\ Misc,\ OLE,\ -@@ -87,6 +88,7 @@ AddReg=\ +@@ -86,6 +87,7 @@ AddReg=\ Debugger,\ DirectX,\ Fonts,\ @@ -28,7 +28,7 @@ index ff601e41b26..6ffb8c56d87 100644 MCI,\ Misc,\ OLE,\ -@@ -113,6 +115,7 @@ AddReg=\ +@@ -111,6 +113,7 @@ AddReg=\ Debugger,\ DirectX,\ Fonts,\ @@ -36,15 +36,15 @@ index ff601e41b26..6ffb8c56d87 100644 MCI,\ Misc,\ OLE,\ -@@ -160,6 +163,7 @@ AddReg=\ - CurrentVersionWow64,\ +@@ -156,6 +159,7 @@ AddReg=\ + CurrentVersionWow64.ntx86,\ Debugger,\ DirectX,\ + KeyboardLayouts,\ MCI,\ Misc,\ Tapi,\ -@@ -597,6 +601,211 @@ HKCU,Software\Microsoft\Windows\Shell\Associations\UrlAssociations\ftp\UserChoic +@@ -628,6 +632,211 @@ HKCU,Software\Microsoft\Windows\Shell\Associations\UrlAssociations\ftp\UserChoic HKCU,Software\Microsoft\Windows\Shell\Associations\UrlAssociations\http\UserChoice,"ProgId",,"http" HKCU,Software\Microsoft\Windows\Shell\Associations\UrlAssociations\https\UserChoice,"ProgId",,"https" @@ -257,5 +257,5 @@ index ff601e41b26..6ffb8c56d87 100644 HKLM,"Software\Microsoft\OLE","EnableDCOM",,"Y" HKLM,"Software\Microsoft\OLE","EnableRemoteConnect",,"N" -- -2.35.1 +2.39.2 diff --git a/patches/user32-rawinput-mouse/0005-server-Add-send_hardware_message-flags-for-rawinput-.patch b/patches/user32-rawinput-mouse/0005-server-Add-send_hardware_message-flags-for-rawinput-.patch index 49f1e1e3..29bdcbcf 100644 --- a/patches/user32-rawinput-mouse/0005-server-Add-send_hardware_message-flags-for-rawinput-.patch +++ b/patches/user32-rawinput-mouse/0005-server-Add-send_hardware_message-flags-for-rawinput-.patch @@ -1,4 +1,4 @@ -From b3e1675f4654daecf5237f86a6bfa5d3512c109c Mon Sep 17 00:00:00 2001 +From f13bfd6f599ae272f698bb06491d689bd6d5d142 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Bernon?= Date: Mon, 26 Aug 2019 14:37:20 +0200 Subject: [PATCH] server: Add send_hardware_message flags for rawinput @@ -11,31 +11,31 @@ Subject: [PATCH] server: Add send_hardware_message flags for rawinput 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/dlls/win32u/message.c b/dlls/win32u/message.c -index 74cfec0651a..fbdd09ad806 100644 +index ad3d8e85cd2..bad69c18142 100644 --- a/dlls/win32u/message.c +++ b/dlls/win32u/message.c -@@ -1912,6 +1912,7 @@ NTSTATUS send_hardware_message( HWND hwnd, const INPUT *input, const RAWINPUT *r +@@ -2627,6 +2627,7 @@ NTSTATUS send_hardware_message( HWND hwnd, const INPUT *input, const RAWINPUT *r req->input.mouse.flags = input->mi.dwFlags; req->input.mouse.time = input->mi.time; req->input.mouse.info = input->mi.dwExtraInfo; + req->flags |= SEND_HWMSG_RAWINPUT; - break; - case INPUT_KEYBOARD: - req->input.kbd.vkey = input->ki.wVk; -@@ -1919,6 +1920,7 @@ NTSTATUS send_hardware_message( HWND hwnd, const INPUT *input, const RAWINPUT *r + affects_key_state = !!(input->mi.dwFlags & (MOUSEEVENTF_LEFTDOWN | MOUSEEVENTF_LEFTUP | + MOUSEEVENTF_RIGHTDOWN | MOUSEEVENTF_RIGHTUP | + MOUSEEVENTF_MIDDLEDOWN | MOUSEEVENTF_MIDDLEUP | +@@ -2638,6 +2639,7 @@ NTSTATUS send_hardware_message( HWND hwnd, const INPUT *input, const RAWINPUT *r req->input.kbd.flags = input->ki.dwFlags; req->input.kbd.time = input->ki.time; req->input.kbd.info = input->ki.dwExtraInfo; + req->flags |= SEND_HWMSG_RAWINPUT; + affects_key_state = TRUE; break; case INPUT_HARDWARE: - req->input.hw.msg = input->hi.uMsg; diff --git a/server/protocol.def b/server/protocol.def -index 673fcdd6c8d..0c1b6b57518 100644 +index a4660a21aca..9e6ba5317fd 100644 --- a/server/protocol.def +++ b/server/protocol.def -@@ -2041,6 +2041,7 @@ enum message_type - VARARG(keystate,bytes); /* global state array for all the keys */ +@@ -2082,6 +2082,7 @@ enum message_type + int new_y; @END #define SEND_HWMSG_INJECTED 0x01 +#define SEND_HWMSG_RAWINPUT 0x02 @@ -43,10 +43,10 @@ index 673fcdd6c8d..0c1b6b57518 100644 /* Get a message from the current queue */ diff --git a/server/queue.c b/server/queue.c -index e11e24378e6..950a2cdce22 100644 +index 61cbeec75dd..f5dbe0e733e 100644 --- a/server/queue.c +++ b/server/queue.c -@@ -1815,7 +1815,7 @@ done: +@@ -1794,7 +1794,7 @@ done: /* queue a hardware message for a mouse event */ static int queue_mouse_message( struct desktop *desktop, user_handle_t win, const hw_input_t *input, @@ -55,7 +55,7 @@ index e11e24378e6..950a2cdce22 100644 { const struct rawinput_device *device; struct hardware_msg_data *msg_data; -@@ -1870,7 +1870,7 @@ static int queue_mouse_message( struct desktop *desktop, user_handle_t win, cons +@@ -1849,7 +1849,7 @@ static int queue_mouse_message( struct desktop *desktop, user_handle_t win, cons y = desktop->cursor.y; } @@ -64,7 +64,7 @@ index e11e24378e6..950a2cdce22 100644 { memset( &raw_msg, 0, sizeof(raw_msg) ); raw_msg.foreground = foreground; -@@ -1929,7 +1929,7 @@ static int queue_mouse_message( struct desktop *desktop, user_handle_t win, cons +@@ -1908,7 +1908,7 @@ static int queue_mouse_message( struct desktop *desktop, user_handle_t win, cons /* queue a hardware message for a keyboard event */ static int queue_keyboard_message( struct desktop *desktop, user_handle_t win, const hw_input_t *input, @@ -73,7 +73,7 @@ index e11e24378e6..950a2cdce22 100644 { struct hw_msg_source source = { IMDT_KEYBOARD, origin }; const struct rawinput_device *device; -@@ -2007,7 +2007,7 @@ static int queue_keyboard_message( struct desktop *desktop, user_handle_t win, c +@@ -1986,7 +1986,7 @@ static int queue_keyboard_message( struct desktop *desktop, user_handle_t win, c break; } @@ -82,7 +82,7 @@ index e11e24378e6..950a2cdce22 100644 { memset( &raw_msg, 0, sizeof(raw_msg) ); raw_msg.foreground = foreground; -@@ -2641,10 +2641,10 @@ DECL_HANDLER(send_hardware_message) +@@ -2617,10 +2617,10 @@ DECL_HANDLER(send_hardware_message) switch (req->input.type) { case INPUT_MOUSE: @@ -96,5 +96,5 @@ index e11e24378e6..950a2cdce22 100644 case INPUT_HARDWARE: queue_custom_hardware_message( desktop, req->win, origin, &req->input ); -- -2.35.1 +2.39.2 diff --git a/patches/user32-rawinput-mouse/0006-user32-Set-SEND_HWMSG_RAWINPUT-flags-only-when-RAWIN.patch b/patches/user32-rawinput-mouse/0006-user32-Set-SEND_HWMSG_RAWINPUT-flags-only-when-RAWIN.patch index 473fd226..af6b7675 100644 --- a/patches/user32-rawinput-mouse/0006-user32-Set-SEND_HWMSG_RAWINPUT-flags-only-when-RAWIN.patch +++ b/patches/user32-rawinput-mouse/0006-user32-Set-SEND_HWMSG_RAWINPUT-flags-only-when-RAWIN.patch @@ -1,4 +1,4 @@ -From b2f68f427f6fc486238b768c664ed6df6009a5ef Mon Sep 17 00:00:00 2001 +From aabf00b3648c3ac7573d2ddffdb95bb98aed2616 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Bernon?= Date: Wed, 24 Mar 2021 23:29:28 +0100 Subject: [PATCH] user32: Set SEND_HWMSG_RAWINPUT flags only when RAWINPUT is @@ -20,7 +20,7 @@ __wine_send_input with INPUT_HARDWARE input type and a rawinput. 9 files changed, 26 insertions(+), 15 deletions(-) diff --git a/dlls/win32u/input.c b/dlls/win32u/input.c -index afd352e1fbd..2442aa49053 100644 +index a8b938066ff..b89869b141c 100644 --- a/dlls/win32u/input.c +++ b/dlls/win32u/input.c @@ -613,6 +613,7 @@ UINT WINAPI NtUserSendInput( UINT count, INPUT *inputs, int size ) @@ -41,27 +41,27 @@ index afd352e1fbd..2442aa49053 100644 case INPUT_HARDWARE: RtlSetLastWin32Error( ERROR_CALL_NOT_IMPLEMENTED ); diff --git a/dlls/win32u/message.c b/dlls/win32u/message.c -index 56a23a95e71..7b0004dfb96 100644 +index bad69c18142..3c4c12d1c7f 100644 --- a/dlls/win32u/message.c +++ b/dlls/win32u/message.c -@@ -2623,7 +2623,7 @@ NTSTATUS send_hardware_message( HWND hwnd, const INPUT *input, const RAWINPUT *r +@@ -2627,7 +2627,7 @@ NTSTATUS send_hardware_message( HWND hwnd, const INPUT *input, const RAWINPUT *r req->input.mouse.flags = input->mi.dwFlags; req->input.mouse.time = input->mi.time; req->input.mouse.info = input->mi.dwExtraInfo; - req->flags |= SEND_HWMSG_RAWINPUT; + if (rawinput) req->flags |= SEND_HWMSG_RAWINPUT; - break; - case INPUT_KEYBOARD: - req->input.kbd.vkey = input->ki.wVk; -@@ -2631,7 +2631,7 @@ NTSTATUS send_hardware_message( HWND hwnd, const INPUT *input, const RAWINPUT *r + affects_key_state = !!(input->mi.dwFlags & (MOUSEEVENTF_LEFTDOWN | MOUSEEVENTF_LEFTUP | + MOUSEEVENTF_RIGHTDOWN | MOUSEEVENTF_RIGHTUP | + MOUSEEVENTF_MIDDLEDOWN | MOUSEEVENTF_MIDDLEUP | +@@ -2639,7 +2639,7 @@ NTSTATUS send_hardware_message( HWND hwnd, const INPUT *input, const RAWINPUT *r req->input.kbd.flags = input->ki.dwFlags; req->input.kbd.time = input->ki.time; req->input.kbd.info = input->ki.dwExtraInfo; - req->flags |= SEND_HWMSG_RAWINPUT; + if (rawinput) req->flags |= SEND_HWMSG_RAWINPUT; + affects_key_state = TRUE; break; case INPUT_HARDWARE: - req->input.hw.msg = input->hi.uMsg; diff --git a/dlls/wineandroid.drv/keyboard.c b/dlls/wineandroid.drv/keyboard.c index 7c55c481353..9a20daf8809 100644 --- a/dlls/wineandroid.drv/keyboard.c @@ -84,7 +84,7 @@ index 7c55c481353..9a20daf8809 100644 /*********************************************************************** diff --git a/dlls/wineandroid.drv/window.c b/dlls/wineandroid.drv/window.c -index a339c20ceda..222751abc29 100644 +index f01df37a400..eb96300da89 100644 --- a/dlls/wineandroid.drv/window.c +++ b/dlls/wineandroid.drv/window.c @@ -424,6 +424,7 @@ static int process_events( DWORD mask ) @@ -189,10 +189,10 @@ index cb194095d55..74c329488c4 100644 diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c -index 5b1b892de32..622024dcdd9 100644 +index 5d02da68313..0a74a7c603d 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c -@@ -1134,6 +1134,7 @@ static WORD EVENT_event_to_vkey( XIC xic, XKeyEvent *e) +@@ -1123,6 +1123,7 @@ static WORD EVENT_event_to_vkey( XIC xic, XKeyEvent *e) */ static void X11DRV_send_keyboard_input( HWND hwnd, WORD vkey, WORD scan, UINT flags, UINT time ) { @@ -200,7 +200,7 @@ index 5b1b892de32..622024dcdd9 100644 INPUT input; TRACE_(key)( "hwnd %p vkey=%04x scan=%04x flags=%04x\n", hwnd, vkey, scan, flags ); -@@ -1145,7 +1146,7 @@ static void X11DRV_send_keyboard_input( HWND hwnd, WORD vkey, WORD scan, UINT fl +@@ -1134,7 +1135,7 @@ static void X11DRV_send_keyboard_input( HWND hwnd, WORD vkey, WORD scan, UINT fl input.u.ki.time = time; input.u.ki.dwExtraInfo = 0; @@ -210,10 +210,10 @@ index 5b1b892de32..622024dcdd9 100644 diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c -index 82a82032957..17e88f87982 100644 +index e25b3e7728a..bb9807bf850 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c -@@ -750,6 +750,7 @@ static void send_mouse_input( HWND hwnd, Window window, unsigned int state, INPU +@@ -749,6 +749,7 @@ static void send_mouse_input( HWND hwnd, Window window, unsigned int state, INPU { struct x11drv_win_data *data; Window win = 0; @@ -221,7 +221,7 @@ index 82a82032957..17e88f87982 100644 input->type = INPUT_MOUSE; -@@ -766,7 +767,7 @@ static void send_mouse_input( HWND hwnd, Window window, unsigned int state, INPU +@@ -765,7 +766,7 @@ static void send_mouse_input( HWND hwnd, Window window, unsigned int state, INPU sync_window_cursor( window ); last_cursor_change = input->u.mi.time; } @@ -230,7 +230,7 @@ index 82a82032957..17e88f87982 100644 return; } -@@ -807,7 +808,7 @@ static void send_mouse_input( HWND hwnd, Window window, unsigned int state, INPU +@@ -806,7 +807,7 @@ static void send_mouse_input( HWND hwnd, Window window, unsigned int state, INPU SERVER_END_REQ; } @@ -239,7 +239,7 @@ index 82a82032957..17e88f87982 100644 } #ifdef SONAME_LIBXCURSOR -@@ -1790,6 +1791,7 @@ void move_resize_window( HWND hwnd, int dir ) +@@ -1789,6 +1790,7 @@ void move_resize_window( HWND hwnd, int dir ) { MSG msg; INPUT input; @@ -247,7 +247,7 @@ index 82a82032957..17e88f87982 100644 int x, y, rootX, rootY; if (!XQueryPointer( display, root_window, &root, &child, &rootX, &rootY, &x, &y, &xstate )) break; -@@ -1805,7 +1807,7 @@ void move_resize_window( HWND hwnd, int dir ) +@@ -1804,7 +1806,7 @@ void move_resize_window( HWND hwnd, int dir ) input.u.mi.dwFlags = button_up_flags[button - 1] | MOUSEEVENTF_ABSOLUTE | MOUSEEVENTF_MOVE; input.u.mi.time = NtGetTickCount(); input.u.mi.dwExtraInfo = 0; @@ -256,7 +256,7 @@ index 82a82032957..17e88f87982 100644 } while (NtUserPeekMessage( &msg, 0, 0, 0, PM_REMOVE )) -@@ -2018,6 +2020,7 @@ static BOOL map_raw_event_coords( XIRawEvent *event, INPUT *input ) +@@ -2017,6 +2019,7 @@ static BOOL map_raw_event_coords( XIRawEvent *event, INPUT *input ) static BOOL X11DRV_RawMotion( XGenericEventCookie *xev ) { XIRawEvent *event = xev->data; @@ -264,7 +264,7 @@ index 82a82032957..17e88f87982 100644 INPUT input; if (broken_rawevents && is_old_motion_event( xev->serial )) -@@ -2035,7 +2038,7 @@ static BOOL X11DRV_RawMotion( XGenericEventCookie *xev ) +@@ -2034,7 +2037,7 @@ static BOOL X11DRV_RawMotion( XGenericEventCookie *xev ) input.u.mi.dy = 0; if (!map_raw_event_coords( event, &input )) return FALSE; @@ -274,5 +274,5 @@ index 82a82032957..17e88f87982 100644 } -- -2.39.1 +2.39.2 diff --git a/patches/winedevice-Default_Drivers/0004-programs-winedevice-Load-some-common-drivers-and-fix.patch b/patches/winedevice-Default_Drivers/0004-programs-winedevice-Load-some-common-drivers-and-fix.patch index a3297f5a..9c6948ff 100644 --- a/patches/winedevice-Default_Drivers/0004-programs-winedevice-Load-some-common-drivers-and-fix.patch +++ b/patches/winedevice-Default_Drivers/0004-programs-winedevice-Load-some-common-drivers-and-fix.patch @@ -1,4 +1,4 @@ -From f7664a23897b809862a80e287122464cb31e4986 Mon Sep 17 00:00:00 2001 +From 951d65cf18b7950d1aadaaf63c02c6a2a6fce073 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Thu, 8 Jun 2017 23:50:03 +0200 Subject: [PATCH] programs/winedevice: Load some common drivers and fix ldr @@ -10,7 +10,7 @@ Subject: [PATCH] programs/winedevice: Load some common drivers and fix ldr 2 files changed, 76 insertions(+) diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c -index dc4f4ad993d..4a57cf56f75 100644 +index a80bef78fab..18f2920759d 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -52,6 +52,7 @@ static int kmemcmp( const void *ptr1, const void *ptr2, size_t n ) @@ -21,7 +21,7 @@ index dc4f4ad993d..4a57cf56f75 100644 static POBJECT_TYPE *pExEventObjectType, *pIoFileObjectType, *pPsThreadType, *pIoDriverObjectType; static PEPROCESS *pPsInitialSystemProcess; -@@ -1712,6 +1713,7 @@ static void test_resource(void) +@@ -1713,6 +1714,7 @@ static void test_resource(void) ok(status == STATUS_SUCCESS, "got status %#lx\n", status); } @@ -29,8 +29,8 @@ index dc4f4ad993d..4a57cf56f75 100644 static void test_lookup_thread(void) { NTSTATUS status; -@@ -2290,6 +2292,52 @@ static void test_permanence(void) - ok(status == STATUS_OBJECT_NAME_NOT_FOUND, "got %#lx\n", status); +@@ -2326,6 +2328,52 @@ static void test_driver_object_extension(void) + ok(get_obj_ext == NULL, "got %p\n", get_obj_ext); } +static void test_default_modules(void) @@ -82,7 +82,7 @@ index dc4f4ad993d..4a57cf56f75 100644 static NTSTATUS main_test(DEVICE_OBJECT *device, IRP *irp, IO_STACK_LOCATION *stack) { void *buffer = irp->AssociatedIrp.SystemBuffer; -@@ -2322,6 +2370,7 @@ static NTSTATUS main_test(DEVICE_OBJECT *device, IRP *irp, IO_STACK_LOCATION *st +@@ -2358,6 +2406,7 @@ static NTSTATUS main_test(DEVICE_OBJECT *device, IRP *irp, IO_STACK_LOCATION *st test_stack_callout(); test_lookaside_list(); test_ob_reference(); @@ -90,7 +90,7 @@ index dc4f4ad993d..4a57cf56f75 100644 test_resource(); test_lookup_thread(); test_IoAttachDeviceToDeviceStack(); -@@ -2801,6 +2850,7 @@ NTSTATUS WINAPI DriverEntry(DRIVER_OBJECT *driver, PUNICODE_STRING registry) +@@ -2838,6 +2887,7 @@ NTSTATUS WINAPI DriverEntry(DRIVER_OBJECT *driver, PUNICODE_STRING registry) DbgPrint("loading driver\n"); driver_obj = driver; @@ -145,5 +145,5 @@ index 0a96307a017..abcb7b20679 100644 set_service_status( service_handle, SERVICE_RUNNING, SERVICE_ACCEPT_STOP | SERVICE_ACCEPT_SHUTDOWN ); -- -2.34.1 +2.39.2 diff --git a/staging/upstream-commit b/staging/upstream-commit index 34800589..97a19a71 100644 --- a/staging/upstream-commit +++ b/staging/upstream-commit @@ -1 +1 @@ -56db5b0bf1aa6df5edbedbec03e0a1db39d6639b +10765f2956d6f9fc2d16bb2bec476b12a31786f6