March 2023 - Wine-Commits - list.winehq.org

Michael Stefaniuc : uiautomationcore/tests: Drop superfluous TRUE : FALSE conditional expression.
by Alexandre Julliard March 31, 2023

March 31, 2023

Module: wine Branch: master Commit: 0afc0d8de995e4e4e85dd676a3ea61f5f29cd5bc URL: https://gitlab.winehq.org/wine/wine/-/commit/0afc0d8de995e4e4e85dd676a3ea61… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Mar 30 19:21:51 2023 +0200 uiautomationcore/tests: Drop superfluous TRUE : FALSE conditional expression. --- dlls/uiautomationcore/tests/uiautomation.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/uiautomationcore/tests/uiautomation.c b/dlls/uiautomationcore/tests/uiautomation.c index ce3ee303fd1..3d2a61af8f0 100644 --- a/dlls/uiautomationcore/tests/uiautomation.c +++ b/dlls/uiautomationcore/tests/uiautomation.c @@ -135,7 +135,7 @@ static BOOL iface_cmp(IUnknown *iface1, IUnknown *iface2) IUnknown_QueryInterface(iface1, &IID_IUnknown, (void**)&unk1); IUnknown_QueryInterface(iface2, &IID_IUnknown, (void**)&unk2); - cmp = (unk1 == unk2) ? TRUE : FALSE; + cmp = unk1 == unk2; IUnknown_Release(unk1); IUnknown_Release(unk2);

1 0

Michael Stefaniuc : dinput: Remove superfluous cast to self.
by Alexandre Julliard March 31, 2023

March 31, 2023

Module: wine Branch: master Commit: 6acbec19279c25c3751f459053bfad5f18a62245 URL: https://gitlab.winehq.org/wine/wine/-/commit/6acbec19279c25c3751f459053bfad… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Mar 30 19:35:16 2023 +0200 dinput: Remove superfluous cast to self. --- dlls/dinput/dinput.c | 2 +- dlls/dinput/tests/dinput.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/dinput.c b/dlls/dinput/dinput.c index f3003b652d8..76c60b09db0 100644 --- a/dlls/dinput/dinput.c +++ b/dlls/dinput/dinput.c @@ -944,7 +944,7 @@ HRESULT WINAPI DECLSPEC_HOTPATCH DirectInput8Create( HINSTANCE hinst, DWORD vers if (outer || FAILED(hr = IDirectInput8_Initialize( (IDirectInput8W *)unknown, hinst, version ))) { - IUnknown_Release( (IUnknown *)unknown ); + IUnknown_Release( unknown ); *out = NULL; return hr; } diff --git a/dlls/dinput/tests/dinput.c b/dlls/dinput/tests/dinput.c index 682a5cbf97f..88db7be9288 100644 --- a/dlls/dinput/tests/dinput.c +++ b/dlls/dinput/tests/dinput.c @@ -84,7 +84,7 @@ static HRESULT WINAPI outer_QueryInterface( IUnknown *iface, REFIID iid, void ** if (IsEqualGUID( iid, &IID_IUnknown )) { - *obj = (IUnknown *)iface; + *obj = iface; return S_OK; }

1 0

Michael Stefaniuc : wmvcore/tests: Don't cast NULL to another pointer type.
by Alexandre Julliard March 31, 2023

March 31, 2023

Module: wine Branch: master Commit: 17fbef91929af9c6ab98e53fb2a54942f0f1a0a5 URL: https://gitlab.winehq.org/wine/wine/-/commit/17fbef91929af9c6ab98e53fb2a549… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Mar 30 19:27:19 2023 +0200 wmvcore/tests: Don't cast NULL to another pointer type. --- dlls/wmvcore/tests/wmvcore.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wmvcore/tests/wmvcore.c b/dlls/wmvcore/tests/wmvcore.c index f07abb8d4bb..a116d8a1d69 100644 --- a/dlls/wmvcore/tests/wmvcore.c +++ b/dlls/wmvcore/tests/wmvcore.c @@ -3185,7 +3185,7 @@ static void test_async_reader_settings(void) WMT_TYPE_DWORD, 0, E_INVALIDARG); SetEvent(callback.expect_started); - hr = IWMReader_Start(reader, 0, 0, 1, (void **)NULL); + hr = IWMReader_Start(reader, 0, 0, 1, NULL); ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = IWMReader_Close(reader); ok(hr == S_OK, "Got hr %#lx.\n", hr); @@ -3259,7 +3259,7 @@ static void test_async_reader_streaming(void) ok(!ref, "Got outstanding refcount %ld.\n", ref); } - hr = IWMReader_Start(reader, 0, 0, 1.0f, (void *)NULL); + hr = IWMReader_Start(reader, 0, 0, 1.0f, NULL); ok(hr == S_OK, "Got hr %#lx.\n", hr); wait_started_callback(&callback); @@ -3296,7 +3296,7 @@ static void test_async_reader_streaming(void) callback.last_pts[1] = 0; callback.next_pts[1] = 0; - hr = IWMReader_Start(reader, 0, 0, 1.0f, (void *)NULL); + hr = IWMReader_Start(reader, 0, 0, 1.0f, NULL); ok(hr == S_OK, "Got hr %#lx.\n", hr); wait_started_callback(&callback);

1 0

Michael Stefaniuc : dinput/tests: Drop superfluous TRUE : FALSE conditional expressions.
by Alexandre Julliard March 31, 2023

March 31, 2023

Module: wine Branch: master Commit: 567e35ceaf4bbf23c91d545d7a15c75dada6a424 URL: https://gitlab.winehq.org/wine/wine/-/commit/567e35ceaf4bbf23c91d545d7a15c7… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Mar 30 19:20:44 2023 +0200 dinput/tests: Drop superfluous TRUE : FALSE conditional expressions. --- dlls/dinput/tests/force_feedback.c | 2 +- dlls/dinput/tests/joystick8.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/tests/force_feedback.c b/dlls/dinput/tests/force_feedback.c index 696546ee49d..0086144fb73 100644 --- a/dlls/dinput/tests/force_feedback.c +++ b/dlls/dinput/tests/force_feedback.c @@ -2950,7 +2950,7 @@ static BOOL test_force_feedback_joystick( DWORD version ) .expect_count = version < 0x700 ? ARRAY_SIZE(expect_objects_5) : ARRAY_SIZE(expect_objects), .expect_objs = version < 0x700 ? expect_objects_5 : expect_objects, .todo_objs = version < 0x700 ? todo_objects_5 : NULL, - .todo_extra = version < 0x700 ? TRUE : FALSE, + .todo_extra = version < 0x700, }; struct check_effects_params check_effects_params = { diff --git a/dlls/dinput/tests/joystick8.c b/dlls/dinput/tests/joystick8.c index e654fd53dbb..3ab6f3c26d4 100644 --- a/dlls/dinput/tests/joystick8.c +++ b/dlls/dinput/tests/joystick8.c @@ -1781,7 +1781,7 @@ static void test_simple_joystick( DWORD version ) .expect_count = version < 0x700 ? ARRAY_SIZE(expect_objects_5) : ARRAY_SIZE(expect_objects), .expect_objs = version < 0x700 ? expect_objects_5 : expect_objects, .todo_objs = version < 0x700 ? todo_objects_5 : NULL, - .todo_extra = version < 0x700 ? TRUE : FALSE, + .todo_extra = version < 0x700, }; const DIEFFECTINFOW expect_effects[] = {};

1 0

Zebediah Figura : include: Include corecrt.h in vadefs.h.
by Alexandre Julliard March 31, 2023

March 31, 2023

Module: wine Branch: master Commit: cf4b4ff642494251ab3d3c7e3c8fb77c5e4b78fd URL: https://gitlab.winehq.org/wine/wine/-/commit/cf4b4ff642494251ab3d3c7e3c8fb7… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Mar 30 16:21:22 2023 -0500 include: Include corecrt.h in vadefs.h. For the __has_attribute() fallback. Fixes: f4c3801495f4fe17a10e2f21339de3b511c78339 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54666 --- include/msvcrt/vadefs.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/msvcrt/vadefs.h b/include/msvcrt/vadefs.h index 462c2d6815f..b5205f79c36 100644 --- a/include/msvcrt/vadefs.h +++ b/include/msvcrt/vadefs.h @@ -21,6 +21,8 @@ #ifndef _INC_VADEFS #define _INC_VADEFS +#include <corecrt.h> + #ifdef __cplusplus #define _ADDRESSOF(v) (&reinterpret_cast<const char &>(v)) #else

1 0

Alistair Leslie-Hughes : msado15: Handle DBTYPE_STR type when loading recordset data.
by Alexandre Julliard March 30, 2023

March 30, 2023

