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

Nikolay Sivov : hlink: Return requested interface from HlinkCreateFromString().
by Alexandre Julliard April 11, 2022

April 11, 2022

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 : evr/mixer: Implement GetVideoProcessorCaps().
by Alexandre Julliard April 11, 2022

April 11, 2022

Module: wine Branch: master Commit: 28423d79d4440b0b2a44ad92be305ba37d765012 URL: https://source.winehq.org/git/wine.git/?a=commit;h=28423d79d4440b0b2a44ad92… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 11 11:23:13 2022 +0300 evr/mixer: Implement GetVideoProcessorCaps(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/mixer.c | 25 +++++++++++++++++++++++-- dlls/evr/tests/evr.c | 4 +++- 2 files changed, 26 insertions(+), 3 deletions(-) diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c index c7e3033f2d1..668a97da979 100644 --- a/dlls/evr/mixer.c +++ b/dlls/evr/mixer.c @@ -1956,9 +1956,30 @@ static HRESULT WINAPI video_mixer_processor_GetAvailableVideoProcessorModes(IMFV static HRESULT WINAPI video_mixer_processor_GetVideoProcessorCaps(IMFVideoProcessor *iface, GUID *mode, DXVA2_VideoProcessorCaps *caps) { - FIXME("%p, %s, %p.\n", iface, debugstr_guid(mode), caps); + struct video_mixer *mixer = impl_from_IMFVideoProcessor(iface); + IDirectXVideoProcessorService *service; + DXVA2_VideoDesc video_desc; + GUID subtype = { 0 }; + HRESULT hr; - return E_NOTIMPL; + TRACE("%p, %s, %p.\n", iface, debugstr_guid(mode), caps); + + EnterCriticalSection(&mixer->cs); + + if (!mixer->inputs[0].media_type || !mixer->output.media_type) + hr = MF_E_TRANSFORM_TYPE_NOT_SET; + else if (SUCCEEDED(hr = video_mixer_get_processor_service(mixer, &service))) + { + video_mixer_init_dxva_videodesc(mixer->inputs[0].media_type, &video_desc); + IMFMediaType_GetGUID(mixer->output.media_type, &MF_MT_SUBTYPE, &subtype); + + hr = IDirectXVideoProcessorService_GetVideoProcessorCaps(service, mode, &video_desc, subtype.Data1, caps); + IDirectXVideoProcessorService_Release(service); + } + + LeaveCriticalSection(&mixer->cs); + + return hr; } static HRESULT WINAPI video_mixer_processor_GetVideoProcessorMode(IMFVideoProcessor *iface, GUID *mode) diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index bd280836046..93e262e52a3 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -1292,7 +1292,6 @@ static void test_default_mixer_type_negotiation(void) ok(hr == MF_E_TRANSFORM_TYPE_NOT_SET, "Unexpected hr %#lx.\n", hr); hr = IMFVideoProcessor_GetVideoProcessorCaps(processor, (GUID *)&DXVA2_VideoProcSoftwareDevice, &caps); - todo_wine ok(hr == MF_E_TRANSFORM_TYPE_NOT_SET, "Unexpected hr %#lx.\n", hr); hr = IMFTransform_GetInputCurrentType(transform, 0, &media_type); @@ -1324,6 +1323,9 @@ static void test_default_mixer_type_negotiation(void) ok(count > 0 && !!guids, "Unexpected modes data.\n"); CoTaskMemFree(guids); + hr = IMFVideoProcessor_GetVideoProcessorCaps(processor, (GUID *)&DXVA2_VideoProcSoftwareDevice, &caps); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + hr = IMFTransform_GetOutputCurrentType(transform, 0, &media_type2); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(media_type == media_type2, "Unexpected media type instance.\n");

1 0

Alexandre Julliard : kernelbase: Support UTF-8 as default Ansi codepage in MultiByteToWideChar().
by Alexandre Julliard April 11, 2022

April 11, 2022

