From a6bdf0d803c57922d0020bab4b9432bb135523fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Fri, 3 Apr 2015 17:13:12 +0200 Subject: [PATCH] Added patch to stub ntoskrnl.PsRemoveLoadImageNotifyRoutine. --- README.md | 3 +- debian/changelog | 1 + ...-stub-for-PsRemoveLoadImageNotifyRou.patch | 46 +++++++++++++++++++ patches/ntoskrnl-Stubs/definition | 1 + patches/patchinstall.sh | 2 + 5 files changed, 52 insertions(+), 1 deletion(-) create mode 100644 patches/ntoskrnl-Stubs/0017-ntoskrnl.exe-Add-stub-for-PsRemoveLoadImageNotifyRou.patch diff --git a/README.md b/README.md index fe689c1a..34b7b8a9 100644 --- a/README.md +++ b/README.md @@ -39,9 +39,10 @@ Wine. All those differences are also documented on the Included bug fixes and improvements ----------------------------------- -**Bug fixes and features included in the next upcoming release [15]:** +**Bug fixes and features included in the next upcoming release [16]:** * Add stub fltmgr.sys (filter manager driver) ([Wine Bug #23583](https://bugs.winehq.org/show_bug.cgi?id=23583)) +* Add stub for ntoskrnl.PsRemoveLoadImageNotifyRoutine * 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)) * Don't return an error in WS_select when EINTR happens during timeout diff --git a/debian/changelog b/debian/changelog index 34718f40..5f497ae8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -17,6 +17,7 @@ wine-staging (1.7.40) UNRELEASED; urgency=low * Added patch to implement support for linux priority levels (by Joakim Hernberg, various modifications by Sebastian Lackner). * Added patch to implement mscoree._CorValidateImage for mono runtime. * Added patch to implement proper handling of CLI .NET images in Wine library loader. + * Added patch to stub ntoskrnl.PsRemoveLoadImageNotifyRoutine * 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-Stubs/0017-ntoskrnl.exe-Add-stub-for-PsRemoveLoadImageNotifyRou.patch b/patches/ntoskrnl-Stubs/0017-ntoskrnl.exe-Add-stub-for-PsRemoveLoadImageNotifyRou.patch new file mode 100644 index 00000000..011f55c6 --- /dev/null +++ b/patches/ntoskrnl-Stubs/0017-ntoskrnl.exe-Add-stub-for-PsRemoveLoadImageNotifyRou.patch @@ -0,0 +1,46 @@ +From b103fd3f5b4d21c2ac6e1e0039ff898a2ad7dcb4 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Michael=20M=C3=BCller?= +Date: Fri, 3 Apr 2015 17:08:20 +0200 +Subject: ntoskrnl.exe: Add stub for PsRemoveLoadImageNotifyRoutine. + +--- + dlls/ntoskrnl.exe/ntoskrnl.c | 9 +++++++++ + dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- + 2 files changed, 10 insertions(+), 1 deletion(-) + +diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c +index 179da4e..10f8c44 100644 +--- a/dlls/ntoskrnl.exe/ntoskrnl.c ++++ b/dlls/ntoskrnl.exe/ntoskrnl.c +@@ -2022,6 +2022,15 @@ NTSTATUS WINAPI IoWMIRegistrationControl(PDEVICE_OBJECT DeviceObject, ULONG Acti + } + + /***************************************************** ++ * PsRemoveLoadImageNotifyRoutine (NTOSKRNL.EXE.@) ++ */ ++NTSTATUS WINAPI PsRemoveLoadImageNotifyRoutine(PLOAD_IMAGE_NOTIFY_ROUTINE routine) ++{ ++ FIXME("(%p) stub\n", routine); ++ return STATUS_SUCCESS; ++} ++ ++/***************************************************** + * PsSetLoadImageNotifyRoutine (NTOSKRNL.EXE.@) + */ + NTSTATUS WINAPI PsSetLoadImageNotifyRoutine(PLOAD_IMAGE_NOTIFY_ROUTINE routine) +diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +index e206bac..1914b7f 100644 +--- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec ++++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +@@ -899,7 +899,7 @@ + @ stub PsReferenceImpersonationToken + @ stub PsReferencePrimaryToken + @ stub PsRemoveCreateThreadNotifyRoutine +-@ stub PsRemoveLoadImageNotifyRoutine ++@ stdcall PsRemoveLoadImageNotifyRoutine(ptr) + @ stub PsRestoreImpersonation + @ stub PsReturnPoolQuota + @ stub PsReturnProcessNonPagedPoolQuota +-- +2.1.0 + diff --git a/patches/ntoskrnl-Stubs/definition b/patches/ntoskrnl-Stubs/definition index 36b1f50a..70767005 100644 --- a/patches/ntoskrnl-Stubs/definition +++ b/patches/ntoskrnl-Stubs/definition @@ -10,3 +10,4 @@ Fixes: Add stub for ntoskrnl.ExDeleteResourceLite Fixes: Add stub for ntoskrnl.Mm{Map,Unmap}LockedPages Fixes: Implement ntoskrnl.KeInitializeMutex Fixes: [38103] Process Hacker 2.x needs ntoskrnl.ProbeForRead +Fixes: Add stub for ntoskrnl.PsRemoveLoadImageNotifyRoutine diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index 1221b260..e3fa3cca 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -3472,6 +3472,7 @@ if test "$enable_ntoskrnl_Stubs" -eq 1; then patch_apply ntoskrnl-Stubs/0014-ntoskrnl.exe-Implement-KeInitializeMutex.patch patch_apply ntoskrnl-Stubs/0015-ntoskrnl.exe-Add-stub-for-ProbeForRead.patch patch_apply ntoskrnl-Stubs/0016-ntoskrnl.exe-Add-stub-for-ProbeForWrite.patch + patch_apply ntoskrnl-Stubs/0017-ntoskrnl.exe-Add-stub-for-PsRemoveLoadImageNotifyRou.patch ( echo '+ { "Austin English", "ntoskrnl.exe: add KeWaitForMultipleObjects stub.", 1 },'; echo '+ { "Alexander Morozov", "ntoskrnl.exe: Add stub for IoGetAttachedDeviceReference.", 1 },'; @@ -3489,6 +3490,7 @@ if test "$enable_ntoskrnl_Stubs" -eq 1; then echo '+ { "Alexander Morozov", "ntoskrnl.exe: Implement KeInitializeMutex.", 1 },'; echo '+ { "Austin English", "ntoskrnl.exe: Add stub for ProbeForRead.", 1 },'; echo '+ { "Sebastian Lackner", "ntoskrnl.exe: Add stub for ProbeForWrite.", 1 },'; + echo '+ { "Michael Müller", "ntoskrnl.exe: Add stub for PsRemoveLoadImageNotifyRoutine.", 1 },'; ) >> "$patchlist" fi