- Wine-Commits - list.winehq.org

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

Aug. 23, 2023

Module: wine Branch: master Commit: 23c75adf2d36c73f1853ed2a7c4db6465711b013 URL: https://gitlab.winehq.org/wine/wine/-/commit/23c75adf2d36c73f1853ed2a7c4db6… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Aug 23 20:32:06 2023 +1000 hhctrl.ocx: Remove DECLSPEC_HIDDEN usage. --- dlls/hhctrl.ocx/hhctrl.h | 76 ++++++++++++++++++++++++------------------------ dlls/hhctrl.ocx/stream.h | 16 +++++----- 2 files changed, 46 insertions(+), 46 deletions(-) diff --git a/dlls/hhctrl.ocx/hhctrl.h b/dlls/hhctrl.ocx/hhctrl.h index 359b199e141..ebec0eebf30 100644 --- a/dlls/hhctrl.ocx/hhctrl.h +++ b/dlls/hhctrl.ocx/hhctrl.h @@ -205,42 +205,42 @@ typedef struct { DWORD current_tab; } HHInfo; -BOOL InitWebBrowser(HHInfo*,HWND) DECLSPEC_HIDDEN; -void ReleaseWebBrowser(HHInfo*) DECLSPEC_HIDDEN; -void ResizeWebBrowser(HHInfo*,DWORD,DWORD) DECLSPEC_HIDDEN; -void DoPageAction(WebBrowserContainer*,DWORD) DECLSPEC_HIDDEN; - -void InitContent(HHInfo*) DECLSPEC_HIDDEN; -void ReleaseContent(HHInfo*) DECLSPEC_HIDDEN; -void ActivateContentTopic(HWND,LPCWSTR,ContentItem *) DECLSPEC_HIDDEN; - -void InitIndex(HHInfo*) DECLSPEC_HIDDEN; -void ReleaseIndex(HHInfo*) DECLSPEC_HIDDEN; - -CHMInfo *OpenCHM(LPCWSTR szFile) DECLSPEC_HIDDEN; -BOOL LoadWinTypeFromCHM(HHInfo *info) DECLSPEC_HIDDEN; -CHMInfo *CloseCHM(CHMInfo *pCHMInfo) DECLSPEC_HIDDEN; -void SetChmPath(ChmPath*,LPCWSTR,LPCWSTR) DECLSPEC_HIDDEN; -IStream *GetChmStream(CHMInfo*,LPCWSTR,ChmPath*) DECLSPEC_HIDDEN; -LPWSTR FindContextAlias(CHMInfo*,DWORD) DECLSPEC_HIDDEN; -WCHAR *GetDocumentTitle(CHMInfo*,LPCWSTR) DECLSPEC_HIDDEN; - -extern struct list window_list DECLSPEC_HIDDEN; -HHInfo *CreateHelpViewer(HHInfo*,LPCWSTR,HWND) DECLSPEC_HIDDEN; -void ReleaseHelpViewer(HHInfo*) DECLSPEC_HIDDEN; -BOOL NavigateToUrl(HHInfo*,LPCWSTR) DECLSPEC_HIDDEN; -BOOL NavigateToChm(HHInfo*,LPCWSTR,LPCWSTR) DECLSPEC_HIDDEN; -void MergeChmProperties(HH_WINTYPEW*,HHInfo*,BOOL) DECLSPEC_HIDDEN; -void UpdateHelpWindow(HHInfo *info) DECLSPEC_HIDDEN; - -void InitSearch(HHInfo *info, const char *needle) DECLSPEC_HIDDEN; -void ReleaseSearch(HHInfo *info) DECLSPEC_HIDDEN; - -LPCWSTR skip_schema(LPCWSTR url) DECLSPEC_HIDDEN; -void wintype_stringsA_free(struct wintype_stringsA *stringsA) DECLSPEC_HIDDEN; -void wintype_stringsW_free(struct wintype_stringsW *stringsW) DECLSPEC_HIDDEN; -WCHAR *decode_html(const char *html_fragment, int html_fragment_len, UINT code_page) DECLSPEC_HIDDEN; -HHInfo *find_window(const WCHAR *window) DECLSPEC_HIDDEN; +BOOL InitWebBrowser(HHInfo*,HWND); +void ReleaseWebBrowser(HHInfo*); +void ResizeWebBrowser(HHInfo*,DWORD,DWORD); +void DoPageAction(WebBrowserContainer*,DWORD); + +void InitContent(HHInfo*); +void ReleaseContent(HHInfo*); +void ActivateContentTopic(HWND,LPCWSTR,ContentItem *); + +void InitIndex(HHInfo*); +void ReleaseIndex(HHInfo*); + +CHMInfo *OpenCHM(LPCWSTR szFile); +BOOL LoadWinTypeFromCHM(HHInfo *info); +CHMInfo *CloseCHM(CHMInfo *pCHMInfo); +void SetChmPath(ChmPath*,LPCWSTR,LPCWSTR); +IStream *GetChmStream(CHMInfo*,LPCWSTR,ChmPath*); +LPWSTR FindContextAlias(CHMInfo*,DWORD); +WCHAR *GetDocumentTitle(CHMInfo*,LPCWSTR); + +extern struct list window_list; +HHInfo *CreateHelpViewer(HHInfo*,LPCWSTR,HWND); +void ReleaseHelpViewer(HHInfo*); +BOOL NavigateToUrl(HHInfo*,LPCWSTR); +BOOL NavigateToChm(HHInfo*,LPCWSTR,LPCWSTR); +void MergeChmProperties(HH_WINTYPEW*,HHInfo*,BOOL); +void UpdateHelpWindow(HHInfo *info); + +void InitSearch(HHInfo *info, const char *needle); +void ReleaseSearch(HHInfo *info); + +LPCWSTR skip_schema(LPCWSTR url); +void wintype_stringsA_free(struct wintype_stringsA *stringsA); +void wintype_stringsW_free(struct wintype_stringsW *stringsW); +WCHAR *decode_html(const char *html_fragment, int html_fragment_len, UINT code_page); +HHInfo *find_window(const WCHAR *window); /* memory allocation functions */ @@ -287,7 +287,7 @@ static inline LPSTR strdupWtoA(LPCWSTR str) } -extern HINSTANCE hhctrl_hinstance DECLSPEC_HIDDEN; -extern BOOL hh_process DECLSPEC_HIDDEN; +extern HINSTANCE hhctrl_hinstance; +extern BOOL hh_process; #endif diff --git a/dlls/hhctrl.ocx/stream.h b/dlls/hhctrl.ocx/stream.h index 8d61ad54d51..68f105c11a3 100644 --- a/dlls/hhctrl.ocx/stream.h +++ b/dlls/hhctrl.ocx/stream.h @@ -36,13 +36,13 @@ typedef struct { ULONG p; } stream_t; -void strbuf_init(strbuf_t *buf) DECLSPEC_HIDDEN; -void strbuf_zero(strbuf_t *buf) DECLSPEC_HIDDEN; -void strbuf_free(strbuf_t *buf) DECLSPEC_HIDDEN; -void stream_init(stream_t *stream, IStream *str) DECLSPEC_HIDDEN; -void get_node_name(strbuf_t *node, strbuf_t *name) DECLSPEC_HIDDEN; -BOOL next_content(stream_t *stream, strbuf_t *buf) DECLSPEC_HIDDEN; -BOOL next_node(stream_t *stream, strbuf_t *buf) DECLSPEC_HIDDEN; -const char *get_attr(const char *node, const char *name, int *len) DECLSPEC_HIDDEN; +void strbuf_init(strbuf_t *buf); +void strbuf_zero(strbuf_t *buf); +void strbuf_free(strbuf_t *buf); +void stream_init(stream_t *stream, IStream *str); +void get_node_name(strbuf_t *node, strbuf_t *name); +BOOL next_content(stream_t *stream, strbuf_t *buf); +BOOL next_node(stream_t *stream, strbuf_t *buf); +const char *get_attr(const char *node, const char *name, int *len); #endif

