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

Connor McAdams : uiautomationcore: Add support for element array properties in IUIAutomationElement::GetCurrentPropertyValueEx.
by Alexandre Julliard March 13, 2023

March 13, 2023

Module: wine Branch: master Commit: 64d13cb7ecbd24c55973a440319d2248fbd55675 URL: https://gitlab.winehq.org/wine/wine/-/commit/64d13cb7ecbd24c55973a440319d22… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Wed Mar 8 13:40:49 2023 -0500 uiautomationcore: Add support for element array properties in IUIAutomationElement::GetCurrentPropertyValueEx. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/tests/uiautomation.c | 135 ++++++++++++++++--- dlls/uiautomationcore/uia_com_client.c | 207 ++++++++++++++++++++++++++++- 2 files changed, 316 insertions(+), 26 deletions(-)

1 0

Connor McAdams : uiautomationcore: Validate input arguments for IUIAutomationElement::GetCurrentPropertyValueEx.
by Alexandre Julliard March 13, 2023

March 13, 2023

Module: wine Branch: master Commit: 67496491804953c04427c90821ecab6e5a9f2035 URL: https://gitlab.winehq.org/wine/wine/-/commit/67496491804953c04427c90821ecab… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Wed Mar 8 12:04:55 2023 -0500 uiautomationcore: Validate input arguments for IUIAutomationElement::GetCurrentPropertyValueEx. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/tests/uiautomation.c | 8 ++++++++ dlls/uiautomationcore/uia_com_client.c | 8 +++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/dlls/uiautomationcore/tests/uiautomation.c b/dlls/uiautomationcore/tests/uiautomation.c index e6be0ce75a3..1c3f1d6c15c 100644 --- a/dlls/uiautomationcore/tests/uiautomation.c +++ b/dlls/uiautomationcore/tests/uiautomation.c @@ -9851,7 +9851,15 @@ static void test_Element_GetPropertyValue(IUIAutomation *uia_iface) hr = UiaGetReservedNotSupportedValue(&unk_ns); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + hr = IUIAutomationElement_GetCurrentPropertyValueEx(element, UIA_ControlTypePropertyId, TRUE, NULL); + ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); + VariantInit(&v); + V_VT(&v) = VT_BOOL; + hr = IUIAutomationElement_GetCurrentPropertyValueEx(element, 1, TRUE, &v); + ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); + ok(V_VT(&v) == VT_EMPTY, "Unexpected vt %d\n", V_VT(&v)); + for (i = 0; i < ARRAY_SIZE(element_properties); i++) { elem_prop = &element_properties[i]; diff --git a/dlls/uiautomationcore/uia_com_client.c b/dlls/uiautomationcore/uia_com_client.c index a6320f15b0d..e5fdc049342 100644 --- a/dlls/uiautomationcore/uia_com_client.c +++ b/dlls/uiautomationcore/uia_com_client.c @@ -714,10 +714,16 @@ static HRESULT WINAPI uia_element_GetCurrentPropertyValueEx(IUIAutomationElement TRACE("%p, %d, %d, %p\n", iface, prop_id, ignore_default, ret_val); + if (!ret_val) + return E_POINTER; + + VariantInit(ret_val); + if (!prop_info) + return E_INVALIDARG; + if (!ignore_default) FIXME("Default values currently unimplemented\n"); - VariantInit(ret_val); if (prop_info->type == UIAutomationType_ElementArray) { FIXME("ElementArray property types currently unsupported for IUIAutomationElement\n");

1 0

Alexandre Julliard : tiff: Import upstream release 4.5.0.
by Alexandre Julliard March 13, 2023

March 13, 2023

