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

Davide Beatrici : winecoreaudio: Remove GetEndpointIDs.
by Alexandre Julliard Aug. 23, 2023

Aug. 23, 2023

Module: wine Branch: master Commit: 9b681e03f6611b17d972ab527ae8ac390ac3d51b URL: https://gitlab.winehq.org/wine/wine/-/commit/9b681e03f6611b17d972ab527ae8ac… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Sun Aug 13 03:47:46 2023 +0200 winecoreaudio: Remove GetEndpointIDs. --- dlls/winecoreaudio.drv/mmdevdrv.c | 60 --------------------------- dlls/winecoreaudio.drv/winecoreaudio.drv.spec | 1 - 2 files changed, 61 deletions(-) diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index 8e8fc57f47d..b8992618a5a 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -151,66 +151,6 @@ void WINAPI get_device_guid(EDataFlow flow, const char *dev, GUID *guid) RegCloseKey(key); } -HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids_out, - GUID **guids_out, UINT *num, UINT *def_index) -{ - struct get_endpoint_ids_params params; - unsigned int i; - GUID *guids = NULL; - WCHAR **ids = NULL; - - TRACE("%d %p %p %p\n", flow, ids_out, num, def_index); - - params.flow = flow; - params.size = 1000; - params.endpoints = NULL; - do{ - heap_free(params.endpoints); - params.endpoints = heap_alloc(params.size); - UNIX_CALL(get_endpoint_ids, &params); - }while(params.result == HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER)); - - if(FAILED(params.result)) goto end; - - ids = heap_alloc_zero(params.num * sizeof(*ids)); - guids = heap_alloc(params.num * sizeof(*guids)); - if(!ids || !guids){ - params.result = E_OUTOFMEMORY; - goto end; - } - - for(i = 0; i < params.num; i++){ - const WCHAR *name = (WCHAR *)((char *)params.endpoints + params.endpoints[i].name); - const char *device = (char *)params.endpoints + params.endpoints[i].device; - const unsigned int size = (wcslen(name) + 1) * sizeof(WCHAR); - - ids[i] = heap_alloc(size); - if(!ids[i]){ - params.result = E_OUTOFMEMORY; - goto end; - } - memcpy(ids[i], name, size); - get_device_guid(flow, device, guids + i); - } - *def_index = params.default_idx; - -end: - heap_free(params.endpoints); - if(FAILED(params.result)){ - heap_free(guids); - if(ids){ - for(i = 0; i < params.num; i++) heap_free(ids[i]); - heap_free(ids); - } - }else{ - *ids_out = ids; - *guids_out = guids; - *num = params.num; - } - - return params.result; -} - BOOL WINAPI get_device_name_from_guid(const GUID *guid, char **name, EDataFlow *flow) { HKEY devices_key; diff --git a/dlls/winecoreaudio.drv/winecoreaudio.drv.spec b/dlls/winecoreaudio.drv/winecoreaudio.drv.spec index 5dbdf80bd23..0537f2d2d8b 100644 --- a/dlls/winecoreaudio.drv/winecoreaudio.drv.spec +++ b/dlls/winecoreaudio.drv/winecoreaudio.drv.spec @@ -6,4 +6,3 @@ # MMDevAPI driver functions @ stdcall -private get_device_guid(long ptr ptr) get_device_guid @ stdcall -private get_device_name_from_guid(ptr ptr ptr) get_device_name_from_guid -@ stdcall -private GetEndpointIDs(long ptr ptr ptr ptr) AUDDRV_GetEndpointIDs

1 0

Davide Beatrici : winealsa: Remove GetEndpointIDs.
by Alexandre Julliard Aug. 23, 2023

Aug. 23, 2023

