June 2015 - Wine-Commits - list.winehq.org

Michael Stefaniuc : riched20: Print the debug string and not the pointer to it.
by Alexandre Julliard June 30, 2015

June 30, 2015

Module: wine Branch: master Commit: b05cc8c0a6bfd1da6ac535bd0ab395044b1baa0d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b05cc8c0a6bfd1da6ac535bd0… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jun 30 09:30:26 2015 +0200 riched20: Print the debug string and not the pointer to it. --- dlls/riched20/richole.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index 907e55e..be35521 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -2368,7 +2368,7 @@ static HRESULT WINAPI ITextRange_fnCanPaste(ITextRange *me, VARIANT *v, LONG for { ITextRangeImpl *This = impl_from_ITextRange(me); - FIXME("(%p)->(%p %x %p): stub\n", This, debugstr_variant(v), format, ret); + FIXME("(%p)->(%s %x %p): stub\n", This, debugstr_variant(v), format, ret); if (!This->child.reole) return CO_E_RELEASED;

1 0

Michael Stefaniuc : dmstyle: COM cleanup for IDirectMusicTrack8 of DMAuditionTrack.
by Alexandre Julliard June 30, 2015

June 30, 2015

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

Michael Stefaniuc : dmstyle: Use the generic IPersistStream for DMMuteTrack.
by Alexandre Julliard June 30, 2015

June 30, 2015

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

Michael Stefaniuc : dmstyle: Remove the extraneous IUnknown from DMMuteTrack.
by Alexandre Julliard June 30, 2015

June 30, 2015

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

Michael Stefaniuc : dmstyle: COM cleanup for IDirectMusicTrack8 of DMMuteTrack.
by Alexandre Julliard June 30, 2015

June 30, 2015

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

Michael Stefaniuc : dmstyle: Implement the E_NOTIMPL methods of IDirectMusicTrack8.
by Alexandre Julliard June 30, 2015

June 30, 2015

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

Michael Stefaniuc : dmstyle: COM cleanup for IDirectMusicTrack8 of DMMotifTrack.
by Alexandre Julliard June 30, 2015

June 30, 2015

Module: wine Branch: master Commit: 1d2bc65c94cb9ac84b5933989a10a9bd188512dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d2bc65c94cb9ac84b5933989… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jun 30 09:26:01 2015 +0200 dmstyle: COM cleanup for IDirectMusicTrack8 of DMMotifTrack. --- dlls/dmstyle/motiftrack.c | 138 ++++++++++++++++++++++++++++------------------ 1 file changed, 83 insertions(+), 55 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1d2bc65c94cb9ac84b593…

1 0

André Hentschel : ntdll: Silence warning about TAPE_GetStatus when sys/mtio.h is not available.
by Alexandre Julliard June 30, 2015

June 30, 2015

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

Thomas Faber : shell32/tests: Remove a misleading test.
by Alexandre Julliard June 30, 2015

June 30, 2015

Module: wine Branch: master Commit: 9551179c0b94a8eb4b33d36e5aaf42a998b4b085 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9551179c0b94a8eb4b33d36e5… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Mon Jun 29 16:09:09 2015 -0400 shell32/tests: Remove a misleading test. --- dlls/shell32/tests/shlview.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/dlls/shell32/tests/shlview.c b/dlls/shell32/tests/shlview.c index af57e60..eafaec5 100644 --- a/dlls/shell32/tests/shlview.c +++ b/dlls/shell32/tests/shlview.c @@ -694,7 +694,6 @@ static void test_IFolderView(void) HRESULT hr; INT ret, count; POINT pt; - LONG ref1, ref2; RECT r; hr = SHGetDesktopFolder(&desktop); @@ -822,14 +821,8 @@ if (0) hr = IFolderView_GetFolder(fv, &IID_IShellFolder, NULL); ok(hr == E_POINTER, "got (0x%08x)\n", hr); - ref1 = IShellFolder_AddRef(desktop); - IShellFolder_Release(desktop); hr = IFolderView_GetFolder(fv, &IID_IShellFolder, (void**)&folder); ok(hr == S_OK, "got (0x%08x)\n", hr); - ref2 = IShellFolder_AddRef(desktop); - IShellFolder_Release(desktop); - ok(ref1 == ref2 || ref1 + 1 == ref2, /* >= vista */ - "expected same refcount, got %d\n", ref2); ok(desktop == folder, "\n"); if (folder) IShellFolder_Release(folder);

1 0

Thomas Faber : shell32: Use QueryInterface in FolderView_GetFolder.
by Alexandre Julliard June 30, 2015

June 30, 2015

Module: wine Branch: master Commit: e582495927c253ddb5b6e5b01d3cf845207bdc10 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e582495927c253ddb5b6e5b01… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Mon Jun 29 15:39:25 2015 -0400 shell32: Use QueryInterface in FolderView_GetFolder. test_IFolderView has a test that shows that the shell folder's reference count before and after the call to IFolderView_GetFolder is the same. However this is misleading because it is not a property of the IFolderView_GetFolder method, but of the desktop shell folder object that's used in the folder view. Windows <=2003 uses a cached object and its AddRef/Release methods return constants. --- dlls/shell32/pidl.c | 1 + dlls/shell32/shlview.c | 10 +--------- dlls/shell32/tests/ebrowser.c | 2 +- dlls/shell32/tests/shlview.c | 6 ++++++ 4 files changed, 9 insertions(+), 10 deletions(-) diff --git a/dlls/shell32/pidl.c b/dlls/shell32/pidl.c index d16ca57..1856c12 100644 --- a/dlls/shell32/pidl.c +++ b/dlls/shell32/pidl.c @@ -1477,6 +1477,7 @@ HRESULT WINAPI SHGetIDListFromObject(IUnknown *punk, PIDLIST_ABSOLUTE *ppidl) { /* We might be able to get IPersistFolder2 from a shellfolder. */ ret = SHGetIDListFromObject((IUnknown*)psf, ppidl); + IShellFolder_Release(psf); } IFolderView_Release(pfv); return ret; diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c index e6691f8..b763468 100644 --- a/dlls/shell32/shlview.c +++ b/dlls/shell32/shlview.c @@ -2713,15 +2713,7 @@ static HRESULT WINAPI FolderView_GetFolder(IFolderView2 *iface, REFIID riid, voi TRACE("(%p)->(%s, %p)\n", This, debugstr_guid(riid), ppv); - if (!ppv) return E_POINTER; - - if (IsEqualIID(riid, &IID_IShellFolder)) - { - *ppv = This->pSFParent; - return S_OK; - } - - return E_NOINTERFACE; + return IShellFolder_QueryInterface(This->pSFParent, riid, ppv); } static HRESULT WINAPI FolderView_Item(IFolderView2 *iface, int index, PITEMID_CHILD *ppidl) diff --git a/dlls/shell32/tests/ebrowser.c b/dlls/shell32/tests/ebrowser.c index 4c255a1..c9d81a4 100644 --- a/dlls/shell32/tests/ebrowser.c +++ b/dlls/shell32/tests/ebrowser.c @@ -1469,7 +1469,7 @@ static void test_navigation(void) test_browse_pidl_sb(peb2, &ebev, pidl_relative, SBSP_RELATIVE, S_OK, 1, 1, 0, 1); ILFree(pidl_relative); - /* IShellFolder_Release(psf); */ + IShellFolder_Release(psf); IFolderView_Release(pfv); } diff --git a/dlls/shell32/tests/shlview.c b/dlls/shell32/tests/shlview.c index 6525dd2..af57e60 100644 --- a/dlls/shell32/tests/shlview.c +++ b/dlls/shell32/tests/shlview.c @@ -688,6 +688,7 @@ static void test_IFolderView(void) IShellBrowser *browser; IFolderView2 *fv2; IFolderView *fv; + IUnknown *unk; HWND hwnd_view, hwnd_list; PITEMID_CHILD pidl; HRESULT hr; @@ -830,6 +831,11 @@ if (0) ok(ref1 == ref2 || ref1 + 1 == ref2, /* >= vista */ "expected same refcount, got %d\n", ref2); ok(desktop == folder, "\n"); + if (folder) IShellFolder_Release(folder); + + hr = IFolderView_GetFolder(fv, &IID_IUnknown, (void**)&unk); + ok(hr == S_OK, "got (0x%08x)\n", hr); + if (unk) IUnknown_Release(unk); hr = IFolderView_QueryInterface(fv, &IID_IFolderView2, (void**)&fv2); if (hr != S_OK)

1 0