Move declarations to compile with older compilers.
This commit is contained in:
parent
a2f937f7f5
commit
852a37bc64
@ -514,15 +514,16 @@ static HRESULT WINAPI DSPROPERTY_EnumerateW(
|
|||||||
if (err == DS_OK) {
|
if (err == DS_OK) {
|
||||||
err = mmErr(waveOutMessage((HWAVEOUT)wod,DRV_QUERYDSOUNDGUID,(DWORD)&guid,0));
|
err = mmErr(waveOutMessage((HWAVEOUT)wod,DRV_QUERYDSOUNDGUID,(DWORD)&guid,0));
|
||||||
if (err == DS_OK) {
|
if (err == DS_OK) {
|
||||||
memset(&data, 0, sizeof(data));
|
|
||||||
data.DataFlow = DIRECTSOUNDDEVICE_DATAFLOW_RENDER;
|
|
||||||
data.WaveDeviceId = wod;
|
|
||||||
data.DeviceId = guid;
|
|
||||||
/* FIXME: this is a memory leak */
|
/* FIXME: this is a memory leak */
|
||||||
WCHAR * wDescription = HeapAlloc(GetProcessHeap(),0,0x200);
|
WCHAR * wDescription = HeapAlloc(GetProcessHeap(),0,0x200);
|
||||||
WCHAR * wModule = HeapAlloc(GetProcessHeap(),0,0x200);
|
WCHAR * wModule = HeapAlloc(GetProcessHeap(),0,0x200);
|
||||||
WCHAR * wInterface = HeapAlloc(GetProcessHeap(),0,0x200);
|
WCHAR * wInterface = HeapAlloc(GetProcessHeap(),0,0x200);
|
||||||
|
|
||||||
|
memset(&data, 0, sizeof(data));
|
||||||
|
data.DataFlow = DIRECTSOUNDDEVICE_DATAFLOW_RENDER;
|
||||||
|
data.WaveDeviceId = wod;
|
||||||
|
data.DeviceId = guid;
|
||||||
|
|
||||||
MultiByteToWideChar( CP_ACP, 0, desc.szDesc, -1, wDescription, 0x100 );
|
MultiByteToWideChar( CP_ACP, 0, desc.szDesc, -1, wDescription, 0x100 );
|
||||||
MultiByteToWideChar( CP_ACP, 0, desc.szDrvName, -1, wModule, 0x100 );
|
MultiByteToWideChar( CP_ACP, 0, desc.szDrvName, -1, wModule, 0x100 );
|
||||||
MultiByteToWideChar( CP_ACP, 0, "Interface", -1, wInterface, 0x100 );
|
MultiByteToWideChar( CP_ACP, 0, "Interface", -1, wInterface, 0x100 );
|
||||||
@ -542,15 +543,16 @@ static HRESULT WINAPI DSPROPERTY_EnumerateW(
|
|||||||
if (err == DS_OK) {
|
if (err == DS_OK) {
|
||||||
err = mmErr(waveInMessage((HWAVEIN)wid,DRV_QUERYDSOUNDGUID,(DWORD)&guid,0));
|
err = mmErr(waveInMessage((HWAVEIN)wid,DRV_QUERYDSOUNDGUID,(DWORD)&guid,0));
|
||||||
if (err == DS_OK) {
|
if (err == DS_OK) {
|
||||||
memset(&data, 0, sizeof(data));
|
|
||||||
data.DataFlow = DIRECTSOUNDDEVICE_DATAFLOW_CAPTURE;
|
|
||||||
data.WaveDeviceId = wid;
|
|
||||||
data.DeviceId = guid;
|
|
||||||
/* FIXME: this is a memory leak */
|
/* FIXME: this is a memory leak */
|
||||||
WCHAR * wDescription = HeapAlloc(GetProcessHeap(),0,0x200);
|
WCHAR * wDescription = HeapAlloc(GetProcessHeap(),0,0x200);
|
||||||
WCHAR * wModule = HeapAlloc(GetProcessHeap(),0,0x200);
|
WCHAR * wModule = HeapAlloc(GetProcessHeap(),0,0x200);
|
||||||
WCHAR * wInterface = HeapAlloc(GetProcessHeap(),0,0x200);
|
WCHAR * wInterface = HeapAlloc(GetProcessHeap(),0,0x200);
|
||||||
|
|
||||||
|
memset(&data, 0, sizeof(data));
|
||||||
|
data.DataFlow = DIRECTSOUNDDEVICE_DATAFLOW_CAPTURE;
|
||||||
|
data.WaveDeviceId = wid;
|
||||||
|
data.DeviceId = guid;
|
||||||
|
|
||||||
MultiByteToWideChar( CP_ACP, 0, desc.szDesc, -1, wDescription, 0x100 );
|
MultiByteToWideChar( CP_ACP, 0, desc.szDesc, -1, wDescription, 0x100 );
|
||||||
MultiByteToWideChar( CP_ACP, 0, desc.szDrvName, -1, wModule, 0x100 );
|
MultiByteToWideChar( CP_ACP, 0, desc.szDrvName, -1, wModule, 0x100 );
|
||||||
MultiByteToWideChar( CP_ACP, 0, "Interface", -1, wInterface, 0x100 );
|
MultiByteToWideChar( CP_ACP, 0, "Interface", -1, wInterface, 0x100 );
|
||||||
|
Loading…
x
Reference in New Issue
Block a user