Module: wine Branch: master Commit: d800159d0c679f99ab4731687309463769002247 URL: https://gitlab.winehq.org/wine/wine/-/commit/d800159d0c679f99ab473168730946… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Sun Aug 13 03:47:28 2023 +0200 winealsa: Remove GetEndpointIDs. --- dlls/winealsa.drv/mmdevdrv.c | 61 ------------------------------------- dlls/winealsa.drv/winealsa.drv.spec | 1 - 2 files changed, 62 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index eaf4679ce9b..ee80aa7c09d 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -154,67 +154,6 @@ void WINAPI get_device_guid(EDataFlow flow, const char *device, GUID *guid) RegCloseKey(key); } -HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids_out, GUID **guids_out, - UINT *num, UINT *def_index) -{ - struct get_endpoint_ids_params params; - unsigned int i; - GUID *guids = NULL; - WCHAR **ids = NULL; - - TRACE("%d %p %p %p %p\n", flow, ids, guids, num, def_index); - - params.flow = flow; - params.size = 1000; - params.endpoints = NULL; - do{ - HeapFree(GetProcessHeap(), 0, params.endpoints); - params.endpoints = HeapAlloc(GetProcessHeap(), 0, params.size); - ALSA_CALL(get_endpoint_ids, &params); - }while(params.result == HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER)); - - if(FAILED(params.result)) goto end; - - ids = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, params.num * sizeof(*ids)); - guids = HeapAlloc(GetProcessHeap(), 0, params.num * sizeof(*guids)); - if(!ids || !guids){ - params.result = E_OUTOFMEMORY; - goto end; - } - - for(i = 0; i < params.num; i++){ - WCHAR *name = (WCHAR *)((char *)params.endpoints + params.endpoints[i].name); - char *device = (char *)params.endpoints + params.endpoints[i].device; - unsigned int size = (wcslen(name) + 1) * sizeof(WCHAR); - - ids[i] = HeapAlloc(GetProcessHeap(), 0, size); - if(!ids[i]){ - params.result = E_OUTOFMEMORY; - goto end; - } - memcpy(ids[i], name, size); - get_device_guid(flow, device, guids + i); - } - *def_index = params.default_idx; - -end: - HeapFree(GetProcessHeap(), 0, params.endpoints); - if(FAILED(params.result)){ - HeapFree(GetProcessHeap(), 0, guids); - if(ids){ - for(i = 0; i < params.num; i++) - HeapFree(GetProcessHeap(), 0, ids[i]); - HeapFree(GetProcessHeap(), 0, ids); - } - }else{ - *ids_out = ids; - *guids_out = guids; - *num = params.num; - } - - return params.result; -} - BOOL WINAPI get_device_name_from_guid(GUID *guid, char **name, EDataFlow *flow) { HKEY devices_key; diff --git a/dlls/winealsa.drv/winealsa.drv.spec b/dlls/winealsa.drv/winealsa.drv.spec index 47db9f1a179..8c73d066a39 100644 --- a/dlls/winealsa.drv/winealsa.drv.spec +++ b/dlls/winealsa.drv/winealsa.drv.spec @@ -6,4 +6,3 @@ # MMDevAPI driver functions @ stdcall -private get_device_guid(long ptr ptr) get_device_guid @ stdcall -private get_device_name_from_guid(ptr ptr ptr) get_device_name_from_guid -@ stdcall -private GetEndpointIDs(long ptr ptr ptr ptr) AUDDRV_GetEndpointIDs

1 0

Davide Beatrici : wineoss: Remove GetEndpointIDs.
by Alexandre Julliard Aug. 23, 2023

Aug. 23, 2023

