April 2022 - Wine-commits - list.winehq.org

Nikolay Sivov : hlink: Use CRT allocation functions.
by Alexandre Julliard 11 Apr '22

11 Apr '22

Module: wine Branch: master Commit: 0dad77afa9b8f6e30946e119cdfbfc1a84f943db URL: https://source.winehq.org/git/wine.git/?a=commit;h=0dad77afa9b8f6e30946e119… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 11 11:40:29 2022 +0300 hlink: Use CRT allocation functions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hlink/browse_ctx.c | 15 +++++++-------- dlls/hlink/extserv.c | 29 +++++++++++++---------------- dlls/hlink/hlink_main.c | 6 +++--- dlls/hlink/hlink_private.h | 17 ----------------- dlls/hlink/link.c | 33 ++++++++++++++++----------------- 5 files changed, 39 insertions(+), 61 deletions(-) diff --git a/dlls/hlink/browse_ctx.c b/dlls/hlink/browse_ctx.c index 58a43b180fc..44db1a1fc0c 100644 --- a/dlls/hlink/browse_ctx.c +++ b/dlls/hlink/browse_ctx.c @@ -88,11 +88,11 @@ static ULONG WINAPI IHlinkBC_fnRelease (IHlinkBrowseContext* iface) { list_remove(&link->entry); IHlink_Release(link->link); - heap_free(link); + free(link); } - heap_free(This->BrowseWindowInfo); - heap_free(This); + free(This->BrowseWindowInfo); + free(This); } return ref; @@ -174,8 +174,8 @@ static HRESULT WINAPI IHlinkBC_SetBrowseWindowInfo(IHlinkBrowseContext* iface, if(!phlbwi) return E_INVALIDARG; - heap_free(This->BrowseWindowInfo); - This->BrowseWindowInfo = heap_alloc(phlbwi->cbSize); + free(This->BrowseWindowInfo); + This->BrowseWindowInfo = malloc(phlbwi->cbSize); memcpy(This->BrowseWindowInfo, phlbwi, phlbwi->cbSize); return S_OK; @@ -209,7 +209,7 @@ static HRESULT WINAPI IHlinkBC_SetInitialHlink(IHlinkBrowseContext* iface, if (!list_empty(&This->links)) return CO_E_ALREADYINITIALIZED; - link = heap_alloc(sizeof(struct link_entry)); + link = malloc(sizeof(struct link_entry)); if (!link) return E_OUTOFMEMORY; HlinkCreateFromMoniker(pimkTarget, pwzLocation, pwzFriendlyName, NULL, @@ -375,14 +375,13 @@ HRESULT HLinkBrowseContext_Constructor(IUnknown *pUnkOuter, REFIID riid, void ** if (pUnkOuter) return CLASS_E_NOAGGREGATION; - hl = heap_alloc_zero(sizeof(HlinkBCImpl)); + hl = calloc(1, sizeof(*hl)); if (!hl) return E_OUTOFMEMORY; hl->ref = 1; hl->IHlinkBrowseContext_iface.lpVtbl = &hlvt; list_init(&hl->links); - hl->current = NULL; *ppv = hl; return S_OK; diff --git a/dlls/hlink/extserv.c b/dlls/hlink/extserv.c index 7a5f62246f4..d6587ce9e79 100644 --- a/dlls/hlink/extserv.c +++ b/dlls/hlink/extserv.c @@ -89,10 +89,10 @@ static ULONG WINAPI ExtServUnk_Release(IUnknown *iface) TRACE("(%p) ref=%ld\n", This, ref); if(!ref) { - heap_free(This->username); - heap_free(This->password); - heap_free(This->headers); - heap_free(This); + free(This->username); + free(This->password); + free(This->headers); + free(This); } return ref; @@ -236,7 +236,7 @@ static HRESULT ExtServ_ImplSetAdditionalHeaders(ExtensionService* This, LPCWSTR { int len; - heap_free(This->headers); + free(This->headers); This->headers = NULL; if (!pwzAdditionalHeaders) @@ -245,11 +245,11 @@ static HRESULT ExtServ_ImplSetAdditionalHeaders(ExtensionService* This, LPCWSTR len = lstrlenW(pwzAdditionalHeaders); if(len && pwzAdditionalHeaders[len-1] != '\n' && pwzAdditionalHeaders[len-1] != '\r') { - This->headers = heap_alloc(len*sizeof(WCHAR) + sizeof(L"\r\n")); + This->headers = malloc(len*sizeof(WCHAR) + sizeof(L"\r\n")); memcpy(This->headers, pwzAdditionalHeaders, len*sizeof(WCHAR)); memcpy(This->headers+len, L"\r\n", sizeof(L"\r\n")); }else { - This->headers = hlink_strdupW(pwzAdditionalHeaders); + This->headers = wcsdup(pwzAdditionalHeaders); } return S_OK; @@ -266,12 +266,12 @@ static HRESULT WINAPI ExtServ_SetAdditionalHeaders(IExtensionServices* iface, LP static HRESULT ExtServ_ImplSetAuthenticateData(ExtensionService* This, HWND phwnd, LPCWSTR pwzUsername, LPCWSTR pwzPassword) { - heap_free(This->username); - heap_free(This->password); + free(This->username); + free(This->password); This->hwnd = phwnd; - This->username = hlink_strdupW(pwzUsername); - This->password = hlink_strdupW(pwzPassword); + This->username = wcsdup(pwzUsername); + This->password = wcsdup(pwzPassword); return S_OK; } @@ -307,17 +307,14 @@ HRESULT WINAPI HlinkCreateExtensionServices(LPCWSTR pwzAdditionalHeaders, phwnd, debugstr_w(pszUsername), debugstr_w(pszPassword), punkOuter, debugstr_guid(riid), ppv); - ret = heap_alloc(sizeof(*ret)); + if (!(ret = calloc(1, sizeof(*ret)))) + return E_OUTOFMEMORY; ret->IUnknown_inner.lpVtbl = &ExtServUnkVtbl; ret->IAuthenticate_iface.lpVtbl = &AuthenticateVtbl; ret->IHttpNegotiate_iface.lpVtbl = &HttpNegotiateVtbl; ret->IExtensionServices_iface.lpVtbl = &ExtServVtbl; ret->ref = 1; - ret->headers = NULL; - ret->hwnd = NULL; - ret->username = NULL; - ret->password = NULL; ExtServ_ImplSetAuthenticateData(ret, phwnd, pszUsername, pszPassword); ExtServ_ImplSetAdditionalHeaders(ret, pwzAdditionalHeaders); diff --git a/dlls/hlink/hlink_main.c b/dlls/hlink/hlink_main.c index 46a401824ae..e70a066bb05 100644 --- a/dlls/hlink/hlink_main.c +++ b/dlls/hlink/hlink_main.c @@ -103,7 +103,7 @@ HRESULT WINAPI HlinkCreateFromString( LPCWSTR pwzTarget, LPCWSTR pwzLocation, else { int tgt_len = hash - pwzTarget; - tgt = heap_alloc((tgt_len + 1) * sizeof(WCHAR)); + tgt = malloc((tgt_len + 1) * sizeof(WCHAR)); if (!tgt) return E_OUTOFMEMORY; memcpy(tgt, pwzTarget, tgt_len * sizeof(WCHAR)); @@ -116,7 +116,7 @@ HRESULT WINAPI HlinkCreateFromString( LPCWSTR pwzTarget, LPCWSTR pwzLocation, } else { - tgt = hlink_strdupW(pwzTarget); + tgt = wcsdup(pwzTarget); if (!tgt) return E_OUTOFMEMORY; loc = pwzLocation; @@ -130,7 +130,7 @@ HRESULT WINAPI HlinkCreateFromString( LPCWSTR pwzTarget, LPCWSTR pwzLocation, IHlink_SetStringReference(hl, HLINKSETF_TARGET | HLINKSETF_LOCATION, tgt, loc); - heap_free(tgt); + free(tgt); if (pwzFriendlyName) IHlink_SetFriendlyName(hl, pwzFriendlyName); diff --git a/dlls/hlink/hlink_private.h b/dlls/hlink/hlink_private.h index 565c264fee9..cf1befdb78f 100644 --- a/dlls/hlink/hlink_private.h +++ b/dlls/hlink/hlink_private.h @@ -27,26 +27,9 @@ #include "ole2.h" #include "hlink.h" -#include "wine/heap.h" - extern HRESULT HLink_Constructor(IUnknown*,REFIID,void**) DECLSPEC_HIDDEN; extern HRESULT HLinkBrowseContext_Constructor(IUnknown*,REFIID,void**) DECLSPEC_HIDDEN; -static inline LPWSTR hlink_strdupW(LPCWSTR str) -{ - LPWSTR ret = NULL; - - if(str) { - DWORD size; - - size = (lstrlenW(str)+1)*sizeof(WCHAR); - ret = heap_alloc(size); - memcpy(ret, str, size); - } - - return ret; -} - static inline LPWSTR hlink_co_strdupW(LPCWSTR str) { LPWSTR ret = NULL; diff --git a/dlls/hlink/link.c b/dlls/hlink/link.c index 46597488ab1..305f7136a44 100644 --- a/dlls/hlink/link.c +++ b/dlls/hlink/link.c @@ -169,14 +169,14 @@ static ULONG WINAPI IHlink_fnRelease (IHlink* iface) return refCount; TRACE("-- destroying IHlink (%p)\n", This); - heap_free(This->FriendlyName); - heap_free(This->TargetFrameName); - heap_free(This->Location); + free(This->FriendlyName); + free(This->TargetFrameName); + free(This->Location); if (This->Moniker) IMoniker_Release(This->Moniker); if (This->Site) IHlinkSite_Release(This->Site); - heap_free(This); + free(This); return 0; } @@ -248,8 +248,8 @@ static HRESULT WINAPI IHlink_fnSetMonikerReference( IHlink* iface, } if(rfHLSETF & HLINKSETF_LOCATION){ - heap_free(This->Location); - This->Location = hlink_strdupW( pwzLocation ); + free(This->Location); + This->Location = wcsdup( pwzLocation ); } return S_OK; @@ -310,10 +310,10 @@ static HRESULT WINAPI IHlink_fnSetStringReference(IHlink* iface, if (grfHLSETF & HLINKSETF_LOCATION) { - heap_free(This->Location); + free(This->Location); This->Location = NULL; if (pwzLocation && *pwzLocation) - This->Location = hlink_strdupW( pwzLocation ); + This->Location = wcsdup( pwzLocation ); } return S_OK; @@ -399,8 +399,8 @@ static HRESULT WINAPI IHlink_fnSetFriendlyName (IHlink *iface, TRACE("(%p) -> (%s)\n", This, debugstr_w(pwzFriendlyName)); - heap_free(This->FriendlyName); - This->FriendlyName = hlink_strdupW( pwzFriendlyName ); + free(This->FriendlyName); + This->FriendlyName = wcsdup( pwzFriendlyName ); return S_OK; } @@ -447,8 +447,8 @@ static HRESULT WINAPI IHlink_fnSetTargetFrameName(IHlink* iface, HlinkImpl *This = impl_from_IHlink(iface); TRACE("(%p)->(%s)\n", This, debugstr_w(pwzTargetFramename)); - heap_free(This->TargetFrameName); - This->TargetFrameName = hlink_strdupW( pwzTargetFramename ); + free(This->TargetFrameName); + This->TargetFrameName = wcsdup( pwzTargetFramename ); return S_OK; } @@ -767,18 +767,18 @@ static HRESULT read_hlink_string(IStream *pStm, LPWSTR *out_str) TRACE("read len %ld\n", len); - str = heap_alloc(len * sizeof(WCHAR)); + str = malloc(len * sizeof(WCHAR)); if (!str) return E_OUTOFMEMORY; hr = IStream_Read(pStm, str, len * sizeof(WCHAR), &read); if (FAILED(hr)) { - heap_free(str); + free(str); return hr; } if (read != len * sizeof(WCHAR)) { - heap_free(str); + free(str); return STG_E_READFAULT; } TRACE("read string %s\n", debugstr_w(str)); @@ -1137,8 +1137,7 @@ HRESULT HLink_Constructor(IUnknown *pUnkOuter, REFIID riid, void **ppv) if (pUnkOuter) return CLASS_E_NOAGGREGATION; - hl = heap_alloc_zero(sizeof(HlinkImpl)); - if (!hl) + if (!(hl = calloc(1, sizeof(*hl)))) return E_OUTOFMEMORY; hl->ref = 1;

