January 2024 - Wine-commits

Nikolay Sivov : scrrun/dictionary: Add support for hashing VT_EMPTY keys.
by Alexandre Julliard 17 Jan '24

17 Jan '24

Module: wine Branch: master Commit: 92e2626e9d788fb3909c347d311f25404e12ba3b URL: https://gitlab.winehq.org/wine/wine/-/commit/92e2626e9d788fb3909c347d311f25… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 3 23:03:27 2024 +0100 scrrun/dictionary: Add support for hashing VT_EMPTY keys. --- dlls/scrrun/dictionary.c | 3 +++ dlls/scrrun/tests/dictionary.c | 8 ++++++++ 2 files changed, 11 insertions(+) diff --git a/dlls/scrrun/dictionary.c b/dlls/scrrun/dictionary.c index 364d8b52ff6..650874dcf03 100644 --- a/dlls/scrrun/dictionary.c +++ b/dlls/scrrun/dictionary.c @@ -909,6 +909,9 @@ static HRESULT WINAPI dictionary_get_HashVal(IDictionary *iface, VARIANT *key, V case VT_R8|VT_BYREF: case VT_R8: return get_flt_hash(V_VT(key) & VT_BYREF ? *V_R8REF(key) : V_R8(key), &V_I4(hash)); + case VT_EMPTY: + V_I4(hash) = 0; + return S_OK; case VT_INT: case VT_UINT: case VT_I1: diff --git a/dlls/scrrun/tests/dictionary.c b/dlls/scrrun/tests/dictionary.c index a6369b77831..e7d39bc0336 100644 --- a/dlls/scrrun/tests/dictionary.c +++ b/dlls/scrrun/tests/dictionary.c @@ -745,6 +745,14 @@ if (0) { /* crashes on native */ ok(V_VT(&hash) == VT_I4, "got %d\n", V_VT(&hash)); ok(V_I4(&hash) == expected, "got hash %#lx, expected %#lx\n", V_I4(&hash), expected); + V_VT(&key) = VT_EMPTY; + V_I4(&key) = 1234; + V_I4(&hash) = 5678; + hr = IDictionary_get_HashVal(dict, &key, &hash); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(V_VT(&hash) == VT_I4, "Unexpected hash type %d.\n", V_VT(&hash)); + ok(V_I4(&hash) == 0, "Unexpected hash value %ld.\n", V_I4(&hash)); + IDictionary_Release(dict); }

1 0

Nikolay Sivov : scrrun/dictionary: Add support for hashing VT_NULL keys.
by Alexandre Julliard 17 Jan '24

17 Jan '24

Module: wine Branch: master Commit: e89bedb70b63a3b28de6f835a37e403e3d88fc86 URL: https://gitlab.winehq.org/wine/wine/-/commit/e89bedb70b63a3b28de6f835a37e40… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jan 4 00:53:58 2024 +0100 scrrun/dictionary: Add support for hashing VT_NULL keys. --- dlls/scrrun/dictionary.c | 1 + dlls/scrrun/tests/dictionary.c | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/dlls/scrrun/dictionary.c b/dlls/scrrun/dictionary.c index 650874dcf03..f4f1fa701f6 100644 --- a/dlls/scrrun/dictionary.c +++ b/dlls/scrrun/dictionary.c @@ -910,6 +910,7 @@ static HRESULT WINAPI dictionary_get_HashVal(IDictionary *iface, VARIANT *key, V case VT_R8: return get_flt_hash(V_VT(key) & VT_BYREF ? *V_R8REF(key) : V_R8(key), &V_I4(hash)); case VT_EMPTY: + case VT_NULL: V_I4(hash) = 0; return S_OK; case VT_INT: diff --git a/dlls/scrrun/tests/dictionary.c b/dlls/scrrun/tests/dictionary.c index e7d39bc0336..4c103ff25bf 100644 --- a/dlls/scrrun/tests/dictionary.c +++ b/dlls/scrrun/tests/dictionary.c @@ -753,6 +753,14 @@ if (0) { /* crashes on native */ ok(V_VT(&hash) == VT_I4, "Unexpected hash type %d.\n", V_VT(&hash)); ok(V_I4(&hash) == 0, "Unexpected hash value %ld.\n", V_I4(&hash)); + V_VT(&key) = VT_NULL; + V_I4(&key) = 1234; + V_I4(&hash) = 5678; + hr = IDictionary_get_HashVal(dict, &key, &hash); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(V_VT(&hash) == VT_I4, "Unexpected hash type %d.\n", V_VT(&hash)); + ok(V_I4(&hash) == 0, "Unexpected hash value %ld.\n", V_I4(&hash)); + IDictionary_Release(dict); }