1 0

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

Aug. 23, 2023

Module: wine Branch: master Commit: 59718856802d3f41f48cd1ecbe294d4134e70671 URL: https://gitlab.winehq.org/wine/wine/-/commit/59718856802d3f41f48cd1ecbe294d… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Aug 23 20:32:06 2023 +1000 evr: Remove DECLSPEC_HIDDEN usage. --- dlls/evr/evr_private.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/evr/evr_private.h b/dlls/evr/evr_private.h index 93047b50c94..225e60348b4 100644 --- a/dlls/evr/evr_private.h +++ b/dlls/evr/evr_private.h @@ -51,9 +51,9 @@ static inline const char *debugstr_normalized_rect(const MFVideoNormalizedRect * return wine_dbg_sprintf("(%.8e,%.8e)-(%.8e,%.8e)", rect->left, rect->top, rect->right, rect->bottom); } -HRESULT evr_filter_create(IUnknown *outer_unk, void **ppv) DECLSPEC_HIDDEN; -HRESULT evr_mixer_create(IUnknown *outer_unk, void **ppv) DECLSPEC_HIDDEN; -HRESULT evr_presenter_create(IUnknown *outer_unk, void **ppv) DECLSPEC_HIDDEN; +HRESULT evr_filter_create(IUnknown *outer_unk, void **ppv); +HRESULT evr_mixer_create(IUnknown *outer_unk, void **ppv); +HRESULT evr_presenter_create(IUnknown *outer_unk, void **ppv); HRESULT create_video_sample_allocator(BOOL lock_notify_release, REFIID riid, void **obj);

