November 2021 - Wine-commits

Alex Henrie : oleacc/tests: Fix failure messages in test_AccessibleObjectFromEvent.
by Alexandre Julliard 23 Nov '21

23 Nov '21

Module: wine Branch: master Commit: d9984aa505a8968622e510f129299c6167c1bc2e URL: https://source.winehq.org/git/wine.git/?a=commit;h=d9984aa505a8968622e510f1… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Nov 22 23:02:08 2021 -0700 oleacc/tests: Fix failure messages in test_AccessibleObjectFromEvent. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleacc/tests/main.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/oleacc/tests/main.c b/dlls/oleacc/tests/main.c index 62346ffed01..8c234aee8aa 100644 --- a/dlls/oleacc/tests/main.c +++ b/dlls/oleacc/tests/main.c @@ -720,7 +720,7 @@ static void test_AccessibleObjectFromEvent(void) ok(hr == S_OK, "got %#x\n", hr); todo_wine ok(!iface_cmp((IUnknown*)acc, (IUnknown*)&Accessible), "acc == &Accessible\n"); ok(V_VT(&cid) == VT_I4, "got %#x, expected %#x\n", V_VT(&cid), VT_I4); - ok(V_I4(&cid) == 1, "got %#x, expected %#x\n", V_I4(&cid), CHILDID_SELF); + ok(V_I4(&cid) == 1, "got %#x, expected 1\n", V_I4(&cid)); SET_EXPECT(Accessible_get_accParent); SET_EXPECT(Accessible_get_accName); V_I4(&cid) = 0; @@ -736,7 +736,7 @@ static void test_AccessibleObjectFromEvent(void) ok(hr == S_OK, "got %#x\n", hr); todo_wine ok(!iface_cmp((IUnknown*)acc, (IUnknown*)&Accessible), "acc == &Accessible\n"); ok(V_VT(&cid) == VT_I4, "got %#x, expected %#x\n", V_VT(&cid), VT_I4); - ok(V_I4(&cid) == 2, "got %#x, expected %#x\n", V_I4(&cid), CHILDID_SELF); + ok(V_I4(&cid) == 2, "got %#x, expected 2\n", V_I4(&cid)); SET_EXPECT(Accessible_get_accParent); SET_EXPECT(Accessible_get_accName); V_I4(&cid) = 0; @@ -752,7 +752,7 @@ static void test_AccessibleObjectFromEvent(void) ok(hr == S_OK, "got %#x\n", hr); todo_wine ok(!iface_cmp((IUnknown*)acc, (IUnknown*)&Accessible_child), "acc == &Accessible_child\n"); ok(V_VT(&cid) == VT_I4, "got %#x, expected %#x\n", V_VT(&cid), VT_I4); - ok(V_I4(&cid) == 0, "got %#x, expected %#x\n", V_I4(&cid), CHILDID_SELF); + ok(V_I4(&cid) == CHILDID_SELF, "got %#x, expected %#x\n", V_I4(&cid), CHILDID_SELF); SET_EXPECT(Accessible_child_get_accParent); SET_EXPECT(Accessible_child_get_accName); hr = IAccessible_get_accName(acc, cid, NULL); @@ -767,7 +767,7 @@ static void test_AccessibleObjectFromEvent(void) ok(hr == S_OK, "got %#x\n", hr); ok(acc == &Accessible_child, "acc != &Accessible_child\n"); ok(V_VT(&cid) == VT_I4, "got %#x, expected %#x\n", V_VT(&cid), VT_I4); - ok(V_I4(&cid) == 0, "got %#x, expected %#x\n", V_I4(&cid), CHILDID_SELF); + ok(V_I4(&cid) == CHILDID_SELF, "got %#x, expected %#x\n", V_I4(&cid), CHILDID_SELF); SET_EXPECT(Accessible_child_get_accName); hr = IAccessible_get_accName(acc, cid, NULL); ok(hr == E_INVALIDARG, "get_accName returned %x\n", hr);