Module: wine Branch: master Commit: 3a1f5224fb92913f1789970a755e9bc4e00ceac0 URL: https://gitlab.winehq.org/wine/wine/-/commit/3a1f5224fb92913f1789970a755e9b… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Mar 28 14:06:45 2023 +1100 msado15: Handle DBTYPE_STR type when loading recordset data. --- dlls/msado15/recordset.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c index 13807aa1c5a..0f4acda0156 100644 --- a/dlls/msado15/recordset.c +++ b/dlls/msado15/recordset.c @@ -970,6 +970,22 @@ static HRESULT map_index( struct fields *fields, VARIANT *index, ULONG *ret ) return MAKE_ADO_HRESULT(adErrItemNotFound); } +static inline WCHAR *heap_strdupAtoW(const char *str) +{ + LPWSTR ret = NULL; + + if(str) { + DWORD len; + + len = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0); + ret = malloc(len*sizeof(WCHAR)); + if(ret) + MultiByteToWideChar(CP_ACP, 0, str, -1, ret, len); + } + + return ret; +} + static HRESULT WINAPI fields_get_Item( Fields *iface, VARIANT index, Field **obj ) { struct fields *fields = impl_from_Fields( iface ); @@ -1948,6 +1964,15 @@ static HRESULT load_all_recordset_data(struct recordset *recordset, IUnknown *ro case DBTYPE_I4: V_I4(&copy) = *(LONG*)(data + bindings[datacol].obValue); break; + case DBTYPE_STR: + { + WCHAR *str = heap_strdupAtoW( (char*)(data + bindings[datacol].obValue) ); + + V_VT(&copy) = VT_BSTR; + V_BSTR(&copy) = SysAllocString(str); + free(str); + break; + } case DBTYPE_WSTR: { V_VT(&copy) = VT_BSTR;

1 0

Michael Stefaniuc : dmsynth: Don't crash when Open() gets a DMUS_PORTPARAMS7.
by Alexandre Julliard March 30, 2023

March 30, 2023

Module: wine Branch: master Commit: 48fdc8e08c4150c74e6c740df82518405125541d URL: https://gitlab.winehq.org/wine/wine/-/commit/48fdc8e08c4150c74e6c740df82518… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Mar 29 22:35:32 2023 +0200 dmsynth: Don't crash when Open() gets a DMUS_PORTPARAMS7. Wrong sizeof check: pointer instead of referenced structure. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53704 --- dlls/dmsynth/synth.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dmsynth/synth.c b/dlls/dmsynth/synth.c index 121d9aadf35..3631bcfe784 100644 --- a/dlls/dmsynth/synth.c +++ b/dlls/dmsynth/synth.c @@ -163,7 +163,7 @@ static HRESULT WINAPI IDirectMusicSynth8Impl_Open(IDirectMusicSynth8 *iface, DMU modified = TRUE; params->fShare = FALSE; - if (params->dwSize >= sizeof(params)) { + if (params->dwSize >= sizeof(*params)) { if (params->dwValidParams & DMUS_PORTPARAMS_FEATURES && params->dwFeatures) { if (params->dwFeatures & ~(DMUS_PORT_FEATURE_AUDIOPATH|DMUS_PORT_FEATURE_STREAMING)) { modified = TRUE;

1 0

Alex Henrie : wldap32: Return ~0u from ldap_modrdn* for any error.
by Alexandre Julliard March 30, 2023

March 30, 2023

Module: wine Branch: master Commit: c8148d677898aea3b40e81eeb4d663de469c4ecc URL: https://gitlab.winehq.org/wine/wine/-/commit/c8148d677898aea3b40e81eeb4d663… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Mar 30 09:34:48 2023 -0600 wldap32: Return ~0u from ldap_modrdn* for any error. --- dlls/wldap32/modrdn.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/dlls/wldap32/modrdn.c b/dlls/wldap32/modrdn.c index 4acf16eb5e4..f9d2a356e87 100644 --- a/dlls/wldap32/modrdn.c +++ b/dlls/wldap32/modrdn.c @@ -33,7 +33,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(wldap32); */ ULONG CDECL ldap_modrdnA( LDAP *ld, char *dn, char *newdn ) { - ULONG ret = WLDAP32_LDAP_NO_MEMORY; + ULONG ret = ~0u; WCHAR *dnW = NULL, *newdnW = NULL; TRACE( "(%p, %s, %s)\n", ld, debugstr_a(dn), debugstr_a(newdn) ); @@ -65,7 +65,7 @@ ULONG CDECL ldap_modrdnW( LDAP *ld, WCHAR *dn, WCHAR *newdn ) */ ULONG CDECL ldap_modrdn2A( LDAP *ld, char *dn, char *newdn, int delete ) { - ULONG ret = WLDAP32_LDAP_NO_MEMORY; + ULONG ret = ~0u; WCHAR *dnW = NULL, *newdnW = NULL; TRACE( "(%p, %s, %p, 0x%02x)\n", ld, debugstr_a(dn), newdn, delete ); @@ -88,7 +88,7 @@ exit: */ ULONG CDECL ldap_modrdn2W( LDAP *ld, WCHAR *dn, WCHAR *newdn, int delete ) { - ULONG ret = WLDAP32_LDAP_NO_MEMORY; + ULONG ret = ~0u; char *dnU = NULL, *newdnU = NULL; int msg; @@ -96,15 +96,12 @@ ULONG CDECL ldap_modrdn2W( LDAP *ld, WCHAR *dn, WCHAR *newdn, int delete ) if (!ld || !newdn) return ~0u; - if (dn && !(dnU = strWtoU( dn ))) return WLDAP32_LDAP_NO_MEMORY; + if (dn && !(dnU = strWtoU( dn ))) return ~0u; if ((newdnU = strWtoU( newdn ))) { - ret = ldap_rename( CTX(ld), dnU, newdnU, NULL, delete, NULL, NULL, &msg ); - if (ret == WLDAP32_LDAP_SUCCESS) + if (ldap_rename( CTX(ld), dnU, newdnU, NULL, delete, NULL, NULL, &msg ) == LDAP_SUCCESS) ret = msg; - else - ret = ~0u; free( newdnU ); } free( dnU );