1 0

Davide Beatrici : winepulse: Move GetEndpointIDs into mmdevapi.
by Alexandre Julliard Aug. 23, 2023

Aug. 23, 2023

Module: wine Branch: master Commit: 09a84020de7bd206c0cf8bf680c29f17e21284ea URL: https://gitlab.winehq.org/wine/wine/-/commit/09a84020de7bd206c0cf8bf680c29f… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Sun Aug 13 16:40:53 2023 +0200 winepulse: Move GetEndpointIDs into mmdevapi. --- dlls/mmdevapi/devenum.c | 53 ++++++++++++++++++++++------- dlls/mmdevapi/main.c | 1 - dlls/mmdevapi/mmdevapi_private.h | 7 ---- dlls/winepulse.drv/mmdevdrv.c | 64 ----------------------------------- dlls/winepulse.drv/winepulse.drv.spec | 1 - 5 files changed, 41 insertions(+), 85 deletions(-) diff --git a/dlls/mmdevapi/devenum.c b/dlls/mmdevapi/devenum.c index b87b082e6ef..34fa5a66802 100644 --- a/dlls/mmdevapi/devenum.c +++ b/dlls/mmdevapi/devenum.c @@ -17,6 +17,7 @@ */ #include <stdarg.h> +#include <wchar.h> #define COBJMACROS #include "windef.h" @@ -526,29 +527,57 @@ static HRESULT set_format(MMDevice *dev) HRESULT load_driver_devices(EDataFlow flow) { - WCHAR **ids; - GUID *guids; - UINT num, def, i; - HRESULT hr; + struct get_endpoint_ids_params params; + WCHAR **ids = NULL; + GUID *guids = NULL; + UINT i; - if(!drvs.pGetEndpointIDs) - return S_OK; + params.flow = flow; + params.size = 1024; + params.endpoints = NULL; + do { + HeapFree(GetProcessHeap(), 0, params.endpoints); + params.endpoints = HeapAlloc(GetProcessHeap(), 0, params.size); + __wine_unix_call(drvs.module_unixlib, get_endpoint_ids, &params); + } while (params.result == HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER)); - hr = drvs.pGetEndpointIDs(flow, &ids, &guids, &num, &def); - if(FAILED(hr)) - return hr; + if (FAILED(params.result)) + goto end; + + ids = HeapAlloc(GetProcessHeap(), 0, 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++) { + const WCHAR *name = (WCHAR *)((char *)params.endpoints + params.endpoints[i].name); + const char *dev_name = (char *)params.endpoints + params.endpoints[i].device; + const unsigned int size = (wcslen(name) + 1) * sizeof(WCHAR); - for(i = 0; i < num; ++i){ + if (!(ids[i] = HeapAlloc(GetProcessHeap(), 0, size))) { + while (i--) HeapFree(GetProcessHeap(), 0, ids[i]); + params.result = E_OUTOFMEMORY; + goto end; + } + memcpy(ids[i], name, size); + drvs.pget_device_guid(flow, dev_name, &guids[i]); + } + + for (i = 0; i < params.num; i++) { MMDevice *dev; dev = MMDevice_Create(ids[i], &guids[i], flow, DEVICE_STATE_ACTIVE, - def == i); + params.default_idx == i); set_format(dev); } +end: + HeapFree(GetProcessHeap(), 0, params.endpoints); HeapFree(GetProcessHeap(), 0, guids); HeapFree(GetProcessHeap(), 0, ids); - return S_OK; + return params.result; } static void MMDevice_Destroy(MMDevice *This) diff --git a/dlls/mmdevapi/main.c b/dlls/mmdevapi/main.c index d5ed3a653d4..12a81ba9aa5 100644 --- a/dlls/mmdevapi/main.c +++ b/dlls/mmdevapi/main.c @@ -100,7 +100,6 @@ static BOOL load_driver(const WCHAR *name, DriverFuncs *driver) if(!driver->p##n) { goto fail; } } while(0) LDFC(get_device_guid); LDFC(get_device_name_from_guid); - LDFC(GetEndpointIDs); #undef LDFC GetModuleFileNameW(NULL, path, ARRAY_SIZE(path)); diff --git a/dlls/mmdevapi/mmdevapi_private.h b/dlls/mmdevapi/mmdevapi_private.h index c703ef2517b..0ed9140c3ed 100644 --- a/dlls/mmdevapi/mmdevapi_private.h +++ b/dlls/mmdevapi/mmdevapi_private.h @@ -44,13 +44,6 @@ typedef struct _DriverFuncs { 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 - * in GetAudioEndpoint to identify the endpoint - * it is the caller's responsibility to free both arrays, and - * all of the elements in both arrays with HeapFree() */ - HRESULT (WINAPI *pGetEndpointIDs)(EDataFlow flow, WCHAR ***ids, - GUID **guids, UINT *num, UINT *default_index); } DriverFuncs; extern DriverFuncs drvs DECLSPEC_HIDDEN; diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index 11cbc15448c..19d3d4040a3 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -96,13 +96,6 @@ BOOL WINAPI DllMain(HINSTANCE dll, DWORD reason, void *reserved) return TRUE; } -static void pulse_call(enum unix_funcs code, void *params) -{ - NTSTATUS status; - status = WINE_UNIX_CALL(code, params); - assert(!status); -} - void WINAPI get_device_guid(EDataFlow flow, const char *pulse_name, GUID *guid) { WCHAR key_name[MAX_PULSE_NAME_LEN + 2]; @@ -147,63 +140,6 @@ void WINAPI get_device_guid(EDataFlow flow, const char *pulse_name, GUID *guid) RegCloseKey(drv_key); } -HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids_out, GUID **keys, - UINT *num, UINT *def_index) -{ - struct get_endpoint_ids_params params; - GUID *guids = NULL; - WCHAR **ids = NULL; - unsigned int i = 0; - - TRACE("%d %p %p %p\n", flow, ids_out, num, def_index); - - params.flow = flow; - params.size = MAX_PULSE_NAME_LEN * 4; - params.endpoints = NULL; - do { - HeapFree(GetProcessHeap(), 0, params.endpoints); - params.endpoints = HeapAlloc(GetProcessHeap(), 0, params.size); - pulse_call(get_endpoint_ids, &params); - } while(params.result == HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER)); - - if (FAILED(params.result)) - goto end; - - ids = HeapAlloc(GetProcessHeap(), 0, 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 *pulse_name = (char *)params.endpoints + params.endpoints[i].device; - unsigned int size = (wcslen(name) + 1) * sizeof(WCHAR); - - if (!(ids[i] = HeapAlloc(GetProcessHeap(), 0, size))) { - params.result = E_OUTOFMEMORY; - break; - } - memcpy(ids[i], name, size); - get_device_guid(flow, pulse_name, &guids[i]); - } - -end: - HeapFree(GetProcessHeap(), 0, params.endpoints); - if (FAILED(params.result)) { - HeapFree(GetProcessHeap(), 0, guids); - while (i--) HeapFree(GetProcessHeap(), 0, ids[i]); - HeapFree(GetProcessHeap(), 0, ids); - } else { - *ids_out = ids; - *keys = guids; - *num = params.num; - *def_index = params.default_idx; - } - return params.result; -} - BOOL WINAPI get_device_name_from_guid(GUID *guid, char **name, EDataFlow *flow) { struct device_cache *device; diff --git a/dlls/winepulse.drv/winepulse.drv.spec b/dlls/winepulse.drv/winepulse.drv.spec index 5aea12a6a86..17a0d504c7c 100644 --- a/dlls/winepulse.drv/winepulse.drv.spec +++ b/dlls/winepulse.drv/winepulse.drv.spec @@ -1,7 +1,6 @@ # 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 # WinMM driver functions @ stdcall -private DriverProc(long long long long long) winealsa.drv.DriverProc

1 0

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