Module: wine Branch: master Commit: 4c255f5a634a0f1e75f046da8a8c0446357b562f URL: https://gitlab.winehq.org/wine/wine/-/commit/4c255f5a634a0f1e75f046da8a8c04… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Mar 11 18:37:42 2023 +0100 tiff: Import upstream release 4.5.0. --- libs/tiff/Makefile.in | 1 + libs/tiff/libtiff/t4.h | 464 +- libs/tiff/libtiff/tif_aux.c | 649 +- libs/tiff/libtiff/tif_close.c | 169 +- libs/tiff/libtiff/tif_codec.c | 136 +- libs/tiff/libtiff/tif_compress.c | 428 +- libs/tiff/libtiff/tif_config.h | 6 +- libs/tiff/libtiff/tif_dir.c | 3589 +++++----- libs/tiff/libtiff/tif_dir.h | 461 +- libs/tiff/libtiff/tif_dirinfo.c | 2499 ++++--- libs/tiff/libtiff/tif_dirread.c | 13616 +++++++++++++++++++------------------ libs/tiff/libtiff/tif_dirwrite.c | 6010 ++++++++-------- libs/tiff/libtiff/tif_dumpmode.c | 151 +- libs/tiff/libtiff/tif_error.c | 148 +- libs/tiff/libtiff/tif_fax3.c | 2743 ++++---- libs/tiff/libtiff/tif_fax3.h | 899 +-- libs/tiff/libtiff/tif_flush.c | 135 +- libs/tiff/libtiff/tif_hash_set.c | 603 ++ libs/tiff/libtiff/tif_hash_set.h | 100 + libs/tiff/libtiff/tif_jpeg.c | 4124 ++++++----- libs/tiff/libtiff/tif_luv.c | 2752 ++++---- libs/tiff/libtiff/tif_lzw.c | 2270 ++++--- libs/tiff/libtiff/tif_next.c | 301 +- libs/tiff/libtiff/tif_open.c | 1233 ++-- libs/tiff/libtiff/tif_packbits.c | 510 +- libs/tiff/libtiff/tif_pixarlog.c | 2586 +++---- libs/tiff/libtiff/tif_predict.c | 1557 +++-- libs/tiff/libtiff/tif_predict.h | 55 +- libs/tiff/libtiff/tif_read.c | 2448 +++---- libs/tiff/libtiff/tif_strip.c | 482 +- libs/tiff/libtiff/tif_swab.c | 445 +- libs/tiff/libtiff/tif_thunder.c | 281 +- libs/tiff/libtiff/tif_tile.c | 415 +- libs/tiff/libtiff/tif_warning.c | 122 +- libs/tiff/libtiff/tif_win32.c | 604 +- libs/tiff/libtiff/tif_write.c | 1372 ++-- libs/tiff/libtiff/tif_zip.c | 1043 +-- libs/tiff/libtiff/tiff.h | 1422 ++-- libs/tiff/libtiff/tiffconf.h | 1 + libs/tiff/libtiff/tiffio.h | 865 +-- libs/tiff/libtiff/tiffiop.h | 633 +- libs/tiff/libtiff/tiffvers.h | 25 +- libs/tiff/libtiff/uvcode.h | 269 +- 43 files changed, 30941 insertions(+), 27681 deletions(-)

1 0

Alexandre Julliard : faudio: Import upstream release 23.03.
by Alexandre Julliard March 13, 2023

March 13, 2023

Module: wine Branch: master Commit: f953b99c51829b5e2e93b7e07285c3d6953f63d0 URL: https://gitlab.winehq.org/wine/wine/-/commit/f953b99c51829b5e2e93b7e07285c3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Mar 11 18:24:53 2023 +0100 faudio: Import upstream release 23.03. --- libs/faudio/LICENSE | 2 +- libs/faudio/include/F3DAudio.h | 2 +- libs/faudio/include/FACT.h | 2 +- libs/faudio/include/FACT3D.h | 2 +- libs/faudio/include/FAPO.h | 2 +- libs/faudio/include/FAPOBase.h | 2 +- libs/faudio/include/FAPOFX.h | 2 +- libs/faudio/include/FAudio.h | 6 ++--- libs/faudio/include/FAudioFX.h | 2 +- libs/faudio/src/F3DAudio.c | 2 +- libs/faudio/src/FACT.c | 37 +++++++++++++------------------ libs/faudio/src/FACT3D.c | 2 +- libs/faudio/src/FACT_internal.c | 2 +- libs/faudio/src/FACT_internal.h | 2 +- libs/faudio/src/FAPOBase.c | 2 +- libs/faudio/src/FAPOFX.c | 2 +- libs/faudio/src/FAPOFX_echo.c | 2 +- libs/faudio/src/FAPOFX_eq.c | 2 +- libs/faudio/src/FAPOFX_masteringlimiter.c | 2 +- libs/faudio/src/FAPOFX_reverb.c | 2 +- libs/faudio/src/FAudio.c | 2 +- libs/faudio/src/FAudioFX_reverb.c | 2 +- libs/faudio/src/FAudioFX_volumemeter.c | 2 +- libs/faudio/src/FAudio_internal.c | 2 +- libs/faudio/src/FAudio_internal.h | 2 +- libs/faudio/src/FAudio_internal_simd.c | 2 +- libs/faudio/src/FAudio_operationset.c | 2 +- 27 files changed, 44 insertions(+), 49 deletions(-)

