- Wine-Commits - list.winehq.org

Alex Henrie : wusa: Zero out identity on error path in read_identity.
by Alexandre Julliard June 16, 2023

June 16, 2023

Module: wine Branch: master Commit: 3caa27eafbecfa610e07844d2ed1e09a30960f34 URL: https://gitlab.winehq.org/wine/wine/-/commit/3caa27eafbecfa610e07844d2ed1e0… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sat Jun 10 13:06:58 2023 -0600 wusa: Zero out identity on error path in read_identity. Fixes double frees in read_components and read_dependency. The double frees could also be fixed by using free instead of free_dependency in those functions, but zeroing out the pointers is easier to understand because it ensures that alloc_dependency can always be paired with free_dependency. --- programs/wusa/manifest.c | 1 + 1 file changed, 1 insertion(+) diff --git a/programs/wusa/manifest.c b/programs/wusa/manifest.c index 83d4125133f..986bda27cd8 100644 --- a/programs/wusa/manifest.c +++ b/programs/wusa/manifest.c @@ -275,6 +275,7 @@ static BOOL read_identity(IXMLDOMElement *root, struct assembly_identity *identi error: clear_identity(identity); + memset(identity, 0, sizeof(*identity)); return FALSE; }

1 0

Alex Henrie : winhttp: Fix memory leak on error path in request_get_codepage (scan-build).
by Alexandre Julliard June 16, 2023

June 16, 2023

Module: wine Branch: master Commit: 1f7c84a33aeb376d15f6b54f9b387fc1625f4062 URL: https://gitlab.winehq.org/wine/wine/-/commit/1f7c84a33aeb376d15f6b54f9b387f… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Jun 11 23:10:08 2023 -0600 winhttp: Fix memory leak on error path in request_get_codepage (scan-build). --- dlls/winhttp/request.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index cf091244002..6ea71734cff 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -5493,6 +5493,7 @@ static DWORD request_get_codepage( struct winhttp_request *request, UINT *codepa if (!(buffer = malloc( size ))) return ERROR_OUTOFMEMORY; if (!WinHttpQueryHeaders( request->hrequest, WINHTTP_QUERY_CONTENT_TYPE, NULL, buffer, &size, NULL )) { + free( buffer ); return GetLastError(); } if ((p = wcsstr( buffer, L"charset" )))

1 0

Alex Henrie : msi: Fix memory leak on error path in MSI_OpenPackageW (scan-build).
by Alexandre Julliard June 16, 2023

June 16, 2023

Module: wine Branch: master Commit: 4db2ffa60e16e06b4f6ef89fcc4c73229f4446b1 URL: https://gitlab.winehq.org/wine/wine/-/commit/4db2ffa60e16e06b4f6ef89fcc4c73… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Jun 11 21:17:09 2023 -0600 msi: Fix memory leak on error path in MSI_OpenPackageW (scan-build). --- dlls/msi/package.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 90293a10881..081ab2caa3b 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -1411,7 +1411,10 @@ UINT MSI_OpenPackageW(LPCWSTR szPackage, DWORD dwOptions, MSIPACKAGE **pPackage) TRACE("opening package %s\n", debugstr_w( localfile )); r = MSI_OpenDatabaseW( localfile, MSIDBOPEN_TRANSACT, &db ); if (r != ERROR_SUCCESS) + { + free( product_version ); return r; + } if (product_version) {

1 0

Alex Henrie : msi: Fix double free on error paths in TransformView_Create (scan-build).
by Alexandre Julliard June 16, 2023

June 16, 2023

