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

Zebediah Figura : strmbase: Move window.c to quartz.
by Alexandre Julliard 12 Mar '20

12 Mar '20

Module: wine Branch: master Commit: bb8911928fac413530007a7f1f01cb5abdd35b97 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bb8911928fac413530007a7f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Mar 11 21:10:11 2020 -0500 strmbase: Move window.c to quartz. The only filters that expose IVideoWindow live in quartz. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/Makefile.in | 3 +- dlls/quartz/quartz_private.h | 91 ++++++++++++++++++++++++++++++++++++ dlls/quartz/videorenderer.c | 2 +- dlls/quartz/vmr9.c | 2 +- dlls/{strmbase => quartz}/window.c | 16 +++---- dlls/strmbase/Makefile.in | 3 +- include/wine/strmbase.h | 94 -------------------------------------- 7 files changed, 104 insertions(+), 107 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=bb8911928fac41353000…

1 0

Zebediah Figura : strmbase: Move video.c to quartz.
by Alexandre Julliard 12 Mar '20

12 Mar '20

Module: wine Branch: master Commit: f55427fb9da28f99593f978f0bbd2b9c41143bd1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f55427fb9da28f99593f978f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Mar 11 21:10:12 2020 -0500 strmbase: Move video.c to quartz. The only filters that expose IBasicVideo live in quartz. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/Makefile.in | 1 + dlls/quartz/quartz_private.h | 39 +++++++++++++++++++++++++++++++++++ dlls/{strmbase => quartz}/video.c | 8 ++++---- dlls/quartz/videorenderer.c | 2 +- dlls/quartz/vmr9.c | 2 +- dlls/strmbase/Makefile.in | 3 +-- include/wine/strmbase.h | 43 --------------------------------------- 7 files changed, 47 insertions(+), 51 deletions(-) diff --git a/dlls/quartz/Makefile.in b/dlls/quartz/Makefile.in index 4ba8edf5fe..858b957879 100644 --- a/dlls/quartz/Makefile.in +++ b/dlls/quartz/Makefile.in @@ -17,6 +17,7 @@ C_SRCS = \ memallocator.c \ regsvr.c \ systemclock.c \ + video.c \ videorenderer.c \ vmr9.c \ window.c diff --git a/dlls/quartz/quartz_private.h b/dlls/quartz/quartz_private.h index cbf5da4c09..2b100969eb 100644 --- a/dlls/quartz/quartz_private.h +++ b/dlls/quartz/quartz_private.h @@ -174,4 +174,43 @@ HRESULT WINAPI BaseControlWindowImpl_GetRestorePosition(IVideoWindow *iface, LON HRESULT WINAPI BaseControlWindowImpl_HideCursor(IVideoWindow *iface, LONG HideCursor) DECLSPEC_HIDDEN; HRESULT WINAPI BaseControlWindowImpl_IsCursorHidden(IVideoWindow *iface, LONG *CursorHidden) DECLSPEC_HIDDEN; +typedef struct tagBaseControlVideo +{ + IBasicVideo IBasicVideo_iface; + + struct strmbase_filter *pFilter; + struct strmbase_pin *pPin; + + const struct BaseControlVideoFuncTable *pFuncsTable; +} BaseControlVideo; + +typedef HRESULT (WINAPI *BaseControlVideo_GetSourceRect)(BaseControlVideo* This, RECT *pSourceRect); +typedef HRESULT (WINAPI *BaseControlVideo_GetStaticImage)(BaseControlVideo* This, LONG *pBufferSize, LONG *pDIBImage); +typedef HRESULT (WINAPI *BaseControlVideo_GetTargetRect)(BaseControlVideo* This, RECT *pTargetRect); +typedef VIDEOINFOHEADER* (WINAPI *BaseControlVideo_GetVideoFormat)(BaseControlVideo* This); +typedef HRESULT (WINAPI *BaseControlVideo_IsDefaultSourceRect)(BaseControlVideo* This); +typedef HRESULT (WINAPI *BaseControlVideo_IsDefaultTargetRect)(BaseControlVideo* This); +typedef HRESULT (WINAPI *BaseControlVideo_SetDefaultSourceRect)(BaseControlVideo* This); +typedef HRESULT (WINAPI *BaseControlVideo_SetDefaultTargetRect)(BaseControlVideo* This); +typedef HRESULT (WINAPI *BaseControlVideo_SetSourceRect)(BaseControlVideo* This, RECT *pSourceRect); +typedef HRESULT (WINAPI *BaseControlVideo_SetTargetRect)(BaseControlVideo* This, RECT *pTargetRect); + +typedef struct BaseControlVideoFuncTable +{ + BaseControlVideo_GetSourceRect pfnGetSourceRect; + BaseControlVideo_GetStaticImage pfnGetStaticImage; + BaseControlVideo_GetTargetRect pfnGetTargetRect; + BaseControlVideo_GetVideoFormat pfnGetVideoFormat; + BaseControlVideo_IsDefaultSourceRect pfnIsDefaultSourceRect; + BaseControlVideo_IsDefaultTargetRect pfnIsDefaultTargetRect; + BaseControlVideo_SetDefaultSourceRect pfnSetDefaultSourceRect; + BaseControlVideo_SetDefaultTargetRect pfnSetDefaultTargetRect; + BaseControlVideo_SetSourceRect pfnSetSourceRect; + BaseControlVideo_SetTargetRect pfnSetTargetRect; +} BaseControlVideoFuncTable; + +HRESULT basic_video_init(BaseControlVideo *video, struct strmbase_filter *filter, + struct strmbase_pin *pin, const BaseControlVideoFuncTable *func_table) DECLSPEC_HIDDEN; +HRESULT WINAPI BaseControlVideo_Destroy(BaseControlVideo *pControlVideo) DECLSPEC_HIDDEN; + #endif /* __QUARTZ_PRIVATE_INCLUDED__ */ diff --git a/dlls/strmbase/video.c b/dlls/quartz/video.c similarity index 98% rename from dlls/strmbase/video.c rename to dlls/quartz/video.c index 081794e9b3..f59c2dee0c 100644 --- a/dlls/strmbase/video.c +++ b/dlls/quartz/video.c @@ -1,5 +1,5 @@ /* - * Generic Implementation of strmbase video classes + * Common implementation of IBasicVideo * * Copyright 2012 Aric Stewart, CodeWeavers * @@ -18,9 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "strmbase_private.h" +#include "quartz_private.h" -WINE_DEFAULT_DEBUG_CHANNEL(strmbase); +WINE_DEFAULT_DEBUG_CHANNEL(quartz); static inline BaseControlVideo *impl_from_IBasicVideo(IBasicVideo *iface) { @@ -647,7 +647,7 @@ static const IBasicVideoVtbl basic_video_vtbl = basic_video_IsUsingDefaultDestination }; -HRESULT WINAPI strmbase_video_init(BaseControlVideo *video, struct strmbase_filter *filter, +HRESULT basic_video_init(BaseControlVideo *video, struct strmbase_filter *filter, struct strmbase_pin *pin, const BaseControlVideoFuncTable *func_table) { video->IBasicVideo_iface.lpVtbl = &basic_video_vtbl; diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index 52d4b1aa62..1b5e68e7d5 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -726,7 +726,7 @@ HRESULT video_renderer_create(IUnknown *outer, IUnknown **out) if (FAILED(hr)) goto fail; - hr = strmbase_video_init(&pVideoRenderer->baseControlVideo, &pVideoRenderer->renderer.filter, + hr = basic_video_init(&pVideoRenderer->baseControlVideo, &pVideoRenderer->renderer.filter, &pVideoRenderer->renderer.sink.pin, &renderer_BaseControlVideoFuncTable); if (FAILED(hr)) goto fail; diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index c457f31e4e..b8cf0698ec 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -2257,7 +2257,7 @@ static HRESULT vmr_create(IUnknown *outer, IUnknown **out, const CLSID *clsid) if (FAILED(hr = BaseWindowImpl_PrepareWindow(&pVMR->baseControlWindow.baseWindow))) goto fail; - hr = strmbase_video_init(&pVMR->baseControlVideo, &pVMR->renderer.filter, + hr = basic_video_init(&pVMR->baseControlVideo, &pVMR->renderer.filter, &pVMR->renderer.sink.pin, &renderer_BaseControlVideoFuncTable); if (FAILED(hr)) goto fail; diff --git a/dlls/strmbase/Makefile.in b/dlls/strmbase/Makefile.in index 607ce235bb..ec13acccf4 100644 --- a/dlls/strmbase/Makefile.in +++ b/dlls/strmbase/Makefile.in @@ -9,5 +9,4 @@ C_SRCS = \ pospass.c \ qualitycontrol.c \ renderer.c \ - seeking.c \ - video.c + seeking.c diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index f874a44186..0bcac13ebb 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -255,49 +255,6 @@ enum strmbase_type_id HRESULT strmbase_get_typeinfo(enum strmbase_type_id tid, ITypeInfo **typeinfo); -#ifdef __IBasicVideo_FWD_DEFINED__ -#ifdef __amvideo_h__ -typedef struct tagBaseControlVideo -{ - IBasicVideo IBasicVideo_iface; - - struct strmbase_filter *pFilter; - struct strmbase_pin *pPin; - - const struct BaseControlVideoFuncTable* pFuncsTable; -} BaseControlVideo; - -typedef HRESULT (WINAPI *BaseControlVideo_GetSourceRect)(BaseControlVideo* This, RECT *pSourceRect); -typedef HRESULT (WINAPI *BaseControlVideo_GetStaticImage)(BaseControlVideo* This, LONG *pBufferSize, LONG *pDIBImage); -typedef HRESULT (WINAPI *BaseControlVideo_GetTargetRect)(BaseControlVideo* This, RECT *pTargetRect); -typedef VIDEOINFOHEADER* (WINAPI *BaseControlVideo_GetVideoFormat)(BaseControlVideo* This); -typedef HRESULT (WINAPI *BaseControlVideo_IsDefaultSourceRect)(BaseControlVideo* This); -typedef HRESULT (WINAPI *BaseControlVideo_IsDefaultTargetRect)(BaseControlVideo* This); -typedef HRESULT (WINAPI *BaseControlVideo_SetDefaultSourceRect)(BaseControlVideo* This); -typedef HRESULT (WINAPI *BaseControlVideo_SetDefaultTargetRect)(BaseControlVideo* This); -typedef HRESULT (WINAPI *BaseControlVideo_SetSourceRect)(BaseControlVideo* This, RECT *pSourceRect); -typedef HRESULT (WINAPI *BaseControlVideo_SetTargetRect)(BaseControlVideo* This, RECT *pTargetRect); - -typedef struct BaseControlVideoFuncTable { - /* Required */ - BaseControlVideo_GetSourceRect pfnGetSourceRect; - BaseControlVideo_GetStaticImage pfnGetStaticImage; - BaseControlVideo_GetTargetRect pfnGetTargetRect; - BaseControlVideo_GetVideoFormat pfnGetVideoFormat; - BaseControlVideo_IsDefaultSourceRect pfnIsDefaultSourceRect; - BaseControlVideo_IsDefaultTargetRect pfnIsDefaultTargetRect; - BaseControlVideo_SetDefaultSourceRect pfnSetDefaultSourceRect; - BaseControlVideo_SetDefaultTargetRect pfnSetDefaultTargetRect; - BaseControlVideo_SetSourceRect pfnSetSourceRect; - BaseControlVideo_SetTargetRect pfnSetTargetRect; -} BaseControlVideoFuncTable; - -HRESULT WINAPI strmbase_video_init(BaseControlVideo *video, struct strmbase_filter *filter, - struct strmbase_pin *pin, const BaseControlVideoFuncTable *func_table); -HRESULT WINAPI BaseControlVideo_Destroy(BaseControlVideo *pControlVideo); -#endif -#endif - struct strmbase_renderer { struct strmbase_filter filter;

1 0

Zebediah Figura : quartz: Unregister the video window class on DLL unload.
by Alexandre Julliard 12 Mar '20

12 Mar '20

Module: wine Branch: master Commit: 2db87b733f92f8541de6ba4dafefb8f05eb9aae0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2db87b733f92f8541de6ba4d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Mar 11 21:10:13 2020 -0500 quartz: Unregister the video window class on DLL unload. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48734 Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/main.c | 7 ++++--- dlls/quartz/quartz_private.h | 1 + dlls/quartz/window.c | 6 ++++++ 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/quartz/main.c b/dlls/quartz/main.c index 9c61dd50d7..284f2cacae 100644 --- a/dlls/quartz/main.c +++ b/dlls/quartz/main.c @@ -29,10 +29,11 @@ extern BOOL WINAPI QUARTZ_DllMain(HINSTANCE, DWORD, LPVOID) DECLSPEC_HIDDEN; static LONG server_locks = 0; -/* For the moment, do nothing here. */ -BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) +BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) { - return QUARTZ_DllMain( hInstDLL, fdwReason, lpv ); + if (reason == DLL_PROCESS_DETACH) + video_window_unregister_class(); + return QUARTZ_DllMain(instance, reason, reserved); } static HRESULT seeking_passthrough_create(IUnknown *outer, IUnknown **out) diff --git a/dlls/quartz/quartz_private.h b/dlls/quartz/quartz_private.h index 2b100969eb..3332c27d21 100644 --- a/dlls/quartz/quartz_private.h +++ b/dlls/quartz/quartz_private.h @@ -123,6 +123,7 @@ typedef struct tagBaseControlWindow HRESULT video_window_init(BaseControlWindow *window, const IVideoWindowVtbl *vtbl, struct strmbase_filter *filter, struct strmbase_pin *pin, const BaseWindowFuncTable *func_table) DECLSPEC_HIDDEN; +void video_window_unregister_class(void) DECLSPEC_HIDDEN; HRESULT WINAPI BaseControlWindow_Destroy(BaseControlWindow *pControlWindow) DECLSPEC_HIDDEN; BOOL WINAPI BaseControlWindowImpl_PossiblyEatMessage(BaseWindow *This, UINT uMsg, WPARAM wParam, LPARAM lParam) DECLSPEC_HIDDEN; diff --git a/dlls/quartz/window.c b/dlls/quartz/window.c index 6e1a60086f..0b0df136f2 100644 --- a/dlls/quartz/window.c +++ b/dlls/quartz/window.c @@ -741,3 +741,9 @@ HRESULT WINAPI BaseControlWindowImpl_IsCursorHidden(IVideoWindow *iface, LONG *C return S_OK; } + +void video_window_unregister_class(void) +{ + if (!UnregisterClassW(class_name, NULL) && GetLastError() != ERROR_CLASS_DOES_NOT_EXIST) + ERR("Failed to unregister class, error %u.\n", GetLastError()); +}