1 0

Alexandre Julliard : lcms2: Import upstream release 2.15.
by Alexandre Julliard March 13, 2023

March 13, 2023

Module: wine Branch: master Commit: d462bcdff162417261cb16d6912e690a41f14ee7 URL: https://gitlab.winehq.org/wine/wine/-/commit/d462bcdff162417261cb16d6912e69… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Mar 11 18:22:36 2023 +0100 lcms2: Import upstream release 2.15. --- libs/lcms2/AUTHORS | 4 ++++ libs/lcms2/include/lcms2.h | 8 ++++---- libs/lcms2/include/lcms2_plugin.h | 2 +- libs/lcms2/src/cmsalpha.c | 2 +- libs/lcms2/src/cmscnvrt.c | 12 ++++++------ libs/lcms2/src/cmserr.c | 2 +- libs/lcms2/src/cmsgamma.c | 6 +++++- libs/lcms2/src/cmshalf.c | 2 +- libs/lcms2/src/cmsintrp.c | 2 +- libs/lcms2/src/cmsio0.c | 8 ++++---- libs/lcms2/src/cmsio1.c | 6 +++++- libs/lcms2/src/cmslut.c | 2 +- libs/lcms2/src/cmsmtrx.c | 2 +- libs/lcms2/src/cmsnamed.c | 12 ++++++++++-- libs/lcms2/src/cmsopt.c | 6 +++++- libs/lcms2/src/cmspack.c | 10 +++++----- libs/lcms2/src/cmspcs.c | 2 +- libs/lcms2/src/cmsplugin.c | 16 +++++++++------- libs/lcms2/src/cmssamp.c | 7 +++---- libs/lcms2/src/cmstypes.c | 14 ++++++++++++-- libs/lcms2/src/cmsvirt.c | 2 +- libs/lcms2/src/cmswtpnt.c | 7 +++++-- libs/lcms2/src/cmsxform.c | 2 +- libs/lcms2/src/lcms2_internal.h | 2 +- 24 files changed, 88 insertions(+), 50 deletions(-)

1 0

Alexandre Julliard : ldap: Import upstream release 2.5.14.
by Alexandre Julliard March 13, 2023

March 13, 2023

