system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-10-14 15:02:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

winealsa.drv: Set device path for all devices.

Browse source 
Signed-off-by: Arkadiusz Hiler <ahiler@codeweavers.com>
This commit is contained in:
Arkadiusz Hiler 2022-06-27 16:58:15 +03:00 committed by Alexandre Julliard
parent 3180ed3237
commit 5d0d812dfd
1 changed files with 31 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
dlls/winealsa.drv/alsa.c
View file

@ -2318,21 +2318,21 @@ static NTSTATUS get_prop_value(void *args)
if(IsEqualPropertyKey(*prop, devicepath_key))
{
char uevent[MAX_PATH];
FILE *fuevent;
int card, device;
/* only implemented for identifiable devices, i.e. not "default" */
if(!sscanf(name, "plughw:%u,%u", &card, &device)){
params->result = E_NOTIMPL;
return STATUS_SUCCESS;
}
sprintf(uevent, "/sys/class/sound/card%u/device/uevent", card);
fuevent = fopen(uevent, "r");
if(fuevent){
enum AudioDeviceConnectionType connection = AudioDeviceConnectionType_Unknown;
USHORT vendor_id = 0, product_id = 0;
char uevent[MAX_PATH];
FILE *fuevent = NULL;
int card, device;
UINT serial_number;
char buf[128];
int len;
if(sscanf(name, "plughw:%u,%u", &card, &device)){
sprintf(uevent, "/sys/class/sound/card%u/device/uevent", card);
fuevent = fopen(uevent, "r");
}
if(fuevent){
char line[256];
while (fgets(line, sizeof(line), fuevent)) {
@ -2365,11 +2365,7 @@ static NTSTATUS get_prop_value(void *args)
}
fclose(fuevent);
if(connection == AudioDeviceConnectionType_USB || connection == AudioDeviceConnectionType_PCI){
UINT serial_number;
char buf[128];
int len;
}
/* As hardly any audio devices have serial numbers, Windows instead
appears to use a persistent random number. We emulate this here
@ -2379,9 +2375,11 @@ static NTSTATUS get_prop_value(void *args)
if(connection == AudioDeviceConnectionType_USB)
sprintf(buf, "{1}.USB\\VID_%04X&PID_%04X\\%u&%08X",
vendor_id, product_id, device, serial_number);
else /* AudioDeviceConnectionType_PCI */
else if (connection == AudioDeviceConnectionType_PCI)
sprintf(buf, "{1}.HDAUDIO\\FUNC_01&VEN_%04X&DEV_%04X\\%u&%08X",
vendor_id, product_id, device, serial_number);
else
sprintf(buf, "{1}.ROOT\\MEDIA\\%04u", serial_number & 0x1FF);
len = strlen(buf) + 1;
if(*params->buffer_size < len * sizeof(WCHAR)){
@ -2394,12 +2392,6 @@ static NTSTATUS get_prop_value(void *args)
ntdll_umbstowcs(buf, len, out->pwszVal, len);
params->result = S_OK;
return STATUS_SUCCESS;
}
}else{
WARN("Could not open %s for reading\n", uevent);
params->result = E_NOTIMPL;
return STATUS_SUCCESS;
}
} else if (flow != eCapture && IsEqualPropertyKey(*prop, PKEY_AudioEndpoint_PhysicalSpeakers)) {
unsigned int num_speakers, card, device;
char hwname[255];