1 0

Jefferson Carpenter : user32: Always initialize module in load_desktop_driver.
by Alexandre Julliard 12 Mar '20

12 Mar '20

Module: wine Branch: master Commit: bc9d4eb55adc2b9063aa9807138b36eff43a96d6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bc9d4eb55adc2b9063aa9807… Author: Jefferson Carpenter <jeffersoncarpenter2(a)gmail.com> Date: Thu Mar 12 07:48:14 2020 +0000 user32: Always initialize module in load_desktop_driver. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48742 Signed-off-by: Jefferson Carpenter <jeffersoncarpenter2(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/driver.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c index 8f3e1b3597..6d916c7d65 100644 --- a/dlls/user32/driver.c +++ b/dlls/user32/driver.c @@ -85,6 +85,7 @@ static BOOL load_desktop_driver( HWND hwnd, HMODULE *module ) else { size = sizeof(driver_load_error); + *module = NULL; RegQueryValueExA( hkey, "DriverError", NULL, NULL, (BYTE *)driver_load_error, &size ); } RegCloseKey( hkey );

1 0

Zebediah Figura : ntdll/tests: Add tests for linking a file to the same name.
by Alexandre Julliard 12 Mar '20

12 Mar '20

Module: wine Branch: master Commit: 5b75d943044feba2ac92f8e05e3827c8ac3e8a4d URL: https://source.winehq.org/git/wine.git/?a=commit;h=5b75d943044feba2ac92f8e0… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Mar 10 22:38:22 2020 -0500 ntdll/tests: Add tests for linking a file to the same name. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/file.c | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index e71f887c2b..a05b124fd2 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -2759,6 +2759,36 @@ static void test_file_link_information(void) HeapFree( GetProcessHeap(), 0, fli ); delete_object( oldpath ); delete_object( newpath ); + + /* oldpath == newpath */ + res = GetTempFileNameW( tmp_path, fooW, 0, oldpath ); + ok( res != 0, "failed to create temp file\n" ); + handle = CreateFileW( oldpath, GENERIC_WRITE | DELETE, 0, NULL, CREATE_ALWAYS, 0, 0 ); + ok( handle != INVALID_HANDLE_VALUE, "CreateFileW failed\n" ); + + pRtlDosPathNameToNtPathName_U( oldpath, &name_str, NULL, NULL ); + fli = HeapAlloc( GetProcessHeap(), 0, sizeof(FILE_RENAME_INFORMATION) + name_str.Length ); + fli->ReplaceIfExists = FALSE; + fli->RootDirectory = NULL; + fli->FileNameLength = name_str.Length; + memcpy( fli->FileName, name_str.Buffer, name_str.Length ); + pRtlFreeUnicodeString( &name_str ); + + U(io).Status = 0xdeadbeef; + res = pNtSetInformationFile( handle, &io, fli, sizeof(FILE_LINK_INFORMATION) + fli->FileNameLength, FileLinkInformation ); + todo_wine ok( U(io).Status == 0xdeadbeef, "got io status %#x\n", U(io).Status ); + ok( res == STATUS_OBJECT_NAME_COLLISION, "got status %x\n", res ); + + fli->ReplaceIfExists = TRUE; + U(io).Status = 0xdeadbeef; + res = pNtSetInformationFile( handle, &io, fli, sizeof(FILE_LINK_INFORMATION) + fli->FileNameLength, FileLinkInformation ); + todo_wine ok( U(io).Status == STATUS_SUCCESS, "got io status %#x\n", U(io).Status ); + todo_wine ok( res == STATUS_SUCCESS, "got status %x\n", res ); + ok( GetFileAttributesW( oldpath ) != INVALID_FILE_ATTRIBUTES, "file should exist\n" ); + + CloseHandle( handle ); + HeapFree( GetProcessHeap(), 0, fli ); + delete_object( oldpath ); } static void test_file_both_information(void)

1 0

Nikolay Sivov : mf: Notify just added sinks with current clock state.
by Alexandre Julliard 11 Mar '20

11 Mar '20

Module: wine Branch: master Commit: 02613046efddf1a5c49d778bee9b571ccbe9d741 URL: https://source.winehq.org/git/wine.git/?a=commit;h=02613046efddf1a5c49d778b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 11 14:19:43 2020 +0300 mf: Notify just added sinks with current clock state. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/session.c | 176 +++++++++++++++++++++++++++++------------------------- 1 file changed, 95 insertions(+), 81 deletions(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index 91fcce57ca..933cdf5c93 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -234,6 +234,7 @@ struct presentation_clock IMFPresentationTimeSource *time_source; IMFClockStateSink *time_source_sink; MFCLOCK_STATE state; + LONGLONG start_offset; struct list sinks; struct list timers; float rate; @@ -2504,6 +2505,81 @@ failed: return hr; } +static HRESULT WINAPI sink_notification_QueryInterface(IUnknown *iface, REFIID riid, void **out) +{ + if (IsEqualIID(riid, &IID_IUnknown)) + { + *out = iface; + IUnknown_AddRef(iface); + return S_OK; + } + + WARN("Unsupported %s.\n", debugstr_guid(riid)); + *out = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI sink_notification_AddRef(IUnknown *iface) +{ + struct sink_notification *notification = impl_sink_notification_from_IUnknown(iface); + ULONG refcount = InterlockedIncrement(&notification->refcount); + + TRACE("%p, refcount %u.\n", iface, refcount); + + return refcount; +} + +static ULONG WINAPI sink_notification_Release(IUnknown *iface) +{ + struct sink_notification *notification = impl_sink_notification_from_IUnknown(iface); + ULONG refcount = InterlockedDecrement(&notification->refcount); + + TRACE("%p, refcount %u.\n", iface, refcount); + + if (!refcount) + { + IMFClockStateSink_Release(notification->sink); + heap_free(notification); + } + + return refcount; +} + +static const IUnknownVtbl sinknotificationvtbl = +{ + sink_notification_QueryInterface, + sink_notification_AddRef, + sink_notification_Release, +}; + +static void clock_notify_async_sink(struct presentation_clock *clock, MFTIME system_time, + struct clock_state_change_param param, enum clock_notification notification, IMFClockStateSink *sink) +{ + struct sink_notification *object; + IMFAsyncResult *result; + HRESULT hr; + + object = heap_alloc(sizeof(*object)); + if (!object) + return; + + object->IUnknown_iface.lpVtbl = &sinknotificationvtbl; + object->refcount = 1; + object->system_time = system_time; + object->param = param; + object->notification = notification; + object->sink = sink; + IMFClockStateSink_AddRef(object->sink); + + hr = MFCreateAsyncResult(&object->IUnknown_iface, &clock->sink_callback, NULL, &result); + IUnknown_Release(&object->IUnknown_iface); + if (SUCCEEDED(hr)) + { + MFPutWorkItemEx(MFASYNC_CALLBACK_QUEUE_STANDARD, result); + IMFAsyncResult_Release(result); + } +} + static HRESULT WINAPI present_clock_QueryInterface(IMFPresentationClock *iface, REFIID riid, void **out) { struct presentation_clock *clock = impl_from_IMFPresentationClock(iface); @@ -2762,7 +2838,24 @@ static HRESULT WINAPI present_clock_AddClockStateSink(IMFPresentationClock *ifac } } if (SUCCEEDED(hr)) + { + static const enum clock_notification notifications[MFCLOCK_STATE_PAUSED + 1] = + { + /* MFCLOCK_STATE_INVALID */ 0, /* Does not apply */ + /* MFCLOCK_STATE_RUNNING */ CLOCK_NOTIFY_START, + /* MFCLOCK_STATE_STOPPED */ CLOCK_NOTIFY_STOP, + /* MFCLOCK_STATE_PAUSED */ CLOCK_NOTIFY_PAUSE, + }; + struct clock_state_change_param param; + + if (!clock->is_shut_down && clock->state != MFCLOCK_STATE_INVALID) + { + param.u.offset = clock->start_offset; + clock_notify_async_sink(clock, MFGetSystemTime(), param, notifications[clock->state], sink->state_sink); + } + list_add_tail(&clock->sinks, &sink->entry); + } LeaveCriticalSection(&clock->cs); if (FAILED(hr)) @@ -2801,75 +2894,6 @@ static HRESULT WINAPI present_clock_RemoveClockStateSink(IMFPresentationClock *i return S_OK; } -static HRESULT WINAPI sink_notification_QueryInterface(IUnknown *iface, REFIID riid, void **out) -{ - if (IsEqualIID(riid, &IID_IUnknown)) - { - *out = iface; - IUnknown_AddRef(iface); - return S_OK; - } - - WARN("Unsupported %s.\n", debugstr_guid(riid)); - *out = NULL; - return E_NOINTERFACE; -} - -static ULONG WINAPI sink_notification_AddRef(IUnknown *iface) -{ - struct sink_notification *notification = impl_sink_notification_from_IUnknown(iface); - ULONG refcount = InterlockedIncrement(&notification->refcount); - - TRACE("%p, refcount %u.\n", iface, refcount); - - return refcount; -} - -static ULONG WINAPI sink_notification_Release(IUnknown *iface) -{ - struct sink_notification *notification = impl_sink_notification_from_IUnknown(iface); - ULONG refcount = InterlockedDecrement(&notification->refcount); - - TRACE("%p, refcount %u.\n", iface, refcount); - - if (!refcount) - { - IMFClockStateSink_Release(notification->sink); - heap_free(notification); - } - - return refcount; -} - -static const IUnknownVtbl sinknotificationvtbl = -{ - sink_notification_QueryInterface, - sink_notification_AddRef, - sink_notification_Release, -}; - -static HRESULT create_sink_notification(MFTIME system_time, struct clock_state_change_param param, - enum clock_notification notification, IMFClockStateSink *sink, IUnknown **out) -{ - struct sink_notification *object; - - object = heap_alloc(sizeof(*object)); - if (!object) - return E_OUTOFMEMORY; - - object->IUnknown_iface.lpVtbl = &sinknotificationvtbl; - object->refcount = 1; - object->system_time = system_time; - object->param = param; - object->notification = notification; - object->sink = sink; - IMFClockStateSink_AddRef(object->sink); - - *out = &object->IUnknown_iface; - - return S_OK; -} - static HRESULT clock_call_state_change(MFTIME system_time, struct clock_state_change_param param, enum clock_notification notification, IMFClockStateSink *sink) { @@ -2926,7 +2950,6 @@ static HRESULT clock_change_state(struct presentation_clock *clock, enum clock_c }; enum clock_notification notification; struct clock_sink *sink; - IUnknown *notify_object; MFCLOCK_STATE old_state; IMFAsyncResult *result; MFTIME system_time; @@ -2992,16 +3015,7 @@ static HRESULT clock_change_state(struct presentation_clock *clock, enum clock_c LIST_FOR_EACH_ENTRY(sink, &clock->sinks, struct clock_sink, entry) { - if (SUCCEEDED(create_sink_notification(system_time, param, notification, sink->state_sink, &notify_object))) - { - hr = MFCreateAsyncResult(notify_object, &clock->sink_callback, NULL, &result); - IUnknown_Release(notify_object); - if (SUCCEEDED(hr)) - { - MFPutWorkItemEx(MFASYNC_CALLBACK_QUEUE_STANDARD, result); - IMFAsyncResult_Release(result); - } - } + clock_notify_async_sink(clock, system_time, param, notification, sink->state_sink); } return S_OK; @@ -3016,7 +3030,7 @@ static HRESULT WINAPI present_clock_Start(IMFPresentationClock *iface, LONGLONG TRACE("%p, %s.\n", iface, wine_dbgstr_longlong(start_offset)); EnterCriticalSection(&clock->cs); - param.u.offset = start_offset; + clock->start_offset = param.u.offset = start_offset; hr = clock_change_state(clock, CLOCK_CMD_START, param); LeaveCriticalSection(&clock->cs);

1 0

Nikolay Sivov : mf: Do not touch clock state when setting rate.
by Alexandre Julliard 11 Mar '20

11 Mar '20

Module: wine Branch: master Commit: f5ace38adc2c09f9e63431a514c4845f088369cb URL: https://source.winehq.org/git/wine.git/?a=commit;h=f5ace38adc2c09f9e63431a5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 11 14:19:44 2020 +0300 mf: Do not touch clock state when setting rate. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/session.c | 3 ++- dlls/mf/tests/mf.c | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index 933cdf5c93..cc014f548a 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -2978,7 +2978,8 @@ static HRESULT clock_change_state(struct presentation_clock *clock, enum clock_c return hr; old_state = clock->state; - clock->state = states[command]; + if (command != CLOCK_CMD_SET_RATE) + clock->state = states[command]; /* Dump all pending timer requests immediately on start; otherwise try to cancel scheduled items when transitioning from running state. */ diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index a86a8ecdbb..a9b0ee34a3 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -1797,6 +1797,10 @@ static void test_presentation_clock(void) hr = IMFRateControl_SetRate(rate_control, TRUE, -1.0f); ok(hr == MF_E_THINNING_UNSUPPORTED, "Unexpected hr %#x.\n", hr); + hr = IMFPresentationClock_GetState(clock, 0, &state); + ok(hr == S_OK, "Failed to get clock state, hr %#x.\n", hr); + ok(state == MFCLOCK_STATE_RUNNING, "Unexpected state %d.\n", state); + hr = IMFRateControl_GetRate(rate_control, &thin, &rate); ok(hr == S_OK, "Failed to get clock rate, hr %#x.\n", hr); ok(rate == 0.5f, "Unexpected rate.\n");

1 0

Nikolay Sivov : mf/tests: Remove tests causing occasional crashes on Windows.
by Alexandre Julliard 11 Mar '20

11 Mar '20

Module: wine Branch: master Commit: 2a2d09c50e564ae16e79b80c598af537b535a82f URL: https://source.winehq.org/git/wine.git/?a=commit;h=2a2d09c50e564ae16e79b80c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 11 14:19:45 2020 +0300 mf/tests: Remove tests causing occasional crashes on Windows. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/tests/mf.c | 44 -------------------------------------------- 1 file changed, 44 deletions(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index a9b0ee34a3..8ebfd0ddee 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -875,14 +875,8 @@ static void test_sequencer_source(void) struct test_callback { IMFAsyncCallback IMFAsyncCallback_iface; - HANDLE event; }; -static struct test_callback *impl_from_IMFAsyncCallback(IMFAsyncCallback *iface) -{ - return CONTAINING_RECORD(iface, struct test_callback, IMFAsyncCallback_iface); -} - static HRESULT WINAPI testcallback_QueryInterface(IMFAsyncCallback *iface, REFIID riid, void **obj) { if (IsEqualIID(riid, &IID_IMFAsyncCallback) || @@ -915,34 +909,8 @@ static HRESULT WINAPI testcallback_GetParameters(IMFAsyncCallback *iface, DWORD static HRESULT WINAPI testcallback_Invoke(IMFAsyncCallback *iface, IMFAsyncResult *result) { - struct test_callback *callback = impl_from_IMFAsyncCallback(iface); - IMFMediaSession *session; - IUnknown *state, *obj; - HRESULT hr; - ok(result != NULL, "Unexpected result object.\n"); - state = IMFAsyncResult_GetStateNoAddRef(result); - if (state && SUCCEEDED(IUnknown_QueryInterface(state, &IID_IMFMediaSession, (void **)&session))) - { - IMFMediaEvent *event; - - hr = IMFMediaSession_EndGetEvent(session, result, &event); - ok(hr == S_OK, "Failed to finalize GetEvent, hr %#x.\n", hr); - - hr = IMFAsyncResult_GetObject(result, &obj); - ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); - - IMFMediaEvent_Release(event); - - hr = IMFMediaSession_EndGetEvent(session, result, &event); - ok(hr == E_FAIL, "Unexpected result, hr %#x.\n", hr); - - IMFMediaSession_Release(session); - - SetEvent(callback->event); - } - return E_NOTIMPL; } @@ -958,7 +926,6 @@ static const IMFAsyncCallbackVtbl testcallbackvtbl = static void init_test_callback(struct test_callback *callback) { callback->IMFAsyncCallback_iface.lpVtbl = &testcallbackvtbl; - callback->event = NULL; } static void test_session_events(IMFMediaSession *session) @@ -967,7 +934,6 @@ static void test_session_events(IMFMediaSession *session) IMFAsyncResult *result; IMFMediaEvent *event; HRESULT hr; - DWORD ret; init_test_callback(&callback); init_test_callback(&callback2); @@ -998,16 +964,6 @@ static void test_session_events(IMFMediaSession *session) hr = IMFMediaSession_BeginGetEvent(session, &callback2.IMFAsyncCallback_iface, (IUnknown *)&callback.IMFAsyncCallback_iface); ok(hr == MF_E_MULTIPLE_SUBSCRIBERS, "Unexpected hr %#x.\n", hr); - callback.event = CreateEventA(NULL, FALSE, FALSE, NULL); - - hr = IMFMediaSession_QueueEvent(session, MEError, &GUID_NULL, E_FAIL, NULL); - ok(hr == S_OK, "Failed to queue event, hr %#x.\n", hr); - - ret = WaitForSingleObject(callback.event, 100); - ok(ret == WAIT_OBJECT_0, "Unexpected return value %#x.\n", ret); - - CloseHandle(callback.event); - hr = MFCreateAsyncResult(NULL, &callback.IMFAsyncCallback_iface, NULL, &result); ok(hr == S_OK, "Failed to create result, hr %#x.\n", hr);

1 0

Francois Gouget : kernel32/tests: Fix a race condition in test_WaitForJobObject().
by Alexandre Julliard 11 Mar '20

11 Mar '20

Module: wine Branch: master Commit: 5a66e3e0d82ee55b78095be1a8668639107e6bb5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5a66e3e0d82ee55b78095be1… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 11 09:28:44 2020 +0100 kernel32/tests: Fix a race condition in test_WaitForJobObject(). Synchronize with the child process to ensure it does not exit before being added to the test job. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48642 Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/process.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index b5ed99062e..1d426dd017 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -2759,7 +2759,8 @@ static void test_KillOnJobClose(void) static void test_WaitForJobObject(void) { - HANDLE job; + HANDLE job, sem; + char buffer[50]; PROCESS_INFORMATION pi; BOOL ret; DWORD dwret; @@ -2826,10 +2827,13 @@ static void test_WaitForJobObject(void) dwret = WaitForSingleObject(job, 100); ok(dwret == WAIT_TIMEOUT, "WaitForSingleObject returned %u\n", dwret); - create_process("exit", &pi); + sprintf(buffer, "sync kernel32-process-%x", GetCurrentProcessId()); + sem = CreateSemaphoreA(NULL, 0, 1, buffer); + create_process(buffer, &pi); ret = pAssignProcessToJobObject(job, pi.hProcess); ok(ret, "AssignProcessToJobObject error %u\n", GetLastError()); + ReleaseSemaphore(sem, 1, NULL); dwret = WaitForSingleObject(job, 100); ok(dwret == WAIT_TIMEOUT, "WaitForSingleObject returned %u\n", dwret); @@ -4047,6 +4051,13 @@ START_TEST(process) ok(0, "Child process not killed\n"); return; } + else if (!strcmp(myARGV[2], "sync") && myARGC >= 4) + { + HANDLE sem = CreateSemaphoreA(NULL, 0, 1, myARGV[3]); + ok(sem != 0, "Could not get the %s semaphore: le=%u\n", myARGV[3], GetLastError()); + if (sem) WaitForSingleObject(sem, 30000); + return; + } else if (!strcmp(myARGV[2], "exit")) { Sleep(100);

1 0

Dmitry Timoshkov : adsldp: Add IParseDisplayName stub interface.
by Alexandre Julliard 11 Mar '20

11 Mar '20

Module: wine Branch: master Commit: 9f20b7f483f091f572b3694ca52409d618773eda URL: https://source.winehq.org/git/wine.git/?a=commit;h=9f20b7f483f091f572b3694c… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Mar 10 15:42:37 2020 +0800 adsldp: Add IParseDisplayName stub interface. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/adsldp/Makefile.in | 2 +- dlls/adsldp/adsldp.c | 96 ++++++++++++++++++++++++++++++++++++++++++++---- dlls/adsldp/adsldp.idl | 8 ++++ dlls/adsldp/tests/ldap.c | 92 ++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 189 insertions(+), 9 deletions(-) diff --git a/dlls/adsldp/Makefile.in b/dlls/adsldp/Makefile.in index 6d760c8682..cfa84c3fd0 100644 --- a/dlls/adsldp/Makefile.in +++ b/dlls/adsldp/Makefile.in @@ -1,5 +1,5 @@ MODULE = adsldp.dll -IMPORTS = oleaut32 secur32 +IMPORTS = ole32 oleaut32 secur32 EXTRADLLFLAGS = -mno-cygwin diff --git a/dlls/adsldp/adsldp.c b/dlls/adsldp/adsldp.c index 7281375e91..5432a0abe2 100644 --- a/dlls/adsldp/adsldp.c +++ b/dlls/adsldp/adsldp.c @@ -36,10 +36,95 @@ WINE_DEFAULT_DEBUG_CHANNEL(adsldp); +DEFINE_GUID(CLSID_LDAP,0x228d9a81,0xc302,0x11cf,0x9a,0xa4,0x00,0xaa,0x00,0x4a,0x56,0x91); DEFINE_GUID(CLSID_LDAPNamespace,0x228d9a82,0xc302,0x11cf,0x9a,0xa4,0x00,0xaa,0x00,0x4a,0x56,0x91); static HMODULE adsldp_hinst; +static HRESULT LDAPNamespace_create(REFIID riid, void **obj); + +typedef struct +{ + IParseDisplayName IParseDisplayName_iface; + LONG ref; +} LDAP_PARSE; + +static inline LDAP_PARSE *impl_from_IParseDisplayName(IParseDisplayName *iface) +{ + return CONTAINING_RECORD(iface, LDAP_PARSE, IParseDisplayName_iface); +} + +static HRESULT WINAPI ldap_QueryInterface(IParseDisplayName *iface, REFIID riid, void **obj) +{ + TRACE("%p,%s,%p\n", iface, debugstr_guid(riid), obj); + + if (!riid || !obj) return E_INVALIDARG; + + if (IsEqualGUID(riid, &IID_IUnknown) || + IsEqualGUID(riid, &IID_IParseDisplayName)) + { + IParseDisplayName_AddRef(iface); + *obj = iface; + return S_OK; + } + + *obj = NULL; + FIXME("interface %s is not implemented\n", debugstr_guid(riid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI ldap_AddRef(IParseDisplayName *iface) +{ + LDAP_PARSE *ldap = impl_from_IParseDisplayName(iface); + return InterlockedIncrement(&ldap->ref); +} + +static ULONG WINAPI ldap_Release(IParseDisplayName *iface) +{ + LDAP_PARSE *ldap = impl_from_IParseDisplayName(iface); + LONG ref = InterlockedDecrement(&ldap->ref); + + if (!ref) + { + TRACE("destroying %p\n", iface); + heap_free(ldap); + } + + return ref; +} + +static HRESULT WINAPI ldap_ParseDisplayName(IParseDisplayName *iface, IBindCtx *bc, + LPOLESTR name, ULONG *eaten, IMoniker **mk) +{ + FIXME("%p,%p,%s,%p,%p: stub\n", iface, bc, debugstr_w(name), eaten, mk); + return E_NOTIMPL; +} + +static const IParseDisplayNameVtbl LDAP_PARSE_vtbl = +{ + ldap_QueryInterface, + ldap_AddRef, + ldap_Release, + ldap_ParseDisplayName +}; + +static HRESULT LDAP_create(REFIID riid, void **obj) +{ + LDAP_PARSE *ldap; + HRESULT hr; + + ldap = heap_alloc(sizeof(*ldap)); + if (!ldap) return E_OUTOFMEMORY; + + ldap->IParseDisplayName_iface.lpVtbl = &LDAP_PARSE_vtbl; + ldap->ref = 1; + + hr = IParseDisplayName_QueryInterface(&ldap->IParseDisplayName_iface, riid, obj); + IParseDisplayName_Release(&ldap->IParseDisplayName_iface); + + return hr; +} + typedef struct { IADsADSystemInfo IADsADSystemInfo_iface; @@ -66,6 +151,7 @@ static HRESULT WINAPI sysinfo_QueryInterface(IADsADSystemInfo *iface, REFIID rii return S_OK; } + *obj = NULL; FIXME("interface %s is not implemented\n", debugstr_guid(riid)); return E_NOINTERFACE; } @@ -560,6 +646,7 @@ static const struct class_info } class_info[] = { { &CLSID_ADSystemInfo, ADSystemInfo_create }, + { &CLSID_LDAP, LDAP_create }, { &CLSID_LDAPNamespace, LDAPNamespace_create }, }; @@ -666,7 +753,6 @@ static HRESULT factory_constructor(const struct class_info *info, REFIID riid, v HRESULT WINAPI DllGetClassObject(REFCLSID clsid, REFIID iid, LPVOID *obj) { - const struct class_info *info = NULL; int i; TRACE("%s,%s,%p\n", debugstr_guid(clsid), debugstr_guid(iid), obj); @@ -678,15 +764,9 @@ HRESULT WINAPI DllGetClassObject(REFCLSID clsid, REFIID iid, LPVOID *obj) for (i = 0; i < ARRAY_SIZE(class_info); i++) { if (IsEqualCLSID(class_info[i].clsid, clsid)) - { - info = &class_info[i]; - break; - } + return factory_constructor(&class_info[i], iid, obj); } - if (info) - return factory_constructor(info, iid, obj); - FIXME("class %s/%s is not implemented\n", debugstr_guid(clsid), debugstr_guid(iid)); return CLASS_E_CLASSNOTAVAILABLE; } diff --git a/dlls/adsldp/adsldp.idl b/dlls/adsldp/adsldp.idl index b9549419e2..85190bc693 100644 --- a/dlls/adsldp/adsldp.idl +++ b/dlls/adsldp/adsldp.idl @@ -20,6 +20,14 @@ #pragma makedep register +[ + helpstring("LDAP Provider Object"), + progid("LDAP"), + uuid(228d9a81-c302-11cf-9aa4-00aa004a5691), + threading(both) +] +coclass LDAP { interface IParseDisplayName; } + [ helpstring("LDAP Namespace Object"), progid("LDAPNamespace"), diff --git a/dlls/adsldp/tests/ldap.c b/dlls/adsldp/tests/ldap.c index e2ce9ee1a2..cc0b42c1c5 100644 --- a/dlls/adsldp/tests/ldap.c +++ b/dlls/adsldp/tests/ldap.c @@ -27,11 +27,36 @@ #include "winbase.h" #include "objbase.h" #include "iads.h" +#include "adserr.h" #include "wine/test.h" #include "initguid.h" +DEFINE_GUID(CLSID_LDAP,0x228d9a81,0xc302,0x11cf,0x9a,0xa4,0x00,0xaa,0x00,0x4a,0x56,0x91); DEFINE_GUID(CLSID_LDAPNamespace,0x228d9a82,0xc302,0x11cf,0x9a,0xa4,0x00,0xaa,0x00,0x4a,0x56,0x91); +DEFINE_OLEGUID(CLSID_PointerMoniker,0x306,0,0); + +static const struct +{ + const WCHAR *path; + HRESULT hr, hr_ads_open, hr_ads_get; +} test[] = +{ + { L"invalid", MK_E_SYNTAX, E_ADS_BAD_PATHNAME, E_FAIL }, + { L"LDAP", MK_E_SYNTAX, E_ADS_BAD_PATHNAME, E_FAIL }, + { L"LDAP:", S_OK }, + { L"LDAP:/", E_ADS_BAD_PATHNAME }, + { L"LDAP://", E_ADS_BAD_PATHNAME }, + { L"LDAP://ldap.forumsys.com", S_OK }, + { L"LDAP:///ldap.forumsys.com", E_ADS_BAD_PATHNAME }, + { L"LDAP://ldap.forumsys.com:389", S_OK }, + { L"LDAP://ldap.forumsys.com:389/DC=example,DC=com", S_OK }, + { L"LDAP://ldap.forumsys.com/", E_ADS_BAD_PATHNAME }, + { L"LDAP://ldap.forumsys.com/rootDSE", S_OK }, + { L"LDAP://ldap.forumsys.com/rootDSE/", E_ADS_BAD_PATHNAME }, + { L"LDAP://ldap.forumsys.com/rootDSE/invalid", E_ADS_BAD_PATHNAME }, + /*{ L"LDAP://invalid", __HRESULT_FROM_WIN32(ERROR_DS_INVALID_DN_SYNTAX) }, takes way too much time */ +}; static void test_LDAP(void) { @@ -68,6 +93,72 @@ if (hr == S_OK) IUnknown_Release(unk); } +static void test_ParseDisplayName(void) +{ + HRESULT hr; + IBindCtx *bc; + IParseDisplayName *parse; + IMoniker *mk; + IUnknown *unk; + CLSID clsid; + BSTR path; + ULONG count; + int i; + + hr = CoCreateInstance(&CLSID_LDAP, 0, CLSCTX_INPROC_SERVER, &IID_IParseDisplayName, (void **)&parse); + ok(hr == S_OK, "got %#x\n", hr); + IParseDisplayName_Release(parse); + + hr = CoCreateInstance(&CLSID_LDAP, 0, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void **)&unk); + ok(hr == S_OK, "got %#x\n", hr); + hr = IUnknown_QueryInterface(unk, &IID_IParseDisplayName, (void **)&parse); + ok(hr == S_OK, "got %#x\n", hr); + IUnknown_Release(unk); + + hr = CreateBindCtx(0, &bc); + ok(hr == S_OK, "got %#x\n", hr); + + for (i = 0; i < ARRAY_SIZE(test); i++) + { + path = SysAllocString(test[i].path); + + count = 0xdeadbeef; + hr = IParseDisplayName_ParseDisplayName(parse, bc, path, &count, &mk); +todo_wine + ok(hr == test[i].hr || hr == test[i].hr_ads_open, "%d: got %#x, expected %#x\n", i, hr, test[i].hr); + if (hr == S_OK) + { + ok(count == lstrlenW(test[i].path), "%d: got %d\n", i, count); + + hr = IMoniker_GetClassID(mk, &clsid); + ok(hr == S_OK, "got %#x\n", hr); + ok(IsEqualGUID(&clsid, &CLSID_PointerMoniker), "%d: got %s\n", i, wine_dbgstr_guid(&clsid)); + + IMoniker_Release(mk); + } + + SysFreeString(path); + + count = 0xdeadbeef; + hr = MkParseDisplayName(bc, test[i].path, &count, &mk); +todo_wine + ok(hr == test[i].hr, "%d: got %#x, expected %#x\n", i, hr, test[i].hr); + if (hr == S_OK) + { + ok(count == lstrlenW(test[i].path), "%d: got %d\n", i, count); + + hr = IMoniker_GetClassID(mk, &clsid); + ok(hr == S_OK, "got %#x\n", hr); + ok(IsEqualGUID(&clsid, &CLSID_PointerMoniker), "%d: got %s\n", i, wine_dbgstr_guid(&clsid)); + + IMoniker_Release(mk); + } + } + + IBindCtx_Release(bc); + IParseDisplayName_Release(parse); +} + START_TEST(ldap) { HRESULT hr; @@ -76,6 +167,7 @@ START_TEST(ldap) ok(hr == S_OK, "got %#x\n", hr); test_LDAP(); + test_ParseDisplayName(); CoUninitialize(); }

1 0