1 0

Mohamad Al-Jaf : include: Add DirectXAlphaMode enum.
by Alexandre Julliard March 30, 2023

March 30, 2023

Module: wine Branch: master Commit: 58e6c4d11cd79bb35977c03ac0b09c1c515eb6d1 URL: https://gitlab.winehq.org/wine/wine/-/commit/58e6c4d11cd79bb35977c03ac0b09c… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Thu Mar 30 02:17:39 2023 -0400 include: Add DirectXAlphaMode enum. Needed for mingw Firefox build. --- include/windows.graphics.directx.idl | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/include/windows.graphics.directx.idl b/include/windows.graphics.directx.idl index 251d3d20f2a..45961ec983e 100644 --- a/include/windows.graphics.directx.idl +++ b/include/windows.graphics.directx.idl @@ -27,6 +27,7 @@ import "windowscontracts.idl"; import "windows.foundation.idl"; namespace Windows.Graphics.DirectX { + typedef enum DirectXAlphaMode DirectXAlphaMode; typedef enum DirectXPixelFormat DirectXPixelFormat; declare { @@ -35,6 +36,17 @@ namespace Windows.Graphics.DirectX { interface Windows.Foundation.Collections.IVectorView<Windows.Graphics.DirectX.DirectXPixelFormat>; } + [ + contract(Windows.Foundation.UniversalApiContract, 2.0) + ] + enum DirectXAlphaMode + { + Unspecified = 0, + Premultiplied = 1, + Straight = 2, + Ignore = 3, + }; + [ contract(Windows.Foundation.UniversalApiContract, 1.0) ]

1 0

Alex Henrie : wldap32: Implement setting LDAP_OPT_SERVER_CERTIFICATE and add tests.
by Alexandre Julliard March 30, 2023

March 30, 2023

Module: wine Branch: master Commit: 8fb04515cfc733eaee66201941fcce5120865ce5 URL: https://gitlab.winehq.org/wine/wine/-/commit/8fb04515cfc733eaee66201941fcce… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Mar 30 09:34:48 2023 -0600 wldap32: Implement setting LDAP_OPT_SERVER_CERTIFICATE and add tests. ctxt_handle is moved to the top of struct tlsw_session so that it can be easily retrieved via LDAP_OPT_X_TLS_SSL_CTX. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54727 --- dlls/wldap32/Makefile.in | 2 +- dlls/wldap32/add.c | 8 ++++++-- dlls/wldap32/bind.c | 22 ++++++++++++++++------ dlls/wldap32/compare.c | 8 ++++++-- dlls/wldap32/control.c | 2 ++ dlls/wldap32/delete.c | 8 ++++++-- dlls/wldap32/extended.c | 8 ++++++-- dlls/wldap32/init.c | 34 +++++++++++++++++++++++++++++++++- dlls/wldap32/modify.c | 8 ++++++-- dlls/wldap32/modrdn.c | 5 ++++- dlls/wldap32/option.c | 7 +++++-- dlls/wldap32/rename.c | 8 ++++++-- dlls/wldap32/search.c | 16 +++++++++------- dlls/wldap32/tests/Makefile.in | 2 +- dlls/wldap32/tests/parse.c | 39 +++++++++++++++++++++++++++++++++++++++ dlls/wldap32/winldap_private.h | 16 ++++++++++++++-- include/winldap.h | 2 ++ libs/ldap/libldap/tls_w.c | 2 +- 18 files changed, 163 insertions(+), 34 deletions(-)

1 0