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

Michael Stefaniuc : dmstyle: Remove unused DirectMusicMelodyFormulationTrack stuff.
by Alexandre Julliard June 29, 2015

June 29, 2015

Module: wine Branch: master Commit: 809b8604e981ab5213c28371041638b7c68ef2ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=809b8604e981ab5213c283710… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Jun 28 23:33:52 2015 +0200 dmstyle: Remove unused DirectMusicMelodyFormulationTrack stuff. --- dlls/dmstyle/dmstyle_private.h | 27 --------------------------- 1 file changed, 27 deletions(-) diff --git a/dlls/dmstyle/dmstyle_private.h b/dlls/dmstyle/dmstyle_private.h index 3382468..978d75f 100644 --- a/dlls/dmstyle/dmstyle_private.h +++ b/dlls/dmstyle/dmstyle_private.h @@ -43,11 +43,6 @@ #include "dmusics.h" /***************************************************************************** - * Interfaces - */ -typedef struct IDirectMusicMelodyFormulationTrack IDirectMusicMelodyFormulationTrack; - -/***************************************************************************** * ClassFactory */ extern HRESULT WINAPI create_dmstyle(REFIID lpcGUID, LPVOID* ppobj) DECLSPEC_HIDDEN; @@ -97,28 +92,6 @@ typedef struct _DMUS_PRIVATE_COMMAND { IDirectMusicCollection* ppReferenceCollection; } DMUS_PRIVATE_COMMAND, *LPDMUS_PRIVATE_COMMAND; -/***************************************************************************** - * IDirectMusicMelodyFormulationTrack implementation structure - */ -struct IDirectMusicMelodyFormulationTrack { - /* IUnknown fields */ - const IUnknownVtbl *UnknownVtbl; - const IDirectMusicTrack8Vtbl *TrackVtbl; - const IPersistStreamVtbl *PersistStreamVtbl; - LONG ref; - - /* IDirectMusicMelodyFormulationTrack fields */ - LPDMUS_OBJECTDESC pDesc; -}; - -/* IUnknown: */ -extern HRESULT WINAPI IDirectMusicMelodyFormulationTrack_IUnknown_QueryInterface (LPUNKNOWN iface, REFIID riid, LPVOID *ppobj) DECLSPEC_HIDDEN; -extern ULONG WINAPI IDirectMusicMelodyFormulationTrack_IUnknown_AddRef (LPUNKNOWN iface) DECLSPEC_HIDDEN; -/* IDirectMusicTrack(8): */ -extern ULONG WINAPI IDirectMusicMelodyFormulationTrack_IDirectMusicTrack_AddRef (LPDIRECTMUSICTRACK8 iface) DECLSPEC_HIDDEN; -/* IPersistStream: */ -extern ULONG WINAPI IDirectMusicMelodyFormulationTrack_IPersistStream_AddRef (LPPERSISTSTREAM iface) DECLSPEC_HIDDEN; - /********************************************************************** * Dll lifetime tracking declaration for dmstyle.dll */

1 0

Nikolay Sivov : shell32: Fix memory leak on NULL return length (Coverity).
by Alexandre Julliard June 29, 2015

June 29, 2015

