dsound: remove unused parameter from propset functions
Robert Reif
reif at earthlink.net
Tue Aug 22 06:36:08 CDT 2006
-------------- next part --------------
diff -p -u -r1.49 propset.c
--- dlls/dsound/propset.c 18 Aug 2006 10:42:54 -0000 1.49
+++ dlls/dsound/propset.c 22 Aug 2006 11:33:57 -0000
@@ -268,15 +268,14 @@ static ULONG WINAPI IKsPrivatePropertySe
}
static HRESULT WINAPI DSPROPERTY_WaveDeviceMappingA(
- REFGUID guidPropSet,
LPVOID pPropData,
ULONG cbPropData,
PULONG pcbReturned )
{
HRESULT hr = DSERR_INVALIDPARAM;
PDSPROPERTY_DIRECTSOUNDDEVICE_WAVEDEVICEMAPPING_A_DATA ppd;
- TRACE("(guidPropSet=%s,pPropData=%p,cbPropData=%ld,pcbReturned=%p) not implemented!\n",
- debugstr_guid(guidPropSet),pPropData,cbPropData,pcbReturned);
+ TRACE("(pPropData=%p,cbPropData=%ld,pcbReturned=%p)\n",
+ pPropData,cbPropData,pcbReturned);
ppd = (PDSPROPERTY_DIRECTSOUNDDEVICE_WAVEDEVICEMAPPING_A_DATA) pPropData;
@@ -332,15 +331,14 @@ static HRESULT WINAPI DSPROPERTY_WaveDev
}
static HRESULT WINAPI DSPROPERTY_WaveDeviceMappingW(
- REFGUID guidPropSet,
LPVOID pPropData,
ULONG cbPropData,
PULONG pcbReturned )
{
HRESULT hr = DSERR_INVALIDPARAM;
PDSPROPERTY_DIRECTSOUNDDEVICE_WAVEDEVICEMAPPING_W_DATA ppd;
- TRACE("(guidPropSet=%s,pPropData=%p,cbPropData=%ld,pcbReturned=%p)\n",
- debugstr_guid(guidPropSet),pPropData,cbPropData,pcbReturned);
+ TRACE("(pPropData=%p,cbPropData=%ld,pcbReturned=%p)\n",
+ pPropData,cbPropData,pcbReturned);
ppd = (PDSPROPERTY_DIRECTSOUNDDEVICE_WAVEDEVICEMAPPING_W_DATA) pPropData;
@@ -396,7 +394,6 @@ static HRESULT WINAPI DSPROPERTY_WaveDev
}
static HRESULT WINAPI DSPROPERTY_Description1(
- REFGUID guidPropSet,
LPVOID pPropData,
ULONG cbPropData,
PULONG pcbReturned )
@@ -404,8 +401,8 @@ static HRESULT WINAPI DSPROPERTY_Descrip
HRESULT err;
GUID guid, dev_guid;
PDSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_1_DATA ppd;
- TRACE("(guidPropSet=%s,pPropData=%p,cbPropData=%ld,pcbReturned=%p)\n",
- debugstr_guid(guidPropSet),pPropData,cbPropData,pcbReturned);
+ TRACE("(pPropData=%p,cbPropData=%ld,pcbReturned=%p)\n",
+ pPropData,cbPropData,pcbReturned);
ppd = (PDSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_1_DATA) pPropData;
@@ -424,8 +421,8 @@ static HRESULT WINAPI DSPROPERTY_Descrip
} else {
TRACE("DataFlow=Unknown(%d)\n", ppd->DataFlow);
}
- FIXME("(guidPropSet=%s,pPropData=%p,cbPropData=%ld,pcbReturned=%p) GUID_NULL not implemented!\n",
- debugstr_guid(guidPropSet),pPropData,cbPropData,pcbReturned);
+ FIXME("(pPropData=%p,cbPropData=%ld,pcbReturned=%p) GUID_NULL not implemented!\n",
+ pPropData,cbPropData,pcbReturned);
return E_PROP_ID_UNSUPPORTED;
}
@@ -577,7 +574,6 @@ static HRESULT WINAPI DSPROPERTY_Descrip
}
static HRESULT WINAPI DSPROPERTY_DescriptionA(
- REFGUID guidPropSet,
LPVOID pPropData,
ULONG cbPropData,
PULONG pcbReturned )
@@ -585,8 +581,8 @@ static HRESULT WINAPI DSPROPERTY_Descrip
PDSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_A_DATA ppd = (PDSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_A_DATA) pPropData;
HRESULT err;
GUID dev_guid;
- TRACE("(guidPropSet=%s,pPropData=%p,cbPropData=%ld,pcbReturned=%p)\n",
- debugstr_guid(guidPropSet),pPropData,cbPropData,pcbReturned);
+ TRACE("(pPropData=%p,cbPropData=%ld,pcbReturned=%p)\n",
+ pPropData,cbPropData,pcbReturned);
TRACE("DeviceId=%s\n",debugstr_guid(&ppd->DeviceId));
if ( IsEqualGUID( &ppd->DeviceId , &GUID_NULL) ) {
@@ -598,8 +594,8 @@ static HRESULT WINAPI DSPROPERTY_Descrip
} else {
TRACE("DataFlow=Unknown(%d)\n", ppd->DataFlow);
}
- FIXME("(guidPropSet=%s,pPropData=%p,cbPropData=%ld,pcbReturned=%p) GUID_NULL not implemented!\n",
- debugstr_guid(guidPropSet),pPropData,cbPropData,pcbReturned);
+ FIXME("(pPropData=%p,cbPropData=%ld,pcbReturned=%p) GUID_NULL not implemented!\n",
+ pPropData,cbPropData,pcbReturned);
return E_PROP_ID_UNSUPPORTED;
}
@@ -818,7 +814,6 @@ static HRESULT WINAPI DSPROPERTY_Descrip
}
static HRESULT WINAPI DSPROPERTY_DescriptionW(
- REFGUID guidPropSet,
LPVOID pPropData,
ULONG cbPropData,
PULONG pcbReturned )
@@ -826,8 +821,8 @@ static HRESULT WINAPI DSPROPERTY_Descrip
PDSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_W_DATA ppd = (PDSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_W_DATA) pPropData;
HRESULT err;
GUID dev_guid;
- TRACE("(guidPropSet=%s,pPropData=%p,cbPropData=%ld,pcbReturned=%p)\n",
- debugstr_guid(guidPropSet),pPropData,cbPropData,pcbReturned);
+ TRACE("pPropData=%p,cbPropData=%ld,pcbReturned=%p)\n",
+ pPropData,cbPropData,pcbReturned);
TRACE("DeviceId=%s\n",debugstr_guid(&ppd->DeviceId));
if ( IsEqualGUID( &ppd->DeviceId , &GUID_NULL) ) {
@@ -839,8 +834,8 @@ static HRESULT WINAPI DSPROPERTY_Descrip
} else {
TRACE("DataFlow=Unknown(%d)\n", ppd->DataFlow);
}
- FIXME("(guidPropSet=%s,pPropData=%p,cbPropData=%ld,pcbReturned=%p) GUID_NULL not implemented!\n",
- debugstr_guid(guidPropSet),pPropData,cbPropData,pcbReturned);
+ FIXME("(pPropData=%p,cbPropData=%ld,pcbReturned=%p) GUID_NULL not implemented!\n",
+ pPropData,cbPropData,pcbReturned);
return E_PROP_ID_UNSUPPORTED;
}
@@ -1043,7 +1038,7 @@ static HRESULT WINAPI DSPROPERTY_Descrip
}
}
}
- }
+ }
if (found == FALSE) {
WARN("device not found\n");
@@ -1060,82 +1055,77 @@ static HRESULT WINAPI DSPROPERTY_Descrip
}
static HRESULT WINAPI DSPROPERTY_Enumerate1(
- REFGUID guidPropSet,
LPVOID pPropData,
ULONG cbPropData,
PULONG pcbReturned )
{
PDSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_1_DATA ppd = (PDSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_1_DATA) pPropData;
HRESULT err;
- TRACE("(guidPropSet=%s,pPropData=%p,cbPropData=%ld,pcbReturned=%p)\n",
- debugstr_guid(guidPropSet),pPropData,cbPropData,pcbReturned);
+ TRACE("(pPropData=%p,cbPropData=%ld,pcbReturned=%p)\n",
+ pPropData,cbPropData,pcbReturned);
- if ( IsEqualGUID( &DSPROPSETID_DirectSoundDevice, guidPropSet) ) {
- if (ppd) {
- if (ppd->Callback) {
- unsigned devs, wod, wid;
- DSDRIVERDESC desc;
- DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_1_DATA data;
-
- devs = waveOutGetNumDevs();
- for (wod = 0; wod < devs; ++wod) {
- err = mmErr(waveOutMessage((HWAVEOUT)wod,DRV_QUERYDSOUNDDESC,(DWORD_PTR)&desc,0));
- if (err == DS_OK) {
- PIDSCDRIVER drv;
- ZeroMemory(&data, sizeof(data));
- data.DataFlow = DIRECTSOUNDDEVICE_DATAFLOW_RENDER;
- data.WaveDeviceId = wod;
- data.DeviceId = DSOUND_renderer_guids[wod];
- lstrcpynA(data.DescriptionA, desc.szDesc, sizeof(data.DescriptionA));
- lstrcpynA(data.ModuleA, desc.szDrvname, sizeof(data.ModuleA));
+ if (ppd) {
+ if (ppd->Callback) {
+ unsigned devs, wod, wid;
+ DSDRIVERDESC desc;
+ DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_1_DATA data;
+
+ devs = waveOutGetNumDevs();
+ for (wod = 0; wod < devs; ++wod) {
+ err = mmErr(waveOutMessage((HWAVEOUT)wod,DRV_QUERYDSOUNDDESC,(DWORD_PTR)&desc,0));
+ if (err == DS_OK) {
+ PIDSCDRIVER drv;
+ ZeroMemory(&data, sizeof(data));
+ data.DataFlow = DIRECTSOUNDDEVICE_DATAFLOW_RENDER;
+ data.WaveDeviceId = wod;
+ data.DeviceId = DSOUND_renderer_guids[wod];
+ lstrcpynA(data.DescriptionA, desc.szDesc, sizeof(data.DescriptionA));
+ lstrcpynA(data.ModuleA, desc.szDrvname, sizeof(data.ModuleA));
- MultiByteToWideChar( CP_ACP, 0, data.DescriptionA, -1, data.DescriptionW, sizeof(data.DescriptionW)/sizeof(WCHAR) );
- MultiByteToWideChar( CP_ACP, 0, data.ModuleA, -1, data.ModuleW, sizeof(data.ModuleW)/sizeof(WCHAR) );
+ MultiByteToWideChar( CP_ACP, 0, data.DescriptionA, -1, data.DescriptionW, sizeof(data.DescriptionW)/sizeof(WCHAR) );
+ MultiByteToWideChar( CP_ACP, 0, data.ModuleA, -1, data.ModuleW, sizeof(data.ModuleW)/sizeof(WCHAR) );
- data.Type = DIRECTSOUNDDEVICE_TYPE_EMULATED;
- err = mmErr(waveOutMessage((HWAVEOUT)wod, DRV_QUERYDSOUNDIFACE, (DWORD_PTR)&drv, 0));
- if (err == DS_OK && drv)
- data.Type = DIRECTSOUNDDEVICE_TYPE_VXD;
- else
- WARN("waveOutMessage(DRV_QUERYDSOUNDIFACE) failed\n");
+ data.Type = DIRECTSOUNDDEVICE_TYPE_EMULATED;
+ err = mmErr(waveOutMessage((HWAVEOUT)wod, DRV_QUERYDSOUNDIFACE, (DWORD_PTR)&drv, 0));
+ if (err == DS_OK && drv)
+ data.Type = DIRECTSOUNDDEVICE_TYPE_VXD;
+ else
+ WARN("waveOutMessage(DRV_QUERYDSOUNDIFACE) failed\n");
- TRACE("calling Callback(%p,%p)\n", &data, ppd->Context);
- (ppd->Callback)(&data, ppd->Context);
- }
+ TRACE("calling Callback(%p,%p)\n", &data, ppd->Context);
+ (ppd->Callback)(&data, ppd->Context);
}
+ }
- devs = waveInGetNumDevs();
- for (wid = 0; wid < devs; ++wid) {
- err = mmErr(waveInMessage((HWAVEIN)wid,DRV_QUERYDSOUNDDESC,(DWORD_PTR)&desc,0));
- if (err == DS_OK) {
- PIDSCDRIVER drv;
- ZeroMemory(&data, sizeof(data));
- data.DataFlow = DIRECTSOUNDDEVICE_DATAFLOW_CAPTURE;
- data.WaveDeviceId = wid;
- data.DeviceId = DSOUND_capture_guids[wid];
- lstrcpynA(data.DescriptionA, desc.szDesc, sizeof(data.DescriptionA));
- lstrcpynA(data.ModuleA, desc.szDrvname, sizeof(data.ModuleA));
+ devs = waveInGetNumDevs();
+ for (wid = 0; wid < devs; ++wid) {
+ err = mmErr(waveInMessage((HWAVEIN)wid,DRV_QUERYDSOUNDDESC,(DWORD_PTR)&desc,0));
+ if (err == DS_OK) {
+ PIDSCDRIVER drv;
+ ZeroMemory(&data, sizeof(data));
+ data.DataFlow = DIRECTSOUNDDEVICE_DATAFLOW_CAPTURE;
+ data.WaveDeviceId = wid;
+ data.DeviceId = DSOUND_capture_guids[wid];
+ lstrcpynA(data.DescriptionA, desc.szDesc, sizeof(data.DescriptionA));
+ lstrcpynA(data.ModuleA, desc.szDrvname, sizeof(data.ModuleA));
- MultiByteToWideChar( CP_ACP, 0, data.DescriptionA, -1, data.DescriptionW, sizeof(data.DescriptionW)/sizeof(WCHAR) );
- MultiByteToWideChar( CP_ACP, 0, data.ModuleA, -1, data.ModuleW, sizeof(data.ModuleW)/sizeof(WCHAR) );
+ MultiByteToWideChar( CP_ACP, 0, data.DescriptionA, -1, data.DescriptionW, sizeof(data.DescriptionW)/sizeof(WCHAR) );
+ MultiByteToWideChar( CP_ACP, 0, data.ModuleA, -1, data.ModuleW, sizeof(data.ModuleW)/sizeof(WCHAR) );
- data.Type = DIRECTSOUNDDEVICE_TYPE_EMULATED;
- err = mmErr(waveInMessage((HWAVEIN)wid, DRV_QUERYDSOUNDIFACE, (DWORD_PTR)&drv, 0));
- if (err == DS_OK && drv)
- data.Type = DIRECTSOUNDDEVICE_TYPE_VXD;
- else
- WARN("waveInMessage(DRV_QUERYDSOUNDIFACE) failed\n");
+ data.Type = DIRECTSOUNDDEVICE_TYPE_EMULATED;
+ err = mmErr(waveInMessage((HWAVEIN)wid, DRV_QUERYDSOUNDIFACE, (DWORD_PTR)&drv, 0));
+ if (err == DS_OK && drv)
+ data.Type = DIRECTSOUNDDEVICE_TYPE_VXD;
+ else
+ WARN("waveInMessage(DRV_QUERYDSOUNDIFACE) failed\n");
- TRACE("calling Callback(%p,%p)\n", &data, ppd->Context);
- (ppd->Callback)(&data, ppd->Context);
- }
+ TRACE("calling Callback(%p,%p)\n", &data, ppd->Context);
+ (ppd->Callback)(&data, ppd->Context);
}
-
- return S_OK;
}
+
+ return S_OK;
}
- } else {
- FIXME("unsupported property: %s\n",debugstr_guid(guidPropSet));
}
if (pcbReturned) {
@@ -1147,239 +1137,229 @@ static HRESULT WINAPI DSPROPERTY_Enumera
}
static HRESULT WINAPI DSPROPERTY_EnumerateA(
- REFGUID guidPropSet,
LPVOID pPropData,
ULONG cbPropData,
PULONG pcbReturned )
{
PDSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_A_DATA ppd = (PDSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_A_DATA) pPropData;
HRESULT err;
- TRACE("(guidPropSet=%s,pPropData=%p,cbPropData=%ld,pcbReturned=%p)\n",
- debugstr_guid(guidPropSet),pPropData,cbPropData,pcbReturned);
+ TRACE("(pPropData=%p,cbPropData=%ld,pcbReturned=%p)\n",
+ pPropData,cbPropData,pcbReturned);
- if ( IsEqualGUID( &DSPROPSETID_DirectSoundDevice, guidPropSet) ) {
- if (ppd) {
- if (ppd->Callback) {
- unsigned devs, wod, wid;
- DSDRIVERDESC desc;
- DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_A_DATA data;
-
- devs = waveOutGetNumDevs();
- for (wod = 0; wod < devs; ++wod) {
- err = mmErr(waveOutMessage((HWAVEOUT)wod,DRV_QUERYDSOUNDDESC,(DWORD_PTR)&desc,0));
- if (err == DS_OK) {
- DWORD size;
- err = mmErr(waveOutMessage((HWAVEOUT)wod,DRV_QUERYDEVICEINTERFACESIZE,(DWORD_PTR)&size,0));
- if (err == DS_OK) {
- WCHAR * nameW = HeapAlloc(GetProcessHeap(),0,size);
- if (nameW) {
- err = mmErr(waveOutMessage((HWAVEOUT)wod,DRV_QUERYDEVICEINTERFACE,(DWORD_PTR)nameW,size));
- if (err == DS_OK) {
- CHAR * szInterface = HeapAlloc(GetProcessHeap(),0,size/sizeof(WCHAR));
- if (szInterface) {
- PIDSCDRIVER drv;
- ZeroMemory(&data, sizeof(data));
- data.DataFlow = DIRECTSOUNDDEVICE_DATAFLOW_RENDER;
- data.WaveDeviceId = wod;
- data.DeviceId = DSOUND_renderer_guids[wod];
- data.Description = desc.szDesc;
- data.Module = desc.szDrvname;
- WideCharToMultiByte( CP_ACP, 0, nameW, size/sizeof(WCHAR), szInterface, size/sizeof(WCHAR), NULL, NULL );
- data.Interface = szInterface;
-
- data.Type = DIRECTSOUNDDEVICE_TYPE_EMULATED;
- err = mmErr(waveOutMessage((HWAVEOUT)wod, DRV_QUERYDSOUNDIFACE, (DWORD_PTR)&drv, 0));
- if (err == DS_OK && drv)
- data.Type = DIRECTSOUNDDEVICE_TYPE_VXD;
- else
- WARN("waveOutMessage(DRV_QUERYDSOUNDIFACE) failed\n");
+ if (ppd) {
+ if (ppd->Callback) {
+ unsigned devs, wod, wid;
+ DSDRIVERDESC desc;
+ DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_A_DATA data;
+
+ devs = waveOutGetNumDevs();
+ for (wod = 0; wod < devs; ++wod) {
+ err = mmErr(waveOutMessage((HWAVEOUT)wod,DRV_QUERYDSOUNDDESC,(DWORD_PTR)&desc,0));
+ if (err == DS_OK) {
+ DWORD size;
+ err = mmErr(waveOutMessage((HWAVEOUT)wod,DRV_QUERYDEVICEINTERFACESIZE,(DWORD_PTR)&size,0));
+ if (err == DS_OK) {
+ WCHAR * nameW = HeapAlloc(GetProcessHeap(),0,size);
+ if (nameW) {
+ err = mmErr(waveOutMessage((HWAVEOUT)wod,DRV_QUERYDEVICEINTERFACE,(DWORD_PTR)nameW,size));
+ if (err == DS_OK) {
+ CHAR * szInterface = HeapAlloc(GetProcessHeap(),0,size/sizeof(WCHAR));
+ if (szInterface) {
+ PIDSCDRIVER drv;
+ ZeroMemory(&data, sizeof(data));
+ data.DataFlow = DIRECTSOUNDDEVICE_DATAFLOW_RENDER;
+ data.WaveDeviceId = wod;
+ data.DeviceId = DSOUND_renderer_guids[wod];
+ data.Description = desc.szDesc;
+ data.Module = desc.szDrvname;
+ WideCharToMultiByte( CP_ACP, 0, nameW, size/sizeof(WCHAR), szInterface, size/sizeof(WCHAR), NULL, NULL );
+ data.Interface = szInterface;
+
+ data.Type = DIRECTSOUNDDEVICE_TYPE_EMULATED;
+ err = mmErr(waveOutMessage((HWAVEOUT)wod, DRV_QUERYDSOUNDIFACE, (DWORD_PTR)&drv, 0));
+ if (err == DS_OK && drv)
+ data.Type = DIRECTSOUNDDEVICE_TYPE_VXD;
+ else
+ WARN("waveOutMessage(DRV_QUERYDSOUNDIFACE) failed\n");
- TRACE("calling Callback(%p,%p)\n", &data, ppd->Context);
- (ppd->Callback)(&data, ppd->Context);
- }
- HeapFree(GetProcessHeap(),0,szInterface);
+ TRACE("calling Callback(%p,%p)\n", &data, ppd->Context);
+ (ppd->Callback)(&data, ppd->Context);
}
- }
- HeapFree(GetProcessHeap(),0,nameW);
- }
- }
- }
+ HeapFree(GetProcessHeap(),0,szInterface);
+ }
+ }
+ HeapFree(GetProcessHeap(),0,nameW);
+ }
+ }
+ }
- devs = waveInGetNumDevs();
- for (wid = 0; wid < devs; ++wid) {
- err = mmErr(waveInMessage((HWAVEIN)wid,DRV_QUERYDSOUNDDESC,(DWORD_PTR)&desc,0));
- if (err == DS_OK) {
- DWORD size;
- err = mmErr(waveInMessage((HWAVEIN)wid,DRV_QUERYDEVICEINTERFACESIZE,(DWORD_PTR)&size,0));
- if (err == DS_OK) {
- WCHAR * nameW = HeapAlloc(GetProcessHeap(),0,size);
- if (nameW) {
- err = mmErr(waveInMessage((HWAVEIN)wid,DRV_QUERYDEVICEINTERFACE,(DWORD_PTR)nameW,size));
- if (err == DS_OK) {
- CHAR * szInterface = HeapAlloc(GetProcessHeap(),0,size/sizeof(WCHAR));
- if (szInterface) {
- PIDSCDRIVER drv;
- ZeroMemory(&data, sizeof(data));
- data.DataFlow = DIRECTSOUNDDEVICE_DATAFLOW_CAPTURE;
- data.WaveDeviceId = wid;
- data.DeviceId = DSOUND_capture_guids[wid];
- data.Description = desc.szDesc;
- data.Module = desc.szDrvname;
- WideCharToMultiByte( CP_ACP, 0, nameW, size/sizeof(WCHAR), szInterface, size/sizeof(WCHAR), NULL, NULL );
- data.Interface = szInterface;
-
- data.Type = DIRECTSOUNDDEVICE_TYPE_EMULATED;
- err = mmErr(waveInMessage((HWAVEIN)wid, DRV_QUERYDSOUNDIFACE, (DWORD_PTR)&drv, 0));
- if (err == DS_OK && drv)
- data.Type = DIRECTSOUNDDEVICE_TYPE_VXD;
- else
- WARN("waveInMessage(DRV_QUERYDSOUNDIFACE) failed\n");
+ devs = waveInGetNumDevs();
+ for (wid = 0; wid < devs; ++wid) {
+ err = mmErr(waveInMessage((HWAVEIN)wid,DRV_QUERYDSOUNDDESC,(DWORD_PTR)&desc,0));
+ if (err == DS_OK) {
+ DWORD size;
+ err = mmErr(waveInMessage((HWAVEIN)wid,DRV_QUERYDEVICEINTERFACESIZE,(DWORD_PTR)&size,0));
+ if (err == DS_OK) {
+ WCHAR * nameW = HeapAlloc(GetProcessHeap(),0,size);
+ if (nameW) {
+ err = mmErr(waveInMessage((HWAVEIN)wid,DRV_QUERYDEVICEINTERFACE,(DWORD_PTR)nameW,size));
+ if (err == DS_OK) {
+ CHAR * szInterface = HeapAlloc(GetProcessHeap(),0,size/sizeof(WCHAR));
+ if (szInterface) {
+ PIDSCDRIVER drv;
+ ZeroMemory(&data, sizeof(data));
+ data.DataFlow = DIRECTSOUNDDEVICE_DATAFLOW_CAPTURE;
+ data.WaveDeviceId = wid;
+ data.DeviceId = DSOUND_capture_guids[wid];
+ data.Description = desc.szDesc;
+ data.Module = desc.szDrvname;
+ WideCharToMultiByte( CP_ACP, 0, nameW, size/sizeof(WCHAR), szInterface, size/sizeof(WCHAR), NULL, NULL );
+ data.Interface = szInterface;
+
+ data.Type = DIRECTSOUNDDEVICE_TYPE_EMULATED;
+ err = mmErr(waveInMessage((HWAVEIN)wid, DRV_QUERYDSOUNDIFACE, (DWORD_PTR)&drv, 0));
+ if (err == DS_OK && drv)
+ data.Type = DIRECTSOUNDDEVICE_TYPE_VXD;
+ else
+ WARN("waveInMessage(DRV_QUERYDSOUNDIFACE) failed\n");
- TRACE("calling Callback(%p,%p)\n", &data, ppd->Context);
- (ppd->Callback)(&data, ppd->Context);
- }
- HeapFree(GetProcessHeap(),0,szInterface);
+ TRACE("calling Callback(%p,%p)\n", &data, ppd->Context);
+ (ppd->Callback)(&data, ppd->Context);
}
- }
- HeapFree(GetProcessHeap(),0,nameW);
- }
- }
- }
+ HeapFree(GetProcessHeap(),0,szInterface);
+ }
+ }
+ HeapFree(GetProcessHeap(),0,nameW);
+ }
+ }
+ }
- return S_OK;
- }
- }
- } else {
- FIXME("unsupported property: %s\n",debugstr_guid(guidPropSet));
+ return S_OK;
+ }
}
if (pcbReturned) {
- *pcbReturned = 0;
- FIXME("*pcbReturned=%ld\n", *pcbReturned);
+ *pcbReturned = 0;
+ FIXME("*pcbReturned=%ld\n", *pcbReturned);
}
return E_PROP_ID_UNSUPPORTED;
}
static HRESULT WINAPI DSPROPERTY_EnumerateW(
- REFGUID guidPropSet,
LPVOID pPropData,
ULONG cbPropData,
PULONG pcbReturned )
{
PDSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_W_DATA ppd = (PDSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_W_DATA) pPropData;
HRESULT err;
- TRACE("(guidPropSet=%s,pPropData=%p,cbPropData=%ld,pcbReturned=%p)\n",
- debugstr_guid(guidPropSet),pPropData,cbPropData,pcbReturned);
-
- if ( IsEqualGUID( &DSPROPSETID_DirectSoundDevice, guidPropSet) ) {
- if (ppd) {
- if (ppd->Callback) {
- unsigned devs, wod, wid;
- DSDRIVERDESC desc;
- DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_W_DATA data;
-
- devs = waveOutGetNumDevs();
- for (wod = 0; wod < devs; ++wod) {
- err = mmErr(waveOutMessage((HWAVEOUT)wod,DRV_QUERYDSOUNDDESC,(DWORD_PTR)&desc,0));
- if (err == DS_OK) {
- WCHAR * wDescription = HeapAlloc(GetProcessHeap(),0,0x200);
- WCHAR * wModule = HeapAlloc(GetProcessHeap(),0,0x200);
- if (wDescription && wModule) {
- DWORD size;
- err = mmErr(waveOutMessage((HWAVEOUT)wod,DRV_QUERYDEVICEINTERFACESIZE, (DWORD_PTR)&size, 0));
- if (err == DS_OK) {
- WCHAR * wInterface = HeapAlloc(GetProcessHeap(),0,size);
- if (wInterface) {
- err = mmErr(waveOutMessage((HWAVEOUT)wod, DRV_QUERYDEVICEINTERFACE, (DWORD_PTR)wInterface, size));
- if (err == DS_OK) {
- PIDSCDRIVER drv;
- ZeroMemory(&data, sizeof(data));
- data.DataFlow = DIRECTSOUNDDEVICE_DATAFLOW_RENDER;
- data.WaveDeviceId = wod;
- data.DeviceId = DSOUND_renderer_guids[wod];
-
- MultiByteToWideChar( CP_ACP, 0, desc.szDesc, -1, wDescription, 0x100 );
- MultiByteToWideChar( CP_ACP, 0, desc.szDrvname, -1, wModule, 0x100 );
-
- data.Description = wDescription;
- data.Module = wModule;
- data.Interface = wInterface;
-
- data.Type = DIRECTSOUNDDEVICE_TYPE_EMULATED;
- err = mmErr(waveOutMessage((HWAVEOUT)wod, DRV_QUERYDSOUNDIFACE, (DWORD_PTR)&drv, 0));
- if (err == DS_OK && drv)
- data.Type = DIRECTSOUNDDEVICE_TYPE_VXD;
- else
- WARN("waveOutMessage(DRV_QUERYDSOUNDIFACE) failed\n");
-
- TRACE("calling Callback(%p,%p)\n", &data, ppd->Context);
- (ppd->Callback)(&data, ppd->Context);
- }
- }
- HeapFree(GetProcessHeap(),0,wInterface);
- }
- }
- HeapFree(GetProcessHeap(),0,wDescription);
- HeapFree(GetProcessHeap(),0,wModule);
- }
- }
+ TRACE("(pPropData=%p,cbPropData=%ld,pcbReturned=%p)\n",
+ pPropData,cbPropData,pcbReturned);
- devs = waveInGetNumDevs();
- for (wid = 0; wid < devs; ++wid) {
- err = mmErr(waveInMessage((HWAVEIN)wid,DRV_QUERYDSOUNDDESC,(DWORD_PTR)&desc,0));
- if (err == DS_OK) {
- WCHAR * wDescription = HeapAlloc(GetProcessHeap(),0,0x200);
- WCHAR * wModule = HeapAlloc(GetProcessHeap(),0,0x200);
- if (wDescription && wModule) {
- DWORD size;
- err = mmErr(waveInMessage((HWAVEIN)wid,DRV_QUERYDEVICEINTERFACESIZE, (DWORD_PTR)&size, 0));
- if (err == DS_OK) {
- WCHAR * wInterface = HeapAlloc(GetProcessHeap(),0,size);
- if (wInterface) {
- err = mmErr(waveInMessage((HWAVEIN)wid, DRV_QUERYDEVICEINTERFACE, (DWORD_PTR)wInterface, size));
- if (err == DS_OK) {
- PIDSCDRIVER drv;
- ZeroMemory(&data, sizeof(data));
- data.DataFlow = DIRECTSOUNDDEVICE_DATAFLOW_CAPTURE;
- data.WaveDeviceId = wid;
- data.DeviceId = DSOUND_capture_guids[wid];
-
- MultiByteToWideChar( CP_ACP, 0, desc.szDesc, -1, wDescription, 0x100 );
- MultiByteToWideChar( CP_ACP, 0, desc.szDrvname, -1, wModule, 0x100 );
-
- data.Description = wDescription;
- data.Module = wModule;
- data.Interface = wInterface;
- data.Type = DIRECTSOUNDDEVICE_TYPE_EMULATED;
- err = mmErr(waveInMessage((HWAVEIN)wid, DRV_QUERYDSOUNDIFACE, (DWORD_PTR)&drv, 0));
- if (err == DS_OK && drv)
- data.Type = DIRECTSOUNDDEVICE_TYPE_VXD;
- else
- WARN("waveInMessage(DRV_QUERYDSOUNDIFACE) failed\n");
+ if (ppd) {
+ if (ppd->Callback) {
+ unsigned devs, wod, wid;
+ DSDRIVERDESC desc;
+ DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_W_DATA data;
+
+ devs = waveOutGetNumDevs();
+ for (wod = 0; wod < devs; ++wod) {
+ err = mmErr(waveOutMessage((HWAVEOUT)wod,DRV_QUERYDSOUNDDESC,(DWORD_PTR)&desc,0));
+ if (err == DS_OK) {
+ WCHAR * wDescription = HeapAlloc(GetProcessHeap(),0,0x200);
+ WCHAR * wModule = HeapAlloc(GetProcessHeap(),0,0x200);
+ if (wDescription && wModule) {
+ DWORD size;
+ err = mmErr(waveOutMessage((HWAVEOUT)wod,DRV_QUERYDEVICEINTERFACESIZE, (DWORD_PTR)&size, 0));
+ if (err == DS_OK) {
+ WCHAR * wInterface = HeapAlloc(GetProcessHeap(),0,size);
+ if (wInterface) {
+ err = mmErr(waveOutMessage((HWAVEOUT)wod, DRV_QUERYDEVICEINTERFACE, (DWORD_PTR)wInterface, size));
+ if (err == DS_OK) {
+ PIDSCDRIVER drv;
+ ZeroMemory(&data, sizeof(data));
+ data.DataFlow = DIRECTSOUNDDEVICE_DATAFLOW_RENDER;
+ data.WaveDeviceId = wod;
+ data.DeviceId = DSOUND_renderer_guids[wod];
+
+ MultiByteToWideChar( CP_ACP, 0, desc.szDesc, -1, wDescription, 0x100 );
+ MultiByteToWideChar( CP_ACP, 0, desc.szDrvname, -1, wModule, 0x100 );
+
+ data.Description = wDescription;
+ data.Module = wModule;
+ data.Interface = wInterface;
+
+ data.Type = DIRECTSOUNDDEVICE_TYPE_EMULATED;
+ err = mmErr(waveOutMessage((HWAVEOUT)wod, DRV_QUERYDSOUNDIFACE, (DWORD_PTR)&drv, 0));
+ if (err == DS_OK && drv)
+ data.Type = DIRECTSOUNDDEVICE_TYPE_VXD;
+ else
+ WARN("waveOutMessage(DRV_QUERYDSOUNDIFACE) failed\n");
- TRACE("calling Callback(%p,%p)\n", &data, ppd->Context);
- (ppd->Callback)(&data, ppd->Context);
+ TRACE("calling Callback(%p,%p)\n", &data, ppd->Context);
+ (ppd->Callback)(&data, ppd->Context);
}
+ }
+ HeapFree(GetProcessHeap(),0,wInterface);
+ }
+ }
+ HeapFree(GetProcessHeap(),0,wDescription);
+ HeapFree(GetProcessHeap(),0,wModule);
+ }
+ }
+
+ devs = waveInGetNumDevs();
+ for (wid = 0; wid < devs; ++wid) {
+ err = mmErr(waveInMessage((HWAVEIN)wid,DRV_QUERYDSOUNDDESC,(DWORD_PTR)&desc,0));
+ if (err == DS_OK) {
+ WCHAR * wDescription = HeapAlloc(GetProcessHeap(),0,0x200);
+ WCHAR * wModule = HeapAlloc(GetProcessHeap(),0,0x200);
+ if (wDescription && wModule) {
+ DWORD size;
+ err = mmErr(waveInMessage((HWAVEIN)wid,DRV_QUERYDEVICEINTERFACESIZE, (DWORD_PTR)&size, 0));
+ if (err == DS_OK) {
+ WCHAR * wInterface = HeapAlloc(GetProcessHeap(),0,size);
+ if (wInterface) {
+ err = mmErr(waveInMessage((HWAVEIN)wid, DRV_QUERYDEVICEINTERFACE, (DWORD_PTR)wInterface, size));
+ if (err == DS_OK) {
+ PIDSCDRIVER drv;
+ ZeroMemory(&data, sizeof(data));
+ data.DataFlow = DIRECTSOUNDDEVICE_DATAFLOW_CAPTURE;
+ data.WaveDeviceId = wid;
+ data.DeviceId = DSOUND_capture_guids[wid];
+
+ MultiByteToWideChar( CP_ACP, 0, desc.szDesc, -1, wDescription, 0x100 );
+ MultiByteToWideChar( CP_ACP, 0, desc.szDrvname, -1, wModule, 0x100 );
+
+ data.Description = wDescription;
+ data.Module = wModule;
+ data.Interface = wInterface;
+ data.Type = DIRECTSOUNDDEVICE_TYPE_EMULATED;
+ err = mmErr(waveInMessage((HWAVEIN)wid, DRV_QUERYDSOUNDIFACE, (DWORD_PTR)&drv, 0));
+ if (err == DS_OK && drv)
+ data.Type = DIRECTSOUNDDEVICE_TYPE_VXD;
+ else
+ WARN("waveInMessage(DRV_QUERYDSOUNDIFACE) failed\n");
+
+ TRACE("calling Callback(%p,%p)\n", &data, ppd->Context);
+ (ppd->Callback)(&data, ppd->Context);
}
- HeapFree(GetProcessHeap(),0,wInterface);
- }
- }
- HeapFree(GetProcessHeap(),0,wDescription);
- HeapFree(GetProcessHeap(),0,wModule);
- }
- }
+ }
+ HeapFree(GetProcessHeap(),0,wInterface);
+ }
+ }
+ HeapFree(GetProcessHeap(),0,wDescription);
+ HeapFree(GetProcessHeap(),0,wModule);
+ }
+ }
- return S_OK;
- }
- }
- } else {
- FIXME("unsupported property: %s\n",debugstr_guid(guidPropSet));
+ return S_OK;
+ }
}
if (pcbReturned) {
- *pcbReturned = 0;
- FIXME("*pcbReturned=%ld\n", *pcbReturned);
+ *pcbReturned = 0;
+ FIXME("*pcbReturned=%ld\n", *pcbReturned);
}
return E_PROP_ID_UNSUPPORTED;
@@ -1397,37 +1377,37 @@ static HRESULT WINAPI IKsPrivateProperty
{
IKsPrivatePropertySetImpl *This = (IKsPrivatePropertySetImpl *)iface;
TRACE("(iface=%p,guidPropSet=%s,dwPropID=%ld,pInstanceData=%p,cbInstanceData=%ld,pPropData=%p,cbPropData=%ld,pcbReturned=%p)\n",
- This,debugstr_guid(guidPropSet),dwPropID,pInstanceData,cbInstanceData,pPropData,cbPropData,pcbReturned);
+ This,debugstr_guid(guidPropSet),dwPropID,pInstanceData,cbInstanceData,pPropData,cbPropData,pcbReturned);
if ( IsEqualGUID( &DSPROPSETID_DirectSoundDevice, guidPropSet) ) {
- switch (dwPropID) {
- case DSPROPERTY_DIRECTSOUNDDEVICE_WAVEDEVICEMAPPING_A:
- return DSPROPERTY_WaveDeviceMappingA(guidPropSet,pPropData,cbPropData,pcbReturned);
- case DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_1:
- return DSPROPERTY_Description1(guidPropSet,pPropData,cbPropData,pcbReturned);
- case DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_1:
- return DSPROPERTY_Enumerate1(guidPropSet,pPropData,cbPropData,pcbReturned);
- case DSPROPERTY_DIRECTSOUNDDEVICE_WAVEDEVICEMAPPING_W:
- return DSPROPERTY_WaveDeviceMappingW(guidPropSet,pPropData,cbPropData,pcbReturned);
- case DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_A:
- return DSPROPERTY_DescriptionA(guidPropSet,pPropData,cbPropData,pcbReturned);
- case DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_W:
- return DSPROPERTY_DescriptionW(guidPropSet,pPropData,cbPropData,pcbReturned);
- case DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_A:
- return DSPROPERTY_EnumerateA(guidPropSet,pPropData,cbPropData,pcbReturned);
- case DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_W:
- return DSPROPERTY_EnumerateW(guidPropSet,pPropData,cbPropData,pcbReturned);
- default:
- FIXME("unsupported ID: %ld\n",dwPropID);
- break;
- }
+ switch (dwPropID) {
+ case DSPROPERTY_DIRECTSOUNDDEVICE_WAVEDEVICEMAPPING_A:
+ return DSPROPERTY_WaveDeviceMappingA(pPropData,cbPropData,pcbReturned);
+ case DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_1:
+ return DSPROPERTY_Description1(pPropData,cbPropData,pcbReturned);
+ case DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_1:
+ return DSPROPERTY_Enumerate1(pPropData,cbPropData,pcbReturned);
+ case DSPROPERTY_DIRECTSOUNDDEVICE_WAVEDEVICEMAPPING_W:
+ return DSPROPERTY_WaveDeviceMappingW(pPropData,cbPropData,pcbReturned);
+ case DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_A:
+ return DSPROPERTY_DescriptionA(pPropData,cbPropData,pcbReturned);
+ case DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_W:
+ return DSPROPERTY_DescriptionW(pPropData,cbPropData,pcbReturned);
+ case DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_A:
+ return DSPROPERTY_EnumerateA(pPropData,cbPropData,pcbReturned);
+ case DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_W:
+ return DSPROPERTY_EnumerateW(pPropData,cbPropData,pcbReturned);
+ default:
+ FIXME("unsupported ID: %ld\n",dwPropID);
+ break;
+ }
} else {
- FIXME("unsupported property: %s\n",debugstr_guid(guidPropSet));
+ FIXME("unsupported property: %s\n",debugstr_guid(guidPropSet));
}
if (pcbReturned) {
- *pcbReturned = 0;
- FIXME("*pcbReturned=%ld\n", *pcbReturned);
+ *pcbReturned = 0;
+ FIXME("*pcbReturned=%ld\n", *pcbReturned);
}
return E_PROP_ID_UNSUPPORTED;
More information about the wine-patches
mailing list