Module: wine Branch: master Commit: 6831b71f993b8d750e263b2ee9a7523de23ad0af URL: https://gitlab.winehq.org/wine/wine/-/commit/6831b71f993b8d750e263b2ee9a752… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Sun Aug 13 03:58:24 2023 +0200 wineoss: Remove GetEndpointIDs. --- dlls/wineoss.drv/mmdevdrv.c | 61 --------------------------------------- dlls/wineoss.drv/wineoss.drv.spec | 1 - 2 files changed, 62 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index 65756317c96..48a46473956 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -205,64 +205,3 @@ BOOL WINAPI get_device_name_from_guid(GUID *guid, char **name, EDataFlow *flow) return FALSE; } - -HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids_out, GUID **guids_out, - UINT *num, UINT *def_index) -{ - struct get_endpoint_ids_params params; - GUID *guids = NULL; - WCHAR **ids = NULL; - unsigned int i; - - TRACE("%d %p %p %p %p\n", flow, ids, guids, num, def_index); - - params.flow = flow; - params.size = 1000; - params.endpoints = NULL; - do{ - HeapFree(GetProcessHeap(), 0, params.endpoints); - params.endpoints = HeapAlloc(GetProcessHeap(), 0, params.size); - OSS_CALL(get_endpoint_ids, &params); - }while(params.result == HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER)); - - if(FAILED(params.result)) goto end; - - ids = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, params.num * sizeof(*ids)); - guids = HeapAlloc(GetProcessHeap(), 0, params.num * sizeof(*guids)); - if(!ids || !guids){ - params.result = E_OUTOFMEMORY; - goto end; - } - - for(i = 0; i < params.num; i++){ - WCHAR *name = (WCHAR *)((char *)params.endpoints + params.endpoints[i].name); - char *device = (char *)params.endpoints + params.endpoints[i].device; - unsigned int name_size = (wcslen(name) + 1) * sizeof(WCHAR); - - ids[i] = HeapAlloc(GetProcessHeap(), 0, name_size); - if(!ids[i]){ - params.result = E_OUTOFMEMORY; - goto end; - } - memcpy(ids[i], name, name_size); - get_device_guid(flow, device, guids + i); - } - *def_index = params.default_idx; - -end: - HeapFree(GetProcessHeap(), 0, params.endpoints); - if(FAILED(params.result)){ - HeapFree(GetProcessHeap(), 0, guids); - if(ids){ - for(i = 0; i < params.num; i++) - HeapFree(GetProcessHeap(), 0, ids[i]); - HeapFree(GetProcessHeap(), 0, ids); - } - }else{ - *ids_out = ids; - *guids_out = guids; - *num = params.num; - } - - return params.result; -} diff --git a/dlls/wineoss.drv/wineoss.drv.spec b/dlls/wineoss.drv/wineoss.drv.spec index f8b1420901d..c6d68a70eee 100644 --- a/dlls/wineoss.drv/wineoss.drv.spec +++ b/dlls/wineoss.drv/wineoss.drv.spec @@ -7,4 +7,3 @@ # MMDevAPI driver functions @ stdcall -private get_device_guid(long ptr ptr) get_device_guid @ stdcall -private get_device_name_from_guid(ptr ptr ptr) get_device_name_from_guid -@ stdcall -private GetEndpointIDs(long ptr ptr ptr ptr) AUDDRV_GetEndpointIDs

1 0

Alistair Leslie-Hughes : avifil32: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard Aug. 23, 2023

Aug. 23, 2023

