diff --git a/patches/gdi32-MultiMonitor/0005-user32-Return-a-more-reasonable-display-DeviceID.patch b/patches/gdi32-MultiMonitor/0005-user32-Return-a-more-reasonable-display-DeviceID.patch index 5ab781a7..39cebe3e 100644 --- a/patches/gdi32-MultiMonitor/0005-user32-Return-a-more-reasonable-display-DeviceID.patch +++ b/patches/gdi32-MultiMonitor/0005-user32-Return-a-more-reasonable-display-DeviceID.patch @@ -1,15 +1,15 @@ -From 99f4a556a733ff6036edbcde171beef389449d6f Mon Sep 17 00:00:00 2001 +From 547a92d26b034a226b65a64aec229412129bdd61 Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Sat, 27 May 2017 04:15:55 +0200 -Subject: user32: Return a more reasonable display DeviceID. +Subject: [PATCH] user32: Return a more reasonable display DeviceID. --- dlls/user32/misc.c | 7 ++++++- - dlls/user32/tests/monitor.c | 16 +++++++++++++--- - 2 files changed, 19 insertions(+), 4 deletions(-) + dlls/user32/tests/monitor.c | 12 ++++++++++++ + 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/dlls/user32/misc.c b/dlls/user32/misc.c -index 1898ce1b696..03114650348 100644 +index a6b7644020f..c1c812dbd51 100644 --- a/dlls/user32/misc.c +++ b/dlls/user32/misc.c @@ -249,7 +249,12 @@ static const WCHAR adapter_device_deviceid[] = {'P','C','I','\\','V','E','N','_' @@ -27,33 +27,18 @@ index 1898ce1b696..03114650348 100644 struct display_devices_enum_info { diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c -index dfdca49e792..886d63ccfe2 100644 +index 8bf284a5e1c..6a886da1b63 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c -@@ -89,12 +89,12 @@ static void test_enumdisplaydevices(void) - } +@@ -225,6 +225,7 @@ static void test_enumdisplaydevices(void) + int adapter_index; + int monitor_index; + BOOL ret; ++ int num; - dd.cb = sizeof(dd); -- while(1) -+ for (num = 0;; num++) + if (!pEnumDisplayDevicesA) { -- BOOL ret; - HDC dc; - ret = pEnumDisplayDevicesA(NULL, num, &dd, 0); - if(!ret) break; -+ - if(dd.StateFlags & DISPLAY_DEVICE_PRIMARY_DEVICE) - { - strcpy(primary_device_name, dd.DeviceName); -@@ -107,7 +107,6 @@ static void test_enumdisplaydevices(void) - ok(dc != NULL, "Failed to CreateDC(\"%s\") err=%d\n", dd.DeviceName, GetLastError()); - DeleteDC(dc); - } -- num++; - } - - if (primary_num == -1 || !pEnumDisplayMonitors || !pGetMonitorInfoA) -@@ -122,6 +121,17 @@ static void test_enumdisplaydevices(void) +@@ -276,6 +277,17 @@ static void test_enumdisplaydevices(void) ok(!strcmp(primary_monitor_device_name, primary_device_name), "monitor device name %s, device name %s\n", primary_monitor_device_name, primary_device_name); @@ -72,5 +57,5 @@ index dfdca49e792..886d63ccfe2 100644 struct vid_mode -- -2.12.2 +2.20.1 diff --git a/patches/ntoskrnl-Stubs/0009-ntoskrnl.exe-Implement-MmMapLockedPages-and-MmUnmapL.patch b/patches/ntoskrnl-Stubs/0009-ntoskrnl.exe-Implement-MmMapLockedPages-and-MmUnmapL.patch index 09e08758..0323759e 100644 --- a/patches/ntoskrnl-Stubs/0009-ntoskrnl.exe-Implement-MmMapLockedPages-and-MmUnmapL.patch +++ b/patches/ntoskrnl-Stubs/0009-ntoskrnl.exe-Implement-MmMapLockedPages-and-MmUnmapL.patch @@ -1,7 +1,8 @@ -From c4b9b10d49301e248612f06b984ed9c6e9968673 Mon Sep 17 00:00:00 2001 +From a661ba02ea0d607b11c35c16b21dea3b0a865615 Mon Sep 17 00:00:00 2001 From: Christian Costa Date: Sun, 1 Feb 2015 12:53:09 +0100 -Subject: ntoskrnl.exe: Implement MmMapLockedPages and MmUnmapLockedPages. +Subject: [PATCH] ntoskrnl.exe: Implement MmMapLockedPages and + MmUnmapLockedPages. --- dlls/ntoskrnl.exe/ntoskrnl.c | 20 ++++++++++++++++++++ @@ -9,10 +10,10 @@ Subject: ntoskrnl.exe: Implement MmMapLockedPages and MmUnmapLockedPages. 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c -index 9c88479..9b5058b 100644 +index 010f9f735f7..0581f3e0d55 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c -@@ -1991,6 +1991,16 @@ VOID WINAPI MmLockPagableSectionByHandle(PVOID ImageSectionHandle) +@@ -2610,6 +2610,16 @@ VOID WINAPI MmLockPagableSectionByHandle(PVOID ImageSectionHandle) FIXME("stub %p\n", ImageSectionHandle); } @@ -29,7 +30,7 @@ index 9c88479..9b5058b 100644 /*********************************************************************** * MmMapLockedPagesSpecifyCache (NTOSKRNL.EXE.@) */ -@@ -2056,6 +2066,16 @@ VOID WINAPI MmUnmapIoSpace( PVOID BaseAddress, SIZE_T NumberOfBytes ) +@@ -2675,6 +2685,16 @@ VOID WINAPI MmUnmapIoSpace( PVOID BaseAddress, SIZE_T NumberOfBytes ) } @@ -44,13 +45,13 @@ index 9c88479..9b5058b 100644 + + /*********************************************************************** - * ObReferenceObjectByHandle (NTOSKRNL.EXE.@) + * ObReferenceObjectByName (NTOSKRNL.EXE.@) */ diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec -index 7283510..0cd5c99 100644 +index 4dcd5530494..75f9d595ad1 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec -@@ -689,7 +689,7 @@ +@@ -702,7 +702,7 @@ @ stub MmLockPagableImageSection @ stdcall MmLockPagableSectionByHandle(ptr) @ stdcall MmMapIoSpace(int64 long long) @@ -59,7 +60,7 @@ index 7283510..0cd5c99 100644 @ stdcall MmMapLockedPagesSpecifyCache(ptr long long ptr long long) @ stub MmMapLockedPagesWithReservedMapping @ stub MmMapMemoryDumpMdl -@@ -719,7 +719,7 @@ +@@ -732,7 +732,7 @@ @ stdcall MmUnlockPagableImageSection(ptr) @ stdcall MmUnlockPages(ptr) @ stdcall MmUnmapIoSpace(ptr long) @@ -69,5 +70,5 @@ index 7283510..0cd5c99 100644 @ stub MmUnmapVideoDisplay @ stub MmUnmapViewInSessionSpace -- -2.7.1 +2.20.1 diff --git a/patches/ntoskrnl.exe-Resources/0013-ntoskrnl.exe-tests-Add-tests-for-ERESOURCE-functions.patch b/patches/ntoskrnl.exe-Resources/0013-ntoskrnl.exe-tests-Add-tests-for-ERESOURCE-functions.patch index b8ece9cd..b11dbfb2 100644 --- a/patches/ntoskrnl.exe-Resources/0013-ntoskrnl.exe-tests-Add-tests-for-ERESOURCE-functions.patch +++ b/patches/ntoskrnl.exe-Resources/0013-ntoskrnl.exe-tests-Add-tests-for-ERESOURCE-functions.patch @@ -1,7 +1,7 @@ -From 85acc986954ed6476fe459fc60fafee7211eb556 Mon Sep 17 00:00:00 2001 +From 62ab92c3a4b0ba57df6a84ac0119a0c134760608 Mon Sep 17 00:00:00 2001 From: Zebediah Figura Date: Tue, 29 Jan 2019 21:54:39 -0600 -Subject: [PATCH 13/13] ntoskrnl.exe/tests: Add tests for ERESOURCE functions. +Subject: [PATCH] ntoskrnl.exe/tests: Add tests for ERESOURCE functions. Signed-off-by: Zebediah Figura --- @@ -10,10 +10,10 @@ Signed-off-by: Zebediah Figura 2 files changed, 312 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c -index 3984240e..6d64cc8e 100644 +index 2fbe493fa35..b2ac5fc8a0e 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c -@@ -289,7 +289,14 @@ static NTSTATUS wait_multiple(ULONG count, void *objs[], WAIT_TYPE wait_type, UL +@@ -308,7 +308,14 @@ static NTSTATUS wait_multiple(ULONG count, void *objs[], WAIT_TYPE wait_type, UL return KeWaitForMultipleObjects(count, objs, wait_type, Executive, KernelMode, FALSE, &integer, NULL); } @@ -29,7 +29,7 @@ index 3984240e..6d64cc8e 100644 { OBJECT_ATTRIBUTES attr = {0}; HANDLE thread; -@@ -300,12 +307,25 @@ static void run_thread(PKSTART_ROUTINE proc, void *arg) +@@ -319,12 +326,25 @@ static void run_thread(PKSTART_ROUTINE proc, void *arg) ret = PsCreateSystemThread(&thread, THREAD_ALL_ACCESS, &attr, NULL, NULL, proc, arg); ok(!ret, "got %#x\n", ret); @@ -55,8 +55,8 @@ index 3984240e..6d64cc8e 100644 static KMUTEX test_mutex; static void WINAPI mutex_thread(void *arg) -@@ -636,6 +656,294 @@ static void test_version(void) - ok(*pNtBuildNumber == build, "Expected build number %u, got %u\n", build, *pNtBuildNumber); +@@ -763,6 +783,294 @@ static void test_ob_reference(const WCHAR *test_path) + ok(!status, "ZwClose failed: %#x\n", status); } +static void check_resource_(int line, ERESOURCE *resource, ULONG exclusive_waiters, @@ -350,16 +350,16 @@ index 3984240e..6d64cc8e 100644 static NTSTATUS main_test(DEVICE_OBJECT *device, IRP *irp, IO_STACK_LOCATION *stack, ULONG_PTR *info) { ULONG length = stack->Parameters.DeviceIoControl.OutputBufferLength; -@@ -669,6 +977,7 @@ static NTSTATUS main_test(DEVICE_OBJECT *device, IRP *irp, IO_STACK_LOCATION *st - test_version(); +@@ -805,6 +1113,7 @@ static NTSTATUS main_test(DEVICE_OBJECT *device, IRP *irp, IO_STACK_LOCATION *st test_stack_callout(); test_lookaside_list(); + test_ob_reference(test_input->path); + test_resource(); /* print process report */ - if (test_input->winetest_debug) + if (winetest_debug) diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h -index e5a2906f..0677be69 100644 +index e5a2906fb49..0677be693c1 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1578,6 +1578,7 @@ void WINAPI KeAcquireSpinLockAtDpcLevel(KSPIN_LOCK*); diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index 9fb71227..5d437cee 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -52,7 +52,7 @@ usage() # Get the upstream commit sha upstream_commit() { - echo "f784cabd3489b20c13afd80fddbbcf5aa1b656b3" + echo "474a6771ba03e2c475cd088ff40c97e8285a455f" } # Show version information @@ -377,7 +377,6 @@ patch_enable_all () enable_wintab32_improvements="$1" enable_wintrust_WTHelperGetProvCertFromChain="$1" enable_wintrust_WinVerifyTrust="$1" - enable_wmvcore_WMCheckURlExtension="$1" enable_wmvcore_WMCreateSyncReader="$1" enable_wmvcore_WMCreateSyncReaderPriv="$1" enable_wow64cpu_Wow64Transition="$1" @@ -1279,9 +1278,6 @@ patch_enable () wintrust-WinVerifyTrust) enable_wintrust_WinVerifyTrust="$2" ;; - wmvcore-WMCheckURlExtension) - enable_wmvcore_WMCheckURlExtension="$2" - ;; wmvcore-WMCreateSyncReader) enable_wmvcore_WMCreateSyncReader="$2" ;; @@ -1691,13 +1687,9 @@ if test "$enable_ws2_32_TransmitFile" -eq 1; then fi if test "$enable_wmvcore_WMCreateSyncReaderPriv" -eq 1; then - if test "$enable_wmvcore_WMCheckURlExtension" -gt 1; then - abort "Patchset wmvcore-WMCheckURlExtension disabled, but wmvcore-WMCreateSyncReaderPriv depends on that." - fi if test "$enable_wmvcore_WMCreateSyncReader" -gt 1; then abort "Patchset wmvcore-WMCreateSyncReader disabled, but wmvcore-WMCreateSyncReaderPriv depends on that." fi - enable_wmvcore_WMCheckURlExtension=1 enable_wmvcore_WMCreateSyncReader=1 fi @@ -7411,21 +7403,6 @@ if test "$enable_wintrust_WTHelperGetProvCertFromChain" -eq 1; then ) >> "$patchlist" fi -# Patchset wmvcore-WMCheckURlExtension -# | -# | This patchset fixes the following Wine bugs: -# | * [#44300] wmvcore: Add stub for WMCheckURlExtension -# | -# | Modified files: -# | * dlls/wmvcore/wmvcore.spec, dlls/wmvcore/wmvcore_main.c, include/wmsdkidl.idl -# | -if test "$enable_wmvcore_WMCheckURlExtension" -eq 1; then - patch_apply wmvcore-WMCheckURlExtension/0001-wmvcore-Add-stub-for-WMCheckURlExtension.patch - ( - printf '%s\n' '+ { "Vijay Kiran Kamuju", "wmvcore: Add stub for WMCheckURlExtension.", 1 },'; - ) >> "$patchlist" -fi - # Patchset wmvcore-WMCreateSyncReader # | # | This patchset fixes the following Wine bugs: @@ -7444,7 +7421,7 @@ fi # Patchset wmvcore-WMCreateSyncReaderPriv # | # | This patchset has the following (direct or indirect) dependencies: -# | * wmvcore-WMCheckURlExtension, wmvcore-WMCreateSyncReader +# | * wmvcore-WMCreateSyncReader # | # | This patchset fixes the following Wine bugs: # | * [#37327] wmvcore: Implement WMCreateSyncReaderPriv 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 72da3b1b..543a4e98 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 63ae0e1dd59a078db172a96b3c1d63db4e9d8245 Mon Sep 17 00:00:00 2001 +From 6f57fd23096d854ac448817cbe69747e7265f9fb 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, 77 insertions(+) diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c -index 6d64cc8e..f3465b77 100644 +index b2ac5fc8a0e..c2675eadca7 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -38,6 +38,8 @@ static const WCHAR driver_device[] = {'\\','D','e','v','i','c','e', @@ -22,7 +22,7 @@ index 6d64cc8e..f3465b77 100644 static HANDLE okfile; static LONG successes; static LONG failures; -@@ -944,6 +946,52 @@ static void test_resource(void) +@@ -1071,6 +1073,52 @@ static void test_resource(void) ok(status == STATUS_SUCCESS, "got status %#x\n", status); } @@ -75,15 +75,15 @@ index 6d64cc8e..f3465b77 100644 static NTSTATUS main_test(DEVICE_OBJECT *device, IRP *irp, IO_STACK_LOCATION *stack, ULONG_PTR *info) { ULONG length = stack->Parameters.DeviceIoControl.OutputBufferLength; -@@ -978,6 +1026,7 @@ static NTSTATUS main_test(DEVICE_OBJECT *device, IRP *irp, IO_STACK_LOCATION *st +@@ -1113,6 +1161,7 @@ static NTSTATUS main_test(DEVICE_OBJECT *device, IRP *irp, IO_STACK_LOCATION *st test_stack_callout(); test_lookaside_list(); - test_resource(); + test_ob_reference(test_input->path); + test_default_modules(); + test_resource(); /* print process report */ - if (test_input->winetest_debug) -@@ -1090,6 +1139,8 @@ NTSTATUS WINAPI DriverEntry(DRIVER_OBJECT *driver, PUNICODE_STRING registry) +@@ -1226,6 +1275,8 @@ NTSTATUS WINAPI DriverEntry(DRIVER_OBJECT *driver, PUNICODE_STRING registry) DbgPrint("loading driver\n"); @@ -93,7 +93,7 @@ index 6d64cc8e..f3465b77 100644 driver->DriverUnload = driver_Unload; diff --git a/programs/winedevice/device.c b/programs/winedevice/device.c -index 201a0411..33b332da 100644 +index 201a0411d60..33b332da933 100644 --- a/programs/winedevice/device.c +++ b/programs/winedevice/device.c @@ -124,7 +124,33 @@ static DWORD WINAPI service_handler( DWORD ctrl, DWORD event_type, LPVOID event_ diff --git a/patches/wmvcore-WMCheckURlExtension/0001-wmvcore-Add-stub-for-WMCheckURlExtension.patch b/patches/wmvcore-WMCheckURlExtension/0001-wmvcore-Add-stub-for-WMCheckURlExtension.patch deleted file mode 100644 index 03e7a423..00000000 --- a/patches/wmvcore-WMCheckURlExtension/0001-wmvcore-Add-stub-for-WMCheckURlExtension.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 10f582be96ce5acf9e4dd48b3af865fb47917ff8 Mon Sep 17 00:00:00 2001 -From: Vijay Kiran Kamuju -Date: Thu, 11 Jan 2018 14:09:57 +0100 -Subject: [PATCH] wmvcore: Add stub for WMCheckURlExtension - -Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=44300 -Signed-off-by: Vijay Kiran Kamuju ---- - dlls/wmvcore/wmvcore.spec | 2 +- - dlls/wmvcore/wmvcore_main.c | 10 ++++++++++ - include/wmsdkidl.idl | 2 ++ - 3 files changed, 13 insertions(+), 1 deletion(-) - -diff --git a/dlls/wmvcore/wmvcore.spec b/dlls/wmvcore/wmvcore.spec -index f3e3b64..61c3c08 100644 ---- a/dlls/wmvcore/wmvcore.spec -+++ b/dlls/wmvcore/wmvcore.spec -@@ -1,4 +1,4 @@ --@ stub WMCheckURLExtension -+@ stdcall WMCheckURLExtension(wstr) - @ stdcall WMCheckURLScheme(wstr) - @ stub WMCreateBackupRestorerPrivate - @ stub WMCreateSyncReaderPriv -diff --git a/dlls/wmvcore/wmvcore_main.c b/dlls/wmvcore/wmvcore_main.c -index 690885e..14014ee 100644 ---- a/dlls/wmvcore/wmvcore_main.c -+++ b/dlls/wmvcore/wmvcore_main.c -@@ -48,6 +48,16 @@ HRESULT WINAPI DllRegisterServer(void) - return S_OK; - } - -+HRESULT WINAPI WMCheckURLExtension(const WCHAR *url) -+{ -+ FIXME("(%s): stub\n", wine_dbgstr_w(url)); -+ -+ if (!url) -+ return E_INVALIDARG; -+ -+ return NS_E_INVALID_NAME; -+} -+ - HRESULT WINAPI WMCheckURLScheme(const WCHAR *scheme) - { - FIXME("(%s): stub\n", wine_dbgstr_w(scheme)); -diff --git a/include/wmsdkidl.idl b/include/wmsdkidl.idl -index 5bc8546..bb7bfee 100644 ---- a/include/wmsdkidl.idl -+++ b/include/wmsdkidl.idl -@@ -1787,6 +1787,8 @@ interface IWMWriterPreprocess : IUnknown - [in] DWORD flags); - }; - -+cpp_quote("HRESULT WINAPI WMCheckURLExtension(LPCWSTR);") -+cpp_quote("HRESULT WINAPI WMCheckURLScheme(LPCWSTR);") - cpp_quote("HRESULT WINAPI WMCreateWriter(IUnknown*,IWMWriter**);") - cpp_quote("HRESULT WINAPI WMCreateReader(IUnknown*,DWORD,IWMReader**);") - --- -1.9.1 - diff --git a/patches/wmvcore-WMCheckURlExtension/definition b/patches/wmvcore-WMCheckURlExtension/definition deleted file mode 100644 index 6cf4872a..00000000 --- a/patches/wmvcore-WMCheckURlExtension/definition +++ /dev/null @@ -1 +0,0 @@ -Fixes: [44300] wmvcore: Add stub for WMCheckURlExtension diff --git a/patches/wmvcore-WMCreateSyncReaderPriv/definition b/patches/wmvcore-WMCreateSyncReaderPriv/definition index f681a86e..eff06a84 100644 --- a/patches/wmvcore-WMCreateSyncReaderPriv/definition +++ b/patches/wmvcore-WMCreateSyncReaderPriv/definition @@ -1,3 +1,2 @@ Fixes: [37327] wmvcore: Implement WMCreateSyncReaderPriv -Depends: wmvcore-WMCheckURlExtension Depends: wmvcore-WMCreateSyncReader