This is an automated email from the git hooks/post-receive script. mgilbert pushed a commit to branch upstream-stable in repository wine.
commit 4056837b71d60197f4734c38bee8800eed9fb157 Author: Austin English <austinengl...@gmail.com> Date: Thu Apr 20 18:26:14 2017 +0200 ntoskrnl.exe: Add IoReportResourceForDetection stub. Signed-off-by: Austin English <austinengl...@gmail.com> Signed-off-by: Sebastian Lackner <sebast...@fds-team.de> Signed-off-by: Alexandre Julliard <julli...@winehq.org> (cherry picked from commit 18c94886d7ca3f5c9df71e0b6268b3114ada25e6) Signed-off-by: Michael Stefaniuc <mstef...@winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 14 ++++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index b3db46c..c2d3127 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -1453,6 +1453,20 @@ VOID WINAPI IoUnregisterShutdownNotification( PDEVICE_OBJECT obj ) /*********************************************************************** + * IoReportResourceForDetection (NTOSKRNL.EXE.@) + */ +NTSTATUS WINAPI IoReportResourceForDetection( DRIVER_OBJECT *drv_obj, CM_RESOURCE_LIST *drv_list, ULONG drv_size, + DEVICE_OBJECT *dev_obj, CM_RESOURCE_LIST *dev_list, ULONG dev_size, + BOOLEAN *conflict ) +{ + FIXME( "(%p, %p, %u, %p, %p, %u, %p): stub\n", drv_obj, drv_list, drv_size, + dev_obj, dev_list, dev_size, conflict ); + + return STATUS_NOT_IMPLEMENTED; +} + + +/*********************************************************************** * IoReportResourceUsage (NTOSKRNL.EXE.@) */ NTSTATUS WINAPI IoReportResourceUsage(PUNICODE_STRING name, PDRIVER_OBJECT drv_obj, PCM_RESOURCE_LIST drv_list, diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 7416740..cb92d80 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -440,7 +440,7 @@ @ stub IoRemoveShareAccess @ stub IoReportDetectedDevice @ stub IoReportHalResourceUsage -@ stub IoReportResourceForDetection +@ stdcall IoReportResourceForDetection(ptr ptr long ptr ptr long ptr) @ stdcall IoReportResourceUsage(ptr ptr ptr long ptr ptr long long ptr) @ stub IoReportTargetDeviceChange @ stub IoReportTargetDeviceChangeAsynchronous -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wine/wine.git _______________________________________________ pkg-wine-party mailing list pkg-wine-party@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-wine-party