August 2012 - Wine-Commits - list.winehq.org

Gustavo Henrique Milaré : po: Fix Brazilian Portuguese translation.
by Alexandre Julliard Aug. 16, 2012

Aug. 16, 2012

Module: wine Branch: master Commit: 5ec657600e14b7176c7a4220011a58b715cb9b4f URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ec657600e14b7176c7a42200… Author: Gustavo Henrique Milaré <gugamilare(a)gmail.com> Date: Thu Aug 16 00:02:59 2012 -0300 po: Fix Brazilian Portuguese translation. --- po/pt_BR.po | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/po/pt_BR.po b/po/pt_BR.po index 8644ac6..622dd8a 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2012-07-23 22:30-0300\n" +"PO-Revision-Date: 2012-08-16 00:01-0300\n" "Last-Translator: Gustavo Henrique Milaré <gugamilare(a)gmail.com>\n" "Language-Team: none\n" "Language: Portuguese (Brazil)\n" @@ -12643,23 +12643,23 @@ msgstr "Diagnósticos de driver" #: winecfg.rc:258 msgid "Defaults" -msgstr "Padrões" +msgstr "Dispositivos Padrões" #: winecfg.rc:259 msgid "Output device:" -msgstr "Dispositivo de saída:" +msgstr "Saída:" #: winecfg.rc:260 msgid "Voice output device:" -msgstr "Dispositivo de saída de voz:" +msgstr "Saída de voz:" #: winecfg.rc:261 msgid "Input device:" -msgstr "Dispositivo de entrada:" +msgstr "Entrada:" #: winecfg.rc:262 msgid "Voice input device:" -msgstr "Dispositivo de entrada de voz:" +msgstr "Entrada de voz:" #: winecfg.rc:267 msgid "&Test Sound"

1 0

Michael Stefaniuc : dsound: Move the QI implementation from IDirectSoundFullDuplex to IUnknown.
by Alexandre Julliard Aug. 16, 2012

Aug. 16, 2012

