Skip to content

W
wine-cw
Commit 86bc819f authored by Eric Pouech's avatar Eric Pouech Committed by Alexandre Julliard
Browse files
Options

dsound: Enable compilation with long types.

Signed-off-by: 's avatarEric Pouech <eric.pouech@gmail.com> Signed-off-by: 's avatarAndrew Eikum <aeikum@codeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent c9bff72b
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 76 additions and 77 deletions
dlls/dsound/Makefile.in
View file @ 86bc819f
EXTRADEFS = -DWINE_NO_LONG_TYPES
MODULE = dsound.dll MODULE = dsound.dll
IMPORTLIB = dsound IMPORTLIB = dsound
IMPORTS = dxguid uuid winmm ole32 advapi32 user32 IMPORTS = dxguid uuid winmm ole32 advapi32 user32
......
dlls/dsound/dsound.c
View file @ 86bc819f
...@@ -60,7 +60,7 @@ static const char * dumpCooperativeLevel(DWORD level) ...@@ -60,7 +60,7 @@ static const char * dumpCooperativeLevel(DWORD level)
LE(DSSCL_WRITEPRIMARY); LE(DSSCL_WRITEPRIMARY);
} }
#undef LE #undef LE
return wine_dbg_sprintf("Unknown(%08x)", level); return wine_dbg_sprintf("Unknown(%08lx)", level);
} }
static void _dump_DSCAPS(DWORD xmask) { static void _dump_DSCAPS(DWORD xmask) {
...@@ -190,7 +190,7 @@ static HRESULT DirectSoundDevice_Create(DirectSoundDevice ** ppDevice) ...@@ -190,7 +190,7 @@ static HRESULT DirectSoundDevice_Create(DirectSoundDevice ** ppDevice)
static ULONG DirectSoundDevice_AddRef(DirectSoundDevice * device) static ULONG DirectSoundDevice_AddRef(DirectSoundDevice * device)
{ {
ULONG ref = InterlockedIncrement(&(device->ref)); ULONG ref = InterlockedIncrement(&(device->ref));
TRACE("(%p) ref %d\n", device, ref); TRACE("(%p) ref %ld\n", device, ref);
return ref; return ref;
} }
...@@ -198,7 +198,7 @@ static ULONG DirectSoundDevice_Release(DirectSoundDevice * device) ...@@ -198,7 +198,7 @@ static ULONG DirectSoundDevice_Release(DirectSoundDevice * device)
{ {
HRESULT hr; HRESULT hr;
ULONG ref = InterlockedDecrement(&(device->ref)); ULONG ref = InterlockedDecrement(&(device->ref));
TRACE("(%p) ref %d\n", device, ref); TRACE("(%p) ref %ld\n", device, ref);
if (!ref) { if (!ref) {
int i; int i;
...@@ -328,7 +328,7 @@ static HRESULT DirectSoundDevice_Initialize(DirectSoundDevice ** ppDevice, LPCGU ...@@ -328,7 +328,7 @@ static HRESULT DirectSoundDevice_Initialize(DirectSoundDevice ** ppDevice, LPCGU
HeapFree(GetProcessHeap(), 0, device); HeapFree(GetProcessHeap(), 0, device);
LeaveCriticalSection(&DSOUND_renderers_lock); LeaveCriticalSection(&DSOUND_renderers_lock);
IMMDevice_Release(mmdevice); IMMDevice_Release(mmdevice);
WARN("DSOUND_ReopenDevice failed: %08x\n", hr); WARN("DSOUND_ReopenDevice failed: %08lx\n", hr);
return hr; return hr;
} }
...@@ -426,11 +426,11 @@ static HRESULT DirectSoundDevice_CreateSoundBuffer( ...@@ -426,11 +426,11 @@ static HRESULT DirectSoundDevice_CreateSoundBuffer(
*ppdsb = NULL; *ppdsb = NULL;
if (TRACE_ON(dsound)) { if (TRACE_ON(dsound)) {
TRACE("(structsize=%d)\n",dsbd->dwSize); TRACE("(structsize=%ld)\n",dsbd->dwSize);
TRACE("(flags=0x%08x:\n",dsbd->dwFlags); TRACE("(flags=0x%08lx:\n",dsbd->dwFlags);
_dump_DSBCAPS(dsbd->dwFlags); _dump_DSBCAPS(dsbd->dwFlags);
TRACE(")\n"); TRACE(")\n");
TRACE("(bufferbytes=%d)\n",dsbd->dwBufferBytes); TRACE("(bufferbytes=%ld)\n",dsbd->dwBufferBytes);
TRACE("(lpwfxFormat=%p)\n",dsbd->lpwfxFormat); TRACE("(lpwfxFormat=%p)\n",dsbd->lpwfxFormat);
} }
...@@ -526,8 +526,8 @@ static HRESULT DirectSoundDevice_CreateSoundBuffer( ...@@ -526,8 +526,8 @@ static HRESULT DirectSoundDevice_CreateSoundBuffer(
} }
} }
TRACE("(formattag=0x%04x,chans=%d,samplerate=%d," TRACE("(formattag=0x%04x,chans=%d,samplerate=%ld,"
"bytespersec=%d,blockalign=%d,bitspersamp=%d,cbSize=%d)\n", "bytespersec=%ld,blockalign=%d,bitspersamp=%d,cbSize=%d)\n",
dsbd->lpwfxFormat->wFormatTag, dsbd->lpwfxFormat->nChannels, dsbd->lpwfxFormat->wFormatTag, dsbd->lpwfxFormat->nChannels,
dsbd->lpwfxFormat->nSamplesPerSec, dsbd->lpwfxFormat->nSamplesPerSec,
dsbd->lpwfxFormat->nAvgBytesPerSec, dsbd->lpwfxFormat->nAvgBytesPerSec,
...@@ -710,7 +710,7 @@ static ULONG WINAPI IUnknownImpl_AddRef(IUnknown *iface) ...@@ -710,7 +710,7 @@ static ULONG WINAPI IUnknownImpl_AddRef(IUnknown *iface)
IDirectSoundImpl *This = impl_from_IUnknown(iface); IDirectSoundImpl *This = impl_from_IUnknown(iface);
ULONG ref = InterlockedIncrement(&This->ref); ULONG ref = InterlockedIncrement(&This->ref);
TRACE("(%p) ref=%d\n", This, ref); TRACE("(%p) ref=%ld\n", This, ref);
if(ref == 1) if(ref == 1)
InterlockedIncrement(&This->numIfaces); InterlockedIncrement(&This->numIfaces);
...@@ -723,7 +723,7 @@ static ULONG WINAPI IUnknownImpl_Release(IUnknown *iface) ...@@ -723,7 +723,7 @@ static ULONG WINAPI IUnknownImpl_Release(IUnknown *iface)
IDirectSoundImpl *This = impl_from_IUnknown(iface); IDirectSoundImpl *This = impl_from_IUnknown(iface);
ULONG ref = InterlockedDecrement(&This->ref); ULONG ref = InterlockedDecrement(&This->ref);
TRACE("(%p) ref=%d\n", This, ref); TRACE("(%p) ref=%ld\n", This, ref);
if (!ref && !InterlockedDecrement(&This->numIfaces)) if (!ref && !InterlockedDecrement(&This->numIfaces))
directsound_destroy(This); directsound_destroy(This);
...@@ -759,7 +759,7 @@ static ULONG WINAPI IDirectSound8Impl_AddRef(IDirectSound8 *iface) ...@@ -759,7 +759,7 @@ static ULONG WINAPI IDirectSound8Impl_AddRef(IDirectSound8 *iface)
IDirectSoundImpl *This = impl_from_IDirectSound8(iface); IDirectSoundImpl *This = impl_from_IDirectSound8(iface);
ULONG ref = InterlockedIncrement(&This->refds); ULONG ref = InterlockedIncrement(&This->refds);
TRACE("(%p) refds=%d\n", This, ref); TRACE("(%p) refds=%ld\n", This, ref);
if(ref == 1) if(ref == 1)
InterlockedIncrement(&This->numIfaces); InterlockedIncrement(&This->numIfaces);
...@@ -772,7 +772,7 @@ static ULONG WINAPI IDirectSound8Impl_Release(IDirectSound8 *iface) ...@@ -772,7 +772,7 @@ static ULONG WINAPI IDirectSound8Impl_Release(IDirectSound8 *iface)
IDirectSoundImpl *This = impl_from_IDirectSound8(iface); IDirectSoundImpl *This = impl_from_IDirectSound8(iface);
ULONG ref = InterlockedDecrement(&(This->refds)); ULONG ref = InterlockedDecrement(&(This->refds));
TRACE("(%p) refds=%d\n", This, ref); TRACE("(%p) refds=%ld\n", This, ref);
if (!ref && !InterlockedDecrement(&This->numIfaces)) if (!ref && !InterlockedDecrement(&This->numIfaces))
directsound_destroy(This); directsound_destroy(This);
...@@ -803,7 +803,7 @@ static HRESULT WINAPI IDirectSound8Impl_GetCaps(IDirectSound8 *iface, DSCAPS *ds ...@@ -803,7 +803,7 @@ static HRESULT WINAPI IDirectSound8Impl_GetCaps(IDirectSound8 *iface, DSCAPS *ds
return DSERR_INVALIDPARAM; return DSERR_INVALIDPARAM;
} }
if (dscaps->dwSize < sizeof(*dscaps)) { if (dscaps->dwSize < sizeof(*dscaps)) {
WARN("invalid parameter: dscaps->dwSize = %d\n", dscaps->dwSize); WARN("invalid parameter: dscaps->dwSize = %ld\n", dscaps->dwSize);
return DSERR_INVALIDPARAM; return DSERR_INVALIDPARAM;
} }
...@@ -831,7 +831,7 @@ static HRESULT WINAPI IDirectSound8Impl_GetCaps(IDirectSound8 *iface, DSCAPS *ds ...@@ -831,7 +831,7 @@ static HRESULT WINAPI IDirectSound8Impl_GetCaps(IDirectSound8 *iface, DSCAPS *ds
dscaps->dwPlayCpuOverheadSwBuffers = This->device->drvcaps.dwPlayCpuOverheadSwBuffers; dscaps->dwPlayCpuOverheadSwBuffers = This->device->drvcaps.dwPlayCpuOverheadSwBuffers;
if (TRACE_ON(dsound)) { if (TRACE_ON(dsound)) {
TRACE("(flags=0x%08x:\n", dscaps->dwFlags); TRACE("(flags=0x%08lx:\n", dscaps->dwFlags);
_dump_DSCAPS(dscaps->dwFlags); _dump_DSCAPS(dscaps->dwFlags);
TRACE(")\n"); TRACE(")\n");
} }
...@@ -919,7 +919,7 @@ static HRESULT WINAPI IDirectSound8Impl_SetSpeakerConfig(IDirectSound8 *iface, D ...@@ -919,7 +919,7 @@ static HRESULT WINAPI IDirectSound8Impl_SetSpeakerConfig(IDirectSound8 *iface, D
{ {
IDirectSoundImpl *This = impl_from_IDirectSound8(iface); IDirectSoundImpl *This = impl_from_IDirectSound8(iface);
TRACE("(%p,0x%08x)\n", This, config); TRACE("(%p,0x%08lx)\n", This, config);
if (!This->device) { if (!This->device) {
WARN("not initialized\n"); WARN("not initialized\n");
...@@ -1193,6 +1193,6 @@ void DSOUND_ParseSpeakerConfig(DirectSoundDevice *device) ...@@ -1193,6 +1193,6 @@ void DSOUND_ParseSpeakerConfig(DirectSoundDevice *device)
break; break;
default: default:
WARN("unknown speaker_config %u\n", device->speaker_config); WARN("unknown speaker_config %lu\n", device->speaker_config);
} }
} }
dlls/dsound/dsound_main.c
View file @ 86bc819f
...@@ -174,7 +174,7 @@ static HRESULT get_mmdevenum(IMMDeviceEnumerator **devenum) ...@@ -174,7 +174,7 @@ static HRESULT get_mmdevenum(IMMDeviceEnumerator **devenum)
if(SUCCEEDED(init_hr)) if(SUCCEEDED(init_hr))
CoUninitialize(); CoUninitialize();
*devenum = NULL; *devenum = NULL;
ERR("CoCreateInstance failed: %08x\n", hr); ERR("CoCreateInstance failed: %08lx\n", hr);
return hr; return hr;
} }
...@@ -197,7 +197,7 @@ static HRESULT get_mmdevice_guid(IMMDevice *device, IPropertyStore *ps, ...@@ -197,7 +197,7 @@ static HRESULT get_mmdevice_guid(IMMDevice *device, IPropertyStore *ps,
if(!ps){ if(!ps){
hr = IMMDevice_OpenPropertyStore(device, STGM_READ, &ps); hr = IMMDevice_OpenPropertyStore(device, STGM_READ, &ps);
if(FAILED(hr)){ if(FAILED(hr)){
WARN("OpenPropertyStore failed: %08x\n", hr); WARN("OpenPropertyStore failed: %08lx\n", hr);
return hr; return hr;
} }
}else }else
...@@ -208,7 +208,7 @@ static HRESULT get_mmdevice_guid(IMMDevice *device, IPropertyStore *ps, ...@@ -208,7 +208,7 @@ static HRESULT get_mmdevice_guid(IMMDevice *device, IPropertyStore *ps,
hr = IPropertyStore_GetValue(ps, &PKEY_AudioEndpoint_GUID, &pv); hr = IPropertyStore_GetValue(ps, &PKEY_AudioEndpoint_GUID, &pv);
if(FAILED(hr)){ if(FAILED(hr)){
IPropertyStore_Release(ps); IPropertyStore_Release(ps);
WARN("GetValue(GUID) failed: %08x\n", hr); WARN("GetValue(GUID) failed: %08lx\n", hr);
return hr; return hr;
} }
...@@ -276,7 +276,7 @@ HRESULT WINAPI GetDeviceID(LPCGUID pGuidSrc, LPGUID pGuidDest) ...@@ -276,7 +276,7 @@ HRESULT WINAPI GetDeviceID(LPCGUID pGuidSrc, LPGUID pGuidDest)
hr = IMMDeviceEnumerator_GetDefaultAudioEndpoint(devenum, hr = IMMDeviceEnumerator_GetDefaultAudioEndpoint(devenum,
flow, role, &device); flow, role, &device);
if(FAILED(hr)){ if(FAILED(hr)){
WARN("GetDefaultAudioEndpoint failed: %08x\n", hr); WARN("GetDefaultAudioEndpoint failed: %08lx\n", hr);
release_mmdevenum(devenum, init_hr); release_mmdevenum(devenum, init_hr);
return DSERR_NODRIVER; return DSERR_NODRIVER;
} }
...@@ -357,7 +357,7 @@ HRESULT get_mmdevice(EDataFlow flow, const GUID *tgt, IMMDevice **device) ...@@ -357,7 +357,7 @@ HRESULT get_mmdevice(EDataFlow flow, const GUID *tgt, IMMDevice **device)
hr = IMMDeviceEnumerator_EnumAudioEndpoints(devenum, flow, hr = IMMDeviceEnumerator_EnumAudioEndpoints(devenum, flow,
DEVICE_STATE_ACTIVE, &coll); DEVICE_STATE_ACTIVE, &coll);
if(FAILED(hr)){ if(FAILED(hr)){
WARN("EnumAudioEndpoints failed: %08x\n", hr); WARN("EnumAudioEndpoints failed: %08lx\n", hr);
release_mmdevenum(devenum, init_hr); release_mmdevenum(devenum, init_hr);
return hr; return hr;
} }
...@@ -366,7 +366,7 @@ HRESULT get_mmdevice(EDataFlow flow, const GUID *tgt, IMMDevice **device) ...@@ -366,7 +366,7 @@ HRESULT get_mmdevice(EDataFlow flow, const GUID *tgt, IMMDevice **device)
if(FAILED(hr)){ if(FAILED(hr)){
IMMDeviceCollection_Release(coll); IMMDeviceCollection_Release(coll);
release_mmdevenum(devenum, init_hr); release_mmdevenum(devenum, init_hr);
WARN("GetCount failed: %08x\n", hr); WARN("GetCount failed: %08lx\n", hr);
return hr; return hr;
} }
...@@ -412,7 +412,7 @@ static BOOL send_device(IMMDevice *device, GUID *guid, ...@@ -412,7 +412,7 @@ static BOOL send_device(IMMDevice *device, GUID *guid,
hr = IMMDevice_OpenPropertyStore(device, STGM_READ, &ps); hr = IMMDevice_OpenPropertyStore(device, STGM_READ, &ps);
if(FAILED(hr)){ if(FAILED(hr)){
WARN("OpenPropertyStore failed: %08x\n", hr); WARN("OpenPropertyStore failed: %08lx\n", hr);
return TRUE; return TRUE;
} }
...@@ -426,7 +426,7 @@ static BOOL send_device(IMMDevice *device, GUID *guid, ...@@ -426,7 +426,7 @@ static BOOL send_device(IMMDevice *device, GUID *guid,
(const PROPERTYKEY *)&DEVPKEY_Device_FriendlyName, &pv); (const PROPERTYKEY *)&DEVPKEY_Device_FriendlyName, &pv);
if(FAILED(hr)){ if(FAILED(hr)){
IPropertyStore_Release(ps); IPropertyStore_Release(ps);
WARN("GetValue(FriendlyName) failed: %08x\n", hr); WARN("GetValue(FriendlyName) failed: %08lx\n", hr);
return TRUE; return TRUE;
} }
...@@ -461,7 +461,7 @@ HRESULT enumerate_mmdevices(EDataFlow flow, GUID *guids, ...@@ -461,7 +461,7 @@ HRESULT enumerate_mmdevices(EDataFlow flow, GUID *guids,
DEVICE_STATE_ACTIVE, &coll); DEVICE_STATE_ACTIVE, &coll);
if(FAILED(hr)){ if(FAILED(hr)){
release_mmdevenum(devenum, init_hr); release_mmdevenum(devenum, init_hr);
WARN("EnumAudioEndpoints failed: %08x\n", hr); WARN("EnumAudioEndpoints failed: %08lx\n", hr);
return DS_OK; return DS_OK;
} }
...@@ -469,7 +469,7 @@ HRESULT enumerate_mmdevices(EDataFlow flow, GUID *guids, ...@@ -469,7 +469,7 @@ HRESULT enumerate_mmdevices(EDataFlow flow, GUID *guids,
if(FAILED(hr)){ if(FAILED(hr)){
IMMDeviceCollection_Release(coll); IMMDeviceCollection_Release(coll);
release_mmdevenum(devenum, init_hr); release_mmdevenum(devenum, init_hr);
WARN("GetCount failed: %08x\n", hr); WARN("GetCount failed: %08lx\n", hr);
return DS_OK; return DS_OK;
} }
...@@ -500,7 +500,7 @@ HRESULT enumerate_mmdevices(EDataFlow flow, GUID *guids, ...@@ -500,7 +500,7 @@ HRESULT enumerate_mmdevices(EDataFlow flow, GUID *guids,
hr = IMMDeviceCollection_Item(coll, i, &device); hr = IMMDeviceCollection_Item(coll, i, &device);
if(FAILED(hr)){ if(FAILED(hr)){
WARN("Item failed: %08x\n", hr); WARN("Item failed: %08lx\n", hr);
continue; continue;
} }
...@@ -770,7 +770,7 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) ...@@ -770,7 +770,7 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv)
*/ */
BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpvReserved) BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpvReserved)
{ {
TRACE("(%p %d %p)\n", hInstDLL, fdwReason, lpvReserved); TRACE("(%p %ld %p)\n", hInstDLL, fdwReason, lpvReserved);
switch (fdwReason) { switch (fdwReason) {
case DLL_PROCESS_ATTACH: case DLL_PROCESS_ATTACH:
......
dlls/dsound/duplex.c
View file @ 86bc819f
...@@ -107,7 +107,7 @@ static ULONG WINAPI IUnknownImpl_AddRef(IUnknown *iface) ...@@ -107,7 +107,7 @@ static ULONG WINAPI IUnknownImpl_AddRef(IUnknown *iface)
IDirectSoundFullDuplexImpl *This = impl_from_IUnknown(iface); IDirectSoundFullDuplexImpl *This = impl_from_IUnknown(iface);
ULONG ref = InterlockedIncrement(&This->ref); ULONG ref = InterlockedIncrement(&This->ref);
TRACE("(%p) ref=%d\n", This, ref); TRACE("(%p) ref=%ld\n", This, ref);
if(ref == 1) if(ref == 1)
InterlockedIncrement(&This->numIfaces); InterlockedIncrement(&This->numIfaces);
...@@ -119,7 +119,7 @@ static ULONG WINAPI IUnknownImpl_Release(IUnknown *iface) ...@@ -119,7 +119,7 @@ static ULONG WINAPI IUnknownImpl_Release(IUnknown *iface)
IDirectSoundFullDuplexImpl *This = impl_from_IUnknown(iface); IDirectSoundFullDuplexImpl *This = impl_from_IUnknown(iface);
ULONG ref = InterlockedDecrement(&This->ref); ULONG ref = InterlockedDecrement(&This->ref);
TRACE("(%p) ref=%d\n", This, ref); TRACE("(%p) ref=%ld\n", This, ref);
if (!ref && !InterlockedDecrement(&This->numIfaces)) if (!ref && !InterlockedDecrement(&This->numIfaces))
fullduplex_destroy(This); fullduplex_destroy(This);
...@@ -154,7 +154,7 @@ static ULONG WINAPI IDirectSoundFullDuplexImpl_AddRef(IDirectSoundFullDuplex *if ...@@ -154,7 +154,7 @@ static ULONG WINAPI IDirectSoundFullDuplexImpl_AddRef(IDirectSoundFullDuplex *if
IDirectSoundFullDuplexImpl *This = impl_from_IDirectSoundFullDuplex(iface); IDirectSoundFullDuplexImpl *This = impl_from_IDirectSoundFullDuplex(iface);
ULONG ref = InterlockedIncrement(&This->refdsfd); ULONG ref = InterlockedIncrement(&This->refdsfd);
TRACE("(%p) ref=%d\n", This, ref); TRACE("(%p) ref=%ld\n", This, ref);
if(ref == 1) if(ref == 1)
InterlockedIncrement(&This->numIfaces); InterlockedIncrement(&This->numIfaces);
...@@ -166,7 +166,7 @@ static ULONG WINAPI IDirectSoundFullDuplexImpl_Release(IDirectSoundFullDuplex *i ...@@ -166,7 +166,7 @@ static ULONG WINAPI IDirectSoundFullDuplexImpl_Release(IDirectSoundFullDuplex *i
IDirectSoundFullDuplexImpl *This = impl_from_IDirectSoundFullDuplex(iface); IDirectSoundFullDuplexImpl *This = impl_from_IDirectSoundFullDuplex(iface);
ULONG ref = InterlockedDecrement(&This->refdsfd); ULONG ref = InterlockedDecrement(&This->refdsfd);
TRACE("(%p) ref=%d\n", This, ref); TRACE("(%p) ref=%ld\n", This, ref);
if (!ref && !InterlockedDecrement(&This->numIfaces)) if (!ref && !InterlockedDecrement(&This->numIfaces))
fullduplex_destroy(This); fullduplex_destroy(This);
...@@ -183,7 +183,7 @@ static HRESULT WINAPI IDirectSoundFullDuplexImpl_Initialize(IDirectSoundFullDupl ...@@ -183,7 +183,7 @@ static HRESULT WINAPI IDirectSoundFullDuplexImpl_Initialize(IDirectSoundFullDupl
IDirectSoundCapture8 *dsc8 = NULL; IDirectSoundCapture8 *dsc8 = NULL;
HRESULT hr; HRESULT hr;
TRACE("(%p,%s,%s,%p,%p,%p,%x,%p,%p)\n", This, debugstr_guid(capture_dev), TRACE("(%p,%s,%s,%p,%p,%p,%lx,%p,%p)\n", This, debugstr_guid(capture_dev),
debugstr_guid(render_dev), cbufdesc, bufdesc, hwnd, level, dscb8, dsb8); debugstr_guid(render_dev), cbufdesc, bufdesc, hwnd, level, dscb8, dsb8);
if (!dscb8 || !dsb8) if (!dscb8 || !dsb8)
...@@ -330,7 +330,7 @@ HRESULT WINAPI DirectSoundFullDuplexCreate(const GUID *capture_dev, const GUID * ...@@ -330,7 +330,7 @@ HRESULT WINAPI DirectSoundFullDuplexCreate(const GUID *capture_dev, const GUID *
{ {
HRESULT hr; HRESULT hr;
TRACE("(%s,%s,%p,%p,%p,%x,%p,%p,%p,%p)\n", debugstr_guid(capture_dev), TRACE("(%s,%s,%p,%p,%p,%lx,%p,%p,%p,%p)\n", debugstr_guid(capture_dev),
debugstr_guid(render_dev), cbufdesc, bufdesc, hwnd, level, dsfd, dscb8, dsb8, debugstr_guid(render_dev), cbufdesc, bufdesc, hwnd, level, dsfd, dscb8, dsb8,
outer_unk); outer_unk);
......
dlls/dsound/mixer.c
View file @ 86bc819f
...@@ -47,7 +47,7 @@ void DSOUND_RecalcVolPan(PDSVOLUMEPAN volpan) ...@@ -47,7 +47,7 @@ void DSOUND_RecalcVolPan(PDSVOLUMEPAN volpan)
double temp; double temp;
TRACE("(%p)\n",volpan); TRACE("(%p)\n",volpan);
TRACE("Vol=%d Pan=%d\n", volpan->lVolume, volpan->lPan); TRACE("Vol=%ld Pan=%ld\n", volpan->lVolume, volpan->lPan);
/* the AmpFactors are expressed in 16.16 fixed point */ /* the AmpFactors are expressed in 16.16 fixed point */
/* FIXME: use calculated vol and pan ampfactors */ /* FIXME: use calculated vol and pan ampfactors */
...@@ -56,7 +56,7 @@ void DSOUND_RecalcVolPan(PDSVOLUMEPAN volpan) ...@@ -56,7 +56,7 @@ void DSOUND_RecalcVolPan(PDSVOLUMEPAN volpan)
temp = (double) (volpan->lVolume + (volpan->lPan < 0 ? volpan->lPan : 0)); temp = (double) (volpan->lVolume + (volpan->lPan < 0 ? volpan->lPan : 0));
volpan->dwTotalAmpFactor[1] = (ULONG) (pow(2.0, temp / 600.0) * 0xffff); volpan->dwTotalAmpFactor[1] = (ULONG) (pow(2.0, temp / 600.0) * 0xffff);
TRACE("left = %x, right = %x\n", volpan->dwTotalAmpFactor[0], volpan->dwTotalAmpFactor[1]); TRACE("left = %lx, right = %lx\n", volpan->dwTotalAmpFactor[0], volpan->dwTotalAmpFactor[1]);
} }
void DSOUND_AmpFactorToVolPan(PDSVOLUMEPAN volpan) void DSOUND_AmpFactorToVolPan(PDSVOLUMEPAN volpan)
...@@ -64,7 +64,7 @@ void DSOUND_AmpFactorToVolPan(PDSVOLUMEPAN volpan) ...@@ -64,7 +64,7 @@ void DSOUND_AmpFactorToVolPan(PDSVOLUMEPAN volpan)
double left,right; double left,right;
TRACE("(%p)\n",volpan); TRACE("(%p)\n",volpan);
TRACE("left=%x, right=%x\n",volpan->dwTotalAmpFactor[0],volpan->dwTotalAmpFactor[1]); TRACE("left=%lx, right=%lx\n",volpan->dwTotalAmpFactor[0],volpan->dwTotalAmpFactor[1]);
if (volpan->dwTotalAmpFactor[0]==0) if (volpan->dwTotalAmpFactor[0]==0)
left=-10000; left=-10000;
else else
...@@ -83,7 +83,7 @@ void DSOUND_AmpFactorToVolPan(PDSVOLUMEPAN volpan) ...@@ -83,7 +83,7 @@ void DSOUND_AmpFactorToVolPan(PDSVOLUMEPAN volpan)
if (volpan->lPan < -10000) if (volpan->lPan < -10000)
volpan->lPan=-10000; volpan->lPan=-10000;
TRACE("Vol=%d Pan=%d\n", volpan->lVolume, volpan->lPan); TRACE("Vol=%ld Pan=%ld\n", volpan->lVolume, volpan->lPan);
} }
/** /**
...@@ -142,7 +142,7 @@ void DSOUND_RecalcFormat(IDirectSoundBufferImpl *dsb) ...@@ -142,7 +142,7 @@ void DSOUND_RecalcFormat(IDirectSoundBufferImpl *dsb)
{ {
dsb->mix_channels = ichannels; dsb->mix_channels = ichannels;
if (ichannels > 32) { if (ichannels > 32) {
FIXME("Copying %u channels is unsupported, limiting to first 32\n", ichannels); FIXME("Copying %lu channels is unsupported, limiting to first 32\n", ichannels);
dsb->mix_channels = 32; dsb->mix_channels = 32;
} }
} }
...@@ -193,7 +193,7 @@ void DSOUND_RecalcFormat(IDirectSoundBufferImpl *dsb) ...@@ -193,7 +193,7 @@ void DSOUND_RecalcFormat(IDirectSoundBufferImpl *dsb)
else else
{ {
if (ichannels > 2) if (ichannels > 2)
FIXME("Conversion from %u to %u channels is not implemented, falling back to stereo\n", ichannels, ochannels); FIXME("Conversion from %lu to %lu channels is not implemented, falling back to stereo\n", ichannels, ochannels);
dsb->mix_channels = 2; dsb->mix_channels = 2;
} }
} }
...@@ -248,7 +248,7 @@ void DSOUND_CheckEvent(const IDirectSoundBufferImpl *dsb, DWORD playpos, int len ...@@ -248,7 +248,7 @@ void DSOUND_CheckEvent(const IDirectSoundBufferImpl *dsb, DWORD playpos, int len
} }
} }
TRACE("Not stopped: first notify: %u (%u), left notify: %u (%u), range: [%u,%u)\n", TRACE("Not stopped: first notify: %u (%lu), left notify: %u (%lu), range: [%lu,%lu)\n",
first, dsb->notifies[first].dwOffset, first, dsb->notifies[first].dwOffset,
left, dsb->notifies[left].dwOffset, left, dsb->notifies[left].dwOffset,
playpos, (playpos + len) % dsb->buflen); playpos, (playpos + len) % dsb->buflen);
...@@ -259,7 +259,7 @@ void DSOUND_CheckEvent(const IDirectSoundBufferImpl *dsb, DWORD playpos, int len ...@@ -259,7 +259,7 @@ void DSOUND_CheckEvent(const IDirectSoundBufferImpl *dsb, DWORD playpos, int len
if(dsb->notifies[check].dwOffset >= playpos + len) if(dsb->notifies[check].dwOffset >= playpos + len)
break; break;
TRACE("Signalling %p (%u)\n", dsb->notifies[check].hEventNotify, dsb->notifies[check].dwOffset); TRACE("Signalling %p (%lu)\n", dsb->notifies[check].hEventNotify, dsb->notifies[check].dwOffset);
SetEvent(dsb->notifies[check].hEventNotify); SetEvent(dsb->notifies[check].hEventNotify);
} }
} }
...@@ -269,7 +269,7 @@ void DSOUND_CheckEvent(const IDirectSoundBufferImpl *dsb, DWORD playpos, int len ...@@ -269,7 +269,7 @@ void DSOUND_CheckEvent(const IDirectSoundBufferImpl *dsb, DWORD playpos, int len
if(dsb->notifies[check].dwOffset >= (playpos + len) % dsb->buflen) if(dsb->notifies[check].dwOffset >= (playpos + len) % dsb->buflen)
break; break;
TRACE("Signalling %p (%u)\n", dsb->notifies[check].hEventNotify, dsb->notifies[check].dwOffset); TRACE("Signalling %p (%lu)\n", dsb->notifies[check].hEventNotify, dsb->notifies[check].dwOffset);
SetEvent(dsb->notifies[check].hEventNotify); SetEvent(dsb->notifies[check].hEventNotify);
} }
} }
...@@ -492,7 +492,7 @@ static void DSOUND_MixerVol(const IDirectSoundBufferImpl *dsb, INT frames) ...@@ -492,7 +492,7 @@ static void DSOUND_MixerVol(const IDirectSoundBufferImpl *dsb, INT frames)
UINT channels = dsb->device->pwfx->nChannels, chan; UINT channels = dsb->device->pwfx->nChannels, chan;
TRACE("(%p,%d)\n",dsb,frames); TRACE("(%p,%d)\n",dsb,frames);
TRACE("left = %x, right = %x\n", dsb->volpan.dwTotalAmpFactor[0], TRACE("left = %lx, right = %lx\n", dsb->volpan.dwTotalAmpFactor[0],
dsb->volpan.dwTotalAmpFactor[1]); dsb->volpan.dwTotalAmpFactor[1]);
if ((!(dsb->dsbd.dwFlags & DSBCAPS_CTRLPAN) || (dsb->volpan.lPan == 0)) && if ((!(dsb->dsbd.dwFlags & DSBCAPS_CTRLPAN) || (dsb->volpan.lPan == 0)) &&
...@@ -533,8 +533,8 @@ static DWORD DSOUND_MixInBuffer(IDirectSoundBufferImpl *dsb, float *mix_buffer, ...@@ -533,8 +533,8 @@ static DWORD DSOUND_MixInBuffer(IDirectSoundBufferImpl *dsb, float *mix_buffer,
float *ibuf; float *ibuf;
DWORD oldpos; DWORD oldpos;
TRACE("sec_mixpos=%d/%d\n", dsb->sec_mixpos, dsb->buflen); TRACE("sec_mixpos=%ld/%ld\n", dsb->sec_mixpos, dsb->buflen);
TRACE("(%p, frames=%d)\n",dsb,frames); TRACE("(%p, frames=%ld)\n",dsb,frames);
/* Resample buffer to temporary buffer specifically allocated for this purpose, if needed */ /* Resample buffer to temporary buffer specifically allocated for this purpose, if needed */
oldpos = dsb->sec_mixpos; oldpos = dsb->sec_mixpos;
...@@ -573,8 +573,8 @@ static DWORD DSOUND_MixOne(IDirectSoundBufferImpl *dsb, float *mix_buffer, DWORD ...@@ -573,8 +573,8 @@ static DWORD DSOUND_MixOne(IDirectSoundBufferImpl *dsb, float *mix_buffer, DWORD
{ {
DWORD primary_done = 0; DWORD primary_done = 0;
TRACE("(%p, frames=%d)\n",dsb,frames); TRACE("(%p, frames=%ld)\n",dsb,frames);
TRACE("looping=%d, leadin=%d\n", dsb->playflags, dsb->leadin); TRACE("looping=%ld, leadin=%ld\n", dsb->playflags, dsb->leadin);
/* If leading in, only mix about 20 ms, and 'skip' mixing the rest, for more fluid pointer advancement */ /* If leading in, only mix about 20 ms, and 'skip' mixing the rest, for more fluid pointer advancement */
/* FIXME: Is this needed? */ /* FIXME: Is this needed? */
...@@ -589,14 +589,14 @@ static DWORD DSOUND_MixOne(IDirectSoundBufferImpl *dsb, float *mix_buffer, DWORD ...@@ -589,14 +589,14 @@ static DWORD DSOUND_MixOne(IDirectSoundBufferImpl *dsb, float *mix_buffer, DWORD
dsb->leadin = FALSE; dsb->leadin = FALSE;
TRACE("frames (primary) = %i\n", frames); TRACE("frames (primary) = %li\n", frames);
/* First try to mix to the end of the buffer if possible /* First try to mix to the end of the buffer if possible
* Theoretically it would allow for better optimization * Theoretically it would allow for better optimization
*/ */
primary_done += DSOUND_MixInBuffer(dsb, mix_buffer, frames); primary_done += DSOUND_MixInBuffer(dsb, mix_buffer, frames);
TRACE("total mixed data=%d\n", primary_done); TRACE("total mixed data=%ld\n", primary_done);
/* Report back the total prebuffered amount for this buffer */ /* Report back the total prebuffered amount for this buffer */
return primary_done; return primary_done;
...@@ -620,14 +620,14 @@ static void DSOUND_MixToPrimary(const DirectSoundDevice *device, float *mix_buff ...@@ -620,14 +620,14 @@ static void DSOUND_MixToPrimary(const DirectSoundDevice *device, float *mix_buff
/* unless we find a running buffer, all have stopped */ /* unless we find a running buffer, all have stopped */
*all_stopped = TRUE; *all_stopped = TRUE;
TRACE("(frames %d)\n", frames); TRACE("(frames %ld)\n", frames);
for (i = 0; i < device->nrofbuffers; i++) { for (i = 0; i < device->nrofbuffers; i++) {
dsb = device->buffers[i]; dsb = device->buffers[i];
TRACE("MixToPrimary for %p, state=%d\n", dsb, dsb->state); TRACE("MixToPrimary for %p, state=%ld\n", dsb, dsb->state);
if (dsb->buflen && dsb->state) { if (dsb->buflen && dsb->state) {
TRACE("Checking %p, frames=%d\n", dsb, frames); TRACE("Checking %p, frames=%ld\n", dsb, frames);
AcquireSRWLockShared(&dsb->lock); AcquireSRWLockShared(&dsb->lock);
if (dsb->state != STATE_STOPPED) { if (dsb->state != STATE_STOPPED) {
...@@ -664,7 +664,7 @@ static void DSOUND_WaveQueue(DirectSoundDevice *device, LPBYTE pos, DWORD bytes) ...@@ -664,7 +664,7 @@ static void DSOUND_WaveQueue(DirectSoundDevice *device, LPBYTE pos, DWORD bytes)
hr = IAudioRenderClient_GetBuffer(device->render, bytes / device->pwfx->nBlockAlign, &buffer); hr = IAudioRenderClient_GetBuffer(device->render, bytes / device->pwfx->nBlockAlign, &buffer);
if(FAILED(hr)){ if(FAILED(hr)){
WARN("GetBuffer failed: %08x\n", hr); WARN("GetBuffer failed: %08lx\n", hr);
return; return;
} }
...@@ -672,7 +672,7 @@ static void DSOUND_WaveQueue(DirectSoundDevice *device, LPBYTE pos, DWORD bytes) ...@@ -672,7 +672,7 @@ static void DSOUND_WaveQueue(DirectSoundDevice *device, LPBYTE pos, DWORD bytes)
hr = IAudioRenderClient_ReleaseBuffer(device->render, bytes / device->pwfx->nBlockAlign, 0); hr = IAudioRenderClient_ReleaseBuffer(device->render, bytes / device->pwfx->nBlockAlign, 0);
if(FAILED(hr)) { if(FAILED(hr)) {
ERR("ReleaseBuffer failed: %08x\n", hr); ERR("ReleaseBuffer failed: %08lx\n", hr);
IAudioRenderClient_ReleaseBuffer(device->render, 0, 0); IAudioRenderClient_ReleaseBuffer(device->render, 0, 0);
return; return;
} }
...@@ -705,7 +705,7 @@ static void DSOUND_PerformMix(DirectSoundDevice *device) ...@@ -705,7 +705,7 @@ static void DSOUND_PerformMix(DirectSoundDevice *device)
hr = IAudioClient_GetCurrentPadding(device->client, &pad_frames); hr = IAudioClient_GetCurrentPadding(device->client, &pad_frames);
if(FAILED(hr)){ if(FAILED(hr)){
WARN("GetCurrentPadding failed: %08x\n", hr); WARN("GetCurrentPadding failed: %08lx\n", hr);
LeaveCriticalSection(&device->mixlock); LeaveCriticalSection(&device->mixlock);
return; return;
} }
...@@ -739,7 +739,7 @@ static void DSOUND_PerformMix(DirectSoundDevice *device) ...@@ -739,7 +739,7 @@ static void DSOUND_PerformMix(DirectSoundDevice *device)
hr = IAudioRenderClient_GetBuffer(device->render, frames, (BYTE **)&buffer); hr = IAudioRenderClient_GetBuffer(device->render, frames, (BYTE **)&buffer);
if(FAILED(hr)){ if(FAILED(hr)){
WARN("GetBuffer failed: %08x\n", hr); WARN("GetBuffer failed: %08lx\n", hr);
LeaveCriticalSection(&device->mixlock); LeaveCriticalSection(&device->mixlock);
return; return;
} }
...@@ -759,7 +759,7 @@ static void DSOUND_PerformMix(DirectSoundDevice *device) ...@@ -759,7 +759,7 @@ static void DSOUND_PerformMix(DirectSoundDevice *device)
hr = IAudioRenderClient_ReleaseBuffer(device->render, frames, 0); hr = IAudioRenderClient_ReleaseBuffer(device->render, frames, 0);
if(FAILED(hr)) if(FAILED(hr))
ERR("ReleaseBuffer failed: %08x\n", hr); ERR("ReleaseBuffer failed: %08lx\n", hr);
device->pad += frames * block; device->pad += frames * block;
} else if (!device->stopped) { } else if (!device->stopped) {
...@@ -793,9 +793,9 @@ DWORD CALLBACK DSOUND_mixthread(void *p) ...@@ -793,9 +793,9 @@ DWORD CALLBACK DSOUND_mixthread(void *p)
*/ */
ret = WaitForSingleObject(dev->sleepev, dev->sleeptime); ret = WaitForSingleObject(dev->sleepev, dev->sleeptime);
if (ret == WAIT_FAILED) if (ret == WAIT_FAILED)
WARN("wait returned error %u %08x!\n", GetLastError(), GetLastError()); WARN("wait returned error %lu %08lx!\n", GetLastError(), GetLastError());
else if (ret != WAIT_OBJECT_0) else if (ret != WAIT_OBJECT_0)
WARN("wait returned %08x!\n", ret); WARN("wait returned %08lx!\n", ret);
if (!dev->ref) if (!dev->ref)
break; break;
......
dlls/dsound/propset.c
View file @ 86bc819f
...@@ -80,7 +80,7 @@ static ULONG WINAPI IKsPrivatePropertySetImpl_AddRef(LPKSPROPERTYSET iface) ...@@ -80,7 +80,7 @@ static ULONG WINAPI IKsPrivatePropertySetImpl_AddRef(LPKSPROPERTYSET iface)
{ {
IKsPrivatePropertySetImpl *This = impl_from_IKsPropertySet(iface); IKsPrivatePropertySetImpl *This = impl_from_IKsPropertySet(iface);
ULONG ref = InterlockedIncrement(&(This->ref)); ULONG ref = InterlockedIncrement(&(This->ref));
TRACE("(%p) ref %d\n", This, ref); TRACE("(%p) ref %ld\n", This, ref);
return ref; return ref;
} }
...@@ -88,7 +88,7 @@ static ULONG WINAPI IKsPrivatePropertySetImpl_Release(LPKSPROPERTYSET iface) ...@@ -88,7 +88,7 @@ static ULONG WINAPI IKsPrivatePropertySetImpl_Release(LPKSPROPERTYSET iface)
{ {
IKsPrivatePropertySetImpl *This = impl_from_IKsPropertySet(iface); IKsPrivatePropertySetImpl *This = impl_from_IKsPropertySet(iface);
ULONG ref = InterlockedDecrement(&(This->ref)); ULONG ref = InterlockedDecrement(&(This->ref));
TRACE("(%p) ref %d\n", This, ref); TRACE("(%p) ref %ld\n", This, ref);
if (!ref) { if (!ref) {
HeapFree(GetProcessHeap(), 0, This); HeapFree(GetProcessHeap(), 0, This);
...@@ -124,7 +124,7 @@ static HRESULT DSPROPERTY_WaveDeviceMappingW( ...@@ -124,7 +124,7 @@ static HRESULT DSPROPERTY_WaveDeviceMappingW(
PDSPROPERTY_DIRECTSOUNDDEVICE_WAVEDEVICEMAPPING_W_DATA ppd = pPropData; PDSPROPERTY_DIRECTSOUNDDEVICE_WAVEDEVICEMAPPING_W_DATA ppd = pPropData;
struct search_data search; struct search_data search;
TRACE("(pPropData=%p,cbPropData=%d,pcbReturned=%p)\n", TRACE("(pPropData=%p,cbPropData=%ld,pcbReturned=%p)\n",
pPropData,cbPropData,pcbReturned); pPropData,cbPropData,pcbReturned);
if (!ppd) { if (!ppd) {
...@@ -164,7 +164,7 @@ static HRESULT DSPROPERTY_WaveDeviceMappingA( ...@@ -164,7 +164,7 @@ static HRESULT DSPROPERTY_WaveDeviceMappingA(
DWORD len; DWORD len;
HRESULT hr; HRESULT hr;
TRACE("(pPropData=%p,cbPropData=%d,pcbReturned=%p)\n", TRACE("(pPropData=%p,cbPropData=%ld,pcbReturned=%p)\n",
pPropData,cbPropData,pcbReturned); pPropData,cbPropData,pcbReturned);
if (!ppd || !ppd->DeviceName) { if (!ppd || !ppd->DeviceName) {
...@@ -201,7 +201,7 @@ static HRESULT DSPROPERTY_DescriptionW( ...@@ -201,7 +201,7 @@ static HRESULT DSPROPERTY_DescriptionW(
PROPVARIANT pv; PROPVARIANT pv;
HRESULT hr; HRESULT hr;
TRACE("pPropData=%p,cbPropData=%d,pcbReturned=%p)\n", TRACE("pPropData=%p,cbPropData=%ld,pcbReturned=%p)\n",
pPropData,cbPropData,pcbReturned); pPropData,cbPropData,pcbReturned);
TRACE("DeviceId=%s\n",debugstr_guid(&ppd->DeviceId)); TRACE("DeviceId=%s\n",debugstr_guid(&ppd->DeviceId));
...@@ -233,7 +233,7 @@ static HRESULT DSPROPERTY_DescriptionW( ...@@ -233,7 +233,7 @@ static HRESULT DSPROPERTY_DescriptionW(
hr = IMMDevice_OpenPropertyStore(mmdevice, STGM_READ, &ps); hr = IMMDevice_OpenPropertyStore(mmdevice, STGM_READ, &ps);
if(FAILED(hr)){ if(FAILED(hr)){
IMMDevice_Release(mmdevice); IMMDevice_Release(mmdevice);
WARN("OpenPropertyStore failed: %08x\n", hr); WARN("OpenPropertyStore failed: %08lx\n", hr);
return hr; return hr;
} }
...@@ -242,7 +242,7 @@ static HRESULT DSPROPERTY_DescriptionW( ...@@ -242,7 +242,7 @@ static HRESULT DSPROPERTY_DescriptionW(
if(FAILED(hr)){ if(FAILED(hr)){
IPropertyStore_Release(ps); IPropertyStore_Release(ps);
IMMDevice_Release(mmdevice); IMMDevice_Release(mmdevice);
WARN("GetValue(FriendlyName) failed: %08x\n", hr); WARN("GetValue(FriendlyName) failed: %08lx\n", hr);
return hr; return hr;
} }
...@@ -257,7 +257,7 @@ static HRESULT DSPROPERTY_DescriptionW( ...@@ -257,7 +257,7 @@ static HRESULT DSPROPERTY_DescriptionW(
if (pcbReturned) { if (pcbReturned) {
*pcbReturned = sizeof(*ppd); *pcbReturned = sizeof(*ppd);
TRACE("*pcbReturned=%d\n", *pcbReturned); TRACE("*pcbReturned=%ld\n", *pcbReturned);
} }
return S_OK; return S_OK;
...@@ -306,7 +306,7 @@ static HRESULT DSPROPERTY_EnumerateW( ...@@ -306,7 +306,7 @@ static HRESULT DSPROPERTY_EnumerateW(
PDSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_W_DATA ppd = pPropData; PDSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_W_DATA ppd = pPropData;
HRESULT hr; HRESULT hr;
TRACE("(pPropData=%p,cbPropData=%d,pcbReturned=%p)\n", TRACE("(pPropData=%p,cbPropData=%ld,pcbReturned=%p)\n",
pPropData,cbPropData,pcbReturned); pPropData,cbPropData,pcbReturned);
if (pcbReturned) if (pcbReturned)
...@@ -501,7 +501,7 @@ static HRESULT WINAPI IKsPrivatePropertySetImpl_Get( ...@@ -501,7 +501,7 @@ static HRESULT WINAPI IKsPrivatePropertySetImpl_Get(
PULONG pcbReturned ) PULONG pcbReturned )
{ {
IKsPrivatePropertySetImpl *This = impl_from_IKsPropertySet(iface); IKsPrivatePropertySetImpl *This = impl_from_IKsPropertySet(iface);
TRACE("(iface=%p,guidPropSet=%s,dwPropID=%d,pInstanceData=%p,cbInstanceData=%d,pPropData=%p,cbPropData=%d,pcbReturned=%p)\n", TRACE("(iface=%p,guidPropSet=%s,dwPropID=%lu,pInstanceData=%p,cbInstanceData=%lu,pPropData=%p,cbPropData=%lu,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) ) { if ( IsEqualGUID( &DSPROPSETID_DirectSoundDevice, guidPropSet) ) {
...@@ -523,7 +523,7 @@ static HRESULT WINAPI IKsPrivatePropertySetImpl_Get( ...@@ -523,7 +523,7 @@ static HRESULT WINAPI IKsPrivatePropertySetImpl_Get(
case DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_W: case DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_W:
return DSPROPERTY_EnumerateW(pPropData,cbPropData,pcbReturned); return DSPROPERTY_EnumerateW(pPropData,cbPropData,pcbReturned);
default: default:
FIXME("unsupported ID: %d\n",dwPropID); FIXME("unsupported ID: %ld\n",dwPropID);
break; break;
} }
} else { } else {
...@@ -532,7 +532,7 @@ static HRESULT WINAPI IKsPrivatePropertySetImpl_Get( ...@@ -532,7 +532,7 @@ static HRESULT WINAPI IKsPrivatePropertySetImpl_Get(
if (pcbReturned) { if (pcbReturned) {
*pcbReturned = 0; *pcbReturned = 0;
FIXME("*pcbReturned=%d\n", *pcbReturned); FIXME("*pcbReturned=%ld\n", *pcbReturned);
} }
return E_PROP_ID_UNSUPPORTED; return E_PROP_ID_UNSUPPORTED;
...@@ -549,7 +549,7 @@ static HRESULT WINAPI IKsPrivatePropertySetImpl_Set( ...@@ -549,7 +549,7 @@ static HRESULT WINAPI IKsPrivatePropertySetImpl_Set(
{ {
IKsPrivatePropertySetImpl *This = impl_from_IKsPropertySet(iface); IKsPrivatePropertySetImpl *This = impl_from_IKsPropertySet(iface);
FIXME("(%p,%s,%d,%p,%d,%p,%d), stub!\n",This,debugstr_guid(guidPropSet),dwPropID,pInstanceData,cbInstanceData,pPropData,cbPropData); FIXME("(%p,%s,%ld,%p,%ld,%p,%ld), stub!\n",This,debugstr_guid(guidPropSet),dwPropID,pInstanceData,cbInstanceData,pPropData,cbPropData);
return E_PROP_ID_UNSUPPORTED; return E_PROP_ID_UNSUPPORTED;
} }
...@@ -560,7 +560,7 @@ static HRESULT WINAPI IKsPrivatePropertySetImpl_QuerySupport( ...@@ -560,7 +560,7 @@ static HRESULT WINAPI IKsPrivatePropertySetImpl_QuerySupport(
PULONG pTypeSupport ) PULONG pTypeSupport )
{ {
IKsPrivatePropertySetImpl *This = impl_from_IKsPropertySet(iface); IKsPrivatePropertySetImpl *This = impl_from_IKsPropertySet(iface);
TRACE("(%p,%s,%d,%p)\n",This,debugstr_guid(guidPropSet),dwPropID,pTypeSupport); TRACE("(%p,%s,%ld,%p)\n",This,debugstr_guid(guidPropSet),dwPropID,pTypeSupport);
if ( IsEqualGUID( &DSPROPSETID_DirectSoundDevice, guidPropSet) ) { if ( IsEqualGUID( &DSPROPSETID_DirectSoundDevice, guidPropSet) ) {
switch (dwPropID) { switch (dwPropID) {
...@@ -589,7 +589,7 @@ static HRESULT WINAPI IKsPrivatePropertySetImpl_QuerySupport( ...@@ -589,7 +589,7 @@ static HRESULT WINAPI IKsPrivatePropertySetImpl_QuerySupport(
*pTypeSupport = KSPROPERTY_SUPPORT_GET; *pTypeSupport = KSPROPERTY_SUPPORT_GET;
return S_OK; return S_OK;
default: default:
FIXME("unsupported ID: %d\n",dwPropID); FIXME("unsupported ID: %ld\n",dwPropID);
break; break;
} }
} else { } else {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment