winehq.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2025
July
June
May
April
March
February
January
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
January
2003
December
November
October
September
August
July
June
May
April
March
February
January
2002
December
November
October
September
August
July
June
May
April
March
February
January
2001
December
November
October
September
August
July
June
May
April
March
February
List overview
wine-commits
August 2012
----- 2025 -----
July 2025
June 2025
May 2025
April 2025
March 2025
February 2025
January 2025
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
January 2004
----- 2003 -----
December 2003
November 2003
October 2003
September 2003
August 2003
July 2003
June 2003
May 2003
April 2003
March 2003
February 2003
January 2003
----- 2002 -----
December 2002
November 2002
October 2002
September 2002
August 2002
July 2002
June 2002
May 2002
April 2002
March 2002
February 2002
January 2002
----- 2001 -----
December 2001
November 2001
October 2001
September 2001
August 2001
July 2001
June 2001
May 2001
April 2001
March 2001
February 2001
wine-commits@winehq.org
2 participants
541 discussions
Start a n
N
ew thread
Michael Stefaniuc : dsound/tests: Refcount tests for IDirectSoundCapture / IUnknown.
by Alexandre Julliard
16 Aug '12
16 Aug '12
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
0
0
Michael Stefaniuc : dsound: IDirectSoundCapture / IUnknown use separate refcounts.
by Alexandre Julliard
16 Aug '12
16 Aug '12
Module: wine Branch: master Commit: 9383affe87f7654d037958d60ea3e0f1f70ac452 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=9383affe87f7654d037958d60…
Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Aug 16 01:21:26 2012 +0200 dsound: IDirectSoundCapture / IUnknown use separate refcounts. --- dlls/dsound/capture.c | 128 +++++++++++++++++++++++++++++++----------- dlls/dsound/dsound_private.h | 1 - 2 files changed, 94 insertions(+), 35 deletions(-) diff --git a/dlls/dsound/capture.c b/dlls/dsound/capture.c index 40df315..23668e9 100644 --- a/dlls/dsound/capture.c +++ b/dlls/dsound/capture.c @@ -995,67 +995,124 @@ static HRESULT DirectSoundCaptureDevice_Initialize( /***************************************************************************** * IDirectSoundCapture implementation structure */ -struct IDirectSoundCaptureImpl +typedef struct IDirectSoundCaptureImpl { + IUnknown IUnknown_iface; /* Separate refcount */ IDirectSoundCapture IDirectSoundCapture_iface; - LONG ref; + LONG ref, refdsc, numIfaces; DirectSoundCaptureDevice *device; BOOL has_dsc8; -}; +} IDirectSoundCaptureImpl; -static inline struct IDirectSoundCaptureImpl *impl_from_IDirectSoundCapture(IDirectSoundCapture *iface) +static void capture_destroy(IDirectSoundCaptureImpl *This) { - return CONTAINING_RECORD(iface, struct IDirectSoundCaptureImpl, IDirectSoundCapture_iface); + if (This->device) + DirectSoundCaptureDevice_Release(This->device); + HeapFree(GetProcessHeap(),0,This); + TRACE("(%p) released\n", This); } -/*************************************************************************** - * IDirectSoundCaptureImpl +/******************************************************************************* + * IUnknown Implementation for DirectSoundCapture */ -static HRESULT WINAPI IDirectSoundCaptureImpl_QueryInterface(IDirectSoundCapture *iface, - REFIID riid, void **ppobj) +static inline IDirectSoundCaptureImpl *impl_from_IUnknown(IUnknown *iface) { - TRACE( "(%p,%s,%p)\n", iface, debugstr_guid(riid), ppobj ); + return CONTAINING_RECORD(iface, IDirectSoundCaptureImpl, IUnknown_iface); +} - if (ppobj == NULL) { - WARN("invalid parameter\n"); - return E_INVALIDARG; - } +static HRESULT WINAPI IUnknownImpl_QueryInterface(IUnknown *iface, REFIID riid, void **ppv) +{ + IDirectSoundCaptureImpl *This = impl_from_IUnknown(iface); - *ppobj = NULL; + TRACE("(%p,%s,%p)\n", This, debugstr_guid(riid), ppv); - if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IDirectSoundCapture)) { - IDirectSoundCapture_AddRef(iface); - *ppobj = iface; - return S_OK; + if (!ppv) { + WARN("invalid parameter\n"); + return E_INVALIDARG; } + *ppv = NULL; - WARN("unsupported riid: %s\n", debugstr_guid(riid)); - return E_NOINTERFACE; + if (IsEqualIID(riid, &IID_IUnknown)) + *ppv = &This->IUnknown_iface; + else if (IsEqualIID(riid, &IID_IDirectSoundCapture)) + *ppv = &This->IDirectSoundCapture_iface; + else { + WARN("unknown IID %s\n", debugstr_guid(riid)); + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI IUnknownImpl_AddRef(IUnknown *iface) +{ + IDirectSoundCaptureImpl *This = impl_from_IUnknown(iface); + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + if(ref == 1) + InterlockedIncrement(&This->numIfaces); + return ref; +} + +static ULONG WINAPI IUnknownImpl_Release(IUnknown *iface) +{ + IDirectSoundCaptureImpl *This = impl_from_IUnknown(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + if (!ref && !InterlockedDecrement(&This->numIfaces)) + capture_destroy(This); + return ref; +} + +static const IUnknownVtbl unk_vtbl = +{ + IUnknownImpl_QueryInterface, + IUnknownImpl_AddRef, + IUnknownImpl_Release +}; + +/*************************************************************************** + * IDirectSoundCaptureImpl + */ +static inline struct IDirectSoundCaptureImpl *impl_from_IDirectSoundCapture(IDirectSoundCapture *iface) +{ + return CONTAINING_RECORD(iface, struct IDirectSoundCaptureImpl, IDirectSoundCapture_iface); +} + +static HRESULT WINAPI IDirectSoundCaptureImpl_QueryInterface(IDirectSoundCapture *iface, + REFIID riid, void **ppv) +{ + IDirectSoundCaptureImpl *This = impl_from_IDirectSoundCapture(iface); + TRACE("(%p,%s,%p)\n", iface, debugstr_guid(riid), ppv); + return IUnknown_QueryInterface(&This->IUnknown_iface, riid, ppv); } static ULONG WINAPI IDirectSoundCaptureImpl_AddRef(IDirectSoundCapture *iface) { IDirectSoundCaptureImpl *This = impl_from_IDirectSoundCapture(iface); - ULONG ref = InterlockedIncrement(&(This->ref)); + ULONG ref = InterlockedIncrement(&This->refdsc); - TRACE("(%p) ref was %d\n", This, ref - 1); + TRACE("(%p) ref=%d\n", This, ref); + + if(ref == 1) + InterlockedIncrement(&This->numIfaces); return ref; } static ULONG WINAPI IDirectSoundCaptureImpl_Release(IDirectSoundCapture *iface) { IDirectSoundCaptureImpl *This = impl_from_IDirectSoundCapture(iface); - ULONG ref = InterlockedDecrement(&(This->ref)); - - TRACE("(%p) ref was %d\n", This, ref + 1); + ULONG ref = InterlockedDecrement(&This->refdsc); - if (!ref) { - if (This->device) - DirectSoundCaptureDevice_Release(This->device); + TRACE("(%p) ref=%d\n", This, ref); - HeapFree( GetProcessHeap(), 0, This ); - TRACE("(%p) released\n", This); - } + if (!ref && !InterlockedDecrement(&This->numIfaces)) + capture_destroy(This); return ref; } @@ -1178,13 +1235,16 @@ static HRESULT IDirectSoundCaptureImpl_Create(REFIID riid, void **ppv, BOOL has_ setup_dsound_options(); + obj->IUnknown_iface.lpVtbl = &unk_vtbl; obj->IDirectSoundCapture_iface.lpVtbl = &dscvt; obj->ref = 1; + obj->refdsc = 0; + obj->numIfaces = 1; obj->device = NULL; obj->has_dsc8 = has_dsc8; - hr = IDirectSoundCapture_QueryInterface(&obj->IDirectSoundCapture_iface, riid, ppv); - IDirectSoundCapture_Release(&obj->IDirectSoundCapture_iface); + hr = IUnknown_QueryInterface(&obj->IUnknown_iface, riid, ppv); + IUnknown_Release(&obj->IUnknown_iface); return hr; } diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h index 107cbab..c8498d3 100644 --- a/dlls/dsound/dsound_private.h +++ b/dlls/dsound/dsound_private.h @@ -40,7 +40,6 @@ extern int ds_default_bits_per_sample DECLSPEC_HIDDEN; * Predeclare the interface implementation structures */ typedef struct IDirectSoundBufferImpl IDirectSoundBufferImpl; -typedef struct IDirectSoundCaptureImpl IDirectSoundCaptureImpl; typedef struct IDirectSoundCaptureBufferImpl IDirectSoundCaptureBufferImpl; typedef struct DirectSoundDevice DirectSoundDevice; typedef struct DirectSoundCaptureDevice DirectSoundCaptureDevice;
1
0
0
0
Michael Stefaniuc : dsound: Merge the DirectSoundCapture create functions.
by Alexandre Julliard
16 Aug '12
16 Aug '12
Module: wine Branch: master Commit: b8ffb4930fe1d9a482bfb6aef093a0a0d673f2e2 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=b8ffb4930fe1d9a482bfb6aef…
Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Aug 16 01:20:01 2012 +0200 dsound: Merge the DirectSoundCapture create functions. --- dlls/dsound/capture.c | 89 +++++++++++------------------------------ dlls/dsound/dsound_main.c | 4 +- dlls/dsound/dsound_private.h | 4 +- dlls/dsound/duplex.c | 2 +- 4 files changed, 29 insertions(+), 70 deletions(-) diff --git a/dlls/dsound/capture.c b/dlls/dsound/capture.c index 7970537..40df315 100644 --- a/dlls/dsound/capture.c +++ b/dlls/dsound/capture.c @@ -1000,6 +1000,7 @@ struct IDirectSoundCaptureImpl IDirectSoundCapture IDirectSoundCapture_iface; LONG ref; DirectSoundCaptureDevice *device; + BOOL has_dsc8; }; static inline struct IDirectSoundCaptureImpl *impl_from_IDirectSoundCapture(IDirectSoundCapture *iface) @@ -1161,83 +1162,41 @@ static const IDirectSoundCaptureVtbl dscvt = IDirectSoundCaptureImpl_Initialize }; -static HRESULT IDirectSoundCaptureImpl_Create( - LPDIRECTSOUNDCAPTURE8 * ppDSC) +static HRESULT IDirectSoundCaptureImpl_Create(REFIID riid, void **ppv, BOOL has_dsc8) { - IDirectSoundCaptureImpl *pDSC; - TRACE("(%p)\n", ppDSC); + IDirectSoundCaptureImpl *obj; + HRESULT hr; - /* Allocate memory */ - pDSC = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(IDirectSoundCaptureImpl)); - if (pDSC == NULL) { + TRACE("(%s, %p)\n", debugstr_guid(riid), ppv); + + *ppv = NULL; + obj = HeapAlloc(GetProcessHeap(), 0, sizeof(*obj)); + if (obj == NULL) { WARN("out of memory\n"); - *ppDSC = NULL; return DSERR_OUTOFMEMORY; } - pDSC->IDirectSoundCapture_iface.lpVtbl = &dscvt; - pDSC->ref = 0; - pDSC->device = NULL; - - *ppDSC = (LPDIRECTSOUNDCAPTURE8)pDSC; - - return DS_OK; -} - -HRESULT DSOUND_CaptureCreate(REFIID riid, IDirectSoundCapture **ppDSC) -{ - IDirectSoundCapture *pDSC; - HRESULT hr; - TRACE("(%s, %p)\n", debugstr_guid(riid), ppDSC); - - if (!IsEqualIID(riid, &IID_IUnknown) && - !IsEqualIID(riid, &IID_IDirectSoundCapture)) { - *ppDSC = 0; - return E_NOINTERFACE; - } - - /* Get dsound configuration */ setup_dsound_options(); - hr = IDirectSoundCaptureImpl_Create(&pDSC); - if (hr == DS_OK) { - IDirectSoundCapture_AddRef(pDSC); - *ppDSC = pDSC; - } else { - WARN("IDirectSoundCaptureImpl_Create failed\n"); - *ppDSC = 0; - } + obj->IDirectSoundCapture_iface.lpVtbl = &dscvt; + obj->ref = 1; + obj->device = NULL; + obj->has_dsc8 = has_dsc8; + + hr = IDirectSoundCapture_QueryInterface(&obj->IDirectSoundCapture_iface, riid, ppv); + IDirectSoundCapture_Release(&obj->IDirectSoundCapture_iface); return hr; } -HRESULT DSOUND_CaptureCreate8( - REFIID riid, - LPDIRECTSOUNDCAPTURE8 *ppDSC8) +HRESULT DSOUND_CaptureCreate(REFIID riid, void **ppv) { - LPDIRECTSOUNDCAPTURE8 pDSC8; - HRESULT hr; - TRACE("(%s, %p)\n", debugstr_guid(riid), ppDSC8); - - if (!IsEqualIID(riid, &IID_IUnknown) && - !IsEqualIID(riid, &IID_IDirectSoundCapture8)) { - *ppDSC8 = 0; - return E_NOINTERFACE; - } - - /* Get dsound configuration */ - setup_dsound_options(); - - hr = IDirectSoundCaptureImpl_Create(&pDSC8); - if (hr == DS_OK) { - IDirectSoundCapture_AddRef(pDSC8); - *ppDSC8 = pDSC8; - } else { - WARN("IDirectSoundCaptureImpl_Create failed\n"); - *ppDSC8 = 0; - } + return IDirectSoundCaptureImpl_Create(riid, ppv, FALSE); +} - return hr; +HRESULT DSOUND_CaptureCreate8(REFIID riid, void **ppv) +{ + return IDirectSoundCaptureImpl_Create(riid, ppv, TRUE); } /*************************************************************************** @@ -1280,7 +1239,7 @@ HRESULT WINAPI DirectSoundCaptureCreate(LPCGUID lpcGUID, IDirectSoundCapture **p return DSERR_NOAGGREGATION; } - hr = DSOUND_CaptureCreate(&IID_IDirectSoundCapture, &pDSC); + hr = DSOUND_CaptureCreate(&IID_IDirectSoundCapture, (void**)&pDSC); if (hr == DS_OK) { hr = IDirectSoundCapture_Initialize(pDSC, lpcGUID); if (hr != DS_OK) { @@ -1336,7 +1295,7 @@ HRESULT WINAPI DirectSoundCaptureCreate8( return DSERR_NOAGGREGATION; } - hr = DSOUND_CaptureCreate8(&IID_IDirectSoundCapture8, &pDSC8); + hr = DSOUND_CaptureCreate8(&IID_IDirectSoundCapture8, (void**)&pDSC8); if (hr == DS_OK) { hr = IDirectSoundCapture_Initialize(pDSC8, lpcGUID); if (hr != DS_OK) { diff --git a/dlls/dsound/dsound_main.c b/dlls/dsound/dsound_main.c index e1969a1..34b23a5 100644 --- a/dlls/dsound/dsound_main.c +++ b/dlls/dsound/dsound_main.c @@ -721,8 +721,8 @@ static const IClassFactoryVtbl DSCF_Vtbl = { static IClassFactoryImpl DSOUND_CF[] = { { { &DSCF_Vtbl }, &CLSID_DirectSound, DSOUND_Create }, { { &DSCF_Vtbl }, &CLSID_DirectSound8, DSOUND_Create8 }, - { { &DSCF_Vtbl }, &CLSID_DirectSoundCapture, (FnCreateInstance)DSOUND_CaptureCreate }, - { { &DSCF_Vtbl }, &CLSID_DirectSoundCapture8, (FnCreateInstance)DSOUND_CaptureCreate8 }, + { { &DSCF_Vtbl }, &CLSID_DirectSoundCapture, DSOUND_CaptureCreate }, + { { &DSCF_Vtbl }, &CLSID_DirectSoundCapture8, DSOUND_CaptureCreate8 }, { { &DSCF_Vtbl }, &CLSID_DirectSoundFullDuplex, (FnCreateInstance)DSOUND_FullDuplexCreate }, { { &DSCF_Vtbl }, &CLSID_DirectSoundPrivate, (FnCreateInstance)IKsPrivatePropertySetImpl_Create }, { { NULL }, NULL, NULL } diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h index be40797..107cbab 100644 --- a/dlls/dsound/dsound_private.h +++ b/dlls/dsound/dsound_private.h @@ -299,8 +299,8 @@ void DSOUND_Calc3DBuffer(IDirectSoundBufferImpl *dsb) DECLSPEC_HIDDEN; /* capture.c */ -HRESULT DSOUND_CaptureCreate(REFIID riid, LPDIRECTSOUNDCAPTURE *ppDSC) DECLSPEC_HIDDEN; -HRESULT DSOUND_CaptureCreate8(REFIID riid, LPDIRECTSOUNDCAPTURE8 *ppDSC8) DECLSPEC_HIDDEN; +HRESULT DSOUND_CaptureCreate(REFIID riid, void **ppv) DECLSPEC_HIDDEN; +HRESULT DSOUND_CaptureCreate8(REFIID riid, void **ppv) DECLSPEC_HIDDEN; #define STATE_STOPPED 0 #define STATE_STARTING 1 diff --git a/dlls/dsound/duplex.c b/dlls/dsound/duplex.c index ccb0c9b..b473c03 100644 --- a/dlls/dsound/duplex.c +++ b/dlls/dsound/duplex.c @@ -578,7 +578,7 @@ IDirectSoundFullDuplexImpl_Initialize( return hr; } - hr = DSOUND_CaptureCreate8(&IID_IDirectSoundCapture8, &This->capture_device); + hr = DSOUND_CaptureCreate8(&IID_IDirectSoundCapture8, (void**)&This->capture_device); if (SUCCEEDED(hr)) hr = IDirectSoundCapture_Initialize(This->capture_device, pCaptureGuid); if (hr != DS_OK) {
1
0
0
0
Michael Stefaniuc : taskmgr: Drop a superfluous TRUE: FALSE conditional expression.
by Alexandre Julliard
16 Aug '12
16 Aug '12
Module: wine Branch: master Commit: 4cebe9e27e37efbf16c885fa428aeb96e21ca7cd URL:
http://source.winehq.org/git/wine.git/?a=commit;h=4cebe9e27e37efbf16c885fa4…
Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Aug 16 01:54:31 2012 +0200 taskmgr: Drop a superfluous TRUE:FALSE conditional expression. --- programs/taskmgr/applpage.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/programs/taskmgr/applpage.c b/programs/taskmgr/applpage.c index d0a812a..c7debec 100644 --- a/programs/taskmgr/applpage.c +++ b/programs/taskmgr/applpage.c @@ -244,7 +244,7 @@ static BOOL CALLBACK EnumWindowsProc(HWND hWnd, LPARAM lParam) { HICON hIcon; WCHAR wszText[256]; - BOOL bLargeIcon; + BOOL bLargeIcon = TaskManagerSettings.View_LargeIcons; BOOL bHung = FALSE; typedef int (__stdcall *IsHungAppWindowProc)(HWND); IsHungAppWindowProc IsHungAppWindow; @@ -254,8 +254,6 @@ static BOOL CALLBACK EnumWindowsProc(HWND hWnd, LPARAM lParam) if (hWnd == hMainWnd) return TRUE; - bLargeIcon = TaskManagerSettings.View_LargeIcons ? TRUE : FALSE; - /* Check and see if this is a top-level app window */ if (!GetWindowTextW(hWnd, wszText, sizeof(wszText)/sizeof(WCHAR)) || !IsWindowVisible(hWnd) ||
1
0
0
0
Gustavo Henrique Milaré : po: Fix Brazilian Portuguese translation.
by Alexandre Julliard
16 Aug '12
16 Aug '12
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
0
0
Francois Gouget : kernel32: Fix the spelling of 'combo box' and 'top-level' in some error messages.
by Alexandre Julliard
16 Aug '12
16 Aug '12
Module: wine Branch: master Commit: 63ba4b4a5a5057674e4cc3aee0c76705be95eec6 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=63ba4b4a5a5057674e4cc3aee…
Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Aug 15 18:47:50 2012 +0200 kernel32: Fix the spelling of 'combo box' and 'top-level' in some error messages. --- dlls/kernel32/winerror.mc | 6 +++--- po/ar.po | 6 +++--- po/bg.po | 6 +++--- po/ca.po | 6 +++--- po/cs.po | 6 +++--- po/da.po | 6 +++--- po/de.po | 6 +++--- po/el.po | 6 +++--- po/en.po | 12 ++++++------ po/en_US.po | 12 ++++++------ po/eo.po | 6 +++--- po/es.po | 10 +++++----- po/fa.po | 6 +++--- po/fi.po | 6 +++--- po/fr.po | 6 +++--- po/he.po | 6 +++--- po/hi.po | 6 +++--- po/hu.po | 6 +++--- po/it.po | 12 ++++++------ po/ja.po | 6 +++--- po/ko.po | 6 +++--- po/lt.po | 6 +++--- po/ml.po | 6 +++--- po/nb_NO.po | 6 +++--- po/nl.po | 12 ++++++------ po/or.po | 6 +++--- po/pa.po | 6 +++--- po/pl.po | 10 +++++----- po/pt_BR.po | 10 +++++----- po/pt_PT.po | 10 +++++----- po/rm.po | 6 +++--- po/ro.po | 6 +++--- po/ru.po | 6 +++--- po/sk.po | 6 +++--- po/sl.po | 6 +++--- po/sr_RS(a)cyrillic.po | 6 +++--- po/sr_RS(a)latin.po | 6 +++--- po/sv.po | 6 +++--- po/te.po | 6 +++--- po/th.po | 6 +++--- po/tr.po | 6 +++--- po/uk.po | 6 +++--- po/wa.po | 6 +++--- po/wine.pot | 6 +++--- po/zh_CN.po | 6 +++--- po/zh_TW.po | 8 +++++--- 46 files changed, 160 insertions(+), 158 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=63ba4b4a5a5057674e4cc…
1
0
0
0
Francois Gouget : winecfg: An English spelling tweak.
by Alexandre Julliard
16 Aug '12
16 Aug '12
Module: wine Branch: master Commit: b1d35b15a9b2f67ef136872cf04817d42e00d31d URL:
http://source.winehq.org/git/wine.git/?a=commit;h=b1d35b15a9b2f67ef136872cf…
Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Aug 15 18:42:49 2012 +0200 winecfg: An English spelling tweak. --- po/ar.po | 2 +- po/bg.po | 2 +- po/ca.po | 2 +- po/cs.po | 2 +- po/da.po | 2 +- po/de.po | 2 +- po/el.po | 2 +- po/en.po | 2 +- po/en_US.po | 4 ++-- po/eo.po | 2 +- po/es.po | 2 +- po/fa.po | 2 +- po/fi.po | 2 +- po/fr.po | 2 +- po/he.po | 2 +- po/hi.po | 2 +- po/hu.po | 2 +- po/it.po | 2 +- po/ja.po | 2 +- po/ko.po | 2 +- po/lt.po | 2 +- po/ml.po | 2 +- po/nb_NO.po | 2 +- po/nl.po | 2 +- po/or.po | 2 +- po/pa.po | 2 +- po/pl.po | 2 +- po/pt_BR.po | 2 +- po/pt_PT.po | 2 +- po/rm.po | 2 +- po/ro.po | 2 +- po/ru.po | 2 +- po/sk.po | 2 +- po/sl.po | 2 +- po/sr_RS(a)cyrillic.po | 2 +- po/sr_RS(a)latin.po | 2 +- po/sv.po | 2 +- po/te.po | 2 +- po/th.po | 2 +- po/tr.po | 2 +- po/uk.po | 2 +- po/wa.po | 2 +- po/wine.pot | 2 +- po/zh_CN.po | 2 +- po/zh_TW.po | 2 +- programs/winecfg/winecfg.rc | 2 +- 46 files changed, 47 insertions(+), 47 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=b1d35b15a9b2f67ef1368…
1
0
0
0
Francois Gouget : inetcpl: Tweak the spelling of a label.
by Alexandre Julliard
16 Aug '12
16 Aug '12
Module: wine Branch: master Commit: dc09ffe1940388bf71217767a65b11650fb83847 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=dc09ffe1940388bf71217767a…
Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Aug 15 18:24:35 2012 +0200 inetcpl: Tweak the spelling of a label. --- dlls/inetcpl.cpl/inetcpl.rc | 2 +- po/ar.po | 2 +- po/bg.po | 2 +- po/ca.po | 2 +- po/cs.po | 2 +- po/da.po | 2 +- po/de.po | 2 +- po/el.po | 2 +- po/en.po | 2 +- po/en_US.po | 4 ++-- po/eo.po | 2 +- po/es.po | 2 +- po/fa.po | 2 +- po/fi.po | 2 +- po/fr.po | 2 +- po/he.po | 2 +- po/hi.po | 2 +- po/hu.po | 2 +- po/it.po | 2 +- po/ja.po | 2 +- po/ko.po | 2 +- po/lt.po | 2 +- po/ml.po | 2 +- po/nb_NO.po | 2 +- po/nl.po | 2 +- po/or.po | 2 +- po/pa.po | 2 +- po/pl.po | 2 +- po/pt_BR.po | 2 +- po/pt_PT.po | 2 +- po/rm.po | 2 +- po/ro.po | 2 +- po/ru.po | 2 +- po/sk.po | 2 +- po/sl.po | 2 +- po/sr_RS(a)cyrillic.po | 2 +- po/sr_RS(a)latin.po | 2 +- po/sv.po | 2 +- po/te.po | 2 +- po/th.po | 2 +- po/tr.po | 2 +- po/uk.po | 2 +- po/wa.po | 2 +- po/wine.pot | 2 +- po/zh_CN.po | 2 +- po/zh_TW.po | 2 +- 46 files changed, 47 insertions(+), 47 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=dc09ffe1940388bf71217…
1
0
0
0
Francois Gouget : winefile: Tweak the spelling of a menu.
by Alexandre Julliard
16 Aug '12
16 Aug '12
Module: wine Branch: master Commit: 951f143b26f73cea44b9bc85058224f70b30ba1a URL:
http://source.winehq.org/git/wine.git/?a=commit;h=951f143b26f73cea44b9bc850…
Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Aug 15 18:21:09 2012 +0200 winefile: Tweak the spelling of a menu. --- po/ar.po | 2 +- po/bg.po | 2 +- po/ca.po | 2 +- po/cs.po | 2 +- po/da.po | 2 +- po/de.po | 2 +- po/el.po | 2 +- po/en.po | 4 ++-- po/en_US.po | 4 ++-- po/eo.po | 2 +- po/es.po | 2 +- po/fa.po | 2 +- po/fi.po | 2 +- po/fr.po | 2 +- po/he.po | 2 +- po/hi.po | 2 +- po/hu.po | 2 +- po/it.po | 2 +- po/ja.po | 2 +- po/ko.po | 2 +- po/lt.po | 2 +- po/ml.po | 2 +- po/nb_NO.po | 2 +- po/nl.po | 2 +- po/or.po | 2 +- po/pa.po | 2 +- po/pl.po | 2 +- po/pt_BR.po | 2 +- po/pt_PT.po | 2 +- po/rm.po | 2 +- po/ro.po | 2 +- po/ru.po | 2 +- po/sk.po | 2 +- po/sl.po | 2 +- po/sr_RS(a)cyrillic.po | 2 +- po/sr_RS(a)latin.po | 2 +- po/sv.po | 2 +- po/te.po | 2 +- po/th.po | 2 +- po/tr.po | 2 +- po/uk.po | 2 +- po/wa.po | 2 +- po/wine.pot | 2 +- po/zh_CN.po | 2 +- po/zh_TW.po | 2 +- programs/winefile/winefile.rc | 2 +- 46 files changed, 48 insertions(+), 48 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=951f143b26f73cea44b9b…
1
0
0
0
Francois Gouget : winecfg: Tweak the spelling of a couple of labels.
by Alexandre Julliard
16 Aug '12
16 Aug '12
Module: wine Branch: master Commit: 29fcdfe5330a87b200b44175e320c3e9a1392b19 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=29fcdfe5330a87b200b44175e…
Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Aug 15 18:18:10 2012 +0200 winecfg: Tweak the spelling of a couple of labels. --- po/ar.po | 4 ++-- po/bg.po | 4 ++-- po/ca.po | 4 ++-- po/cs.po | 4 ++-- po/da.po | 4 ++-- po/de.po | 4 ++-- po/el.po | 4 ++-- po/en.po | 8 ++++---- po/en_US.po | 8 ++++---- po/eo.po | 4 ++-- po/es.po | 4 ++-- po/fa.po | 4 ++-- po/fi.po | 4 ++-- po/fr.po | 4 ++-- po/he.po | 4 ++-- po/hi.po | 4 ++-- po/hu.po | 4 ++-- po/it.po | 8 ++++---- po/ja.po | 4 ++-- po/ko.po | 4 ++-- po/lt.po | 4 ++-- po/ml.po | 4 ++-- po/nb_NO.po | 4 ++-- po/nl.po | 8 ++++---- po/or.po | 4 ++-- po/pa.po | 4 ++-- po/pl.po | 4 ++-- po/pt_BR.po | 4 ++-- po/pt_PT.po | 4 ++-- po/rm.po | 4 ++-- po/ro.po | 4 ++-- po/ru.po | 4 ++-- po/sk.po | 4 ++-- po/sl.po | 4 ++-- po/sr_RS(a)cyrillic.po | 4 ++-- po/sr_RS(a)latin.po | 6 +++--- po/sv.po | 4 ++-- po/te.po | 4 ++-- po/th.po | 4 ++-- po/tr.po | 4 ++-- po/uk.po | 4 ++-- po/wa.po | 4 ++-- po/wine.pot | 4 ++-- po/zh_CN.po | 4 ++-- po/zh_TW.po | 4 ++-- programs/winecfg/winecfg.rc | 4 ++-- 46 files changed, 101 insertions(+), 101 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=29fcdfe5330a87b200b44…
1
0
0
0
← Newer
1
...
33
34
35
36
37
38
39
...
55
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
Results per page:
10
25
50
100
200