1 0

Nikolay Sivov : scrrun/dictionary: Handle VT_EMPTY/VT_NULL keys.
by Alexandre Julliard 17 Jan '24

17 Jan '24

Module: wine Branch: master Commit: 564b796e3605f8f622c47f3588b22deef4f323a4 URL: https://gitlab.winehq.org/wine/wine/-/commit/564b796e3605f8f622c47f3588b22d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jan 4 01:43:16 2024 +0100 scrrun/dictionary: Handle VT_EMPTY/VT_NULL keys. --- dlls/scrrun/dictionary.c | 4 ++++ dlls/scrrun/tests/dictionary.c | 39 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+) diff --git a/dlls/scrrun/dictionary.c b/dlls/scrrun/dictionary.c index f4f1fa701f6..f2f39c82f6f 100644 --- a/dlls/scrrun/dictionary.c +++ b/dlls/scrrun/dictionary.c @@ -188,6 +188,10 @@ static BOOL is_matching_key(const struct dictionary *dict, const struct keyitem_ { return hash == pair->hash && numeric_key_eq(key, &pair->key); } + else if (V_VT(&pair->key) == VT_EMPTY || V_VT(&pair->key) == VT_NULL) + { + return V_VT(&pair->key) == V_VT(key); + } else { WARN("Unexpected key type %#x.\n", V_VT(key)); diff --git a/dlls/scrrun/tests/dictionary.c b/dlls/scrrun/tests/dictionary.c index 4c103ff25bf..ccc4d181793 100644 --- a/dlls/scrrun/tests/dictionary.c +++ b/dlls/scrrun/tests/dictionary.c @@ -1009,6 +1009,45 @@ static void test_Add(void) VariantClear(&item); + /* Empty and null keys. */ + hr = IDictionary_RemoveAll(dict); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + V_VT(&key1) = VT_EMPTY; + V_I4(&key1) = 1; + + V_VT(&item) = VT_BSTR; + V_BSTR(&item) = SysAllocString(L"empty"); + + hr = IDictionary_Add(dict, &key1, &item); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + V_VT(&key2) = VT_EMPTY; + V_I4(&key2) = 2; + + hr = IDictionary_Add(dict, &key2, &item); + ok(hr == CTL_E_KEY_ALREADY_EXISTS, "Unexpected hr %#lx.\n", hr); + + V_VT(&key2) = VT_NULL; + V_I4(&key2) = 2; + + hr = IDictionary_Add(dict, &key2, &item); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + hr = IDictionary_RemoveAll(dict); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + hr = IDictionary_Add(dict, &key2, &item); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + hr = IDictionary_Add(dict, &key2, &item); + ok(hr == CTL_E_KEY_ALREADY_EXISTS, "Unexpected hr %#lx.\n", hr); + + hr = IDictionary_Add(dict, &key1, &item); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + VariantClear(&item); + IDictionary_Release(dict); }

1 0

Eric Pouech : appwiz.cpl: Load dynamically wine_get_version().
by Alexandre Julliard 17 Jan '24

17 Jan '24