Module: wine Branch: master Commit: f93e53c94b0c36a277fed93740af463c5e3a8dec URL: https://gitlab.winehq.org/wine/wine/-/commit/f93e53c94b0c36a277fed93740af46… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Mar 11 18:30:53 2023 +0100 ldap: Import upstream release 2.5.14. --- libs/ldap/include/ac/socket.h | 24 +++++++++++------------- libs/ldap/include/ldap_pvt_thread.h | 3 ++- libs/ldap/liblber/bprint.c | 6 +++--- libs/ldap/libldap/filter.c | 2 ++ libs/ldap/libldap/request.c | 10 +++++----- 5 files changed, 23 insertions(+), 22 deletions(-) diff --git a/libs/ldap/include/ac/socket.h b/libs/ldap/include/ac/socket.h index e2d32afb3a8..e457d4ba754 100644 --- a/libs/ldap/include/ac/socket.h +++ b/libs/ldap/include/ac/socket.h @@ -63,7 +63,7 @@ #ifdef HAVE_WINSOCK2 #include <winsock2.h> #include <ws2tcpip.h> -#elif HAVE_WINSOCK +#elif defined(HAVE_WINSOCK) #include <winsock.h> #endif @@ -114,22 +114,20 @@ LBER_F( char * ) ber_pvt_wsa_err2string LDAP_P((int)); -#elif MACOS +#elif defined(MACOS) # define tcp_close( s ) tcpclose( s ) # define tcp_read( s, buf, len ) tcpread( s, buf, len ) # define tcp_write( s, buf, len ) tcpwrite( s, buf, len ) -#elif DOS -# ifdef PCNFS -# define tcp_close( s ) close( s ) -# define tcp_read( s, buf, len ) recv( s, buf, len, 0 ) -# define tcp_write( s, buf, len ) send( s, buf, len, 0 ) -# endif /* PCNFS */ -# ifdef NCSA -# define tcp_close( s ) do { netclose( s ); netshut() } while(0) -# define tcp_read( s, buf, len ) nread( s, buf, len ) -# define tcp_write( s, buf, len ) netwrite( s, buf, len ) -# endif /* NCSA */ +#elif defined(HAVE_PCNFS) +# define tcp_close( s ) close( s ) +# define tcp_read( s, buf, len ) recv( s, buf, len, 0 ) +# define tcp_write( s, buf, len ) send( s, buf, len, 0 ) + +#elif defined(HAVE_NCSA) +# define tcp_close( s ) do { netclose( s ); netshut() } while(0) +# define tcp_read( s, buf, len ) nread( s, buf, len ) +# define tcp_write( s, buf, len ) netwrite( s, buf, len ) #elif defined(HAVE_CLOSESOCKET) # define tcp_close( s ) closesocket( s ) diff --git a/libs/ldap/include/ldap_pvt_thread.h b/libs/ldap/include/ldap_pvt_thread.h index 18462ab57b5..5a9bd27a9c8 100644 --- a/libs/ldap/include/ldap_pvt_thread.h +++ b/libs/ldap/include/ldap_pvt_thread.h @@ -253,7 +253,8 @@ typedef enum { LDAP_PVT_THREAD_POOL_PARAM_ACTIVE_MAX, LDAP_PVT_THREAD_POOL_PARAM_PENDING_MAX, LDAP_PVT_THREAD_POOL_PARAM_BACKLOAD_MAX, - LDAP_PVT_THREAD_POOL_PARAM_STATE + LDAP_PVT_THREAD_POOL_PARAM_STATE, + LDAP_PVT_THREAD_POOL_PARAM_PAUSED } ldap_pvt_thread_pool_param_t; #endif /* !LDAP_PVT_THREAD_H_DONE */ diff --git a/libs/ldap/liblber/bprint.c b/libs/ldap/liblber/bprint.c index 50f0af2d3fe..da5003a82f9 100644 --- a/libs/ldap/liblber/bprint.c +++ b/libs/ldap/liblber/bprint.c @@ -266,9 +266,9 @@ ber_dump( } sprintf( buf, "ber_dump: buf=%p ptr=%p end=%p len=%ld\n", - ber->ber_buf, - ber->ber_ptr, - ber->ber_end, + (void *) ber->ber_buf, + (void *) ber->ber_ptr, + (void *) ber->ber_end, (long) len ); (void) (*ber_pvt_log_print)( buf ); diff --git a/libs/ldap/libldap/filter.c b/libs/ldap/libldap/filter.c index 5eb54583b58..2331171fb80 100644 --- a/libs/ldap/libldap/filter.c +++ b/libs/ldap/libldap/filter.c @@ -555,6 +555,8 @@ put_simple_filter( Debug1( LDAP_DEBUG_TRACE, "put_simple_filter: \"%s\"\n", str ); + if ( str[0] == '=' ) return -1; + str = LDAP_STRDUP( str ); if( str == NULL ) return -1; diff --git a/libs/ldap/libldap/request.c b/libs/ldap/libldap/request.c index ad5872e41aa..4709768379d 100644 --- a/libs/ldap/libldap/request.c +++ b/libs/ldap/libldap/request.c @@ -961,7 +961,7 @@ ldap_do_free_request( void *arg ) Debug3( LDAP_DEBUG_TRACE, "ldap_do_free_request: " "asked to free lr %p msgid %d refcnt %d\n", - lr, lr->lr_msgid, lr->lr_refcnt ); + (void *) lr, lr->lr_msgid, lr->lr_refcnt ); /* if lr_refcnt > 0, the request has been looked up * by ldap_find_request_by_msgid(); if in the meanwhile * the request is free()'d by someone else, just decrease @@ -1008,7 +1008,7 @@ ldap_free_request_int( LDAP *ld, LDAPRequest *lr ) assert( !removed || removed == lr ); Debug3( LDAP_DEBUG_TRACE, "ldap_free_request_int: " "lr %p msgid %d%s removed\n", - lr, lr->lr_msgid, removed ? "" : " not" ); + (void *) lr, lr->lr_msgid, removed ? "" : " not" ); ldap_do_free_request( lr ); } @@ -1673,12 +1673,12 @@ ldap_find_request_by_msgid( LDAP *ld, ber_int_t msgid ) lr->lr_refcnt++; Debug3( LDAP_DEBUG_TRACE, "ldap_find_request_by_msgid: " "msgid %d, lr %p lr->lr_refcnt = %d\n", - msgid, lr, lr->lr_refcnt ); + msgid, (void *) lr, lr->lr_refcnt ); return lr; } Debug2( LDAP_DEBUG_TRACE, "ldap_find_request_by_msgid: " - "msgid %d, lr %p\n", msgid, lr ); + "msgid %d, lr %p\n", msgid, (void *) lr ); return NULL; } @@ -1690,7 +1690,7 @@ ldap_return_request( LDAP *ld, LDAPRequest *lrx, int freeit ) lr = ldap_tavl_find( ld->ld_requests, lrx, ldap_req_cmp ); Debug2( LDAP_DEBUG_TRACE, "ldap_return_request: " - "lrx %p, lr %p\n", lrx, lr ); + "lrx %p, lr %p\n", (void *) lrx, (void *) lr ); if ( lr ) { assert( lr == lrx ); if ( lr->lr_refcnt > 0 ) {