Module: wine Branch: master Commit: 0653409e0631582d89edaab0ac516994710dae1a URL: https://gitlab.winehq.org/wine/wine/-/commit/0653409e0631582d89edaab0ac5169… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Jun 11 21:59:26 2023 -0600 msi: Fix double free on error paths in TransformView_Create (scan-build). If TransformView_Create returns an error, it should not return a pointer that table_load_transform will try to free. --- dlls/msi/table.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/msi/table.c b/dlls/msi/table.c index 77fa20502c5..ea4ef3b0d0e 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -2779,7 +2779,7 @@ static UINT TransformView_Create( MSIDATABASE *db, string_table *st, LPCWSTR nam name_len = wcslen( name ); - r = TABLE_CreateView( db, name, view ); + r = TABLE_CreateView( db, name, (MSIVIEW **)&tv ); if (r == ERROR_INVALID_PARAMETER) { /* table does not exist */ @@ -2790,16 +2790,11 @@ static UINT TransformView_Create( MSIDATABASE *db, string_table *st, LPCWSTR nam tv->db = db; memcpy( tv->name, name, name_len * sizeof(WCHAR) ); - *view = (MSIVIEW*)tv; } else if (r != ERROR_SUCCESS) { return r; } - else - { - tv = (struct table_view *)*view; - } tv->view.ops = &transform_view_ops; @@ -2847,6 +2842,7 @@ static UINT TransformView_Create( MSIDATABASE *db, string_table *st, LPCWSTR nam { MSI_ViewClose( q ); msiobj_release( &q->hdr ); + *view = (MSIVIEW *)tv; return ERROR_SUCCESS; } @@ -2883,6 +2879,7 @@ static UINT TransformView_Create( MSIDATABASE *db, string_table *st, LPCWSTR nam memcpy( colinfo, tv->columns, tv->num_cols * sizeof(*colinfo) ); tv->columns = colinfo; tv->num_cols += add_col; + *view = (MSIVIEW *)tv; return ERROR_SUCCESS; }

1 0

Davide Beatrici : winecoreaudio: Call mmdevapi's get_application_name.
by Alexandre Julliard June 16, 2023

June 16, 2023

Module: wine Branch: master Commit: bb2e093ad336ab9dc4a241e0becc3d70a17dc9ec URL: https://gitlab.winehq.org/wine/wine/-/commit/bb2e093ad336ab9dc4a241e0becc3d… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Thu Jun 15 17:50:51 2023 +0200 winecoreaudio: Call mmdevapi's get_application_name. --- dlls/winecoreaudio.drv/mmdevdrv.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index 300d2a8223a..93a9b4422f2 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -75,6 +75,8 @@ extern HRESULT main_loop_start(void) DECLSPEC_HIDDEN; extern struct audio_session_wrapper *session_wrapper_create( struct audio_client *client) DECLSPEC_HIDDEN; +extern WCHAR *get_application_name(void); + void DECLSPEC_HIDDEN sessions_lock(void) { EnterCriticalSection(&g_sessions_lock); @@ -556,6 +558,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, struct create_stream_params params; stream_handle stream; UINT32 i; + WCHAR *name; TRACE("(%p)->(%x, %lx, %s, %s, %p, %s)\n", This, mode, flags, wine_dbgstr_longlong(duration), wine_dbgstr_longlong(period), fmt, debugstr_guid(sessionguid)); @@ -594,7 +597,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, return params.result; } - params.name = NULL; + params.name = name = get_application_name(); params.device = This->device_name; params.flow = This->dataflow; params.share = mode; @@ -606,6 +609,9 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, params.stream = &stream; UNIX_CALL(create_stream, &params); + + free(name); + if(FAILED(params.result)){ sessions_unlock(); return params.result;

1 0

Davide Beatrici : wineoss: Call mmdevapi's get_application_name.
by Alexandre Julliard June 16, 2023

June 16, 2023

Module: wine Branch: master Commit: 617117ceae128d48f9070436f2dc98156068dd06 URL: https://gitlab.winehq.org/wine/wine/-/commit/617117ceae128d48f9070436f2dc98… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Thu Jun 15 17:51:05 2023 +0200 wineoss: Call mmdevapi's get_application_name. --- dlls/wineoss.drv/mmdevdrv.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index 038dcecd07f..c1d9cc6d1a9 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -87,6 +87,8 @@ extern HRESULT main_loop_start(void) DECLSPEC_HIDDEN; extern struct audio_session_wrapper *session_wrapper_create( struct audio_client *client) DECLSPEC_HIDDEN; +extern WCHAR *get_application_name(void); + void DECLSPEC_HIDDEN sessions_lock(void) { EnterCriticalSection(&g_sessions_lock); @@ -544,6 +546,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, struct create_stream_params params; stream_handle stream; unsigned int i; + WCHAR *name; TRACE("(%p)->(%x, %lx, %s, %s, %p, %s)\n", This, mode, flags, wine_dbgstr_longlong(duration), wine_dbgstr_longlong(period), fmt, debugstr_guid(sessionguid)); @@ -582,7 +585,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, return params.result; } - params.name = NULL; + params.name = name = get_application_name(); params.device = This->device_name; params.flow = This->dataflow; params.share = mode; @@ -594,6 +597,9 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, params.stream = &stream; OSS_CALL(create_stream, &params); + + free(name); + if(FAILED(params.result)){ sessions_unlock(); return params.result;

1 0

Davide Beatrici : winepulse: Move get_application_name into mmdevapi.
by Alexandre Julliard June 16, 2023

June 16, 2023

Module: wine Branch: master Commit: bfb3bbba540159d7daaf8aafe19841ecaa98f47a URL: https://gitlab.winehq.org/wine/wine/-/commit/bfb3bbba540159d7daaf8aafe19841… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Fri Jun 16 08:32:20 2023 +0200 winepulse: Move get_application_name into mmdevapi. --- dlls/mmdevapi/Makefile.in | 2 +- dlls/mmdevapi/client.c | 107 +++++++++++++++++++++++++++++++++++ dlls/winealsa.drv/Makefile.in | 2 +- dlls/winecoreaudio.drv/Makefile.in | 2 +- dlls/wineoss.drv/Makefile.in | 2 +- dlls/winepulse.drv/mmdevdrv.c | 113 +------------------------------------ 6 files changed, 114 insertions(+), 114 deletions(-) diff --git a/dlls/mmdevapi/Makefile.in b/dlls/mmdevapi/Makefile.in index ee2848ff2de..027854ea97b 100644 --- a/dlls/mmdevapi/Makefile.in +++ b/dlls/mmdevapi/Makefile.in @@ -1,5 +1,5 @@ MODULE = mmdevapi.dll -IMPORTS = uuid ole32 oleaut32 user32 advapi32 +IMPORTS = uuid ole32 oleaut32 user32 advapi32 version C_SRCS = \ audiosessionmanager.c \ diff --git a/dlls/mmdevapi/client.c b/dlls/mmdevapi/client.c index 8eb6d6867dc..a0a2b225c0b 100644 --- a/dlls/mmdevapi/client.c +++ b/dlls/mmdevapi/client.c @@ -21,6 +21,8 @@ #define COBJMACROS +#include <wchar.h> + #include <audiopolicy.h> #include <mmdeviceapi.h> #include <winternl.h> @@ -33,6 +35,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(mmdevapi); +typedef struct tagLANGANDCODEPAGE +{ + WORD wLanguage; + WORD wCodePage; +} LANGANDCODEPAGE; + extern void sessions_lock(void) DECLSPEC_HIDDEN; extern void sessions_unlock(void) DECLSPEC_HIDDEN; @@ -169,6 +177,105 @@ static DWORD CALLBACK timer_loop_func(void *user) return 0; } +static BOOL query_productname(void *data, LANGANDCODEPAGE *lang, LPVOID *buffer, UINT *len) +{ + WCHAR pn[37]; + swprintf(pn, ARRAY_SIZE(pn), L"\\StringFileInfo\\%04x%04x\\ProductName", lang->wLanguage, lang->wCodePage); + return VerQueryValueW(data, pn, buffer, len) && *len; +} + +WCHAR *get_application_name(void) +{ + WCHAR path[MAX_PATH], *name; + UINT translate_size, productname_size; + LANGANDCODEPAGE *translate; + LPVOID productname; + BOOL found = FALSE; + void *data = NULL; + unsigned int i; + LCID locale; + DWORD size; + + GetModuleFileNameW(NULL, path, ARRAY_SIZE(path)); + + size = GetFileVersionInfoSizeW(path, NULL); + if (!size) + goto skip; + + data = malloc(size); + if (!data) + goto skip; + + if (!GetFileVersionInfoW(path, 0, size, data)) + goto skip; + + if (!VerQueryValueW(data, L"\\VarFileInfo\\Translation", (LPVOID *)&translate, &translate_size)) + goto skip; + + /* No translations found. */ + if (translate_size < sizeof(LANGANDCODEPAGE)) + goto skip; + + /* The following code will try to find the best translation. We first search for an + * exact match of the language, then a match of the language PRIMARYLANGID, then we + * search for a LANG_NEUTRAL match, and if that still doesn't work we pick the + * first entry which contains a proper productname. */ + locale = GetThreadLocale(); + + for (i = 0; i < translate_size / sizeof(LANGANDCODEPAGE); i++) { + if (translate[i].wLanguage == locale && + query_productname(data, &translate[i], &productname, &productname_size)) { + found = TRUE; + break; + } + } + + if (!found) { + for (i = 0; i < translate_size / sizeof(LANGANDCODEPAGE); i++) { + if (PRIMARYLANGID(translate[i].wLanguage) == PRIMARYLANGID(locale) && + query_productname(data, &translate[i], &productname, &productname_size)) { + found = TRUE; + break; + } + } + } + + if (!found) { + for (i = 0; i < translate_size / sizeof(LANGANDCODEPAGE); i++) { + if (PRIMARYLANGID(translate[i].wLanguage) == LANG_NEUTRAL && + query_productname(data, &translate[i], &productname, &productname_size)) { + found = TRUE; + break; + } + } + } + + if (!found) { + for (i = 0; i < translate_size / sizeof(LANGANDCODEPAGE); i++) { + if (query_productname(data, &translate[i], &productname, &productname_size)) { + found = TRUE; + break; + } + } + } +skip: + if (found) { + name = wcsdup(productname); + free(data); + return name; + } + + free(data); + + name = wcsrchr(path, '\\'); + if (!name) + name = path; + else + name++; + + return wcsdup(name); +} + static HRESULT WINAPI capture_QueryInterface(IAudioCaptureClient *iface, REFIID riid, void **ppv) { struct audio_client *This = impl_from_IAudioCaptureClient(iface); diff --git a/dlls/winealsa.drv/Makefile.in b/dlls/winealsa.drv/Makefile.in index 9494858c4dd..d1387520742 100644 --- a/dlls/winealsa.drv/Makefile.in +++ b/dlls/winealsa.drv/Makefile.in @@ -1,6 +1,6 @@ MODULE = winealsa.drv UNIXLIB = winealsa.so -IMPORTS = uuid ole32 advapi32 +IMPORTS = uuid ole32 advapi32 version PARENTSRC = ../mmdevapi DELAYIMPORTS = winmm UNIX_LIBS = $(ALSA_LIBS) $(PTHREAD_LIBS) diff --git a/dlls/winecoreaudio.drv/Makefile.in b/dlls/winecoreaudio.drv/Makefile.in index 01c5a3d0073..ecf85cffda4 100644 --- a/dlls/winecoreaudio.drv/Makefile.in +++ b/dlls/winecoreaudio.drv/Makefile.in @@ -1,6 +1,6 @@ MODULE = winecoreaudio.drv UNIXLIB = winecoreaudio.so -IMPORTS = uuid ole32 user32 advapi32 +IMPORTS = uuid ole32 user32 advapi32 version PARENTSRC = ../mmdevapi DELAYIMPORTS = winmm UNIX_LIBS = $(COREAUDIO_LIBS) diff --git a/dlls/wineoss.drv/Makefile.in b/dlls/wineoss.drv/Makefile.in index 121595a7c6c..f571397257b 100644 --- a/dlls/wineoss.drv/Makefile.in +++ b/dlls/wineoss.drv/Makefile.in @@ -1,6 +1,6 @@ MODULE = wineoss.drv UNIXLIB = wineoss.so -IMPORTS = uuid ole32 user32 advapi32 +IMPORTS = uuid ole32 user32 advapi32 version PARENTSRC = ../mmdevapi DELAYIMPORTS = winmm UNIX_LIBS = $(OSS4_LIBS) $(PTHREAD_LIBS) diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index 5a276c40f4c..6221856481d 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -133,6 +133,8 @@ extern HRESULT main_loop_start(void) DECLSPEC_HIDDEN; extern struct audio_session_wrapper *session_wrapper_create( struct audio_client *client) DECLSPEC_HIDDEN; +extern WCHAR *get_application_name(void); + static inline ACImpl *impl_from_IAudioClient3(IAudioClient3 *iface) { return CONTAINING_RECORD(iface, ACImpl, IAudioClient3_iface); @@ -153,115 +155,6 @@ static void pulse_release_stream(stream_handle stream, HANDLE timer) pulse_call(release_stream, &params); } -typedef struct tagLANGANDCODEPAGE -{ - WORD wLanguage; - WORD wCodePage; -} LANGANDCODEPAGE; - -static BOOL query_productname(void *data, LANGANDCODEPAGE *lang, LPVOID *buffer, UINT *len) -{ - WCHAR pn[37]; - swprintf(pn, ARRAY_SIZE(pn), L"\\StringFileInfo\\%04x%04x\\ProductName", lang->wLanguage, lang->wCodePage); - return VerQueryValueW(data, pn, buffer, len) && *len; -} - -static WCHAR *get_application_name(BOOL query_app_name) -{ - WCHAR path[MAX_PATH], *name; - - GetModuleFileNameW(NULL, path, ARRAY_SIZE(path)); - - if (query_app_name) - { - UINT translate_size, productname_size; - LANGANDCODEPAGE *translate; - LPVOID productname; - BOOL found = FALSE; - void *data = NULL; - unsigned int i; - LCID locale; - DWORD size; - - size = GetFileVersionInfoSizeW(path, NULL); - if (!size) - goto skip; - - data = malloc(size); - if (!data) - goto skip; - - if (!GetFileVersionInfoW(path, 0, size, data)) - goto skip; - - if (!VerQueryValueW(data, L"\\VarFileInfo\\Translation", (LPVOID *)&translate, &translate_size)) - goto skip; - - /* no translations found */ - if (translate_size < sizeof(LANGANDCODEPAGE)) - goto skip; - - /* The following code will try to find the best translation. We first search for an - * exact match of the language, then a match of the language PRIMARYLANGID, then we - * search for a LANG_NEUTRAL match, and if that still doesn't work we pick the - * first entry which contains a proper productname. */ - locale = GetThreadLocale(); - - for (i = 0; i < translate_size / sizeof(LANGANDCODEPAGE); i++) { - if (translate[i].wLanguage == locale && - query_productname(data, &translate[i], &productname, &productname_size)) { - found = TRUE; - break; - } - } - - if (!found) { - for (i = 0; i < translate_size / sizeof(LANGANDCODEPAGE); i++) { - if (PRIMARYLANGID(translate[i].wLanguage) == PRIMARYLANGID(locale) && - query_productname(data, &translate[i], &productname, &productname_size)) { - found = TRUE; - break; - } - } - } - - if (!found) { - for (i = 0; i < translate_size / sizeof(LANGANDCODEPAGE); i++) { - if (PRIMARYLANGID(translate[i].wLanguage) == LANG_NEUTRAL && - query_productname(data, &translate[i], &productname, &productname_size)) { - found = TRUE; - break; - } - } - } - - if (!found) { - for (i = 0; i < translate_size / sizeof(LANGANDCODEPAGE); i++) { - if (query_productname(data, &translate[i], &productname, &productname_size)) { - found = TRUE; - break; - } - } - } - - skip: - if (found) - { - name = wcsdup(productname); - free(data); - return name; - } - free(data); - } - - name = wcsrchr(path, '\\'); - if (!name) - name = path; - else - name++; - return wcsdup(name); -} - static void set_stream_volumes(ACImpl *This) { struct set_volumes_params params; @@ -726,7 +619,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, return hr; } - params.name = name = get_application_name(TRUE); + params.name = name = get_application_name(); params.device = This->device_name; params.flow = This->dataflow; params.share = mode;