Module: wine Branch: master Commit: b522dc66f7a089de37d8ac037ad1ceb11ab15a75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b522dc66f7a089de37d8ac037… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Aug 16 01:52:16 2012 +0200 dsound: Move the QI implementation from IDirectSoundFullDuplex to IUnknown. --- dlls/dsound/duplex.c | 63 ++++++++++++++++++++++++------------------------- 1 files changed, 31 insertions(+), 32 deletions(-) diff --git a/dlls/dsound/duplex.c b/dlls/dsound/duplex.c index 5e57bbd..a2bc726 100644 --- a/dlls/dsound/duplex.c +++ b/dlls/dsound/duplex.c @@ -79,8 +79,30 @@ static inline IDirectSoundFullDuplexImpl *impl_from_IUnknown(IUnknown *iface) static HRESULT WINAPI IUnknownImpl_QueryInterface(IUnknown *iface, REFIID riid, void **ppv) { IDirectSoundFullDuplexImpl *This = impl_from_IUnknown(iface); + TRACE("(%p,%s,%p)\n", This, debugstr_guid(riid), ppv); - return IDirectSoundFullDuplex_QueryInterface(&This->IDirectSoundFullDuplex_iface, riid, ppv); + + if (!ppv) { + WARN("invalid parameter\n"); + return E_INVALIDARG; + } + + if (IsEqualIID(riid, &IID_IUnknown)) { + IUnknown_AddRef(&This->IUnknown_iface); + *ppv = &This->IUnknown_iface; + return S_OK; + } else if (IsEqualIID(riid, &IID_IDirectSoundFullDuplex)) { + IDirectSoundFullDuplex_AddRef(&This->IDirectSoundFullDuplex_iface); + *ppv = &This->IDirectSoundFullDuplex_iface; + return S_OK; + } else if (This->ds8_unk && (IsEqualIID(riid, &IID_IDirectSound) || + IsEqualIID(riid, &IID_IDirectSound8))) + return IUnknown_QueryInterface(This->ds8_unk, riid, ppv); + else if (This->dsc8_unk && IsEqualIID(riid, &IID_IDirectSoundCapture)) + return IUnknown_QueryInterface(This->dsc8_unk, riid, ppv); + + *ppv = NULL; + return E_NOINTERFACE; } static ULONG WINAPI IUnknownImpl_AddRef(IUnknown *iface) @@ -122,6 +144,14 @@ static inline IDirectSoundFullDuplexImpl *impl_from_IDirectSoundFullDuplex(IDire return CONTAINING_RECORD(iface, IDirectSoundFullDuplexImpl, IDirectSoundFullDuplex_iface); } +static HRESULT WINAPI IDirectSoundFullDuplexImpl_QueryInterface(IDirectSoundFullDuplex *iface, + REFIID riid, void **ppv) +{ + IDirectSoundFullDuplexImpl *This = impl_from_IDirectSoundFullDuplex(iface); + TRACE("(%p,%s,%p)\n", This, debugstr_guid(riid), ppv); + return IUnknown_QueryInterface(&This->IUnknown_iface, riid, ppv); +} + static ULONG WINAPI IDirectSoundFullDuplexImpl_AddRef(IDirectSoundFullDuplex *iface) { IDirectSoundFullDuplexImpl *This = impl_from_IDirectSoundFullDuplex(iface); @@ -134,37 +164,6 @@ static ULONG WINAPI IDirectSoundFullDuplexImpl_AddRef(IDirectSoundFullDuplex *if return ref; } -static HRESULT WINAPI IDirectSoundFullDuplexImpl_QueryInterface(IDirectSoundFullDuplex *iface, - REFIID riid, void **ppv) -{ - IDirectSoundFullDuplexImpl *This = impl_from_IDirectSoundFullDuplex(iface); - TRACE("(%p,%s,%p)\n", This, debugstr_guid(riid), ppv); - - if (ppv == NULL) { - WARN("invalid parameter\n"); - return E_INVALIDARG; - } - - *ppv = NULL; - - if (IsEqualIID(riid, &IID_IUnknown)) { - IUnknown_AddRef(&This->IUnknown_iface); - *ppv = &This->IUnknown_iface; - return S_OK; - } else if (IsEqualIID(riid, &IID_IDirectSoundFullDuplex)) { - IDirectSoundFullDuplexImpl_AddRef(iface); - *ppv = &This->IDirectSoundFullDuplex_iface; - return S_OK; - } else if (This->ds8_unk && (IsEqualIID(riid, &IID_IDirectSound) || - IsEqualIID(riid, &IID_IDirectSound8))) { - return IUnknown_QueryInterface(This->ds8_unk, riid, ppv); - } else if (This->dsc8_unk && IsEqualIID(riid, &IID_IDirectSoundCapture)) { - return IUnknown_QueryInterface(This->dsc8_unk, riid, ppv); - } - - return E_NOINTERFACE; -} - static ULONG WINAPI IDirectSoundFullDuplexImpl_Release(IDirectSoundFullDuplex *iface) { IDirectSoundFullDuplexImpl *This = impl_from_IDirectSoundFullDuplex(iface);

1 0

Michael Stefaniuc : dsound/tests: Refcount tests for IDirectSoundCapture / IUnknown.
by Alexandre Julliard Aug. 16, 2012

Aug. 16, 2012

Module: wine Branch: master Commit: 598cc8f44a98d3795aa8a969ad6b578279a46b49 URL: http://source.winehq.org/git/wine.git/?a=commit;h=598cc8f44a98d3795aa8a969a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Aug 16 01:22:58 2012 +0200 dsound/tests: Refcount tests for IDirectSoundCapture / IUnknown. --- dlls/dsound/tests/capture.c | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/dlls/dsound/tests/capture.c b/dlls/dsound/tests/capture.c index 3d81194..ba52818 100644 --- a/dlls/dsound/tests/capture.c +++ b/dlls/dsound/tests/capture.c @@ -19,6 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define COBJMACROS #include <stdio.h> #include "initguid.h" #include "windows.h" @@ -671,6 +672,7 @@ static void test_COM(void) IDirectSoundCapture *dsc = (IDirectSoundCapture*)0xdeadbeef; IDirectSoundCaptureBuffer *buffer = (IDirectSoundCaptureBuffer*)0xdeadbeef; IDirectSoundNotify *notify; + IUnknown *unk; DSCBUFFERDESC bufdesc; WAVEFORMATEX wfx; HRESULT hr; @@ -688,6 +690,17 @@ static void test_COM(void) } ok(hr == DS_OK, "DirectSoundCaptureCreate failed: %08x, expected DS_OK\n", hr); + /* Different refcount for IDirectSoundCapture and for IUnknown */ + refcount = IDirectSoundCapture_AddRef(dsc); + ok(refcount == 2, "refcount == %u, expected 2\n", refcount); + hr = IDirectSoundCapture_QueryInterface(dsc, &IID_IUnknown, (void**)&unk); + 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); + IUnknown_Release(unk); + IUnknown_Release(unk); + IDirectSoundCapture_Release(dsc); + init_format(&wfx, WAVE_FORMAT_PCM, 44100, 16, 1); ZeroMemory(&bufdesc, sizeof(bufdesc)); bufdesc.dwSize = sizeof(bufdesc);

1 0

Michael Stefaniuc : dsound: Add an object refcount for DirectSoundFullDuplex.
by Alexandre Julliard Aug. 16, 2012

Aug. 16, 2012

Module: wine Branch: master Commit: 6692f97e01b6c06c247f11e51b327f9ca4b277c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6692f97e01b6c06c247f11e51… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Aug 16 01:40:59 2012 +0200 dsound: Add an object refcount for DirectSoundFullDuplex. --- dlls/dsound/duplex.c | 33 +++++++++++++++++++++------------ 1 files changed, 21 insertions(+), 12 deletions(-) diff --git a/dlls/dsound/duplex.c b/dlls/dsound/duplex.c index c9f08c4..0e9320a 100644 --- a/dlls/dsound/duplex.c +++ b/dlls/dsound/duplex.c @@ -43,8 +43,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dsound); typedef struct IDirectSoundFullDuplexImpl { IDirectSoundFullDuplex IDirectSoundFullDuplex_iface; - LONG ref; - + LONG ref, numIfaces; /* IDirectSoundFullDuplexImpl fields */ IDirectSound8 *renderer_device; IDirectSoundCapture *capture_device; @@ -72,6 +71,16 @@ typedef struct IDirectSoundFullDuplex_IDirectSoundCapture { IDirectSoundFullDuplexImpl *pdsfd; } IDirectSoundFullDuplex_IDirectSoundCapture; +static void fullduplex_destroy(IDirectSoundFullDuplexImpl *This) +{ + if (This->capture_device) + IDirectSoundCapture_Release(This->capture_device); + if (This->renderer_device) + IDirectSound_Release(This->renderer_device); + HeapFree(GetProcessHeap(), 0, This); + TRACE("(%p) released\n", This); +} + /******************************************************************************* * IUnknown */ @@ -449,7 +458,11 @@ static ULONG WINAPI IDirectSoundFullDuplexImpl_AddRef(IDirectSoundFullDuplex *if { IDirectSoundFullDuplexImpl *This = impl_from_IDirectSoundFullDuplex(iface); ULONG ref = InterlockedIncrement(&(This->ref)); - TRACE("(%p) ref was %d\n", This, ref - 1); + + TRACE("(%p) ref=%d\n", This, ref); + + if(ref == 1) + InterlockedIncrement(&This->numIfaces); return ref; } @@ -516,16 +529,11 @@ static ULONG WINAPI IDirectSoundFullDuplexImpl_Release(IDirectSoundFullDuplex *i { IDirectSoundFullDuplexImpl *This = impl_from_IDirectSoundFullDuplex(iface); ULONG ref = InterlockedDecrement(&(This->ref)); - TRACE("(%p) ref was %d\n", This, ref - 1); - if (!ref) { - if (This->capture_device) - IDirectSoundCapture_Release(This->capture_device); - if (This->renderer_device) - IDirectSound_Release(This->renderer_device); - HeapFree( GetProcessHeap(), 0, This ); - TRACE("(%p) released\n", This); - } + TRACE("(%p) ref=%d\n", This, ref); + + if (!ref && !InterlockedDecrement(&This->numIfaces)) + fullduplex_destroy(This); return ref; } @@ -634,6 +642,7 @@ HRESULT DSOUND_FullDuplexCreate(REFIID riid, void **ppv) obj->IDirectSoundFullDuplex_iface.lpVtbl = &dsfd_vtbl; obj->ref = 1; + obj->numIfaces = 1; hr = IUnknown_QueryInterface((IUnknown*)obj, riid, ppv); IUnknown_Release((IUnknown*)obj);

1 0

Andrew Eikum : mciavi32: Advance video frames based on frame duration, not audio sample rate.
by Alexandre Julliard Aug. 16, 2012

Aug. 16, 2012

Module: wine Branch: master Commit: b0312eab924277d483c16ab0de235d00a2f26abb URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0312eab924277d483c16ab0d… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Aug 15 13:45:07 2012 -0500 mciavi32: Advance video frames based on frame duration, not audio sample rate. --- dlls/mciavi32/mciavi.c | 45 ++++++++++++++++++++++++--------------- dlls/mciavi32/mmoutput.c | 10 ++++---- dlls/mciavi32/private_mciavi.h | 2 +- 3 files changed, 34 insertions(+), 23 deletions(-) diff --git a/dlls/mciavi32/mciavi.c b/dlls/mciavi32/mciavi.c index c78ddc0..597359c 100644 --- a/dlls/mciavi32/mciavi.c +++ b/dlls/mciavi32/mciavi.c @@ -391,19 +391,27 @@ static DWORD MCIAVI_mciPlay_async(WINE_MCIAVI *wma, DWORD dwFlags, LPMCI_PLAY_PA return 0; } +static double currenttime_us(void) +{ + LARGE_INTEGER lc, lf; + QueryPerformanceCounter(&lc); + QueryPerformanceFrequency(&lf); + return (lc.QuadPart * 1000000) / lf.QuadPart; +} + /*************************************************************************** * MCIAVI_mciPlay [internal] */ static DWORD MCIAVI_mciPlay(UINT wDevID, DWORD dwFlags, LPMCI_PLAY_PARMS lpParms) { WINE_MCIAVI *wma; - DWORD frameTime; DWORD dwRet; LPWAVEHDR waveHdr = NULL; unsigned i, nHdr = 0; DWORD dwFromFrame, dwToFrame; DWORD numEvents = 1; HANDLE events[2]; + double next_frame_us; TRACE("(%04x, %08X, %p)\n", wDevID, dwFlags, lpParms); @@ -476,9 +484,6 @@ static DWORD MCIAVI_mciPlay(UINT wDevID, DWORD dwFlags, LPMCI_PLAY_PARMS lpParms if (dwFlags & (MCI_DGV_PLAY_REPEAT|MCI_MCIAVI_PLAY_WINDOW|MCI_MCIAVI_PLAY_FULLSCREEN)) FIXME("Unsupported flag %08x\n", dwFlags); - /* time is in microseconds, we should convert it to milliseconds */ - frameTime = (wma->mah.dwMicroSecPerFrame + 500) / 1000; - events[0] = wma->hStopEvent; if (wma->lpWaveFormat) { if (MCIAVI_OpenAudio(wma, &nHdr, &waveHdr) != 0) @@ -496,39 +501,45 @@ static DWORD MCIAVI_mciPlay(UINT wDevID, DWORD dwFlags, LPMCI_PLAY_PARMS lpParms } } + next_frame_us = currenttime_us(); while (wma->dwStatus == MCI_MODE_PLAY) { HDC hDC; - DWORD tc, delta; + double tc, delta; DWORD ret; - tc = GetTickCount(); + tc = currenttime_us(); hDC = wma->hWndPaint ? GetDC(wma->hWndPaint) : 0; if (hDC) { - MCIAVI_PaintFrame(wma, hDC); + while(next_frame_us <= tc && wma->dwCurrVideoFrame < dwToFrame){ + double dur; + ++wma->dwCurrVideoFrame; + dur = MCIAVI_PaintFrame(wma, hDC); + if(!dur) + break; + next_frame_us += dur; + TRACE("next_frame: %f\n", next_frame_us); + } ReleaseDC(wma->hWndPaint, hDC); } + if(wma->dwCurrVideoFrame >= dwToFrame) + break; if (wma->lpWaveFormat) - MCIAVI_PlayAudioBlocks(wma, nHdr, waveHdr); + MCIAVI_PlayAudioBlocks(wma, nHdr, waveHdr); - delta = GetTickCount() - tc; - if (delta < frameTime) - delta = frameTime - delta; + tc = currenttime_us(); + if(tc < next_frame_us) + delta = next_frame_us - tc; else delta = 0; LeaveCriticalSection(&wma->cs); - ret = WaitForMultipleObjects(numEvents, events, FALSE, delta); + ret = WaitForMultipleObjects(numEvents, events, FALSE, delta / 1000); EnterCriticalSection(&wma->cs); if (ret == WAIT_OBJECT_0 || wma->dwStatus != MCI_MODE_PLAY) break; - - if (wma->dwCurrVideoFrame < dwToFrame) - wma->dwCurrVideoFrame++; - else - break; } if (wma->lpWaveFormat) { diff --git a/dlls/mciavi32/mmoutput.c b/dlls/mciavi32/mmoutput.c index 2cd3339..5d4e092 100644 --- a/dlls/mciavi32/mmoutput.c +++ b/dlls/mciavi32/mmoutput.c @@ -600,20 +600,20 @@ void MCIAVI_PlayAudioBlocks(WINE_MCIAVI* wma, unsigned nHdr, LPWAVEHDR waveHdr) } } -LRESULT MCIAVI_PaintFrame(WINE_MCIAVI* wma, HDC hDC) +double MCIAVI_PaintFrame(WINE_MCIAVI* wma, HDC hDC) { void* pBitmapData; LPBITMAPINFO pBitmapInfo; if (!hDC || !wma->inbih) - return TRUE; + return 0; TRACE("Painting frame %u (cached %u)\n", wma->dwCurrVideoFrame, wma->dwCachedFrame); if (wma->dwCurrVideoFrame != wma->dwCachedFrame) { if (!wma->lpVideoIndex[wma->dwCurrVideoFrame].dwOffset) - return FALSE; + return 0; if (wma->lpVideoIndex[wma->dwCurrVideoFrame].dwSize) { @@ -626,7 +626,7 @@ LRESULT MCIAVI_PaintFrame(WINE_MCIAVI* wma, HDC hDC) wma->outbih, wma->outdata) != ICERR_OK) { WARN("Decompression error\n"); - return FALSE; + return 0; } } @@ -648,5 +648,5 @@ LRESULT MCIAVI_PaintFrame(WINE_MCIAVI* wma, HDC hDC) wma->source.right - wma->source.left, wma->source.bottom - wma->source.top, pBitmapData, pBitmapInfo, DIB_RGB_COLORS, SRCCOPY); - return TRUE; + return (wma->ash_video.dwScale / (double)wma->ash_video.dwRate) * 1000000; } diff --git a/dlls/mciavi32/private_mciavi.h b/dlls/mciavi32/private_mciavi.h index 1ee0eb3..2b9d6c2 100644 --- a/dlls/mciavi32/private_mciavi.h +++ b/dlls/mciavi32/private_mciavi.h @@ -96,7 +96,7 @@ BOOL MCIAVI_GetInfo(WINE_MCIAVI* wma) DECLSPEC_HIDDEN; DWORD MCIAVI_OpenAudio(WINE_MCIAVI* wma, unsigned* nHdr, LPWAVEHDR* pWaveHdr) DECLSPEC_HIDDEN; BOOL MCIAVI_OpenVideo(WINE_MCIAVI* wma) DECLSPEC_HIDDEN; void MCIAVI_PlayAudioBlocks(WINE_MCIAVI* wma, unsigned nHdr, LPWAVEHDR waveHdr) DECLSPEC_HIDDEN; -LRESULT MCIAVI_PaintFrame(WINE_MCIAVI* wma, HDC hDC) DECLSPEC_HIDDEN; +double MCIAVI_PaintFrame(WINE_MCIAVI* wma, HDC hDC) DECLSPEC_HIDDEN; /* mciavi.c */ WINE_MCIAVI* MCIAVI_mciGetOpenDev(UINT wDevID) DECLSPEC_HIDDEN;

1 0

Michael Stefaniuc : dsound: Aggregate IDirectSoundCapture8 instead of wrapping it.
by Alexandre Julliard Aug. 16, 2012

Aug. 16, 2012

Module: wine Branch: master Commit: 0d33e204d1016c317f656c627a2c4537d1d9e315 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d33e204d1016c317f656c627… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Aug 16 01:50:27 2012 +0200 dsound: Aggregate IDirectSoundCapture8 instead of wrapping it. --- dlls/dsound/duplex.c | 172 ++++++++------------------------------------------ 1 files changed, 26 insertions(+), 146 deletions(-) diff --git a/dlls/dsound/duplex.c b/dlls/dsound/duplex.c index c521486..5e57bbd 100644 --- a/dlls/dsound/duplex.c +++ b/dlls/dsound/duplex.c @@ -46,27 +46,24 @@ typedef struct IDirectSoundFullDuplexImpl IDirectSoundFullDuplex IDirectSoundFullDuplex_iface; LONG ref, refdsfd, numIfaces; IUnknown *ds8_unk; /* Aggregated IDirectSound8 */ - IDirectSoundCapture *capture_device; - LPDIRECTSOUNDCAPTURE pDSC; + IUnknown *dsc8_unk; /* Aggregated IDirectSoundCapture8 */ } IDirectSoundFullDuplexImpl; -typedef struct IDirectSoundFullDuplex_IDirectSoundCapture { - const IDirectSoundCaptureVtbl *lpVtbl; - LONG ref; - IDirectSoundFullDuplexImpl *pdsfd; -} IDirectSoundFullDuplex_IDirectSoundCapture; - static void fullduplex_destroy(IDirectSoundFullDuplexImpl *This) { IDirectSound8 *ds8; + IDirectSoundCapture8 *dsc8; - if (This->capture_device) - IDirectSoundCapture_Release(This->capture_device); if (This->ds8_unk) { IUnknown_QueryInterface(This->ds8_unk, &IID_IDirectSound8, (void**)&ds8); while(IDirectSound8_Release(ds8) > 0); IUnknown_Release(This->ds8_unk); } + if (This->dsc8_unk) { + IUnknown_QueryInterface(This->dsc8_unk, &IID_IDirectSoundCapture8, (void**)&dsc8); + while(IDirectSoundCapture_Release(dsc8) > 0); + IUnknown_Release(This->dsc8_unk); + } HeapFree(GetProcessHeap(), 0, This); TRACE("(%p) released\n", This); } @@ -117,120 +114,6 @@ static const IUnknownVtbl unk_vtbl = IUnknownImpl_Release }; -/******************************************************************************* - * IDirectSoundFullDuplex_IDirectSoundCapture - */ -static HRESULT WINAPI IDirectSoundFullDuplex_IDirectSoundCapture_QueryInterface( - LPDIRECTSOUNDCAPTURE iface, - REFIID riid, - LPVOID * ppobj) -{ - IDirectSoundFullDuplex_IDirectSoundCapture *This = (IDirectSoundFullDuplex_IDirectSoundCapture *)iface; - TRACE("(%p,%s,%p)\n",This,debugstr_guid(riid),ppobj); - return IDirectSoundFullDuplex_QueryInterface(&This->pdsfd->IDirectSoundFullDuplex_iface, riid, ppobj); -} - -static ULONG WINAPI IDirectSoundFullDuplex_IDirectSoundCapture_AddRef( - LPDIRECTSOUNDCAPTURE iface) -{ - IDirectSoundFullDuplex_IDirectSoundCapture *This = (IDirectSoundFullDuplex_IDirectSoundCapture *)iface; - ULONG ref = InterlockedIncrement(&(This->ref)); - TRACE("(%p) ref was %d\n", This, ref - 1); - return ref; -} - -static ULONG WINAPI IDirectSoundFullDuplex_IDirectSoundCapture_Release( - LPDIRECTSOUNDCAPTURE iface) -{ - IDirectSoundFullDuplex_IDirectSoundCapture *This = (IDirectSoundFullDuplex_IDirectSoundCapture *)iface; - ULONG ref = InterlockedDecrement(&(This->ref)); - TRACE("(%p) ref was %d\n", This, ref + 1); - if (!ref) { - This->pdsfd->pDSC = NULL; - HeapFree(GetProcessHeap(), 0, This); - TRACE("(%p) released\n", This); - } - return ref; -} - -static HRESULT WINAPI IDirectSoundFullDuplex_IDirectSoundCapture_CreateCaptureBuffer( - LPDIRECTSOUNDCAPTURE iface, - LPCDSCBUFFERDESC lpcDSCBufferDesc, - LPDIRECTSOUNDCAPTUREBUFFER* lplpDSCaptureBuffer, - LPUNKNOWN pUnk) -{ - IDirectSoundFullDuplex_IDirectSoundCapture *This = (IDirectSoundFullDuplex_IDirectSoundCapture *)iface; - TRACE("(%p,%p,%p,%p)\n",This,lpcDSCBufferDesc,lplpDSCaptureBuffer,pUnk); - return IDirectSoundCapture_CreateCaptureBuffer(This->pdsfd->capture_device,lpcDSCBufferDesc,lplpDSCaptureBuffer,pUnk); -} - -static HRESULT WINAPI IDirectSoundFullDuplex_IDirectSoundCapture_GetCaps( - LPDIRECTSOUNDCAPTURE iface, - LPDSCCAPS lpDSCCaps) -{ - IDirectSoundFullDuplex_IDirectSoundCapture *This = (IDirectSoundFullDuplex_IDirectSoundCapture *)iface; - TRACE("(%p,%p)\n",This,lpDSCCaps); - return IDirectSoundCapture_GetCaps(This->pdsfd->capture_device, lpDSCCaps); -} - -static HRESULT WINAPI IDirectSoundFullDuplex_IDirectSoundCapture_Initialize( - LPDIRECTSOUNDCAPTURE iface, - LPCGUID lpcGUID) -{ - IDirectSoundFullDuplex_IDirectSoundCapture *This = (IDirectSoundFullDuplex_IDirectSoundCapture *)iface; - TRACE("(%p, %s)\n", This, debugstr_guid(lpcGUID)); - return IDirectSoundCapture_Initialize(This->pdsfd->capture_device,lpcGUID); -} - -static const IDirectSoundCaptureVtbl DirectSoundFullDuplex_DirectSoundCapture_Vtbl = -{ - IDirectSoundFullDuplex_IDirectSoundCapture_QueryInterface, - IDirectSoundFullDuplex_IDirectSoundCapture_AddRef, - IDirectSoundFullDuplex_IDirectSoundCapture_Release, - IDirectSoundFullDuplex_IDirectSoundCapture_CreateCaptureBuffer, - IDirectSoundFullDuplex_IDirectSoundCapture_GetCaps, - IDirectSoundFullDuplex_IDirectSoundCapture_Initialize -}; - -static HRESULT IDirectSoundFullDuplex_IDirectSoundCapture_Create( - IDirectSoundFullDuplexImpl *pdsfd, - LPDIRECTSOUNDCAPTURE8 * ppdsc8) -{ - IDirectSoundFullDuplex_IDirectSoundCapture * pdsfddsc; - TRACE("(%p,%p)\n",pdsfd,ppdsc8); - - if (pdsfd == NULL) { - ERR("invalid parameter: pdsfd == NULL\n"); - return DSERR_INVALIDPARAM; - } - - if (ppdsc8 == NULL) { - ERR("invalid parameter: ppdsc8 == NULL\n"); - return DSERR_INVALIDPARAM; - } - - if (pdsfd->capture_device == NULL) { - WARN("not initialized\n"); - *ppdsc8 = NULL; - return DSERR_UNINITIALIZED; - } - - pdsfddsc = HeapAlloc(GetProcessHeap(),0,sizeof(*pdsfddsc)); - if (pdsfddsc == NULL) { - WARN("out of memory\n"); - *ppdsc8 = NULL; - return DSERR_OUTOFMEMORY; - } - - pdsfddsc->lpVtbl = &DirectSoundFullDuplex_DirectSoundCapture_Vtbl; - pdsfddsc->ref = 0; - pdsfddsc->pdsfd = pdsfd; - - *ppdsc8 = (LPDIRECTSOUNDCAPTURE)pdsfddsc; - - return DS_OK; -} - /*************************************************************************** * IDirectSoundFullDuplex implementation */ @@ -275,18 +158,8 @@ static HRESULT WINAPI IDirectSoundFullDuplexImpl_QueryInterface(IDirectSoundFull } else if (This->ds8_unk && (IsEqualIID(riid, &IID_IDirectSound) || IsEqualIID(riid, &IID_IDirectSound8))) { return IUnknown_QueryInterface(This->ds8_unk, riid, ppv); - } else if (IsEqualIID(riid, &IID_IDirectSoundCapture)) { - if (!This->pDSC) { - IDirectSoundFullDuplex_IDirectSoundCapture_Create(This, &This->pDSC); - if (!This->pDSC) { - WARN("IDirectSoundFullDuplex_IDirectSoundCapture_Create() failed\n"); - *ppv = NULL; - return E_NOINTERFACE; - } - } - IDirectSoundFullDuplex_IDirectSoundCapture_AddRef(This->pDSC); - *ppv = This->pDSC; - return S_OK; + } else if (This->dsc8_unk && IsEqualIID(riid, &IID_IDirectSoundCapture)) { + return IUnknown_QueryInterface(This->dsc8_unk, riid, ppv); } return E_NOINTERFACE; @@ -311,6 +184,7 @@ static HRESULT WINAPI IDirectSoundFullDuplexImpl_Initialize(IDirectSoundFullDupl { IDirectSoundFullDuplexImpl *This = impl_from_IDirectSoundFullDuplex(iface); IDirectSound8 *ds8 = NULL; + IDirectSoundCapture8 *dsc8 = NULL; HRESULT hr; TRACE("(%p,%s,%s,%p,%p,%p,%x,%p,%p)\n", This, debugstr_guid(capture_dev), @@ -322,7 +196,7 @@ static HRESULT WINAPI IDirectSoundFullDuplexImpl_Initialize(IDirectSoundFullDupl *dscb8 = NULL; *dsb8 = NULL; - if (This->ds8_unk || This->capture_device != NULL) { + if (This->ds8_unk || This->dsc8_unk) { WARN("already initialized\n"); return DSERR_ALREADYINITIALIZED; } @@ -346,22 +220,26 @@ static HRESULT WINAPI IDirectSoundFullDuplexImpl_Initialize(IDirectSoundFullDupl goto error; } - hr = DSOUND_CaptureCreate8(&IID_IDirectSoundCapture8, (void**)&This->capture_device); - if (SUCCEEDED(hr)) - hr = IDirectSoundCapture_Initialize(This->capture_device, capture_dev); + hr = IDirectSoundCaptureImpl_Create(&This->IUnknown_iface, &IID_IUnknown, + (void**)&This->dsc8_unk, TRUE); + if (SUCCEEDED(hr)) { + IUnknown_QueryInterface(This->dsc8_unk, &IID_IDirectSoundCapture8, (void**)&dsc8); + hr = IDirectSoundCapture_Initialize(dsc8, capture_dev); + } if (hr != DS_OK) { - WARN("DirectSoundCaptureDevice_Initialize() failed\n"); + WARN("Creating/initializing IDirectSoundCapture8 failed\n"); goto error; } - hr = IDirectSoundCapture_CreateCaptureBuffer(This->capture_device, cbufdesc, + hr = IDirectSoundCapture_CreateCaptureBuffer(dsc8, cbufdesc, (IDirectSoundCaptureBuffer**)dscb8, NULL); if (hr != DS_OK) { - WARN("IDirectSoundCaptureBufferImpl_Create() failed\n"); + WARN("IDirectSoundCapture_CreateCaptureBuffer() failed\n"); goto error; } IDirectSound8_Release(ds8); + IDirectSoundCapture_Release(dsc8); return DS_OK; error: @@ -379,9 +257,11 @@ error: IDirectSoundCaptureBuffer8_Release(*dscb8); *dscb8 = NULL; } - if (This->capture_device) { - IDirectSoundCapture_Release(This->capture_device); - This->capture_device = NULL; + if (dsc8) + IDirectSoundCapture_Release(dsc8); + if (This->dsc8_unk) { + IUnknown_Release(This->dsc8_unk); + This->dsc8_unk = NULL; } return hr; }

1 0

Francois Gouget : inetcpl: Tweak the spelling of a label.
by Alexandre Julliard Aug. 16, 2012

Aug. 16, 2012

1 0

Francois Gouget : winecfg: An English spelling tweak.
by Alexandre Julliard Aug. 16, 2012

Aug. 16, 2012

1 0

Francois Gouget : winefile: Tweak the spelling of a menu.
by Alexandre Julliard Aug. 16, 2012

Aug. 16, 2012

1 0

Francois Gouget : winecfg: Tweak the spelling of a couple of labels.
by Alexandre Julliard Aug. 16, 2012

Aug. 16, 2012

1 0