From b5a7498b865b85579e637c41c11a6d398c6b7f2c Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Fri, 27 Mar 2015 08:18:24 +0100 Subject: [PATCH] Added patch to avoid spam of FIXME messages for PsLookupProcessByProcessId stub. --- README.md | 3 +- debian/changelog | 1 + ...epeated-FIXME-messages-in-PsLookupPr.patch | 27 ++++++++++ .../definition | 1 + patches/patchinstall.sh | 49 +++++++++++++------ 5 files changed, 65 insertions(+), 16 deletions(-) create mode 100644 patches/ntoskrnl-PsLookupProcessByProcessId/0001-ntoskrnl-Avoid-repeated-FIXME-messages-in-PsLookupPr.patch create mode 100644 patches/ntoskrnl-PsLookupProcessByProcessId/definition diff --git a/README.md b/README.md index 5c99b380..6c948633 100644 --- a/README.md +++ b/README.md @@ -38,9 +38,10 @@ Wine. All those differences are also documented on the Included bug fixes and improvements =================================== -**Bugfixes and features included in the next upcoming release [1]:** +**Bugfixes and features included in the next upcoming release [2]:** * Add stubs for Power[Set|Clear]Request +* Avoid spam of FIXME messages for PsLookupProcessByProcessId stub ([Wine Bug #36821](https://bugs.winehq.org/show_bug.cgi?id=36821)) **Bugs fixed in Wine Staging 1.7.39 [205]:** diff --git a/debian/changelog b/debian/changelog index f11bbf4f..1d9877fa 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ wine-staging (1.7.40) UNRELEASED; urgency=low * Update dsound fast mixer patchset to use integer math. * Added patch with stubs for Power[Set|Clear]Request. + * Added patch to avoid spam of FIXME messages for PsLookupProcessByProcessId stub. * 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/ntoskrnl-PsLookupProcessByProcessId/0001-ntoskrnl-Avoid-repeated-FIXME-messages-in-PsLookupPr.patch b/patches/ntoskrnl-PsLookupProcessByProcessId/0001-ntoskrnl-Avoid-repeated-FIXME-messages-in-PsLookupPr.patch new file mode 100644 index 00000000..4771fbe3 --- /dev/null +++ b/patches/ntoskrnl-PsLookupProcessByProcessId/0001-ntoskrnl-Avoid-repeated-FIXME-messages-in-PsLookupPr.patch @@ -0,0 +1,27 @@ +From 7c0c2b354c261c898ac9acfea575cc022a1bbb34 Mon Sep 17 00:00:00 2001 +From: Sebastian Lackner +Date: Fri, 27 Mar 2015 08:15:14 +0100 +Subject: ntoskrnl: Avoid repeated FIXME messages in + PsLookupProcessByProcessId. + +--- + dlls/ntoskrnl.exe/ntoskrnl.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c +index 95dcdc9..bb26424 100644 +--- a/dlls/ntoskrnl.exe/ntoskrnl.c ++++ b/dlls/ntoskrnl.exe/ntoskrnl.c +@@ -1885,7 +1885,8 @@ NTSTATUS WINAPI PsSetLoadImageNotifyRoutine(PLOAD_IMAGE_NOTIFY_ROUTINE routine) + */ + NTSTATUS WINAPI PsLookupProcessByProcessId(HANDLE processid, PEPROCESS *process) + { +- FIXME("(%p %p) stub\n", processid, process); ++ static int once; ++ if (!once++) FIXME("(%p %p) stub\n", processid, process); + return STATUS_NOT_IMPLEMENTED; + } + +-- +2.3.3 + diff --git a/patches/ntoskrnl-PsLookupProcessByProcessId/definition b/patches/ntoskrnl-PsLookupProcessByProcessId/definition new file mode 100644 index 00000000..4079ffef --- /dev/null +++ b/patches/ntoskrnl-PsLookupProcessByProcessId/definition @@ -0,0 +1 @@ +Fixes: [36821] Avoid spam of FIXME messages for PsLookupProcessByProcessId stub diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index 1bd15f35..29008d01 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -154,6 +154,7 @@ patch_enable_all () enable_ntdll_WriteWatches="$1" enable_ntoskrnl_DriverTest="$1" enable_ntoskrnl_Emulator="$1" + enable_ntoskrnl_PsLookupProcessByProcessId="$1" enable_ntoskrnl_Stubs="$1" enable_nvapi_Stub_DLL="$1" enable_nvcuda_CUDA_Support="$1" @@ -516,6 +517,9 @@ patch_enable () ntoskrnl-Emulator) enable_ntoskrnl_Emulator="$2" ;; + ntoskrnl-PsLookupProcessByProcessId) + enable_ntoskrnl_PsLookupProcessByProcessId="$2" + ;; ntoskrnl-Stubs) enable_ntoskrnl_Stubs="$2" ;; @@ -3265,6 +3269,21 @@ if test "$enable_ntoskrnl_Emulator" -eq 1; then ) >> "$patchlist" fi +# Patchset ntoskrnl-PsLookupProcessByProcessId +# | +# | This patchset fixes the following Wine bugs: +# | * [#36821] Avoid spam of FIXME messages for PsLookupProcessByProcessId stub +# | +# | Modified files: +# | * dlls/ntoskrnl.exe/ntoskrnl.c +# | +if test "$enable_ntoskrnl_PsLookupProcessByProcessId" -eq 1; then + patch_apply ntoskrnl-PsLookupProcessByProcessId/0001-ntoskrnl-Avoid-repeated-FIXME-messages-in-PsLookupPr.patch + ( + echo '+ { "Sebastian Lackner", "ntoskrnl: Avoid repeated FIXME messages in PsLookupProcessByProcessId.", 1 },'; + ) >> "$patchlist" +fi + # Patchset ntoskrnl-Stubs # | # | This patchset fixes the following Wine bugs: @@ -3624,21 +3643,6 @@ if test "$enable_server_CreateProcess_ACLs" -eq 1; then ) >> "$patchlist" fi -# Patchset server-OpenProcess -# | -# | This patchset fixes the following Wine bugs: -# | * [#37087] Return an error when trying to open a terminated process -# | -# | Modified files: -# | * server/process.c, server/process.h -# | -if test "$enable_server_OpenProcess" -eq 1; then - patch_apply server-OpenProcess/0001-server-Return-error-when-opening-a-terminating-proce.patch - ( - echo '+ { "Michael Müller", "server: Return error when opening a terminating process.", 3 },'; - ) >> "$patchlist" -fi - # Patchset server-Misc_ACL # | # | This patchset fixes the following Wine bugs: @@ -3656,6 +3660,21 @@ if test "$enable_server_Misc_ACL" -eq 1; then ) >> "$patchlist" fi +# Patchset server-OpenProcess +# | +# | This patchset fixes the following Wine bugs: +# | * [#37087] Return an error when trying to open a terminated process +# | +# | Modified files: +# | * server/process.c, server/process.h +# | +if test "$enable_server_OpenProcess" -eq 1; then + patch_apply server-OpenProcess/0001-server-Return-error-when-opening-a-terminating-proce.patch + ( + echo '+ { "Michael Müller", "server: Return error when opening a terminating process.", 3 },'; + ) >> "$patchlist" +fi + # Patchset server-JobObjects # | # | This patchset fixes the following Wine bugs: