April 2021 - Wine-Commits - list.winehq.org

Vijay Kiran Kamuju : dhtmled.ocx: Add IProvideClassInfo2 stub interface.
by Alexandre Julliard April 7, 2021

April 7, 2021

Module: wine Branch: master Commit: ff06e37c577f00f93b900142af87464d94169b0c URL: https://source.winehq.org/git/wine.git/?a=commit;h=ff06e37c577f00f93b900142… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Wed Apr 7 12:11:14 2021 +0200 dhtmled.ocx: Add IProvideClassInfo2 stub interface. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dhtmled.ocx/edit.c | 51 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/dlls/dhtmled.ocx/edit.c b/dlls/dhtmled.ocx/edit.c index 55520b34607..8c6c92f05f7 100644 --- a/dlls/dhtmled.ocx/edit.c +++ b/dlls/dhtmled.ocx/edit.c @@ -29,6 +29,7 @@ typedef struct { IDHTMLEdit IDHTMLEdit_iface; IOleObject IOleObject_iface; + IProvideClassInfo2 IProvideClassInfo2_iface; IPersistStreamInit IPersistStreamInit_iface; IOleControl IOleControl_iface; IOleInPlaceObjectWindowless IOleInPlaceObjectWindowless_iface; @@ -48,6 +49,11 @@ static inline DHTMLEditImpl *impl_from_IOleObject(IOleObject *iface) return CONTAINING_RECORD(iface, DHTMLEditImpl, IOleObject_iface); } +static inline DHTMLEditImpl *impl_from_IProvideClassInfo2(IProvideClassInfo2 *iface) +{ + return CONTAINING_RECORD(iface, DHTMLEditImpl, IProvideClassInfo2_iface); +} + static inline DHTMLEditImpl *impl_from_IPersistStreamInit(IPersistStreamInit *iface) { return CONTAINING_RECORD(iface, DHTMLEditImpl, IPersistStreamInit_iface); @@ -95,6 +101,13 @@ static HRESULT dhtml_edit_qi(DHTMLEditImpl *This, REFIID iid, void **out) *out = &This->IOleObject_iface; return S_OK; } + else if (IsEqualGUID(iid, &IID_IProvideClassInfo) || + IsEqualGUID(iid, &IID_IProvideClassInfo2)) + { + dhtml_edit_addref(This); + *out = &This->IProvideClassInfo2_iface; + return S_OK; + } else if (IsEqualGUID(iid, &IID_IPersistStreamInit)) { dhtml_edit_addref(This); @@ -826,6 +839,43 @@ static const IOleObjectVtbl OleObjectVtbl = { OleObject_SetColorScheme }; +static HRESULT WINAPI ProvideClassInfo2_QueryInterface(IProvideClassInfo2 *iface, REFIID iid, LPVOID *out) +{ + return dhtml_edit_qi(impl_from_IProvideClassInfo2(iface), iid, out); +} + +static ULONG WINAPI ProvideClassInfo2_AddRef(IProvideClassInfo2 *iface) +{ + return dhtml_edit_addref(impl_from_IProvideClassInfo2(iface)); +} + +static ULONG WINAPI ProvideClassInfo2_Release(IProvideClassInfo2 *iface) +{ + return dhtml_edit_release(impl_from_IProvideClassInfo2(iface)); +} + +static HRESULT WINAPI ProvideClassInfo2_GetClassInfo(IProvideClassInfo2 *iface, ITypeInfo **ppTI) +{ + DHTMLEditImpl *This = impl_from_IProvideClassInfo2(iface); + FIXME("(%p)->(%p)\n", This, ppTI); + return E_NOTIMPL; +} + +static HRESULT WINAPI ProvideClassInfo2_GetGUID(IProvideClassInfo2 *iface, DWORD dwGuidKind, GUID *pGUID) +{ + DHTMLEditImpl *This = impl_from_IProvideClassInfo2(iface); + FIXME("(%p)->(%d %p)\n", This, dwGuidKind, pGUID); + return E_NOTIMPL; +} + +static const IProvideClassInfo2Vtbl ProvideClassInfo2Vtbl = { + ProvideClassInfo2_QueryInterface, + ProvideClassInfo2_AddRef, + ProvideClassInfo2_Release, + ProvideClassInfo2_GetClassInfo, + ProvideClassInfo2_GetGUID +}; + static HRESULT WINAPI PersistStreamInit_QueryInterface(IPersistStreamInit *iface, REFIID iid, void **out) { return dhtml_edit_qi(impl_from_IPersistStreamInit(iface), iid, out); @@ -1095,6 +1145,7 @@ HRESULT dhtml_edit_create(REFIID iid, void **out) This->IDHTMLEdit_iface.lpVtbl = &DHTMLEditVtbl; This->IOleObject_iface.lpVtbl = &OleObjectVtbl; + This->IProvideClassInfo2_iface.lpVtbl = &ProvideClassInfo2Vtbl; This->IPersistStreamInit_iface.lpVtbl = &PersistStreamInitVtbl; This->IOleControl_iface.lpVtbl = &OleControlVtbl; This->IOleInPlaceObjectWindowless_iface.lpVtbl = &OleInPlaceObjectWindowlessVtbl;

1 0

Nikolay Sivov : mfplay: Use CRT functions for heap allocations.
by Alexandre Julliard April 7, 2021

April 7, 2021

Module: wine Branch: master Commit: 326f44e1c710b34bc42add9951ad91000102df13 URL: https://source.winehq.org/git/wine.git/?a=commit;h=326f44e1c710b34bc42add99… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 7 11:07:07 2021 +0300 mfplay: Use CRT functions for heap allocations. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplay/player.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/mfplay/player.c b/dlls/mfplay/player.c index 87a345e6968..0c72395ab1e 100644 --- a/dlls/mfplay/player.c +++ b/dlls/mfplay/player.c @@ -27,7 +27,6 @@ #include "mferror.h" #include "wine/debug.h" -#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(mfplat); @@ -206,7 +205,7 @@ static ULONG WINAPI media_event_Release(IUnknown *iface) break; } - heap_free(event); + free(event); } return refcount; @@ -224,7 +223,7 @@ static HRESULT media_event_create(struct media_player *player, MFP_EVENT_TYPE ev { struct media_event *object; - if (!(object = heap_alloc_zero(sizeof(*object)))) + if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; object->IUnknown_iface.lpVtbl = &media_event_vtbl; @@ -311,7 +310,7 @@ static ULONG WINAPI media_item_Release(IMFPMediaItem *iface) if (item->pd) IMFPresentationDescriptor_Release(item->pd); free(item->url); - heap_free(item); + free(item); } return refcount; @@ -554,7 +553,7 @@ static HRESULT create_media_item(IMFPMediaPlayer *player, DWORD_PTR user_data, s { struct media_item *object; - if (!(object = heap_alloc_zero(sizeof(*object)))) + if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; object->IMFPMediaItem_iface.lpVtbl = &media_item_vtbl; @@ -659,7 +658,7 @@ static ULONG WINAPI media_player_Release(IMFPMediaPlayer *iface) IMFMediaSession_Release(player->session); DestroyWindow(player->event_window); DeleteCriticalSection(&player->cs); - heap_free(player); + free(player); platform_shutdown(); } @@ -1338,7 +1337,7 @@ HRESULT WINAPI MFPCreateMediaPlayer(const WCHAR *url, BOOL start_playback, MFP_C TRACE("%s, %d, %#x, %p, %p, %p.\n", debugstr_w(url), start_playback, options, callback, window, player); - if (!(object = heap_alloc_zero(sizeof(*object)))) + if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; platform_startup();

1 0

Nikolay Sivov : mfplay: Update player state on session state changes.
by Alexandre Julliard April 7, 2021

April 7, 2021

Module: wine Branch: master Commit: 11f4927fedafca7a61b973941dd56442f68bf18e URL: https://source.winehq.org/git/wine.git/?a=commit;h=11f4927fedafca7a61b97394… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 7 11:07:01 2021 +0300 mfplay: Update player state on session state changes. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplay/player.c | 99 ++++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 85 insertions(+), 14 deletions(-) diff --git a/dlls/mfplay/player.c b/dlls/mfplay/player.c index 6fbbc0f4632..16592f2b3b6 100644 --- a/dlls/mfplay/player.c +++ b/dlls/mfplay/player.c @@ -70,8 +70,10 @@ struct media_player IMFSourceResolver *resolver; IMFMediaSession *session; MFP_CREATION_OPTIONS options; + MFP_MEDIAPLAYER_STATE state; HWND event_window; HWND output_window; + CRITICAL_SECTION cs; }; struct generic_event @@ -215,8 +217,8 @@ static const IUnknownVtbl media_event_vtbl = media_event_Release, }; -static HRESULT media_event_create(MFP_EVENT_TYPE event_type, HRESULT hr, - IMFPMediaPlayer *player, struct media_event **event) +static HRESULT media_event_create(struct media_player *player, MFP_EVENT_TYPE event_type, + HRESULT hr, struct media_event **event) { struct media_event *object; @@ -227,9 +229,9 @@ static HRESULT media_event_create(MFP_EVENT_TYPE event_type, HRESULT hr, object->refcount = 1; object->u.header.eEventType = event_type; object->u.header.hrEvent = hr; - object->u.header.pMediaPlayer = player; + object->u.header.pMediaPlayer = &player->IMFPMediaPlayer_iface; IMFPMediaPlayer_AddRef(object->u.header.pMediaPlayer); - /* FIXME: set player state field */ + object->u.header.eState = player->state; /* FIXME: set properties for some events? */ *event = object; @@ -254,6 +256,16 @@ static LRESULT WINAPI media_player_event_proc(HWND hwnd, UINT msg, WPARAM wparam return DefWindowProcW(hwnd, msg, wparam, lparam); } +static void media_player_set_state(struct media_player *player, MFP_MEDIAPLAYER_STATE state) +{ + if (player->state != MFP_MEDIAPLAYER_STATE_SHUTDOWN) + { + if (state == MFP_MEDIAPLAYER_STATE_SHUTDOWN) + IMFMediaSession_Shutdown(player->session); + player->state = state; + } +} + static HRESULT WINAPI media_item_QueryInterface(IMFPMediaItem *iface, REFIID riid, void **obj) { TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), obj); @@ -628,6 +640,7 @@ static ULONG WINAPI media_player_Release(IMFPMediaPlayer *iface) if (player->session) IMFMediaSession_Release(player->session); DestroyWindow(player->event_window); + DeleteCriticalSection(&player->cs); heap_free(player); platform_shutdown(); @@ -708,9 +721,13 @@ static HRESULT WINAPI media_player_GetSupportedRates(IMFPMediaPlayer *iface, BOO static HRESULT WINAPI media_player_GetState(IMFPMediaPlayer *iface, MFP_MEDIAPLAYER_STATE *state) { - FIXME("%p, %p.\n", iface, state); + struct media_player *player = impl_from_IMFPMediaPlayer(iface); - return E_NOTIMPL; + TRACE("%p, %p.\n", iface, state); + + *state = player->state; + + return S_OK; } static HRESULT WINAPI media_player_CreateMediaItemFromURL(IMFPMediaPlayer *iface, @@ -928,9 +945,15 @@ static HRESULT WINAPI media_player_RemoveAllEffects(IMFPMediaPlayer *iface) static HRESULT WINAPI media_player_Shutdown(IMFPMediaPlayer *iface) { - FIXME("%p.\n", iface); + struct media_player *player = impl_from_IMFPMediaPlayer(iface); - return E_NOTIMPL; + TRACE("%p.\n", iface); + + EnterCriticalSection(&player->cs); + media_player_set_state(player, MFP_MEDIAPLAYER_STATE_SHUTDOWN); + LeaveCriticalSection(&player->cs); + + return S_OK; } static const IMFPMediaPlayerVtbl media_player_vtbl = @@ -1108,7 +1131,7 @@ static HRESULT WINAPI media_player_resolver_callback_Invoke(IMFAsyncCallback *if if (FAILED(hr)) WARN("Failed to set media source, hr %#x.\n", hr); - if (FAILED(media_event_create(MFP_EVENT_TYPE_MEDIAITEM_CREATED, hr, &player->IMFPMediaPlayer_iface, &event))) + if (FAILED(media_event_create(player, MFP_EVENT_TYPE_MEDIAITEM_CREATED, hr, &event))) { WARN("Failed to create event object.\n"); IUnknown_Release(state); @@ -1195,14 +1218,61 @@ static HRESULT WINAPI media_player_session_events_callback_Invoke(IMFAsyncCallba IMFAsyncResult *result) { struct media_player *player = impl_from_session_events_IMFAsyncCallback(iface); - IMFMediaEvent *event; - HRESULT hr; - - if (FAILED(hr = IMFMediaSession_EndGetEvent(player->session, result, &event))) + MediaEventType session_event_type = MEUnknown; + struct media_event *event = NULL; + IMFMediaEvent *session_event; + MFP_MEDIAPLAYER_STATE state; + MFP_EVENT_TYPE event_type; + HRESULT hr, event_status; + + if (FAILED(hr = IMFMediaSession_EndGetEvent(player->session, result, &session_event))) return S_OK; + IMFMediaEvent_GetType(session_event, &session_event_type); + IMFMediaEvent_GetStatus(session_event, &event_status); + + switch (session_event_type) + { + case MESessionStarted: + case MESessionStopped: + case MESessionPaused: + if (session_event_type == MESessionStarted) + { + event_type = MFP_EVENT_TYPE_PLAY; + state = MFP_MEDIAPLAYER_STATE_PLAYING; + } + else if (session_event_type == MESessionStopped) + { + event_type = MFP_EVENT_TYPE_STOP; + state = MFP_MEDIAPLAYER_STATE_STOPPED; + } + else + { + event_type = MFP_EVENT_TYPE_PAUSE; + state = MFP_MEDIAPLAYER_STATE_PAUSED; + } + + EnterCriticalSection(&player->cs); + media_player_set_state(player, state); + media_event_create(player, event_type, event_status, &event); + LeaveCriticalSection(&player->cs); + + /* FIXME: set pMediaItem */ + media_player_queue_event(player, event); + IUnknown_Release(&event->IUnknown_iface); + + break; + default: + ; + } + + if (event) + { + IUnknown_Release(&event->IUnknown_iface); + } + IMFMediaSession_BeginGetEvent(player->session, &player->session_events_callback, NULL); - IMFMediaEvent_Release(event); + IMFMediaEvent_Release(session_event); return S_OK; } @@ -1240,6 +1310,7 @@ HRESULT WINAPI MFPCreateMediaPlayer(const WCHAR *url, BOOL start_playback, MFP_C IMFPMediaPlayerCallback_AddRef(object->callback); object->options = options; object->output_window = window; + InitializeCriticalSection(&object->cs); if (FAILED(hr = CreatePropertyStore(&object->propstore))) goto failed; if (FAILED(hr = MFCreateSourceResolver(&object->resolver)))

1 0

Piotr Caban : msvcp: Remove MSVCP_ prefix from RTTI and vtable related code.
by Alexandre Julliard April 7, 2021

April 7, 2021

Module: wine Branch: master Commit: 84406584942d2b998f8cb3645abeb4836c85991f URL: https://source.winehq.org/git/wine.git/?a=commit;h=84406584942d2b998f8cb364… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Apr 7 12:08:04 2021 +0200 msvcp: Remove MSVCP_ prefix from RTTI and vtable related code. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcirt/msvcirt.c | 116 ++++++++++---------- dlls/msvcirt/msvcirt.spec | 46 ++++---- dlls/msvcp100/msvcp100.spec | 72 ++++++------ dlls/msvcp110/msvcp110.spec | 78 ++++++------- dlls/msvcp120/msvcp120.spec | 78 ++++++------- dlls/msvcp140/msvcp140.spec | 76 ++++++------- dlls/msvcp140_1/msvcp140_1.c | 12 +- dlls/msvcp60/ios.c | 240 ++++++++++++++++++++-------------------- dlls/msvcp60/msvcp60.spec | 136 +++++++++++------------ dlls/msvcp60/string.c | 10 +- dlls/msvcp70/msvcp70.spec | 138 +++++++++++------------ dlls/msvcp71/msvcp71.spec | 132 +++++++++++----------- dlls/msvcp80/msvcp80.spec | 136 +++++++++++------------ dlls/msvcp90/cxx.h | 30 ++--- dlls/msvcp90/exception.c | 158 +++++++++++++------------- dlls/msvcp90/ios.c | 256 +++++++++++++++++++++---------------------- dlls/msvcp90/locale.c | 158 +++++++++++++------------- dlls/msvcp90/misc.c | 28 ++--- dlls/msvcp90/msvcp90.spec | 134 +++++++++++----------- 19 files changed, 1017 insertions(+), 1017 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=84406584942d2b998f8c…

1 0

Haoyang Chen : winhttp: Invalid url decomposition should return failure when it fails.
by Alexandre Julliard April 7, 2021

April 7, 2021

Module: wine Branch: master Commit: f547592bd2173eec9fcb6ef27363a3bd83348f01 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f547592bd2173eec9fcb6ef2… Author: Haoyang Chen <chenhaoyang(a)uniontech.com> Date: Wed Apr 7 18:01:38 2021 +0800 winhttp: Invalid url decomposition should return failure when it fails. Signed-off-by: Haoyang Chen <chenhaoyang(a)uniontech.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/session.c | 5 +++-- dlls/winhttp/tests/winhttp.c | 10 ++++++++++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index 319066db55b..f052c3c569c 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -1854,7 +1854,7 @@ static BOOL run_script( char *script, DWORD size, const WCHAR *url, WINHTTP_PROX uc.dwStructSize = sizeof(uc); uc.dwHostNameLength = -1; - if (WinHttpCrackUrl( url, 0, 0, &uc )) + if ((ret = WinHttpCrackUrl( url, 0, 0, &uc ))) { char *hostnameA = strdupWA_sized( uc.lpszHostName, uc.dwHostNameLength ); @@ -1868,7 +1868,8 @@ static BOOL run_script( char *script, DWORD size, const WCHAR *url, WINHTTP_PROX heap_free( hostnameA ); } heap_free( urlA ); - return InternetDeInitializeAutoProxyDll( NULL, 0 ); + InternetDeInitializeAutoProxyDll( NULL, 0 ); + return ret; } /*********************************************************************** diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 6a61a23ec02..56f35252615 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -4974,6 +4974,9 @@ static void test_WinHttpGetProxyForUrl(void) trace("Proxy.ProxyBypass=%s\n", wine_dbgstr_w(info.lpszProxyBypass)); GlobalFree( info.lpszProxy ); GlobalFree( info.lpszProxyBypass ); + + ret = WinHttpGetProxyForUrl( session, L"http:", &options, &info ); + ok( !ret, "expected failure\n" ); } options.dwFlags = WINHTTP_AUTOPROXY_CONFIG_URL; @@ -4990,6 +4993,13 @@ static void test_WinHttpGetProxyForUrl(void) GlobalFree( info.lpszProxy ); GlobalFree( info.lpszProxyBypass ); } + + options.dwFlags = WINHTTP_AUTOPROXY_AUTO_DETECT; + options.dwAutoDetectFlags = WINHTTP_AUTO_DETECT_TYPE_DHCP|WINHTTP_AUTO_DETECT_TYPE_DNS_A; + + ret = WinHttpGetProxyForUrl( session, L"http:", &options, &info ); + ok( !ret, "expected failure\n" ); + WinHttpCloseHandle( session ); }

1 0

Nikolay Sivov : mfplay: Implement GetSupportedRates().
by Alexandre Julliard April 7, 2021

April 7, 2021

Module: wine Branch: master Commit: b39b55a10be6b294b626b4b2800a81beab4f5029 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b39b55a10be6b294b626b4b2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 7 11:07:04 2021 +0300 mfplay: Implement GetSupportedRates(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplay/player.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/dlls/mfplay/player.c b/dlls/mfplay/player.c index ddc83e9f441..3aa03103240 100644 --- a/dlls/mfplay/player.c +++ b/dlls/mfplay/player.c @@ -722,11 +722,23 @@ static HRESULT WINAPI media_player_GetRate(IMFPMediaPlayer *iface, float *rate) return E_NOTIMPL; } -static HRESULT WINAPI media_player_GetSupportedRates(IMFPMediaPlayer *iface, BOOL forward, float *slowest_rate, float *fastest_rate) +static HRESULT WINAPI media_player_GetSupportedRates(IMFPMediaPlayer *iface, BOOL forward, + float *slowest_rate, float *fastest_rate) { - FIXME("%p, %d, %p, %p.\n", iface, forward, slowest_rate, fastest_rate); + struct media_player *player = impl_from_IMFPMediaPlayer(iface); + IMFRateSupport *rs; + HRESULT hr; - return E_NOTIMPL; + TRACE("%p, %d, %p, %p.\n", iface, forward, slowest_rate, fastest_rate); + + if (SUCCEEDED(hr = MFGetService((IUnknown *)player->session, &MF_RATE_CONTROL_SERVICE, &IID_IMFRateSupport, (void **)&rs))) + { + if (SUCCEEDED(hr = IMFRateSupport_GetSlowestRate(rs, forward ? MFRATE_FORWARD : MFRATE_REVERSE, FALSE, slowest_rate))) + hr = IMFRateSupport_GetFastestRate(rs, forward ? MFRATE_FORWARD : MFRATE_REVERSE, FALSE, fastest_rate); + IMFRateSupport_Release(rs); + } + + return hr; } static HRESULT WINAPI media_player_GetState(IMFPMediaPlayer *iface, MFP_MEDIAPLAYER_STATE *state)

1 0

Vijay Kiran Kamuju : dhtmled.ocx: Add IConnectionPointContainer stub interface.
by Alexandre Julliard April 7, 2021

April 7, 2021

Module: wine Branch: master Commit: bbf940bf932607cb7c286e8c3dc215b98cbc401a URL: https://source.winehq.org/git/wine.git/?a=commit;h=bbf940bf932607cb7c286e8c… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Wed Apr 7 12:11:12 2021 +0200 dhtmled.ocx: Add IConnectionPointContainer stub interface. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dhtmled.ocx/edit.c | 54 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/dlls/dhtmled.ocx/edit.c b/dlls/dhtmled.ocx/edit.c index fc518de7323..7772ec1538b 100644 --- a/dlls/dhtmled.ocx/edit.c +++ b/dlls/dhtmled.ocx/edit.c @@ -31,6 +31,7 @@ typedef struct IOleObject IOleObject_iface; IPersistStreamInit IPersistStreamInit_iface; IOleControl IOleControl_iface; + IConnectionPointContainer IConnectionPointContainer_iface; IOleClientSite *client_site; SIZEL extent; LONG ref; @@ -56,6 +57,11 @@ static inline DHTMLEditImpl *impl_from_IOleControl(IOleControl *iface) return CONTAINING_RECORD(iface, DHTMLEditImpl, IOleControl_iface); } +static inline DHTMLEditImpl *impl_from_IConnectionPointContainer(IConnectionPointContainer *iface) +{ + return CONTAINING_RECORD(iface, DHTMLEditImpl, IConnectionPointContainer_iface); +} + static ULONG dhtml_edit_addref(DHTMLEditImpl *This) { LONG ref = InterlockedIncrement(&This->ref); @@ -95,6 +101,12 @@ static HRESULT dhtml_edit_qi(DHTMLEditImpl *This, REFIID iid, void **out) *out = &This->IOleControl_iface; return S_OK; } + else if(IsEqualGUID(iid, &IID_IConnectionPointContainer)) + { + dhtml_edit_addref(This); + *out = &This->IConnectionPointContainer_iface; + return S_OK; + } *out = NULL; ERR("no interface for %s\n", debugstr_guid(iid)); @@ -923,6 +935,47 @@ static const IOleControlVtbl OleControlVtbl = { OleControl_FreezeEvents }; +static HRESULT WINAPI ConnectionPointContainer_QueryInterface(IConnectionPointContainer *iface, + REFIID iid, LPVOID *out) +{ + return dhtml_edit_qi(impl_from_IConnectionPointContainer(iface), iid, out); +} + +static ULONG WINAPI ConnectionPointContainer_AddRef(IConnectionPointContainer *iface) +{ + return dhtml_edit_addref(impl_from_IConnectionPointContainer(iface)); +} + +static ULONG WINAPI ConnectionPointContainer_Release(IConnectionPointContainer *iface) +{ + return dhtml_edit_release(impl_from_IConnectionPointContainer(iface)); +} + +static HRESULT WINAPI ConnectionPointContainer_EnumConnectionPoints(IConnectionPointContainer *iface, + IEnumConnectionPoints **ppEnum) +{ + DHTMLEditImpl *This = impl_from_IConnectionPointContainer(iface); + FIXME("(%p)->(%p)\n", This, ppEnum); + return E_NOTIMPL; +} + +static HRESULT WINAPI ConnectionPointContainer_FindConnectionPoint(IConnectionPointContainer *iface, + REFIID riid, IConnectionPoint **ppCP) +{ + DHTMLEditImpl *This = impl_from_IConnectionPointContainer(iface); + FIXME("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppCP); + return CONNECT_E_NOCONNECTION; +} + +static const IConnectionPointContainerVtbl ConnectionPointContainerVtbl = +{ + ConnectionPointContainer_QueryInterface, + ConnectionPointContainer_AddRef, + ConnectionPointContainer_Release, + ConnectionPointContainer_EnumConnectionPoints, + ConnectionPointContainer_FindConnectionPoint +}; + HRESULT dhtml_edit_create(REFIID iid, void **out) { DHTMLEditImpl *This; @@ -940,6 +993,7 @@ HRESULT dhtml_edit_create(REFIID iid, void **out) This->IOleObject_iface.lpVtbl = &OleObjectVtbl; This->IPersistStreamInit_iface.lpVtbl = &PersistStreamInitVtbl; This->IOleControl_iface.lpVtbl = &OleControlVtbl; + This->IConnectionPointContainer_iface.lpVtbl = &ConnectionPointContainerVtbl; This->client_site = NULL; This->ref = 1;

1 0

Nikolay Sivov : mfplay: Implement GetDuration() for media items.
by Alexandre Julliard April 7, 2021

April 7, 2021

Module: wine Branch: master Commit: 4c77a97037b35d8fed52a9aebe7b86c32412f086 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4c77a97037b35d8fed52a9ae… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 7 11:07:03 2021 +0300 mfplay: Implement GetDuration() for media items. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplay/player.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/mfplay/player.c b/dlls/mfplay/player.c index 9ef926f00f6..ddc83e9f441 100644 --- a/dlls/mfplay/player.c +++ b/dlls/mfplay/player.c @@ -407,9 +407,11 @@ static HRESULT WINAPI media_item_IsProtected(IMFPMediaItem *iface, BOOL *protect static HRESULT WINAPI media_item_GetDuration(IMFPMediaItem *iface, REFGUID format, PROPVARIANT *value) { - FIXME("%p, %s, %p.\n", iface, debugstr_guid(format), value); + struct media_item *item = impl_from_IMFPMediaItem(iface); - return E_NOTIMPL; + TRACE("%p, %s, %p.\n", iface, debugstr_guid(format), value); + + return IMFPresentationDescriptor_GetItem(item->pd, &MF_PD_DURATION, value); } static HRESULT WINAPI media_item_GetNumberOfStreams(IMFPMediaItem *iface, DWORD *count)

1 0

Nikolay Sivov : mfplay: Implement GetURL().
by Alexandre Julliard April 7, 2021

April 7, 2021

Module: wine Branch: master Commit: 342d7797987c2f890f0e2b13bdfff92333f9ea57 URL: https://source.winehq.org/git/wine.git/?a=commit;h=342d7797987c2f890f0e2b13… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 7 11:07:06 2021 +0300 mfplay: Implement GetURL(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplay/Makefile.in | 2 +- dlls/mfplay/player.c | 23 +++++++++++++++++++++-- 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/dlls/mfplay/Makefile.in b/dlls/mfplay/Makefile.in index c353fa33cc1..8cd572bf638 100644 --- a/dlls/mfplay/Makefile.in +++ b/dlls/mfplay/Makefile.in @@ -1,6 +1,6 @@ MODULE = mfplay.dll IMPORTLIB = mfplay -IMPORTS = mfplat mf user32 uuid mfuuid +IMPORTS = mfplat mf ole32 user32 uuid mfuuid EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native diff --git a/dlls/mfplay/player.c b/dlls/mfplay/player.c index 9f20d6c1a2a..87a345e6968 100644 --- a/dlls/mfplay/player.c +++ b/dlls/mfplay/player.c @@ -24,6 +24,7 @@ #include "winbase.h" #include "mfapi.h" #include "mfplay.h" +#include "mferror.h" #include "wine/debug.h" #include "wine/heap.h" @@ -55,6 +56,7 @@ struct media_item IMFMediaSource *source; IMFPresentationDescriptor *pd; DWORD_PTR user_data; + WCHAR *url; }; struct media_player @@ -308,6 +310,7 @@ static ULONG WINAPI media_item_Release(IMFPMediaItem *iface) IMFMediaSource_Release(item->source); if (item->pd) IMFPresentationDescriptor_Release(item->pd); + free(item->url); heap_free(item); } @@ -329,9 +332,19 @@ static HRESULT WINAPI media_item_GetMediaPlayer(IMFPMediaItem *iface, static HRESULT WINAPI media_item_GetURL(IMFPMediaItem *iface, LPWSTR *url) { - FIXME("%p, %p.\n", iface, url); + struct media_item *item = impl_from_IMFPMediaItem(iface); - return E_NOTIMPL; + TRACE("%p, %p.\n", iface, url); + + if (!item->url) + return MF_E_NOT_FOUND; + + if (!(*url = CoTaskMemAlloc((wcslen(item->url) + 1) * sizeof(*item->url)))) + return E_OUTOFMEMORY; + + wcscpy(*url, item->url); + + return S_OK; } static HRESULT WINAPI media_item_GetObject(IMFPMediaItem *iface, IUnknown **obj) @@ -769,6 +782,12 @@ static HRESULT WINAPI media_player_CreateMediaItemFromURL(IMFPMediaPlayer *iface if (FAILED(hr = create_media_item(iface, user_data, &item))) return hr; + if (url && !(item->url = wcsdup(url))) + { + IMFPMediaItem_Release(&item->IMFPMediaItem_iface); + return E_OUTOFMEMORY; + } + if (sync) { *ret = NULL;

1 0

Vijay Kiran Kamuju : dhtmled.ocx: Add IOleInPlaceActiveObject stub interface.
by Alexandre Julliard April 7, 2021

April 7, 2021

Module: wine Branch: master Commit: f0c68b9a78fa581ca7b05d7c265900a9e1d03f01 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f0c68b9a78fa581ca7b05d7c… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Wed Apr 7 12:11:16 2021 +0200 dhtmled.ocx: Add IOleInPlaceActiveObject stub interface. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dhtmled.ocx/edit.c | 96 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 96 insertions(+) diff --git a/dlls/dhtmled.ocx/edit.c b/dlls/dhtmled.ocx/edit.c index 7554aacbf8f..7a06588d46a 100644 --- a/dlls/dhtmled.ocx/edit.c +++ b/dlls/dhtmled.ocx/edit.c @@ -34,6 +34,7 @@ typedef struct IOleControl IOleControl_iface; IViewObjectEx IViewObjectEx_iface; IOleInPlaceObjectWindowless IOleInPlaceObjectWindowless_iface; + IOleInPlaceActiveObject IOleInPlaceActiveObject_iface; IConnectionPointContainer IConnectionPointContainer_iface; IOleClientSite *client_site; SIZEL extent; @@ -75,6 +76,11 @@ static inline DHTMLEditImpl *impl_from_IOleInPlaceObjectWindowless(IOleInPlaceOb return CONTAINING_RECORD(iface, DHTMLEditImpl, IOleInPlaceObjectWindowless_iface); } +static inline DHTMLEditImpl *impl_from_IOleInPlaceActiveObject(IOleInPlaceActiveObject *iface) +{ + return CONTAINING_RECORD(iface, DHTMLEditImpl, IOleInPlaceActiveObject_iface); +} + static inline DHTMLEditImpl *impl_from_IConnectionPointContainer(IConnectionPointContainer *iface) { return CONTAINING_RECORD(iface, DHTMLEditImpl, IConnectionPointContainer_iface); @@ -142,6 +148,12 @@ static HRESULT dhtml_edit_qi(DHTMLEditImpl *This, REFIID iid, void **out) *out = &This->IOleInPlaceObjectWindowless_iface; return S_OK; } + else if(IsEqualGUID(iid, &IID_IOleInPlaceActiveObject)) + { + dhtml_edit_addref(This); + *out = &This->IOleInPlaceActiveObject_iface; + return S_OK; + } else if(IsEqualGUID(iid, &IID_IConnectionPointContainer)) { dhtml_edit_addref(This); @@ -1254,6 +1266,89 @@ static const IOleInPlaceObjectWindowlessVtbl OleInPlaceObjectWindowlessVtbl = { OleInPlaceObjectWindowless_GetDropTarget }; +static HRESULT WINAPI InPlaceActiveObject_QueryInterface(IOleInPlaceActiveObject *iface, + REFIID iid, LPVOID *out) +{ + return dhtml_edit_qi(impl_from_IOleInPlaceActiveObject(iface), iid, out); +} + +static ULONG WINAPI InPlaceActiveObject_AddRef(IOleInPlaceActiveObject *iface) +{ + return dhtml_edit_addref(impl_from_IOleInPlaceActiveObject(iface)); +} + +static ULONG WINAPI InPlaceActiveObject_Release(IOleInPlaceActiveObject *iface) +{ + return dhtml_edit_release(impl_from_IOleInPlaceActiveObject(iface)); +} + +static HRESULT WINAPI InPlaceActiveObject_GetWindow(IOleInPlaceActiveObject *iface, + HWND *phwnd) +{ + DHTMLEditImpl *This = impl_from_IOleInPlaceActiveObject(iface); + return IOleInPlaceObjectWindowless_GetWindow(&This->IOleInPlaceObjectWindowless_iface, phwnd); +} + +static HRESULT WINAPI InPlaceActiveObject_ContextSensitiveHelp(IOleInPlaceActiveObject *iface, + BOOL fEnterMode) +{ + DHTMLEditImpl *This = impl_from_IOleInPlaceActiveObject(iface); + return IOleInPlaceObjectWindowless_ContextSensitiveHelp(&This->IOleInPlaceObjectWindowless_iface, fEnterMode); +} + +static HRESULT WINAPI InPlaceActiveObject_TranslateAccelerator(IOleInPlaceActiveObject *iface, + LPMSG lpmsg) +{ + DHTMLEditImpl *This = impl_from_IOleInPlaceActiveObject(iface); + FIXME("(%p)->(%p)\n", This, lpmsg); + return E_NOTIMPL; +} + +static HRESULT WINAPI InPlaceActiveObject_OnFrameWindowActivate(IOleInPlaceActiveObject *iface, + BOOL fActivate) +{ + DHTMLEditImpl *This = impl_from_IOleInPlaceActiveObject(iface); + FIXME("(%p)->(%x)\n", This, fActivate); + return E_NOTIMPL; +} + +static HRESULT WINAPI InPlaceActiveObject_OnDocWindowActivate(IOleInPlaceActiveObject *iface, + BOOL fActivate) +{ + DHTMLEditImpl *This = impl_from_IOleInPlaceActiveObject(iface); + FIXME("(%p)->(%x)\n", This, fActivate); + return E_NOTIMPL; +} + +static HRESULT WINAPI InPlaceActiveObject_ResizeBorder(IOleInPlaceActiveObject *iface, + LPCRECT lprcBorder, IOleInPlaceUIWindow *pUIWindow, BOOL fFrameWindow) +{ + DHTMLEditImpl *This = impl_from_IOleInPlaceActiveObject(iface); + FIXME("(%p)->(%p %p %x)\n", This, lprcBorder, pUIWindow, fFrameWindow); + return E_NOTIMPL; +} + +static HRESULT WINAPI InPlaceActiveObject_EnableModeless(IOleInPlaceActiveObject *iface, + BOOL fEnable) +{ + DHTMLEditImpl *This = impl_from_IOleInPlaceActiveObject(iface); + FIXME("(%p)->(%x)\n", This, fEnable); + return E_NOTIMPL; +} + +static const IOleInPlaceActiveObjectVtbl OleInPlaceActiveObjectVtbl = { + InPlaceActiveObject_QueryInterface, + InPlaceActiveObject_AddRef, + InPlaceActiveObject_Release, + InPlaceActiveObject_GetWindow, + InPlaceActiveObject_ContextSensitiveHelp, + InPlaceActiveObject_TranslateAccelerator, + InPlaceActiveObject_OnFrameWindowActivate, + InPlaceActiveObject_OnDocWindowActivate, + InPlaceActiveObject_ResizeBorder, + InPlaceActiveObject_EnableModeless +}; + static HRESULT WINAPI ConnectionPointContainer_QueryInterface(IConnectionPointContainer *iface, REFIID iid, LPVOID *out) { @@ -1315,6 +1410,7 @@ HRESULT dhtml_edit_create(REFIID iid, void **out) This->IOleControl_iface.lpVtbl = &OleControlVtbl; This->IViewObjectEx_iface.lpVtbl = &ViewObjectExVtbl; This->IOleInPlaceObjectWindowless_iface.lpVtbl = &OleInPlaceObjectWindowlessVtbl; + This->IOleInPlaceActiveObject_iface.lpVtbl = &OleInPlaceActiveObjectVtbl; This->IConnectionPointContainer_iface.lpVtbl = &ConnectionPointContainerVtbl; This->client_site = NULL; This->ref = 1;

1 0