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 2015
----- 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
610 discussions
Start a n
N
ew thread
Michael Stefaniuc : dmstyle: Remove the extraneous IUnknown from DMAuditionTrack.
by Alexandre Julliard
30 Jun '15
30 Jun '15
Module: wine Branch: master Commit: 6f9f3db32c34a2b0a79ea0a6cdb162dfaa612426 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=6f9f3db32c34a2b0a79ea0a6c…
Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jun 30 09:24:55 2015 +0200 dmstyle: Remove the extraneous IUnknown from DMAuditionTrack. Also lock/unlock the module only on creation/destruction of the object. --- dlls/dmstyle/auditiontrack.c | 127 +++++++++++++++++-------------------------- 1 file changed, 50 insertions(+), 77 deletions(-) diff --git a/dlls/dmstyle/auditiontrack.c b/dlls/dmstyle/auditiontrack.c index fa9eec8..025658b 100644 --- a/dlls/dmstyle/auditiontrack.c +++ b/dlls/dmstyle/auditiontrack.c @@ -21,76 +21,16 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmstyle); -static ULONG WINAPI IDirectMusicAuditionTrack_IUnknown_AddRef (LPUNKNOWN iface); -static ULONG WINAPI IDirectMusicAuditionTrack_IPersistStream_AddRef (LPPERSISTSTREAM iface); - /***************************************************************************** * IDirectMusicAuditionTrack implementation */ typedef struct IDirectMusicAuditionTrack { - const IUnknownVtbl *UnknownVtbl; IDirectMusicTrack8 IDirectMusicTrack8_iface; const IPersistStreamVtbl *PersistStreamVtbl; LONG ref; DMUS_OBJECTDESC *pDesc; } IDirectMusicAuditionTrack; -/* IDirectMusicAuditionTrack IUnknown part: */ -static HRESULT WINAPI IDirectMusicAuditionTrack_IUnknown_QueryInterface (LPUNKNOWN iface, REFIID riid, LPVOID *ppobj) { - ICOM_THIS_MULTI(IDirectMusicAuditionTrack, UnknownVtbl, iface); - TRACE("(%p, %s, %p)\n", This, debugstr_dmguid(riid), ppobj); - - if (IsEqualIID (riid, &IID_IUnknown)) { - *ppobj = &This->UnknownVtbl; - IDirectMusicAuditionTrack_IUnknown_AddRef ((LPUNKNOWN)&This->UnknownVtbl); - return S_OK; - } else if (IsEqualIID (riid, &IID_IDirectMusicTrack) - || IsEqualIID (riid, &IID_IDirectMusicTrack8)) { - *ppobj = &This->IDirectMusicTrack8_iface; - IDirectMusicTrack8_AddRef (&This->IDirectMusicTrack8_iface); - return S_OK; - } else if (IsEqualIID (riid, &IID_IPersistStream)) { - *ppobj = &This->PersistStreamVtbl; - IDirectMusicAuditionTrack_IPersistStream_AddRef ((LPPERSISTSTREAM)&This->PersistStreamVtbl); - return S_OK; - } - - WARN("(%p, %s, %p): not found\n", This, debugstr_dmguid(riid), ppobj); - return E_NOINTERFACE; -} - -static ULONG WINAPI IDirectMusicAuditionTrack_IUnknown_AddRef (LPUNKNOWN iface) { - ICOM_THIS_MULTI(IDirectMusicAuditionTrack, UnknownVtbl, iface); - ULONG ref = InterlockedIncrement(&This->ref); - - TRACE("(%p): AddRef from %d\n", This, ref - 1); - - DMSTYLE_LockModule(); - - return ref; -} - -static ULONG WINAPI IDirectMusicAuditionTrack_IUnknown_Release (LPUNKNOWN iface) { - ICOM_THIS_MULTI(IDirectMusicAuditionTrack, UnknownVtbl, iface); - ULONG ref = InterlockedDecrement(&This->ref); - - TRACE("(%p): ReleaseRef to %d\n", This, ref); - - if (ref == 0) { - HeapFree(GetProcessHeap(), 0, This); - } - - DMSTYLE_UnlockModule(); - - return ref; -} - -static const IUnknownVtbl DirectMusicAuditionTrack_Unknown_Vtbl = { - IDirectMusicAuditionTrack_IUnknown_QueryInterface, - IDirectMusicAuditionTrack_IUnknown_AddRef, - IDirectMusicAuditionTrack_IUnknown_Release -}; - /* IDirectMusicAuditionTrack IDirectMusicTrack8 part: */ static inline IDirectMusicAuditionTrack *impl_from_IDirectMusicTrack8(IDirectMusicTrack8 *iface) { @@ -98,22 +38,51 @@ static inline IDirectMusicAuditionTrack *impl_from_IDirectMusicTrack8(IDirectMus } static HRESULT WINAPI IDirectMusicTrack8Impl_QueryInterface(IDirectMusicTrack8 *iface, REFIID riid, - void **ppobj) + void **ret_iface) { IDirectMusicAuditionTrack *This = impl_from_IDirectMusicTrack8(iface); - return IDirectMusicAuditionTrack_IUnknown_QueryInterface ((LPUNKNOWN)&This->UnknownVtbl, riid, ppobj); + + TRACE("(%p, %s, %p)\n", This, debugstr_dmguid(riid), ret_iface); + + *ret_iface = NULL; + + if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IDirectMusicTrack) || + IsEqualIID(riid, &IID_IDirectMusicTrack8)) + *ret_iface = iface; + else if (IsEqualIID(riid, &IID_IPersistStream)) + *ret_iface = &This->PersistStreamVtbl; + else { + WARN("(%p, %s, %p): not found\n", This, debugstr_dmguid(riid), ret_iface); + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ret_iface); + return S_OK; } static ULONG WINAPI IDirectMusicTrack8Impl_AddRef(IDirectMusicTrack8 *iface) { IDirectMusicAuditionTrack *This = impl_from_IDirectMusicTrack8(iface); - return IDirectMusicAuditionTrack_IUnknown_AddRef ((LPUNKNOWN)&This->UnknownVtbl); + LONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + return ref; } static ULONG WINAPI IDirectMusicTrack8Impl_Release(IDirectMusicTrack8 *iface) { IDirectMusicAuditionTrack *This = impl_from_IDirectMusicTrack8(iface); - return IDirectMusicAuditionTrack_IUnknown_Release ((LPUNKNOWN)&This->UnknownVtbl); + LONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + if (!ref) { + HeapFree(GetProcessHeap(), 0, This); + DMSTYLE_UnlockModule(); + } + + return ref; } static HRESULT WINAPI IDirectMusicTrack8Impl_Init(IDirectMusicTrack8 *iface, @@ -276,17 +245,17 @@ static const IDirectMusicTrack8Vtbl dmtrack8_vtbl = { /* IDirectMusicAuditionTrack IPersistStream part: */ static HRESULT WINAPI IDirectMusicAuditionTrack_IPersistStream_QueryInterface (LPPERSISTSTREAM iface, REFIID riid, LPVOID *ppobj) { ICOM_THIS_MULTI(IDirectMusicAuditionTrack, PersistStreamVtbl, iface); - return IDirectMusicAuditionTrack_IUnknown_QueryInterface ((LPUNKNOWN)&This->UnknownVtbl, riid, ppobj); + return IDirectMusicTrack8_QueryInterface(&This->IDirectMusicTrack8_iface, riid, ppobj); } static ULONG WINAPI IDirectMusicAuditionTrack_IPersistStream_AddRef (LPPERSISTSTREAM iface) { ICOM_THIS_MULTI(IDirectMusicAuditionTrack, PersistStreamVtbl, iface); - return IDirectMusicAuditionTrack_IUnknown_AddRef ((LPUNKNOWN)&This->UnknownVtbl); + return IDirectMusicTrack8_AddRef(&This->IDirectMusicTrack8_iface); } static ULONG WINAPI IDirectMusicAuditionTrack_IPersistStream_Release (LPPERSISTSTREAM iface) { ICOM_THIS_MULTI(IDirectMusicAuditionTrack, PersistStreamVtbl, iface); - return IDirectMusicAuditionTrack_IUnknown_Release ((LPUNKNOWN)&This->UnknownVtbl); + return IDirectMusicTrack8_Release(&This->IDirectMusicTrack8_iface); } static HRESULT WINAPI IDirectMusicAuditionTrack_IPersistStream_GetClassID (LPPERSISTSTREAM iface, CLSID* pClassID) { @@ -324,21 +293,25 @@ static const IPersistStreamVtbl DirectMusicAuditionTrack_PersistStream_Vtbl = { /* for ClassFactory */ HRESULT WINAPI create_dmauditiontrack(REFIID lpcGUID, void **ppobj) { - IDirectMusicAuditionTrack* track; - - track = HeapAlloc (GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicAuditionTrack)); - if (NULL == track) { - *ppobj = NULL; - return E_OUTOFMEMORY; - } - track->UnknownVtbl = &DirectMusicAuditionTrack_Unknown_Vtbl; + IDirectMusicAuditionTrack *track; + HRESULT hr; + + track = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*track)); + if (!track) { + *ppobj = NULL; + return E_OUTOFMEMORY; + } track->IDirectMusicTrack8_iface.lpVtbl = &dmtrack8_vtbl; track->PersistStreamVtbl = &DirectMusicAuditionTrack_PersistStream_Vtbl; track->pDesc = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(DMUS_OBJECTDESC)); DM_STRUCT_INIT(track->pDesc); track->pDesc->dwValidData |= DMUS_OBJ_CLASS; track->pDesc->guidClass = CLSID_DirectMusicAuditionTrack; - track->ref = 0; /* will be inited by QueryInterface */ + track->ref = 1; + + DMSTYLE_LockModule(); + hr = IDirectMusicTrack8_QueryInterface(&track->IDirectMusicTrack8_iface, lpcGUID, ppobj); + IDirectMusicTrack8_Release(&track->IDirectMusicTrack8_iface); - return IDirectMusicAuditionTrack_IUnknown_QueryInterface ((LPUNKNOWN)&track->UnknownVtbl, lpcGUID, ppobj); + return hr; }
1
0
0
0
Michael Stefaniuc : dmstyle: COM cleanup for IDirectMusicTrack8 of DMAuditionTrack.
by Alexandre Julliard
30 Jun '15
30 Jun '15
Module: wine Branch: master Commit: 55a085f5e8468ebd14ef858c8a20bd217ce69c6f URL:
http://source.winehq.org/git/wine.git/?a=commit;h=55a085f5e8468ebd14ef858c8…
Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jun 30 09:24:02 2015 +0200 dmstyle: COM cleanup for IDirectMusicTrack8 of DMAuditionTrack. --- dlls/dmstyle/auditiontrack.c | 138 ++++++++++++++++++++++++++----------------- 1 file changed, 83 insertions(+), 55 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=55a085f5e8468ebd14ef8…
1
0
0
0
Michael Stefaniuc : dmstyle: Use the generic IPersistStream for DMMuteTrack.
by Alexandre Julliard
30 Jun '15
30 Jun '15
Module: wine Branch: master Commit: 2387bbfe3b51b3d6a93d26d9163dce4d70592016 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=2387bbfe3b51b3d6a93d26d91…
Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jun 30 09:23:26 2015 +0200 dmstyle: Use the generic IPersistStream for DMMuteTrack. --- dlls/dmstyle/mutetrack.c | 67 +++++++++++++------------------------------- dlls/dmstyle/tests/dmstyle.c | 2 +- 2 files changed, 21 insertions(+), 48 deletions(-) diff --git a/dlls/dmstyle/mutetrack.c b/dlls/dmstyle/mutetrack.c index 89e13ca..c912ee0 100644 --- a/dlls/dmstyle/mutetrack.c +++ b/dlls/dmstyle/mutetrack.c @@ -18,6 +18,7 @@ */ #include "dmstyle_private.h" +#include "dmobject.h" WINE_DEFAULT_DEBUG_CHANNEL(dmstyle); @@ -26,9 +27,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmstyle); */ typedef struct IDirectMusicMuteTrack { IDirectMusicTrack8 IDirectMusicTrack8_iface; - const IPersistStreamVtbl *PersistStreamVtbl; + struct dmobject dmobj; /* IPersistStream only */ LONG ref; - DMUS_OBJECTDESC *pDesc; } IDirectMusicMuteTrack; /* IDirectMusicMuteTrack IDirectMusicTrack8 part: */ @@ -50,7 +50,7 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_QueryInterface(IDirectMusicTrack8 * IsEqualIID(riid, &IID_IDirectMusicTrack8)) *ret_iface = iface; else if (IsEqualIID(riid, &IID_IPersistStream)) - *ret_iface = &This->PersistStreamVtbl; + *ret_iface = &This->dmobj.IPersistStream_iface; else { WARN("(%p, %s, %p): not found\n", This, debugstr_dmguid(riid), ret_iface); return E_NOINTERFACE; @@ -247,52 +247,27 @@ static const IDirectMusicTrack8Vtbl dmtrack8_vtbl = { IDirectMusicTrack8Impl_Join }; -/* IDirectMusicMuteTrack IPersistStream part: */ -static HRESULT WINAPI IDirectMusicMuteTrack_IPersistStream_QueryInterface (LPPERSISTSTREAM iface, REFIID riid, LPVOID *ppobj) { - ICOM_THIS_MULTI(IDirectMusicMuteTrack, PersistStreamVtbl, iface); - return IDirectMusicTrack8_QueryInterface(&This->IDirectMusicTrack8_iface, riid, ppobj); -} - -static ULONG WINAPI IDirectMusicMuteTrack_IPersistStream_AddRef (LPPERSISTSTREAM iface) { - ICOM_THIS_MULTI(IDirectMusicMuteTrack, PersistStreamVtbl, iface); - return IDirectMusicTrack8_AddRef(&This->IDirectMusicTrack8_iface); -} - -static ULONG WINAPI IDirectMusicMuteTrack_IPersistStream_Release (LPPERSISTSTREAM iface) { - ICOM_THIS_MULTI(IDirectMusicMuteTrack, PersistStreamVtbl, iface); - return IDirectMusicTrack8_Release(&This->IDirectMusicTrack8_iface); -} - -static HRESULT WINAPI IDirectMusicMuteTrack_IPersistStream_GetClassID (LPPERSISTSTREAM iface, CLSID* pClassID) { - return E_NOTIMPL; -} - -static HRESULT WINAPI IDirectMusicMuteTrack_IPersistStream_IsDirty (LPPERSISTSTREAM iface) { - return E_NOTIMPL; -} - -static HRESULT WINAPI IDirectMusicMuteTrack_IPersistStream_Load (LPPERSISTSTREAM iface, IStream* pStm) { +static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *stream) +{ FIXME(": Loading not implemented yet\n"); return S_OK; } -static HRESULT WINAPI IDirectMusicMuteTrack_IPersistStream_Save (LPPERSISTSTREAM iface, IStream* pStm, BOOL fClearDirty) { - return E_NOTIMPL; -} - -static HRESULT WINAPI IDirectMusicMuteTrack_IPersistStream_GetSizeMax (LPPERSISTSTREAM iface, ULARGE_INTEGER* pcbSize) { +static HRESULT WINAPI IPersistStreamImpl_Save(IPersistStream *iface, IStream *stream, + BOOL cleardirty) +{ return E_NOTIMPL; } -static const IPersistStreamVtbl DirectMusicMuteTrack_PersistStream_Vtbl = { - IDirectMusicMuteTrack_IPersistStream_QueryInterface, - IDirectMusicMuteTrack_IPersistStream_AddRef, - IDirectMusicMuteTrack_IPersistStream_Release, - IDirectMusicMuteTrack_IPersistStream_GetClassID, - IDirectMusicMuteTrack_IPersistStream_IsDirty, - IDirectMusicMuteTrack_IPersistStream_Load, - IDirectMusicMuteTrack_IPersistStream_Save, - IDirectMusicMuteTrack_IPersistStream_GetSizeMax +static const IPersistStreamVtbl persiststream_vtbl = { + dmobj_IPersistStream_QueryInterface, + dmobj_IPersistStream_AddRef, + dmobj_IPersistStream_Release, + dmobj_IPersistStream_GetClassID, + unimpl_IPersistStream_IsDirty, + IPersistStreamImpl_Load, + IPersistStreamImpl_Save, + unimpl_IPersistStream_GetSizeMax }; /* for ClassFactory */ @@ -307,12 +282,10 @@ HRESULT WINAPI create_dmmutetrack(REFIID lpcGUID, void **ppobj) return E_OUTOFMEMORY; } track->IDirectMusicTrack8_iface.lpVtbl = &dmtrack8_vtbl; - track->PersistStreamVtbl = &DirectMusicMuteTrack_PersistStream_Vtbl; - track->pDesc = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(DMUS_OBJECTDESC)); - DM_STRUCT_INIT(track->pDesc); - track->pDesc->dwValidData |= DMUS_OBJ_CLASS; - track->pDesc->guidClass = CLSID_DirectMusicMuteTrack; track->ref = 1; + dmobject_init(&track->dmobj, &CLSID_DirectMusicMuteTrack, + (IUnknown *)&track->IDirectMusicTrack8_iface); + track->dmobj.IPersistStream_iface.lpVtbl = &persiststream_vtbl; DMSTYLE_LockModule(); hr = IDirectMusicTrack8_QueryInterface(&track->IDirectMusicTrack8_iface, lpcGUID, ppobj); diff --git a/dlls/dmstyle/tests/dmstyle.c b/dlls/dmstyle/tests/dmstyle.c index 0c585fe..426ba0d 100644 --- a/dlls/dmstyle/tests/dmstyle.c +++ b/dlls/dmstyle/tests/dmstyle.c @@ -258,7 +258,7 @@ static void test_track(void) { X(DirectMusicChordTrack), TRUE, TRUE, FALSE }, { X(DirectMusicCommandTrack), TRUE, TRUE, TRUE }, { X(DirectMusicMotifTrack), FALSE, FALSE, TRUE }, - { X(DirectMusicMuteTrack), TRUE, FALSE, TRUE }, + { X(DirectMusicMuteTrack), TRUE, FALSE, FALSE }, { X(DirectMusicStyleTrack), FALSE, TRUE, FALSE }, }; #undef X
1
0
0
0
Michael Stefaniuc : dmstyle: Remove the extraneous IUnknown from DMMuteTrack.
by Alexandre Julliard
30 Jun '15
30 Jun '15
Module: wine Branch: master Commit: 43c9f3a0bc10e3ac37d29d436f017c6efb5702b0 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=43c9f3a0bc10e3ac37d29d436…
Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jun 30 09:22:51 2015 +0200 dmstyle: Remove the extraneous IUnknown from DMMuteTrack. Also lock/unlock the module only on creation/destruction of the object. --- dlls/dmstyle/mutetrack.c | 127 +++++++++++++++++++---------------------------- 1 file changed, 50 insertions(+), 77 deletions(-) diff --git a/dlls/dmstyle/mutetrack.c b/dlls/dmstyle/mutetrack.c index 58b11f2..89e13ca 100644 --- a/dlls/dmstyle/mutetrack.c +++ b/dlls/dmstyle/mutetrack.c @@ -21,76 +21,16 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmstyle); -static ULONG WINAPI IDirectMusicMuteTrack_IUnknown_AddRef (LPUNKNOWN iface); -static ULONG WINAPI IDirectMusicMuteTrack_IPersistStream_AddRef (LPPERSISTSTREAM iface); - /***************************************************************************** * IDirectMusicMuteTrack implementation */ typedef struct IDirectMusicMuteTrack { - const IUnknownVtbl *UnknownVtbl; IDirectMusicTrack8 IDirectMusicTrack8_iface; const IPersistStreamVtbl *PersistStreamVtbl; LONG ref; DMUS_OBJECTDESC *pDesc; } IDirectMusicMuteTrack; -/* IDirectMusicMuteTrack IUnknown part: */ -static HRESULT WINAPI IDirectMusicMuteTrack_IUnknown_QueryInterface (LPUNKNOWN iface, REFIID riid, LPVOID *ppobj) { - ICOM_THIS_MULTI(IDirectMusicMuteTrack, UnknownVtbl, iface); - TRACE("(%p, %s, %p)\n", This, debugstr_dmguid(riid), ppobj); - - if (IsEqualIID (riid, &IID_IUnknown)) { - *ppobj = &This->UnknownVtbl; - IDirectMusicMuteTrack_IUnknown_AddRef ((LPUNKNOWN)&This->UnknownVtbl); - return S_OK; - } else if (IsEqualIID (riid, &IID_IDirectMusicTrack) - || IsEqualIID (riid, &IID_IDirectMusicTrack8)) { - *ppobj = &This->IDirectMusicTrack8_iface; - IDirectMusicTrack8_AddRef (&This->IDirectMusicTrack8_iface); - return S_OK; - } else if (IsEqualIID (riid, &IID_IPersistStream)) { - *ppobj = &This->PersistStreamVtbl; - IDirectMusicMuteTrack_IPersistStream_AddRef ((LPPERSISTSTREAM)&This->PersistStreamVtbl); - return S_OK; - } - - WARN("(%p, %s, %p): not found\n", This, debugstr_dmguid(riid), ppobj); - return E_NOINTERFACE; -} - -static ULONG WINAPI IDirectMusicMuteTrack_IUnknown_AddRef (LPUNKNOWN iface) { - ICOM_THIS_MULTI(IDirectMusicMuteTrack, UnknownVtbl, iface); - ULONG ref = InterlockedIncrement(&This->ref); - - TRACE("(%p): AddRef from %d\n", This, ref - 1); - - DMSTYLE_LockModule(); - - return ref; -} - -static ULONG WINAPI IDirectMusicMuteTrack_IUnknown_Release (LPUNKNOWN iface) { - ICOM_THIS_MULTI(IDirectMusicMuteTrack, UnknownVtbl, iface); - ULONG ref = InterlockedDecrement(&This->ref); - - TRACE("(%p): ReleaseRef to %d\n", This, ref); - - if (ref == 0) { - HeapFree(GetProcessHeap(), 0, This); - } - - DMSTYLE_UnlockModule(); - - return ref; -} - -static const IUnknownVtbl DirectMusicMuteTrack_Unknown_Vtbl = { - IDirectMusicMuteTrack_IUnknown_QueryInterface, - IDirectMusicMuteTrack_IUnknown_AddRef, - IDirectMusicMuteTrack_IUnknown_Release -}; - /* IDirectMusicMuteTrack IDirectMusicTrack8 part: */ static inline IDirectMusicMuteTrack *impl_from_IDirectMusicTrack8(IDirectMusicTrack8 *iface) { @@ -98,22 +38,51 @@ static inline IDirectMusicMuteTrack *impl_from_IDirectMusicTrack8(IDirectMusicTr } static HRESULT WINAPI IDirectMusicTrack8Impl_QueryInterface(IDirectMusicTrack8 *iface, REFIID riid, - void **ppobj) + void **ret_iface) { IDirectMusicMuteTrack *This = impl_from_IDirectMusicTrack8(iface); - return IDirectMusicMuteTrack_IUnknown_QueryInterface ((LPUNKNOWN)&This->UnknownVtbl, riid, ppobj); + + TRACE("(%p, %s, %p)\n", This, debugstr_dmguid(riid), ret_iface); + + *ret_iface = NULL; + + if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IDirectMusicTrack) || + IsEqualIID(riid, &IID_IDirectMusicTrack8)) + *ret_iface = iface; + else if (IsEqualIID(riid, &IID_IPersistStream)) + *ret_iface = &This->PersistStreamVtbl; + else { + WARN("(%p, %s, %p): not found\n", This, debugstr_dmguid(riid), ret_iface); + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ret_iface); + return S_OK; } static ULONG WINAPI IDirectMusicTrack8Impl_AddRef(IDirectMusicTrack8 *iface) { IDirectMusicMuteTrack *This = impl_from_IDirectMusicTrack8(iface); - return IDirectMusicMuteTrack_IUnknown_AddRef ((LPUNKNOWN)&This->UnknownVtbl); + LONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + return ref; } static ULONG WINAPI IDirectMusicTrack8Impl_Release(IDirectMusicTrack8 *iface) { IDirectMusicMuteTrack *This = impl_from_IDirectMusicTrack8(iface); - return IDirectMusicMuteTrack_IUnknown_Release ((LPUNKNOWN)&This->UnknownVtbl); + LONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + if (!ref) { + HeapFree(GetProcessHeap(), 0, This); + DMSTYLE_UnlockModule(); + } + + return ref; } static HRESULT WINAPI IDirectMusicTrack8Impl_Init(IDirectMusicTrack8 *iface, @@ -281,17 +250,17 @@ static const IDirectMusicTrack8Vtbl dmtrack8_vtbl = { /* IDirectMusicMuteTrack IPersistStream part: */ static HRESULT WINAPI IDirectMusicMuteTrack_IPersistStream_QueryInterface (LPPERSISTSTREAM iface, REFIID riid, LPVOID *ppobj) { ICOM_THIS_MULTI(IDirectMusicMuteTrack, PersistStreamVtbl, iface); - return IDirectMusicMuteTrack_IUnknown_QueryInterface ((LPUNKNOWN)&This->UnknownVtbl, riid, ppobj); + return IDirectMusicTrack8_QueryInterface(&This->IDirectMusicTrack8_iface, riid, ppobj); } static ULONG WINAPI IDirectMusicMuteTrack_IPersistStream_AddRef (LPPERSISTSTREAM iface) { ICOM_THIS_MULTI(IDirectMusicMuteTrack, PersistStreamVtbl, iface); - return IDirectMusicMuteTrack_IUnknown_AddRef ((LPUNKNOWN)&This->UnknownVtbl); + return IDirectMusicTrack8_AddRef(&This->IDirectMusicTrack8_iface); } static ULONG WINAPI IDirectMusicMuteTrack_IPersistStream_Release (LPPERSISTSTREAM iface) { ICOM_THIS_MULTI(IDirectMusicMuteTrack, PersistStreamVtbl, iface); - return IDirectMusicMuteTrack_IUnknown_Release ((LPUNKNOWN)&This->UnknownVtbl); + return IDirectMusicTrack8_Release(&This->IDirectMusicTrack8_iface); } static HRESULT WINAPI IDirectMusicMuteTrack_IPersistStream_GetClassID (LPPERSISTSTREAM iface, CLSID* pClassID) { @@ -329,21 +298,25 @@ static const IPersistStreamVtbl DirectMusicMuteTrack_PersistStream_Vtbl = { /* for ClassFactory */ HRESULT WINAPI create_dmmutetrack(REFIID lpcGUID, void **ppobj) { - IDirectMusicMuteTrack* track; - - track = HeapAlloc (GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicMuteTrack)); - if (NULL == track) { - *ppobj = NULL; - return E_OUTOFMEMORY; - } - track->UnknownVtbl = &DirectMusicMuteTrack_Unknown_Vtbl; + IDirectMusicMuteTrack *track; + HRESULT hr; + + track = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*track)); + if (!track) { + *ppobj = NULL; + return E_OUTOFMEMORY; + } track->IDirectMusicTrack8_iface.lpVtbl = &dmtrack8_vtbl; track->PersistStreamVtbl = &DirectMusicMuteTrack_PersistStream_Vtbl; track->pDesc = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(DMUS_OBJECTDESC)); DM_STRUCT_INIT(track->pDesc); track->pDesc->dwValidData |= DMUS_OBJ_CLASS; track->pDesc->guidClass = CLSID_DirectMusicMuteTrack; - track->ref = 0; /* will be inited by QueryInterface */ + track->ref = 1; + + DMSTYLE_LockModule(); + hr = IDirectMusicTrack8_QueryInterface(&track->IDirectMusicTrack8_iface, lpcGUID, ppobj); + IDirectMusicTrack8_Release(&track->IDirectMusicTrack8_iface); - return IDirectMusicMuteTrack_IUnknown_QueryInterface ((LPUNKNOWN)&track->UnknownVtbl, lpcGUID, ppobj); + return hr; }
1
0
0
0
Michael Stefaniuc : dmstyle: COM cleanup for IDirectMusicTrack8 of DMMuteTrack.
by Alexandre Julliard
30 Jun '15
30 Jun '15
Module: wine Branch: master Commit: c0b7fe80272caa8eab5d2bf1d2721ae11cf42d9f URL:
http://source.winehq.org/git/wine.git/?a=commit;h=c0b7fe80272caa8eab5d2bf1d…
Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jun 30 09:22:12 2015 +0200 dmstyle: COM cleanup for IDirectMusicTrack8 of DMMuteTrack. --- dlls/dmstyle/mutetrack.c | 122 ++++++++++++++++++++++++++++------------------- 1 file changed, 73 insertions(+), 49 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=c0b7fe80272caa8eab5d2…
1
0
0
0
Michael Stefaniuc : dmstyle/tests: Add some basic DirectMusicTrack8 tests.
by Alexandre Julliard
30 Jun '15
30 Jun '15
Module: wine Branch: master Commit: b2ff03ed0350ba7e3892943cf5664099524b5a86 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=b2ff03ed0350ba7e3892943cf…
Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jun 30 09:21:16 2015 +0200 dmstyle/tests: Add some basic DirectMusicTrack8 tests. --- dlls/dmstyle/tests/dmstyle.c | 60 +++++++++++++++++++++++++++++++++++++++----- 1 file changed, 54 insertions(+), 6 deletions(-) diff --git a/dlls/dmstyle/tests/dmstyle.c b/dlls/dmstyle/tests/dmstyle.c index 58c229c..0c585fe 100644 --- a/dlls/dmstyle/tests/dmstyle.c +++ b/dlls/dmstyle/tests/dmstyle.c @@ -251,14 +251,15 @@ static void test_track(void) REFCLSID clsid; const char *name; BOOL has_save; + BOOL has_join; BOOL todo; } class[] = { - { X(DirectMusicAuditionTrack), TRUE, TRUE }, - { X(DirectMusicChordTrack), TRUE, FALSE }, - { X(DirectMusicCommandTrack), TRUE, TRUE }, - { X(DirectMusicMotifTrack), FALSE, TRUE }, - { X(DirectMusicMuteTrack), TRUE, TRUE }, - { X(DirectMusicStyleTrack), FALSE, FALSE }, + { X(DirectMusicAuditionTrack), TRUE, FALSE, TRUE }, + { X(DirectMusicChordTrack), TRUE, TRUE, FALSE }, + { X(DirectMusicCommandTrack), TRUE, TRUE, TRUE }, + { X(DirectMusicMotifTrack), FALSE, FALSE, TRUE }, + { X(DirectMusicMuteTrack), TRUE, FALSE, TRUE }, + { X(DirectMusicStyleTrack), FALSE, TRUE, FALSE }, }; #undef X unsigned int i; @@ -274,8 +275,55 @@ static void test_track(void) ok(hr == S_OK, "%s create failed: %08x, expected S_OK\n", class[i].name, hr); /* IDirectMusicTrack8 */ + hr = IDirectMusicTrack8_Init(dmt8, NULL); + todo_wine ok(hr == E_POINTER, "IDirectMusicTrack8_Init failed: %08x\n", hr); + if (class[i].clsid != &CLSID_DirectMusicChordTrack && + class[i].clsid != &CLSID_DirectMusicCommandTrack) { + /* Crashes on native */ + hr = IDirectMusicTrack8_InitPlay(dmt8, NULL, NULL, NULL, 0, 0); + if (class[i].clsid == &CLSID_DirectMusicMuteTrack) + ok(hr == S_OK, "IDirectMusicTrack8_InitPlay failed: %08x\n", hr); + else + todo_wine ok(hr == E_POINTER, "IDirectMusicTrack8_InitPlay failed: %08x\n", hr); + } + todo_wine { + hr = IDirectMusicTrack8_GetParam(dmt8, NULL, 0, NULL, NULL); + ok(hr == E_POINTER, "IDirectMusicTrack8_GetParam failed: %08x\n", hr); + hr = IDirectMusicTrack8_SetParam(dmt8, NULL, 0, NULL); + ok(hr == E_POINTER, "IDirectMusicTrack8_SetParam failed: %08x\n", hr); + } hr = IDirectMusicTrack8_IsParamSupported(dmt8, NULL); ok(hr == E_POINTER, "IDirectMusicTrack8_IsParamSupported failed: %08x\n", hr); + if (class[i].clsid == &CLSID_DirectMusicMuteTrack) { + hr = IDirectMusicTrack8_AddNotificationType(dmt8, NULL); + ok(hr == E_NOTIMPL, "IDirectMusicTrack8_AddNotificationType failed: %08x\n", hr); + hr = IDirectMusicTrack8_RemoveNotificationType(dmt8, NULL); + ok(hr == E_NOTIMPL, "IDirectMusicTrack8_RemoveNotificationType failed: %08x\n", hr); + } else todo_wine { + hr = IDirectMusicTrack8_AddNotificationType(dmt8, NULL); + ok(hr == E_POINTER, "IDirectMusicTrack8_AddNotificationType failed: %08x\n", hr); + hr = IDirectMusicTrack8_RemoveNotificationType(dmt8, NULL); + ok(hr == E_POINTER, "IDirectMusicTrack8_RemoveNotificationType failed: %08x\n", hr); + } + todo_wine { + hr = IDirectMusicTrack8_Clone(dmt8, 0, 0, NULL); + ok(hr == E_POINTER, "IDirectMusicTrack8_Clone failed: %08x\n", hr); + hr = IDirectMusicTrack8_PlayEx(dmt8, NULL, 0, 0, 0, 0, NULL, NULL, 0); + ok(hr == E_POINTER, "IDirectMusicTrack8_PlayEx failed: %08x\n", hr); + hr = IDirectMusicTrack8_GetParamEx(dmt8, NULL, 0, NULL, NULL, NULL, 0); + ok(hr == E_POINTER, "IDirectMusicTrack8_GetParamEx failed: %08x\n", hr); + hr = IDirectMusicTrack8_SetParamEx(dmt8, NULL, 0, NULL, NULL, 0); + ok(hr == E_POINTER, "IDirectMusicTrack8_SetParamEx failed: %08x\n", hr); + } + hr = IDirectMusicTrack8_Compose(dmt8, NULL, 0, NULL); + ok(hr == E_NOTIMPL, "IDirectMusicTrack8_Compose failed: %08x\n", hr); + if (class[i].has_join) { + hr = IDirectMusicTrack8_Join(dmt8, NULL, 0, NULL, 0, NULL); + todo_wine ok(hr == E_POINTER, "IDirectMusicTrack8_Join failed: %08x\n", hr); + } else { + hr = IDirectMusicTrack8_Join(dmt8, NULL, 0, NULL, 0, NULL); + ok(hr == E_NOTIMPL, "IDirectMusicTrack8_Join failed: %08x\n", hr); + } /* IPersistStream */ hr = IDirectMusicTrack8_QueryInterface(dmt8, &IID_IPersistStream, (void**)&ps);
1
0
0
0
Michael Stefaniuc : dmstyle: Implement the E_NOTIMPL methods of IDirectMusicTrack8.
by Alexandre Julliard
30 Jun '15
30 Jun '15
Module: wine Branch: master Commit: 02412469fb44deb0a0309323a7ba4b61d1119e3a URL:
http://source.winehq.org/git/wine.git/?a=commit;h=02412469fb44deb0a0309323a…
Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jun 30 09:20:11 2015 +0200 dmstyle: Implement the E_NOTIMPL methods of IDirectMusicTrack8. --- dlls/dmstyle/auditiontrack.c | 32 ++++++++++++++++-------- dlls/dmstyle/chordtrack.c | 18 ++++++++++---- dlls/dmstyle/commandtrack.c | 18 ++++++++++---- dlls/dmstyle/motiftrack.c | 32 ++++++++++++++++-------- dlls/dmstyle/mutetrack.c | 58 +++++++++++++++++++++++++++++--------------- dlls/dmstyle/styletrack.c | 18 ++++++++++---- 6 files changed, 121 insertions(+), 55 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=02412469fb44deb0a0309…
1
0
0
0
Gerald Pfeifer : widl: Fix indentation in the EXPR_ADDRESSOF case in resolve_expression.
by Alexandre Julliard
30 Jun '15
30 Jun '15
Module: wine Branch: master Commit: 3a64eb2c4ad1e874229a2e6c0968754787a86a28 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=3a64eb2c4ad1e874229a2e6c0…
Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Tue Jun 30 00:21:08 2015 +0200 widl: Fix indentation in the EXPR_ADDRESSOF case in resolve_expression. --- tools/widl/expr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/widl/expr.c b/tools/widl/expr.c index 7012382..0ada012 100644 --- a/tools/widl/expr.c +++ b/tools/widl/expr.c @@ -571,7 +571,7 @@ static struct expression_type resolve_expression(const struct expr_loc *expr_loc error_loc_info(&expr_loc->v->loc_info, "address-of operator applied to non-variable type in expression%s%s\n", expr_loc->attr ? " for attribute " : "", expr_loc->attr ? expr_loc->attr : ""); - result.is_variable = FALSE; + result.is_variable = FALSE; result.is_temporary = TRUE; result.type = type_new_pointer(RPC_FC_UP, result.type, NULL); break;
1
0
0
0
Sebastian Lackner : windowscodecs: Distinguish interface and implementation pointer for IcnsEncoder.
by Alexandre Julliard
30 Jun '15
30 Jun '15
Module: wine Branch: master Commit: 863f432a7d73b8b480a742fcbaf01de33964cc21 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=863f432a7d73b8b480a742fcb…
Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Jun 29 12:18:12 2015 +0200 windowscodecs: Distinguish interface and implementation pointer for IcnsEncoder. --- dlls/windowscodecs/icnsformat.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/windowscodecs/icnsformat.c b/dlls/windowscodecs/icnsformat.c index 5ce44a2..54c7707 100644 --- a/dlls/windowscodecs/icnsformat.c +++ b/dlls/windowscodecs/icnsformat.c @@ -179,7 +179,7 @@ static ULONG WINAPI IcnsFrameEncode_Release(IWICBitmapFrameEncode *iface) if (This->icns_image != NULL) HeapFree(GetProcessHeap(), 0, This->icns_image); - IUnknown_Release((IUnknown*)This->encoder); + IWICBitmapFrameEncode_Release(&This->encoder->IWICBitmapFrameEncode_iface); HeapFree(GetProcessHeap(), 0, This); } @@ -489,7 +489,7 @@ static HRESULT WINAPI IcnsEncoder_QueryInterface(IWICBitmapEncoder *iface, REFII if (IsEqualIID(&IID_IUnknown, iid) || IsEqualIID(&IID_IWICBitmapEncoder, iid)) { - *ppv = This; + *ppv = &This->IWICBitmapEncoder_iface; } else { @@ -639,7 +639,7 @@ static HRESULT WINAPI IcnsEncoder_CreateNewFrame(IWICBitmapEncoder *iface, frameEncode->committed = FALSE; *ppIFrameEncode = &frameEncode->IWICBitmapFrameEncode_iface; This->outstanding_commits++; - IUnknown_AddRef((IUnknown*)This); + IWICBitmapEncoder_AddRef(&This->IWICBitmapEncoder_iface); end: LeaveCriticalSection(&This->lock); @@ -725,8 +725,8 @@ HRESULT IcnsEncoder_CreateInstance(REFIID iid, void** ppv) InitializeCriticalSection(&This->lock); This->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": IcnsEncoder.lock"); - ret = IUnknown_QueryInterface((IUnknown*)This, iid, ppv); - IUnknown_Release((IUnknown*)This); + ret = IWICBitmapEncoder_QueryInterface(&This->IWICBitmapEncoder_iface, iid, ppv); + IWICBitmapEncoder_Release(&This->IWICBitmapEncoder_iface); return ret; }
1
0
0
0
André Hentschel : ntdll: Silence warning about TAPE_GetStatus when sys/mtio.h is not available.
by Alexandre Julliard
30 Jun '15
30 Jun '15
Module: wine Branch: master Commit: d37f4076458a758d69613cefdabd72d0b3bbd5fa URL:
http://source.winehq.org/git/wine.git/?a=commit;h=d37f4076458a758d69613cefd…
Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Jun 29 19:56:23 2015 +0200 ntdll: Silence warning about TAPE_GetStatus when sys/mtio.h is not available. --- dlls/ntdll/tape.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/ntdll/tape.c b/dlls/ntdll/tape.c index fef31cb..09803d4 100644 --- a/dlls/ntdll/tape.c +++ b/dlls/ntdll/tape.c @@ -87,11 +87,13 @@ static const char *io2str( DWORD io ) /****************************************************************** * TAPE_GetStatus */ +#ifdef HAVE_SYS_MTIO_H static inline NTSTATUS TAPE_GetStatus( int error ) { if (!error) return STATUS_SUCCESS; return FILE_GetNtStatus(); } +#endif /****************************************************************** * TAPE_CreatePartition
1
0
0
0
← Newer
1
2
3
4
5
...
61
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
56
57
58
59
60
61
Results per page:
10
25
50
100
200