wine-commits June 2015

wine-commits@winehq.org

2 participants
610 discussions

Jacek Caban : msscript.ocx: Added IScriptControl stub implementation.
by Alexandre Julliard 30 Jun '15

30 Jun '15

Module: wine Branch: master Commit: 6b205e41cf0798fd6dff7c37e9b250fc885cf792 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b205e41cf0798fd6dff7c37e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jun 30 14:09:03 2015 +0200 msscript.ocx: Added IScriptControl stub implementation. --- dlls/msscript.ocx/msscript.c | 311 ++++++++++++++++++++++++++++++++++++++++- dlls/msscript.ocx/msscript.idl | 2 +- 2 files changed, 309 insertions(+), 4 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6b205e41cf0798fd6dff7…

1 0

Hugh McMaster : wineconsole: Add HKCU registry entries for Insert Mode.
by Alexandre Julliard 30 Jun '15

30 Jun '15

Module: wine Branch: master Commit: ef0f0ad1d06bc7cdc05b92eb97d92d258247048e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef0f0ad1d06bc7cdc05b92eb9… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Jun 30 20:05:35 2015 +1000 wineconsole: Add HKCU registry entries for Insert Mode. --- programs/wineconsole/registry.c | 13 +++++++++++-- programs/wineconsole/winecon_private.h | 1 + 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/programs/wineconsole/registry.c b/programs/wineconsole/registry.c index 2805f2a..c1d04c1 100644 --- a/programs/wineconsole/registry.c +++ b/programs/wineconsole/registry.c @@ -40,6 +40,7 @@ static const WCHAR wszFontSize[] = {'F','o','n','t','S','i','z','e',0}; static const WCHAR wszFontWeight[] = {'F','o','n','t','W','e','i','g','h','t',0}; static const WCHAR wszHistoryBufferSize[] = {'H','i','s','t','o','r','y','B','u','f','f','e','r','S','i','z','e',0}; static const WCHAR wszHistoryNoDup[] = {'H','i','s','t','o','r','y','N','o','D','u','p',0}; +static const WCHAR wszInsertMode[] = {'I','n','s','e','r','t','M','o','d','e',0}; static const WCHAR wszMenuMask[] = {'M','e','n','u','M','a','s','k',0}; static const WCHAR wszQuickEdit[] = {'Q','u','i','c','k','E','d','i','t',0}; static const WCHAR wszScreenBufferSize[] = {'S','c','r','e','e','n','B','u','f','f','e','r','S','i','z','e',0}; @@ -48,10 +49,10 @@ static const WCHAR wszWindowSize[] = {'W','i','n','d','o','w','S','i','z' void WINECON_DumpConfig(const char* pfx, const struct config_data* cfg) { - WINE_TRACE("%s cell=(%u,%u) cursor=(%d,%d) attr=%02x font=%s/%u hist=%u/%d flags=%c%c msk=%08x sb=(%u,%u) win=(%u,%u)x(%u,%u) edit=%u registry=%s\n", + WINE_TRACE("%s cell=(%u,%u) cursor=(%d,%d) attr=%02x font=%s/%u hist=%u/%d flags=%c%c%c msk=%08x sb=(%u,%u) win=(%u,%u)x(%u,%u) edit=%u registry=%s\n", pfx, cfg->cell_width, cfg->cell_height, cfg->cursor_size, cfg->cursor_visible, cfg->def_attr, wine_dbgstr_w(cfg->face_name), cfg->font_weight, cfg->history_size, cfg->history_nodup ? 1 : 2, - cfg->quick_edit ? 'Q' : 'q', cfg->exit_on_die ? 'X' : 'x', + cfg->insert_mode ? 'I' : 'i', cfg->quick_edit ? 'Q' : 'q', cfg->exit_on_die ? 'X' : 'x', cfg->menu_mask, cfg->sb_width, cfg->sb_height, cfg->win_pos.X, cfg->win_pos.Y, cfg->win_width, cfg->win_height, cfg->edition_mode, wine_dbgstr_w(cfg->registry)); @@ -126,6 +127,10 @@ static void WINECON_RegLoadHelper(HKEY hConKey, struct config_data* cfg) cfg->history_nodup = val; count = sizeof(val); + if (!RegQueryValueExW(hConKey, wszInsertMode, 0, &type, (LPBYTE)&val, &count)) + cfg->insert_mode = val; + + count = sizeof(val); if (!RegQueryValueExW(hConKey, wszMenuMask, 0, &type, (LPBYTE)&val, &count)) cfg->menu_mask = val; @@ -175,6 +180,7 @@ void WINECON_RegLoad(const WCHAR* appname, struct config_data* cfg) cfg->font_weight = 0; cfg->history_size = 50; cfg->history_nodup = 0; + cfg->insert_mode = 1; cfg->menu_mask = 0; cfg->quick_edit = 0; cfg->sb_height = 25; @@ -245,6 +251,9 @@ static void WINECON_RegSaveHelper(HKEY hConKey, const struct config_data* cfg) val = cfg->history_nodup; RegSetValueExW(hConKey, wszHistoryNoDup, 0, REG_DWORD, (LPBYTE)&val, sizeof(val)); + val = cfg->insert_mode; + RegSetValueExW(hConKey, wszInsertMode, 0, REG_DWORD, (LPBYTE)&val, sizeof(val)); + val = cfg->menu_mask; RegSetValueExW(hConKey, wszMenuMask, 0, REG_DWORD, (LPBYTE)&val, sizeof(val)); diff --git a/programs/wineconsole/winecon_private.h b/programs/wineconsole/winecon_private.h index eec4171..2178dd0 100644 --- a/programs/wineconsole/winecon_private.h +++ b/programs/wineconsole/winecon_private.h @@ -36,6 +36,7 @@ struct config_data { DWORD font_weight; DWORD history_size; /* number of commands in history buffer */ DWORD history_nodup; /* TRUE if commands are not stored twice in buffer */ + DWORD insert_mode; /* TRUE to insert text at the cursor location; FALSE to overwrite it */ DWORD menu_mask; /* MK_CONTROL MK_SHIFT mask to drive submenu opening */ DWORD quick_edit; /* whether mouse ops are sent to app (false) or used for content selection (true) */ unsigned sb_width; /* active screen buffer width */

1 0

Aaryaman Vasishta : d3drm/tests: Add test for IDirect3DRM*:: CreateDeviceFromClipper.
by Alexandre Julliard 30 Jun '15

30 Jun '15

Module: wine Branch: master Commit: c20e016eb23214f5d42132836927559824d2bd65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c20e016eb23214f5d42132836… Author: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Date: Mon Jun 29 20:34:06 2015 +0530 d3drm/tests: Add test for IDirect3DRM*::CreateDeviceFromClipper. --- dlls/d3drm/tests/d3drm.c | 202 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 202 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c20e016eb23214f5d4213…

1 0

Michael Stefaniuc : riched20: Print the debug string and not the pointer to it.
by Alexandre Julliard 30 Jun '15

30 Jun '15

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 : explorer: Print the debug string and not the pointer to it.
by Alexandre Julliard 30 Jun '15

30 Jun '15

Module: wine Branch: master Commit: 51144d6a6d978a33a0b8c34a4d7fe309ba56e430 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51144d6a6d978a33a0b8c34a4… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jun 30 09:30:05 2015 +0200 explorer: Print the debug string and not the pointer to it. --- programs/explorer/desktop.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c index d2a4932..2b8502b 100644 --- a/programs/explorer/desktop.c +++ b/programs/explorer/desktop.c @@ -1171,7 +1171,7 @@ static HRESULT WINAPI shellwindows_Revoke(IShellWindows *iface, LONG cookie) static HRESULT WINAPI shellwindows_OnNavigate(IShellWindows *iface, LONG cookie, VARIANT *loc) { - FIXME("0x%x %p\n", cookie, debugstr_variant(loc)); + FIXME("0x%x %s\n", cookie, debugstr_variant(loc)); return E_NOTIMPL; } @@ -1184,7 +1184,7 @@ static HRESULT WINAPI shellwindows_OnActivated(IShellWindows *iface, LONG cookie static HRESULT WINAPI shellwindows_FindWindowSW(IShellWindows *iface, VARIANT *loc, VARIANT *root, int class, LONG *hwnd, int options, IDispatch **disp) { - TRACE("%s %p 0x%x %p 0x%x %p\n", debugstr_variant(loc), debugstr_variant(root), + TRACE("%s %s 0x%x %p 0x%x %p\n", debugstr_variant(loc), debugstr_variant(root), class, hwnd, options, disp); if (class != SWC_DESKTOP)

1 0

Michael Stefaniuc : kernel32/tests: The result of a comparison is already a BOOL.
by Alexandre Julliard 30 Jun '15

30 Jun '15

Module: wine Branch: master Commit: c50f6a304c93b1d17e762a412a259f1d0260b2a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c50f6a304c93b1d17e762a412… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jun 30 09:29:24 2015 +0200 kernel32/tests: The result of a comparison is already a BOOL. --- dlls/kernel32/tests/volume.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/volume.c b/dlls/kernel32/tests/volume.c index b41f8ac..44794f1 100644 --- a/dlls/kernel32/tests/volume.c +++ b/dlls/kernel32/tests/volume.c @@ -793,9 +793,9 @@ static void test_GetVolumePathNameA(void) for (i=0; i<sizeof(test_paths)/sizeof(test_paths[0]); i++) { - BOOL broken_ret = test_paths[i].broken_error == NO_ERROR ? TRUE : FALSE; + BOOL broken_ret = test_paths[i].broken_error == NO_ERROR; char *output = (test_paths[i].path_name != NULL ? volume_path : NULL); - BOOL expected_ret = test_paths[i].error == NO_ERROR ? TRUE : FALSE; + BOOL expected_ret = test_paths[i].error == NO_ERROR; volume_path[0] = 0; if (test_paths[i].path_len < sizeof(volume_path))

1 0

Michael Stefaniuc : dmstyle: Use the generic IPersistStream for DMMotifTrack.
by Alexandre Julliard 30 Jun '15

30 Jun '15

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 30 Jun '15

30 Jun '15

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

Michael Stefaniuc : dmstyle: COM cleanup for IDirectMusicTrack8 of DMMotifTrack.
by Alexandre Julliard 30 Jun '15

30 Jun '15

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

Michael Stefaniuc : dmstyle: Use the generic IPersistStream for DMAuditionTrack.
by Alexandre Julliard 30 Jun '15

30 Jun '15

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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2015