system/wine
system/wine
1
0
Fork 0
mirror of https://github.com/wine-mirror/wine synced 2024-07-03 08:19:41 +00:00
Code Issues Projects Releases Wiki Activity

winepulse: Move GetPropValue into mmdevapi.

Browse Source
This commit is contained in:
Davide Beatrici 2023-08-05 23:17:15 +02:00 committed by Alexandre Julliard
parent c03170a9b7
commit 906ad69b0a
5 changed files with 34 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
dlls/mmdevapi/devenum.c
View File

@ -240,21 +240,48 @@ static HRESULT MMDevice_SetPropValue(const GUID *devguid, DWORD flow, REFPROPERT
static HRESULT set_driver_prop_value(GUID *id, const EDataFlow flow, const PROPERTYKEY *prop)
{
HRESULT hr;
struct get_prop_value_params params;
PROPVARIANT pv;
char *dev_name;
unsigned int size = 0;
if (!drvs.pGetPropValue)
return E_NOTIMPL;
TRACE("%s, (%s,%lu)\n", wine_dbgstr_guid(id), wine_dbgstr_guid(&prop->fmtid), prop->pid);
hr = drvs.pGetPropValue(id, prop, &pv);
if (!drvs.pget_device_name_from_guid(id, &dev_name, &params.flow))
return E_FAIL;
if (SUCCEEDED(hr))
{
params.device = dev_name;
params.guid = id;
params.prop = prop;
params.value = &pv;
params.buffer = NULL;
params.buffer_size = &size;
while (1) {
__wine_unix_call(drvs.module_unixlib, get_prop_value, &params);
if (params.result != E_NOT_SUFFICIENT_BUFFER)
break;
CoTaskMemFree(params.buffer);
params.buffer = CoTaskMemAlloc(*params.buffer_size);
if (!params.buffer) {
free(dev_name);
return E_OUTOFMEMORY;
}
}
if (FAILED(params.result))
CoTaskMemFree(params.buffer);
free(dev_name);
if (SUCCEEDED(params.result)) {
MMDevice_SetPropValue(id, flow, prop, &pv);
PropVariantClear(&pv);
}
return hr;
return params.result;
}
struct product_name_overrides

3
dlls/mmdevapi/main.c
View File

@ -102,9 +102,6 @@ static BOOL load_driver(const WCHAR *name, DriverFuncs *driver)
LDFC(GetEndpointIDs);
#undef LDFC
/* optional - do not fail if not found */
driver->pGetPropValue = (void*)GetProcAddress(driver->module, "GetPropValue");
GetModuleFileNameW(NULL, path, ARRAY_SIZE(path));
params.name = wcsrchr(path, '\\');
params.name = params.name ? params.name + 1 : path;

2
dlls/mmdevapi/mmdevapi_private.h
View File

@ -50,8 +50,6 @@ typedef struct _DriverFuncs {
* all of the elements in both arrays with HeapFree() */
HRESULT (WINAPI *pGetEndpointIDs)(EDataFlow flow, WCHAR ***ids,
GUID **guids, UINT *num, UINT *default_index);
HRESULT (WINAPI *pGetPropValue)(GUID *guid,
const PROPERTYKEY *prop, PROPVARIANT *out);
} DriverFuncs;
extern DriverFuncs drvs DECLSPEC_HIDDEN;

39
dlls/winepulse.drv/mmdevdrv.c
View File

@ -311,42 +311,3 @@ BOOL WINAPI get_device_name_from_guid(GUID *guid, char **name, EDataFlow *flow)
WARN("No matching device in registry for GUID %s\n", debugstr_guid(guid));
return FALSE;
}
HRESULT WINAPI AUDDRV_GetPropValue(GUID *guid, const PROPERTYKEY *prop, PROPVARIANT *out)
{
struct get_prop_value_params params;
char *pulse_name;
unsigned int size = 0;
TRACE("%s, (%s,%lu), %p\n", wine_dbgstr_guid(guid), wine_dbgstr_guid(&prop->fmtid), prop->pid, out);
if (!get_device_name_from_guid(guid, &pulse_name, &params.flow))
return E_FAIL;
params.device = pulse_name;
params.guid = guid;
params.prop = prop;
params.value = out;
params.buffer = NULL;
params.buffer_size = &size;
while(1) {
pulse_call(get_prop_value, &params);
if(params.result != E_NOT_SUFFICIENT_BUFFER)
break;
CoTaskMemFree(params.buffer);
params.buffer = CoTaskMemAlloc(*params.buffer_size);
if(!params.buffer) {
free(pulse_name);
return E_OUTOFMEMORY;
}
}
if(FAILED(params.result))
CoTaskMemFree(params.buffer);
free(pulse_name);
return params.result;
}

1
dlls/winepulse.drv/winepulse.drv.spec
View File

@ -1,7 +1,6 @@
# MMDevAPI driver functions
@ 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
@ stdcall -private GetPropValue(ptr ptr ptr) AUDDRV_GetPropValue
# WinMM driver functions
@ stdcall -private DriverProc(long long long long long) winealsa.drv.DriverProc