1 0

Henri Verbeet : vkd3d-shader/sm4: Do not specify a destination register for VKD3D_SM4_OP_DCL_RESOURCE in opcode_table[].
by Alexandre Julliard March 13, 2023

March 13, 2023

Module: vkd3d Branch: master Commit: 685abf9c2d4c0421d99eb8b752fa1cd312a1677d URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/685abf9c2d4c0421d99eb8b752fa1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 13 14:41:12 2023 +0100 vkd3d-shader/sm4: Do not specify a destination register for VKD3D_SM4_OP_DCL_RESOURCE in opcode_table[]. We do not set one in shader_sm4_read_dcl_resource(), and shader_sm4_read_instruction() explicitly sets this to 0. --- libs/vkd3d-shader/dxbc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 978572d8..d99ea2e3 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -710,7 +710,7 @@ static const struct vkd3d_sm4_opcode_info opcode_table[] = {VKD3D_SM4_OP_USHR, VKD3DSIH_USHR, "u", "uu"}, {VKD3D_SM4_OP_UTOF, VKD3DSIH_UTOF, "f", "u"}, {VKD3D_SM4_OP_XOR, VKD3DSIH_XOR, "u", "uu"}, - {VKD3D_SM4_OP_DCL_RESOURCE, VKD3DSIH_DCL, "R", "", + {VKD3D_SM4_OP_DCL_RESOURCE, VKD3DSIH_DCL, "", "", shader_sm4_read_dcl_resource}, {VKD3D_SM4_OP_DCL_CONSTANT_BUFFER, VKD3DSIH_DCL_CONSTANT_BUFFER, "", "", shader_sm4_read_dcl_constant_buffer},

1 0

Henri Verbeet : vkd3d-shader/sm4: Set "dst_count" to 0 when we clear "dst" in shader_sm4_read_instruction().
by Alexandre Julliard March 13, 2023

March 13, 2023

Module: vkd3d Branch: master Commit: 65b7154a22a571df75abee15892d241b454669f4 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/65b7154a22a571df75abee15892d2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Feb 26 02:57:54 2023 +0100 vkd3d-shader/sm4: Set "dst_count" to 0 when we clear "dst" in shader_sm4_read_instruction(). VKD3D_SM4_OP_DCL_RESOURCE currently has 1 for "dst_count", but NULL for "dst". This is largely harmless because we never attempt to access the destination register of VKD3DSIH_DCL instructions, but nevertheless not quite proper. --- libs/vkd3d-shader/dxbc.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 6d16f079..978572d8 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -1539,6 +1539,7 @@ static void shader_sm4_read_instruction(struct vkd3d_shader_parser *parser, stru if (opcode_info->read_opcode_func) { ins->dst = NULL; + ins->dst_count = 0; opcode_info->read_opcode_func(ins, opcode, opcode_token, p, len, sm4); } else

1 0

Davide Beatrici : winepulse: Use GetModuleFileName() instead of hardcoded module filename for registry key.
by Alexandre Julliard March 10, 2023

March 10, 2023

Module: wine Branch: master Commit: 576827d83aedbec302e5ad1756d178fd94112308 URL: https://gitlab.winehq.org/wine/wine/-/commit/576827d83aedbec302e5ad1756d178… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Fri Mar 10 03:51:50 2023 +0100 winepulse: Use GetModuleFileName() instead of hardcoded module filename for registry key. --- dlls/winepulse.drv/mmdevdrv.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index 20fa08d3fa7..0ad17edf2ef 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -71,7 +71,7 @@ static GUID pulse_render_guid = static GUID pulse_capture_guid = { 0x25da76d0, 0x033c, 0x4235, { 0x90, 0x02, 0x19, 0xf4, 0x88, 0x94, 0xac, 0x6f } }; -static const WCHAR *drv_key_devicesW = L"Software\\Wine\\Drivers\\winepulse.drv\\devices"; +static WCHAR drv_key_devicesW[256]; static CRITICAL_SECTION session_cs; static CRITICAL_SECTION_DEBUG session_cs_debug = { @@ -85,9 +85,20 @@ static CRITICAL_SECTION session_cs = { &session_cs_debug, -1, 0, 0, 0, 0 }; BOOL WINAPI DllMain(HINSTANCE dll, DWORD reason, void *reserved) { if (reason == DLL_PROCESS_ATTACH) { + WCHAR buf[MAX_PATH]; + WCHAR *filename; + DisableThreadLibraryCalls(dll); if (__wine_init_unix_call()) return FALSE; + + GetModuleFileNameW(dll, buf, ARRAY_SIZE(buf)); + + filename = wcsrchr(buf, '\\'); + filename = filename ? filename + 1 : buf; + + swprintf(drv_key_devicesW, ARRAY_SIZE(drv_key_devicesW), + L"Software\\Wine\\Drivers\\%s\\devices", filename); } else if (reason == DLL_PROCESS_DETACH) { struct device_cache *device, *device_next;

1 0

Davide Beatrici : wineoss: Use GetModuleFileName() instead of hardcoded module filename for registry key.
by Alexandre Julliard March 10, 2023

March 10, 2023

Module: wine Branch: master Commit: 53baa4457438d90427ce1157644d0138a17a6355 URL: https://gitlab.winehq.org/wine/wine/-/commit/53baa4457438d90427ce1157644d01… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Fri Mar 10 03:51:05 2023 +0100 wineoss: Use GetModuleFileName() instead of hardcoded module filename for registry key. --- dlls/wineoss.drv/mmdevdrv.c | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index 6993fa88d0a..166f9408416 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -19,6 +19,7 @@ #define COBJMACROS #include <stdarg.h> +#include <wchar.h> #include "windef.h" #include "winbase.h" @@ -124,9 +125,7 @@ typedef struct _OSSDevice { static struct list g_devices = LIST_INIT(g_devices); -static const WCHAR drv_key_devicesW[] = {'S','o','f','t','w','a','r','e','\\', - 'W','i','n','e','\\','D','r','i','v','e','r','s','\\', - 'w','i','n','e','o','s','s','.','d','r','v','\\','d','e','v','i','c','e','s',0}; +static WCHAR drv_key_devicesW[256]; static const WCHAR guidW[] = {'g','u','i','d',0}; static CRITICAL_SECTION g_sessions_lock; @@ -207,9 +206,22 @@ BOOL WINAPI DllMain(HINSTANCE dll, DWORD reason, void *reserved) switch (reason) { case DLL_PROCESS_ATTACH: + { + WCHAR buf[MAX_PATH]; + WCHAR *filename; + if(__wine_init_unix_call()) return FALSE; - break; + GetModuleFileNameW(dll, buf, ARRAY_SIZE(buf)); + + filename = wcsrchr(buf, '\\'); + filename = filename ? filename + 1 : buf; + + swprintf(drv_key_devicesW, ARRAY_SIZE(drv_key_devicesW), + L"Software\\Wine\\Drivers\\%s\\devices", filename); + + break; + } case DLL_PROCESS_DETACH: if (!reserved) {

1 0