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
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
June 2014
----- 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
4 participants
378 discussions
Start a n
N
ew thread
Nicolas Le Cam : winedbg: Remove unused variable.
by Alexandre Julliard
11 Jun '14
11 Jun '14
Module: wine Branch: master Commit: 81a904e72911d86475aef9999e827343285ec48c URL:
http://source.winehq.org/git/wine.git/?a=commit;h=81a904e72911d86475aef9999…
Author: Nicolas Le Cam <niko.lecam(a)gmail.com> Date: Mon Jun 2 00:21:11 2014 +0200 winedbg: Remove unused variable. --- programs/winedbg/be_x86_64.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/programs/winedbg/be_x86_64.c b/programs/winedbg/be_x86_64.c index 18032d4..8628025 100644 --- a/programs/winedbg/be_x86_64.c +++ b/programs/winedbg/be_x86_64.c @@ -347,7 +347,6 @@ static BOOL be_x86_64_is_func_call(const void* insn, ADDRESS64* callee) { BYTE ch; LONG delta; - short segment; unsigned op_size = 32, rex = 0; DWORD64 dst; @@ -383,7 +382,6 @@ static BOOL be_x86_64_is_func_call(const void* insn, ADDRESS64* callee) switch (f_reg(ch)) { case 0x02: - segment = dbg_context.SegCs; break; default: return FALSE; }
1
0
0
0
Nicolas Le Cam : mshtml/tests: Remove unused variable.
by Alexandre Julliard
11 Jun '14
11 Jun '14
Module: wine Branch: master Commit: b57a88482940d5adb2b65d1c103364e9909deeef URL:
http://source.winehq.org/git/wine.git/?a=commit;h=b57a88482940d5adb2b65d1c1…
Author: Nicolas Le Cam <niko.lecam(a)gmail.com> Date: Sun Jun 1 17:40:23 2014 +0200 mshtml/tests: Remove unused variable. --- dlls/mshtml/tests/events.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dlls/mshtml/tests/events.c b/dlls/mshtml/tests/events.c index 6755591..2f99699 100644 --- a/dlls/mshtml/tests/events.c +++ b/dlls/mshtml/tests/events.c @@ -88,7 +88,6 @@ DEFINE_EXPECT(iframe_onload); static HWND container_hwnd = NULL; static IHTMLWindow2 *window; static IOleDocumentView *view; -static BOOL xy_todo; static BOOL is_ie9plus; typedef struct { @@ -1638,8 +1637,6 @@ static void test_onclick(IHTMLDocument2 *doc) CHECK_CALLED(invoke_onclick); } - xy_todo = TRUE; - SET_EXPECT(div_onclick); SET_EXPECT(div_onclick_attached); SET_EXPECT(body_onclick); @@ -2757,7 +2754,6 @@ static void run_test(const char *str, testfunc_t test) MSG msg; HRESULT hres; - xy_todo = FALSE; doc = create_document(); if (!doc) return;
1
0
0
0
Nikolay Sivov : wbemprox/tests: Fix some test failures on older XP versions.
by Alexandre Julliard
11 Jun '14
11 Jun '14
Module: wine Branch: master Commit: ba111c79e492f4c5cb3f071d6f4a25761c8de794 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=ba111c79e492f4c5cb3f071d6…
Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jun 1 21:23:21 2014 +0400 wbemprox/tests: Fix some test failures on older XP versions. --- dlls/wbemprox/tests/services.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wbemprox/tests/services.c b/dlls/wbemprox/tests/services.c index b36748e..8ab6e83 100644 --- a/dlls/wbemprox/tests/services.c +++ b/dlls/wbemprox/tests/services.c @@ -131,7 +131,7 @@ static void test_IWbemLocator(void) { path8W, WBEM_E_INVALID_NAMESPACE }, { path9W, S_OK }, { path10W, WBEM_E_INVALID_PARAMETER }, - { path11W, S_OK }, + { path11W, S_OK, FALSE, WBEM_E_INVALID_PARAMETER }, { path12W, S_OK }, { path13W, S_OK }, { path14W, S_OK }, @@ -139,8 +139,8 @@ static void test_IWbemLocator(void) { path16W, S_OK }, { path17W, WBEM_E_INVALID_NAMESPACE }, { path18W, S_OK }, - { path19W, WBEM_E_INVALID_NAMESPACE }, - { path20W, WBEM_E_INVALID_NAMESPACE }, + { path19W, WBEM_E_INVALID_NAMESPACE, FALSE, WBEM_E_INVALID_PARAMETER }, + { path20W, WBEM_E_INVALID_NAMESPACE, FALSE, WBEM_E_INVALID_PARAMETER }, { path21W, S_OK }, { path22W, S_OK }, { path23W, WBEM_E_INVALID_NAMESPACE },
1
0
0
0
Michael Stefaniuc : dmusic: Lock/unlock the module only on creation/ destruction of the object.
by Alexandre Julliard
11 Jun '14
11 Jun '14
Module: wine Branch: master Commit: 1a7c0a6a70b3b7f4d07c032796d5b0d05a55ada6 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=1a7c0a6a70b3b7f4d07c03279…
Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sat May 31 20:12:31 2014 +0200 dmusic: Lock/unlock the module only on creation/destruction of the object. --- dlls/dmusic/collection.c | 9 ++++----- dlls/dmusic/download.c | 10 +++++----- dlls/dmusic/port.c | 6 ++---- 3 files changed, 11 insertions(+), 14 deletions(-) diff --git a/dlls/dmusic/collection.c b/dlls/dmusic/collection.c index 3d09815..2c826f5 100644 --- a/dlls/dmusic/collection.c +++ b/dlls/dmusic/collection.c @@ -92,8 +92,6 @@ static ULONG WINAPI IDirectMusicCollectionImpl_IDirectMusicCollection_AddRef(LPD TRACE("(%p/%p)->(): new ref = %u\n", iface, This, ref); - DMUSIC_LockModule(); - return ref; } @@ -104,10 +102,10 @@ static ULONG WINAPI IDirectMusicCollectionImpl_IDirectMusicCollection_Release(LP TRACE("(%p/%p)->(): new ref = %u\n", iface, This, ref); - if (!ref) + if (!ref) { HeapFree(GetProcessHeap(), 0, This); - - DMUSIC_UnlockModule(); + DMUSIC_UnlockModule(); + } return ref; } @@ -851,6 +849,7 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicCollectionImpl(LPCGUID lpcGUID, LPVOID* p obj->ref = 1; list_init (&obj->Instruments); + DMUSIC_LockModule(); hr = IDirectMusicCollection_QueryInterface(&obj->IDirectMusicCollection_iface, lpcGUID, ppobj); IDirectMusicCollection_Release(&obj->IDirectMusicCollection_iface); diff --git a/dlls/dmusic/download.c b/dlls/dmusic/download.c index cc2b024..a88ec2c 100644 --- a/dlls/dmusic/download.c +++ b/dlls/dmusic/download.c @@ -52,8 +52,6 @@ static ULONG WINAPI IDirectMusicDownloadImpl_AddRef(IDirectMusicDownload *iface) TRACE("(%p)->(): new ref = %u\n", iface, ref); - DMUSIC_LockModule(); - return ref; } @@ -64,10 +62,10 @@ static ULONG WINAPI IDirectMusicDownloadImpl_Release(IDirectMusicDownload *iface TRACE("(%p)->(): new ref = %u\n", iface, ref); - if (!ref) + if (!ref) { HeapFree(GetProcessHeap(), 0, This); - - DMUSIC_UnlockModule(); + DMUSIC_UnlockModule(); + } return ref; } @@ -102,5 +100,7 @@ HRESULT DMUSIC_CreateDirectMusicDownloadImpl(const GUID *guid, void **ret_iface, download->IDirectMusicDownload_iface.lpVtbl = &DirectMusicDownload_Vtbl; download->ref = 1; *ret_iface = download; + + DMUSIC_LockModule(); return S_OK; } diff --git a/dlls/dmusic/port.c b/dlls/dmusic/port.c index 9d42667..ad61ba5 100644 --- a/dlls/dmusic/port.c +++ b/dlls/dmusic/port.c @@ -70,8 +70,6 @@ static ULONG WINAPI IDirectMusicDownloadedInstrumentImpl_AddRef(LPDIRECTMUSICDOW TRACE("(%p)->(): new ref = %u\n", iface, ref); - DMUSIC_LockModule(); - return ref; } @@ -86,10 +84,9 @@ static ULONG WINAPI IDirectMusicDownloadedInstrumentImpl_Release(LPDIRECTMUSICDO { HeapFree(GetProcessHeap(), 0, This->data); HeapFree(GetProcessHeap(), 0, This); + DMUSIC_UnlockModule(); } - DMUSIC_UnlockModule(); - return ref; } @@ -123,6 +120,7 @@ static HRESULT DMUSIC_CreateDirectMusicDownloadedInstrumentImpl(IDirectMusicDown object->ref = 1; *instrument = &object->IDirectMusicDownloadedInstrument_iface; + DMUSIC_LockModule(); return S_OK; }
1
0
0
0
Michael Stefaniuc : dmusic: Don' t leak memory on DirectMusicInstrument creation failure.
by Alexandre Julliard
11 Jun '14
11 Jun '14
Module: wine Branch: master Commit: d67f35b9dce3c3656a7c32513d75fdec2c157aa6 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=d67f35b9dce3c3656a7c32513…
Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sat May 31 19:22:48 2014 +0200 dmusic: Don't leak memory on DirectMusicInstrument creation failure. Also lock/unlock the module only on creation/destruction of the object. --- dlls/dmusic/instrument.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/dmusic/instrument.c b/dlls/dmusic/instrument.c index 9df3e0c..87b31c1 100644 --- a/dlls/dmusic/instrument.c +++ b/dlls/dmusic/instrument.c @@ -62,8 +62,6 @@ static ULONG WINAPI IDirectMusicInstrumentImpl_AddRef(LPDIRECTMUSICINSTRUMENT if TRACE("(%p)->(): new ref = %u\n", iface, ref); - DMUSIC_LockModule(); - return ref; } @@ -83,10 +81,9 @@ static ULONG WINAPI IDirectMusicInstrumentImpl_Release(LPDIRECTMUSICINSTRUMENT i HeapFree(GetProcessHeap(), 0, This->articulations->connections); HeapFree(GetProcessHeap(), 0, This->articulations); HeapFree(GetProcessHeap(), 0, This); + DMUSIC_UnlockModule(); } - DMUSIC_UnlockModule(); - return ref; } @@ -125,16 +122,22 @@ static const IDirectMusicInstrumentVtbl DirectMusicInstrument_Vtbl = /* for ClassFactory */ HRESULT DMUSIC_CreateDirectMusicInstrumentImpl (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) { IDirectMusicInstrumentImpl* dminst; - + HRESULT hr; + dminst = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicInstrumentImpl)); if (NULL == dminst) { *ppobj = NULL; return E_OUTOFMEMORY; } dminst->IDirectMusicInstrument_iface.lpVtbl = &DirectMusicInstrument_Vtbl; - dminst->ref = 0; /* will be inited by QueryInterface */ - - return IDirectMusicInstrument_QueryInterface(&dminst->IDirectMusicInstrument_iface, lpcGUID, ppobj); + dminst->ref = 1; + + DMUSIC_LockModule(); + hr = IDirectMusicInstrument_QueryInterface(&dminst->IDirectMusicInstrument_iface, lpcGUID, + ppobj); + IDirectMusicInstrument_Release(&dminst->IDirectMusicInstrument_iface); + + return hr; } static HRESULT read_from_stream(IStream *stream, void *data, ULONG size)
1
0
0
0
Michael Stefaniuc : dmusic: Simplify the creation of a DirectMusic8 object.
by Alexandre Julliard
11 Jun '14
11 Jun '14
Module: wine Branch: master Commit: 096bfbd2143b07ca68441a7d8f722d38ce2dc3b2 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=096bfbd2143b07ca68441a7d8…
Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sat May 31 19:21:33 2014 +0200 dmusic: Simplify the creation of a DirectMusic8 object. Also lock/unlock the module only on creation/destruction of the object. --- dlls/dmusic/dmusic.c | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/dlls/dmusic/dmusic.c b/dlls/dmusic/dmusic.c index 30f69cc..28be851 100644 --- a/dlls/dmusic/dmusic.c +++ b/dlls/dmusic/dmusic.c @@ -61,8 +61,6 @@ static ULONG WINAPI IDirectMusic8Impl_AddRef(LPDIRECTMUSIC8 iface) TRACE("(%p)->(): new ref = %u\n", This, ref); - DMUSIC_LockModule(); - return ref; } @@ -78,10 +76,9 @@ static ULONG WINAPI IDirectMusic8Impl_Release(LPDIRECTMUSIC8 iface) HeapFree(GetProcessHeap(), 0, This->system_ports); HeapFree(GetProcessHeap(), 0, This->ppPorts); HeapFree(GetProcessHeap(), 0, This); + DMUSIC_UnlockModule(); } - DMUSIC_UnlockModule(); - return ref; } @@ -417,7 +414,7 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicImpl(LPCGUID riid, LPVOID* ret_iface, LPU return E_OUTOFMEMORY; dmusic->IDirectMusic8_iface.lpVtbl = &DirectMusic8_Vtbl; - dmusic->ref = 0; /* Will be inited by QueryInterface */ + dmusic->ref = 1; dmusic->pMasterClock = NULL; dmusic->ppPorts = NULL; dmusic->nrofports = 0; @@ -427,14 +424,11 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicImpl(LPCGUID riid, LPVOID* ret_iface, LPU return ret; } - ret = IDirectMusic8Impl_QueryInterface(&dmusic->IDirectMusic8_iface, riid, ret_iface); - if (FAILED(ret)) { - IReferenceClock_Release(&dmusic->pMasterClock->IReferenceClock_iface); - HeapFree(GetProcessHeap(), 0, dmusic); - return ret; - } - create_system_ports_list(dmusic); - return S_OK; + DMUSIC_LockModule(); + ret = IDirectMusic8Impl_QueryInterface(&dmusic->IDirectMusic8_iface, riid, ret_iface); + IDirectMusic8Impl_Release(&dmusic->IDirectMusic8_iface); + + return ret; }
1
0
0
0
Michael Stefaniuc : dmusic: Release the clock when destroying the IDirectMusic8 object.
by Alexandre Julliard
11 Jun '14
11 Jun '14
Module: wine Branch: master Commit: d82e2935e41da81bd9e5576046c362ea091d0fe1 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=d82e2935e41da81bd9e557604…
Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sat May 31 19:20:55 2014 +0200 dmusic: Release the clock when destroying the IDirectMusic8 object. --- dlls/dmusic/dmusic.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/dmusic/dmusic.c b/dlls/dmusic/dmusic.c index 6c837f7..30f69cc 100644 --- a/dlls/dmusic/dmusic.c +++ b/dlls/dmusic/dmusic.c @@ -74,6 +74,7 @@ static ULONG WINAPI IDirectMusic8Impl_Release(LPDIRECTMUSIC8 iface) TRACE("(%p)->(): new ref = %u\n", This, ref); if (!ref) { + IReferenceClock_Release(&This->pMasterClock->IReferenceClock_iface); HeapFree(GetProcessHeap(), 0, This->system_ports); HeapFree(GetProcessHeap(), 0, This->ppPorts); HeapFree(GetProcessHeap(), 0, This);
1
0
0
0
Michael Stefaniuc : dmusic: Don' t leak memory on IReferenceClock creation failure.
by Alexandre Julliard
11 Jun '14
11 Jun '14
Module: wine Branch: master Commit: 19eba06a2658d5abab32642071140414a0be18b6 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=19eba06a2658d5abab3264207…
Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sat May 31 19:20:14 2014 +0200 dmusic: Don't leak memory on IReferenceClock creation failure. Also lock/unlock the module only on creation/destruction of the object. --- dlls/dmusic/clock.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/dlls/dmusic/clock.c b/dlls/dmusic/clock.c index 2a8cd09..46a035f 100644 --- a/dlls/dmusic/clock.c +++ b/dlls/dmusic/clock.c @@ -50,8 +50,6 @@ static ULONG WINAPI IReferenceClockImpl_AddRef(IReferenceClock *iface) TRACE("(%p)->(): new ref = %u\n", This, ref); - DMUSIC_LockModule(); - return ref; } @@ -62,10 +60,10 @@ static ULONG WINAPI IReferenceClockImpl_Release(IReferenceClock *iface) TRACE("(%p)->(): new ref = %u\n", This, ref); - if (!ref) + if (!ref) { HeapFree(GetProcessHeap(), 0, This); - - DMUSIC_UnlockModule(); + DMUSIC_UnlockModule(); + } return ref; } @@ -123,6 +121,7 @@ static const IReferenceClockVtbl ReferenceClock_Vtbl = { HRESULT DMUSIC_CreateReferenceClockImpl(LPCGUID riid, LPVOID* ret_iface, LPUNKNOWN unkouter) { IReferenceClockImpl* clock; + HRESULT hr; TRACE("(%p,%p,%p)\n", riid, ret_iface, unkouter); @@ -133,9 +132,13 @@ HRESULT DMUSIC_CreateReferenceClockImpl(LPCGUID riid, LPVOID* ret_iface, LPUNKNO } clock->IReferenceClock_iface.lpVtbl = &ReferenceClock_Vtbl; - clock->ref = 0; /* Will be inited by QueryInterface */ + clock->ref = 1; clock->rtTime = 0; clock->pClockInfo.dwSize = sizeof (DMUS_CLOCKINFO); - return IReferenceClockImpl_QueryInterface((IReferenceClock*)clock, riid, ret_iface); + DMUSIC_LockModule(); + hr = IReferenceClockImpl_QueryInterface(&clock->IReferenceClock_iface, riid, ret_iface); + IReferenceClockImpl_Release(&clock->IReferenceClock_iface); + + return hr; }
1
0
0
0
Michael Stefaniuc : dmusic: Simplify the creation of a DirectMusicBuffer object.
by Alexandre Julliard
11 Jun '14
11 Jun '14
Module: wine Branch: master Commit: 57eb95a2ea19d555435a5ab0eaa1976426d8c1cd URL:
http://source.winehq.org/git/wine.git/?a=commit;h=57eb95a2ea19d555435a5ab0e…
Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sat May 31 19:18:55 2014 +0200 dmusic: Simplify the creation of a DirectMusicBuffer object. Also lock/unlock the module only on creation/destruction of the object. --- dlls/dmusic/buffer.c | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/dlls/dmusic/buffer.c b/dlls/dmusic/buffer.c index 35cbd88..bd0ad1a 100644 --- a/dlls/dmusic/buffer.c +++ b/dlls/dmusic/buffer.c @@ -57,8 +57,6 @@ static ULONG WINAPI IDirectMusicBufferImpl_AddRef(LPDIRECTMUSICBUFFER iface) TRACE("(%p)->(): new ref = %u\n", iface, ref); - DMUSIC_LockModule(); - return ref; } @@ -72,10 +70,9 @@ static ULONG WINAPI IDirectMusicBufferImpl_Release(LPDIRECTMUSICBUFFER iface) if (!ref) { HeapFree(GetProcessHeap(), 0, This->data); HeapFree(GetProcessHeap(), 0, This); + DMUSIC_UnlockModule(); } - DMUSIC_UnlockModule(); - return ref; } @@ -279,7 +276,6 @@ static const IDirectMusicBufferVtbl DirectMusicBuffer_Vtbl = { HRESULT DMUSIC_CreateDirectMusicBufferImpl(LPDMUS_BUFFERDESC desc, LPVOID* ret_iface) { IDirectMusicBufferImpl* dmbuffer; - HRESULT hr; TRACE("(%p, %p)\n", desc, ret_iface); @@ -290,7 +286,7 @@ HRESULT DMUSIC_CreateDirectMusicBufferImpl(LPDMUS_BUFFERDESC desc, LPVOID* ret_i return E_OUTOFMEMORY; dmbuffer->IDirectMusicBuffer_iface.lpVtbl = &DirectMusicBuffer_Vtbl; - dmbuffer->ref = 0; /* Will be inited by QueryInterface */ + dmbuffer->ref = 1; if (IsEqualGUID(&desc->guidBufferFormat, &GUID_NULL)) dmbuffer->format = KSDATAFORMAT_SUBTYPE_MIDI; @@ -304,12 +300,8 @@ HRESULT DMUSIC_CreateDirectMusicBufferImpl(LPDMUS_BUFFERDESC desc, LPVOID* ret_i return E_OUTOFMEMORY; } - hr = IDirectMusicBufferImpl_QueryInterface((LPDIRECTMUSICBUFFER)dmbuffer, &IID_IDirectMusicBuffer, ret_iface); - if (FAILED(hr)) - { - HeapFree(GetProcessHeap(), 0, dmbuffer->data); - HeapFree(GetProcessHeap(), 0, dmbuffer); - } + DMUSIC_LockModule(); + *ret_iface = &dmbuffer->IDirectMusicBuffer_iface; - return hr; + return S_OK; }
1
0
0
0
Michael Stefaniuc : dmscript/tests: Test some IPersistStream methods of DMScriptTrack.
by Alexandre Julliard
11 Jun '14
11 Jun '14
Module: wine Branch: master Commit: 19b6c4cfc77e05e4ea21de59096e02a9c3ee6d5f URL:
http://source.winehq.org/git/wine.git/?a=commit;h=19b6c4cfc77e05e4ea21de590…
Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri May 30 23:09:20 2014 +0200 dmscript/tests: Test some IPersistStream methods of DMScriptTrack. --- dlls/dmscript/tests/dmscript.c | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/dlls/dmscript/tests/dmscript.c b/dlls/dmscript/tests/dmscript.c index 204cf7c..02fddc3 100644 --- a/dlls/dmscript/tests/dmscript.c +++ b/dlls/dmscript/tests/dmscript.c @@ -202,6 +202,37 @@ static void test_dmscript(void) while (IDirectMusicScript_Release(dms)); } +static void test_scripttrack(void) +{ + IDirectMusicTrack *dmt; + IPersistStream *ps; + CLSID class; + ULARGE_INTEGER size; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_DirectMusicScriptTrack, NULL, CLSCTX_INPROC_SERVER, + &IID_IDirectMusicTrack, (void**)&dmt); + ok(hr == S_OK, "DirectMusicScriptTrack create failed: %08x, expected S_OK\n", hr); + + /* IPersistStream */ + hr = IDirectMusicTrack_QueryInterface(dmt, &IID_IPersistStream, (void**)&ps); + ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr); + hr = IPersistStream_GetClassID(ps, &class); + todo_wine ok(hr == S_OK, "IPersistStream_GetClassID failed: %08x\n", hr); + todo_wine ok(IsEqualGUID(&class, &CLSID_DirectMusicScriptTrack), + "Expected class CLSID_DirectMusicScriptTrack got %s\n", wine_dbgstr_guid(&class)); + + /* Unimplemented IPersistStream methods */ + hr = IPersistStream_IsDirty(ps); + todo_wine ok(hr == S_FALSE, "IPersistStream_IsDirty failed: %08x\n", hr); + hr = IPersistStream_GetSizeMax(ps, &size); + ok(hr == E_NOTIMPL, "IPersistStream_GetSizeMax failed: %08x\n", hr); + hr = IPersistStream_Save(ps, NULL, TRUE); + ok(hr == E_NOTIMPL, "IPersistStream_Save failed: %08x\n", hr); + + while (IDirectMusicTrack_Release(dmt)); +} + START_TEST(dmscript) { CoInitialize(NULL); @@ -215,6 +246,7 @@ START_TEST(dmscript) test_COM(); test_COM_scripttrack(); test_dmscript(); + test_scripttrack(); CoUninitialize(); }
1
0
0
0
← Newer
1
...
30
31
32
33
34
35
36
37
38
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
Results per page:
10
25
50
100
200