Module: wine Branch: master Commit: d40a0d8a1d881f5c54c2d336faee545f70ab1bea URL: https://gitlab.winehq.org/wine/wine/-/commit/d40a0d8a1d881f5c54c2d336faee54… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Tue Jan 2 11:48:50 2024 +0100 appwiz.cpl: Load dynamically wine_get_version(). Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/appwiz.cpl/addons.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c index a2957c3040a..88f871be53b 100644 --- a/dlls/appwiz.cpl/addons.c +++ b/dlls/appwiz.cpl/addons.c @@ -108,8 +108,7 @@ static LPWSTR url = NULL; static IBinding *dwl_binding; static WCHAR *msi_file; -extern const char * CDECL wine_get_version(void); - +static const char * (CDECL *p_wine_get_version)(void); static WCHAR * (CDECL *p_wine_get_dos_file_name)(const char*); static BOOL sha_check(const WCHAR *file_name) @@ -610,7 +609,7 @@ static void append_url_params( WCHAR *url ) len += MultiByteToWideChar(CP_ACP, 0, addon->version, -1, url+len, size/sizeof(WCHAR)-len)-1; lstrcpyW(url+len, L"&winev="); len += lstrlenW(L"&winev="); - MultiByteToWideChar(CP_ACP, 0, wine_get_version(), -1, url+len, size/sizeof(WCHAR)-len); + MultiByteToWideChar(CP_ACP, 0, p_wine_get_version() ? p_wine_get_version() : 0, -1, url+len, size/sizeof(WCHAR)-len); } static LPWSTR get_url(void) @@ -751,6 +750,7 @@ BOOL install_addon(addon_t addon_type) addon = addons_info+addon_type; p_wine_get_dos_file_name = (void *)GetProcAddress(GetModuleHandleW(L"kernel32.dll"), "wine_get_dos_file_name"); + p_wine_get_version = (void *)GetProcAddress(GetModuleHandleW(L"ntdll.dll"), "wine_get_version"); /* * Try to find addon .msi file in following order:

1 0

Eric Pouech : user32: Load dynamically wine_get_version().
by Alexandre Julliard 17 Jan '24

17 Jan '24

Module: wine Branch: master Commit: 20b4cdde55cdd1462d97c30c9e72f128b7d24df4 URL: https://gitlab.winehq.org/wine/wine/-/commit/20b4cdde55cdd1462d97c30c9e72f1… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Tue Jan 2 11:50:58 2024 +0100 user32: Load dynamically wine_get_version(). Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/user32/nonclient.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/user32/nonclient.c b/dlls/user32/nonclient.c index 00c7368c516..b28e9e258da 100644 --- a/dlls/user32/nonclient.c +++ b/dlls/user32/nonclient.c @@ -159,12 +159,16 @@ LRESULT NC_HandleSysCommand( HWND hwnd, WPARAM wParam, LPARAM lParam ) if (hmodule) { BOOL (WINAPI *aboutproc)(HWND, LPCSTR, LPCSTR, HICON); - extern const char * CDECL wine_get_version(void); + const char * (CDECL *p_wine_get_version)(void); char app[256]; - sprintf( app, "Wine %s", wine_get_version() ); + p_wine_get_version = (void *)GetProcAddress( GetModuleHandleW(L"ntdll.dll"), "wine_get_version" ); aboutproc = (void *)GetProcAddress( hmodule, "ShellAboutA" ); - if (aboutproc) aboutproc( hwnd, app, NULL, 0 ); + if (p_wine_get_version && aboutproc) + { + snprintf( app, ARRAY_SIZE(app), "Wine %s", p_wine_get_version() ); + aboutproc( hwnd, app, NULL, 0 ); + } FreeLibrary( hmodule ); } }

1 0

Zhiyi Zhang : win32u: Fix a possible out-of-bounds write (Coverity).
by Alexandre Julliard 17 Jan '24

17 Jan '24

Module: wine Branch: master Commit: d91eab24d245d13642cf2fd5d96a9f5851fdb240 URL: https://gitlab.winehq.org/wine/wine/-/commit/d91eab24d245d13642cf2fd5d96a9f… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Sat Dec 30 13:11:34 2023 +0800 win32u: Fix a possible out-of-bounds write (Coverity). --- dlls/win32u/sysparams.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index ad6e7dce39b..a9563eaff84 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -6121,7 +6121,7 @@ BOOL WINAPI NtUserSetSysColors( INT count, const INT *colors, const COLORREF *va if (IS_INTRESOURCE(colors)) return FALSE; /* stupid app passes a color instead of an array */ for (i = 0; i < count; i++) - if (colors[i] >= 0 && colors[i] <= ARRAY_SIZE( system_colors )) + if (colors[i] >= 0 && colors[i] < ARRAY_SIZE( system_colors )) set_entry( &system_colors[colors[i]], values[i], 0, 0 ); /* Send WM_SYSCOLORCHANGE message to all windows */