Module: wine Branch: master Commit: 2cc54d4b854e6c4f9610f60116b320c93c21e1e3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2cc54d4b854e6c4f9610f601… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 11 17:26:46 2022 +0200 kernelbase: Support UTF-8 as default Ansi codepage in MultiByteToWideChar(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/locale.c | 43 ++++++++++++++++--------------------------- 1 file changed, 16 insertions(+), 27 deletions(-) diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index c0cd0307447..c807b1e0124 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -2283,11 +2283,6 @@ static int mbstowcs_utf8( DWORD flags, const char *src, int srclen, WCHAR *dst, DWORD reslen; NTSTATUS status; - if (flags & ~(MB_PRECOMPOSED | MB_COMPOSITE | MB_USEGLYPHCHARS | MB_ERR_INVALID_CHARS)) - { - SetLastError( ERROR_INVALID_FLAGS ); - return 0; - } if (!dstlen) dst = NULL; status = RtlUTF8ToUnicodeN( dst, dstlen * sizeof(WCHAR), &reslen, src, srclen ); if (status == STATUS_SOME_NOT_MAPPED) @@ -2528,24 +2523,12 @@ static int mbstowcs_dbcs( const CPTABLEINFO *info, const unsigned char *src, int } -static int mbstowcs_codepage( UINT codepage, DWORD flags, const char *src, int srclen, +static int mbstowcs_codepage( const CPTABLEINFO *info, DWORD flags, const char *src, int srclen, WCHAR *dst, int dstlen ) { CPTABLEINFO local_info; - const CPTABLEINFO *info = get_codepage_table( codepage ); const unsigned char *str = (const unsigned char *)src; - if (!info) - { - SetLastError( ERROR_INVALID_PARAMETER ); - return 0; - } - if (flags & ~(MB_PRECOMPOSED | MB_COMPOSITE | MB_USEGLYPHCHARS | MB_ERR_INVALID_CHARS)) - { - SetLastError( ERROR_INVALID_FLAGS ); - return 0; - } - if ((flags & MB_USEGLYPHCHARS) && info->MultiByteTable[256] == 256) { local_info = *info; @@ -6161,6 +6144,7 @@ LCID WINAPI DECLSPEC_HOTPATCH LocaleNameToLCID( const WCHAR *name, DWORD flags ) INT WINAPI DECLSPEC_HOTPATCH MultiByteToWideChar( UINT codepage, DWORD flags, const char *src, INT srclen, WCHAR *dst, INT dstlen ) { + const CPTABLEINFO *info; int ret; if (!src || !srclen || (!dst && dstlen) || dstlen < 0) @@ -6178,19 +6162,24 @@ INT WINAPI DECLSPEC_HOTPATCH MultiByteToWideChar( UINT codepage, DWORD flags, co case CP_UTF7: ret = mbstowcs_utf7( flags, src, srclen, dst, dstlen ); break; - case CP_UTF8: - ret = mbstowcs_utf8( flags, src, srclen, dst, dstlen ); - break; case CP_UNIXCP: - if (unix_cp == CP_UTF8) - { - ret = mbstowcs_utf8( flags, src, srclen, dst, dstlen ); - break; - } codepage = unix_cp; /* fall through */ default: - ret = mbstowcs_codepage( codepage, flags, src, srclen, dst, dstlen ); + if (!(info = get_codepage_table( codepage ))) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return 0; + } + if (flags & ~(MB_PRECOMPOSED | MB_COMPOSITE | MB_USEGLYPHCHARS | MB_ERR_INVALID_CHARS)) + { + SetLastError( ERROR_INVALID_FLAGS ); + return 0; + } + if (info->CodePage == CP_UTF8) + ret = mbstowcs_utf8( flags, src, srclen, dst, dstlen ); + else + ret = mbstowcs_codepage( info, flags, src, srclen, dst, dstlen ); break; } TRACE( "cp %d %s -> %s, ret = %d\n", codepage, debugstr_an(src, srclen), debugstr_wn(dst, ret), ret );

1 0

Nikolay Sivov : hlink: Return requested interface when creating IHlink instance.
by Alexandre Julliard April 11, 2022

April 11, 2022

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 requested interface when creating IHlinkBrowseContext instance.
by Alexandre Julliard April 11, 2022

April 11, 2022

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: Use CRT allocation functions.
by Alexandre Julliard April 11, 2022

April 11, 2022

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

Jacek Caban : winex11: Directly use ntdll for registry access in write_registry_settings.
by Alexandre Julliard April 11, 2022

April 11, 2022

Module: wine Branch: master Commit: 91d6e8b4abe46a58a931c8b6ce0383bffa8f2566 URL: https://source.winehq.org/git/wine.git/?a=commit;h=91d6e8b4abe46a58a931c8b6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 8 13:30:02 2022 +0200 winex11: Directly use ntdll for registry access in write_registry_settings. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/Makefile.in | 2 +- dlls/winex11.drv/settings.c | 33 +++++++++++++++++---------------- 2 files changed, 18 insertions(+), 17 deletions(-) diff --git a/dlls/winex11.drv/Makefile.in b/dlls/winex11.drv/Makefile.in index 93a975d7f63..b6b1062c425 100644 --- a/dlls/winex11.drv/Makefile.in +++ b/dlls/winex11.drv/Makefile.in @@ -1,6 +1,6 @@ EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = winex11.drv -IMPORTS = uuid user32 gdi32 advapi32 win32u +IMPORTS = uuid user32 gdi32 win32u DELAYIMPORTS = comctl32 ole32 shell32 imm32 EXTRAINCL = $(X_CFLAGS) EXTRALIBS = $(X_LIBS) $(X_EXTRA_LIBS) diff --git a/dlls/winex11.drv/settings.c b/dlls/winex11.drv/settings.c index 61bdf1afd0f..ec8a01fbc58 100644 --- a/dlls/winex11.drv/settings.c +++ b/dlls/winex11.drv/settings.c @@ -319,6 +319,13 @@ static BOOL read_registry_settings(const WCHAR *device_name, DEVMODEW *dm) return ret; } +static BOOL set_setting_value( HKEY hkey, const char *name, DWORD val ) +{ + WCHAR nameW[128]; + UNICODE_STRING str = { asciiz_to_unicode( nameW, name ) - sizeof(WCHAR), sizeof(nameW), nameW }; + return !NtSetValueKey( hkey, &str, 0, REG_DWORD, &val, sizeof(val) ); +} + static BOOL write_registry_settings(const WCHAR *device_name, const DEVMODEW *dm) { HANDLE mutex; @@ -332,23 +339,17 @@ static BOOL write_registry_settings(const WCHAR *device_name, const DEVMODEW *dm return FALSE; } -#define set_value(name, data) \ - if (RegSetValueExA(hkey, name, 0, REG_DWORD, (const BYTE*)(data), sizeof(DWORD))) \ - ret = FALSE + ret &= set_setting_value( hkey, "DefaultSettings.BitsPerPel", dm->dmBitsPerPel ); + ret &= set_setting_value( hkey, "DefaultSettings.XResolution", dm->dmPelsWidth ); + ret &= set_setting_value( hkey, "DefaultSettings.YResolution", dm->dmPelsHeight ); + ret &= set_setting_value( hkey, "DefaultSettings.VRefresh", dm->dmDisplayFrequency ); + ret &= set_setting_value( hkey, "DefaultSettings.Flags", dm->u2.dmDisplayFlags ); + ret &= set_setting_value( hkey, "DefaultSettings.XPanning", dm->u1.s2.dmPosition.x ); + ret &= set_setting_value( hkey, "DefaultSettings.YPanning", dm->u1.s2.dmPosition.y ); + ret &= set_setting_value( hkey, "DefaultSettings.Orientation", dm->u1.s2.dmDisplayOrientation ); + ret &= set_setting_value( hkey, "DefaultSettings.FixedOutput", dm->u1.s2.dmDisplayFixedOutput ); - set_value("DefaultSettings.BitsPerPel", &dm->dmBitsPerPel); - set_value("DefaultSettings.XResolution", &dm->dmPelsWidth); - set_value("DefaultSettings.YResolution", &dm->dmPelsHeight); - set_value("DefaultSettings.VRefresh", &dm->dmDisplayFrequency); - set_value("DefaultSettings.Flags", &dm->u2.dmDisplayFlags); - set_value("DefaultSettings.XPanning", &dm->u1.s2.dmPosition.x); - set_value("DefaultSettings.YPanning", &dm->u1.s2.dmPosition.y); - set_value("DefaultSettings.Orientation", &dm->u1.s2.dmDisplayOrientation); - set_value("DefaultSettings.FixedOutput", &dm->u1.s2.dmDisplayFixedOutput); - -#undef set_value - - RegCloseKey(hkey); + NtClose( hkey ); release_display_device_init_mutex(mutex); return ret; }

1 0

Jacek Caban : winex11: Directly use ntdll for registry access in read_registry_settings.
by Alexandre Julliard April 11, 2022

April 11, 2022

Module: wine Branch: master Commit: bdbbc3467c24db07810e09f988c4498e7a8de3e2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bdbbc3467c24db07810e09f9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 8 13:29:54 2022 +0200 winex11: Directly use ntdll for registry access in read_registry_settings. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/settings.c | 44 +++++++++++++++++++++++++------------------- 1 file changed, 25 insertions(+), 19 deletions(-) diff --git a/dlls/winex11.drv/settings.c b/dlls/winex11.drv/settings.c index f4fb450375b..61bdf1afd0f 100644 --- a/dlls/winex11.drv/settings.c +++ b/dlls/winex11.drv/settings.c @@ -267,11 +267,25 @@ static HKEY get_display_device_reg_key( const WCHAR *device_name ) return reg_open_key( NULL, buffer, lstrlenW(buffer) * sizeof(WCHAR) ); } +static BOOL query_display_setting( HKEY hkey, const char *name, DWORD *ret ) +{ + char buffer[1024]; + WCHAR nameW[128]; + KEY_VALUE_PARTIAL_INFORMATION *value = (void *)buffer; + + asciiz_to_unicode( nameW, name ); + if (query_reg_value( hkey, nameW, value, sizeof(buffer) ) != sizeof(DWORD) || + value->Type != REG_DWORD) + return FALSE; + + *ret = *(DWORD *)value->Data; + return TRUE; +} + static BOOL read_registry_settings(const WCHAR *device_name, DEVMODEW *dm) { HANDLE mutex; HKEY hkey; - DWORD type, size; BOOL ret = TRUE; dm->dmFields = 0; @@ -283,32 +297,24 @@ static BOOL read_registry_settings(const WCHAR *device_name, DEVMODEW *dm) return FALSE; } -#define query_value(name, data) \ - size = sizeof(DWORD); \ - if (RegQueryValueExA(hkey, name, 0, &type, (LPBYTE)(data), &size) || \ - type != REG_DWORD || size != sizeof(DWORD)) \ - ret = FALSE - - query_value("DefaultSettings.BitsPerPel", &dm->dmBitsPerPel); + ret &= query_display_setting( hkey, "DefaultSettings.BitsPerPel", &dm->dmBitsPerPel ); dm->dmFields |= DM_BITSPERPEL; - query_value("DefaultSettings.XResolution", &dm->dmPelsWidth); + ret &= query_display_setting( hkey, "DefaultSettings.XResolution", &dm->dmPelsWidth ); dm->dmFields |= DM_PELSWIDTH; - query_value("DefaultSettings.YResolution", &dm->dmPelsHeight); + ret &= query_display_setting( hkey, "DefaultSettings.YResolution", &dm->dmPelsHeight ); dm->dmFields |= DM_PELSHEIGHT; - query_value("DefaultSettings.VRefresh", &dm->dmDisplayFrequency); + ret &= query_display_setting( hkey, "DefaultSettings.VRefresh", &dm->dmDisplayFrequency ); dm->dmFields |= DM_DISPLAYFREQUENCY; - query_value("DefaultSettings.Flags", &dm->u2.dmDisplayFlags); + ret &= query_display_setting( hkey, "DefaultSettings.Flags", &dm->u2.dmDisplayFlags ); dm->dmFields |= DM_DISPLAYFLAGS; - query_value("DefaultSettings.XPanning", &dm->u1.s2.dmPosition.x); - query_value("DefaultSettings.YPanning", &dm->u1.s2.dmPosition.y); + ret &= query_display_setting( hkey, "DefaultSettings.XPanning", (DWORD *)&dm->u1.s2.dmPosition.x ); + ret &= query_display_setting( hkey, "DefaultSettings.YPanning", (DWORD *)&dm->u1.s2.dmPosition.y ); dm->dmFields |= DM_POSITION; - query_value("DefaultSettings.Orientation", &dm->u1.s2.dmDisplayOrientation); + ret &= query_display_setting( hkey, "DefaultSettings.Orientation", &dm->u1.s2.dmDisplayOrientation ); dm->dmFields |= DM_DISPLAYORIENTATION; - query_value("DefaultSettings.FixedOutput", &dm->u1.s2.dmDisplayFixedOutput); + ret &= query_display_setting( hkey, "DefaultSettings.FixedOutput", &dm->u1.s2.dmDisplayFixedOutput ); -#undef query_value - - RegCloseKey(hkey); + NtClose( hkey ); release_display_device_init_mutex(mutex); return ret; }

1 0

Alexandre Julliard : kernelbase: Use RtlMultiByteToUnicodeN in IsChar* functions.
by Alexandre Julliard April 11, 2022

April 11, 2022

Module: wine Branch: master Commit: 23834ee3b8d0a3d73eed593404748abd7d29d0d9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=23834ee3b8d0a3d73eed5934… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 11 17:01:36 2022 +0200 kernelbase: Use RtlMultiByteToUnicodeN in IsChar* functions. In case the Ansi codepage was set to UTF-8. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/locale.c | 30 ++++++++++++++++++++---------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index 54d4a838731..1e477a449e1 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -5580,8 +5580,10 @@ INT WINAPI DECLSPEC_HOTPATCH IdnToUnicode( DWORD flags, const WCHAR *src, INT sr */ BOOL WINAPI DECLSPEC_HOTPATCH IsCharAlphaA( CHAR c ) { - WCHAR wc = nls_info.AnsiTableInfo.MultiByteTable[(unsigned char)c]; - return !!(get_char_type( CT_CTYPE1, wc ) & C1_ALPHA); + WCHAR wc; + DWORD reslen; + RtlMultiByteToUnicodeN( &wc, sizeof(WCHAR), &reslen, &c, 1 ); + return reslen && (get_char_type( CT_CTYPE1, wc ) & C1_ALPHA); } @@ -5599,8 +5601,10 @@ BOOL WINAPI DECLSPEC_HOTPATCH IsCharAlphaW( WCHAR wc ) */ BOOL WINAPI DECLSPEC_HOTPATCH IsCharAlphaNumericA( CHAR c ) { - WCHAR wc = nls_info.AnsiTableInfo.MultiByteTable[(unsigned char)c]; - return !!(get_char_type( CT_CTYPE1, wc ) & (C1_ALPHA | C1_DIGIT)); + WCHAR wc; + DWORD reslen; + RtlMultiByteToUnicodeN( &wc, sizeof(WCHAR), &reslen, &c, 1 ); + return reslen && (get_char_type( CT_CTYPE1, wc ) & (C1_ALPHA | C1_DIGIT)); } @@ -5645,8 +5649,10 @@ BOOL WINAPI DECLSPEC_HOTPATCH IsCharDigitW( WCHAR wc ) */ BOOL WINAPI DECLSPEC_HOTPATCH IsCharLowerA( CHAR c ) { - WCHAR wc = nls_info.AnsiTableInfo.MultiByteTable[(unsigned char)c]; - return !!(get_char_type( CT_CTYPE1, wc ) & C1_LOWER); + WCHAR wc; + DWORD reslen; + RtlMultiByteToUnicodeN( &wc, sizeof(WCHAR), &reslen, &c, 1 ); + return reslen && (get_char_type( CT_CTYPE1, wc ) & C1_LOWER); } @@ -5673,8 +5679,10 @@ BOOL WINAPI DECLSPEC_HOTPATCH IsCharPunctW( WCHAR wc ) */ BOOL WINAPI DECLSPEC_HOTPATCH IsCharSpaceA( CHAR c ) { - WCHAR wc = nls_info.AnsiTableInfo.MultiByteTable[(unsigned char)c]; - return !!(get_char_type( CT_CTYPE1, wc ) & C1_SPACE); + WCHAR wc; + DWORD reslen; + RtlMultiByteToUnicodeN( &wc, sizeof(WCHAR), &reslen, &c, 1 ); + return reslen && (get_char_type( CT_CTYPE1, wc ) & C1_SPACE); } @@ -5692,8 +5700,10 @@ BOOL WINAPI DECLSPEC_HOTPATCH IsCharSpaceW( WCHAR wc ) */ BOOL WINAPI DECLSPEC_HOTPATCH IsCharUpperA( CHAR c ) { - WCHAR wc = nls_info.AnsiTableInfo.MultiByteTable[(unsigned char)c]; - return !!(get_char_type( CT_CTYPE1, wc ) & C1_UPPER); + WCHAR wc; + DWORD reslen; + RtlMultiByteToUnicodeN( &wc, sizeof(WCHAR), &reslen, &c, 1 ); + return reslen && (get_char_type( CT_CTYPE1, wc ) & C1_UPPER); }

1 0

Nikolay Sivov : hlink: Return correct requested interface from HlinkCreateFromMoniker().
by Alexandre Julliard April 11, 2022

April 11, 2022

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