diff --git a/patches/ntdll-NtSetLdtEntries/0002-libs-wine-Allow-to-modify-reserved-LDT-entries.patch b/patches/ntdll-NtSetLdtEntries/0002-libs-wine-Allow-to-modify-reserved-LDT-entries.patch index 90ee9995..9a4adcb0 100644 --- a/patches/ntdll-NtSetLdtEntries/0002-libs-wine-Allow-to-modify-reserved-LDT-entries.patch +++ b/patches/ntdll-NtSetLdtEntries/0002-libs-wine-Allow-to-modify-reserved-LDT-entries.patch @@ -1,4 +1,4 @@ -From c7ec3f3bd55bbe998a09097ad0dfbcc6df3392db Mon Sep 17 00:00:00 2001 +From 09846b453dae490f5496a6ca2ac110b712542357 Mon Sep 17 00:00:00 2001 From: Dmitry Timoshkov Date: Thu, 28 Apr 2016 17:01:16 +0200 Subject: [PATCH] libs/wine: Allow to modify reserved LDT entries. @@ -43,17 +43,17 @@ index ae67a9aa0a0..6149be8cf4a 100644 } } diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c -index eb28d668279..9c629469843 100644 +index 98ce76c8e27..e31c3d6b0b8 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c -@@ -2553,8 +2553,6 @@ NTSTATUS get_thread_ldt_entry( HANDLE handle, void *data, ULONG len, ULONG *ret_ - NTSTATUS WINAPI NtSetLdtEntries( ULONG sel1, LDT_ENTRY entry1, ULONG sel2, LDT_ENTRY entry2 ) - { +@@ -2534,8 +2534,6 @@ NTSTATUS WINAPI NtSetLdtEntries( ULONG sel1, LDT_ENTRY entry1, ULONG sel2, LDT_E + sigset_t sigset; + if (sel1 >> 16 || sel2 >> 16) return STATUS_INVALID_LDT_DESCRIPTOR; - if (sel1 && (sel1 >> 3) < first_ldt_entry) return STATUS_INVALID_LDT_DESCRIPTOR; - if (sel2 && (sel2 >> 3) < first_ldt_entry) return STATUS_INVALID_LDT_DESCRIPTOR; - ldt_lock(); + server_enter_uninterrupted_section( &ldt_section, &sigset ); if (sel1) ldt_set_entry( sel1, entry1 ); diff --git a/libs/wine/ldt.c b/libs/wine/ldt.c index 18b0b9be9bf..30d9b945f73 100644 diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index 0df933be..1448e429 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -52,7 +52,7 @@ usage() # Get the upstream commit sha upstream_commit() { - echo "7ccc45f754a39a425ecc2358a4cfc5675ff11ffb" + echo "cf8a6eb2769d2c4ba5bb837d29db89f6b88706ae" } # Show version information diff --git a/patches/windowscodecs-TIFF_Support/0017-gdiplus-tests-Add-some-tests-for-loading-TIFF-images.patch b/patches/windowscodecs-TIFF_Support/0017-gdiplus-tests-Add-some-tests-for-loading-TIFF-images.patch index 90a0bbd4..07741594 100644 --- a/patches/windowscodecs-TIFF_Support/0017-gdiplus-tests-Add-some-tests-for-loading-TIFF-images.patch +++ b/patches/windowscodecs-TIFF_Support/0017-gdiplus-tests-Add-some-tests-for-loading-TIFF-images.patch @@ -1,4 +1,4 @@ -From 79d25c2b499fb98239acd7cc0af19bb0eee7577c Mon Sep 17 00:00:00 2001 +From 82ac8d6c986a16e4dfe07d53403f5636c9ee8d33 Mon Sep 17 00:00:00 2001 From: Dmitry Timoshkov Date: Fri, 16 Dec 2016 18:10:30 +0800 Subject: [PATCH] gdiplus/tests: Add some tests for loading TIFF images in @@ -9,10 +9,10 @@ Subject: [PATCH] gdiplus/tests: Add some tests for loading TIFF images in 1 file changed, 181 insertions(+) diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c -index cb7de3009..a1b141223 100644 +index f63346e1dbf..9fcd66640e8 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c -@@ -5525,6 +5525,186 @@ static void test_graphics_clear(void) +@@ -5901,6 +5901,186 @@ static void test_graphics_clear(void) GdipDisposeImage((GpImage *)bitmap); } @@ -199,14 +199,14 @@ index cb7de3009..a1b141223 100644 START_TEST(image) { HMODULE mod = GetModuleHandleA("gdiplus.dll"); -@@ -5549,6 +5729,7 @@ START_TEST(image) +@@ -5925,6 +6105,7 @@ START_TEST(image) pGdipBitmapGetHistogram = (void*)GetProcAddress(mod, "GdipBitmapGetHistogram"); pGdipImageSetAbort = (void*)GetProcAddress(mod, "GdipImageSetAbort"); + test_tiff_color_formats(); test_GdipInitializePalette(); test_png_color_formats(); - test_supported_encoders(); + test_png_save_palette(); -- -2.24.0 +2.26.2