1 0

Alexandre Julliard : makefiles: Don't use bundled libraries to build native Unix libraries.
by Alexandre Julliard 23 Nov '21

23 Nov '21

Module: wine Branch: master Commit: 1ef7dd2d7c0124371e9915d707102b01a3ad27ec URL: https://source.winehq.org/git/wine.git/?a=commit;h=1ef7dd2d7c0124371e9915d7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 23 14:40:04 2021 +0100 makefiles: Don't use bundled libraries to build native Unix libraries. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 29 +++++++++++++---------------- 1 file changed, 13 insertions(+), 16 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index d0dc9e3d01d..a5ce73ae482 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -2015,9 +2015,8 @@ static struct strarray add_unix_libraries( const struct makefile *make, struct s struct strarray all_libs = empty_strarray; unsigned int i, j; - if (make->native_unix_lib && strcmp( make->unixlib, "ntdll.so" )) strarray_add( &all_libs, "-lntdll" ); + if (strcmp( make->unixlib, "ntdll.so" )) strarray_add( &all_libs, "-lntdll" ); strarray_addall( &all_libs, get_expanded_make_var_array( make, "EXTRALIBS" )); - strarray_addall( &all_libs, libs ); for (i = 0; i < all_libs.count; i++) { @@ -2025,21 +2024,12 @@ static struct strarray add_unix_libraries( const struct makefile *make, struct s if (!strncmp( all_libs.str[i], "-l", 2 )) { - const char *name = all_libs.str[i] + 2; - for (j = 0; j < subdirs.count; j++) { if (make == submakes[j]) continue; - if ((lib = get_static_lib( submakes[j], name ))) break; + if ((lib = get_native_unix_lib( submakes[j], all_libs.str[i] + 2 ))) break; } - if (!lib && make->native_unix_lib) - for (j = 0; j < subdirs.count; j++) - { - if (make == submakes[j]) continue; - if ((lib = get_native_unix_lib( submakes[j], name ))) break; - } } - if (lib) { strarray_add( deps, lib ); @@ -2047,6 +2037,8 @@ static struct strarray add_unix_libraries( const struct makefile *make, struct s } else strarray_add( &ret, all_libs.str[i] ); } + + strarray_addall( &ret, libs ); return ret; } @@ -3145,6 +3137,12 @@ static void output_module( struct makefile *make ) strarray_addall( &all_libs, add_import_libs( make, &dep_libs, make->delayimports, 1, make->is_cross )); strarray_addall( &all_libs, add_import_libs( make, &dep_libs, imports, 0, make->is_cross )); + if (!make->use_msvcrt) + { + strarray_addall( &all_libs, get_expanded_make_var_array( make, "EXTRALIBS" )); + strarray_addall( &all_libs, libs ); + } + if (make->is_cross) { if (delay_load_flag) @@ -3161,7 +3159,6 @@ static void output_module( struct makefile *make ) } else if (*dll_ext) { - if (!make->use_msvcrt) strarray_addall( &all_libs, add_unix_libraries( make, &dep_libs )); for (i = 0; i < make->delayimports.count; i++) strarray_add( &all_libs, strmake( "-Wl,-delayload,%s%s", make->delayimports.str[i], strchr( make->delayimports.str[i], '.' ) ? "" : ".dll" )); @@ -3172,7 +3169,6 @@ static void output_module( struct makefile *make ) } else { - strarray_addall( &all_libs, add_unix_libraries( make, &dep_libs )); strarray_add( &make->all_targets, make->module ); add_install_rule( make, make->module, make->module, strmake( "p$(%s)/%s", spec_file ? "dlldir" : "bindir", make->module )); @@ -3316,9 +3312,10 @@ static void output_unix_lib( struct makefile *make ) if (spec_file) strarray_add( &unix_deps, spec_file ); strarray_addall( &unix_libs, add_import_libs( make, &unix_deps, unix_imports, 0, 0 )); + strarray_addall( &unix_libs, get_expanded_make_var_array( make, "EXTRALIBS" )); + strarray_addall( &unix_libs, libs ); } - - strarray_addall( &unix_libs, add_unix_libraries( make, &unix_deps )); + else unix_libs = add_unix_libraries( make, &unix_deps ); strarray_add( &make->all_targets, make->unixlib ); add_install_rule( make, make->module, make->unixlib, strmake( "p%s/%s", so_dir, make->unixlib ));

1 0

Alexandre Julliard : makedep: Unify the various code paths for module generation.
by Alexandre Julliard 23 Nov '21

23 Nov '21

Module: wine Branch: master Commit: f153ca0d14bbd611e5a2eaf78451735ab25768b9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f153ca0d14bbd611e5a2eaf7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 23 15:05:48 2021 +0100 makedep: Unify the various code paths for module generation. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 45 ++++++++++++++++----------------------------- 1 file changed, 16 insertions(+), 29 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index a5ce73ae482..ac3e6d969e2 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -3125,8 +3125,9 @@ static void output_module( struct makefile *make ) struct strarray all_libs = empty_strarray; struct strarray dep_libs = empty_strarray; struct strarray imports = make->imports; - char *module_path = obj_dir_path( make, make->module ); - const char *debug_file = NULL; + char *module_name = strmake( "%s%s", make->module, make->is_cross ? "" : dll_ext ); + const char *debug_file; + const char *delay_load = delay_load_flag; char *spec_file = NULL; unsigned int i; @@ -3143,39 +3144,24 @@ static void output_module( struct makefile *make ) strarray_addall( &all_libs, libs ); } - if (make->is_cross) - { - if (delay_load_flag) - { - for (i = 0; i < make->delayimports.count; i++) - strarray_add( &all_libs, strmake( "%s%s%s", delay_load_flag, make->delayimports.str[i], - strchr( make->delayimports.str[i], '.' ) ? "" : ".dll" )); - } - strarray_add( &make->all_targets, strmake( "%s", make->module )); - add_install_rule( make, make->module, strmake( "%s", make->module ), - strmake( "c%s/%s", pe_dir, make->module )); - debug_file = get_debug_file( make, make->module ); - output( "%s:", module_path ); - } - else if (*dll_ext) + if (!make->is_cross && *dll_ext) delay_load = "-Wl,-delayload,"; + if (delay_load) { for (i = 0; i < make->delayimports.count; i++) - strarray_add( &all_libs, strmake( "-Wl,-delayload,%s%s", make->delayimports.str[i], + strarray_add( &all_libs, strmake( "%s%s%s", delay_load, make->delayimports.str[i], strchr( make->delayimports.str[i], '.' ) ? "" : ".dll" )); - strarray_add( &make->all_targets, strmake( "%s%s", make->module, dll_ext )); - add_install_rule( make, make->module, strmake( "%s%s", make->module, dll_ext ), - strmake( "p%s/%s%s", so_dir, make->module, dll_ext )); - output( "%s%s:", module_path, dll_ext ); } + strarray_add( &make->all_targets, module_name ); + + if (make->is_cross) + add_install_rule( make, make->module, module_name, strmake( "c%s/%s", pe_dir, module_name )); + else if (*dll_ext) + add_install_rule( make, make->module, module_name, strmake( "p%s/%s", so_dir, module_name )); else - { - strarray_add( &make->all_targets, make->module ); - add_install_rule( make, make->module, make->module, - strmake( "p$(%s)/%s", spec_file ? "dlldir" : "bindir", make->module )); - debug_file = get_debug_file( make, make->module ); - output( "%s:", module_path ); - } + add_install_rule( make, make->module, module_name, + strmake( "p$(%s)/%s", spec_file ? "dlldir" : "bindir", module_name )); + output( "%s:", obj_dir_path( make, module_name )); if (spec_file) output_filename( spec_file ); output_filenames_obj_dir( make, make->is_cross ? make->crossobj_files : make->object_files ); output_filenames_obj_dir( make, make->res_files ); @@ -3193,6 +3179,7 @@ static void output_module( struct makefile *make ) output_filenames( make->extradllflags ); output_filenames_obj_dir( make, make->is_cross ? make->crossobj_files : make->object_files ); output_filenames_obj_dir( make, make->res_files ); + debug_file = get_debug_file( make, make->module ); if (debug_file) output_filename( strmake( "-Wl,--debug-file,%s", obj_dir_path( make, debug_file ))); output_filenames( all_libs ); output_filename( make->is_cross ? "$(CROSSLDFLAGS)" : "$(LDFLAGS)" );

1 0

Alexandre Julliard : opencl: Don't call callback functions from the Unix side.
by Alexandre Julliard 23 Nov '21

23 Nov '21

Module: wine Branch: master Commit: f91c009786fa09723976dce0233592f69df5cead URL: https://source.winehq.org/git/wine.git/?a=commit;h=f91c009786fa09723976dce0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 23 15:10:53 2021 +0100 opencl: Don't call callback functions from the Unix side. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opencl/unix_wrappers.c | 82 ++------------------------------------------- 1 file changed, 3 insertions(+), 79 deletions(-) diff --git a/dlls/opencl/unix_wrappers.c b/dlls/opencl/unix_wrappers.c index 9c83250b4e1..df8d7278ca2 100644 --- a/dlls/opencl/unix_wrappers.c +++ b/dlls/opencl/unix_wrappers.c @@ -26,80 +26,21 @@ WINE_DEFAULT_DEBUG_CHANNEL(opencl); -struct program_callback -{ - void (WINAPI *pfn_notify)(cl_program program, void *user_data); - void *user_data; -}; - -static void CL_CALLBACK program_callback_wrapper(cl_program program, void *user_data) -{ - struct program_callback *callback = user_data; - TRACE("(%p, %p)\n", program, user_data); - callback->pfn_notify(program, callback->user_data); - free(callback); -} - cl_int WINAPI wrap_clBuildProgram( cl_program program, cl_uint num_devices, const cl_device_id *device_list, const char *options, void (WINAPI *pfn_notify)(cl_program program, void *user_data), void *user_data ) { - if (pfn_notify) - { - struct program_callback *callback; - cl_int ret; - - if (!(callback = malloc(sizeof(*callback)))) - return CL_OUT_OF_HOST_MEMORY; - callback->pfn_notify = pfn_notify; - callback->user_data = user_data; - if ((ret = clBuildProgram( program, num_devices, device_list, options, - program_callback_wrapper, callback )) != CL_SUCCESS) - free( callback ); - return ret; - } - + if (pfn_notify) FIXME( "notify callback not supported\n" ); return clBuildProgram( program, num_devices, device_list, options, NULL, NULL ); } -struct context_callback -{ - void (WINAPI *pfn_notify)(const char *errinfo, const void *private_info, size_t cb, void *user_data); - void *user_data; -}; - -static void CL_CALLBACK context_callback_wrapper(const char *errinfo, - const void *private_info, size_t cb, void *user_data) -{ - struct context_callback *callback = user_data; - TRACE("(%s, %p, %zu, %p)\n", debugstr_a(errinfo), private_info, cb, user_data); - callback->pfn_notify(errinfo, private_info, cb, callback->user_data); -} - cl_context WINAPI wrap_clCreateContext( const cl_context_properties *properties, cl_uint num_devices, const cl_device_id *devices, void (WINAPI *pfn_notify)(const char *errinfo, const void *private_info, size_t cb, void *user_data), void *user_data, cl_int *errcode_ret ) { - if (pfn_notify) - { - struct context_callback *callback; - cl_context ret; - - /* FIXME: the callback structure is currently leaked */ - if (!(callback = malloc(sizeof(*callback)))) - { - *errcode_ret = CL_OUT_OF_HOST_MEMORY; - return NULL; - } - callback->pfn_notify = pfn_notify; - callback->user_data = user_data; - if (!(ret = clCreateContext( properties, num_devices, devices, context_callback_wrapper, callback, errcode_ret ))) - free( callback ); - return ret; - } - + if (pfn_notify) FIXME( "notify callback not supported\n" ); return clCreateContext( properties, num_devices, devices, NULL, NULL, errcode_ret ); } @@ -107,24 +48,7 @@ cl_context WINAPI wrap_clCreateContextFromType( const cl_context_properties *pro void (WINAPI *pfn_notify)(const char *errinfo, const void *private_info, size_t cb, void *user_data), void *user_data, cl_int *errcode_ret ) { - if (pfn_notify) - { - struct context_callback *callback; - cl_context ret; - - /* FIXME: the callback structure is currently leaked */ - if (!(callback = malloc(sizeof(*callback)))) - { - *errcode_ret = CL_OUT_OF_HOST_MEMORY; - return NULL; - } - callback->pfn_notify = pfn_notify; - callback->user_data = user_data; - if (!(ret = clCreateContextFromType( properties, device_type, context_callback_wrapper, callback, errcode_ret ))) - free( callback ); - return ret; - } - + if (pfn_notify) FIXME( "notify callback not supported\n" ); return clCreateContextFromType( properties, device_type, NULL, NULL, errcode_ret ); }

1 0

Huw Davies : winecoreaudio: Move get_mix_format to the unixlib.
by Alexandre Julliard 22 Nov '21

22 Nov '21

Module: wine Branch: master Commit: bdbb8591c63f445f35031ce90af45c79027190cc URL: https://source.winehq.org/git/wine.git/?a=commit;h=bdbb8591c63f445f35031ce9… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Nov 18 07:52:38 2021 +0000 winecoreaudio: Move get_mix_format to the unixlib. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winecoreaudio.drv/coreaudio.c | 246 +++++++++++++++++++++++++++++++++++ dlls/winecoreaudio.drv/mmdevdrv.c | 256 ++----------------------------------- dlls/winecoreaudio.drv/unixlib.h | 9 ++ 3 files changed, 267 insertions(+), 244 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=bdbb8591c63f445f3503…

1 0

Andrey Gusev : winecoreaudio.drv: Place output message before return statement.
by Alexandre Julliard 22 Nov '21

22 Nov '21

Module: wine Branch: master Commit: b5b77ed6acad6a20bd4c5bfc98cfce178eef1d0c URL: https://source.winehq.org/git/wine.git/?a=commit;h=b5b77ed6acad6a20bd4c5bfc… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Mon Nov 22 15:12:56 2021 +0200 winecoreaudio.drv: Place output message before return statement. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winecoreaudio.drv/mmdevdrv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index 7ec282c514d..2ad2938a5d8 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -1625,8 +1625,8 @@ static HRESULT WINAPI AudioClient_GetService(IAudioClient3 *iface, REFIID riid, if(*ppv) hr = S_OK; else{ - return E_NOINTERFACE; FIXME("stub %s\n", debugstr_guid(riid)); + return E_NOINTERFACE; } end:

1 0

Huw Davies : winecoreaudio: Pass the stream separately to ca_setvol().
by Alexandre Julliard 22 Nov '21

22 Nov '21

Module: wine Branch: master Commit: 3599e011404824f0a8f863e6401aa193e5f25ca3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3599e011404824f0a8f863e6… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Nov 18 07:52:35 2021 +0000 winecoreaudio: Pass the stream separately to ca_setvol(). This is a temporary measure that will enable the client volumes to be initialized without having the stream set. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winecoreaudio.drv/mmdevdrv.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index abe77d11ee9..1e678b08c5b 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -178,7 +178,7 @@ static CRITICAL_SECTION g_sessions_lock = { &g_sessions_lock_debug, -1, 0, 0, 0, static struct list g_sessions = LIST_INIT(g_sessions); static AudioSessionWrapper *AudioSessionWrapper_Create(ACImpl *client); -static HRESULT ca_setvol(ACImpl *This, UINT32 index); +static HRESULT ca_setvol(ACImpl *This, struct coreaudio_stream *stream, UINT32 index); static inline ACImpl *impl_from_IAudioClient3(IAudioClient3 *iface) { @@ -1382,7 +1382,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, list_add_tail(&This->session->clients, &This->entry); - ca_setvol(This, -1); + ca_setvol(This, This->stream, -1); This->initted = TRUE; @@ -2978,7 +2978,7 @@ static const IAudioSessionControl2Vtbl AudioSessionControl2_Vtbl = }; /* index == -1 means set all channels, otherwise sets only the given channel */ -static HRESULT ca_setvol(ACImpl *This, UINT32 index) +static HRESULT ca_setvol(ACImpl *This, struct coreaudio_stream *stream, UINT32 index) { Float32 level; OSStatus sc; @@ -2989,7 +2989,7 @@ static HRESULT ca_setvol(ACImpl *This, UINT32 index) if(index == (UINT32)-1){ UINT32 i; level = 1.; - for(i = 0; i < This->stream->fmt->nChannels; ++i){ + for(i = 0; i < stream->fmt->nChannels; ++i){ Float32 tmp; tmp = This->session->master_vol * This->session->channel_vols[i] * This->vols[i]; @@ -3000,7 +3000,7 @@ static HRESULT ca_setvol(ACImpl *This, UINT32 index) This->session->channel_vols[index] * This->vols[index]; } - sc = AudioUnitSetParameter(This->stream->unit, kHALOutputParam_Volume, + sc = AudioUnitSetParameter(stream->unit, kHALOutputParam_Volume, kAudioUnitScope_Global, 0, level, 0); if(sc != noErr) WARN("Couldn't set volume: %x\n", (int)sc); @@ -3015,7 +3015,7 @@ static HRESULT ca_session_setvol(AudioSession *session, UINT32 index) LIST_FOR_EACH_ENTRY(client, &session->clients, ACImpl, entry){ HRESULT hr; - hr = ca_setvol(client, index); + hr = ca_setvol(client, client->stream, index); if(FAILED(hr)) ret = hr; } @@ -3214,7 +3214,7 @@ static HRESULT WINAPI AudioStreamVolume_SetChannelVolume( This->vols[index] = level; WARN("CoreAudio doesn't support per-channel volume control\n"); - ret = ca_setvol(This, index); + ret = ca_setvol(This, This->stream, index); LeaveCriticalSection(&g_sessions_lock); @@ -3259,7 +3259,7 @@ static HRESULT WINAPI AudioStreamVolume_SetAllVolumes( for(i = 0; i < count; ++i) This->vols[i] = levels[i]; - ret = ca_setvol(This, -1); + ret = ca_setvol(This, This->stream, -1); LeaveCriticalSection(&g_sessions_lock);

1 0

Huw Davies : winecoreaudio: Use the presence of stream to indicate the init state.
by Alexandre Julliard 22 Nov '21

22 Nov '21

Module: wine Branch: master Commit: d5361a8b470d37a8ffc05cd0b3984eefa938c301 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d5361a8b470d37a8ffc05cd0… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Nov 18 07:52:36 2021 +0000 winecoreaudio: Use the presence of stream to indicate the init state. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winecoreaudio.drv/mmdevdrv.c | 211 +++++++++++++++++--------------------- 1 file changed, 93 insertions(+), 118 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d5361a8b470d37a8ffc0…

1 0

Eric Pouech : dbghelp: Fix allocation error in image_load_debugaltlink.
by Alexandre Julliard 22 Nov '21

22 Nov '21

Module: wine Branch: master Commit: 789512beee9e8e88b2e185ca5ff89fe49ba8703a URL: https://source.winehq.org/git/wine.git/?a=commit;h=789512beee9e8e88b2e185ca… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Nov 22 15:20:54 2021 +0100 dbghelp: Fix allocation error in image_load_debugaltlink. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/module.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index 363f6314b22..73243d80da5 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -671,9 +671,9 @@ struct image_file_map* image_load_debugaltlink(struct image_file_map* fmap, stru */ sect_len = image_get_map_size(&debugaltlink_sect); id = memchr(data, '\0', sect_len); - if (id) + if (id++) { - id++; + unsigned idlen = (const BYTE*)data + sect_len - id; fmap_link = HeapAlloc(GetProcessHeap(), 0, sizeof(*fmap_link)); if (fmap_link) { @@ -691,7 +691,8 @@ struct image_file_map* image_load_debugaltlink(struct image_file_map* fmap, stru { static const WCHAR globalDebugDirW[] = {'/','u','s','r','/','l','i','b','/','d','e','b','u','g','/','.','b','u','i','l','d','-','i','d','/'}; - dst = HeapAlloc(GetProcessHeap(), 0, sizeof(globalDebugDirW) + (3 + filename_len) * sizeof(WCHAR)); + dst = HeapAlloc(GetProcessHeap(), 0, + sizeof(globalDebugDirW) + (3 + filename_len + idlen * 2) * sizeof(WCHAR)); if (dst) { WCHAR* p;

1 0

Eric Pouech : dbghelp: Simplify code for searching alternate debug info files.
by Alexandre Julliard 22 Nov '21

22 Nov '21

Module: wine Branch: master Commit: 9f1766193e87a7039072fe95b5c1bfa40974f63e URL: https://source.winehq.org/git/wine.git/?a=commit;h=9f1766193e87a7039072fe95… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Nov 22 15:21:07 2021 +0100 dbghelp: Simplify code for searching alternate debug info files. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/module.c | 73 ++++++++++++++++++++++----------------------------- 1 file changed, 32 insertions(+), 41 deletions(-) diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index 73243d80da5..5614c575cd0 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -634,6 +634,17 @@ found: return TRUE; } +static WCHAR* append_hex(WCHAR* dst, const BYTE* id, const BYTE* end) +{ + while (id < end) + { + *dst++ = "0123456789abcdef"[*id >> 4 ]; + *dst++ = "0123456789abcdef"[*id & 0x0F]; + id++; + } + return dst; +} + /****************************************************************** * image_load_debugaltlink * @@ -683,16 +694,14 @@ struct image_file_map* image_load_debugaltlink(struct image_file_map* fmap, stru if (dst) { MultiByteToWideChar(CP_UNIXCP, 0, data, -1, dst, filename_len); - ret = image_check_debug_link_gnu_id(dst, fmap_link, id, data + sect_len - (const char*)id); + ret = image_check_debug_link_gnu_id(dst, fmap_link, id, idlen); HeapFree(GetProcessHeap(), 0, dst); } /* Trying relative path to build-id directory */ if (!ret) { - static const WCHAR globalDebugDirW[] = - {'/','u','s','r','/','l','i','b','/','d','e','b','u','g','/','.','b','u','i','l','d','-','i','d','/'}; dst = HeapAlloc(GetProcessHeap(), 0, - sizeof(globalDebugDirW) + (3 + filename_len + idlen * 2) * sizeof(WCHAR)); + sizeof(L"/usr/lib/debug/.build-id/") + (3 + filename_len + idlen * 2) * sizeof(WCHAR)); if (dst) { WCHAR* p; @@ -702,21 +711,16 @@ struct image_file_map* image_load_debugaltlink(struct image_file_map* fmap, stru * where the alternate file is... * so try both */ - p = memcpy(dst, globalDebugDirW, sizeof(globalDebugDirW)); - p += ARRAY_SIZE(globalDebugDirW); + p = memcpy(dst, L"/usr/lib/debug/.build-id/", sizeof(L"/usr/lib/debug/.build-id/")); + p += wcslen(dst); MultiByteToWideChar(CP_UNIXCP, 0, data, -1, p, filename_len); - ret = image_check_debug_link_gnu_id(dst, fmap_link, id, data + sect_len - (const char*)id); + ret = image_check_debug_link_gnu_id(dst, fmap_link, id, idlen); if (!ret) { - p = dst + ARRAY_SIZE(globalDebugDirW); - if ((const char*)id < data + sect_len) - { - *p++ = "0123456789abcdef"[*id >> 4 ]; - *p++ = "0123456789abcdef"[*id & 0x0F]; - } + p = append_hex(p, id, id + idlen); *p++ = '/'; MultiByteToWideChar(CP_UNIXCP, 0, data, -1, p, filename_len); - ret = image_check_debug_link_gnu_id(dst, fmap_link, id, data + sect_len - (const char*)id); + ret = image_check_debug_link_gnu_id(dst, fmap_link, id, idlen); } HeapFree(GetProcessHeap(), 0, dst); } @@ -742,51 +746,38 @@ struct image_file_map* image_load_debugaltlink(struct image_file_map* fmap, stru */ static BOOL image_locate_build_id_target(struct image_file_map* fmap, const BYTE* id, unsigned idlen) { - static const WCHAR globalDebugDirW[] = {'/','u','s','r','/','l','i','b','/','d','e','b','u','g','/'}; - static const WCHAR buildidW[] = {'.','b','u','i','l','d','-','i','d','/'}; struct image_file_map* fmap_link = NULL; WCHAR* p; WCHAR* z; - const BYTE* idend = id + idlen; fmap_link = HeapAlloc(GetProcessHeap(), 0, sizeof(*fmap_link)); if (!fmap_link) return FALSE; - p = HeapAlloc(GetProcessHeap(), 0, - sizeof(globalDebugDirW) + sizeof(buildidW) + - (idlen * 2 + 1) * sizeof(WCHAR) + sizeof(L".debug")); - z = p; - memcpy(z, globalDebugDirW, sizeof(globalDebugDirW)); - z += ARRAY_SIZE(globalDebugDirW); - memcpy(z, buildidW, sizeof(buildidW)); - z += ARRAY_SIZE(buildidW); - - if (id < idend) + p = malloc(sizeof(L"/usr/lib/debug/.build-id/") + + (idlen * 2 + 1) * sizeof(WCHAR) + sizeof(L".debug")); + wcscpy(p, L"/usr/lib/debug/.build-id/"); + z = p + wcslen(p); + if (idlen) { - *z++ = "0123456789abcdef"[*id >> 4 ]; - *z++ = "0123456789abcdef"[*id & 0x0F]; - id++; - } - if (id < idend) - *z++ = '/'; - while (id < idend) - { - *z++ = "0123456789abcdef"[*id >> 4 ]; - *z++ = "0123456789abcdef"[*id & 0x0F]; - id++; + z = append_hex(z, id, id + 1); + if (idlen > 1) + { + *z++ = L'/'; + z = append_hex(z, id + 1, id + idlen); + } } memcpy(z, L".debug", sizeof(L".debug")); TRACE("checking %s\n", wine_dbgstr_w(p)); - if (image_check_debug_link_gnu_id(p, fmap_link, idend - idlen, idlen)) + if (image_check_debug_link_gnu_id(p, fmap_link, id, idlen)) { - HeapFree(GetProcessHeap(), 0, p); + free(p); fmap->alternate = fmap_link; return TRUE; } TRACE("not found\n"); - HeapFree(GetProcessHeap(), 0, p); + free(p); HeapFree(GetProcessHeap(), 0, fmap_link); return FALSE; }

1 0