Module: wine Branch: master Commit: 65c3ad91d47490e6f489a2d7e9e26d6d0f035531 URL: https://gitlab.winehq.org/wine/wine/-/commit/65c3ad91d47490e6f489a2d7e9e26d… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Aug 23 20:32:06 2023 +1000 avifil32: Remove DECLSPEC_HIDDEN usage. --- dlls/avifil32/avifile_private.h | 18 +++++++++--------- dlls/avifil32/extrachunk.h | 8 ++++---- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/avifil32/avifile_private.h b/dlls/avifil32/avifile_private.h index 4bf11f42a8c..b1c0011e400 100644 --- a/dlls/avifil32/avifile_private.h +++ b/dlls/avifil32/avifile_private.h @@ -56,16 +56,16 @@ DEFINE_AVIGUID(CLSID_ICMStream, 0x00020001, 0, 0); DEFINE_AVIGUID(CLSID_WAVFile, 0x00020003, 0, 0); DEFINE_AVIGUID(CLSID_ACMStream, 0x0002000F, 0, 0); -extern HMODULE AVIFILE_hModule DECLSPEC_HIDDEN; +extern HMODULE AVIFILE_hModule; -extern HRESULT AVIFILE_CreateAVIFile(IUnknown *pUnkOuter, REFIID riid, LPVOID *ppobj) DECLSPEC_HIDDEN; -extern HRESULT AVIFILE_CreateWAVFile(IUnknown *outer_unk, REFIID riid, void **ret_iface) DECLSPEC_HIDDEN; -extern HRESULT AVIFILE_CreateACMStream(REFIID riid, LPVOID *ppobj) DECLSPEC_HIDDEN; -extern HRESULT AVIFILE_CreateICMStream(REFIID riid, LPVOID *ppobj) DECLSPEC_HIDDEN; -extern PGETFRAME AVIFILE_CreateGetFrame(PAVISTREAM pstream) DECLSPEC_HIDDEN; -extern PAVIFILE AVIFILE_CreateAVITempFile(int nStreams, const PAVISTREAM *ppStreams) DECLSPEC_HIDDEN; +extern HRESULT AVIFILE_CreateAVIFile(IUnknown *pUnkOuter, REFIID riid, LPVOID *ppobj); +extern HRESULT AVIFILE_CreateWAVFile(IUnknown *outer_unk, REFIID riid, void **ret_iface); +extern HRESULT AVIFILE_CreateACMStream(REFIID riid, LPVOID *ppobj); +extern HRESULT AVIFILE_CreateICMStream(REFIID riid, LPVOID *ppobj); +extern PGETFRAME AVIFILE_CreateGetFrame(PAVISTREAM pstream); +extern PAVIFILE AVIFILE_CreateAVITempFile(int nStreams, const PAVISTREAM *ppStreams); -extern LPCWSTR AVIFILE_BasenameW(LPCWSTR szFileName) DECLSPEC_HIDDEN; -extern HRESULT WINAPI avifil32_DllGetClassObject(REFCLSID pclsid, REFIID piid, LPVOID *ppv) DECLSPEC_HIDDEN; +extern LPCWSTR AVIFILE_BasenameW(LPCWSTR szFileName); +extern HRESULT WINAPI avifil32_DllGetClassObject(REFCLSID pclsid, REFIID piid, LPVOID *ppv); #endif diff --git a/dlls/avifil32/extrachunk.h b/dlls/avifil32/extrachunk.h index 5b87d7f44de..d401a39a6a1 100644 --- a/dlls/avifil32/extrachunk.h +++ b/dlls/avifil32/extrachunk.h @@ -35,18 +35,18 @@ typedef struct _EXTRACHUNKS { } EXTRACHUNKS, *LPEXTRACHUNKS; /* reads a chunk outof the extrachunk-structure */ -HRESULT ReadExtraChunk(const EXTRACHUNKS *extra,FOURCC ckid,LPVOID lp,LPLONG size) DECLSPEC_HIDDEN; +HRESULT ReadExtraChunk(const EXTRACHUNKS *extra,FOURCC ckid,LPVOID lp,LPLONG size); /* writes a chunk into the extrachunk-structure */ -HRESULT WriteExtraChunk(LPEXTRACHUNKS extra,FOURCC ckid,LPCVOID lp,LONG size) DECLSPEC_HIDDEN; +HRESULT WriteExtraChunk(LPEXTRACHUNKS extra,FOURCC ckid,LPCVOID lp,LONG size); /* reads a chunk from the HMMIO into the extrachunk-structure */ -HRESULT ReadChunkIntoExtra(LPEXTRACHUNKS extra,HMMIO hmmio,const MMCKINFO *lpck) DECLSPEC_HIDDEN; +HRESULT ReadChunkIntoExtra(LPEXTRACHUNKS extra,HMMIO hmmio,const MMCKINFO *lpck); /* reads all non-junk chunks into the extrachunk-structure until it finds * the given chunk or the optional parent-chunk is at the end */ HRESULT FindChunkAndKeepExtras(LPEXTRACHUNKS extra,HMMIO hmmio, - MMCKINFO *lpck,MMCKINFO *lpckParent,UINT flags) DECLSPEC_HIDDEN; + MMCKINFO *lpck,MMCKINFO *lpckParent,UINT flags); #ifdef __cplusplus }

1 0

Alistair Leslie-Hughes : opcservices: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard Aug. 23, 2023

Aug. 23, 2023

