May 2020 - Wine-commits - list.winehq.org

Nikolay Sivov : mfmediaengine: Create media session instance.
by Alexandre Julliard 29 May '20

29 May '20

Module: wine Branch: master Commit: f465187f411b2d0b83fee25051d6b4d2c17e4ff8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f465187f411b2d0b83fee250… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 29 21:28:38 2020 +0300 mfmediaengine: Create media session instance. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfmediaengine/Makefile.in | 2 +- dlls/mfmediaengine/main.c | 78 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 79 insertions(+), 1 deletion(-) diff --git a/dlls/mfmediaengine/Makefile.in b/dlls/mfmediaengine/Makefile.in index 292baa8001..2278e87a64 100644 --- a/dlls/mfmediaengine/Makefile.in +++ b/dlls/mfmediaengine/Makefile.in @@ -1,6 +1,6 @@ MODULE = mfmediaengine.dll IMPORTLIB = mfmediaengine -IMPORTS = mfuuid uuid +IMPORTS = mf mfuuid uuid EXTRADLLFLAGS = -mno-cygwin diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c index eef485e315..77466e9993 100644 --- a/dlls/mfmediaengine/main.c +++ b/dlls/mfmediaengine/main.c @@ -66,6 +66,7 @@ enum media_engine_flags struct media_engine { IMFMediaEngine IMFMediaEngine_iface; + IMFAsyncCallback session_events; LONG refcount; IMFMediaEngineNotify *callback; UINT64 playback_hwnd; @@ -73,6 +74,7 @@ struct media_engine IMFDXGIDeviceManager *dxgi_manager; enum media_engine_mode mode; unsigned int flags; + IMFMediaSession *session; CRITICAL_SECTION cs; }; @@ -89,6 +91,70 @@ static inline struct media_engine *impl_from_IMFMediaEngine(IMFMediaEngine *ifac return CONTAINING_RECORD(iface, struct media_engine, IMFMediaEngine_iface); } +static struct media_engine *impl_from_session_events_IMFAsyncCallback(IMFAsyncCallback *iface) +{ + return CONTAINING_RECORD(iface, struct media_engine, session_events); +} + +static HRESULT WINAPI media_engine_session_events_QueryInterface(IMFAsyncCallback *iface, REFIID riid, void **obj) +{ + if (IsEqualIID(riid, &IID_IMFAsyncCallback) || + IsEqualIID(riid, &IID_IUnknown)) + { + *obj = iface; + IMFAsyncCallback_AddRef(iface); + return S_OK; + } + + WARN("Unsupported interface %s.\n", debugstr_guid(riid)); + *obj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI media_engine_session_events_AddRef(IMFAsyncCallback *iface) +{ + struct media_engine *engine = impl_from_session_events_IMFAsyncCallback(iface); + return IMFMediaEngine_AddRef(&engine->IMFMediaEngine_iface); +} + +static ULONG WINAPI media_engine_session_events_Release(IMFAsyncCallback *iface) +{ + struct media_engine *engine = impl_from_session_events_IMFAsyncCallback(iface); + return IMFMediaEngine_Release(&engine->IMFMediaEngine_iface); +} + +static HRESULT WINAPI media_engine_session_events_GetParameters(IMFAsyncCallback *iface, DWORD *flags, DWORD *queue) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI media_engine_session_events_Invoke(IMFAsyncCallback *iface, IMFAsyncResult *result) +{ + struct media_engine *engine = impl_from_session_events_IMFAsyncCallback(iface); + IMFMediaEvent *event = NULL; + HRESULT hr; + + if (FAILED(hr = IMFMediaSession_EndGetEvent(engine->session, result, &event))) + WARN("Failed to get session event, hr %#x.\n", hr); + + if (event) + IMFMediaEvent_Release(event); + + if (FAILED(hr = IMFMediaSession_BeginGetEvent(engine->session, iface, NULL))) + WARN("Failed to subscribe to session events, hr %#x.\n", hr); + + return S_OK; +} + +static const IMFAsyncCallbackVtbl media_engine_session_events_vtbl = +{ + media_engine_session_events_QueryInterface, + media_engine_session_events_AddRef, + media_engine_session_events_Release, + media_engine_session_events_GetParameters, + media_engine_session_events_Invoke, +}; + static HRESULT WINAPI media_engine_QueryInterface(IMFMediaEngine *iface, REFIID riid, void **obj) { TRACE("(%p, %s, %p).\n", iface, debugstr_guid(riid), obj); @@ -122,6 +188,8 @@ static void free_media_engine(struct media_engine *engine) IMFMediaEngineNotify_Release(engine->callback); if (engine->dxgi_manager) IMFDXGIDeviceManager_Release(engine->dxgi_manager); + if (engine->session) + IMFMediaSession_Release(engine->session); DeleteCriticalSection(&engine->cs); heap_free(engine); } @@ -449,7 +517,10 @@ static HRESULT WINAPI media_engine_Shutdown(IMFMediaEngine *iface) if (engine->flags & FLAGS_ENGINE_SHUT_DOWN) hr = MF_E_SHUTDOWN; else + { engine->flags |= FLAGS_ENGINE_SHUT_DOWN; + IMFMediaSession_Shutdown(engine->session); + } LeaveCriticalSection(&engine->cs); return hr; @@ -550,6 +621,7 @@ static HRESULT init_media_engine(DWORD flags, IMFAttributes *attributes, struct HRESULT hr; engine->IMFMediaEngine_iface.lpVtbl = &media_engine_vtbl; + engine->session_events.lpVtbl = &media_engine_session_events_vtbl; engine->refcount = 1; engine->flags = flags & MF_MEDIA_ENGINE_CREATEFLAGS_MASK; InitializeCriticalSection(&engine->cs); @@ -559,6 +631,12 @@ static HRESULT init_media_engine(DWORD flags, IMFAttributes *attributes, struct if (FAILED(hr)) return MF_E_ATTRIBUTENOTFOUND; + if (FAILED(hr = MFCreateMediaSession(NULL, &engine->session))) + return hr; + + if (FAILED(hr = IMFMediaSession_BeginGetEvent(engine->session, &engine->session_events, NULL))) + return hr; + IMFAttributes_GetUINT64(attributes, &MF_MEDIA_ENGINE_PLAYBACK_HWND, &engine->playback_hwnd); IMFAttributes_GetUnknown(attributes, &MF_MEDIA_ENGINE_DXGI_MANAGER, &IID_IMFDXGIDeviceManager, (void **)&engine->dxgi_manager);

1 0

Nikolay Sivov : mfmediaengine: Send "play" event on Play().
by Alexandre Julliard 29 May '20

29 May '20

Module: wine Branch: master Commit: 41af1d1e710b0895f5aee04b178cdb59a283a40d URL: https://source.winehq.org/git/wine.git/?a=commit;h=41af1d1e710b0895f5aee04b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 29 21:28:39 2020 +0300 mfmediaengine: Send "play" event on Play(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfmediaengine/main.c | 41 ++++++++++++++++++++++++++++---- dlls/mfmediaengine/tests/mfmediaengine.c | 33 ++++++++++++++++++++++++- 2 files changed, 68 insertions(+), 6 deletions(-) diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c index 77466e9993..13cbeb4b8d 100644 --- a/dlls/mfmediaengine/main.c +++ b/dlls/mfmediaengine/main.c @@ -61,6 +61,8 @@ enum media_engine_flags FLAGS_ENGINE_SHUT_DOWN = 0x20, FLAGS_ENGINE_AUTO_PLAY = 0x40, FLAGS_ENGINE_LOOP = 0x80, + FLAGS_ENGINE_PAUSED = 0x100, + FLAGS_ENGINE_WAITING = 0x200, }; struct media_engine @@ -328,9 +330,16 @@ static double WINAPI media_engine_GetDuration(IMFMediaEngine *iface) static BOOL WINAPI media_engine_IsPaused(IMFMediaEngine *iface) { - FIXME("(%p): stub.\n", iface); + struct media_engine *engine = impl_from_IMFMediaEngine(iface); + BOOL value; - return FALSE; + TRACE("%p.\n", iface); + + EnterCriticalSection(&engine->cs); + value = !!(engine->flags & FLAGS_ENGINE_PAUSED); + LeaveCriticalSection(&engine->cs); + + return value; } static double WINAPI media_engine_GetDefaultPlaybackRate(IMFMediaEngine *iface) @@ -438,9 +447,31 @@ static HRESULT WINAPI media_engine_SetLoop(IMFMediaEngine *iface, BOOL loop) static HRESULT WINAPI media_engine_Play(IMFMediaEngine *iface) { - FIXME("(%p): stub.\n", iface); + struct media_engine *engine = impl_from_IMFMediaEngine(iface); + PROPVARIANT var; - return E_NOTIMPL; + TRACE("%p.\n", iface); + + EnterCriticalSection(&engine->cs); + + IMFMediaEngineNotify_EventNotify(engine->callback, MF_MEDIA_ENGINE_EVENT_PURGEQUEUEDEVENTS, 0, 0); + + if (!(engine->flags & FLAGS_ENGINE_WAITING)) + { + engine->flags &= ~FLAGS_ENGINE_PAUSED; + IMFMediaEngineNotify_EventNotify(engine->callback, MF_MEDIA_ENGINE_EVENT_PLAY, 0, 0); + + var.vt = VT_EMPTY; + IMFMediaSession_Start(engine->session, &GUID_NULL, &var); + + engine->flags |= FLAGS_ENGINE_WAITING; + } + + IMFMediaEngineNotify_EventNotify(engine->callback, MF_MEDIA_ENGINE_EVENT_WAITING, 0, 0); + + LeaveCriticalSection(&engine->cs); + + return S_OK; } static HRESULT WINAPI media_engine_Pause(IMFMediaEngine *iface) @@ -623,7 +654,7 @@ static HRESULT init_media_engine(DWORD flags, IMFAttributes *attributes, struct engine->IMFMediaEngine_iface.lpVtbl = &media_engine_vtbl; engine->session_events.lpVtbl = &media_engine_session_events_vtbl; engine->refcount = 1; - engine->flags = flags & MF_MEDIA_ENGINE_CREATEFLAGS_MASK; + engine->flags = (flags & MF_MEDIA_ENGINE_CREATEFLAGS_MASK) | FLAGS_ENGINE_PAUSED; InitializeCriticalSection(&engine->cs); hr = IMFAttributes_GetUnknown(attributes, &MF_MEDIA_ENGINE_CALLBACK, &IID_IMFMediaEngineNotify, diff --git a/dlls/mfmediaengine/tests/mfmediaengine.c b/dlls/mfmediaengine/tests/mfmediaengine.c index 504464b527..e7cb6432b9 100644 --- a/dlls/mfmediaengine/tests/mfmediaengine.c +++ b/dlls/mfmediaengine/tests/mfmediaengine.c @@ -307,7 +307,6 @@ todo_wine ok(val == 0.0, "Unexpected time %f.\n", val); state = IMFMediaEngine_IsPaused(media_engine); -todo_wine ok(!!state, "Unexpected state %d.\n", state); val = IMFMediaEngine_GetDefaultPlaybackRate(media_engine); @@ -393,6 +392,37 @@ todo_wine IMFMediaEngine_Release(media_engine); } +static void test_Play(void) +{ + struct media_engine_notify notify_impl = {{&media_engine_notify_vtbl}, 1}; + IMFMediaEngineNotify *callback = &notify_impl.IMFMediaEngineNotify_iface; + IMFMediaEngine *media_engine; + HRESULT hr; + BOOL ret; + + media_engine = create_media_engine(callback); + + ret = IMFMediaEngine_IsPaused(media_engine); + ok(ret, "Unexpected state %d.\n", ret); + + hr = IMFMediaEngine_Play(media_engine); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + ret = IMFMediaEngine_IsPaused(media_engine); + ok(!ret, "Unexpected state %d.\n", ret); + + hr = IMFMediaEngine_Play(media_engine); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaEngine_Shutdown(media_engine); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + ret = IMFMediaEngine_IsPaused(media_engine); + ok(!ret, "Unexpected state %d.\n", ret); + + IMFMediaEngine_Release(media_engine); +} + START_TEST(mfmediaengine) { HRESULT hr; @@ -416,6 +446,7 @@ START_TEST(mfmediaengine) test_factory(); test_CreateInstance(); test_Shutdown(); + test_Play(); IMFMediaEngineClassFactory_Release(factory);

1 0

Nikolay Sivov : mfmediaengine: Send "pause" event on Pause().
by Alexandre Julliard 29 May '20

29 May '20

Module: wine Branch: master Commit: 58f468038013db22ba1905d57df0eb58caad5dbb URL: https://source.winehq.org/git/wine.git/?a=commit;h=58f468038013db22ba1905d5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 29 21:28:40 2020 +0300 mfmediaengine: Send "pause" event on Pause(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfmediaengine/main.c | 21 +++++++++++++++++++-- dlls/mfmediaengine/tests/mfmediaengine.c | 17 +++++++++++++++++ 2 files changed, 36 insertions(+), 2 deletions(-) diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c index 13cbeb4b8d..fcef1be048 100644 --- a/dlls/mfmediaengine/main.c +++ b/dlls/mfmediaengine/main.c @@ -476,9 +476,26 @@ static HRESULT WINAPI media_engine_Play(IMFMediaEngine *iface) static HRESULT WINAPI media_engine_Pause(IMFMediaEngine *iface) { - FIXME("(%p): stub.\n", iface); + struct media_engine *engine = impl_from_IMFMediaEngine(iface); - return E_NOTIMPL; + TRACE("%p.\n", iface); + + EnterCriticalSection(&engine->cs); + + if (!(engine->flags & FLAGS_ENGINE_PAUSED)) + { + engine->flags &= ~FLAGS_ENGINE_WAITING; + engine->flags |= FLAGS_ENGINE_PAUSED; + + IMFMediaEngineNotify_EventNotify(engine->callback, MF_MEDIA_ENGINE_EVENT_TIMEUPDATE, 0, 0); + IMFMediaEngineNotify_EventNotify(engine->callback, MF_MEDIA_ENGINE_EVENT_PAUSE, 0, 0); + } + + IMFMediaEngineNotify_EventNotify(engine->callback, MF_MEDIA_ENGINE_EVENT_PURGEQUEUEDEVENTS, 0, 0); + + LeaveCriticalSection(&engine->cs); + + return S_OK; } static BOOL WINAPI media_engine_GetMuted(IMFMediaEngine *iface) diff --git a/dlls/mfmediaengine/tests/mfmediaengine.c b/dlls/mfmediaengine/tests/mfmediaengine.c index e7cb6432b9..a3db611e9f 100644 --- a/dlls/mfmediaengine/tests/mfmediaengine.c +++ b/dlls/mfmediaengine/tests/mfmediaengine.c @@ -421,6 +421,23 @@ static void test_Play(void) ok(!ret, "Unexpected state %d.\n", ret); IMFMediaEngine_Release(media_engine); + + /* Play -> Pause */ + media_engine = create_media_engine(callback); + + hr = IMFMediaEngine_Play(media_engine); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + ret = IMFMediaEngine_IsPaused(media_engine); + ok(!ret, "Unexpected state %d.\n", ret); + + hr = IMFMediaEngine_Pause(media_engine); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + ret = IMFMediaEngine_IsPaused(media_engine); + ok(!!ret, "Unexpected state %d.\n", ret); + + IMFMediaEngine_Release(media_engine); } START_TEST(mfmediaengine)

1 0

Jacek Caban : ieframe: Return S_FALSE in IWebBrowser2::get_Document when returning NULL.
by Alexandre Julliard 29 May '20

29 May '20

Module: wine Branch: master Commit: bf83d755d987fec552cd1dce30638c31c49ab760 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bf83d755d987fec552cd1dce… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 29 20:37:03 2020 +0200 ieframe: Return S_FALSE in IWebBrowser2::get_Document when returning NULL. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ieframe/tests/webbrowser.c | 6 ++++++ dlls/ieframe/webbrowser.c | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c index 426fe18da0..898d0e6805 100644 --- a/dlls/ieframe/tests/webbrowser.c +++ b/dlls/ieframe/tests/webbrowser.c @@ -4056,6 +4056,7 @@ static void test_SetAdvise(void) IViewObject2 *view; IAdviseSink *sink; IOleObject *oleobj; + IDispatch *doc; DWORD aspects, flags; if (!(browser = create_webbrowser())) return; @@ -4115,6 +4116,11 @@ static void test_SetAdvise(void) hr = IViewObject2_SetAdvise(view, 0, 0, NULL); ok(hr == S_OK, "got %08x\n", hr); + doc = (void*)0xdeadbeef; + hr = IWebBrowser2_get_Document(browser, &doc); + ok(hr == S_FALSE, "get_Document failed: %08x\n", hr); + ok(!doc, "doc = %p\n", doc); + IOleObject_Release(oleobj); IViewObject2_Release(view); IWebBrowser2_Release(browser); diff --git a/dlls/ieframe/webbrowser.c b/dlls/ieframe/webbrowser.c index 1e50512e42..356b0a2833 100644 --- a/dlls/ieframe/webbrowser.c +++ b/dlls/ieframe/webbrowser.c @@ -404,7 +404,7 @@ static HRESULT WINAPI WebBrowser_get_Document(IWebBrowser2 *iface, IDispatch **p } *ppDisp = disp; - return S_OK; + return disp ? S_OK : S_FALSE; } static HRESULT WINAPI WebBrowser_get_TopLevelContainer(IWebBrowser2 *iface, VARIANT_BOOL *pBool)

1 0

Paul Gofman : ntoskrnl.exe: Implement IoReuseIrp() function.
by Alexandre Julliard 29 May '20

29 May '20

Module: wine Branch: master Commit: eb7f7847610f73d3ce76169c8b4603fe5a13addb URL: https://source.winehq.org/git/wine.git/?a=commit;h=eb7f7847610f73d3ce76169c… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri May 29 10:53:08 2020 +0300 ntoskrnl.exe: Implement IoReuseIrp() function. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 11 +++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- dlls/ntoskrnl.exe/tests/driver.c | 37 +++++++++++++++++++++++++++++++++++++ include/ddk/wdm.h | 1 + 4 files changed, 50 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 3c8b207a4a..e9c35cf7e3 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -975,6 +975,17 @@ void WINAPI IoInitializeIrp( IRP *irp, USHORT size, CCHAR stack_size ) (PIO_STACK_LOCATION)(irp + 1) + stack_size; } +void WINAPI IoReuseIrp(IRP *irp, NTSTATUS iostatus) +{ + UCHAR AllocationFlags; + + TRACE("irp %p, iostatus %#x.\n", irp, iostatus); + + AllocationFlags = irp->AllocationFlags; + IoInitializeIrp(irp, irp->Size, irp->StackCount); + irp->AllocationFlags = AllocationFlags; + irp->IoStatus.u.Status = iostatus; +} /*********************************************************************** * IoInitializeTimer (NTOSKRNL.EXE.@) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index c442656694..3b36a62269 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -462,7 +462,7 @@ @ stub IoReportTargetDeviceChange @ stub IoReportTargetDeviceChangeAsynchronous @ stub IoRequestDeviceEject -@ stub IoReuseIrp +@ stdcall IoReuseIrp(ptr long) @ stub IoSetCompletionRoutineEx @ stdcall IoSetDeviceInterfaceState(ptr long) @ stub IoSetDeviceToVerify diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index e762ad0ccd..f6cc442bab 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -211,9 +211,18 @@ static void *get_proc_address(const char *name) static FILE_OBJECT *last_created_file; static unsigned int create_count, close_count; +static NTSTATUS WINAPI test_irp_struct_completion_routine(DEVICE_OBJECT *reserved, IRP *irp, void *context) +{ + unsigned int *result = context; + + *result = 1; + return STATUS_MORE_PROCESSING_REQUIRED; +} + static void test_irp_struct(IRP *irp, DEVICE_OBJECT *device) { IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation( irp ); + unsigned int irp_completion_result; ok(device == upper_device, "Expected device %p, got %p.\n", upper_device, device); ok(last_created_file != NULL, "last_created_file = NULL\n"); @@ -225,6 +234,34 @@ static void test_irp_struct(IRP *irp, DEVICE_OBJECT *device) "IRP thread is not the current thread\n"); ok(IoGetRequestorProcess(irp) == IoGetCurrentProcess(), "processes didn't match\n"); + + irp = IoAllocateIrp(1, FALSE); + ok(irp->AllocationFlags == IRP_ALLOCATED_FIXED_SIZE, "Got unexpected irp->AllocationFlags %#x.\n", + irp->AllocationFlags); + ok(irp->CurrentLocation == 2, + "Got unexpected irp->CurrentLocation %u.\n", irp->CurrentLocation); + IoSetCompletionRoutine(irp, test_irp_struct_completion_routine, &irp_completion_result, + TRUE, TRUE, TRUE); + + irp_completion_result = 0; + + irp->IoStatus.Status = STATUS_SUCCESS; + --irp->CurrentLocation; + --irp->Tail.Overlay.CurrentStackLocation; + IoCompleteRequest(irp, IO_NO_INCREMENT); + ok(irp->CurrentLocation == 2, + "Got unexpected irp->CurrentLocation %u.\n", irp->CurrentLocation); + ok(irp_completion_result, "IRP completion was not called.\n"); + + --irp->CurrentLocation; + --irp->Tail.Overlay.CurrentStackLocation; + IoReuseIrp(irp, STATUS_UNSUCCESSFUL); + ok(irp->CurrentLocation == 2, + "Got unexpected irp->CurrentLocation %u.\n", irp->CurrentLocation); + ok(irp->AllocationFlags == IRP_ALLOCATED_FIXED_SIZE, "Got unexpected irp->AllocationFlags %#x.\n", + irp->AllocationFlags); + + IoFreeIrp(irp); } static void test_mdl_map(void) diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 0d98680cfa..57e4cf4fe5 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1679,6 +1679,7 @@ NTSTATUS WINAPI IoRegisterDeviceInterface(PDEVICE_OBJECT,const GUID*,PUNICODE_S void WINAPI IoReleaseCancelSpinLock(KIRQL); void WINAPI IoReleaseRemoveLockAndWaitEx(IO_REMOVE_LOCK*,void*,ULONG); void WINAPI IoReleaseRemoveLockEx(IO_REMOVE_LOCK*,void*,ULONG); +void WINAPI IoReuseIrp(IRP*,NTSTATUS); NTSTATUS WINAPI IoSetDeviceInterfaceState(UNICODE_STRING*,BOOLEAN); NTSTATUS WINAPI IoWMIRegistrationControl(PDEVICE_OBJECT,ULONG);

1 0

Paul Gofman : include/ddk: Update the IMAGE_INFO structure.
by Alexandre Julliard 29 May '20

29 May '20

Module: wine Branch: master Commit: a5b5be497913b0e9cb5c53ce37c6c81f1cc02093 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a5b5be497913b0e9cb5c53ce… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri May 29 10:53:09 2020 +0300 include/ddk: Update the IMAGE_INFO structure. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/ddk/ntddk.h | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/include/ddk/ntddk.h b/include/ddk/ntddk.h index 36f69cdf9a..e3c9124023 100644 --- a/include/ddk/ntddk.h +++ b/include/ddk/ntddk.h @@ -107,6 +107,8 @@ typedef enum _CONFIGURATION_TYPE MaximumType } CONFIGURATION_TYPE, *PCONFIGURATION_TYPE; +#define IMAGE_ADDRESSING_MODE_32BIT 3 + typedef struct _IMAGE_INFO { union @@ -118,7 +120,11 @@ typedef struct _IMAGE_INFO ULONG SystemModeImage : 1; ULONG ImageMappedToAllPids : 1; ULONG ExtendedInfoPresent : 1; - ULONG Reserved : 21; + ULONG MachineTypeMismatch : 1; + ULONG ImageSignatureLevel : 4; + ULONG ImageSignatureType : 3; + ULONG ImagePartialMap : 1; + ULONG Reserved : 12; } DUMMYSTRUCTNAME; } DUMMYUNIONNAME; PVOID ImageBase;

1 0

Paul Gofman : ntoskrnl.exe: Implement image load notify routines registration.
by Alexandre Julliard 29 May '20

29 May '20

Module: wine Branch: master Commit: 26fbff05a1e39a3c910ff778e2229c674a0569c5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=26fbff05a1e39a3c910ff778… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri May 29 10:53:10 2020 +0300 ntoskrnl.exe: Implement image load notify routines registration. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 28 ++++++++++++++++++++++++---- include/ddk/ntddk.h | 1 + 2 files changed, 25 insertions(+), 4 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index e9c35cf7e3..94733ec60a 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -85,6 +85,9 @@ static DWORD client_tid; static HANDLE ntoskrnl_heap; +static PLOAD_IMAGE_NOTIFY_ROUTINE load_image_notify_routines[8]; +static unsigned int load_image_notify_routine_count; + struct wine_driver { DRIVER_OBJECT driver_obj; @@ -3001,10 +3004,21 @@ NTSTATUS WINAPI PsRemoveCreateThreadNotifyRoutine( PCREATE_THREAD_NOTIFY_ROUTINE /*********************************************************************** * PsRemoveLoadImageNotifyRoutine (NTOSKRNL.EXE.@) */ - NTSTATUS WINAPI PsRemoveLoadImageNotifyRoutine(PLOAD_IMAGE_NOTIFY_ROUTINE NotifyRoutine) +NTSTATUS WINAPI PsRemoveLoadImageNotifyRoutine(PLOAD_IMAGE_NOTIFY_ROUTINE routine) { - FIXME( "stub: %p\n", NotifyRoutine ); - return STATUS_SUCCESS; + unsigned int i; + + TRACE("routine %p.\n", routine); + + for (i = 0; i < load_image_notify_routine_count; ++i) + if (load_image_notify_routines[i] == routine) + { + --load_image_notify_routine_count; + memmove(&load_image_notify_routines[i], &load_image_notify_routines[i + 1], + sizeof(*load_image_notify_routines) * (load_image_notify_routine_count - i)); + return STATUS_SUCCESS; + } + return STATUS_PROCEDURE_NOT_FOUND; } @@ -3160,7 +3174,13 @@ NTSTATUS WINAPI IoWMIOpenBlock(LPCGUID guid, ULONG desired_access, PVOID *data_b */ NTSTATUS WINAPI PsSetLoadImageNotifyRoutine(PLOAD_IMAGE_NOTIFY_ROUTINE routine) { - FIXME("(%p) stub\n", routine); + FIXME("routine %p, semi-stub.\n", routine); + + if (load_image_notify_routine_count == ARRAY_SIZE(load_image_notify_routines)) + return STATUS_INSUFFICIENT_RESOURCES; + + load_image_notify_routines[load_image_notify_routine_count++] = routine; + return STATUS_SUCCESS; } diff --git a/include/ddk/ntddk.h b/include/ddk/ntddk.h index e3c9124023..2b05fda711 100644 --- a/include/ddk/ntddk.h +++ b/include/ddk/ntddk.h @@ -231,6 +231,7 @@ BOOLEAN WINAPI MmIsAddressValid(void *); HANDLE WINAPI PsGetProcessId(PEPROCESS); HANDLE WINAPI PsGetThreadId(PETHREAD); HANDLE WINAPI PsGetThreadProcessId(PETHREAD); +NTSTATUS WINAPI PsRemoveLoadImageNotifyRoutine(PLOAD_IMAGE_NOTIFY_ROUTINE); NTSTATUS WINAPI PsSetCreateProcessNotifyRoutine(PCREATE_PROCESS_NOTIFY_ROUTINE,BOOLEAN); NTSTATUS WINAPI PsSetCreateProcessNotifyRoutineEx(PCREATE_PROCESS_NOTIFY_ROUTINE_EX,BOOLEAN); NTSTATUS WINAPI PsSetCreateThreadNotifyRoutine(PCREATE_THREAD_NOTIFY_ROUTINE);

1 0

Paul Gofman : include: Add RTL_QUERY_REGISTRY_TYPECHECK defines.
by Alexandre Julliard 29 May '20

29 May '20

Module: wine Branch: master Commit: 9e8b44ac5c8aefbd43f256fcfae367a8ab8977ba URL: https://source.winehq.org/git/wine.git/?a=commit;h=9e8b44ac5c8aefbd43f256fc… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri May 29 10:53:11 2020 +0300 include: Add RTL_QUERY_REGISTRY_TYPECHECK defines. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winternl.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/winternl.h b/include/winternl.h index b70460f314..f362790dbc 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -1988,6 +1988,9 @@ typedef void (NTAPI *RTL_WAITORTIMERCALLBACKFUNC)(PVOID,BOOLEAN); /* FIXME: not #define RTL_QUERY_REGISTRY_NOEXPAND 0x00000010 #define RTL_QUERY_REGISTRY_DIRECT 0x00000020 #define RTL_QUERY_REGISTRY_DELETE 0x00000040 +#define RTL_QUERY_REGISTRY_TYPECHECK 0x00000100 + +#define RTL_QUERY_REGISTRY_TYPECHECK_SHIFT 24 typedef NTSTATUS (WINAPI *PRTL_QUERY_REGISTRY_ROUTINE)( PCWSTR ValueName, ULONG ValueType,

1 0

Paul Gofman : ntoskrnl.exe: Call load image notify routines for driver modules.
by Alexandre Julliard 29 May '20

29 May '20

Module: wine Branch: master Commit: 5d92cf7dbf11038c08eb35a042958faab3ef5b83 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5d92cf7dbf11038c08eb35a0… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri May 29 10:53:12 2020 +0300 ntoskrnl.exe: Call load image notify routines for driver modules. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 24 ++++++++++++++++ dlls/ntoskrnl.exe/tests/driver.c | 60 +++++++++++++++++++++++++++++++++++++++- 2 files changed, 83 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 94733ec60a..fbf6262b3e 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -3673,6 +3673,30 @@ static HMODULE load_driver( const WCHAR *driver_name, const UNICODE_STRING *keyn TRACE( "loading driver %s\n", wine_dbgstr_w(str) ); module = load_driver_module( str ); + + if (module && load_image_notify_routine_count) + { + UNICODE_STRING module_name; + IMAGE_NT_HEADERS *nt; + IMAGE_INFO info; + unsigned int i; + + RtlInitUnicodeString(&module_name, str); + nt = RtlImageNtHeader(module); + memset(&info, 0, sizeof(info)); + info.u.s.ImageAddressingMode = IMAGE_ADDRESSING_MODE_32BIT; + info.u.s.SystemModeImage = TRUE; + info.ImageSize = nt->OptionalHeader.SizeOfImage; + info.ImageBase = module; + + for (i = 0; i < load_image_notify_routine_count; ++i) + { + TRACE("Calling image load notify %p.\n", load_image_notify_routines[i]); + load_image_notify_routines[i](&module_name, NULL, &info); + TRACE("Called image load notify %p.\n", load_image_notify_routines[i]); + } + } + HeapFree( GetProcessHeap(), 0, path ); return module; } diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index f6cc442bab..ba2b4d6ac8 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -308,21 +308,79 @@ static const WCHAR driver2_path[] = { '\\','W','i','n','e','T','e','s','t','D','r','i','v','e','r','2',0 }; +static IMAGE_INFO test_image_info; +static int test_load_image_notify_count; +static WCHAR test_load_image_name[MAX_PATH]; + +static void WINAPI test_load_image_notify_routine(UNICODE_STRING *image_name, HANDLE process_id, + IMAGE_INFO *image_info) +{ + if (test_load_image_notify_count == -1 + || (image_name->Buffer && wcsstr(image_name->Buffer, L".tmp"))) + { + ++test_load_image_notify_count; + test_image_info = *image_info; + wcscpy(test_load_image_name, image_name->Buffer); + } +} + static void test_load_driver(void) { - UNICODE_STRING name; + static WCHAR image_path_key_name[] = L"ImagePath"; + RTL_QUERY_REGISTRY_TABLE query_table[2]; + UNICODE_STRING name, image_path; NTSTATUS ret; + ret = PsSetLoadImageNotifyRoutine(test_load_image_notify_routine); + ok(ret == STATUS_SUCCESS, "Got unexpected status %#x.\n", ret); + + /* Routine gets registered twice on Windows. */ + ret = PsSetLoadImageNotifyRoutine(test_load_image_notify_routine); + ok(ret == STATUS_SUCCESS, "Got unexpected status %#x.\n", ret); + + RtlInitUnicodeString(&image_path, NULL); + memset(query_table, 0, sizeof(query_table)); + query_table[0].QueryRoutine = NULL; + query_table[0].Name = image_path_key_name; + query_table[0].EntryContext = &image_path; + query_table[0].Flags = RTL_QUERY_REGISTRY_DIRECT | RTL_QUERY_REGISTRY_TYPECHECK; + query_table[0].DefaultType = REG_EXPAND_SZ << RTL_QUERY_REGISTRY_TYPECHECK_SHIFT; + + ret = RtlQueryRegistryValues(RTL_REGISTRY_ABSOLUTE, driver2_path, query_table, NULL, NULL); + ok(ret == STATUS_SUCCESS, "Got unexpected status %#x.\n", ret); + ok(!!image_path.Buffer, "image_path.Buffer is NULL.\n"); + RtlInitUnicodeString(&name, driver2_path); ret = ZwLoadDriver(&name); ok(!ret, "got %#x\n", ret); + ok(test_load_image_notify_count == 2, "Got unexpected test_load_image_notify_count %u.\n", + test_load_image_notify_count); + ok(test_image_info.ImageAddressingMode == IMAGE_ADDRESSING_MODE_32BIT, + "Got unexpected ImageAddressingMode %#x.\n", test_image_info.ImageAddressingMode); + ok(test_image_info.SystemModeImage, + "Got unexpected SystemModeImage %#x.\n", test_image_info.SystemModeImage); + ok(!wcscmp(test_load_image_name, image_path.Buffer), "Image path names do not match.\n"); + + test_load_image_notify_count = -1; + ret = ZwLoadDriver(&name); ok(ret == STATUS_IMAGE_ALREADY_LOADED, "got %#x\n", ret); ret = ZwUnloadDriver(&name); ok(!ret, "got %#x\n", ret); + + ret = PsRemoveLoadImageNotifyRoutine(test_load_image_notify_routine); + ok(ret == STATUS_SUCCESS, "Got unexpected status %#x.\n", ret); + ret = PsRemoveLoadImageNotifyRoutine(test_load_image_notify_routine); + ok(ret == STATUS_SUCCESS, "Got unexpected status %#x.\n", ret); + ret = PsRemoveLoadImageNotifyRoutine(test_load_image_notify_routine); + ok(ret == STATUS_PROCEDURE_NOT_FOUND, "Got unexpected status %#x.\n", ret); + + ok(test_load_image_notify_count == -1, "Got unexpected test_load_image_notify_count %u.\n", + test_load_image_notify_count); + RtlFreeUnicodeString(&image_path); } static NTSTATUS wait_single(void *obj, ULONGLONG timeout)

1 0

Gijs Vermeulen : wtsapi32: Implement WTSQuerySessionInformationA.
by Alexandre Julliard 29 May '20

29 May '20

Module: wine Branch: master Commit: 1db2b563360c48d6697b4f538b2c843ad4762db5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1db2b563360c48d6697b4f53… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Thu May 28 15:59:26 2020 +0200 wtsapi32: Implement WTSQuerySessionInformationA. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49178 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wtsapi32/tests/wtsapi.c | 44 ++++++++++++++++++++++++++++++++++-------- dlls/wtsapi32/wtsapi32.c | 46 ++++++++++++++++++++++++++++++++++---------- 2 files changed, 72 insertions(+), 18 deletions(-) diff --git a/dlls/wtsapi32/tests/wtsapi.c b/dlls/wtsapi32/tests/wtsapi.c index 67f56bbd7f..f45598f548 100644 --- a/dlls/wtsapi32/tests/wtsapi.c +++ b/dlls/wtsapi32/tests/wtsapi.c @@ -90,19 +90,47 @@ static void test_WTSEnumerateProcessesW(void) WTSFreeMemory(info); } -static void test_WTSQuerySessionInformationW(void) +static void test_WTSQuerySessionInformation(void) { BOOL ret; - WCHAR *buf; + WCHAR *buf1; + char *buf2; DWORD count; count = 0; - buf = NULL; - ret = WTSQuerySessionInformationW(WTS_CURRENT_SERVER_HANDLE, WTS_CURRENT_SESSION, WTSUserName, &buf, &count); + buf1 = NULL; + ret = WTSQuerySessionInformationW(WTS_CURRENT_SERVER_HANDLE, WTS_CURRENT_SESSION, WTSUserName, &buf1, &count); ok(ret, "got %u\n", GetLastError()); - ok(buf != NULL, "buf not set\n"); - ok(count == (lstrlenW(buf) + 1) * sizeof(WCHAR), "got %u\n", count); - WTSFreeMemory(buf); + ok(buf1 != NULL, "buf not set\n"); + ok(count == (lstrlenW(buf1) + 1) * sizeof(WCHAR), "expected %u, got %u\n", (lstrlenW(buf1) + 1) * sizeof(WCHAR), count); + WTSFreeMemory(buf1); + + SetLastError(0xdeadbeef); + count = 0; + ret = WTSQuerySessionInformationA(WTS_CURRENT_SERVER_HANDLE, WTS_CURRENT_SESSION, WTSUserName, NULL, &count); + ok(!ret, "got %u\n", GetLastError()); + ok(count == 0, "got %u\n", count); + ok(GetLastError() == ERROR_INVALID_USER_BUFFER, "got %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + count = 1; + ret = WTSQuerySessionInformationA(WTS_CURRENT_SERVER_HANDLE, WTS_CURRENT_SESSION, WTSUserName, NULL, &count); + ok(!ret, "got %u\n", GetLastError()); + ok(count == 1, "got %u\n", count); + ok(GetLastError() == ERROR_INVALID_USER_BUFFER, "got %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = WTSQuerySessionInformationA(WTS_CURRENT_SERVER_HANDLE, WTS_CURRENT_SESSION, WTSUserName, &buf2, NULL); + ok(!ret, "got %u\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_USER_BUFFER, "got %u\n", GetLastError()); + + count = 0; + buf2 = NULL; + ret = WTSQuerySessionInformationA(WTS_CURRENT_SERVER_HANDLE, WTS_CURRENT_SESSION, WTSUserName, &buf2, &count); + ok(ret, "got %u\n", GetLastError()); + ok(buf2 != NULL, "buf not set\n"); + ok(count == lstrlenA(buf2) + 1, "expected %u, got %u\n", lstrlenA(buf2) + 1, count); + WTSFreeMemory(buf2); } static void test_WTSQueryUserToken(void) @@ -118,6 +146,6 @@ static void test_WTSQueryUserToken(void) START_TEST (wtsapi) { test_WTSEnumerateProcessesW(); - test_WTSQuerySessionInformationW(); + test_WTSQuerySessionInformation(); test_WTSQueryUserToken(); } diff --git a/dlls/wtsapi32/wtsapi32.c b/dlls/wtsapi32/wtsapi32.c index 026e7f4369..0ba05abf2c 100644 --- a/dlls/wtsapi32/wtsapi32.c +++ b/dlls/wtsapi32/wtsapi32.c @@ -19,6 +19,7 @@ #include <stdlib.h> #include "windef.h" #include "winbase.h" +#include "winnls.h" #include "wtsapi32.h" #include "wine/debug.h" #include "wine/heap.h" @@ -287,18 +288,43 @@ HANDLE WINAPI WTSOpenServerW(LPWSTR pServerName) /************************************************************ * WTSQuerySessionInformationA (WTSAPI32.@) */ -BOOL WINAPI WTSQuerySessionInformationA( - HANDLE hServer, - DWORD SessionId, - WTS_INFO_CLASS WTSInfoClass, - LPSTR* Buffer, - DWORD* BytesReturned) +BOOL WINAPI WTSQuerySessionInformationA(HANDLE server, DWORD session_id, WTS_INFO_CLASS class, char **buffer, DWORD *count) { - /* FIXME: Forward request to winsta.dll::WinStationQueryInformationA */ - FIXME("Stub %p 0x%08x %d %p %p\n", hServer, SessionId, WTSInfoClass, - Buffer, BytesReturned); + WCHAR *bufferW = NULL; - return FALSE; + TRACE("%p 0x%08x %d %p %p\n", server, session_id, class, buffer, count); + + if (!buffer || !count) + { + SetLastError(ERROR_INVALID_USER_BUFFER); + return FALSE; + } + + if (!WTSQuerySessionInformationW(server, session_id, class, &bufferW, count)) + return FALSE; + + *count = WideCharToMultiByte(CP_ACP, 0, bufferW, -1, NULL, 0, NULL, NULL); + if (!*count) + { + WTSFreeMemory(bufferW); + return FALSE; + } + + if (!(*buffer = heap_alloc(*count))) + { + WTSFreeMemory(bufferW); + return FALSE; + } + + if (!(*count = WideCharToMultiByte(CP_ACP, 0, bufferW, -1, *buffer, *count, NULL, NULL))) + { + WTSFreeMemory(bufferW); + heap_free(*buffer); + return FALSE; + } + + WTSFreeMemory(bufferW); + return TRUE; } /************************************************************

1 0