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

Rémi Bernon : mf/scheme_handler: Implement http(s):// scheme handler using urlmon.
by Alexandre Julliard 23 Aug '23

23 Aug '23

Module: wine Branch: master Commit: 8143a57500538b6af9b769f475f63a2ba1c08a15 URL: https://gitlab.winehq.org/wine/wine/-/commit/8143a57500538b6af9b769f475f63a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Aug 22 11:35:09 2023 +0200 mf/scheme_handler: Implement http(s):// scheme handler using urlmon. --- dlls/mf/Makefile.in | 2 +- dlls/mf/main.c | 2 ++ dlls/mf/mf.idl | 6 ++++ dlls/mf/mf.rgs | 8 ++++++ dlls/mf/mf_private.h | 1 + dlls/mf/scheme_handler.c | 74 +++++++++++++++++++++++++++++++++++++++++------- dlls/mf/tests/mf.c | 4 +-- 7 files changed, 83 insertions(+), 14 deletions(-) diff --git a/dlls/mf/Makefile.in b/dlls/mf/Makefile.in index f7592df1930..1deffe1cc0e 100644 --- a/dlls/mf/Makefile.in +++ b/dlls/mf/Makefile.in @@ -1,7 +1,7 @@ MODULE = mf.dll IMPORTLIB = mf IMPORTS = advapi32 mfplat ole32 uuid mfuuid strmiids -DELAYIMPORTS = evr user32 +DELAYIMPORTS = evr urlmon user32 EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/mf/main.c b/dlls/mf/main.c index b25a47d78c0..92558a86b30 100644 --- a/dlls/mf/main.c +++ b/dlls/mf/main.c @@ -549,6 +549,7 @@ static const IClassFactoryVtbl class_factory_vtbl = }; static struct class_factory file_scheme_handler_factory = { { &class_factory_vtbl }, file_scheme_handler_construct }; +static struct class_factory urlmon_scheme_handler_factory = { { &class_factory_vtbl }, urlmon_scheme_handler_construct }; static const struct class_object { @@ -558,6 +559,7 @@ static const struct class_object class_objects[] = { { &CLSID_FileSchemePlugin, &file_scheme_handler_factory.IClassFactory_iface }, + { &CLSID_UrlmonSchemePlugin, &urlmon_scheme_handler_factory.IClassFactory_iface }, }; /******************************************************************************* diff --git a/dlls/mf/mf.idl b/dlls/mf/mf.idl index 289a521b4f2..4f5ef36c965 100644 --- a/dlls/mf/mf.idl +++ b/dlls/mf/mf.idl @@ -24,3 +24,9 @@ uuid(477ec299-1421-4bdd-971f-7ccb933f21ad) ] coclass FileSchemePlugin { } + +[ + threading(both), + uuid(9ec4b4f9-3029-45ad-947b-344de2a249e2) +] +coclass UrlmonSchemePlugin {} diff --git a/dlls/mf/mf.rgs b/dlls/mf/mf.rgs index f127df76321..f06576baccb 100644 --- a/dlls/mf/mf.rgs +++ b/dlls/mf/mf.rgs @@ -12,6 +12,14 @@ HKLM { val '{477ec299-1421-4bdd-971f-7ccb933f21ad}' = s 'File Scheme Handler' } + 'http:' + { + val '{9ec4b4f9-3029-45ad-947b-344de2a249e2}' = s 'Urlmon Scheme Handler' + } + 'https:' + { + val '{9ec4b4f9-3029-45ad-947b-344de2a249e2}' = s 'Urlmon Scheme Handler' + } } } } diff --git a/dlls/mf/mf_private.h b/dlls/mf/mf_private.h index 90ad8eaf8b7..bbfadaee5d8 100644 --- a/dlls/mf/mf_private.h +++ b/dlls/mf/mf_private.h @@ -114,6 +114,7 @@ static inline const char *debugstr_propvar(const PROPVARIANT *v) } extern HRESULT file_scheme_handler_construct(REFIID riid, void **obj); +extern HRESULT urlmon_scheme_handler_construct(REFIID riid, void **obj); extern BOOL mf_is_sample_copier_transform(IMFTransform *transform); extern BOOL mf_is_sar_sink(IMFMediaSink *sink); diff --git a/dlls/mf/scheme_handler.c b/dlls/mf/scheme_handler.c index 9f23ffcc76c..7e92748aeb9 100644 --- a/dlls/mf/scheme_handler.c +++ b/dlls/mf/scheme_handler.c @@ -32,6 +32,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(mfplat); +typedef HRESULT (*create_stream_cb)(const WCHAR *url, DWORD flags, IMFByteStream **out); + struct scheme_handler_result { struct list entry; @@ -48,6 +50,7 @@ struct scheme_handler IMFSourceResolver *resolver; struct list results; CRITICAL_SECTION cs; + create_stream_cb create_stream; }; static struct scheme_handler *impl_from_IMFSchemeHandler(IMFSchemeHandler *iface) @@ -374,7 +377,6 @@ static HRESULT scheme_handler_get_resolver(struct scheme_handler *handler, IMFSo static HRESULT WINAPI scheme_handler_callback_Invoke(IMFAsyncCallback *iface, IMFAsyncResult *result) { - static const WCHAR schemeW[] = {'f','i','l','e',':','/','/'}; struct scheme_handler *handler = impl_from_IMFAsyncCallback(iface); struct scheme_handler_result *handler_result; MF_OBJECT_TYPE obj_type = MF_OBJECT_INVALID; @@ -383,7 +385,6 @@ static HRESULT WINAPI scheme_handler_callback_Invoke(IMFAsyncCallback *iface, IM IMFSourceResolver *resolver; IMFAsyncResult *caller; IMFByteStream *stream; - const WCHAR *url; HRESULT hr; caller = (IMFAsyncResult *)IMFAsyncResult_GetStateNoAddRef(result); @@ -396,14 +397,7 @@ static HRESULT WINAPI scheme_handler_callback_Invoke(IMFAsyncCallback *iface, IM context = impl_from_IUnknown(context_object); - /* Strip from scheme, MFCreateFile() won't be expecting it. */ - url = context->url; - if (!wcsnicmp(context->url, schemeW, ARRAY_SIZE(schemeW))) - url += ARRAY_SIZE(schemeW); - - hr = MFCreateFile(context->flags & MF_RESOLUTION_WRITE ? MF_ACCESSMODE_READWRITE : MF_ACCESSMODE_READ, - MF_OPENMODE_FAIL_IF_NOT_EXIST, MF_FILEFLAGS_NONE, url, &stream); - if (SUCCEEDED(hr)) + if (SUCCEEDED(hr = handler->create_stream(context->url, context->flags, &stream))) { if (context->flags & MF_RESOLUTION_MEDIASOURCE) { @@ -458,6 +452,14 @@ static const IMFAsyncCallbackVtbl scheme_handler_callback_vtbl = scheme_handler_callback_Invoke, }; +static HRESULT file_stream_create(const WCHAR *url, DWORD flags, IMFByteStream **out) +{ + if (!wcsnicmp(url, L"file://", 7)) + url += 7; + return MFCreateFile(flags & MF_RESOLUTION_WRITE ? MF_ACCESSMODE_READWRITE : MF_ACCESSMODE_READ, + MF_OPENMODE_FAIL_IF_NOT_EXIST, MF_FILEFLAGS_NONE, url, out); +} + HRESULT file_scheme_handler_construct(REFIID riid, void **obj) { struct scheme_handler *handler; @@ -473,6 +475,58 @@ HRESULT file_scheme_handler_construct(REFIID riid, void **obj) handler->refcount = 1; list_init(&handler->results); InitializeCriticalSection(&handler->cs); + handler->create_stream = file_stream_create; + + hr = IMFSchemeHandler_QueryInterface(&handler->IMFSchemeHandler_iface, riid, obj); + IMFSchemeHandler_Release(&handler->IMFSchemeHandler_iface); + + return hr; +} + +static HRESULT urlmon_stream_create(const WCHAR *url, DWORD flags, IMFByteStream **out) +{ + IMFAttributes *attributes; + IStream *stream; + HRESULT hr; + + if (flags & MF_RESOLUTION_WRITE) + return E_INVALIDARG; + + if (FAILED(hr = URLOpenBlockingStreamW(NULL, url, &stream, 0, NULL))) + { + WARN("Failed to open url %s, hr %#lx\n", debugstr_w(url), hr); + return hr; + } + + hr = MFCreateMFByteStreamOnStream(stream, out); + IStream_Release(stream); + if (FAILED(hr)) + return hr; + + IMFByteStream_QueryInterface(*out, &IID_IMFAttributes, (void **)&attributes); + IMFAttributes_DeleteItem(attributes, &MF_BYTESTREAM_ORIGIN_NAME); + IMFAttributes_SetString(attributes, &MF_BYTESTREAM_EFFECTIVE_URL, url); + IMFAttributes_SetString(attributes, &MF_BYTESTREAM_CONTENT_TYPE, L"application/octet-stream"); + IMFAttributes_Release(attributes); + return hr; +} + +HRESULT urlmon_scheme_handler_construct(REFIID riid, void **obj) +{ + struct scheme_handler *handler; + HRESULT hr; + + TRACE("%s, %p.\n", debugstr_guid(riid), obj); + + if (!(handler = calloc(1, sizeof(*handler)))) + return E_OUTOFMEMORY; + + handler->IMFSchemeHandler_iface.lpVtbl = &scheme_handler_vtbl; + handler->IMFAsyncCallback_iface.lpVtbl = &scheme_handler_callback_vtbl; + handler->refcount = 1; + list_init(&handler->results); + InitializeCriticalSection(&handler->cs); + handler->create_stream = urlmon_stream_create; hr = IMFSchemeHandler_QueryInterface(&handler->IMFSchemeHandler_iface, riid, obj); IMFSchemeHandler_Release(&handler->IMFSchemeHandler_iface); diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index bf7530becf4..7217e744343 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -6472,7 +6472,7 @@ static void test_scheme_resolvers(void) for (i = 0; i < ARRAY_SIZE(urls); i++) { hr = IMFSourceResolver_CreateObjectFromURL(resolver, urls[i], MF_RESOLUTION_BYTESTREAM, NULL, &type, &object); - todo_wine + todo_wine_if(i >= 2) ok(hr == S_OK, "got hr %#lx\n", hr); if (hr != S_OK) continue; @@ -6485,7 +6485,6 @@ static void test_scheme_resolvers(void) PropVariantInit(&propvar); hr = IMFAttributes_GetItem(attributes, &MF_BYTESTREAM_EFFECTIVE_URL, &propvar); ok(hr == S_OK || broken(hr == MF_E_ATTRIBUTENOTFOUND) /* Win7 */, "got hr %#lx\n", hr); - todo_wine ok(!wcsncmp(expect_domain[i], propvar.pwszVal, wcslen(expect_domain[i])) || broken(hr == MF_E_ATTRIBUTENOTFOUND) /* Win7 */, "got url %s\n", debugstr_w(propvar.pwszVal)); @@ -6493,7 +6492,6 @@ static void test_scheme_resolvers(void) ok(hr == S_OK, "got hr %#lx\n", hr); hr = IMFAttributes_GetItem(attributes, &MF_BYTESTREAM_CONTENT_TYPE, NULL); - todo_wine ok(hr == S_OK, "got hr %#lx\n", hr); hr = IMFAttributes_GetItem(attributes, &MF_BYTESTREAM_LAST_MODIFIED_TIME, NULL); todo_wine

