diff --git a/README.md b/README.md index 0ca701f9..0ce6ac27 100644 --- a/README.md +++ b/README.md @@ -39,10 +39,9 @@ Wine. All those differences are also documented on the Included bug fixes and improvements =================================== -**Bugfixes and features included in the next upcoming release [19]:** +**Bugfixes and features included in the next upcoming release [18]:** * Add stub for NtSetLdtEntries/ZwSetLdtEntries ([Wine Bug #26268](https://bugs.winehq.org/show_bug.cgi?id=26268)) -* Add stubs for vectored continue handler ([Wine Bug #30572](https://bugs.winehq.org/show_bug.cgi?id=30572)) * Allow NULL pointer for optional arguments of D3DXIntersectTri ([Wine Bug #35133](https://bugs.winehq.org/show_bug.cgi?id=35133)) * Allow selection of audio device for PulseAudio backend * Avoid crashing when broken app tries to release surface although refcount is zero ([Wine Bug #18477](https://bugs.winehq.org/show_bug.cgi?id=18477)) diff --git a/debian/changelog b/debian/changelog index 6f721bb6..348bf158 100644 --- a/debian/changelog +++ b/debian/changelog @@ -30,6 +30,7 @@ wine-compholio (1.7.31) UNRELEASED; urgency=low * Removed patch to silence repeated GSUB_apply_ChainContext[Subst|Pos] FIXMEs (accepted upstream). * Removed patch with additional tests for MsgWaitForMultipleObjectsEx (accepted upstream). * Removed patches for D3DXCreatePolygon (accepted upstream). + * Removed patches vor vectored continue handler stubs (accepted upstream). * Partially removed patches for UTF-7 tests (accepted upstream). * Partially removed patches for WS_SO_CONNECT_TIME (accepted upstream). -- Sebastian Lackner Mon, 03 Nov 2014 20:10:04 +0100 diff --git a/patches/Makefile b/patches/Makefile index caa9cc6d..bb840165 100644 --- a/patches/Makefile +++ b/patches/Makefile @@ -67,7 +67,6 @@ PATCHLIST := \ ntdll-NtSetLdtEntries.ok \ ntdll-Pipe_SpecialCharacters.ok \ ntdll-ThreadTime.ok \ - ntdll-Vectored_Continue_Handler.ok \ ntdll-WRITECOPY.ok \ ntoskrnl-Emulator.ok \ ntoskrnl-IoCsqInitialize.ok \ @@ -1093,24 +1092,6 @@ ntdll-ThreadTime.ok: echo '+ { "ntdll-ThreadTime", "Sebastian Lackner", "Return correct values in GetThreadTimes() for all threads." },'; \ ) > ntdll-ThreadTime.ok -# Patchset ntdll-Vectored_Continue_Handler -# | -# | Included patches: -# | * Add stubs for vectored continue handler. [by Austin English] -# | -# | This patchset fixes the following Wine bugs: -# | * [#30572] Add stubs for vectored continue handler -# | -# | Modified files: -# | * dlls/kernel32/kernel32.spec, dlls/ntdll/exception.c, dlls/ntdll/ntdll.spec -# | -.INTERMEDIATE: ntdll-Vectored_Continue_Handler.ok -ntdll-Vectored_Continue_Handler.ok: - $(call APPLY_FILE,ntdll-Vectored_Continue_Handler/0001-ntdll-Add-stubs-for-vectored-continue-handler.patch) - @( \ - echo '+ { "ntdll-Vectored_Continue_Handler", "Austin English", "Add stubs for vectored continue handler." },'; \ - ) > ntdll-Vectored_Continue_Handler.ok - # Patchset ntdll-WRITECOPY # | # | Included patches: diff --git a/patches/ntdll-Exception/0001-ntdll-Throw-exception-if-invalid-handle-is-passed-to.patch b/patches/ntdll-Exception/0001-ntdll-Throw-exception-if-invalid-handle-is-passed-to.patch index 0df6ce9e..96f185ff 100644 --- a/patches/ntdll-Exception/0001-ntdll-Throw-exception-if-invalid-handle-is-passed-to.patch +++ b/patches/ntdll-Exception/0001-ntdll-Throw-exception-if-invalid-handle-is-passed-to.patch @@ -1,4 +1,4 @@ -From 05a69d408bc84fa489f297973e3a0ab384dad635 Mon Sep 17 00:00:00 2001 +From 63e3716b712d4ad9e811fe550906f72ec916a813 Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Sun, 28 Sep 2014 22:42:46 +0200 Subject: ntdll: Throw exception if invalid handle is passed to NtClose and @@ -62,7 +62,7 @@ index 47a2614..bcc6d69 100644 } diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c -index 2074f0a..bc36242 100644 +index a94ed3a..4df8fe5 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -51,6 +51,7 @@ static NTSTATUS (WINAPI *pNtTerminateProcess)(HANDLE handle, LONG exit_code); @@ -91,9 +91,10 @@ index 2074f0a..bc36242 100644 ok(FALSE, "unexpected stage %x\n", stage); @@ -1788,6 +1799,53 @@ static void test_ripevent(DWORD numexc) + pRtlRemoveVectoredExceptionHandler(vectored_handler); } - ++ +static DWORD invalid_handle_exceptions; + +static LONG CALLBACK invalid_handle_vectored_handler(EXCEPTION_POINTERS *ExceptionInfo) @@ -140,11 +141,10 @@ index 2074f0a..bc36242 100644 + + pRtlRemoveVectoredExceptionHandler(vectored_handler); +} -+ + #endif /* defined(__i386__) || defined(__x86_64__) */ + START_TEST(exception) - { - HMODULE hntdll = GetModuleHandleA("ntdll.dll"); -@@ -1802,6 +1860,7 @@ START_TEST(exception) +@@ -1804,6 +1862,7 @@ START_TEST(exception) pNtGetContextThread = (void *)GetProcAddress( hntdll, "NtGetContextThread" ); pNtSetContextThread = (void *)GetProcAddress( hntdll, "NtSetContextThread" ); pNtReadVirtualMemory = (void *)GetProcAddress( hntdll, "NtReadVirtualMemory" ); @@ -152,7 +152,7 @@ index 2074f0a..bc36242 100644 pRtlUnwind = (void *)GetProcAddress( hntdll, "RtlUnwind" ); pRtlRaiseException = (void *)GetProcAddress( hntdll, "RtlRaiseException" ); pNtTerminateProcess = (void *)GetProcAddress( hntdll, "NtTerminateProcess" ); -@@ -1865,6 +1924,10 @@ START_TEST(exception) +@@ -1867,6 +1926,10 @@ START_TEST(exception) test_ripevent(0); test_stage = 6; test_ripevent(1); @@ -163,7 +163,7 @@ index 2074f0a..bc36242 100644 } else skip( "RtlRaiseException not found\n" ); -@@ -1878,6 +1941,7 @@ START_TEST(exception) +@@ -1880,6 +1943,7 @@ START_TEST(exception) test_rtlraiseexception(); test_outputdebugstring(1, FALSE); test_ripevent(1); @@ -171,7 +171,7 @@ index 2074f0a..bc36242 100644 test_debugger(); test_simd_exceptions(); test_fpu_exceptions(); -@@ -1896,6 +1960,7 @@ START_TEST(exception) +@@ -1898,6 +1962,7 @@ START_TEST(exception) test_outputdebugstring(1, FALSE); test_ripevent(1); @@ -180,5 +180,5 @@ index 2074f0a..bc36242 100644 if (pRtlAddFunctionTable && pRtlDeleteFunctionTable && pRtlInstallFunctionTableCallback && pRtlLookupFunctionEntry) -- -2.1.1 +2.1.3 diff --git a/patches/ntdll-Vectored_Continue_Handler/0001-ntdll-Add-stubs-for-vectored-continue-handler.patch b/patches/ntdll-Vectored_Continue_Handler/0001-ntdll-Add-stubs-for-vectored-continue-handler.patch deleted file mode 100644 index df100b5b..00000000 --- a/patches/ntdll-Vectored_Continue_Handler/0001-ntdll-Add-stubs-for-vectored-continue-handler.patch +++ /dev/null @@ -1,85 +0,0 @@ -From 17db3489b11f75799b68551796038482110b2bf9 Mon Sep 17 00:00:00 2001 -From: Austin English -Date: Sat, 8 Nov 2014 07:14:26 +0100 -Subject: ntdll: Add stubs for vectored continue handler. - ---- - dlls/kernel32/kernel32.spec | 2 ++ - dlls/ntdll/exception.c | 20 ++++++++++++++++++++ - dlls/ntdll/ntdll.spec | 2 ++ - 3 files changed, 24 insertions(+) - -diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec -index 2b01df1..c072780 100644 ---- a/dlls/kernel32/kernel32.spec -+++ b/dlls/kernel32/kernel32.spec -@@ -143,6 +143,7 @@ - # @ stub AddLocalAlternateComputerNameA - # @ stub AddLocalAlternateComputerNameW - @ stdcall AddRefActCtx(ptr) -+@ stdcall AddVectoredContinueHandler(long ptr) ntdll.RtlAddVectoredContinueHandler - @ stdcall AddVectoredExceptionHandler(long ptr) ntdll.RtlAddVectoredExceptionHandler - @ stdcall AllocConsole() - @ stub -i386 AllocLSCallback -@@ -1026,6 +1027,7 @@ - @ stdcall RemoveDirectoryW(wstr) - # @ stub RemoveLocalAlternateComputerNameA - # @ stub RemoveLocalAlternateComputerNameW -+@ stdcall RemoveVectoredContinueHandler(ptr) ntdll.RtlRemoveVectoredContinueHandler - @ stdcall RemoveVectoredExceptionHandler(ptr) ntdll.RtlRemoveVectoredExceptionHandler - @ stdcall ReplaceFile(wstr wstr wstr long ptr ptr) ReplaceFileW - @ stdcall ReplaceFileA(str str str long ptr ptr) -diff --git a/dlls/ntdll/exception.c b/dlls/ntdll/exception.c -index 31d5edd..37edc77 100644 ---- a/dlls/ntdll/exception.c -+++ b/dlls/ntdll/exception.c -@@ -224,6 +224,26 @@ void WINAPI RtlRaiseStatus( NTSTATUS status ) - - - /******************************************************************* -+ * RtlAddVectoredContinueHandler (NTDLL.@) -+ */ -+PVOID WINAPI RtlAddVectoredContinueHandler( ULONG first, PVECTORED_EXCEPTION_HANDLER func ) -+{ -+ FIXME("%u %p stub\n", first, func); -+ return NULL; -+} -+ -+ -+/******************************************************************* -+ * RtlRemoveVectoredContinueHandler (NTDLL.@) -+ */ -+ULONG WINAPI RtlRemoveVectoredContinueHandler( PVOID handler ) -+{ -+ FIXME("%p stub\n", handler); -+ return FALSE; -+} -+ -+ -+/******************************************************************* - * RtlAddVectoredExceptionHandler (NTDLL.@) - */ - PVOID WINAPI RtlAddVectoredExceptionHandler( ULONG first, PVECTORED_EXCEPTION_HANDLER func ) -diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec -index 5bac269..7e95969 100644 ---- a/dlls/ntdll/ntdll.spec -+++ b/dlls/ntdll/ntdll.spec -@@ -415,6 +415,7 @@ - @ cdecl -arch=arm,x86_64 RtlAddFunctionTable(ptr long long) - @ stdcall RtlAddRefActivationContext(ptr) - # @ stub RtlAddRefMemoryStream -+@ stdcall RtlAddVectoredContinueHandler(long ptr) - @ stdcall RtlAddVectoredExceptionHandler(long ptr) - # @ stub RtlAddressInSectionTable - @ stdcall RtlAdjustPrivilege(long long long ptr) -@@ -819,6 +820,7 @@ - @ stdcall RtlReleaseSRWLockExclusive(ptr) - @ stdcall RtlReleaseSRWLockShared(ptr) - @ stub RtlRemoteCall -+@ stdcall RtlRemoveVectoredContinueHandler(ptr) - @ stdcall RtlRemoveVectoredExceptionHandler(ptr) - @ stub RtlResetRtlTranslations - @ stdcall RtlRestoreLastWin32Error(long) RtlSetLastWin32Error --- -2.1.3 - diff --git a/patches/ntdll-Vectored_Continue_Handler/definition b/patches/ntdll-Vectored_Continue_Handler/definition deleted file mode 100644 index f7f8490a..00000000 --- a/patches/ntdll-Vectored_Continue_Handler/definition +++ /dev/null @@ -1,4 +0,0 @@ -Author: Austin English -Subject: Add stubs for vectored continue handler. -Revision: 1 -Fixes: [30572] Add stubs for vectored continue handler