1 0

David Kahurani : gdiplus: Avoid use of temporary variable.
by Alexandre Julliard 17 Jan '24

17 Jan '24

Module: wine Branch: master Commit: 760bcdcb4e5c271876baee6bc7207bba400b33a8 URL: https://gitlab.winehq.org/wine/wine/-/commit/760bcdcb4e5c271876baee6bc7207b… Author: David Kahurani <k.kahurani(a)gmail.com> Date: Sat Dec 23 12:26:49 2023 +0300 gdiplus: Avoid use of temporary variable. A temporary variable is used here to assist with assignment but this does not conform to the coding style in the rest of gdiplus and introduces an unnecessary variable. Signed-off-by: David Kahurani <k.kahurani(a)gmail.com> --- dlls/gdiplus/graphicspath.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index 24c2888cfe8..9e186aa43d1 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -117,10 +117,16 @@ struct flatten_bezier_job static BOOL flatten_bezier_add(struct list *jobs, path_list_node_t *start, REAL x2, REAL y2, REAL x3, REAL y3, path_list_node_t *end) { struct flatten_bezier_job *job = malloc(sizeof(struct flatten_bezier_job)); - struct flatten_bezier_job temp = { start, x2, y2, x3, y3, end }; if (!job) return FALSE; - *job = temp; + + job->start = start; + job->x2 = x2; + job->y2 = y2; + job->x3 = x3; + job->y3 = y3; + job->end = end; + list_add_after(jobs, &job->entry); return TRUE; }

1 0

Sven Baars : advapi32/tests: Introduce a new has_wow64 helper.
by Alexandre Julliard 17 Jan '24

17 Jan '24

Module: wine Branch: master Commit: 7565d61403fcb1e784eb5304273c075e499e317c URL: https://gitlab.winehq.org/wine/wine/-/commit/7565d61403fcb1e784eb5304273c07… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Sat Dec 23 14:15:02 2023 +0100 advapi32/tests: Introduce a new has_wow64 helper. --- dlls/advapi32/tests/registry.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 30a79368c94..27b33194fc4 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -64,6 +64,17 @@ static DWORD (WINAPI *pEnumDynamicTimeZoneInformation)(const DWORD, static BOOL limited_user; static const BOOL is_64bit = sizeof(void *) > sizeof(int); +static BOOL has_wow64(void) +{ + if (!is_64bit) + { + BOOL is_wow64; + if (!pIsWow64Process || !pIsWow64Process( GetCurrentProcess(), &is_wow64 ) || !is_wow64) + return FALSE; + } + return TRUE; +} + static const char *dbgstr_SYSTEMTIME(const SYSTEMTIME *st) { return wine_dbg_sprintf("%02d-%02d-%04d %02d:%02d:%02d.%03d", @@ -2575,14 +2586,10 @@ static void test_redirection(void) HKEY key, key32, key64, root, root32, root64; DWORD subkeys, subkeys32, subkeys64; - if (ptr_size != 64) + if (!has_wow64()) { - BOOL is_wow64; - if (!pIsWow64Process || !pIsWow64Process( GetCurrentProcess(), &is_wow64 ) || !is_wow64) - { - skip( "Not on Wow64, no redirection\n" ); - return; - } + skip( "Not on Wow64, no redirection\n" ); + return; } if (limited_user)

1 0

Sven Baars : advapi32/tests: Skip WoW64 tests on 32-bit in test_reg_create_key.
by Alexandre Julliard 17 Jan '24

17 Jan '24