1 0

Davide Beatrici : winealsa: Call mmdevapi's get_application_name.
by Alexandre Julliard June 16, 2023

June 16, 2023

Module: wine Branch: master Commit: b549546ee2a35e926bdefc8972542e635ac5da85 URL: https://gitlab.winehq.org/wine/wine/-/commit/b549546ee2a35e926bdefc8972542e… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Thu Jun 15 17:50:20 2023 +0200 winealsa: Call mmdevapi's get_application_name. --- dlls/winealsa.drv/mmdevdrv.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index d2681fc8e9c..916e04ff047 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -81,6 +81,8 @@ extern HRESULT main_loop_start(void) DECLSPEC_HIDDEN; extern struct audio_session_wrapper *session_wrapper_create( struct audio_client *client) DECLSPEC_HIDDEN; +extern WCHAR *get_application_name(void); + void DECLSPEC_HIDDEN sessions_lock(void) { EnterCriticalSection(&g_sessions_lock); @@ -569,6 +571,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, struct create_stream_params params; stream_handle stream; unsigned int i; + WCHAR *name; TRACE("(%p)->(%x, %lx, %s, %s, %p, %s)\n", This, mode, flags, wine_dbgstr_longlong(duration), wine_dbgstr_longlong(period), fmt, debugstr_guid(sessionguid)); @@ -607,7 +610,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, dump_fmt(fmt); - params.name = NULL; + params.name = name = get_application_name(); params.device = This->device_name; params.flow = This->dataflow; params.share = mode; @@ -619,6 +622,9 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, params.stream = &stream; ALSA_CALL(create_stream, &params); + + free(name); + if(FAILED(params.result)){ sessions_unlock(); return params.result;

