wine-commits January 2024

wine-commits@winehq.org

1 participants
711 discussions

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

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

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

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: 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

Alistair Leslie-Hughes : include: Add more D3D_FEATURE_LEVEL_ defines.
by Alexandre Julliard 17 Jan '24

17 Jan '24

Module: wine Branch: master Commit: 7ea0a3609c94868e8298702b42901079daa31f30 URL: https://gitlab.winehq.org/wine/wine/-/commit/7ea0a3609c94868e8298702b429010… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Jan 4 12:27:13 2024 +1100 include: Add more D3D_FEATURE_LEVEL_ defines. --- include/d3dcommon.idl | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/d3dcommon.idl b/include/d3dcommon.idl index 7a53a84079d..5ffb4cd5b5b 100644 --- a/include/d3dcommon.idl +++ b/include/d3dcommon.idl @@ -100,6 +100,7 @@ typedef enum D3D_DRIVER_TYPE typedef enum D3D_FEATURE_LEVEL { + D3D_FEATURE_LEVEL_1_0_CORE = 0x1000, D3D_FEATURE_LEVEL_9_1 = 0x9100, D3D_FEATURE_LEVEL_9_2 = 0x9200, D3D_FEATURE_LEVEL_9_3 = 0x9300, @@ -109,6 +110,7 @@ typedef enum D3D_FEATURE_LEVEL D3D_FEATURE_LEVEL_11_1 = 0xb100, D3D_FEATURE_LEVEL_12_0 = 0xc000, D3D_FEATURE_LEVEL_12_1 = 0xc100, + D3D_FEATURE_LEVEL_12_2 = 0xc200, } D3D_FEATURE_LEVEL; cpp_quote("#define D3D_FL9_1_REQ_TEXTURE1D_U_DIMENSION 2048")

1 0

Zhiyi Zhang : bcrypt: Fix an possible out-of-bounds read (Coverity).
by Alexandre Julliard 17 Jan '24

17 Jan '24

Module: wine Branch: master Commit: fe7e7c62ee938407e0e411f5fd64637b40bfc2d2 URL: https://gitlab.winehq.org/wine/wine/-/commit/fe7e7c62ee938407e0e411f5fd6463… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Sat Dec 30 11:52:42 2023 +0800 bcrypt: Fix an possible out-of-bounds read (Coverity). --- dlls/bcrypt/bcrypt_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 26472cbfe2b..52066a32c74 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -272,7 +272,7 @@ static struct object *get_object( BCRYPT_HANDLE handle, ULONG magic ) } idx = (ULONG_PTR)handle >> 4; - if (idx > ARRAY_SIZE(pseudo_algorithms) || !pseudo_algorithms[idx].hdr.magic) + if (idx >= ARRAY_SIZE(pseudo_algorithms) || !pseudo_algorithms[idx].hdr.magic) { FIXME( "pseudo-handle %p not supported\n", handle ); return NULL;

1 0

Zhiyi Zhang : msi: Fix a memory leak (Coverity).
by Alexandre Julliard 17 Jan '24

17 Jan '24

Module: wine Branch: master Commit: 4afca1787febb012d0cdd2c007dd32beba35178d URL: https://gitlab.winehq.org/wine/wine/-/commit/4afca1787febb012d0cdd2c007dd32… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Sat Dec 30 11:58:04 2023 +0800 msi: Fix a memory leak (Coverity). --- dlls/msi/action.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 575af431854..20da818e686 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -5263,9 +5263,13 @@ static UINT ACTION_ResolveSource(MSIPACKAGE* package) MSI_RecordSetStringW(record, 0, NULL); rc = MSI_ProcessMessage(package, INSTALLMESSAGE_ERROR, record); if (rc == IDCANCEL) + { + msiobj_release(&record->hdr); return ERROR_INSTALL_USEREXIT; + } attrib = GetFileAttributesW(package->db->path); } + msiobj_release(&record->hdr); rc = ERROR_SUCCESS; } else

1 0

Zhiyi Zhang : wldap32: Fix a possible memory leak (Coverity).
by Alexandre Julliard 17 Jan '24

17 Jan '24

Module: wine Branch: master Commit: b0de71f2149f53263a372a0b09cd77e0aca71c47 URL: https://gitlab.winehq.org/wine/wine/-/commit/b0de71f2149f53263a372a0b09cd77… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Sat Dec 30 13:05:21 2023 +0800 wldap32: Fix a possible memory leak (Coverity). --- dlls/wldap32/ber.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/wldap32/ber.c b/dlls/wldap32/ber.c index d3e8adc8433..d38f0119dc4 100644 --- a/dlls/wldap32/ber.c +++ b/dlls/wldap32/ber.c @@ -91,8 +91,12 @@ int CDECL WLDAP32_ber_flatten( WLDAP32_BerElement *ber, BERVAL **berval ) TRACE( "%p, %p\n", ber, berval ); if (ber_flatten( BER(ber), &bervalU )) return WLDAP32_LBER_ERROR; - if (!(bervalW = bervalUtoW( bervalU ))) return WLDAP32_LBER_ERROR; + + bervalW = bervalUtoW( bervalU ); ber_bvfree( bervalU ); + if (!bervalW) + return WLDAP32_LBER_ERROR; + *berval = bervalW; return 0; }

1 0

Biswapriyo Nath : include: Add missing macros in devenum.idl.
by Alexandre Julliard 17 Jan '24

17 Jan '24

Module: wine Branch: master Commit: e031a0d0daf1af0b328f23cddbcb5d6b101c32bc URL: https://gitlab.winehq.org/wine/wine/-/commit/e031a0d0daf1af0b328f23cddbcb5d… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Mon Dec 18 09:54:44 2023 +0000 include: Add missing macros in devenum.idl. --- include/devenum.idl | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/include/devenum.idl b/include/devenum.idl index f7eaf9a4a59..2afe365bd5e 100644 --- a/include/devenum.idl +++ b/include/devenum.idl @@ -27,6 +27,12 @@ cpp_quote("#define CDEF_BYPASS_CLASS_MANAGER 0x0002") cpp_quote("#define CDEF_CLASS_LEGACY 0x0004") cpp_quote("#define CDEF_MERIT_ABOVE_DO_NOT_USE 0x0008") +cpp_quote("#define CDEF_DEVMON_CMGR_DEVICE 0x0010") +cpp_quote("#define CDEF_DEVMON_DMO 0x0020") +cpp_quote("#define CDEF_DEVMON_PNP_DEVICE 0x0040") +cpp_quote("#define CDEF_DEVMON_FILTER 0x0080") +cpp_quote("#define CDEF_DEVMON_SELECTIVE_MASK 0x00f0") + [ object, uuid(29840822-5B84-11D0-BD3B-00A0C911CE86),

1 0

← Newer
1
...
48
49
50
51
52
53
54
...
72
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits January 2024