Module: wine Branch: master Commit: a1adaaca2768708f5158b82d7a7edaf69124783e URL: https://gitlab.winehq.org/wine/wine/-/commit/a1adaaca2768708f5158b82d7a7eda… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Sat Dec 23 14:17:35 2023 +0100 advapi32/tests: Skip WoW64 tests on 32-bit in test_reg_create_key. Wine-Bug: https://bugs.winehq.org//show_bug.cgi?id=54613 --- dlls/advapi32/tests/registry.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 27b33194fc4..35df1b226f5 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -1338,9 +1338,9 @@ static void test_reg_create_key(void) * the registry access check is performed correctly. Redirection isn't * being tested, so the tests don't care about whether the process is * running under WOW64. */ - if (!pIsWow64Process) + if (!has_wow64()) { - win_skip("WOW64 flags are not recognized\n"); + skip("WOW64 flags are not recognized\n"); return; }

1 0

Nikolay Sivov : evr/dshow: Handle YUY2 sample copy.
by Alexandre Julliard 17 Jan '24

17 Jan '24

Module: wine Branch: master Commit: ba664e108eeb73548d094b08875102897155fcea URL: https://gitlab.winehq.org/wine/wine/-/commit/ba664e108eeb73548d094b08875102… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Dec 18 23:15:43 2023 +0100 evr/dshow: Handle YUY2 sample copy. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53810 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/evr/evr.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/evr/evr.c b/dlls/evr/evr.c index 803c1d2dff9..516427c5fff 100644 --- a/dlls/evr/evr.c +++ b/dlls/evr/evr.c @@ -344,7 +344,7 @@ static void evr_destroy(struct strmbase_renderer *iface) free(filter); } -static HRESULT evr_copy_sample_buffer(struct evr *filter, IMediaSample *input_sample, IMFSample **sample) +static HRESULT evr_copy_sample_buffer(struct evr *filter, const GUID *subtype, IMediaSample *input_sample, IMFSample **sample) { IDirect3DSurface9 *surface; D3DLOCKED_RECT locked_rect; @@ -364,6 +364,15 @@ static HRESULT evr_copy_sample_buffer(struct evr *filter, IMediaSample *input_sa width = frame_size >> 32; lines = frame_size; + if (IsEqualGUID(subtype, &MFVideoFormat_YUY2)) + { + width = (3 * width + 3) & ~3; + } + else + { + width *= 4; + } + if (FAILED(hr = IMediaSample_GetPointer(input_sample, &src))) { WARN("Failed to get pointer to sample data, hr %#lx.\n", hr); @@ -383,7 +392,7 @@ static HRESULT evr_copy_sample_buffer(struct evr *filter, IMediaSample *input_sa if (SUCCEEDED(hr = IDirect3DSurface9_LockRect(surface, &locked_rect, NULL, D3DLOCK_DISCARD))) { if (src_stride < 0) src += (-src_stride) * (lines - 1); - MFCopyImage(locked_rect.pBits, locked_rect.Pitch, src, src_stride, width * 4, lines); + MFCopyImage(locked_rect.pBits, locked_rect.Pitch, src, src_stride, width, lines); IDirect3DSurface9_UnlockRect(surface); } @@ -417,9 +426,10 @@ static HRESULT evr_render(struct strmbase_renderer *iface, IMediaSample *input_s IMFMediaType_GetGUID(filter->media_type, &MF_MT_SUBTYPE, &subtype); if (IsEqualGUID(&subtype, &MFVideoFormat_ARGB32) - || IsEqualGUID(&subtype, &MFVideoFormat_RGB32)) + || IsEqualGUID(&subtype, &MFVideoFormat_RGB32) + || IsEqualGUID(&subtype, &MFVideoFormat_YUY2)) { - if (SUCCEEDED(hr = evr_copy_sample_buffer(filter, input_sample, &sample))) + if (SUCCEEDED(hr = evr_copy_sample_buffer(filter, &subtype, input_sample, &sample))) { if (SUCCEEDED(IMFTransform_ProcessInput(filter->mixer, 0, sample, 0))) IMFVideoPresenter_ProcessMessage(filter->presenter, MFVP_MESSAGE_PROCESSINPUTNOTIFY, 0);

1 0