1 0

Davide Beatrici : winepulse: Move AudioClient's Initialize's exclusive mode check into unixlib.
by Alexandre Julliard June 16, 2023

June 16, 2023

Module: wine Branch: master Commit: 62cd90e8acf1e26e8c813ca37bc0ded4d52134a0 URL: https://gitlab.winehq.org/wine/wine/-/commit/62cd90e8acf1e26e8c813ca37bc0de… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Wed Jun 14 00:52:19 2023 +0200 winepulse: Move AudioClient's Initialize's exclusive mode check into unixlib. --- dlls/winepulse.drv/mmdevdrv.c | 2 -- dlls/winepulse.drv/pulse.c | 9 +++++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index f15fa88c15e..5a276c40f4c 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -698,8 +698,6 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, if (mode != AUDCLNT_SHAREMODE_SHARED && mode != AUDCLNT_SHAREMODE_EXCLUSIVE) return E_INVALIDARG; - if (mode == AUDCLNT_SHAREMODE_EXCLUSIVE) - return AUDCLNT_E_EXCLUSIVE_MODE_NOT_ALLOWED; if (flags & ~(AUDCLNT_STREAMFLAGS_CROSSPROCESS | AUDCLNT_STREAMFLAGS_LOOPBACK | diff --git a/dlls/winepulse.drv/pulse.c b/dlls/winepulse.drv/pulse.c index be540a4da2c..ab49a4cc320 100644 --- a/dlls/winepulse.drv/pulse.c +++ b/dlls/winepulse.drv/pulse.c @@ -1116,12 +1116,17 @@ static NTSTATUS pulse_create_stream(void *args) struct pulse_stream *stream; unsigned int i, bufsize_bytes; HRESULT hr; - char *name = wstr_to_str(params->name); + char *name; + + if (params->share == AUDCLNT_SHAREMODE_EXCLUSIVE) { + params->result = AUDCLNT_E_EXCLUSIVE_MODE_NOT_ALLOWED; + return STATUS_SUCCESS; + } pulse_lock(); + name = wstr_to_str(params->name); params->result = pulse_connect(name); - free(name); if (FAILED(params->result))

