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

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

June 30, 2015

Module: wine Branch: master Commit: 6c057b03da1e41beb9af1348aec6399e47e83fd5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c057b03da1e41beb9af1348a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jun 30 09:25:22 2015 +0200 dmstyle: Use the generic IPersistStream for DMAuditionTrack. --- dlls/dmstyle/auditiontrack.c | 67 +++++++++++++------------------------------- dlls/dmstyle/tests/dmstyle.c | 2 +- 2 files changed, 21 insertions(+), 48 deletions(-) diff --git a/dlls/dmstyle/auditiontrack.c b/dlls/dmstyle/auditiontrack.c index 025658b..3239ed7 100644 --- a/dlls/dmstyle/auditiontrack.c +++ b/dlls/dmstyle/auditiontrack.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 IDirectMusicAuditionTrack { IDirectMusicTrack8 IDirectMusicTrack8_iface; - const IPersistStreamVtbl *PersistStreamVtbl; + struct dmobject dmobj; /* IPersistStream only */ LONG ref; - DMUS_OBJECTDESC *pDesc; } IDirectMusicAuditionTrack; /* IDirectMusicAuditionTrack 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; @@ -242,52 +242,27 @@ static const IDirectMusicTrack8Vtbl dmtrack8_vtbl = { IDirectMusicTrack8Impl_Join }; -/* IDirectMusicAuditionTrack IPersistStream part: */ -static HRESULT WINAPI IDirectMusicAuditionTrack_IPersistStream_QueryInterface (LPPERSISTSTREAM iface, REFIID riid, LPVOID *ppobj) { - ICOM_THIS_MULTI(IDirectMusicAuditionTrack, PersistStreamVtbl, iface); - return IDirectMusicTrack8_QueryInterface(&This->IDirectMusicTrack8_iface, riid, ppobj); -} - -static ULONG WINAPI IDirectMusicAuditionTrack_IPersistStream_AddRef (LPPERSISTSTREAM iface) { - ICOM_THIS_MULTI(IDirectMusicAuditionTrack, PersistStreamVtbl, iface); - return IDirectMusicTrack8_AddRef(&This->IDirectMusicTrack8_iface); -} - -static ULONG WINAPI IDirectMusicAuditionTrack_IPersistStream_Release (LPPERSISTSTREAM iface) { - ICOM_THIS_MULTI(IDirectMusicAuditionTrack, PersistStreamVtbl, iface); - return IDirectMusicTrack8_Release(&This->IDirectMusicTrack8_iface); -} - -static HRESULT WINAPI IDirectMusicAuditionTrack_IPersistStream_GetClassID (LPPERSISTSTREAM iface, CLSID* pClassID) { - return E_NOTIMPL; -} - -static HRESULT WINAPI IDirectMusicAuditionTrack_IPersistStream_IsDirty (LPPERSISTSTREAM iface) { - return E_NOTIMPL; -} - -static HRESULT WINAPI IDirectMusicAuditionTrack_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 IDirectMusicAuditionTrack_IPersistStream_Save (LPPERSISTSTREAM iface, IStream* pStm, BOOL fClearDirty) { - return E_NOTIMPL; -} - -static HRESULT WINAPI IDirectMusicAuditionTrack_IPersistStream_GetSizeMax (LPPERSISTSTREAM iface, ULARGE_INTEGER* pcbSize) { +static HRESULT WINAPI IPersistStreamImpl_Save(IPersistStream *iface, IStream *stream, + BOOL cleardirty) +{ return E_NOTIMPL; } -static const IPersistStreamVtbl DirectMusicAuditionTrack_PersistStream_Vtbl = { - IDirectMusicAuditionTrack_IPersistStream_QueryInterface, - IDirectMusicAuditionTrack_IPersistStream_AddRef, - IDirectMusicAuditionTrack_IPersistStream_Release, - IDirectMusicAuditionTrack_IPersistStream_GetClassID, - IDirectMusicAuditionTrack_IPersistStream_IsDirty, - IDirectMusicAuditionTrack_IPersistStream_Load, - IDirectMusicAuditionTrack_IPersistStream_Save, - IDirectMusicAuditionTrack_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 */ @@ -302,12 +277,10 @@ HRESULT WINAPI create_dmauditiontrack(REFIID lpcGUID, void **ppobj) 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 = 1; + dmobject_init(&track->dmobj, &CLSID_DirectMusicAuditionTrack, + (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 426ba0d..d611c9a 100644 --- a/dlls/dmstyle/tests/dmstyle.c +++ b/dlls/dmstyle/tests/dmstyle.c @@ -254,7 +254,7 @@ static void test_track(void) BOOL has_join; BOOL todo; } class[] = { - { X(DirectMusicAuditionTrack), TRUE, FALSE, TRUE }, + { X(DirectMusicAuditionTrack), TRUE, FALSE, FALSE }, { X(DirectMusicChordTrack), TRUE, TRUE, FALSE }, { X(DirectMusicCommandTrack), TRUE, TRUE, TRUE }, { X(DirectMusicMotifTrack), FALSE, FALSE, TRUE },

1 0

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

June 30, 2015

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

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

June 30, 2015

Module: wine Branch: master Commit: 699efa6f3e274f52ad33a320c2baf102f6d7784f URL: http://source.winehq.org/git/wine.git/?a=commit;h=699efa6f3e274f52ad33a320c… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jun 30 09:28:28 2015 +0200 dmstyle: Use the generic IPersistStream for DMMotifTrack. --- dlls/dmstyle/motiftrack.c | 67 +++++++++++--------------------------------- dlls/dmstyle/tests/dmstyle.c | 2 +- 2 files changed, 18 insertions(+), 51 deletions(-) diff --git a/dlls/dmstyle/motiftrack.c b/dlls/dmstyle/motiftrack.c index 8261dfe..d4a4eff 100644 --- a/dlls/dmstyle/motiftrack.c +++ b/dlls/dmstyle/motiftrack.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 IDirectMusicMotifTrack { IDirectMusicTrack8 IDirectMusicTrack8_iface; - const IPersistStreamVtbl *PersistStreamVtbl; + struct dmobject dmobj; /* IPersistStream only */ LONG ref; - DMUS_OBJECTDESC *pDesc; } IDirectMusicMotifTrack; /* IDirectMusicMotifTrack 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; @@ -248,52 +248,21 @@ static const IDirectMusicTrack8Vtbl dmtrack8_vtbl = { IDirectMusicTrack8Impl_Join }; -/* IDirectMusicMotifTrack IPersistStream part: */ -static HRESULT WINAPI IDirectMusicMotifTrack_IPersistStream_QueryInterface (LPPERSISTSTREAM iface, REFIID riid, LPVOID *ppobj) { - ICOM_THIS_MULTI(IDirectMusicMotifTrack, PersistStreamVtbl, iface); - return IDirectMusicTrack8_QueryInterface(&This->IDirectMusicTrack8_iface, riid, ppobj); -} - -static ULONG WINAPI IDirectMusicMotifTrack_IPersistStream_AddRef (LPPERSISTSTREAM iface) { - ICOM_THIS_MULTI(IDirectMusicMotifTrack, PersistStreamVtbl, iface); - return IDirectMusicTrack8_AddRef(&This->IDirectMusicTrack8_iface); -} - -static ULONG WINAPI IDirectMusicMotifTrack_IPersistStream_Release (LPPERSISTSTREAM iface) { - ICOM_THIS_MULTI(IDirectMusicMotifTrack, PersistStreamVtbl, iface); - return IDirectMusicTrack8_Release(&This->IDirectMusicTrack8_iface); -} - -static HRESULT WINAPI IDirectMusicMotifTrack_IPersistStream_GetClassID (LPPERSISTSTREAM iface, CLSID* pClassID) { - return E_NOTIMPL; -} - -static HRESULT WINAPI IDirectMusicMotifTrack_IPersistStream_IsDirty (LPPERSISTSTREAM iface) { - return E_NOTIMPL; -} - -static HRESULT WINAPI IDirectMusicMotifTrack_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 IDirectMusicMotifTrack_IPersistStream_Save (LPPERSISTSTREAM iface, IStream* pStm, BOOL fClearDirty) { - return E_NOTIMPL; -} - -static HRESULT WINAPI IDirectMusicMotifTrack_IPersistStream_GetSizeMax (LPPERSISTSTREAM iface, ULARGE_INTEGER* pcbSize) { - return E_NOTIMPL; -} - -static const IPersistStreamVtbl DirectMusicMotifTrack_PersistStream_Vtbl = { - IDirectMusicMotifTrack_IPersistStream_QueryInterface, - IDirectMusicMotifTrack_IPersistStream_AddRef, - IDirectMusicMotifTrack_IPersistStream_Release, - IDirectMusicMotifTrack_IPersistStream_GetClassID, - IDirectMusicMotifTrack_IPersistStream_IsDirty, - IDirectMusicMotifTrack_IPersistStream_Load, - IDirectMusicMotifTrack_IPersistStream_Save, - IDirectMusicMotifTrack_IPersistStream_GetSizeMax +static const IPersistStreamVtbl persiststream_vtbl = { + dmobj_IPersistStream_QueryInterface, + dmobj_IPersistStream_AddRef, + dmobj_IPersistStream_Release, + dmobj_IPersistStream_GetClassID, + unimpl_IPersistStream_IsDirty, + IPersistStreamImpl_Load, + unimpl_IPersistStream_Save, + unimpl_IPersistStream_GetSizeMax }; /* for ClassFactory */ @@ -308,12 +277,10 @@ HRESULT WINAPI create_dmmotiftrack(REFIID lpcGUID, void **ppobj) return E_OUTOFMEMORY; } track->IDirectMusicTrack8_iface.lpVtbl = &dmtrack8_vtbl; - track->PersistStreamVtbl = &DirectMusicMotifTrack_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_DirectMusicMotifTrack; track->ref = 1; + dmobject_init(&track->dmobj, &CLSID_DirectMusicMotifTrack, + (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 d611c9a..e98b29c 100644 --- a/dlls/dmstyle/tests/dmstyle.c +++ b/dlls/dmstyle/tests/dmstyle.c @@ -257,7 +257,7 @@ static void test_track(void) { X(DirectMusicAuditionTrack), TRUE, FALSE, FALSE }, { X(DirectMusicChordTrack), TRUE, TRUE, FALSE }, { X(DirectMusicCommandTrack), TRUE, TRUE, TRUE }, - { X(DirectMusicMotifTrack), FALSE, FALSE, TRUE }, + { X(DirectMusicMotifTrack), FALSE, FALSE, FALSE }, { X(DirectMusicMuteTrack), TRUE, FALSE, FALSE }, { X(DirectMusicStyleTrack), FALSE, TRUE, FALSE }, };

1 0

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

June 30, 2015

Module: wine Branch: master Commit: c1647cbbef625bc3b879a3af322c77fcba7e2733 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1647cbbef625bc3b879a3af3… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jun 30 09:27:28 2015 +0200 dmstyle: Remove the extraneous IUnknown from DMMotifTrack. Also lock/unlock the module only on creation/destruction of the object. --- dlls/dmstyle/motiftrack.c | 127 ++++++++++++++++++---------------------------- 1 file changed, 50 insertions(+), 77 deletions(-) diff --git a/dlls/dmstyle/motiftrack.c b/dlls/dmstyle/motiftrack.c index 3a8c6f1..8261dfe 100644 --- a/dlls/dmstyle/motiftrack.c +++ b/dlls/dmstyle/motiftrack.c @@ -21,76 +21,16 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmstyle); -static ULONG WINAPI IDirectMusicMotifTrack_IUnknown_AddRef (LPUNKNOWN iface); -static ULONG WINAPI IDirectMusicMotifTrack_IPersistStream_AddRef (LPPERSISTSTREAM iface); - /***************************************************************************** * IDirectMusicMotifTrack implementation */ typedef struct IDirectMusicMotifTrack { - const IUnknownVtbl *UnknownVtbl; IDirectMusicTrack8 IDirectMusicTrack8_iface; const IPersistStreamVtbl *PersistStreamVtbl; LONG ref; DMUS_OBJECTDESC *pDesc; } IDirectMusicMotifTrack; -/* IDirectMusicMotifTrack IUnknown part: */ -static HRESULT WINAPI IDirectMusicMotifTrack_IUnknown_QueryInterface (LPUNKNOWN iface, REFIID riid, LPVOID *ppobj) { - ICOM_THIS_MULTI(IDirectMusicMotifTrack, UnknownVtbl, iface); - TRACE("(%p, %s, %p)\n", This, debugstr_dmguid(riid), ppobj); - - if (IsEqualIID (riid, &IID_IUnknown)) { - *ppobj = &This->UnknownVtbl; - IDirectMusicMotifTrack_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; - IDirectMusicMotifTrack_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 IDirectMusicMotifTrack_IUnknown_AddRef (LPUNKNOWN iface) { - ICOM_THIS_MULTI(IDirectMusicMotifTrack, UnknownVtbl, iface); - ULONG ref = InterlockedIncrement(&This->ref); - - TRACE("(%p): AddRef from %d\n", This, ref - 1); - - DMSTYLE_LockModule(); - - return ref; -} - -static ULONG WINAPI IDirectMusicMotifTrack_IUnknown_Release (LPUNKNOWN iface) { - ICOM_THIS_MULTI(IDirectMusicMotifTrack, 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 DirectMusicMotifTrack_Unknown_Vtbl = { - IDirectMusicMotifTrack_IUnknown_QueryInterface, - IDirectMusicMotifTrack_IUnknown_AddRef, - IDirectMusicMotifTrack_IUnknown_Release -}; - /* IDirectMusicMotifTrack IDirectMusicTrack8 part: */ static inline IDirectMusicMotifTrack *impl_from_IDirectMusicTrack8(IDirectMusicTrack8 *iface) { @@ -98,22 +38,51 @@ static inline IDirectMusicMotifTrack *impl_from_IDirectMusicTrack8(IDirectMusicT } static HRESULT WINAPI IDirectMusicTrack8Impl_QueryInterface(IDirectMusicTrack8 *iface, REFIID riid, - void **ppobj) + void **ret_iface) { IDirectMusicMotifTrack *This = impl_from_IDirectMusicTrack8(iface); - return IDirectMusicMotifTrack_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) { IDirectMusicMotifTrack *This = impl_from_IDirectMusicTrack8(iface); - return IDirectMusicMotifTrack_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) { IDirectMusicMotifTrack *This = impl_from_IDirectMusicTrack8(iface); - return IDirectMusicMotifTrack_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, @@ -282,17 +251,17 @@ static const IDirectMusicTrack8Vtbl dmtrack8_vtbl = { /* IDirectMusicMotifTrack IPersistStream part: */ static HRESULT WINAPI IDirectMusicMotifTrack_IPersistStream_QueryInterface (LPPERSISTSTREAM iface, REFIID riid, LPVOID *ppobj) { ICOM_THIS_MULTI(IDirectMusicMotifTrack, PersistStreamVtbl, iface); - return IDirectMusicMotifTrack_IUnknown_QueryInterface ((LPUNKNOWN)&This->UnknownVtbl, riid, ppobj); + return IDirectMusicTrack8_QueryInterface(&This->IDirectMusicTrack8_iface, riid, ppobj); } static ULONG WINAPI IDirectMusicMotifTrack_IPersistStream_AddRef (LPPERSISTSTREAM iface) { ICOM_THIS_MULTI(IDirectMusicMotifTrack, PersistStreamVtbl, iface); - return IDirectMusicMotifTrack_IUnknown_AddRef ((LPUNKNOWN)&This->UnknownVtbl); + return IDirectMusicTrack8_AddRef(&This->IDirectMusicTrack8_iface); } static ULONG WINAPI IDirectMusicMotifTrack_IPersistStream_Release (LPPERSISTSTREAM iface) { ICOM_THIS_MULTI(IDirectMusicMotifTrack, PersistStreamVtbl, iface); - return IDirectMusicMotifTrack_IUnknown_Release ((LPUNKNOWN)&This->UnknownVtbl); + return IDirectMusicTrack8_Release(&This->IDirectMusicTrack8_iface); } static HRESULT WINAPI IDirectMusicMotifTrack_IPersistStream_GetClassID (LPPERSISTSTREAM iface, CLSID* pClassID) { @@ -330,21 +299,25 @@ static const IPersistStreamVtbl DirectMusicMotifTrack_PersistStream_Vtbl = { /* for ClassFactory */ HRESULT WINAPI create_dmmotiftrack(REFIID lpcGUID, void **ppobj) { - IDirectMusicMotifTrack* track; - - track = HeapAlloc (GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicMotifTrack)); - if (NULL == track) { - *ppobj = NULL; - return E_OUTOFMEMORY; - } - track->UnknownVtbl = &DirectMusicMotifTrack_Unknown_Vtbl; + IDirectMusicMotifTrack *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 = &DirectMusicMotifTrack_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_DirectMusicMotifTrack; - 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 IDirectMusicMotifTrack_IUnknown_QueryInterface ((LPUNKNOWN)&track->UnknownVtbl, lpcGUID, ppobj); + return hr; }

1 0

André Hentschel : Improve WWN 392
by Jeremy Newman June 29, 2015

June 29, 2015

Module: website Branch: master Commit: 6200bb142ff0a8fa69cad3b6e051c932c0a0a0c3 URL: http://source.winehq.org/git/website.git/?a=commit;h=6200bb142ff0a8fa69cad3… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Jun 29 19:24:34 2015 +0200 Improve WWN 392 --- wwn/en/wn20150607_392.xml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/wwn/en/wn20150607_392.xml b/wwn/en/wn20150607_392.xml index 495e69a..3741114 100644 --- a/wwn/en/wn20150607_392.xml +++ b/wwn/en/wn20150607_392.xml @@ -79,7 +79,7 @@ We have four projects which are already in the coding period: At the moment wine's implementation of this API is mostly full of stubs, and there's quite a bit of work left before something can be drawn on the screen. My role here mainly focuses on implementing object Creation/Initialization functions for some of the main interfaces, mainly devices, textures and viewports, all of which are COM based. If time permits, I will also work on implementing some frequently used frames and lighting functions. The API is quite old (it has been removed since DX 8 SDK, and the dll doesn't come included with vista onwards) but there are a few popular games that used it. Namely, Lego Rock Raiders and Steel Beasts, and applications as well, like FMS (Flying Model Simulator). So there is some merit in working on this. Implementing these functions will help accelerate further development of this API to get some long-awaited apps to run on wine (I can see quite a few threads on google of people trying to get FMS running, and a couple for LRR too, so there is some demand for it). As an added bonus, I also get to interact with wine's ddraw implementation for this one, which could potentially help ddraw's implementation via possible bug detection/fixes and implementing any ddraw functionality that d3drm requires. TL;DR: I'm implementing a main chunk of a graphics API called Direct3D Retained Mode, which is based on Direct3D Immediate Mode. The API is mostly a stub in wine and this project should help get things going. -[1] - https://www.google-melange.com/gsoc/project/details/google/gsoc2015/jam/575… +[1] - <a href="https://www.google-melange.com/gsoc/project/details/google/gsoc2015/jam/575…">https://www.google-melange.com/gsoc/project/details/google/gsoc2015/jam/575…</a> </blockquote> Implement the Visual C++ iostream library - @@ -95,10 +95,10 @@ We have four projects which are already in the coding period: <a href="https://www.google-melange.com/gsoc/project/details/google/gsoc2015/yonghao…">Project</a> <a href="//www.winehq.org/pipermail/wine-devel/2015-May/107628.html">by YongHao Hu</a> <blockquote> -My project focuses on implementing all the functions from tr2 namespace, which was included in the <filesystem> header and being proposed for standardization. +My project focuses on implementing all the functions from tr2 namespace, which was included in the <filesystem> header and being proposed for standardization. Though there are many methods to implement the functions like _File_size and _Equivalent etc, the hard part is finding the most appropriate one. New applications like MSVC12[1] would benefit from this. -[1]: //bugs.winehq.org/show_bug.cgi?id=35774 +[1]: <a href="//bugs.winehq.org/show_bug.cgi?id=35774">bugs.winehq.org/show_bug.cgi?id=35774</a> </blockquote> Improve mshtml.dll - @@ -119,9 +119,9 @@ I can't tell how many applications' status on appdb will change from "garbage" to "silver/gold", but IMHO, implementing XMLHttpRequest is necessary to make wine IE more usable. -[0]: http://en.wikipedia.org/wiki/XMLHttpRequest -[1]: https://getfirebug.com/firebuglite -[2]: https://developer.mozilla.org/en-US/docs/nsIXMLHttpRequest +[0]: <a href="http://en.wikipedia.org/wiki/XMLHttpRequest">http://en.wikipedia.org/wiki/XMLHttpRequest</a> +[1]: <a href="https://getfirebug.com/firebuglite">https://getfirebug.com/firebuglite</a> +[2]: <a href="https://developer.mozilla.org/en-US/docs/nsIXMLHttpRequest">https://developer.mozilla.org/en-US/docs/nsIXMLHttpRequest</a> </blockquote> ]]> </section> @@ -180,7 +180,8 @@ SourceForge. The main uses for SourceForge is for mirroring tarballs, wine-gecko/wine-mono installers, and the wine-gecko git repository. -[1] http://www.extremetech.com/computing/206687-sourceforge-accused-of-hijackin… +[1] <a href="http://www.extremetech.com/computing/206687-sourceforge-accused-of-hijackin…"> +http://www.extremetech.com/computing/206687-sourceforge-accused-of-hijacking-gimp-photo-editor-company-claims-project-was-abandoned</a> </blockquote>

1 0

Julian Rüger : German translation for release 1.7.46
by Jeremy Newman June 29, 2015

June 29, 2015

Module: website Branch: master Commit: 100c8bc59b466bde451e2f85acc3ed81aea6a351 URL: http://source.winehq.org/git/website.git/?a=commit;h=100c8bc59b466bde451e2f… Author: Julian Rüger <jr98(a)gmx.net> Date: Mon Jun 29 17:10:14 2015 +0200 German translation for release 1.7.46 --- news/de/2015062601.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/de/2015062601.xml b/news/de/2015062601.xml new file mode 100644 index 0000000..2f4a77e --- /dev/null +++ b/news/de/2015062601.xml @@ -0,0 +1,17 @@ +<news> +<date>26. Juni 2015</date> +<title>Wine 1.7.46 freigegeben</title> +<body> + Die Entwicklungsversion 1.7.46 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.7.46">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Verbesserungen am BITS-Dateitransferdienst.</li> + <li>Weitere Fortschritte der DirectWrite-Implementierung.</li> + <li>Unterstützung für gemeinsam verwendete Benutzerdaten unter 64-Bit.</li> + <li>Diverse Verbesserungen der C++-Laufzeit.</li> + <li>Ein wenig mehr Unterstützung der 64-Bit ARM-Plattform.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.46.tar.bz2">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Łukasz Wojniłowicz : Polish translation for release 1.7.46
by Jeremy Newman June 29, 2015

June 29, 2015

Module: website Branch: master Commit: 46458045a2b872dd29a73f99ca221f9e2dea8096 URL: http://source.winehq.org/git/website.git/?a=commit;h=46458045a2b872dd29a73f… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Sat Jun 27 07:14:35 2015 +0200 Polish translation for release 1.7.46 --- news/pl/2015062601.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/pl/2015062601.xml b/news/pl/2015062601.xml new file mode 100644 index 0000000..a92c078 --- /dev/null +++ b/news/pl/2015062601.xml @@ -0,0 +1,17 @@ +<news> +<date>Czerwiec 26, 2015</date> +<title>Wydano Wine 1.7.46</title> +<body> + Wydanie rozwojowe Wine 1.7.46 jest już dostępne. + <a href="{$root}/announce/1.7.46">Co nowego</a> w tym wydaniu: +<ul> + <li>Ulepszenia w usłudze przesyłania plików BITS.</li> + <li>Postęp w implementacji DirectWrite.</li> + <li>Wsparcie dla współdzielonych danych użytkownika na 64-bitach.</li> + <li>Rozmaite ulepszenia w bibliotece uruchomieniowej C++.</li> + <li>Większe wsparcie na platformie 64-bitowej ARM.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +Źródło jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.46.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkrótce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</body></news>

1 0

Jacek Caban : vbscript: Treat empty regexp pattern the same way as NULL pattern.
by Alexandre Julliard June 29, 2015

June 29, 2015

Module: wine Branch: master Commit: 392736c5e8f7b5b23240cbe48879a168550c3d74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=392736c5e8f7b5b23240cbe48… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 29 11:55:56 2015 +0200 vbscript: Treat empty regexp pattern the same way as NULL pattern. --- dlls/vbscript/tests/regexp.vbs | 17 +++++++++++++++++ dlls/vbscript/vbregexp.c | 28 +++++++++++----------------- 2 files changed, 28 insertions(+), 17 deletions(-) diff --git a/dlls/vbscript/tests/regexp.vbs b/dlls/vbscript/tests/regexp.vbs index 0354fb7..834be21 100644 --- a/dlls/vbscript/tests/regexp.vbs +++ b/dlls/vbscript/tests/regexp.vbs @@ -174,4 +174,21 @@ Call ok(x.IgnoreCase = false, "RegExp.IgnoreCase = " & x.IgnoreCase) Call ok(x.Global = false, "RegExp.Global = " & x.Global) Call ok(x.Multiline = false, "RegExp.Multiline = " & x.Multiline) +set matches = x.execute("test") +Call ok(matches.Count = 1, "matches.Count = " & matches.Count) +x.pattern = "" +set matches = x.execute("test") +Call ok(matches.Count = 1, "matches.Count = " & matches.Count) +set match = matches.item(0) +Call ok(match.Value = "", "match.Value = " & match.Value) +x.global = true +set matches = x.execute("test") +Call ok(matches.Count = 5, "matches.Count = " & matches.Count) +set match = matches.item(0) +Call ok(match.Value = "", "match.Value = " & match.Value) +set match = matches.item(4) +Call ok(match.Value = "", "match.Value = " & match.Value) +matches = x.test("test") +Call ok(matches = true, "matches = " & matches) + Call reportSuccess() diff --git a/dlls/vbscript/vbregexp.c b/dlls/vbscript/vbregexp.c index 0a399b9..800ea5e 100644 --- a/dlls/vbscript/vbregexp.c +++ b/dlls/vbscript/vbregexp.c @@ -1189,29 +1189,23 @@ static HRESULT WINAPI RegExp2_get_Pattern(IRegExp2 *iface, BSTR *pPattern) static HRESULT WINAPI RegExp2_put_Pattern(IRegExp2 *iface, BSTR pattern) { RegExp2 *This = impl_from_IRegExp2(iface); - WCHAR *p; - DWORD size; + WCHAR *new_pattern; TRACE("(%p)->(%s)\n", This, wine_dbgstr_w(pattern)); - if(!pattern) { - heap_free(This->pattern); - if(This->regexp) { - regexp_destroy(This->regexp); - This->regexp = NULL; - } - This->pattern = NULL; - return S_OK; + if(pattern && *pattern) { + SIZE_T size = (SysStringLen(pattern)+1) * sizeof(WCHAR); + new_pattern = heap_alloc(size); + if(!new_pattern) + return E_OUTOFMEMORY; + memcpy(new_pattern, pattern, size); + }else { + new_pattern = NULL; } - size = (SysStringLen(pattern)+1) * sizeof(WCHAR); - p = heap_alloc(size); - if(!p) - return E_OUTOFMEMORY; - heap_free(This->pattern); - This->pattern = p; - memcpy(p, pattern, size); + This->pattern = new_pattern; + if(This->regexp) { regexp_destroy(This->regexp); This->regexp = NULL;

1 0

Piotr Caban : msvcirt: Fix ostrstream::ostrstream() constructor stub.
by Alexandre Julliard June 29, 2015

June 29, 2015

Module: wine Branch: master Commit: 9249f393c25cb4dc18869483472e9d135dba351f URL: http://source.winehq.org/git/wine.git/?a=commit;h=9249f393c25cb4dc188694834… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jun 29 10:22:07 2015 +0200 msvcirt: Fix ostrstream::ostrstream() constructor stub. --- dlls/msvcirt/msvcirt.c | 18 +++++++++++++----- dlls/msvcirt/msvcirt.spec | 8 ++++---- dlls/msvcrt20/msvcrt20.spec | 4 ++-- dlls/msvcrt40/msvcrt40.spec | 4 ++-- 4 files changed, 21 insertions(+), 13 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index 0979673..960cd90 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -696,13 +696,21 @@ void * __thiscall MSVCIRT_ios_sl_void(class_ios * _this) /****************************************************************** * ??0ostrstream@@QAE(a)XZ (MSVCRTI.@) - * class ostream & __thiscall ostrstream::ostrstream<<(void) */ -DEFINE_THISCALL_WRAPPER(MSVCIRT_ostrstream_sl_void,4) -void * __thiscall MSVCIRT_ostrstream_sl_void(class_ostream * _this) +DEFINE_THISCALL_WRAPPER(MSVCIRT_ostrstream_ctor,8) +void * __thiscall MSVCIRT_ostrstream_ctor(class_ostream *this, BOOL virt_init) { - FIXME("(%p) stub\n", _this); - return _this; + FIXME("(%p %x) stub\n", this, virt_init); + return this; +} + +/****************************************************************** + * ??1ostrstream@@UAE(a)XZ (MSVCRTI.@) + */ +DEFINE_THISCALL_WRAPPER(MSVCIRT_ostrstream_dtor,4) +void __thiscall MSVCIRT_ostrstream_dtor(class_ios *base) +{ + FIXME("(%p) stub\n", base); } /****************************************************************** diff --git a/dlls/msvcirt/msvcirt.spec b/dlls/msvcirt/msvcirt.spec index 0c9e520..36d42ee 100644 --- a/dlls/msvcirt/msvcirt.spec +++ b/dlls/msvcirt/msvcirt.spec @@ -96,8 +96,8 @@ @ stub -arch=win64 ??0ostrstream@@QEAA(a)AEBV0@@Z @ stub -arch=win32 ??0ostrstream@@QAE(a)PADHH@Z # __thiscall ostrstream::ostrstream(char *,int,int) @ stub -arch=win64 ??0ostrstream@@QEAA(a)PEADHH@Z -@ thiscall -arch=win32 ??0ostrstream@@QAE(a)XZ(ptr) MSVCIRT_ostrstream_sl_void # __thiscall ostrstream::ostrstream(void) -@ cdecl -arch=win64 ??0ostrstream@@QEAA(a)XZ(ptr) MSVCIRT_ostrstream_sl_void +@ thiscall -arch=win32 ??0ostrstream@@QAE(a)XZ(ptr long) MSVCIRT_ostrstream_ctor +@ cdecl -arch=win64 ??0ostrstream@@QEAA(a)XZ(ptr long) MSVCIRT_ostrstream_ctor @ stub -arch=win32 ??0stdiobuf@@QAE(a)ABV0@@Z # __thiscall stdiobuf::stdiobuf(class stdiobuf const &) @ stub -arch=win64 ??0stdiobuf@@QEAA(a)AEBV0@@Z @ stub -arch=win32 ??0stdiobuf@@QAE(a)PAU_iobuf@@@Z # __thiscall stdiobuf::stdiobuf(struct _iobuf *) @@ -158,8 +158,8 @@ @ stub -arch=win64 ??1ostream@@UEAA(a)XZ @ stub -arch=win32 ??1ostream_withassign@@UAE(a)XZ # virtual __thiscall ostream_withassign::~ostream_withassign(void) @ stub -arch=win64 ??1ostream_withassign@@UEAA(a)XZ -@ thiscall -arch=win32 ??1ostrstream@@UAE(a)XZ(ptr) MSVCIRT_ostrstream_sl_void # virtual __thiscall ostrstream::~ostrstream(void) -@ cdecl -arch=win64 ??1ostrstream@@UEAA(a)XZ(ptr) MSVCIRT_ostrstream_sl_void +@ thiscall -arch=win32 ??1ostrstream@@UAE(a)XZ(ptr) MSVCIRT_ostrstream_dtor +@ cdecl -arch=win64 ??1ostrstream@@UEAA(a)XZ(ptr) MSVCIRT_ostrstream_dtor @ stub -arch=win32 ??1stdiobuf@@UAE(a)XZ # virtual __thiscall stdiobuf::~stdiobuf(void) @ stub -arch=win64 ??1stdiobuf@@UEAA(a)XZ @ stub -arch=win32 ??1stdiostream@@UAE(a)XZ # virtual __thiscall stdiostream::~stdiostream(void) diff --git a/dlls/msvcrt20/msvcrt20.spec b/dlls/msvcrt20/msvcrt20.spec index c7b28bd..fe1d80c 100644 --- a/dlls/msvcrt20/msvcrt20.spec +++ b/dlls/msvcrt20/msvcrt20.spec @@ -86,8 +86,8 @@ @ stub -arch=win64 ??0ostrstream@@QEAA(a)AEBV0@@Z @ stub -arch=win32 ??0ostrstream@@QAE(a)PADHH@Z @ stub -arch=win64 ??0ostrstream@@QEAA(a)PEADHH@Z -@ thiscall -arch=win32 ??0ostrstream@@QAE(a)XZ(ptr) msvcirt.??0ostrstream@@QAE(a)XZ -@ cdecl -arch=win64 ??0ostrstream@@QEAA(a)XZ(ptr) msvcirt.??0ostrstream@@QEAA(a)XZ +@ thiscall -arch=win32 ??0ostrstream@@QAE(a)XZ(ptr long) msvcirt.??0ostrstream@@QAE(a)XZ +@ cdecl -arch=win64 ??0ostrstream@@QEAA(a)XZ(ptr long) msvcirt.??0ostrstream@@QEAA(a)XZ @ stub -arch=win32 ??0stdiobuf@@QAE(a)ABV0@@Z @ stub -arch=win64 ??0stdiobuf@@QEAA(a)AEBV0@@Z @ stub -arch=win32 ??0stdiobuf@@QAE(a)PAU_iobuf@@@Z diff --git a/dlls/msvcrt40/msvcrt40.spec b/dlls/msvcrt40/msvcrt40.spec index 49df71c..6fa3078 100644 --- a/dlls/msvcrt40/msvcrt40.spec +++ b/dlls/msvcrt40/msvcrt40.spec @@ -108,8 +108,8 @@ @ stub -arch=win64 ??0ostrstream@@QEAA(a)AEBV0@@Z @ stub -arch=win32 ??0ostrstream@@QAE(a)PADHH@Z @ stub -arch=win64 ??0ostrstream@@QEAA(a)PEADHH@Z -@ thiscall -arch=win32 ??0ostrstream@@QAE(a)XZ(ptr) msvcirt.??0ostrstream@@QAE(a)XZ -@ cdecl -arch=win64 ??0ostrstream@@QEAA(a)XZ(ptr) msvcirt.??0ostrstream@@QEAA(a)XZ +@ thiscall -arch=win32 ??0ostrstream@@QAE(a)XZ(ptr long) msvcirt.??0ostrstream@@QAE(a)XZ +@ cdecl -arch=win64 ??0ostrstream@@QEAA(a)XZ(ptr long) msvcirt.??0ostrstream@@QEAA(a)XZ @ stub -arch=win32 ??0stdiobuf@@QAE(a)ABV0@@Z @ stub -arch=win64 ??0stdiobuf@@QEAA(a)AEBV0@@Z @ stub -arch=win32 ??0stdiobuf@@QAE(a)PAU_iobuf@@@Z

1 0

Iván Matellanes : msvcirt: Add implementation of streambuf::dbp.
by Alexandre Julliard June 29, 2015

June 29, 2015

Module: wine Branch: master Commit: 6096dfe6d9c6568a15e8f22c3b59ac8d6570bb69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6096dfe6d9c6568a15e8f22c3… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Mon Jun 29 10:01:58 2015 +0200 msvcirt: Add implementation of streambuf::dbp. --- dlls/msvcirt/msvcirt.c | 16 ++++++++++++++++ dlls/msvcirt/msvcirt.spec | 4 ++-- dlls/msvcrt20/msvcrt20.spec | 4 ++-- dlls/msvcrt40/msvcrt40.spec | 4 ++-- 4 files changed, 22 insertions(+), 6 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index a56fd61..0979673 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -667,6 +667,22 @@ int __thiscall streambuf_sputbackc(streambuf *this, char ch) return call_streambuf_pbackfail(this, ch); } +/* ?dbp(a)streambuf@@QAEXXZ */ +/* ?dbp(a)streambuf@@QEAAXXZ */ +DEFINE_THISCALL_WRAPPER(streambuf_dbp, 4) +void __thiscall streambuf_dbp(streambuf *this) +{ + printf("\nSTREAMBUF DEBUG INFO: this=%p, ", this); + if (this->unbuffered) { + printf("unbuffered\n"); + } else { + printf("_fAlloc=%d\n", this->allocated); + printf(" base()=%p, ebuf()=%p, blen()=%d\n", this->base, this->ebuf, streambuf_blen(this)); + printf("pbase()=%p, pptr()=%p, epptr()=%d\n", this->pbase, this->pptr, this->epptr); + printf("eback()=%p, gptr()=%p, egptr()=%d\n", this->eback, this->gptr, this->egptr); + } +} + /****************************************************************** * ??1ios@@UAE(a)XZ (MSVCRTI.@) * class ios & __thiscall ios::-ios<<(void) diff --git a/dlls/msvcirt/msvcirt.spec b/dlls/msvcirt/msvcirt.spec index f14821e..0c9e520 100644 --- a/dlls/msvcirt/msvcirt.spec +++ b/dlls/msvcirt/msvcirt.spec @@ -437,8 +437,8 @@ @ thiscall -arch=win32 ?clrlock(a)streambuf@@QAEXXZ(ptr) streambuf_clrlock @ cdecl -arch=win64 ?clrlock(a)streambuf@@QEAAXXZ(ptr) streambuf_clrlock @ stub ?cout@@3Vostream_withassign@@A # class ostream_withassign cout -@ stub -arch=win32 ?dbp(a)streambuf@@QAEXXZ # void __thiscall streambuf::dbp(void) -@ stub -arch=win64 ?dbp(a)streambuf@@QEAAXXZ +@ thiscall -arch=win32 ?dbp(a)streambuf@@QAEXXZ(ptr) streambuf_dbp +@ cdecl -arch=win64 ?dbp(a)streambuf@@QEAAXXZ(ptr) streambuf_dbp @ stub -arch=win32 ?dec@@YAAAVios@@AAV1@@Z # class ios & __cdecl dec(class ios &) @ stub -arch=win64 ?dec@@YAAEAVios@@AEAV1@@Z @ stub -arch=win32 ?delbuf(a)ios@@QAEXH(a)Z # void __thiscall ios::delbuf(int) diff --git a/dlls/msvcrt20/msvcrt20.spec b/dlls/msvcrt20/msvcrt20.spec index c7dd035..c7b28bd 100644 --- a/dlls/msvcrt20/msvcrt20.spec +++ b/dlls/msvcrt20/msvcrt20.spec @@ -425,8 +425,8 @@ @ thiscall -arch=win32 ?clrlock(a)streambuf@@QAEXXZ(ptr) msvcirt.?clrlock(a)streambuf@@QAEXXZ @ cdecl -arch=win64 ?clrlock(a)streambuf@@QEAAXXZ(ptr) msvcirt.?clrlock(a)streambuf@@QEAAXXZ @ stub ?cout@@3Vostream_withassign@@A -@ stub -arch=win32 ?dbp(a)streambuf@@QAEXXZ -@ stub -arch=win64 ?dbp(a)streambuf@@QEAAXXZ +@ thiscall -arch=win32 ?dbp(a)streambuf@@QAEXXZ(ptr) msvcirt.?dbp(a)streambuf@@QAEXXZ +@ cdecl -arch=win64 ?dbp(a)streambuf@@QEAAXXZ(ptr) msvcirt.?dbp(a)streambuf@@QEAAXXZ @ stub -arch=win32 ?dec@@YAAAVios@@AAV1@@Z @ stub -arch=win64 ?dec@@YAAEAVios@@AEAV1@@Z @ stub -arch=win32 ?delbuf(a)ios@@QAEXH(a)Z diff --git a/dlls/msvcrt40/msvcrt40.spec b/dlls/msvcrt40/msvcrt40.spec index bda6e2c..49df71c 100644 --- a/dlls/msvcrt40/msvcrt40.spec +++ b/dlls/msvcrt40/msvcrt40.spec @@ -490,8 +490,8 @@ @ thiscall -arch=win32 ?clrlock(a)streambuf@@QAEXXZ(ptr) msvcirt.?clrlock(a)streambuf@@QAEXXZ @ cdecl -arch=win64 ?clrlock(a)streambuf@@QEAAXXZ(ptr) msvcirt.?clrlock(a)streambuf@@QEAAXXZ @ stub ?cout@@3Vostream_withassign@@A -@ stub -arch=win32 ?dbp(a)streambuf@@QAEXXZ -@ stub -arch=win64 ?dbp(a)streambuf@@QEAAXXZ +@ thiscall -arch=win32 ?dbp(a)streambuf@@QAEXXZ(ptr) msvcirt.?dbp(a)streambuf@@QAEXXZ +@ cdecl -arch=win64 ?dbp(a)streambuf@@QEAAXXZ(ptr) msvcirt.?dbp(a)streambuf@@QEAAXXZ @ stub -arch=win32 ?dec@@YAAAVios@@AAV1@@Z @ stub -arch=win64 ?dec@@YAAEAVios@@AEAV1@@Z @ stub -arch=win32 ?delbuf(a)ios@@QAEXH(a)Z

1 0