Module: wine Branch: master Commit: 7ca31b81195ac39ddb3feb49624b57a7d92da994 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ca31b81195ac39ddb3feb496… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jun 27 22:07:39 2015 +0300 shell32: Fix memory leak on NULL return length (Coverity). --- dlls/shell32/assoc.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/shell32/assoc.c b/dlls/shell32/assoc.c index 21df493..90d00a8 100644 --- a/dlls/shell32/assoc.c +++ b/dlls/shell32/assoc.c @@ -745,7 +745,7 @@ static HRESULT WINAPI IQueryAssociations_fnGetData(IQueryAssociations *iface, static const WCHAR edit_flags[] = {'E','d','i','t','F','l','a','g','s',0}; IQueryAssociationsImpl *This = impl_from_IQueryAssociations(iface); - void *data; + void *data = NULL; DWORD size; HRESULT hres; @@ -761,10 +761,8 @@ static HRESULT WINAPI IQueryAssociations_fnGetData(IQueryAssociations *iface, return HRESULT_FROM_WIN32(ERROR_NO_ASSOCIATION); hres = ASSOC_GetValue(This->hkeyProgID, edit_flags, &data, &size); - if(FAILED(hres) || !pcbOut) - return hres; - - hres = ASSOC_ReturnData(pvOut, pcbOut, data, size); + if(SUCCEEDED(hres) && pcbOut) + hres = ASSOC_ReturnData(pvOut, pcbOut, data, size); HeapFree(GetProcessHeap(), 0, data); return hres; default:

1 0

Nikolay Sivov : gdiplus: Check GetMetadataFormat() return value (Coverity) .
by Alexandre Julliard June 29, 2015

June 29, 2015

Module: wine Branch: master Commit: c2ae34c54d5e385c8f85a2b28a0328bf57e1fd0d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2ae34c54d5e385c8f85a2b28… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jun 27 14:29:37 2015 +0300 gdiplus: Check GetMetadataFormat() return value (Coverity). --- dlls/gdiplus/image.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 351c5b3..73f2f74 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -3058,8 +3058,8 @@ static BOOL get_bool_property(IWICMetadataReader *reader, const GUID *guid, cons PROPVARIANT id, value; BOOL ret = FALSE; - IWICMetadataReader_GetMetadataFormat(reader, &format); - if (!IsEqualGUID(&format, guid)) return FALSE; + hr = IWICMetadataReader_GetMetadataFormat(reader, &format); + if (FAILED(hr) || !IsEqualGUID(&format, guid)) return FALSE; PropVariantInit(&id); PropVariantInit(&value); @@ -3085,8 +3085,8 @@ static PropertyItem *get_property(IWICMetadataReader *reader, const GUID *guid, PROPVARIANT id, value; PropertyItem *item = NULL; - IWICMetadataReader_GetMetadataFormat(reader, &format); - if (!IsEqualGUID(&format, guid)) return NULL; + hr = IWICMetadataReader_GetMetadataFormat(reader, &format); + if (FAILED(hr) || !IsEqualGUID(&format, guid)) return NULL; PropVariantInit(&id); PropVariantInit(&value);

1 0

Nikolay Sivov : user32: Added stubs for ShutdownBlockReasonCreate/ ShutdownBlockReasonDestroy.
by Alexandre Julliard June 29, 2015

June 29, 2015

Module: wine Branch: master Commit: 48246a149ed1d4e97338421a376b8f791a2d1dbe URL: http://source.winehq.org/git/wine.git/?a=commit;h=48246a149ed1d4e97338421a3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jun 26 21:35:28 2015 +0300 user32: Added stubs for ShutdownBlockReasonCreate/ShutdownBlockReasonDestroy. --- dlls/user32/user32.spec | 2 ++ dlls/user32/user_main.c | 20 ++++++++++++++++++++ include/winuser.h | 2 ++ 3 files changed, 24 insertions(+) diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index a8bbe83..5cc0f55 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -697,6 +697,8 @@ @ stub ShowStartGlass @ stdcall ShowWindow(long long) @ stdcall ShowWindowAsync(long long) +@ stdcall ShutdownBlockReasonCreate(long wstr) +@ stdcall ShutdownBlockReasonDestroy(long) # @ stub SoftModalMessageBox @ stdcall SubtractRect(ptr ptr ptr) @ stdcall SwapMouseButton(long) diff --git a/dlls/user32/user_main.c b/dlls/user32/user_main.c index 12764e6..718abe0 100644 --- a/dlls/user32/user_main.c +++ b/dlls/user32/user_main.c @@ -409,3 +409,23 @@ int WINAPI RegisterServicesProcess(DWORD ServicesProcessId) FIXME("(0x%x): stub\n", ServicesProcessId); return 0; } + +/*********************************************************************** + * ShutdownBlockReasonCreate (USER32.@) + */ +BOOL WINAPI ShutdownBlockReasonCreate(HWND hwnd, LPCWSTR reason) +{ + FIXME("(%p, %s): stub\n", hwnd, debugstr_w(reason)); + SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); + return FALSE; +} + +/*********************************************************************** + * ShutdownBlockReasonDestroy (USER32.@) + */ +BOOL WINAPI ShutdownBlockReasonDestroy(HWND hwnd) +{ + FIXME("(%p): stub\n", hwnd); + SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); + return FALSE; +} diff --git a/include/winuser.h b/include/winuser.h index e9804a9..118aa73 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -3992,6 +3992,8 @@ WINUSERAPI BOOL WINAPI ShowScrollBar(HWND,INT,BOOL); WINUSERAPI BOOL WINAPI ShowOwnedPopups(HWND,BOOL); WINUSERAPI BOOL WINAPI ShowWindow(HWND,INT); WINUSERAPI BOOL WINAPI ShowWindowAsync(HWND,INT); +WINUSERAPI BOOL WINAPI ShutdownBlockReasonCreate(HWND,LPCWSTR); +WINUSERAPI BOOL WINAPI ShutdownBlockReasonDestroy(HWND); WINUSERAPI BOOL WINAPI SubtractRect(LPRECT,const RECT*,const RECT*); WINUSERAPI BOOL WINAPI SwapMouseButton(BOOL); WINUSERAPI BOOL WINAPI SwitchDesktop(HDESK);

1 0

Jacek Caban : user32: Limit number of hooks called recursively.
by Alexandre Julliard June 29, 2015

June 29, 2015

Module: wine Branch: master Commit: 4bcb4881ae9e7fc2cc4d32aa3ba7f36e46d6fc5c URL: http://source.winehq.org/git/wine.git/?a=commit;h=4bcb4881ae9e7fc2cc4d32aa3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jun 26 19:37:41 2015 +0200 user32: Limit number of hooks called recursively. --- dlls/user32/hook.c | 15 ++++++++++++- dlls/user32/tests/msg.c | 54 +++++++++++++++++++++++++++++++++++++++++++++- dlls/user32/user_private.h | 1 + 3 files changed, 68 insertions(+), 2 deletions(-) diff --git a/dlls/user32/hook.c b/dlls/user32/hook.c index 281b88e..090ec17 100644 --- a/dlls/user32/hook.c +++ b/dlls/user32/hook.c @@ -413,7 +413,19 @@ static LRESULT call_hook( struct hook_info *info, INT code, WPARAM wparam, LPARA } else if (info->proc) { + struct user_thread_info *thread_info = get_user_thread_info(); HMODULE free_module = 0; + + /* + * Windows protects from stack overflow in recursive hook calls. Different Windows + * allow different depths. + */ + if (thread_info->hook_call_depth >= 25) + { + WARN("Too many hooks called recursively, skipping call.\n"); + return 0; + } + TRACE( "calling hook %p %s code %x wp %lx lp %lx module %s\n", info->proc, hook_names[info->id-WH_MINHOOK], code, wparam, lparam, debugstr_w(info->module) ); @@ -421,16 +433,17 @@ static LRESULT call_hook( struct hook_info *info, INT code, WPARAM wparam, LPARA if (!info->module[0] || (info->proc = get_hook_proc( info->proc, info->module, &free_module )) != NULL) { - struct user_thread_info *thread_info = get_user_thread_info(); HHOOK prev = thread_info->hook; BOOL prev_unicode = thread_info->hook_unicode; thread_info->hook = info->handle; thread_info->hook_unicode = info->next_unicode; + thread_info->hook_call_depth++; ret = call_hook_proc( info->proc, info->id, code, wparam, lparam, info->prev_unicode, info->next_unicode ); thread_info->hook = prev; thread_info->hook_unicode = prev_unicode; + thread_info->hook_call_depth--; if (free_module) FreeLibrary(free_module); } diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index a515550..831a56b 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -9182,6 +9182,54 @@ todo_wine { "unexpected error %d\n", GetLastError()); } +static HWND hook_hwnd; +static HHOOK recursive_hook; +static int hook_depth, max_hook_depth; + +static LRESULT WINAPI rec_get_message_hook(int code, WPARAM w, LPARAM l) +{ + LRESULT res; + MSG msg; + BOOL b; + + hook_depth++; + if(hook_depth > max_hook_depth) + max_hook_depth = hook_depth; + + b = PeekMessageW(&msg, hook_hwnd, 0, 0, PM_NOREMOVE); + ok(b, "PeekMessage failed\n"); + + res = CallNextHookEx(recursive_hook, code, w, l); + + hook_depth--; + return res; +} + +static void test_recursive_hook(void) +{ + MSG msg; + BOOL b; + + hook_hwnd = CreateWindowA("Static", NULL, WS_POPUP, 0, 0, 200, 60, NULL, NULL, NULL, NULL); + ok(hook_hwnd != NULL, "CreateWindow failed\n"); + + recursive_hook = SetWindowsHookExW(WH_GETMESSAGE, rec_get_message_hook, NULL, GetCurrentThreadId()); + ok(recursive_hook != NULL, "SetWindowsHookEx failed\n"); + + PostMessageW(hook_hwnd, WM_USER, 0, 0); + PostMessageW(hook_hwnd, WM_USER+1, 0, 0); + + hook_depth = 0; + GetMessageW(&msg, hook_hwnd, 0, 0); + ok(15 < max_hook_depth && max_hook_depth < 45, "max_hook_depth = %d\n", max_hook_depth); + trace("max_hook_depth = %d\n", max_hook_depth); + + b = UnhookWindowsHookEx(recursive_hook); + ok(b, "UnhokWindowsHookEx failed\n"); + + DestroyWindow(hook_hwnd); +} + static const struct message ScrollWindowPaint1[] = { { WM_PAINT, sent }, { WM_ERASEBKGND, sent|beginpaint }, @@ -14946,7 +14994,11 @@ START_TEST(msg) test_timers(); test_timers_no_wnd(); test_timers_exceptions(); - if (hCBT_hook) test_set_hook(); + if (hCBT_hook) + { + test_set_hook(); + test_recursive_hook(); + } test_DestroyWindow(); test_DispatchMessage(); test_SendMessageTimeout(); diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index 1fbecb9..d3affb0 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -175,6 +175,7 @@ struct user_thread_info DWORD changed_mask; /* Current queue changed mask */ WORD recursion_count; /* SendMessage recursion counter */ WORD message_count; /* Get/PeekMessage loop counter */ + WORD hook_call_depth; /* Number of recursively called hook procs */ BOOL hook_unicode; /* Is current hook unicode? */ HHOOK hook; /* Current hook */ struct received_message_info *receive_info; /* Message being currently received */

1 0

Michael Stefaniuc : dmcompos: Remove the extraneous IUnknown from DMSignPostTrack.
by Alexandre Julliard June 29, 2015

June 29, 2015

Module: wine Branch: master Commit: 61343bdce6038a5d1d9580f89f6b334ba441720d URL: http://source.winehq.org/git/wine.git/?a=commit;h=61343bdce6038a5d1d9580f89… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Jun 28 23:36:13 2015 +0200 dmcompos: Remove the extraneous IUnknown from DMSignPostTrack. Also lock/unlock the module only on creation/destruction of the object. --- dlls/dmcompos/signposttrack.c | 127 +++++++++++++++++------------------------- 1 file changed, 50 insertions(+), 77 deletions(-) diff --git a/dlls/dmcompos/signposttrack.c b/dlls/dmcompos/signposttrack.c index c368874..e91f7bb 100644 --- a/dlls/dmcompos/signposttrack.c +++ b/dlls/dmcompos/signposttrack.c @@ -21,76 +21,16 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmcompos); -static ULONG WINAPI IDirectMusicSignPostTrack_IUnknown_AddRef (LPUNKNOWN iface); -static ULONG WINAPI IDirectMusicSignPostTrack_IPersistStream_AddRef (LPPERSISTSTREAM iface); - /***************************************************************************** * IDirectMusicSignPostTrack implementation */ typedef struct IDirectMusicSignPostTrack { - const IUnknownVtbl *UnknownVtbl; IDirectMusicTrack8 IDirectMusicTrack8_iface; const IPersistStreamVtbl *PersistStreamVtbl; LONG ref; DMUS_OBJECTDESC *pDesc; } IDirectMusicSignPostTrack; -/* IDirectMusicSignPostTrack IUnknown part: */ -static HRESULT WINAPI IDirectMusicSignPostTrack_IUnknown_QueryInterface (LPUNKNOWN iface, REFIID riid, LPVOID *ppobj) { - ICOM_THIS_MULTI(IDirectMusicSignPostTrack, UnknownVtbl, iface); - TRACE("(%p, %s, %p)\n", This, debugstr_dmguid(riid), ppobj); - - if (IsEqualIID (riid, &IID_IUnknown)) { - *ppobj = &This->UnknownVtbl; - IDirectMusicSignPostTrack_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; - IDirectMusicSignPostTrack_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 IDirectMusicSignPostTrack_IUnknown_AddRef (LPUNKNOWN iface) { - ICOM_THIS_MULTI(IDirectMusicSignPostTrack, UnknownVtbl, iface); - ULONG ref = InterlockedIncrement(&This->ref); - - TRACE("(%p): AddRef from %d\n", This, ref - 1); - - DMCOMPOS_LockModule(); - - return ref; -} - -static ULONG WINAPI IDirectMusicSignPostTrack_IUnknown_Release (LPUNKNOWN iface) { - ICOM_THIS_MULTI(IDirectMusicSignPostTrack, UnknownVtbl, iface); - ULONG ref = InterlockedDecrement(&This->ref); - - TRACE("(%p): ReleaseRef to %d\n", This, ref); - - if (ref == 0) { - HeapFree(GetProcessHeap(), 0, This); - } - - DMCOMPOS_UnlockModule(); - - return ref; -} - -static const IUnknownVtbl DirectMusicSignPostTrack_Unknown_Vtbl = { - IDirectMusicSignPostTrack_IUnknown_QueryInterface, - IDirectMusicSignPostTrack_IUnknown_AddRef, - IDirectMusicSignPostTrack_IUnknown_Release -}; - /* IDirectMusicSignPostTrack IDirectMusicTrack8 part: */ static inline IDirectMusicSignPostTrack *impl_from_IDirectMusicTrack8(IDirectMusicTrack8 *iface) { @@ -98,22 +38,51 @@ static inline IDirectMusicSignPostTrack *impl_from_IDirectMusicTrack8(IDirectMus } static HRESULT WINAPI IDirectMusicTrack8Impl_QueryInterface(IDirectMusicTrack8 *iface, REFIID riid, - void **ppobj) + void **ret_iface) { IDirectMusicSignPostTrack *This = impl_from_IDirectMusicTrack8(iface); - return IDirectMusicSignPostTrack_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) { IDirectMusicSignPostTrack *This = impl_from_IDirectMusicTrack8(iface); - return IDirectMusicSignPostTrack_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) { IDirectMusicSignPostTrack *This = impl_from_IDirectMusicTrack8(iface); - return IDirectMusicSignPostTrack_IUnknown_Release ((LPUNKNOWN)&This->UnknownVtbl); + LONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + if (!ref) { + HeapFree(GetProcessHeap(), 0, This); + DMCOMPOS_UnlockModule(); + } + + return ref; } static HRESULT WINAPI IDirectMusicTrack8Impl_Init(IDirectMusicTrack8 *iface, @@ -272,17 +241,17 @@ static const IDirectMusicTrack8Vtbl dmtrack8_vtbl = { /* IDirectMusicSignPostTrack IPersistStream part: */ static HRESULT WINAPI IDirectMusicSignPostTrack_IPersistStream_QueryInterface (LPPERSISTSTREAM iface, REFIID riid, LPVOID *ppobj) { ICOM_THIS_MULTI(IDirectMusicSignPostTrack, PersistStreamVtbl, iface); - return IDirectMusicSignPostTrack_IUnknown_QueryInterface ((LPUNKNOWN)&This->UnknownVtbl, riid, ppobj); + return IDirectMusicTrack8_QueryInterface(&This->IDirectMusicTrack8_iface, riid, ppobj); } static ULONG WINAPI IDirectMusicSignPostTrack_IPersistStream_AddRef (LPPERSISTSTREAM iface) { ICOM_THIS_MULTI(IDirectMusicSignPostTrack, PersistStreamVtbl, iface); - return IDirectMusicSignPostTrack_IUnknown_AddRef ((LPUNKNOWN)&This->UnknownVtbl); + return IDirectMusicTrack8_AddRef(&This->IDirectMusicTrack8_iface); } static ULONG WINAPI IDirectMusicSignPostTrack_IPersistStream_Release (LPPERSISTSTREAM iface) { ICOM_THIS_MULTI(IDirectMusicSignPostTrack, PersistStreamVtbl, iface); - return IDirectMusicSignPostTrack_IUnknown_Release ((LPUNKNOWN)&This->UnknownVtbl); + return IDirectMusicTrack8_Release(&This->IDirectMusicTrack8_iface); } static HRESULT WINAPI IDirectMusicSignPostTrack_IPersistStream_GetClassID (LPPERSISTSTREAM iface, CLSID* pClassID) { @@ -322,21 +291,25 @@ static const IPersistStreamVtbl DirectMusicSignPostTrack_PersistStream_Vtbl = /* for ClassFactory */ HRESULT WINAPI create_dmsignposttrack(REFIID lpcGUID, void **ppobj) { - IDirectMusicSignPostTrack* track; - - track = HeapAlloc (GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicSignPostTrack)); - if (NULL == track) { - *ppobj = NULL; - return E_OUTOFMEMORY; - } - track->UnknownVtbl = &DirectMusicSignPostTrack_Unknown_Vtbl; + IDirectMusicSignPostTrack *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 = &DirectMusicSignPostTrack_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_DirectMusicSignPostTrack; - track->ref = 0; /* will be inited by QueryInterface */ + track->ref = 1; + + DMCOMPOS_LockModule(); + hr = IDirectMusicTrack8_QueryInterface(&track->IDirectMusicTrack8_iface, lpcGUID, ppobj); + IDirectMusicTrack8_Release(&track->IDirectMusicTrack8_iface); - return IDirectMusicSignPostTrack_IUnknown_QueryInterface ((LPUNKNOWN)&track->UnknownVtbl, lpcGUID, ppobj); + return hr; }

1 0

Michael Stefaniuc : dmcompos: COM cleanup for IDirectMusicTrack8 of DMSignPostTrack.
by Alexandre Julliard June 29, 2015

June 29, 2015

Module: wine Branch: master Commit: ead9325e1d319c801a999c78baa66da5ca5c9f6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=ead9325e1d319c801a999c78b… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Jun 28 23:35:47 2015 +0200 dmcompos: COM cleanup for IDirectMusicTrack8 of DMSignPostTrack. --- dlls/dmcompos/signposttrack.c | 118 ++++++++++++++++++++++++++---------------- 1 file changed, 72 insertions(+), 46 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ead9325e1d319c801a999…

1 0

Michael Stefaniuc : dmcompos: Use the generic IPersistStream for DMChordMapTrack.
by Alexandre Julliard June 29, 2015

June 29, 2015

Module: wine Branch: master Commit: d9a54d563d26abb527f2aafaf46cd910e3cfd678 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9a54d563d26abb527f2aafaf… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Jun 28 23:35:25 2015 +0200 dmcompos: Use the generic IPersistStream for DMChordMapTrack. --- dlls/dmcompos/chordmaptrack.c | 70 +++++++++++++----------------------------- dlls/dmcompos/tests/dmcompos.c | 6 ++-- 2 files changed, 24 insertions(+), 52 deletions(-) diff --git a/dlls/dmcompos/chordmaptrack.c b/dlls/dmcompos/chordmaptrack.c index 80d54e1..6ebc274 100644 --- a/dlls/dmcompos/chordmaptrack.c +++ b/dlls/dmcompos/chordmaptrack.c @@ -18,6 +18,7 @@ */ #include "dmcompos_private.h" +#include "dmobject.h" WINE_DEFAULT_DEBUG_CHANNEL(dmcompos); @@ -26,9 +27,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmcompos); */ typedef struct IDirectMusicChordMapTrack { IDirectMusicTrack8 IDirectMusicTrack8_iface; - const IPersistStreamVtbl *PersistStreamVtbl; + struct dmobject dmobj; /* IPersistStream only */ LONG ref; - DMUS_OBJECTDESC *pDesc; } IDirectMusicChordMapTrack; /* IDirectMusicChordMapTrack 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; @@ -244,53 +244,27 @@ static const IDirectMusicTrack8Vtbl dmtrack8_vtbl = { IDirectMusicTrack8Impl_Join }; -/* IDirectMusicChordMapTrack IPersistStream part: */ -static HRESULT WINAPI IDirectMusicChordMapTrack_IPersistStream_QueryInterface (LPPERSISTSTREAM iface, REFIID riid, LPVOID *ppobj) { - ICOM_THIS_MULTI(IDirectMusicChordMapTrack, PersistStreamVtbl, iface); - return IDirectMusicTrack8_QueryInterface(&This->IDirectMusicTrack8_iface, riid, ppobj); -} - -static ULONG WINAPI IDirectMusicChordMapTrack_IPersistStream_AddRef (LPPERSISTSTREAM iface) { - ICOM_THIS_MULTI(IDirectMusicChordMapTrack, PersistStreamVtbl, iface); - return IDirectMusicTrack8_AddRef(&This->IDirectMusicTrack8_iface); -} - -static ULONG WINAPI IDirectMusicChordMapTrack_IPersistStream_Release (LPPERSISTSTREAM iface) { - ICOM_THIS_MULTI(IDirectMusicChordMapTrack, PersistStreamVtbl, iface); - return IDirectMusicTrack8_Release(&This->IDirectMusicTrack8_iface); -} - -static HRESULT WINAPI IDirectMusicChordMapTrack_IPersistStream_GetClassID (LPPERSISTSTREAM iface, CLSID* pClassID) { - return E_NOTIMPL; -} - -static HRESULT WINAPI IDirectMusicChordMapTrack_IPersistStream_IsDirty (LPPERSISTSTREAM iface) { - return E_NOTIMPL; +static inline IDirectMusicChordMapTrack *impl_from_IPersistStream(IPersistStream *iface) +{ + return CONTAINING_RECORD(iface, IDirectMusicChordMapTrack, dmobj.IPersistStream_iface); } -static HRESULT WINAPI IDirectMusicChordMapTrack_IPersistStream_Load (LPPERSISTSTREAM iface, IStream* pStm) { - ICOM_THIS_MULTI(IDirectMusicChordMapTrack, PersistStreamVtbl, iface); +static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *pStm) +{ + IDirectMusicChordMapTrack *This = impl_from_IPersistStream(iface); FIXME("(%p, %p): Loading not implemented yet\n", This, pStm); return S_OK; } -static HRESULT WINAPI IDirectMusicChordMapTrack_IPersistStream_Save (LPPERSISTSTREAM iface, IStream* pStm, BOOL fClearDirty) { - return E_NOTIMPL; -} - -static HRESULT WINAPI IDirectMusicChordMapTrack_IPersistStream_GetSizeMax (LPPERSISTSTREAM iface, ULARGE_INTEGER* pcbSize) { - return E_NOTIMPL; -} - -static const IPersistStreamVtbl DirectMusicChordMapTrack_PersistStream_Vtbl = { - IDirectMusicChordMapTrack_IPersistStream_QueryInterface, - IDirectMusicChordMapTrack_IPersistStream_AddRef, - IDirectMusicChordMapTrack_IPersistStream_Release, - IDirectMusicChordMapTrack_IPersistStream_GetClassID, - IDirectMusicChordMapTrack_IPersistStream_IsDirty, - IDirectMusicChordMapTrack_IPersistStream_Load, - IDirectMusicChordMapTrack_IPersistStream_Save, - IDirectMusicChordMapTrack_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 */ @@ -305,12 +279,10 @@ HRESULT WINAPI create_dmchordmaptrack(REFIID lpcGUID, void **ppobj) return E_OUTOFMEMORY; } track->IDirectMusicTrack8_iface.lpVtbl = &dmtrack8_vtbl; - track->PersistStreamVtbl = &DirectMusicChordMapTrack_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_DirectMusicChordMapTrack; track->ref = 1; + dmobject_init(&track->dmobj, &CLSID_DirectMusicChordMapTrack, + (IUnknown *)&track->IDirectMusicTrack8_iface); + track->dmobj.IPersistStream_iface.lpVtbl = &persiststream_vtbl; DMCOMPOS_LockModule(); hr = IDirectMusicTrack8_QueryInterface(&track->IDirectMusicTrack8_iface, lpcGUID, ppobj); diff --git a/dlls/dmcompos/tests/dmcompos.c b/dlls/dmcompos/tests/dmcompos.c index b0646a7..0ca5599 100644 --- a/dlls/dmcompos/tests/dmcompos.c +++ b/dlls/dmcompos/tests/dmcompos.c @@ -313,13 +313,13 @@ static void test_chordmaptrack(void) hr = IDirectMusicTrack8_QueryInterface(dmt8, &IID_IPersistStream, (void**)&ps); ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr); hr = IPersistStream_GetClassID(ps, &class); - todo_wine ok(hr == S_OK, "IPersistStream_GetClassID failed: %08x\n", hr); - todo_wine ok(IsEqualGUID(&class, &CLSID_DirectMusicChordMapTrack), + ok(hr == S_OK, "IPersistStream_GetClassID failed: %08x\n", hr); + ok(IsEqualGUID(&class, &CLSID_DirectMusicChordMapTrack), "Expected class CLSID_DirectMusicChordMapTrack got %s\n", wine_dbgstr_guid(&class)); /* Unimplemented IPersistStream methods */ hr = IPersistStream_IsDirty(ps); - todo_wine ok(hr == S_FALSE, "IPersistStream_IsDirty failed: %08x\n", hr); + ok(hr == S_FALSE, "IPersistStream_IsDirty failed: %08x\n", hr); hr = IPersistStream_GetSizeMax(ps, &size); ok(hr == E_NOTIMPL, "IPersistStream_GetSizeMax failed: %08x\n", hr); hr = IPersistStream_Save(ps, NULL, TRUE);

1 0

Michael Stefaniuc : dmcompos: Remove the extraneous IUnknown from DMChordMapTrack.
by Alexandre Julliard June 29, 2015

June 29, 2015

Module: wine Branch: master Commit: 836a392bd35e6cea980663815129dddc21a9f9a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=836a392bd35e6cea980663815… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Jun 28 23:34:45 2015 +0200 dmcompos: Remove the extraneous IUnknown from DMChordMapTrack. Also lock/unlock the module only on creation/destruction of the object. --- dlls/dmcompos/chordmaptrack.c | 127 +++++++++++++++++------------------------- 1 file changed, 50 insertions(+), 77 deletions(-) diff --git a/dlls/dmcompos/chordmaptrack.c b/dlls/dmcompos/chordmaptrack.c index 8d07a78..80d54e1 100644 --- a/dlls/dmcompos/chordmaptrack.c +++ b/dlls/dmcompos/chordmaptrack.c @@ -21,76 +21,16 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmcompos); -static ULONG WINAPI IDirectMusicChordMapTrack_IUnknown_AddRef (LPUNKNOWN iface); -static ULONG WINAPI IDirectMusicChordMapTrack_IPersistStream_AddRef (LPPERSISTSTREAM iface); - /***************************************************************************** * IDirectMusicChordMapTrack implementation */ typedef struct IDirectMusicChordMapTrack { - const IUnknownVtbl *UnknownVtbl; IDirectMusicTrack8 IDirectMusicTrack8_iface; const IPersistStreamVtbl *PersistStreamVtbl; LONG ref; DMUS_OBJECTDESC *pDesc; } IDirectMusicChordMapTrack; -/* IDirectMusicChordMapTrack IUnknown part: */ -static HRESULT WINAPI IDirectMusicChordMapTrack_IUnknown_QueryInterface (LPUNKNOWN iface, REFIID riid, LPVOID *ppobj) { - ICOM_THIS_MULTI(IDirectMusicChordMapTrack, UnknownVtbl, iface); - TRACE("(%p, %s, %p)\n", This, debugstr_dmguid(riid), ppobj); - - if (IsEqualIID (riid, &IID_IUnknown)) { - *ppobj = &This->UnknownVtbl; - IDirectMusicChordMapTrack_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; - IDirectMusicChordMapTrack_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 IDirectMusicChordMapTrack_IUnknown_AddRef (LPUNKNOWN iface) { - ICOM_THIS_MULTI(IDirectMusicChordMapTrack, UnknownVtbl, iface); - ULONG ref = InterlockedIncrement(&This->ref); - - TRACE("(%p): AddRef from %d\n", This, ref - 1); - - DMCOMPOS_LockModule(); - - return ref; -} - -static ULONG WINAPI IDirectMusicChordMapTrack_IUnknown_Release (LPUNKNOWN iface) { - ICOM_THIS_MULTI(IDirectMusicChordMapTrack, UnknownVtbl, iface); - ULONG ref = InterlockedDecrement(&This->ref); - - TRACE("(%p): ReleaseRef to %d\n", This, ref); - - if (ref == 0) { - HeapFree(GetProcessHeap(), 0, This); - } - - DMCOMPOS_UnlockModule(); - - return ref; -} - -static const IUnknownVtbl DirectMusicChordMapTrack_Unknown_Vtbl = { - IDirectMusicChordMapTrack_IUnknown_QueryInterface, - IDirectMusicChordMapTrack_IUnknown_AddRef, - IDirectMusicChordMapTrack_IUnknown_Release -}; - /* IDirectMusicChordMapTrack IDirectMusicTrack8 part: */ static inline IDirectMusicChordMapTrack *impl_from_IDirectMusicTrack8(IDirectMusicTrack8 *iface) { @@ -98,22 +38,51 @@ static inline IDirectMusicChordMapTrack *impl_from_IDirectMusicTrack8(IDirectMus } static HRESULT WINAPI IDirectMusicTrack8Impl_QueryInterface(IDirectMusicTrack8 *iface, REFIID riid, - void **ppobj) + void **ret_iface) { IDirectMusicChordMapTrack *This = impl_from_IDirectMusicTrack8(iface); - return IDirectMusicChordMapTrack_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) { IDirectMusicChordMapTrack *This = impl_from_IDirectMusicTrack8(iface); - return IDirectMusicChordMapTrack_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) { IDirectMusicChordMapTrack *This = impl_from_IDirectMusicTrack8(iface); - return IDirectMusicChordMapTrack_IUnknown_Release ((LPUNKNOWN)&This->UnknownVtbl); + LONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + if (!ref) { + HeapFree(GetProcessHeap(), 0, This); + DMCOMPOS_UnlockModule(); + } + + return ref; } static HRESULT WINAPI IDirectMusicTrack8Impl_Init(IDirectMusicTrack8 *iface, @@ -278,17 +247,17 @@ static const IDirectMusicTrack8Vtbl dmtrack8_vtbl = { /* IDirectMusicChordMapTrack IPersistStream part: */ static HRESULT WINAPI IDirectMusicChordMapTrack_IPersistStream_QueryInterface (LPPERSISTSTREAM iface, REFIID riid, LPVOID *ppobj) { ICOM_THIS_MULTI(IDirectMusicChordMapTrack, PersistStreamVtbl, iface); - return IDirectMusicChordMapTrack_IUnknown_QueryInterface ((LPUNKNOWN)&This->UnknownVtbl, riid, ppobj); + return IDirectMusicTrack8_QueryInterface(&This->IDirectMusicTrack8_iface, riid, ppobj); } static ULONG WINAPI IDirectMusicChordMapTrack_IPersistStream_AddRef (LPPERSISTSTREAM iface) { ICOM_THIS_MULTI(IDirectMusicChordMapTrack, PersistStreamVtbl, iface); - return IDirectMusicChordMapTrack_IUnknown_AddRef ((LPUNKNOWN)&This->UnknownVtbl); + return IDirectMusicTrack8_AddRef(&This->IDirectMusicTrack8_iface); } static ULONG WINAPI IDirectMusicChordMapTrack_IPersistStream_Release (LPPERSISTSTREAM iface) { ICOM_THIS_MULTI(IDirectMusicChordMapTrack, PersistStreamVtbl, iface); - return IDirectMusicChordMapTrack_IUnknown_Release ((LPUNKNOWN)&This->UnknownVtbl); + return IDirectMusicTrack8_Release(&This->IDirectMusicTrack8_iface); } static HRESULT WINAPI IDirectMusicChordMapTrack_IPersistStream_GetClassID (LPPERSISTSTREAM iface, CLSID* pClassID) { @@ -327,21 +296,25 @@ static const IPersistStreamVtbl DirectMusicChordMapTrack_PersistStream_Vtbl = { /* for ClassFactory */ HRESULT WINAPI create_dmchordmaptrack(REFIID lpcGUID, void **ppobj) { - IDirectMusicChordMapTrack* track; - - track = HeapAlloc (GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicChordMapTrack)); - if (NULL == track) { - *ppobj = NULL; - return E_OUTOFMEMORY; - } - track->UnknownVtbl = &DirectMusicChordMapTrack_Unknown_Vtbl; + IDirectMusicChordMapTrack* 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 = &DirectMusicChordMapTrack_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_DirectMusicChordMapTrack; - track->ref = 0; /* will be inited by QueryInterface */ + track->ref = 1; + + DMCOMPOS_LockModule(); + hr = IDirectMusicTrack8_QueryInterface(&track->IDirectMusicTrack8_iface, lpcGUID, ppobj); + IDirectMusicTrack8_Release(&track->IDirectMusicTrack8_iface); - return IDirectMusicChordMapTrack_IUnknown_QueryInterface ((LPUNKNOWN)&track->UnknownVtbl, lpcGUID, ppobj); + return hr; }

1 0

Michael Stefaniuc : dmcompos: COM cleanup for IDirectMusicTrack8 of DMChordMapTrack.
by Alexandre Julliard June 29, 2015

June 29, 2015

Module: wine Branch: master Commit: 023d72a81e39c9f14520abc349d4fdc240957a10 URL: http://source.winehq.org/git/wine.git/?a=commit;h=023d72a81e39c9f14520abc34… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Jun 28 23:34:15 2015 +0200 dmcompos: COM cleanup for IDirectMusicTrack8 of DMChordMapTrack. --- dlls/dmcompos/chordmaptrack.c | 134 ++++++++++++++++++++++++++---------------- 1 file changed, 82 insertions(+), 52 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=023d72a81e39c9f14520a…

1 0