1 0

Piotr Caban : msvcr90/tests: Restore thread locale settings in _getptd tests to avoid side effects.
by Alexandre Julliard 23 Aug '23

23 Aug '23

Module: wine Branch: master Commit: 6245e2f3a88e856a905ad39648bcee054796ef7b URL: https://gitlab.winehq.org/wine/wine/-/commit/6245e2f3a88e856a905ad39648bcee… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Aug 23 14:29:42 2023 +0200 msvcr90/tests: Restore thread locale settings in _getptd tests to avoid side effects. --- dlls/msvcr90/tests/msvcr90.c | 59 ++++++++++++++++++++++---------------------- 1 file changed, 30 insertions(+), 29 deletions(-)

1 0

Piotr Caban : msvcr90/tests: Reorder locale refcount tests to workaround leak in _create_locale.
by Alexandre Julliard 23 Aug '23

23 Aug '23

Module: wine Branch: master Commit: 195ff4bce75915bbed5b217af100c696ed42a604 URL: https://gitlab.winehq.org/wine/wine/-/commit/195ff4bce75915bbed5b217af100c6… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Aug 23 14:38:57 2023 +0200 msvcr90/tests: Reorder locale refcount tests to workaround leak in _create_locale. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54718 --- dlls/msvcr90/tests/msvcr90.c | 7 +++++-- dlls/msvcrt/locale.c | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/msvcr90/tests/msvcr90.c b/dlls/msvcr90/tests/msvcr90.c index 506ec5931d2..0b274fd694f 100644 --- a/dlls/msvcr90/tests/msvcr90.c +++ b/dlls/msvcr90/tests/msvcr90.c @@ -2380,7 +2380,7 @@ static void test__get_current_locale(void) ok(l->locinfo->lc_time_curr->unk == 1, "unk = %d\n", l->locinfo->lc_time_curr->unk); ok(l->locinfo->lc_time_curr->refcount == 1, "refcount = %d\n", l->locinfo->lc_time_curr->refcount); ok(l2->locinfo->lc_time_curr->unk == 1, "unk = %d\n", l2->locinfo->lc_time_curr->unk); - ok(l2->locinfo->lc_time_curr->refcount == 3 || broken(l2->locinfo->lc_time_curr->refcount == 2), + ok(l2->locinfo->lc_time_curr->refcount == 2, "refcount = %d\n", l2->locinfo->lc_time_curr->refcount); p__free_locale(l2); @@ -2491,6 +2491,10 @@ START_TEST(msvcr90) if(!init()) return; + /* _get_current_locale tests needs to be run first because there's + * a C-locale refcount leak in native _create_locale implementation. */ + test__get_current_locale(); + test__initterm_e(); test__encode_pointer(); test_error_messages(); @@ -2526,7 +2530,6 @@ START_TEST(msvcr90) test___strncnt(); test_swscanf(); test____mb_cur_max_l_func(); - test__get_current_locale(); test_ioinfo_flags(); test_strcmp(); } diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index 82083d66106..f7be2a1e9bc 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -68,7 +68,7 @@ __lc_time_data cloc_time_data = #if _MSVCR_VER < 110 MAKELCID(LANG_ENGLISH, SORT_DEFAULT), #endif - 1, 0, + 1, -1, #if _MSVCR_VER == 0 || _MSVCR_VER >= 100 {{L"Sun", L"Mon", L"Tue", L"Wed", L"Thu", L"Fri", L"Sat", L"Sunday", L"Monday", L"Tuesday", L"Wednesday", L"Thursday", L"Friday", L"Saturday",

1 0

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

23 Aug '23

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 : mmdevapi: Import get_device_guid() from driver.
by Alexandre Julliard 23 Aug '23

23 Aug '23

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: Move GetEndpointIDs into mmdevapi.
by Alexandre Julliard 23 Aug '23

23 Aug '23

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 : winealsa: Remove GetEndpointIDs.
by Alexandre Julliard 23 Aug '23

23 Aug '23

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 : winecoreaudio: Remove GetEndpointIDs.
by Alexandre Julliard 23 Aug '23

23 Aug '23

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 : wineoss: Remove GetEndpointIDs.
by Alexandre Julliard 23 Aug '23

23 Aug '23

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 : opcservices: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard 23 Aug '23

23 Aug '23

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