From 57a12e6845b175d78256803bec8bbc95b84bc931 Mon Sep 17 00:00:00 2001 From: Zebediah Figura Date: Thu, 1 Sep 2022 17:13:59 -0500 Subject: [PATCH] Rebase against 7546b4a63d437c2f7f8673cae9341d358f84f1a5. --- ...user32-Improve-GetKeyboardLayoutList.patch | 22 ++-- ...t-for-FileFsFullSizeInformation-clas.patch | 117 ------------------ .../definition | 1 - ...l32-Advertise-junction-point-support.patch | 36 +++--- patches/ntdll-Junction_Points/definition | 1 + ...e-check-before-returning-a-default-s.patch | 24 ++-- patches/patchinstall.sh | 53 ++++---- staging/upstream-commit | 2 +- 8 files changed, 65 insertions(+), 191 deletions(-) delete mode 100644 patches/ntdll-FileFsFullSizeInformation/0001-ntdll-Add-support-for-FileFsFullSizeInformation-clas.patch delete mode 100644 patches/ntdll-FileFsFullSizeInformation/definition diff --git a/patches/loader-KeyboardLayouts/0002-user32-Improve-GetKeyboardLayoutList.patch b/patches/loader-KeyboardLayouts/0002-user32-Improve-GetKeyboardLayoutList.patch index 1ab757e0..77e39265 100644 --- a/patches/loader-KeyboardLayouts/0002-user32-Improve-GetKeyboardLayoutList.patch +++ b/patches/loader-KeyboardLayouts/0002-user32-Improve-GetKeyboardLayoutList.patch @@ -1,4 +1,4 @@ -From cc964cf26e79a89fb3d7345847a23d93368e3eed Mon Sep 17 00:00:00 2001 +From c4a4d47fb07faee6ef6d20b967e21eafe6a60ea4 Mon Sep 17 00:00:00 2001 From: Alistair Leslie-Hughes Date: Tue, 9 Jul 2019 14:13:28 +1000 Subject: [PATCH] user32: Do not enumerate the registry in @@ -13,10 +13,10 @@ not the complete list from the registry. 3 files changed, 36 insertions(+), 33 deletions(-) diff --git a/dlls/user32/input.c b/dlls/user32/input.c -index 06756b5551e..99abab38ccf 100644 +index bb7477ed482..55ab8d246e7 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c -@@ -521,7 +521,6 @@ BOOL WINAPI UnloadKeyboardLayout( HKL layout ) +@@ -494,7 +494,6 @@ BOOL WINAPI UnloadKeyboardLayout( HKL layout ) return FALSE; } @@ -25,10 +25,10 @@ index 06756b5551e..99abab38ccf 100644 * EnableMouseInPointer (USER32.@) */ diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c -index 8b84a39d009..d7520459c6d 100644 +index 8477645fad5..e92548c7402 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c -@@ -4481,6 +4481,40 @@ static void test_SendInput(void) +@@ -4566,6 +4566,40 @@ static void test_SendInput(void) DestroyWindow( hwnd ); } @@ -69,19 +69,19 @@ index 8b84a39d009..d7520459c6d 100644 START_TEST(input) { char **argv; -@@ -4523,6 +4557,7 @@ START_TEST(input) +@@ -4608,6 +4642,7 @@ START_TEST(input) test_GetRawInputBuffer(); test_RegisterRawInputDevices(); test_rawinput(argv[0]); + test_GetKeyboardLayoutList(); + test_DefRawInputProc(); if(pGetMouseMovePointsEx) - test_GetMouseMovePointsEx(argv[0]); diff --git a/dlls/win32u/input.c b/dlls/win32u/input.c -index 28fc5a918c8..24782e405a7 100644 +index f3b724e7010..a971e1ee776 100644 --- a/dlls/win32u/input.c +++ b/dlls/win32u/input.c -@@ -933,11 +933,7 @@ HKL WINAPI NtUserActivateKeyboardLayout( HKL layout, UINT flags ) +@@ -934,11 +934,7 @@ HKL WINAPI NtUserActivateKeyboardLayout( HKL layout, UINT flags ) */ UINT WINAPI NtUserGetKeyboardLayoutList( INT size, HKL *layouts ) { @@ -94,7 +94,7 @@ index 28fc5a918c8..24782e405a7 100644 HKL layout; TRACE_(keyboard)( "size %d, layouts %p.\n", size, layouts ); -@@ -951,33 +947,6 @@ UINT WINAPI NtUserGetKeyboardLayoutList( INT size, HKL *layouts ) +@@ -952,33 +948,6 @@ UINT WINAPI NtUserGetKeyboardLayoutList( INT size, HKL *layouts ) if (size && layouts) { layouts[count - 1] = layout; @@ -129,5 +129,5 @@ index 28fc5a918c8..24782e405a7 100644 return count; -- -2.34.1 +2.37.2 diff --git a/patches/ntdll-FileFsFullSizeInformation/0001-ntdll-Add-support-for-FileFsFullSizeInformation-clas.patch b/patches/ntdll-FileFsFullSizeInformation/0001-ntdll-Add-support-for-FileFsFullSizeInformation-clas.patch deleted file mode 100644 index a314cecc..00000000 --- a/patches/ntdll-FileFsFullSizeInformation/0001-ntdll-Add-support-for-FileFsFullSizeInformation-clas.patch +++ /dev/null @@ -1,117 +0,0 @@ -From 7ed5fbcd72130a3190e4070185baba8d53a07b3c Mon Sep 17 00:00:00 2001 -From: Jianqiu Zhang -Date: Fri, 17 Apr 2015 14:33:41 +0800 -Subject: [PATCH] ntdll: Add support for FileFsFullSizeInformation class in - NtQueryVolumeInformationFile(try 2) - ---- - dlls/ntdll/tests/file.c | 8 +----- - dlls/ntdll/unix/file.c | 55 +++++++++++++++++++++++++++++++++++++++-- - 2 files changed, 54 insertions(+), 9 deletions(-) - -diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c -index fffe7caa583..fbe5c9deb6e 100644 ---- a/dlls/ntdll/tests/file.c -+++ b/dlls/ntdll/tests/file.c -@@ -1292,7 +1292,7 @@ static void test_file_full_size_information(void) - - /* Assume No Quota Settings configured on Wine Testbot */ - res = pNtQueryVolumeInformationFile(h, &io, &ffsi, sizeof ffsi, FileFsFullSizeInformation); -- todo_wine ok(res == STATUS_SUCCESS, "cannot get attributes, res %lx\n", res); -+ ok(res == STATUS_SUCCESS, "cannot get attributes, res %lx\n", res); - res = pNtQueryVolumeInformationFile(h, &io, &fsi, sizeof fsi, FileFsSizeInformation); - ok(res == STATUS_SUCCESS, "cannot get attributes, res %lx\n", res); - -@@ -1308,8 +1308,6 @@ static void test_file_full_size_information(void) - ok(fsi.BytesPerSector == 512, "[fsi] BytesPerSector expected 512, got %ld\n",fsi.BytesPerSector); - ok(fsi.SectorsPerAllocationUnit == 8, "[fsi] SectorsPerAllocationUnit expected 8, got %ld\n",fsi.SectorsPerAllocationUnit); - -- todo_wine -- { - ok(ffsi.TotalAllocationUnits.QuadPart > 0, - "[ffsi] TotalAllocationUnits expected positive, got negative value 0x%s\n", - wine_dbgstr_longlong(ffsi.TotalAllocationUnits.QuadPart)); -@@ -1327,14 +1325,10 @@ static void test_file_full_size_information(void) - "[ffsi] CallerAvailableAllocationUnits error fsi:0x%s, ffsi: 0x%s\n", - wine_dbgstr_longlong(fsi.AvailableAllocationUnits.QuadPart), - wine_dbgstr_longlong(ffsi.CallerAvailableAllocationUnits.QuadPart)); -- } - - /* Assume file system is NTFS */ -- todo_wine -- { - ok(ffsi.BytesPerSector == 512, "[ffsi] BytesPerSector expected 512, got %ld\n",ffsi.BytesPerSector); - ok(ffsi.SectorsPerAllocationUnit == 8, "[ffsi] SectorsPerAllocationUnit expected 8, got %ld\n",ffsi.SectorsPerAllocationUnit); -- } - - CloseHandle( h ); - } -diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c -index 549b0a26240..d0f8be6c309 100644 ---- a/dlls/ntdll/unix/file.c -+++ b/dlls/ntdll/unix/file.c -@@ -7524,8 +7524,59 @@ NTSTATUS WINAPI NtQueryVolumeInformationFile( HANDLE handle, IO_STATUS_BLOCK *io - break; - - case FileFsFullSizeInformation: -- FIXME( "%p: full size info not supported\n", handle ); -- status = STATUS_NOT_IMPLEMENTED; -+ if(length < sizeof(FILE_FS_FULL_SIZE_INFORMATION)) -+ io->u.Status = STATUS_BUFFER_TOO_SMALL; -+ else -+ { -+ FILE_FS_FULL_SIZE_INFORMATION *info = buffer; -+ -+ if (fstat( fd, &st ) < 0) -+ { -+ io->u.Status = errno_to_status( errno ); -+ break; -+ } -+ if(!S_ISREG(st.st_mode) && !S_ISDIR(st.st_mode)) -+ { -+ io->u.Status = STATUS_INVALID_DEVICE_REQUEST; -+ } -+ else -+ { -+ ULONGLONG bsize; -+#if !defined(linux) || !defined(HAVE_FSTATFS) -+ struct statvfs stfs; -+ -+ if(fstatvfs( fd, &stfs ) < 0) -+ { -+ io->u.Status = errno_to_status( errno ); -+ break; -+ } -+ bsize = stfs.f_frsize; -+#else -+ struct statfs stfs; -+ if(fstatfs( fd, &stfs ) < 0) -+ { -+ io->u.Status = errno_to_status( errno ); -+ break; -+ } -+ bsize = stfs.f_bsize; -+#endif -+ if(bsize == 2048) /* assume CD-ROM */ -+ { -+ info->BytesPerSector = 2048; -+ info->SectorsPerAllocationUnit = 1; -+ } -+ else -+ { -+ info->BytesPerSector = 512; -+ info->SectorsPerAllocationUnit = 8; -+ } -+ info->TotalAllocationUnits.QuadPart = bsize * stfs.f_blocks / (info->BytesPerSector * info->SectorsPerAllocationUnit); -+ info->CallerAvailableAllocationUnits.QuadPart = bsize * stfs.f_bavail / (info->BytesPerSector * info->SectorsPerAllocationUnit); -+ info->ActualAvailableAllocationUnits.QuadPart = bsize * stfs.f_bfree / (info->BytesPerSector * info->SectorsPerAllocationUnit); -+ io->Information = sizeof(*info); -+ io->u.Status = STATUS_SUCCESS; -+ } -+ } - break; - - case FileFsObjectIdInformation: --- -2.35.1 - diff --git a/patches/ntdll-FileFsFullSizeInformation/definition b/patches/ntdll-FileFsFullSizeInformation/definition deleted file mode 100644 index ae100aab..00000000 --- a/patches/ntdll-FileFsFullSizeInformation/definition +++ /dev/null @@ -1 +0,0 @@ -Fixes: Support for FileFsFullSizeInformation information class diff --git a/patches/ntdll-Junction_Points/0006-kernel32-Advertise-junction-point-support.patch b/patches/ntdll-Junction_Points/0006-kernel32-Advertise-junction-point-support.patch index 18fbb4ed..1e6a6bdd 100644 --- a/patches/ntdll-Junction_Points/0006-kernel32-Advertise-junction-point-support.patch +++ b/patches/ntdll-Junction_Points/0006-kernel32-Advertise-junction-point-support.patch @@ -1,7 +1,7 @@ -From 7a2585477f90f5e88a7745eea20f517a00b2175b Mon Sep 17 00:00:00 2001 +From 34e53ddfbd8c65e37d0cc3e68793833e733eb107 Mon Sep 17 00:00:00 2001 From: "Erich E. Hoover" Date: Sat, 12 Dec 2020 17:28:31 -0700 -Subject: kernel32: Advertise junction point support. +Subject: [PATCH] kernel32: Advertise junction point support. Signed-off-by: Erich E. Hoover --- @@ -12,7 +12,7 @@ Signed-off-by: Erich E. Hoover 4 files changed, 144 insertions(+), 3 deletions(-) diff --git a/dlls/mountmgr.sys/device.c b/dlls/mountmgr.sys/device.c -index d4f77012bbe..6131e236e3a 100644 +index 0757036c8e3..6b2187c0991 100644 --- a/dlls/mountmgr.sys/device.c +++ b/dlls/mountmgr.sys/device.c @@ -197,6 +197,36 @@ static void get_filesystem_serial( struct volume *volume ) @@ -52,7 +52,7 @@ index d4f77012bbe..6131e236e3a 100644 /****************************************************************** * VOLUME_FindCdRomDataBestVoldesc -@@ -1695,7 +1725,8 @@ static NTSTATUS WINAPI harddisk_query_volume( DEVICE_OBJECT *device, IRP *irp ) +@@ -1716,7 +1746,8 @@ static NTSTATUS WINAPI harddisk_query_volume( DEVICE_OBJECT *device, IRP *irp ) break; default: fsname = L"NTFS"; @@ -63,12 +63,12 @@ index d4f77012bbe..6131e236e3a 100644 break; } diff --git a/dlls/mountmgr.sys/unixlib.c b/dlls/mountmgr.sys/unixlib.c -index 52a3fce66d6..73735c22d13 100644 +index 0332f6f6018..93ec6f266c5 100644 --- a/dlls/mountmgr.sys/unixlib.c +++ b/dlls/mountmgr.sys/unixlib.c -@@ -31,6 +31,21 @@ - #include - #include +@@ -38,6 +38,21 @@ + #endif + #include #include +#ifdef HAVE_SYS_STATFS_H +# include @@ -87,8 +87,8 @@ index 52a3fce66d6..73735c22d13 100644 +#endif #include "unixlib.h" - -@@ -311,6 +326,87 @@ static NTSTATUS read_volume_file( void *args ) + #include "wine/debug.h" +@@ -463,6 +478,87 @@ static NTSTATUS read_volume_file( void *args ) return STATUS_SUCCESS; } @@ -176,17 +176,17 @@ index 52a3fce66d6..73735c22d13 100644 static NTSTATUS match_unixdev( void *args ) { const struct match_unixdev_params *params = args; -@@ -454,4 +550,5 @@ const unixlib_entry_t __wine_unix_call_funcs[] = +@@ -607,4 +703,5 @@ const unixlib_entry_t __wine_unix_call_funcs[] = write_credential, delete_credential, enumerate_credentials, + get_volume_filesystem, }; diff --git a/dlls/mountmgr.sys/unixlib.h b/dlls/mountmgr.sys/unixlib.h -index e7846a764da..188cf93b091 100644 +index ef5b10732f6..6d3902173b4 100644 --- a/dlls/mountmgr.sys/unixlib.h +++ b/dlls/mountmgr.sys/unixlib.h -@@ -91,6 +91,13 @@ struct read_volume_file_params +@@ -107,6 +107,13 @@ struct read_volume_file_params ULONG *size; }; @@ -200,7 +200,7 @@ index e7846a764da..188cf93b091 100644 struct match_unixdev_params { const char *device; -@@ -156,6 +163,7 @@ enum mountmgr_funcs +@@ -173,6 +180,7 @@ enum mountmgr_funcs unix_write_credential, unix_delete_credential, unix_enumerate_credentials, @@ -209,10 +209,10 @@ index e7846a764da..188cf93b091 100644 extern unixlib_handle_t mountmgr_handle; diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c -index c5b3b83802e..084398ba83d 100644 +index ce8c37a7337..177151832a8 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c -@@ -5351,8 +5351,8 @@ static INT build_reparse_buffer(const WCHAR *filename, REPARSE_DATA_BUFFER **pbu +@@ -5355,8 +5355,8 @@ static INT build_reparse_buffer(const WCHAR *filename, REPARSE_DATA_BUFFER **pbu static void test_reparse_points(void) { @@ -222,7 +222,7 @@ index c5b3b83802e..084398ba83d 100644 static const WCHAR targetW[] = {'\\','t','a','r','g','e','t',0}; INT buffer_len, string_len, path_len, total_len; FILE_BASIC_INFORMATION old_attrib, new_attrib; -@@ -5381,7 +5381,12 @@ static void test_reparse_points(void) +@@ -5385,7 +5385,12 @@ static void test_reparse_points(void) pRtlDosPathNameToNtPathName_U(path, &nameW, NULL, NULL); volW[0] = nameW.Buffer[4]; pRtlFreeUnicodeString( &nameW ); @@ -237,5 +237,5 @@ index c5b3b83802e..084398ba83d 100644 { skip("File system does not support reparse points.\n"); -- -2.17.1 +2.37.2 diff --git a/patches/ntdll-Junction_Points/definition b/patches/ntdll-Junction_Points/definition index 2ed16a5c..41813921 100644 --- a/patches/ntdll-Junction_Points/definition +++ b/patches/ntdll-Junction_Points/definition @@ -2,3 +2,4 @@ Fixes: [12401] NET Framework 2.0, 3.0, 4.0 installers and other apps that make u Fixes: [44948] Multiple apps (Spine (Mod starter for Gothic), MS Office 365 installer) need CreateSymbolicLinkW implementation Depends: ntdll-DOS_Attributes Depends: ntdll-NtQueryEaFile +Depends: ntdll-Serial_Port_Detection diff --git a/patches/ntdll-Serial_Port_Detection/0001-ntdll-Do-a-device-check-before-returning-a-default-s.patch b/patches/ntdll-Serial_Port_Detection/0001-ntdll-Do-a-device-check-before-returning-a-default-s.patch index ea7a00bd..2b8bb937 100644 --- a/patches/ntdll-Serial_Port_Detection/0001-ntdll-Do-a-device-check-before-returning-a-default-s.patch +++ b/patches/ntdll-Serial_Port_Detection/0001-ntdll-Do-a-device-check-before-returning-a-default-s.patch @@ -1,4 +1,4 @@ -From 6684c0f0f73c1664c923ba150e1cb663704d8991 Mon Sep 17 00:00:00 2001 +From 0c71b9c48afdc0478941417595998ab21fcf12ae Mon Sep 17 00:00:00 2001 From: Alex Henrie Date: Tue, 29 Dec 2015 00:48:02 -0700 Subject: [PATCH] mountmgr.sys: Do a device check before returning a default @@ -12,10 +12,10 @@ Fixes https://bugs.winehq.org/show_bug.cgi?id=39793 3 files changed, 24 insertions(+), 1 deletion(-) diff --git a/dlls/mountmgr.sys/device.c b/dlls/mountmgr.sys/device.c -index 8c2808bb643..57ae874b247 100644 +index 328b0b2f344..0757036c8e3 100644 --- a/dlls/mountmgr.sys/device.c +++ b/dlls/mountmgr.sys/device.c -@@ -1868,7 +1868,7 @@ static BOOL create_port_device( DRIVER_OBJECT *driver, int n, const char *unix_p +@@ -1884,7 +1884,7 @@ static BOOL create_port_device( DRIVER_OBJECT *driver, int n, const char *unix_p UNICODE_STRING nt_name, symlink_name, default_name; DEVICE_OBJECT *dev_obj; NTSTATUS status; @@ -25,18 +25,18 @@ index 8c2808bb643..57ae874b247 100644 /* create DOS device */ if (MOUNTMGR_CALL( set_dosdev_symlink, ¶ms )) return FALSE; diff --git a/dlls/mountmgr.sys/unixlib.c b/dlls/mountmgr.sys/unixlib.c -index 73735c22d13..f83f7104d82 100644 +index 13f6fbecf09..0332f6f6018 100644 --- a/dlls/mountmgr.sys/unixlib.c +++ b/dlls/mountmgr.sys/unixlib.c -@@ -46,6 +46,7 @@ - #ifdef HAVE_SYS_MOUNT_H - #include +@@ -36,6 +36,7 @@ + #ifdef HAVE_SYS_STATVFS_H + # include #endif +#include + #include #include "unixlib.h" - -@@ -268,6 +269,27 @@ static NTSTATUS set_dosdev_symlink( void *args ) +@@ -304,6 +305,27 @@ static NTSTATUS set_dosdev_symlink( void *args ) char *path; NTSTATUS status = STATUS_SUCCESS; @@ -65,10 +65,10 @@ index 73735c22d13..f83f7104d82 100644 if (params->dest && params->dest[0]) diff --git a/dlls/mountmgr.sys/unixlib.h b/dlls/mountmgr.sys/unixlib.h -index 188cf93b091..31f5e8a807e 100644 +index d70371876fa..ef5b10732f6 100644 --- a/dlls/mountmgr.sys/unixlib.h +++ b/dlls/mountmgr.sys/unixlib.h -@@ -75,6 +75,7 @@ struct set_dosdev_symlink_params +@@ -90,6 +90,7 @@ struct set_dosdev_symlink_params { const char *dev; const char *dest; @@ -77,5 +77,5 @@ index 188cf93b091..31f5e8a807e 100644 struct get_volume_dos_devices_params -- -2.33.0 +2.37.2 diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index 900c480b..0fc154b9 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -51,7 +51,7 @@ usage() # Get the upstream commit sha upstream_commit() { - echo "a4930f003f45ab82c4c05746cbd29cbd4af09735" + echo "7546b4a63d437c2f7f8673cae9341d358f84f1a5" } # Show version information @@ -134,7 +134,6 @@ patch_enable_all () enable_ntdll_CriticalSection="$1" enable_ntdll_DOS_Attributes="$1" enable_ntdll_Exception="$1" - enable_ntdll_FileFsFullSizeInformation="$1" enable_ntdll_ForceBottomUpAlloc="$1" enable_ntdll_HashLinks="$1" enable_ntdll_Hide_Wine_Exports="$1" @@ -424,9 +423,6 @@ patch_enable () ntdll-Exception) enable_ntdll_Exception="$2" ;; - ntdll-FileFsFullSizeInformation) - enable_ntdll_FileFsFullSizeInformation="$2" - ;; ntdll-ForceBottomUpAlloc) enable_ntdll_ForceBottomUpAlloc="$2" ;; @@ -1315,8 +1311,12 @@ if test "$enable_ntdll_Junction_Points" -eq 1; then if test "$enable_ntdll_NtQueryEaFile" -gt 1; then abort "Patchset ntdll-NtQueryEaFile disabled, but ntdll-Junction_Points depends on that." fi + if test "$enable_ntdll_Serial_Port_Detection" -gt 1; then + abort "Patchset ntdll-Serial_Port_Detection disabled, but ntdll-Junction_Points depends on that." + fi enable_ntdll_DOS_Attributes=1 enable_ntdll_NtQueryEaFile=1 + enable_ntdll_Serial_Port_Detection=1 fi if test "$enable_dsound_EAX" -eq 1; then @@ -1709,10 +1709,22 @@ if test "$enable_ntdll_NtQueryEaFile" -eq 1; then patch_apply ntdll-NtQueryEaFile/0001-ntdll-Improve-stub-of-NtQueryEaFile.patch fi +# Patchset ntdll-Serial_Port_Detection +# | +# | This patchset fixes the following Wine bugs: +# | * [#39793] Do a device check before returning a default serial port name +# | +# | Modified files: +# | * dlls/mountmgr.sys/device.c, dlls/mountmgr.sys/unixlib.c, dlls/mountmgr.sys/unixlib.h +# | +if test "$enable_ntdll_Serial_Port_Detection" -eq 1; then + patch_apply ntdll-Serial_Port_Detection/0001-ntdll-Do-a-device-check-before-returning-a-default-s.patch +fi + # Patchset ntdll-Junction_Points # | # | This patchset has the following (direct or indirect) dependencies: -# | * ntdll-DOS_Attributes, ntdll-NtQueryEaFile +# | * ntdll-DOS_Attributes, ntdll-NtQueryEaFile, ntdll-Serial_Port_Detection # | # | This patchset fixes the following Wine bugs: # | * [#12401] NET Framework 2.0, 3.0, 4.0 installers and other apps that make use of GAC API for managed assembly @@ -1803,8 +1815,8 @@ fi # Patchset eventfd_synchronization # | # | This patchset has the following (direct or indirect) dependencies: -# | * ntdll-DOS_Attributes, ntdll-NtQueryEaFile, ntdll-Junction_Points, server-PeekMessage, server-Realtime_Priority, server- -# | Signal_Thread +# | * ntdll-DOS_Attributes, ntdll-NtQueryEaFile, ntdll-Serial_Port_Detection, ntdll-Junction_Points, server-PeekMessage, +# | server-Realtime_Priority, server-Signal_Thread # | # | This patchset fixes the following Wine bugs: # | * [#36692] Many multi-threaded applications have poor performance due to heavy use of synchronization primitives @@ -2241,15 +2253,6 @@ if test "$enable_ntdll_Exception" -eq 1; then patch_apply ntdll-Exception/0002-ntdll-OutputDebugString-should-throw-the-exception-a.patch fi -# Patchset ntdll-FileFsFullSizeInformation -# | -# | Modified files: -# | * dlls/ntdll/tests/file.c, dlls/ntdll/unix/file.c -# | -if test "$enable_ntdll_FileFsFullSizeInformation" -eq 1; then - patch_apply ntdll-FileFsFullSizeInformation/0001-ntdll-Add-support-for-FileFsFullSizeInformation-clas.patch -fi - # Patchset ntdll-HashLinks # | # | Modified files: @@ -2325,18 +2328,6 @@ if test "$enable_ntdll_RtlQueryPackageIdentity" -eq 1; then patch_apply ntdll-RtlQueryPackageIdentity/0003-ntdll-tests-Add-basic-tests-for-RtlQueryPackageIdent.patch fi -# Patchset ntdll-Serial_Port_Detection -# | -# | This patchset fixes the following Wine bugs: -# | * [#39793] Do a device check before returning a default serial port name -# | -# | Modified files: -# | * dlls/mountmgr.sys/device.c, dlls/mountmgr.sys/unixlib.c, dlls/mountmgr.sys/unixlib.h -# | -if test "$enable_ntdll_Serial_Port_Detection" -eq 1; then - patch_apply ntdll-Serial_Port_Detection/0001-ntdll-Do-a-device-check-before-returning-a-default-s.patch -fi - # Patchset ntdll-Syscall_Emulation # | # | This patchset fixes the following Wine bugs: @@ -2632,7 +2623,7 @@ fi # Patchset server-File_Permissions # | # | This patchset has the following (direct or indirect) dependencies: -# | * ntdll-DOS_Attributes, ntdll-NtQueryEaFile, ntdll-Junction_Points +# | * ntdll-DOS_Attributes, ntdll-NtQueryEaFile, ntdll-Serial_Port_Detection, ntdll-Junction_Points # | # | Modified files: # | * dlls/advapi32/tests/security.c, dlls/ntdll/tests/file.c, server/fd.c @@ -2650,7 +2641,7 @@ fi # Patchset server-Stored_ACLs # | # | This patchset has the following (direct or indirect) dependencies: -# | * ntdll-DOS_Attributes, ntdll-NtQueryEaFile, ntdll-Junction_Points, server-File_Permissions +# | * ntdll-DOS_Attributes, ntdll-NtQueryEaFile, ntdll-Serial_Port_Detection, ntdll-Junction_Points, server-File_Permissions # | # | This patchset fixes the following Wine bugs: # | * [#33576] Support for stored file ACLs diff --git a/staging/upstream-commit b/staging/upstream-commit index a8380879..dd71c98e 100644 --- a/staging/upstream-commit +++ b/staging/upstream-commit @@ -1 +1 @@ -a4930f003f45ab82c4c05746cbd29cbd4af09735 +7546b4a63d437c2f7f8673cae9341d358f84f1a5