1 0

Alex Henrie : wldap32: Clean up LDAP_OPT_API_INFO.
by Alexandre Julliard June 16, 2023

June 16, 2023

Module: wine Branch: master Commit: e24bcef1578fdaff3f14068e02181663bd453584 URL: https://gitlab.winehq.org/wine/wine/-/commit/e24bcef1578fdaff3f14068e021816… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sat Jun 10 12:26:51 2023 -0600 wldap32: Clean up LDAP_OPT_API_INFO. Fix memory leaks on error paths, don't call memset unnecessarily, and ensure that all output fields are initialized. --- dlls/wldap32/option.c | 77 +++++++++++++++++++++++++++++---------------------- 1 file changed, 44 insertions(+), 33 deletions(-) diff --git a/dlls/wldap32/option.c b/dlls/wldap32/option.c index 3d63b116e10..c3e17f81b47 100644 --- a/dlls/wldap32/option.c +++ b/dlls/wldap32/option.c @@ -63,28 +63,33 @@ ULONG CDECL ldap_get_optionA( LDAP *ld, int option, void *value ) LDAPAPIInfoW infoW; LDAPAPIInfoA *infoA = value; - memset( &infoW, 0, sizeof(infoW) ); infoW.ldapai_info_version = infoA->ldapai_info_version; ret = ldap_get_optionW( ld, option, &infoW ); - if (ret == WLDAP32_LDAP_SUCCESS) - { - infoA->ldapai_api_version = infoW.ldapai_api_version; - infoA->ldapai_protocol_version = infoW.ldapai_protocol_version; + if (ret != WLDAP32_LDAP_SUCCESS) return ret; - if (infoW.ldapai_extensions && !(infoA->ldapai_extensions = strarrayWtoA( infoW.ldapai_extensions ))) - return WLDAP32_LDAP_NO_MEMORY; - if (infoW.ldapai_vendor_name && !(infoA->ldapai_vendor_name = strWtoA( infoW.ldapai_vendor_name ))) - { - ldap_value_freeW( infoW.ldapai_extensions ); - return WLDAP32_LDAP_NO_MEMORY; - } - infoA->ldapai_vendor_version = infoW.ldapai_vendor_version; + infoA->ldapai_extensions = strarrayWtoA( infoW.ldapai_extensions ); + if (infoW.ldapai_extensions && !infoA->ldapai_extensions) + { + strarrayfreeW( infoW.ldapai_extensions ); + free( infoW.ldapai_vendor_name ); + return WLDAP32_LDAP_NO_MEMORY; + } - ldap_value_freeW( infoW.ldapai_extensions ); - ldap_memfreeW( infoW.ldapai_vendor_name ); + infoA->ldapai_vendor_name = strWtoA( infoW.ldapai_vendor_name ); + if (infoW.ldapai_vendor_name && !infoA->ldapai_vendor_name) + { + strarrayfreeW( infoW.ldapai_extensions ); + free( infoW.ldapai_vendor_name ); + strarrayfreeA( infoA->ldapai_extensions ); + return WLDAP32_LDAP_NO_MEMORY; } - return ret; + + infoA->ldapai_api_version = infoW.ldapai_api_version; + infoA->ldapai_protocol_version = infoW.ldapai_protocol_version; + infoA->ldapai_vendor_version = infoW.ldapai_vendor_version; + + return WLDAP32_LDAP_SUCCESS; } case WLDAP32_LDAP_OPT_DEREF: @@ -184,28 +189,34 @@ ULONG CDECL ldap_get_optionW( LDAP *ld, int option, void *value ) LDAPAPIInfo infoU; LDAPAPIInfoW *infoW = value; - memset( &infoU, 0, sizeof(infoU) ); infoU.ldapai_info_version = infoW->ldapai_info_version; - ret = map_error( ldap_get_option( CTX(ld), option, &infoU ) ); - if (ret == WLDAP32_LDAP_SUCCESS) - { - infoW->ldapai_api_version = infoU.ldapai_api_version; - infoW->ldapai_protocol_version = infoU.ldapai_protocol_version; + ret = ldap_get_option( CTX(ld), option, &infoU ); + if (ret != LDAP_SUCCESS) return map_error( ret ); - if (infoU.ldapai_extensions && !(infoW->ldapai_extensions = strarrayUtoW( infoU.ldapai_extensions ))) - return WLDAP32_LDAP_NO_MEMORY; - if (infoU.ldapai_vendor_name && !(infoW->ldapai_vendor_name = strUtoW( infoU.ldapai_vendor_name ))) - { - ldap_memvfree( (void **)infoU.ldapai_extensions ); - return WLDAP32_LDAP_NO_MEMORY; - } - infoW->ldapai_vendor_version = infoU.ldapai_vendor_version; + infoW->ldapai_extensions = strarrayUtoW( infoU.ldapai_extensions ); + if (infoU.ldapai_extensions && !infoW->ldapai_extensions) + { + ret = WLDAP32_LDAP_NO_MEMORY; + strarrayfreeU( infoU.ldapai_extensions ); + free( infoU.ldapai_vendor_name ); + return WLDAP32_LDAP_NO_MEMORY; + } - ldap_memvfree( (void **)infoU.ldapai_extensions ); - ldap_memfree( infoU.ldapai_vendor_name ); + infoW->ldapai_vendor_name = strUtoW( infoU.ldapai_vendor_name ); + if (infoU.ldapai_vendor_name && !infoW->ldapai_vendor_name) + { + strarrayfreeU( infoU.ldapai_extensions ); + free( infoU.ldapai_vendor_name ); + strarrayfreeW( infoW->ldapai_extensions ); + return WLDAP32_LDAP_NO_MEMORY; } - return ret; + + infoW->ldapai_api_version = infoU.ldapai_api_version; + infoW->ldapai_protocol_version = infoU.ldapai_protocol_version; + infoW->ldapai_vendor_version = infoU.ldapai_vendor_version; + + return WLDAP32_LDAP_SUCCESS; } case WLDAP32_LDAP_OPT_DEREF:

1 0