Module: wine Branch: master Commit: e77638a883f942344437e628f6f08369fc2b9766 URL: https://gitlab.winehq.org/wine/wine/-/commit/e77638a883f942344437e628f6f083… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Aug 23 20:32:05 2023 +1000 opcservices: Remove DECLSPEC_HIDDEN usage. --- dlls/opcservices/opc_private.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/opcservices/opc_private.h b/dlls/opcservices/opc_private.h index b1163fe1215..cfd8ee864b2 100644 --- a/dlls/opcservices/opc_private.h +++ b/dlls/opcservices/opc_private.h @@ -55,14 +55,14 @@ struct opc_uri struct opc_uri *source_uri; }; -extern HRESULT opc_package_create(IOpcFactory *factory, IOpcPackage **package) DECLSPEC_HIDDEN; -extern HRESULT opc_part_uri_create(IUri *uri, struct opc_uri *source_uri, IOpcPartUri **part_uri) DECLSPEC_HIDDEN; -extern HRESULT opc_root_uri_create(IOpcUri **opc_uri) DECLSPEC_HIDDEN; +extern HRESULT opc_package_create(IOpcFactory *factory, IOpcPackage **package); +extern HRESULT opc_part_uri_create(IUri *uri, struct opc_uri *source_uri, IOpcPartUri **part_uri); +extern HRESULT opc_root_uri_create(IOpcUri **opc_uri); -extern HRESULT opc_package_write(IOpcPackage *package, OPC_WRITE_FLAGS flags, IStream *stream) DECLSPEC_HIDDEN; +extern HRESULT opc_package_write(IOpcPackage *package, OPC_WRITE_FLAGS flags, IStream *stream); struct zip_archive; -extern HRESULT compress_create_archive(IStream *output, struct zip_archive **archive) DECLSPEC_HIDDEN; +extern HRESULT compress_create_archive(IStream *output, struct zip_archive **archive); extern HRESULT compress_add_file(struct zip_archive *archive, const WCHAR *path, IStream *content, - OPC_COMPRESSION_OPTIONS options) DECLSPEC_HIDDEN; -extern void compress_finalize_archive(struct zip_archive *archive) DECLSPEC_HIDDEN; + OPC_COMPRESSION_OPTIONS options); +extern void compress_finalize_archive(struct zip_archive *archive);

1 0

Davide Beatrici : mmdevapi: Import get_device_guid() from driver.
by Alexandre Julliard Aug. 23, 2023

Aug. 23, 2023

Module: wine Branch: master Commit: a8963c006705eb0e44dc20e600d50cd650ed8eac URL: https://gitlab.winehq.org/wine/wine/-/commit/a8963c006705eb0e44dc20e600d50c… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Sun Aug 13 03:02:23 2023 +0200 mmdevapi: Import get_device_guid() from driver. --- dlls/mmdevapi/main.c | 1 + dlls/mmdevapi/mmdevapi_private.h | 1 + 2 files changed, 2 insertions(+) diff --git a/dlls/mmdevapi/main.c b/dlls/mmdevapi/main.c index 43b5921dcc5..d5ed3a653d4 100644 --- a/dlls/mmdevapi/main.c +++ b/dlls/mmdevapi/main.c @@ -98,6 +98,7 @@ static BOOL load_driver(const WCHAR *name, DriverFuncs *driver) #define LDFC(n) do { driver->p##n = (void*)GetProcAddress(driver->module, #n);\ if(!driver->p##n) { goto fail; } } while(0) + LDFC(get_device_guid); LDFC(get_device_name_from_guid); LDFC(GetEndpointIDs); #undef LDFC diff --git a/dlls/mmdevapi/mmdevapi_private.h b/dlls/mmdevapi/mmdevapi_private.h index f8bf7d3a440..c703ef2517b 100644 --- a/dlls/mmdevapi/mmdevapi_private.h +++ b/dlls/mmdevapi/mmdevapi_private.h @@ -42,6 +42,7 @@ typedef struct _DriverFuncs { * valid. See enum _DriverPriority. */ int priority; + void (WINAPI *pget_device_guid)(EDataFlow flow, const char *name, GUID *guid); BOOL (WINAPI *pget_device_name_from_guid)(GUID *guid, char **name, EDataFlow *flow); /* ids gets an array of human-friendly endpoint names * keys gets an array of driver-specific stuff that is used

1 0

Davide Beatrici : winepulse: Export get_device_guid().
by Alexandre Julliard Aug. 23, 2023

Aug. 23, 2023

