[PATCH] dmime: Call interface methods properly.
Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/dmime/audiopath.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/dmime/audiopath.c b/dlls/dmime/audiopath.c index d656058..1aad13b 100644 --- a/dlls/dmime/audiopath.c +++ b/dlls/dmime/audiopath.c @@ -114,7 +114,7 @@ static ULONG WINAPI IDirectMusicAudioPathImpl_Release (IDirectMusicAudioPath *if if (ref == 0) { if (This->pDSBuffer) - IDirectSoundBuffer8_Release(This->pDSBuffer); + IDirectSoundBuffer_Release(This->pDSBuffer); This->pPerf = NULL; HeapFree(GetProcessHeap(), 0, This); } @@ -140,7 +140,7 @@ static HRESULT WINAPI IDirectMusicAudioPathImpl_GetObjectInPath (IDirectMusicAud IsEqualIID (iidInterface, &IID_IDirectSoundBuffer) || IsEqualIID (iidInterface, &IID_IDirectSoundBuffer8) || IsEqualIID (iidInterface, &IID_IDirectSound3DBuffer)) { - return IDirectSoundBuffer8_QueryInterface (This->pDSBuffer, iidInterface, ppObject); + return IDirectSoundBuffer_QueryInterface (This->pDSBuffer, iidInterface, ppObject); } WARN("Unsupported interface %s\n", debugstr_dmguid(iidInterface)); @@ -151,7 +151,7 @@ static HRESULT WINAPI IDirectMusicAudioPathImpl_GetObjectInPath (IDirectMusicAud case DMUS_PATH_PRIMARY_BUFFER: { if (IsEqualIID (iidInterface, &IID_IDirectSound3DListener)) { - IDirectSoundBuffer8_QueryInterface (This->pPrimary, &IID_IDirectSound3DListener, ppObject); + IDirectSoundBuffer_QueryInterface (This->pPrimary, &IID_IDirectSound3DListener, ppObject); return S_OK; } else { FIXME("bad iid...\n"); -- 2.7.4
Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/dmusic/port.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dmusic/port.c b/dlls/dmusic/port.c index 5064615..7131756 100644 --- a/dlls/dmusic/port.c +++ b/dlls/dmusic/port.c @@ -510,7 +510,7 @@ static HRESULT WINAPI synth_dmport_SetDirectSound(IDirectMusicPort *iface, IDire This->parent->dsound = NULL; } if (This->dsbuffer) - IDirectSound_Release(This->dsbuffer); + IDirectSoundBuffer_Release(This->dsbuffer); This->dsound = dsound; This->dsbuffer = dsbuffer; @@ -518,7 +518,7 @@ static HRESULT WINAPI synth_dmport_SetDirectSound(IDirectMusicPort *iface, IDire if (This->dsound) IDirectSound_AddRef(This->dsound); if (This->dsbuffer) - IDirectSound_AddRef(This->dsbuffer); + IDirectSoundBuffer_AddRef(This->dsbuffer); return S_OK; } -- 2.7.4
Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> On 03/30/2018 06:04 AM, Zebediah Figura wrote:
Signed-off-by: Zebediah Figura <z.figura12 at gmail.com> --- dlls/dmusic/port.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dlls/dmusic/port.c b/dlls/dmusic/port.c index 5064615..7131756 100644 --- a/dlls/dmusic/port.c +++ b/dlls/dmusic/port.c @@ -510,7 +510,7 @@ static HRESULT WINAPI synth_dmport_SetDirectSound(IDirectMusicPort *iface, IDire This->parent->dsound = NULL; } if (This->dsbuffer) - IDirectSound_Release(This->dsbuffer); + IDirectSoundBuffer_Release(This->dsbuffer);
This->dsound = dsound; This->dsbuffer = dsbuffer; @@ -518,7 +518,7 @@ static HRESULT WINAPI synth_dmport_SetDirectSound(IDirectMusicPort *iface, IDire if (This->dsound) IDirectSound_AddRef(This->dsound); if (This->dsbuffer) - IDirectSound_AddRef(This->dsbuffer); + IDirectSoundBuffer_AddRef(This->dsbuffer);
return S_OK; }
Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/dsoundrender.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index 7902955..086352e 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -491,7 +491,7 @@ static HRESULT WINAPI DSoundRender_CompleteConnect(BaseRenderer * iface, IPin * DSBCAPS_GETCURRENTPOSITION2; buf_desc.dwBufferBytes = This->buf_size; buf_desc.lpwfxFormat = format; - hr = IDirectSound_CreateSoundBuffer(This->dsound, &buf_desc, &This->dsbuffer, NULL); + hr = IDirectSound8_CreateSoundBuffer(This->dsound, &buf_desc, &This->dsbuffer, NULL); This->writepos = This->buf_size; if (FAILED(hr)) ERR("Can't create sound buffer (%x)\n", hr); @@ -645,14 +645,14 @@ HRESULT DSoundRender_create(IUnknown * pUnkOuter, LPVOID * ppv) if (FAILED(hr)) ERR("Cannot create Direct Sound object (%x)\n", hr); else - hr = IDirectSound_SetCooperativeLevel(pDSoundRender->dsound, GetDesktopWindow(), DSSCL_PRIORITY); + hr = IDirectSound8_SetCooperativeLevel(pDSoundRender->dsound, GetDesktopWindow(), DSSCL_PRIORITY); if (SUCCEEDED(hr)) { IDirectSoundBuffer *buf; DSBUFFERDESC buf_desc; memset(&buf_desc,0,sizeof(DSBUFFERDESC)); buf_desc.dwSize = sizeof(DSBUFFERDESC); buf_desc.dwFlags = DSBCAPS_PRIMARYBUFFER; - hr = IDirectSound_CreateSoundBuffer(pDSoundRender->dsound, &buf_desc, &buf, NULL); + hr = IDirectSound8_CreateSoundBuffer(pDSoundRender->dsound, &buf_desc, &buf, NULL); if (SUCCEEDED(hr)) { IDirectSoundBuffer_Play(buf, 0, 0, DSBPLAY_LOOPING); IDirectSoundBuffer_Release(buf); @@ -736,7 +736,7 @@ static ULONG WINAPI DSoundRender_Release(IBaseFilter * iface) IDirectSoundBuffer_Release(This->dsbuffer); This->dsbuffer = NULL; if (This->dsound) - IDirectSound_Release(This->dsound); + IDirectSound8_Release(This->dsound); This->dsound = NULL; BasicAudio_Destroy(&This->basicAudio); -- 2.7.4
Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/dsound/tests/capture.c | 4 ++-- dlls/dsound/tests/ds3d.c | 30 +++++++++--------------------- dlls/dsound/tests/ds3d8.c | 11 ----------- dlls/dsound/tests/dsound.c | 4 ++-- dlls/dsound/tests/dsound8.c | 34 +++++++++++++++++----------------- dlls/dsound/tests/duplex.c | 6 +++--- 6 files changed, 33 insertions(+), 56 deletions(-) diff --git a/dlls/dsound/tests/capture.c b/dlls/dsound/tests/capture.c index 4eae28b..a23d1eb 100644 --- a/dlls/dsound/tests/capture.c +++ b/dlls/dsound/tests/capture.c @@ -114,7 +114,7 @@ static void IDirectSoundCapture_test(LPDIRECTSOUNDCAPTURE dsco, ok(rc==DS_OK, "IDirectSoundCapture_QueryInterface(IID_IUnknown) " "failed: %08x\n", rc); if (rc==DS_OK) - IDirectSoundCapture_Release(unknown); + IUnknown_Release(unknown); rc=IDirectSoundCapture_QueryInterface(dsco, &IID_IDirectSoundCapture, (LPVOID*)&dsc); @@ -162,7 +162,7 @@ static void IDirectSoundCapture_test(LPDIRECTSOUNDCAPTURE dsco, ZeroMemory(&dsccaps, sizeof(dsccaps)); /* DSOUND: Error: Invalid caps buffer */ - rc=IDirectSound_GetCaps(dsco, &dsccaps); + rc=IDirectSoundCapture_GetCaps(dsco, &dsccaps); ok(rc==DSERR_INVALIDPARAM, "IDirectSound_GetCaps() " "should have returned DSERR_INVALIDPARAM, returned: %08x\n", rc); diff --git a/dlls/dsound/tests/ds3d.c b/dlls/dsound/tests/ds3d.c index 6c12f71..d4356c2 100644 --- a/dlls/dsound/tests/ds3d.c +++ b/dlls/dsound/tests/ds3d.c @@ -535,18 +535,6 @@ void test_buffer(LPDIRECTSOUND dso, LPDIRECTSOUNDBUFFER *dsbo, ok(ref==1,"IDirectSoundBuffer_Release() has %d references, " "should have 1\n",ref); - temp_buffer=NULL; - rc=IDirectSound3DBuffer_QueryInterface(*dsbo, - &IID_IDirectSoundBuffer, - (LPVOID *)&temp_buffer); - ok(rc==DS_OK && temp_buffer!=NULL, - "IDirectSound3DBuffer_QueryInterface() failed: %08x\n", rc); - ok(temp_buffer==*dsbo,"COM interface broken: %p != %p\n", - temp_buffer,*dsbo); - ref=IDirectSoundBuffer_Release(temp_buffer); - ok(ref==1,"IDirectSoundBuffer_Release() has %d references, " - "should have 1\n",ref); - ref=IDirectSoundBuffer_Release(*dsbo); ok(ref==0,"IDirectSoundBuffer_Release() has %d references, " "should have 0\n",ref); @@ -1193,6 +1181,8 @@ static HRESULT test_primary_3d_with_listener(LPGUID lpGuid) if (rc==DS_OK && primary!=NULL) { LPDIRECTSOUND3DLISTENER listener=NULL; LPDIRECTSOUNDBUFFER temp_buffer=NULL; + IKsPropertySet *propset; + rc=IDirectSoundBuffer_QueryInterface(primary, &IID_IDirectSound3DListener,(void **)&listener); ok(rc==DS_OK && listener!=NULL,"IDirectSoundBuffer_QueryInterface() " @@ -1231,11 +1221,10 @@ static HRESULT test_primary_3d_with_listener(LPGUID lpGuid) temp_buffer = NULL; rc = IDirectSound3DListener_QueryInterface(listener, &IID_IKsPropertySet, - (void **)&temp_buffer); - ok(rc==DS_OK && temp_buffer!=NULL, + (void **)&propset); + ok(rc == DS_OK && propset != NULL, "IDirectSound3DListener_QueryInterface didn't handle IKsPropertySet: ret = %08x\n", rc); - if(temp_buffer) - IKsPropertySet_Release(temp_buffer); + IKsPropertySet_Release(propset); } /* Testing the reference counting */ @@ -1244,12 +1233,11 @@ static HRESULT test_primary_3d_with_listener(LPGUID lpGuid) "references, should have 0\n",ref); } - temp_buffer = NULL; - rc = IDirectSoundBuffer_QueryInterface(primary, &IID_IKsPropertySet, (void **)&temp_buffer); - ok(rc==DS_OK && temp_buffer!=NULL, + propset = NULL; + rc = IDirectSoundBuffer_QueryInterface(primary, &IID_IKsPropertySet, (void **)&propset); + ok(rc == DS_OK && propset != NULL, "IDirectSoundBuffer_QueryInterface didn't handle IKsPropertySet on primary buffer: ret = %08x\n", rc); - if(temp_buffer) - IKsPropertySet_Release(temp_buffer); + IKsPropertySet_Release(propset); /* Testing the reference counting */ ref=IDirectSoundBuffer_Release(primary); diff --git a/dlls/dsound/tests/ds3d8.c b/dlls/dsound/tests/ds3d8.c index 25eb010..00340af 100644 --- a/dlls/dsound/tests/ds3d8.c +++ b/dlls/dsound/tests/ds3d8.c @@ -371,17 +371,6 @@ void test_buffer8(LPDIRECTSOUND8 dso, LPDIRECTSOUNDBUFFER * dsbo, ok(ref==1,"IDirectSoundBuffer_Release() has %d references, " "should have 1\n",ref); - temp_buffer=NULL; - rc=IDirectSound3DBuffer_QueryInterface(*dsbo, &IID_IDirectSoundBuffer, - (LPVOID *)&temp_buffer); - ok(rc==DS_OK && temp_buffer!=NULL, - "IDirectSound3DBuffer_QueryInterface() failed: %08x\n", rc); - ok(temp_buffer==*dsbo,"COM interface broken: %p != %p\n", - temp_buffer,*dsbo); - ref=IDirectSoundBuffer_Release(temp_buffer); - ok(ref==1,"IDirectSoundBuffer_Release() has %d references, " - "should have 1\n",ref); - ref=IDirectSoundBuffer_Release(*dsbo); ok(ref==0,"IDirectSoundBuffer_Release() has %d references, " "should have 0\n",ref); diff --git a/dlls/dsound/tests/dsound.c b/dlls/dsound/tests/dsound.c index 1ccb8f9..f4366e1 100644 --- a/dlls/dsound/tests/dsound.c +++ b/dlls/dsound/tests/dsound.c @@ -61,7 +61,7 @@ static void IDirectSound_test(LPDIRECTSOUND dso, BOOL initialized, rc=IDirectSound_QueryInterface(dso,&IID_IUnknown,(LPVOID*)&unknown); ok(rc==DS_OK,"IDirectSound_QueryInterface(IID_IUnknown) failed: %08x\n", rc); if (rc==DS_OK) - IDirectSound_Release(unknown); + IUnknown_Release(unknown); rc=IDirectSound_QueryInterface(dso,&IID_IDirectSound,(LPVOID*)&ds); ok(rc==DS_OK,"IDirectSound_QueryInterface(IID_IDirectSound) failed: %08x\n", rc); @@ -337,7 +337,7 @@ static HRESULT test_dsound(LPGUID lpGuid) "buffer %08x\n",rc); if (rc==DS_OK && secondary!=NULL) { LPDIRECTSOUND3DBUFFER buffer3d; - rc=IDirectSound_QueryInterface(secondary, &IID_IDirectSound3DBuffer, + rc = IDirectSoundBuffer_QueryInterface(secondary, &IID_IDirectSound3DBuffer, (void **)&buffer3d); ok(rc==DS_OK && buffer3d!=NULL,"IDirectSound_QueryInterface() " "failed: %08x\n",rc); diff --git a/dlls/dsound/tests/dsound8.c b/dlls/dsound/tests/dsound8.c index 53b3d47..a6e3f12 100644 --- a/dlls/dsound/tests/dsound8.c +++ b/dlls/dsound/tests/dsound8.c @@ -72,7 +72,7 @@ static void IDirectSound8_test(LPDIRECTSOUND8 dso, BOOL initialized, rc=IDirectSound8_QueryInterface(dso,&IID_IUnknown,(LPVOID*)&unknown); ok(rc==DS_OK,"IDirectSound8_QueryInterface(IID_IUnknown) failed: %08x\n", rc); if (rc==DS_OK) - IDirectSound8_Release(unknown); + IUnknown_Release(unknown); rc=IDirectSound8_QueryInterface(dso,&IID_IDirectSound,(LPVOID*)&ds); ok(rc==DS_OK,"IDirectSound8_QueryInterface(IID_IDirectSound) failed: %08x\n", rc); @@ -353,7 +353,7 @@ static HRESULT test_dsound8(LPGUID lpGuid) if (rc==DS_OK && secondary!=NULL) { LPDIRECTSOUND3DBUFFER buffer3d; LPDIRECTSOUNDBUFFER8 buffer8; - rc=IDirectSound8_QueryInterface(secondary, + rc=IDirectSoundBuffer_QueryInterface(secondary, &IID_IDirectSound3DBuffer, (void **)&buffer3d); ok(rc==DS_OK && buffer3d!=NULL, @@ -363,7 +363,7 @@ static HRESULT test_dsound8(LPGUID lpGuid) ok(ref==2,"IDirectSound3DBuffer_AddRef() has %d references, " "should have 2\n",ref); } - rc=IDirectSound8_QueryInterface(secondary, + rc=IDirectSoundBuffer_QueryInterface(secondary, &IID_IDirectSoundBuffer8, (void **)&buffer8); if (rc==DS_OK && buffer8!=NULL) { @@ -645,7 +645,7 @@ static HRESULT test_primary_secondary8(LPGUID lpGuid) wfx.nSamplesPerSec,wfx.wBitsPerSample,wfx.nChannels,format_tags[tag], wfx2.nSamplesPerSec,wfx2.wBitsPerSample,wfx2.nChannels); } - rc=IDirectSound_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); + rc=IDirectSound8_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); ok(rc==DS_OK && secondary!=NULL, "IDirectSound_CreateSoundBuffer() failed to create a secondary " "buffer %08x\n",rc); @@ -756,7 +756,7 @@ static HRESULT test_secondary8(LPGUID lpGuid) bufdesc.dwBufferBytes=align(wfx.nAvgBytesPerSec*BUFFER_LEN/1000, wfx.nBlockAlign); bufdesc.lpwfxFormat=&wfx; - rc=IDirectSound_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); + rc=IDirectSound8_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); if (wfx.wBitsPerSample != 8 && wfx.wBitsPerSample != 16) ok(((rc == DSERR_CONTROLUNAVAIL || rc == DSERR_INVALIDCALL || rc == DSERR_INVALIDPARAM /* 2003 */) && !secondary) || rc == DS_OK, /* driver dependent? */ @@ -779,7 +779,7 @@ static HRESULT test_secondary8(LPGUID lpGuid) wfxe.Samples.wValidBitsPerSample = wfx.wBitsPerSample; wfxe.dwChannelMask = (wfx.nChannels == 1 ? KSAUDIO_SPEAKER_MONO : KSAUDIO_SPEAKER_STEREO); - rc=IDirectSound_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); + rc=IDirectSound8_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); ok(rc==DSERR_INVALIDPARAM && !secondary, "IDirectSound_CreateSoundBuffer() returned: %08x %p\n", rc, secondary); @@ -791,7 +791,7 @@ static HRESULT test_secondary8(LPGUID lpGuid) wfxe.Format.cbSize = sizeof(wfxe) - sizeof(wfx) + 1; - rc=IDirectSound_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); + rc=IDirectSound8_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); ok(((rc==DSERR_CONTROLUNAVAIL || rc==DSERR_INVALIDCALL /* 2003 */ || rc==DSERR_INVALIDPARAM) && !secondary) || rc==DS_OK /* driver dependent? */, "IDirectSound_CreateSoundBuffer() returned: %08x %p\n", @@ -804,7 +804,7 @@ static HRESULT test_secondary8(LPGUID lpGuid) wfxe.Format.cbSize = sizeof(wfxe) - sizeof(wfx); wfxe.SubFormat = GUID_NULL; - rc=IDirectSound_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); + rc=IDirectSound8_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); ok((rc==DSERR_INVALIDPARAM || rc==DSERR_INVALIDCALL) && !secondary, "IDirectSound_CreateSoundBuffer() returned: %08x %p\n", rc, secondary); @@ -815,7 +815,7 @@ static HRESULT test_secondary8(LPGUID lpGuid) } wfxe.Format.cbSize = sizeof(wfxe); - rc=IDirectSound_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); + rc=IDirectSound8_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); ok((rc==DSERR_CONTROLUNAVAIL || rc==DSERR_INVALIDCALL || rc==DSERR_INVALIDPARAM) && !secondary, "IDirectSound_CreateSoundBuffer() returned: %08x %p\n", rc, secondary); @@ -826,7 +826,7 @@ static HRESULT test_secondary8(LPGUID lpGuid) } wfxe.SubFormat = (format_tags[tag] == WAVE_FORMAT_PCM ? KSDATAFORMAT_SUBTYPE_PCM : KSDATAFORMAT_SUBTYPE_IEEE_FLOAT); - rc=IDirectSound_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); + rc=IDirectSound8_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); ok(rc==DS_OK && secondary, "IDirectSound_CreateSoundBuffer() returned: %08x %p\n", rc, secondary); @@ -837,7 +837,7 @@ static HRESULT test_secondary8(LPGUID lpGuid) } wfxe.Format.cbSize = sizeof(wfxe) + 1; - rc=IDirectSound_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); + rc=IDirectSound8_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); ok(((rc==DSERR_CONTROLUNAVAIL || rc==DSERR_INVALIDCALL /* 2003 */ || rc==DSERR_INVALIDPARAM) && !secondary) || rc==DS_OK /* driver dependent? */, "IDirectSound_CreateSoundBuffer() returned: %08x %p\n", @@ -850,7 +850,7 @@ static HRESULT test_secondary8(LPGUID lpGuid) wfxe.Format.cbSize = sizeof(wfxe) - sizeof(wfx); ++wfxe.Samples.wValidBitsPerSample; - rc=IDirectSound_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); + rc=IDirectSound8_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); ok(rc==DSERR_INVALIDPARAM && !secondary, "IDirectSound_CreateSoundBuffer() returned: %08x %p\n", rc, secondary); @@ -862,7 +862,7 @@ static HRESULT test_secondary8(LPGUID lpGuid) --wfxe.Samples.wValidBitsPerSample; wfxe.Samples.wValidBitsPerSample = 0; - rc=IDirectSound_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); + rc=IDirectSound8_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); ok(rc==DS_OK && secondary, "IDirectSound_CreateSoundBuffer() returned: %08x %p\n", rc, secondary); @@ -873,7 +873,7 @@ static HRESULT test_secondary8(LPGUID lpGuid) } wfxe.Samples.wValidBitsPerSample = wfxe.Format.wBitsPerSample; - rc=IDirectSound_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); + rc=IDirectSound8_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); ok(rc==DS_OK && secondary!=NULL, "IDirectSound_CreateSoundBuffer() failed to create a secondary " "buffer %08x\n",rc); @@ -1162,7 +1162,7 @@ static void test_COM(void) ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %08x\n", hr); refcount = IUnknown_AddRef(unk); ok(refcount == 2, "refcount == %u, expected 2\n", refcount); - hr = IDirectSound_QueryInterface(ds8, &IID_IUnknown, (void**)&unk8); + hr = IDirectSound8_QueryInterface(ds8, &IID_IUnknown, (void**)&unk8); ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %08x\n", hr); refcount = IUnknown_AddRef(unk8); ok(refcount == 4, "refcount == %u, expected 4\n", refcount); @@ -1194,7 +1194,7 @@ static void test_effects(void) rc=IDirectSound8_SetCooperativeLevel(dso,get_hwnd(),DSSCL_PRIORITY); ok(rc==DS_OK,"IDirectSound8_SetCooperativeLevel() failed: %08x\n", rc); if (rc!=DS_OK) { - IDirectSound_Release(dso); + IDirectSound8_Release(dso); return; } @@ -1372,7 +1372,7 @@ static void test_effects(void) IDirectSoundBuffer_Release(primary); } - while (IDirectSound_Release(dso)); + while (IDirectSound8_Release(dso)); } START_TEST(dsound8) diff --git a/dlls/dsound/tests/duplex.c b/dlls/dsound/tests/duplex.c index ecdebdc..b770515 100644 --- a/dlls/dsound/tests/duplex.c +++ b/dlls/dsound/tests/duplex.c @@ -49,7 +49,7 @@ static void IDirectSoundFullDuplex_test(LPDIRECTSOUNDFULLDUPLEX dsfdo, rc=IDirectSoundFullDuplex_QueryInterface(dsfdo,&IID_IUnknown,(LPVOID*)&unknown); ok(rc==DS_OK,"IDirectSoundFullDuplex_QueryInterface(IID_IUnknown) failed: %08x\n", rc); if (rc==DS_OK) { - ref=IDirectSoundFullDuplex_Release(unknown); + ref = IUnknown_Release(unknown); ok(ref==0, "IDirectSoundFullDuplex_Release() has %d references, " "should have 0\n", ref); } @@ -94,7 +94,7 @@ static void IDirectSoundFullDuplex_test(LPDIRECTSOUNDFULLDUPLEX dsfdo, "failed: %08x\n",rc); if (rc==DS_OK) { ok(dsfdo==dsfd, "different interfaces\n"); - ref=IDirectSound8_Release(dsfd); + ref=IDirectSoundFullDuplex_Release(dsfd); ok(ref==1, "IDirectSoundFullDuplex_Release() has %d references, should have 1\n", ref); } @@ -319,7 +319,7 @@ static void test_COM(void) ok(refcount == 2, "refcount == %u, expected 2\n", refcount); refcount = IDirectSoundFullDuplex_AddRef(dsfd); ok(refcount == 4, "refcount == %u, expected 4\n", refcount); - hr = IDirectSoundCapture_QueryInterface(ds8, &IID_IUnknown, (void**)&unk8); + hr = IDirectSound8_QueryInterface(ds8, &IID_IUnknown, (void**)&unk8); ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %08x\n", hr); ok(unk == unk8, "Got different IUnknown when QI'ing IDirectSoundFullDuplex and IDirectSoundCapture\n"); -- 2.7.4
Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=37273 Your paranoid android. === build (build) === Make failed
Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/dsound/buffer.c | 2 +- dlls/dsound/capture.c | 4 ++-- dlls/dsound/duplex.c | 2 +- dlls/dsound/primary.c | 2 +- dlls/dsound/sound3d.c | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c index e85a5d1..1cdc388 100644 --- a/dlls/dsound/buffer.c +++ b/dlls/dsound/buffer.c @@ -1229,7 +1229,7 @@ static HRESULT WINAPI IKsPropertySetImpl_QueryInterface(IKsPropertySet *iface, R TRACE("(%p,%s,%p)\n",This,debugstr_guid(riid),ppobj); - return IDirectSoundBuffer_QueryInterface(&This->IDirectSoundBuffer8_iface, riid, ppobj); + return IDirectSoundBuffer8_QueryInterface(&This->IDirectSoundBuffer8_iface, riid, ppobj); } static ULONG WINAPI IKsPropertySetImpl_AddRef(IKsPropertySet *iface) diff --git a/dlls/dsound/capture.c b/dlls/dsound/capture.c index 30870ae..fcc363d 100644 --- a/dlls/dsound/capture.c +++ b/dlls/dsound/capture.c @@ -129,7 +129,7 @@ static HRESULT WINAPI IDirectSoundNotifyImpl_QueryInterface(IDirectSoundNotify * TRACE("(%p,%s,%p)\n", This, debugstr_guid(riid), ppobj); - return IDirectSoundCaptureBuffer_QueryInterface(&This->IDirectSoundCaptureBuffer8_iface, riid, ppobj); + return IDirectSoundCaptureBuffer8_QueryInterface(&This->IDirectSoundCaptureBuffer8_iface, riid, ppobj); } static ULONG WINAPI IDirectSoundNotifyImpl_AddRef(IDirectSoundNotify *iface) @@ -811,7 +811,7 @@ static HRESULT IDirectSoundCaptureBufferImpl_Create( This->thread = CreateThread(NULL, 0, DSOUND_capture_thread, This, 0, NULL); } - IDirectSoundCaptureBuffer_AddRef(&This->IDirectSoundCaptureBuffer8_iface); + IDirectSoundCaptureBuffer8_AddRef(&This->IDirectSoundCaptureBuffer8_iface); *ppobj = This; TRACE("returning DS_OK\n"); diff --git a/dlls/dsound/duplex.c b/dlls/dsound/duplex.c index 153c7b6..4a88dd8 100644 --- a/dlls/dsound/duplex.c +++ b/dlls/dsound/duplex.c @@ -202,7 +202,7 @@ static HRESULT WINAPI IDirectSoundFullDuplexImpl_Initialize(IDirectSoundFullDupl TRUE); if (SUCCEEDED(hr)) { IUnknown_QueryInterface(This->ds8_unk, &IID_IDirectSound8, (void**)&ds8); - hr = IDirectSound_Initialize(ds8, render_dev); + hr = IDirectSound8_Initialize(ds8, render_dev); } if (hr != DS_OK) { WARN("Creating/initializing IDirectSound8 failed\n"); diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c index 6eb5a98..887ee73 100644 --- a/dlls/dsound/primary.c +++ b/dlls/dsound/primary.c @@ -1208,7 +1208,7 @@ HRESULT primarybuffer_create(DirectSoundDevice *device, IDirectSoundBufferImpl * device->pwfx->nBlockAlign, device->pwfx->wBitsPerSample, device->pwfx->cbSize); - IDirectSoundBuffer_AddRef(&dsb->IDirectSoundBuffer8_iface); + IDirectSoundBuffer8_AddRef(&dsb->IDirectSoundBuffer8_iface); *ppdsb = dsb; return S_OK; } diff --git a/dlls/dsound/sound3d.c b/dlls/dsound/sound3d.c index a3a5b41..03fd3d4 100644 --- a/dlls/dsound/sound3d.c +++ b/dlls/dsound/sound3d.c @@ -730,7 +730,7 @@ static HRESULT WINAPI IDirectSound3DListenerImpl_QueryInterface(IDirectSound3DLi TRACE("(%p,%s,%p)\n", iface, debugstr_guid(riid), ppobj); - return IDirectSoundBuffer_QueryInterface(&This->IDirectSoundBuffer8_iface, riid, ppobj); + return IDirectSoundBuffer8_QueryInterface(&This->IDirectSoundBuffer8_iface, riid, ppobj); } static ULONG WINAPI IDirectSound3DListenerImpl_AddRef(IDirectSound3DListener *iface) -- 2.7.4
Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> On Thu, Mar 29, 2018 at 11:04:48PM -0500, Zebediah Figura wrote:
Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/dsound/buffer.c | 2 +- dlls/dsound/capture.c | 4 ++-- dlls/dsound/duplex.c | 2 +- dlls/dsound/primary.c | 2 +- dlls/dsound/sound3d.c | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c index e85a5d1..1cdc388 100644 --- a/dlls/dsound/buffer.c +++ b/dlls/dsound/buffer.c @@ -1229,7 +1229,7 @@ static HRESULT WINAPI IKsPropertySetImpl_QueryInterface(IKsPropertySet *iface, R
TRACE("(%p,%s,%p)\n",This,debugstr_guid(riid),ppobj);
- return IDirectSoundBuffer_QueryInterface(&This->IDirectSoundBuffer8_iface, riid, ppobj); + return IDirectSoundBuffer8_QueryInterface(&This->IDirectSoundBuffer8_iface, riid, ppobj); }
static ULONG WINAPI IKsPropertySetImpl_AddRef(IKsPropertySet *iface) diff --git a/dlls/dsound/capture.c b/dlls/dsound/capture.c index 30870ae..fcc363d 100644 --- a/dlls/dsound/capture.c +++ b/dlls/dsound/capture.c @@ -129,7 +129,7 @@ static HRESULT WINAPI IDirectSoundNotifyImpl_QueryInterface(IDirectSoundNotify *
TRACE("(%p,%s,%p)\n", This, debugstr_guid(riid), ppobj);
- return IDirectSoundCaptureBuffer_QueryInterface(&This->IDirectSoundCaptureBuffer8_iface, riid, ppobj); + return IDirectSoundCaptureBuffer8_QueryInterface(&This->IDirectSoundCaptureBuffer8_iface, riid, ppobj); }
static ULONG WINAPI IDirectSoundNotifyImpl_AddRef(IDirectSoundNotify *iface) @@ -811,7 +811,7 @@ static HRESULT IDirectSoundCaptureBufferImpl_Create( This->thread = CreateThread(NULL, 0, DSOUND_capture_thread, This, 0, NULL); }
- IDirectSoundCaptureBuffer_AddRef(&This->IDirectSoundCaptureBuffer8_iface); + IDirectSoundCaptureBuffer8_AddRef(&This->IDirectSoundCaptureBuffer8_iface); *ppobj = This;
TRACE("returning DS_OK\n"); diff --git a/dlls/dsound/duplex.c b/dlls/dsound/duplex.c index 153c7b6..4a88dd8 100644 --- a/dlls/dsound/duplex.c +++ b/dlls/dsound/duplex.c @@ -202,7 +202,7 @@ static HRESULT WINAPI IDirectSoundFullDuplexImpl_Initialize(IDirectSoundFullDupl TRUE); if (SUCCEEDED(hr)) { IUnknown_QueryInterface(This->ds8_unk, &IID_IDirectSound8, (void**)&ds8); - hr = IDirectSound_Initialize(ds8, render_dev); + hr = IDirectSound8_Initialize(ds8, render_dev); } if (hr != DS_OK) { WARN("Creating/initializing IDirectSound8 failed\n"); diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c index 6eb5a98..887ee73 100644 --- a/dlls/dsound/primary.c +++ b/dlls/dsound/primary.c @@ -1208,7 +1208,7 @@ HRESULT primarybuffer_create(DirectSoundDevice *device, IDirectSoundBufferImpl * device->pwfx->nBlockAlign, device->pwfx->wBitsPerSample, device->pwfx->cbSize);
- IDirectSoundBuffer_AddRef(&dsb->IDirectSoundBuffer8_iface); + IDirectSoundBuffer8_AddRef(&dsb->IDirectSoundBuffer8_iface); *ppdsb = dsb; return S_OK; } diff --git a/dlls/dsound/sound3d.c b/dlls/dsound/sound3d.c index a3a5b41..03fd3d4 100644 --- a/dlls/dsound/sound3d.c +++ b/dlls/dsound/sound3d.c @@ -730,7 +730,7 @@ static HRESULT WINAPI IDirectSound3DListenerImpl_QueryInterface(IDirectSound3DLi
TRACE("(%p,%s,%p)\n", iface, debugstr_guid(riid), ppobj);
- return IDirectSoundBuffer_QueryInterface(&This->IDirectSoundBuffer8_iface, riid, ppobj); + return IDirectSoundBuffer8_QueryInterface(&This->IDirectSoundBuffer8_iface, riid, ppobj); }
static ULONG WINAPI IDirectSound3DListenerImpl_AddRef(IDirectSound3DListener *iface) -- 2.7.4
wine$ git am /tmp/\[PATCH\]\ dmime\:\ Call\ interface\ methods\ properly..eml Applying: dmime: Call interface methods properly. * * You have some suspicious patch lines: * * In dlls/dmime/audiopath.c * mixed SPACE and TAB indent (line 154) dlls/dmime/audiopath.c:154: IDirectSoundBuffer_QueryInterface (This->pPrimary, &IID_IDirectSound3DListener, ppObject); When you resubmit please remove also the space between function name and opening bracket. bye michael On 03/30/2018 06:04 AM, Zebediah Figura wrote:
Signed-off-by: Zebediah Figura <z.figura12 at gmail.com> --- dlls/dmime/audiopath.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/dlls/dmime/audiopath.c b/dlls/dmime/audiopath.c index d656058..1aad13b 100644 --- a/dlls/dmime/audiopath.c +++ b/dlls/dmime/audiopath.c @@ -114,7 +114,7 @@ static ULONG WINAPI IDirectMusicAudioPathImpl_Release (IDirectMusicAudioPath *if
if (ref == 0) { if (This->pDSBuffer) - IDirectSoundBuffer8_Release(This->pDSBuffer); + IDirectSoundBuffer_Release(This->pDSBuffer); This->pPerf = NULL; HeapFree(GetProcessHeap(), 0, This); } @@ -140,7 +140,7 @@ static HRESULT WINAPI IDirectMusicAudioPathImpl_GetObjectInPath (IDirectMusicAud IsEqualIID (iidInterface, &IID_IDirectSoundBuffer) || IsEqualIID (iidInterface, &IID_IDirectSoundBuffer8) || IsEqualIID (iidInterface, &IID_IDirectSound3DBuffer)) { - return IDirectSoundBuffer8_QueryInterface (This->pDSBuffer, iidInterface, ppObject); + return IDirectSoundBuffer_QueryInterface (This->pDSBuffer, iidInterface, ppObject); }
WARN("Unsupported interface %s\n", debugstr_dmguid(iidInterface)); @@ -151,7 +151,7 @@ static HRESULT WINAPI IDirectMusicAudioPathImpl_GetObjectInPath (IDirectMusicAud
case DMUS_PATH_PRIMARY_BUFFER: { if (IsEqualIID (iidInterface, &IID_IDirectSound3DListener)) { - IDirectSoundBuffer8_QueryInterface (This->pPrimary, &IID_IDirectSound3DListener, ppObject); + IDirectSoundBuffer_QueryInterface (This->pPrimary, &IID_IDirectSound3DListener, ppObject); return S_OK; } else { FIXME("bad iid...\n");
participants (4)
-
Andrew Eikum -
Marvin -
Michael Stefaniuc -
Zebediah Figura