1 0

Nikolay Sivov : hlink: Return requested interface when creating IHlinkBrowseContext instance.
by Alexandre Julliard 11 Apr '22

11 Apr '22

Module: wine Branch: master Commit: 759e2eff8bada2d62d7001bb119917ee31c071c2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=759e2eff8bada2d62d7001bb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 11 11:40:30 2022 +0300 hlink: Return requested interface when creating IHlinkBrowseContext instance. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hlink/browse_ctx.c | 22 ++++++++++++++-------- dlls/hlink/tests/browse_ctx.c | 10 ++++++++++ 2 files changed, 24 insertions(+), 8 deletions(-) diff --git a/dlls/hlink/browse_ctx.c b/dlls/hlink/browse_ctx.c index 44db1a1fc0c..88ee3ea29af 100644 --- a/dlls/hlink/browse_ctx.c +++ b/dlls/hlink/browse_ctx.c @@ -53,14 +53,17 @@ static HRESULT WINAPI IHlinkBC_fnQueryInterface( IHlinkBrowseContext *iface, if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IHlinkBrowseContext)) - *ppvObj = This; - - if (*ppvObj) { - IUnknown_AddRef((IUnknown*)(*ppvObj)); - return S_OK; + *ppvObj = &This->IHlinkBrowseContext_iface; } - return E_NOINTERFACE; + else + { + *ppvObj = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown *)*ppvObj); + return S_OK; } static ULONG WINAPI IHlinkBC_fnAddRef (IHlinkBrowseContext* iface) @@ -368,6 +371,7 @@ static const IHlinkBrowseContextVtbl hlvt = HRESULT HLinkBrowseContext_Constructor(IUnknown *pUnkOuter, REFIID riid, void **ppv) { HlinkBCImpl * hl; + HRESULT hr; TRACE("unkOut=%p riid=%s\n", pUnkOuter, debugstr_guid(riid)); *ppv = NULL; @@ -383,6 +387,8 @@ HRESULT HLinkBrowseContext_Constructor(IUnknown *pUnkOuter, REFIID riid, void ** hl->IHlinkBrowseContext_iface.lpVtbl = &hlvt; list_init(&hl->links); - *ppv = hl; - return S_OK; + hr = IHlinkBrowseContext_QueryInterface(&hl->IHlinkBrowseContext_iface, riid, ppv); + IHlinkBrowseContext_Release(&hl->IHlinkBrowseContext_iface); + + return hr; } diff --git a/dlls/hlink/tests/browse_ctx.c b/dlls/hlink/tests/browse_ctx.c index c0a731bb334..4bd7af9d42f 100644 --- a/dlls/hlink/tests/browse_ctx.c +++ b/dlls/hlink/tests/browse_ctx.c @@ -197,10 +197,20 @@ static void test_GetObject(void) IMoniker_Release(dummy); } +static void test_interfaces(void) +{ + IHlinkBrowseContext *bc; + HRESULT hr; + + hr = HlinkCreateBrowseContext(NULL, &IID_IMoniker, (void **)&bc); + ok(hr == E_NOINTERFACE, "Unexpected hr %#lx.\n", hr); +} + START_TEST(browse_ctx) { CoInitialize(NULL); + test_interfaces(); test_SetInitialHlink(); test_BrowseWindowInfo(); test_GetObject();

1 0

Nikolay Sivov : hlink: Return requested interface when creating IHlink instance.
by Alexandre Julliard 11 Apr '22

11 Apr '22

Module: wine Branch: master Commit: bbb9c273d2063de94a1f75ffae2e249b2e7b3770 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bbb9c273d2063de94a1f75ff… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 11 11:40:31 2022 +0300 hlink: Return requested interface when creating IHlink instance. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hlink/link.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/hlink/link.c b/dlls/hlink/link.c index 305f7136a44..8c7b06f6f2a 100644 --- a/dlls/hlink/link.c +++ b/dlls/hlink/link.c @@ -1130,6 +1130,7 @@ static const IBindStatusCallbackVtbl bind_callback_vtbl = HRESULT HLink_Constructor(IUnknown *pUnkOuter, REFIID riid, void **ppv) { HlinkImpl * hl; + HRESULT hr; TRACE("unkOut=%p riid=%s\n", pUnkOuter, debugstr_guid(riid)); *ppv = NULL; @@ -1146,6 +1147,8 @@ HRESULT HLink_Constructor(IUnknown *pUnkOuter, REFIID riid, void **ppv) hl->IDataObject_iface.lpVtbl = &dovt; hl->IBindStatusCallback_iface.lpVtbl = &bind_callback_vtbl; - *ppv = hl; - return S_OK; + hr = IHlink_QueryInterface(&hl->IHlink_iface, riid, ppv); + IHlink_Release(&hl->IHlink_iface); + + return hr; }

1 0

Nikolay Sivov : hlink: Return correct requested interface from HlinkCreateFromMoniker().
by Alexandre Julliard 11 Apr '22

11 Apr '22

Module: wine Branch: master Commit: 19f802c091344ba87cd6d5c84e8f235418c79a74 URL: https://source.winehq.org/git/wine.git/?a=commit;h=19f802c091344ba87cd6d5c8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 11 11:40:32 2022 +0300 hlink: Return correct requested interface from HlinkCreateFromMoniker(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hlink/hlink_main.c | 15 +++++++-------- dlls/hlink/tests/hlink.c | 17 +++++++++++++++++ 2 files changed, 24 insertions(+), 8 deletions(-) diff --git a/dlls/hlink/hlink_main.c b/dlls/hlink/hlink_main.c index e70a066bb05..3f7a3fcd62e 100644 --- a/dlls/hlink/hlink_main.c +++ b/dlls/hlink/hlink_main.c @@ -49,15 +49,15 @@ HRESULT WINAPI HlinkCreateFromMoniker( IMoniker *pimkTrgt, LPCWSTR pwzLocation, IUnknown* piunkOuter, REFIID riid, void** ppvObj) { IHlink *hl = NULL; - HRESULT r; + HRESULT hr; TRACE("%p %s %s %p %li %p %s %p\n", pimkTrgt, debugstr_w(pwzLocation), debugstr_w(pwzFriendlyName), pihlsite, dwSiteData, piunkOuter, debugstr_guid(riid), ppvObj); - r = CoCreateInstance(&CLSID_StdHlink, piunkOuter, CLSCTX_INPROC_SERVER, riid, (LPVOID*)&hl); - if (FAILED(r)) - return r; + hr = CoCreateInstance(&CLSID_StdHlink, piunkOuter, CLSCTX_INPROC_SERVER, &IID_IHlink, (LPVOID*)&hl); + if (FAILED(hr)) + return hr; IHlink_SetMonikerReference(hl, HLINKSETF_LOCATION | HLINKSETF_TARGET, pimkTrgt, pwzLocation); @@ -66,11 +66,10 @@ HRESULT WINAPI HlinkCreateFromMoniker( IMoniker *pimkTrgt, LPCWSTR pwzLocation, if (pihlsite) IHlink_SetHlinkSite(hl, pihlsite, dwSiteData); - *ppvObj = hl; - - TRACE("Returning %lx\n",r); + hr = IHlink_QueryInterface(hl, riid, ppvObj); + IHlink_Release(hl); - return r; + return hr; } /*********************************************************************** diff --git a/dlls/hlink/tests/hlink.c b/dlls/hlink/tests/hlink.c index 984f952c158..c5c8cd9c81b 100644 --- a/dlls/hlink/tests/hlink.c +++ b/dlls/hlink/tests/hlink.c @@ -2607,6 +2607,22 @@ static void test_HlinkUpdateStackItem(void) CHECK_CALLED(HLF_UpdateHlink); } +static void test_HlinkCreateFromMoniker(void) +{ + IPersistStream *stream; + IMoniker *moniker; + HRESULT hr; + + hr = CreateItemMoniker(L"1", L"1", &moniker); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + hr = HlinkCreateFromMoniker(moniker, L"1", L"a", NULL, 0, NULL, &IID_IPersistStream, (void **)&stream); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + IPersistStream_Release(stream); + + IMoniker_Release(moniker); +} + START_TEST(hlink) { CoInitialize(NULL); @@ -2627,6 +2643,7 @@ START_TEST(hlink) test_StdHlink(); test_Hlink_Navigate(); test_HlinkUpdateStackItem(); + test_HlinkCreateFromMoniker(); CoUninitialize(); }

1 0

Nikolay Sivov : hlink: Return requested interface from HlinkCreateFromString().
by Alexandre Julliard 11 Apr '22

11 Apr '22

Module: wine Branch: master Commit: a08be2a2f8fc22d245b80222bd0643a56a44d25a URL: https://source.winehq.org/git/wine.git/?a=commit;h=a08be2a2f8fc22d245b80222… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 11 11:40:33 2022 +0300 hlink: Return requested interface from HlinkCreateFromString(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hlink/hlink_main.c | 14 +++++++------- dlls/hlink/tests/hlink.c | 11 +++++++++++ 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/dlls/hlink/hlink_main.c b/dlls/hlink/hlink_main.c index 3f7a3fcd62e..8e269f5f375 100644 --- a/dlls/hlink/hlink_main.c +++ b/dlls/hlink/hlink_main.c @@ -80,7 +80,7 @@ HRESULT WINAPI HlinkCreateFromString( LPCWSTR pwzTarget, LPCWSTR pwzLocation, IUnknown* piunkOuter, REFIID riid, void** ppvObj) { IHlink *hl = NULL; - HRESULT r; + HRESULT hr; WCHAR *hash, *tgt; const WCHAR *loc; @@ -88,9 +88,9 @@ HRESULT WINAPI HlinkCreateFromString( LPCWSTR pwzTarget, LPCWSTR pwzLocation, debugstr_w(pwzLocation), debugstr_w(pwzFriendlyName), pihlsite, dwSiteData, piunkOuter, debugstr_guid(riid), ppvObj); - r = CoCreateInstance(&CLSID_StdHlink, piunkOuter, CLSCTX_INPROC_SERVER, riid, (LPVOID*)&hl); - if (FAILED(r)) - return r; + hr = CoCreateInstance(&CLSID_StdHlink, piunkOuter, CLSCTX_INPROC_SERVER, &IID_IHlink, (void **)&hl); + if (FAILED(hr)) + return hr; if (pwzTarget) { @@ -137,10 +137,10 @@ HRESULT WINAPI HlinkCreateFromString( LPCWSTR pwzTarget, LPCWSTR pwzLocation, if (pihlsite) IHlink_SetHlinkSite(hl, pihlsite, dwSiteData); - TRACE("Returning %lx\n",r); - *ppvObj = hl; + hr = IHlink_QueryInterface(hl, riid, ppvObj); + IHlink_Release(hl); - return r; + return hr; } diff --git a/dlls/hlink/tests/hlink.c b/dlls/hlink/tests/hlink.c index c5c8cd9c81b..3c2e8ebf455 100644 --- a/dlls/hlink/tests/hlink.c +++ b/dlls/hlink/tests/hlink.c @@ -2623,6 +2623,16 @@ static void test_HlinkCreateFromMoniker(void) IMoniker_Release(moniker); } +static void test_HlinkCreateFromString(void) +{ + IPersistStream *stream; + HRESULT hr; + + hr = HlinkCreateFromString(L"http://winehq.org", NULL, NULL, NULL, 0, NULL, &IID_IPersistStream, (void **)&stream); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + IPersistStream_Release(stream); +} + START_TEST(hlink) { CoInitialize(NULL); @@ -2644,6 +2654,7 @@ START_TEST(hlink) test_Hlink_Navigate(); test_HlinkUpdateStackItem(); test_HlinkCreateFromMoniker(); + test_HlinkCreateFromString(); CoUninitialize(); }

1 0

Nikolay Sivov : mfplat: Fix alignment used by audio buffers created with MFCreateMediaBufferFromMediaType().
by Alexandre Julliard 11 Apr '22

11 Apr '22

Module: wine Branch: master Commit: b159edc6793a2be16028ae28e41d47951c443a4e URL: https://source.winehq.org/git/wine.git/?a=commit;h=b159edc6793a2be16028ae28… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 11 11:44:35 2022 +0300 mfplat: Fix alignment used by audio buffers created with MFCreateMediaBufferFromMediaType(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/buffer.c | 6 +++--- dlls/mfplat/tests/mfplat.c | 54 ++++++++++++++++++++++++++++++++++++++-------- 2 files changed, 48 insertions(+), 12 deletions(-) diff --git a/dlls/mfplat/buffer.c b/dlls/mfplat/buffer.c index 8ea2283e24b..eada3df18ad 100644 --- a/dlls/mfplat/buffer.c +++ b/dlls/mfplat/buffer.c @@ -1596,6 +1596,8 @@ HRESULT WINAPI MFCreateMediaBufferFromMediaType(IMFMediaType *media_type, LONGLO if (FAILED(IMFMediaType_GetUINT32(media_type, &MF_MT_AUDIO_BLOCK_ALIGNMENT, &block_alignment))) WARN("Block alignment was not specified.\n"); + alignment = max(16, alignment); + if (block_alignment) { avg_length = 0; @@ -1610,8 +1612,6 @@ HRESULT WINAPI MFCreateMediaBufferFromMediaType(IMFMediaType *media_type, LONGLO } } - alignment = max(16, alignment); - length = buffer_get_aligned_length(avg_length + 1, alignment); length = buffer_get_aligned_length(length, block_alignment); } @@ -1620,7 +1620,7 @@ HRESULT WINAPI MFCreateMediaBufferFromMediaType(IMFMediaType *media_type, LONGLO length = max(length, min_length); - return create_1d_buffer(length, MF_1_BYTE_ALIGNMENT, buffer); + return create_1d_buffer(length, alignment - 1, buffer); } else FIXME("Major type %s is not supported.\n", debugstr_guid(&major)); diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 16d24bbff51..8d21f2ed60e 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -6057,18 +6057,21 @@ static void test_MFCreateMediaBufferFromMediaType(void) unsigned int buffer_length; } audio_tests[] = { - { 0, 0, 0, 4, 0, 20 }, - { 0, 16, 0, 4, 0, 20 }, - { 0, 0, 32, 4, 0, 36 }, - { 0, 64, 32, 4, 0, 64 }, - { 1, 0, 0, 4, 16, 36 }, - { 2, 0, 0, 4, 16, 52 }, + { 0, 0, 0, 4, 0, 20 }, + { 0, 16, 0, 4, 0, 20 }, + { 0, 0, 32, 4, 0, 36 }, + { 0, 64, 32, 4, 0, 64 }, + { 1, 0, 0, 4, 16, 36 }, + { 2, 0, 0, 4, 16, 52 }, + { 2, 0, 64, 4, 16, 68 }, + { 2, 0, 128, 4, 16,132 }, }; + IMFMediaType *media_type, *media_type2; + unsigned int i, alignment; IMFMediaBuffer *buffer; - DWORD length; + DWORD length, max; + BYTE *data; HRESULT hr; - IMFMediaType *media_type; - unsigned int i; if (!pMFCreateMediaBufferFromMediaType) { @@ -6082,9 +6085,15 @@ static void test_MFCreateMediaBufferFromMediaType(void) hr = MFCreateMediaType(&media_type); ok(hr == S_OK, "Failed to create media type, hr %#lx.\n", hr); + hr = MFCreateMediaType(&media_type2); + ok(hr == S_OK, "Failed to create media type, hr %#lx.\n", hr); + hr = IMFMediaType_SetGUID(media_type, &MF_MT_MAJOR_TYPE, &MFMediaType_Audio); ok(hr == S_OK, "Failed to set attribute, hr %#lx.\n", hr); + hr = IMFMediaType_CopyAllItems(media_type, (IMFAttributes *)media_type2); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + for (i = 0; i < ARRAY_SIZE(audio_tests); ++i) { const struct audio_buffer_test *ptr = &audio_tests[i]; @@ -6107,10 +6116,37 @@ static void test_MFCreateMediaBufferFromMediaType(void) ok(hr == S_OK, "Failed to get length, hr %#lx.\n", hr); ok(ptr->buffer_length == length, "%d: unexpected buffer length %lu, expected %u.\n", i, length, ptr->buffer_length); + alignment = ptr->min_alignment ? ptr->min_alignment - 1 : MF_16_BYTE_ALIGNMENT; + hr = IMFMediaBuffer_Lock(buffer, &data, &max, &length); + ok(hr == S_OK, "Failed to lock, hr %#lx.\n", hr); + ok(ptr->buffer_length == max && !length, "Unexpected length.\n"); + ok(!((uintptr_t)data & alignment), "%u: data at %p is misaligned.\n", i, data); + hr = IMFMediaBuffer_Unlock(buffer); + ok(hr == S_OK, "Failed to unlock, hr %#lx.\n", hr); + + IMFMediaBuffer_Release(buffer); + + /* Only major type is set. */ + hr = pMFCreateMediaBufferFromMediaType(media_type2, ptr->duration * 10000000, ptr->min_length, + ptr->min_alignment, &buffer); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + hr = IMFMediaBuffer_GetMaxLength(buffer, &length); + ok(hr == S_OK, "Failed to get length, hr %#lx.\n", hr); + ok(ptr->min_length == length, "%u: unexpected buffer length %lu, expected %u.\n", i, length, ptr->min_length); + + hr = IMFMediaBuffer_Lock(buffer, &data, &max, &length); + ok(hr == S_OK, "Failed to lock, hr %#lx.\n", hr); + ok(ptr->min_length == max && !length, "Unexpected length.\n"); + ok(!((uintptr_t)data & alignment), "%u: data at %p is misaligned.\n", i, data); + hr = IMFMediaBuffer_Unlock(buffer); + ok(hr == S_OK, "Failed to unlock, hr %#lx.\n", hr); + IMFMediaBuffer_Release(buffer); } IMFMediaType_Release(media_type); + IMFMediaType_Release(media_type2); } static void validate_media_type(IMFMediaType *mediatype, const WAVEFORMATEX *format)

1 0

Giovanni Mascellani : mfreadwrite/reader: Make the stream sample allocator callback own a reference to the source reader.
by Alexandre Julliard 11 Apr '22

11 Apr '22

Module: wine Branch: master Commit: cdb0471eca6655051701935f18c7e5987b1fe34c URL: https://source.winehq.org/git/wine.git/?a=commit;h=cdb0471eca6655051701935f… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Sat Apr 9 09:16:17 2022 +0300 mfreadwrite/reader: Make the stream sample allocator callback own a reference to the source reader. The stream sample allocator callback NotifyRelease() method assumes that the source reader is valid. Therefore it must own a reference to it, otherwise it might get called while the source reader is being destroyed, causing a crash. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfreadwrite/reader.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/mfreadwrite/reader.c b/dlls/mfreadwrite/reader.c index bdf2e7f5a6f..2d3da19db10 100644 --- a/dlls/mfreadwrite/reader.c +++ b/dlls/mfreadwrite/reader.c @@ -2282,12 +2282,14 @@ static HRESULT WINAPI stream_sample_allocator_cb_QueryInterface(IMFVideoSampleAl static ULONG WINAPI stream_sample_allocator_cb_AddRef(IMFVideoSampleAllocatorNotify *iface) { - return 2; + struct media_stream *stream = impl_stream_from_IMFVideoSampleAllocatorNotify(iface); + return source_reader_addref(stream->reader); } static ULONG WINAPI stream_sample_allocator_cb_Release(IMFVideoSampleAllocatorNotify *iface) { - return 1; + struct media_stream *stream = impl_stream_from_IMFVideoSampleAllocatorNotify(iface); + return source_reader_release(stream->reader); } static HRESULT WINAPI stream_sample_allocator_cb_NotifyRelease(IMFVideoSampleAllocatorNotify *iface)

1 0

Giovanni Mascellani : mfreadwrite/reader: Unset sample allocator callbacks while destroying the source reader.
by Alexandre Julliard 11 Apr '22

11 Apr '22

Module: wine Branch: master Commit: a233c49519f9f8dea9e6270700c89d52cf7d8879 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a233c49519f9f8dea9e62707… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Sat Apr 9 09:16:18 2022 +0300 mfreadwrite/reader: Unset sample allocator callbacks while destroying the source reader. The sample allocator callbacks own a reference to the source reader, which creates a reference loop and prevents the source reader from being properly destroyed. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfreadwrite/reader.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/dlls/mfreadwrite/reader.c b/dlls/mfreadwrite/reader.c index 2d3da19db10..e7b7b555e68 100644 --- a/dlls/mfreadwrite/reader.c +++ b/dlls/mfreadwrite/reader.c @@ -1412,6 +1412,7 @@ static ULONG WINAPI src_reader_Release(IMFSourceReader *iface) { struct source_reader *reader = impl_from_IMFSourceReader(iface); ULONG refcount = InterlockedDecrement(&reader->public_refcount); + unsigned int i; TRACE("%p, refcount %lu.\n", iface, refcount); @@ -1430,6 +1431,23 @@ static ULONG WINAPI src_reader_Release(IMFSourceReader *iface) LeaveCriticalSection(&reader->cs); } + + for (i = 0; i < reader->stream_count; ++i) + { + struct media_stream *stream = &reader->streams[i]; + IMFVideoSampleAllocatorCallback *callback; + + if (!stream->allocator) + continue; + + if (SUCCEEDED(IMFVideoSampleAllocatorEx_QueryInterface(stream->allocator, &IID_IMFVideoSampleAllocatorCallback, + (void **)&callback))) + { + IMFVideoSampleAllocatorCallback_SetCallback(callback, NULL); + IMFVideoSampleAllocatorCallback_Release(callback); + } + } + source_reader_release(reader); }

1 0

Eric Pouech : combase: Use I64 width modifier for 64-bit integers.
by Alexandre Julliard 11 Apr '22

11 Apr '22

Module: wine Branch: master Commit: b7f839e5837782ce9db10a1039644f1704ac9990 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b7f839e5837782ce9db10a10… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Apr 8 09:12:00 2022 +0200 combase: Use I64 width modifier for 64-bit integers. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/combase/rpc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/combase/rpc.c b/dlls/combase/rpc.c index c8401fe0cbd..80760ca37e7 100644 --- a/dlls/combase/rpc.c +++ b/dlls/combase/rpc.c @@ -77,7 +77,7 @@ struct registered_if static inline void get_rpc_endpoint(LPWSTR endpoint, const OXID *oxid) { /* FIXME: should get endpoint from rpcss */ - wsprintfW(endpoint, L"\\pipe\\OLE_%08lx%08lx", (DWORD)(*oxid >> 32), (DWORD)*oxid); + wsprintfW(endpoint, L"\\pipe\\OLE_%016I64x", *oxid); } typedef struct

1 0

Eric Pouech : rtqwork: Trace 64-bit integers with I64 width modifier.
by Alexandre Julliard 11 Apr '22

11 Apr '22

Module: wine Branch: master Commit: 159be4467bddf0eae8b06b6cc3d0de1634d0bdb9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=159be4467bddf0eae8b06b6c… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Apr 8 09:12:21 2022 +0200 rtqwork: Trace 64-bit integers with I64 width modifier. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rtworkq/queue.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/rtworkq/queue.c b/dlls/rtworkq/queue.c index 35ba1e28d03..d6c28ca4566 100644 --- a/dlls/rtworkq/queue.c +++ b/dlls/rtworkq/queue.c @@ -875,7 +875,7 @@ static HRESULT queue_cancel_item(struct queue *queue, RTWQWORKITEM_KEY key) else if ((key & SCHEDULED_ITEM_KEY_MASK) == SCHEDULED_ITEM_KEY_MASK) CloseThreadpoolTimer(item->u.timer_object); else - WARN("Unknown item key mask %#lx.\n", (DWORD)key); + WARN("Unknown item key mask %#I64x.\n", key); queue_release_pending_item(item); hr = S_OK; break;

1 0