From 9f091b033c2ae710a5a5e5a197f164f9fead7a60 Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Sat, 4 Apr 2015 22:17:38 +0200 Subject: [PATCH] Added patch to ignore unsupported job object restrictions. --- README.md | 3 ++- debian/changelog | 1 + patches/patchinstall.sh | 3 +++ ...TUS_SUCCESS-from-SetInformationJobOb.patch | 26 +++++++++++++++++++ patches/server-JobObjects/definition | 1 + 5 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 patches/server-JobObjects/0006-ntdll-Return-STATUS_SUCCESS-from-SetInformationJobOb.patch diff --git a/README.md b/README.md index a75a083b..2e0d7960 100644 --- a/README.md +++ b/README.md @@ -39,7 +39,7 @@ Wine. All those differences are also documented on the Included bug fixes and improvements ----------------------------------- -**Bug fixes and features included in the next upcoming release [19]:** +**Bug fixes and features included in the next upcoming release [20]:** * Add stub fltmgr.sys (filter manager driver) ([Wine Bug #23583](https://bugs.winehq.org/show_bug.cgi?id=23583)) * Add stub for ntoskrnl.PsRemoveLoadImageNotifyRoutine @@ -52,6 +52,7 @@ Included bug fixes and improvements * Fix device paths in HKLM\SYSTEM\MountedDevices ([Wine Bug #38235](https://bugs.winehq.org/show_bug.cgi?id=38235)) * Fix handling of ANSI NTLM credentials ([Wine Bug #37063](https://bugs.winehq.org/show_bug.cgi?id=37063)) * Fix invalid memory access in get_registry_locale_info ([Wine Bug #38344](https://bugs.winehq.org/show_bug.cgi?id=38344)) +* Ignore unsupported job object restrictions ([Wine Bug #38351](https://bugs.winehq.org/show_bug.cgi?id=38351)) * Implement DDENUMSURFACES_CANBECREATED in IDirectDraw7::EnumSurfaces ([Wine Bug #17233](https://bugs.winehq.org/show_bug.cgi?id=17233)) * Implement empty enumerator for IWiaDevMgr::EnumDeviceInfo ([Wine Bug #27775](https://bugs.winehq.org/show_bug.cgi?id=27775)) * Implement mscoree._CorValidateImage for mono runtime diff --git a/debian/changelog b/debian/changelog index 68076e10..9141af75 100644 --- a/debian/changelog +++ b/debian/changelog @@ -21,6 +21,7 @@ wine-staging (1.7.40) UNRELEASED; urgency=low * Added patch to fix invalid memory access in get_registry_locale_info. * Added patch to allow to open files/directories without any access rights in order to query attributes. * Added patch to implement DDENUMSURFACES_CANBECREATED in IDirectDraw7::EnumSurfaces and fix some bugs. + * Added patch to ignore unsupported job object restrictions. * Removed patch to fix regression causing black screen on startup (accepted upstream). * Removed patch to fix edge cases in TOOLTIPS_GetTipText (fixed upstream). * Removed patch for IConnectionPoint/INetworkListManagerEvents stub interface (accepted upstream). diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index cfcd09a6..bc608497 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -3947,6 +3947,7 @@ fi # | # | This patchset fixes the following Wine bugs: # | * [#33723] EA Origin needs support for job objects +# | * [#38351] Ignore unsupported job object restrictions # | # | Modified files: # | * dlls/kernel32/tests/process.c, dlls/ntdll/sync.c, server/process.c, server/process.h, server/protocol.def @@ -3957,12 +3958,14 @@ if test "$enable_server_JobObjects" -eq 1; then patch_apply server-JobObjects/0003-kernel32-tests-Add-tests-for-waiting-on-an-job-objec.patch patch_apply server-JobObjects/0004-server-Implement-waiting-for-job-objects.patch patch_apply server-JobObjects/0005-ntdll-Implement-NtQueryInformationJobObject-stub-fun.patch + patch_apply server-JobObjects/0006-ntdll-Return-STATUS_SUCCESS-from-SetInformationJobOb.patch ( echo '+ { "Andrew Cook", "server: Implement remaining wineserver calls for job objects.", 1 },'; echo '+ { "Andrew Cook", "server: Implement JOB_OBJECT_LIMIT_KILL_ON_JOB_CLOSE.", 1 },'; echo '+ { "Sebastian Lackner", "kernel32/tests: Add tests for waiting on an job object.", 1 },'; echo '+ { "Sebastian Lackner", "server: Implement waiting for job objects.", 1 },'; echo '+ { "Sebastian Lackner", "ntdll: Implement NtQueryInformationJobObject stub function.", 1 },'; + echo '+ { "Andrew Cook", "ntdll: Return STATUS_SUCCESS from SetInformationJobObject.", 1 },'; ) >> "$patchlist" fi diff --git a/patches/server-JobObjects/0006-ntdll-Return-STATUS_SUCCESS-from-SetInformationJobOb.patch b/patches/server-JobObjects/0006-ntdll-Return-STATUS_SUCCESS-from-SetInformationJobOb.patch new file mode 100644 index 00000000..595f777f --- /dev/null +++ b/patches/server-JobObjects/0006-ntdll-Return-STATUS_SUCCESS-from-SetInformationJobOb.patch @@ -0,0 +1,26 @@ +From 2e080477fe74a95265befb02dee6bd1c07d712cc Mon Sep 17 00:00:00 2001 +From: Andrew Cook +Date: Sat, 4 Apr 2015 18:02:53 +1100 +Subject: ntdll: Return STATUS_SUCCESS from SetInformationJobObject + +Fixes #38351 +--- + dlls/ntdll/sync.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c +index 5d1c5f2..8566799 100644 +--- a/dlls/ntdll/sync.c ++++ b/dlls/ntdll/sync.c +@@ -728,7 +728,7 @@ NTSTATUS WINAPI NtSetInformationJobObject( HANDLE handle, JOBOBJECTINFOCLASS cla + + default: + FIXME( "stub: %p %u %p %u\n", handle, class, info, len ); +- return STATUS_NOT_IMPLEMENTED; ++ return STATUS_SUCCESS; + } + + return status; +-- +2.3.3 + diff --git a/patches/server-JobObjects/definition b/patches/server-JobObjects/definition index 8870a451..c59528aa 100644 --- a/patches/server-JobObjects/definition +++ b/patches/server-JobObjects/definition @@ -1,6 +1,7 @@ Fixes: [33723] EA Origin needs support for job objects Fixes: Properly track handle count of wineserver objects Fixes: Python PIP needs better NtQueryInformationJobObject stub +Fixes: [38351] Ignore unsupported job object restrictions Depends: kernel32-Console_Handles Depends: server-OpenProcess Depends: server-Misc_ACL