Module: wine Branch: master Commit: 11a676dab57dc0b951b87fc5640dd4b7b3608f71 URL: https://gitlab.winehq.org/wine/wine/-/commit/11a676dab57dc0b951b87fc5640dd4… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Sun Aug 13 02:59:05 2023 +0200 winepulse: Export get_device_guid(). --- dlls/winepulse.drv/mmdevdrv.c | 2 +- dlls/winepulse.drv/winepulse.drv.spec | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index 3eb95fa1f18..11cbc15448c 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -103,7 +103,7 @@ static void pulse_call(enum unix_funcs code, void *params) assert(!status); } -static void get_device_guid(EDataFlow flow, const char *pulse_name, GUID *guid) +void WINAPI get_device_guid(EDataFlow flow, const char *pulse_name, GUID *guid) { WCHAR key_name[MAX_PULSE_NAME_LEN + 2]; DWORD type, size = sizeof(*guid); diff --git a/dlls/winepulse.drv/winepulse.drv.spec b/dlls/winepulse.drv/winepulse.drv.spec index 5bb84b1764d..5aea12a6a86 100644 --- a/dlls/winepulse.drv/winepulse.drv.spec +++ b/dlls/winepulse.drv/winepulse.drv.spec @@ -1,4 +1,5 @@ # MMDevAPI driver functions +@ stdcall -private get_device_guid(long ptr ptr) get_device_guid @ stdcall -private get_device_name_from_guid(ptr ptr ptr) get_device_name_from_guid @ stdcall -private GetEndpointIDs(long ptr ptr ptr ptr) AUDDRV_GetEndpointIDs

1 0

Davide Beatrici : wineoss: Export get_device_guid().
by Alexandre Julliard Aug. 23, 2023

Aug. 23, 2023

Module: wine Branch: master Commit: c2ac63f73f1d0da8e05d923f1bbdaa502f9e337f URL: https://gitlab.winehq.org/wine/wine/-/commit/c2ac63f73f1d0da8e05d923f1bbdaa… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Sun Aug 13 02:15:32 2023 +0200 wineoss: Export get_device_guid(). --- dlls/wineoss.drv/mmdevdrv.c | 2 +- dlls/wineoss.drv/wineoss.drv.spec | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index 343581ee9e1..65756317c96 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -142,7 +142,7 @@ exit: RegCloseKey(drv_key); } -static void get_device_guid(EDataFlow flow, const char *device, GUID *guid) +void WINAPI get_device_guid(EDataFlow flow, const char *device, GUID *guid) { HKEY key = NULL, dev_key; DWORD type, size = sizeof(*guid); diff --git a/dlls/wineoss.drv/wineoss.drv.spec b/dlls/wineoss.drv/wineoss.drv.spec index e12fb20fd17..f8b1420901d 100644 --- a/dlls/wineoss.drv/wineoss.drv.spec +++ b/dlls/wineoss.drv/wineoss.drv.spec @@ -5,5 +5,6 @@ @ stdcall -private modMessage(long long long long long) OSS_modMessage # MMDevAPI driver functions +@ stdcall -private get_device_guid(long ptr ptr) get_device_guid @ stdcall -private get_device_name_from_guid(ptr ptr ptr) get_device_name_from_guid @ stdcall -private GetEndpointIDs(long ptr ptr ptr ptr) AUDDRV_GetEndpointIDs

1 0

Davide Beatrici : winepulse: Open/create driver registry key in get_device_guid().
by Alexandre Julliard Aug. 23, 2023

Aug. 23, 2023

Module: wine Branch: master Commit: 557a6a1ba69a500f2909abeea8fea5d4fbeec3ea URL: https://gitlab.winehq.org/wine/wine/-/commit/557a6a1ba69a500f2909abeea8fea5… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Sun Aug 13 16:35:24 2023 +0200 winepulse: Open/create driver registry key in get_device_guid(). --- dlls/winepulse.drv/mmdevdrv.c | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index f7de3296567..3eb95fa1f18 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -103,19 +103,22 @@ static void pulse_call(enum unix_funcs code, void *params) assert(!status); } -static void get_device_guid(HKEY drv_key, EDataFlow flow, const char *pulse_name, GUID *guid) +static void get_device_guid(EDataFlow flow, const char *pulse_name, GUID *guid) { WCHAR key_name[MAX_PULSE_NAME_LEN + 2]; DWORD type, size = sizeof(*guid); LSTATUS status; - HKEY dev_key; + HKEY drv_key, dev_key; if (!pulse_name[0]) { *guid = (flow == eRender) ? pulse_render_guid : pulse_capture_guid; return; } - if (!drv_key) { + status = RegCreateKeyExW(HKEY_CURRENT_USER, drv_key_devicesW, 0, NULL, 0, + KEY_WRITE | KEY_WOW64_64KEY, NULL, &drv_key, NULL); + if (status != ERROR_SUCCESS) { + ERR("Failed to open devices registry key: %lu\n", status); CoCreateGuid(guid); return; } @@ -128,6 +131,7 @@ static void get_device_guid(HKEY drv_key, EDataFlow flow, const char *pulse_name NULL, &dev_key, NULL); if (status != ERROR_SUCCESS) { ERR("Failed to open registry key for device %s: %lu\n", pulse_name, status); + RegCloseKey(drv_key); CoCreateGuid(guid); return; } @@ -140,6 +144,7 @@ static void get_device_guid(HKEY drv_key, EDataFlow flow, const char *pulse_name ERR("Failed to store device GUID for %s to registry: %lu\n", pulse_name, status); } RegCloseKey(dev_key); + RegCloseKey(drv_key); } HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids_out, GUID **keys, @@ -149,8 +154,6 @@ HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids_out, GUID **ke GUID *guids = NULL; WCHAR **ids = NULL; unsigned int i = 0; - LSTATUS status; - HKEY drv_key; TRACE("%d %p %p %p\n", flow, ids_out, num, def_index); @@ -173,13 +176,6 @@ HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids_out, GUID **ke goto end; } - status = RegCreateKeyExW(HKEY_CURRENT_USER, drv_key_devicesW, 0, NULL, 0, - KEY_WRITE | KEY_WOW64_64KEY, NULL, &drv_key, NULL); - if (status != ERROR_SUCCESS) { - ERR("Failed to open devices registry key: %lu\n", status); - drv_key = NULL; - } - for (i = 0; i < params.num; i++) { WCHAR *name = (WCHAR *)((char *)params.endpoints + params.endpoints[i].name); char *pulse_name = (char *)params.endpoints + params.endpoints[i].device; @@ -190,10 +186,8 @@ HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids_out, GUID **ke break; } memcpy(ids[i], name, size); - get_device_guid(drv_key, flow, pulse_name, &guids[i]); + get_device_guid(flow, pulse_name, &guids[i]); } - if (drv_key) - RegCloseKey(drv_key); end: HeapFree(GetProcessHeap(), 0, params.endpoints);

1 0

Davide Beatrici : winecoreaudio: Export get_device_guid().
by Alexandre Julliard Aug. 23, 2023

Aug. 23, 2023

Module: wine Branch: master Commit: b8952d8f6dcf068045ed20e00ee460caf3f47409 URL: https://gitlab.winehq.org/wine/wine/-/commit/b8952d8f6dcf068045ed20e00ee460… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Sun Aug 13 02:15:15 2023 +0200 winecoreaudio: Export get_device_guid(). --- dlls/winecoreaudio.drv/mmdevdrv.c | 2 +- dlls/winecoreaudio.drv/winecoreaudio.drv.spec | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index 09668ee9699..8e8fc57f47d 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -113,7 +113,7 @@ exit: RegCloseKey(drv_key); } -static void get_device_guid(EDataFlow flow, const char *dev, GUID *guid) +void WINAPI get_device_guid(EDataFlow flow, const char *dev, GUID *guid) { HKEY key = NULL, dev_key; DWORD type, size = sizeof(*guid); diff --git a/dlls/winecoreaudio.drv/winecoreaudio.drv.spec b/dlls/winecoreaudio.drv/winecoreaudio.drv.spec index 16cd7f08b2b..5dbdf80bd23 100644 --- a/dlls/winecoreaudio.drv/winecoreaudio.drv.spec +++ b/dlls/winecoreaudio.drv/winecoreaudio.drv.spec @@ -4,5 +4,6 @@ @ stdcall -private modMessage(long long long long long) CoreAudio_modMessage # MMDevAPI driver functions +@ stdcall -private get_device_guid(long ptr ptr) get_device_guid @ stdcall -private get_device_name_from_guid(ptr ptr ptr) get_device_name_from_guid @ stdcall -private GetEndpointIDs(long ptr ptr ptr ptr) AUDDRV_GetEndpointIDs

1 0