July 2015 - Wine-commits - list.winehq.org

Sebastian Lackner : ntdll: Implement TpCallbackUnloadDllOnCompletion.
by Alexandre Julliard 02 Jul '15

02 Jul '15

Module: wine Branch: master Commit: 8965511957d3d9f92fa0d6f41e5961d8a867f927 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8965511957d3d9f92fa0d6f41… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Jul 1 22:58:23 2015 +0200 ntdll: Implement TpCallbackUnloadDllOnCompletion. --- dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/threadpool.c | 22 +++++++++++++++++++++- 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 03f3af2..134a3f7 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -978,6 +978,7 @@ @ stdcall TpCallbackReleaseMutexOnCompletion(ptr long) @ stdcall TpCallbackReleaseSemaphoreOnCompletion(ptr long long) @ stdcall TpCallbackSetEventOnCompletion(ptr long) +@ stdcall TpCallbackUnloadDllOnCompletion(ptr ptr) @ stdcall TpPostWork(ptr) @ stdcall TpReleaseCleanupGroup(ptr) @ stdcall TpReleaseCleanupGroupMembers(ptr long ptr) diff --git a/dlls/ntdll/threadpool.c b/dlls/ntdll/threadpool.c index af4f620..eeb275f 100644 --- a/dlls/ntdll/threadpool.c +++ b/dlls/ntdll/threadpool.c @@ -210,6 +210,7 @@ struct threadpool_instance HANDLE semaphore; LONG semaphore_count; HANDLE event; + HMODULE library; } cleanup; }; @@ -1644,6 +1645,7 @@ static void CALLBACK threadpool_worker_proc( void *param ) instance.cleanup.semaphore = NULL; instance.cleanup.semaphore_count = 0; instance.cleanup.event = NULL; + instance.cleanup.library = NULL; switch (object->type) { @@ -1696,7 +1698,12 @@ static void CALLBACK threadpool_worker_proc( void *param ) } if (instance.cleanup.event) { - NtSetEvent( instance.cleanup.event, NULL ); + status = NtSetEvent( instance.cleanup.event, NULL ); + if (status != STATUS_SUCCESS) goto skip_cleanup; + } + if (instance.cleanup.library) + { + LdrUnloadDll( instance.cleanup.library ); } skip_cleanup: @@ -1893,6 +1900,19 @@ VOID WINAPI TpCallbackSetEventOnCompletion( TP_CALLBACK_INSTANCE *instance, HAND } /*********************************************************************** + * TpCallbackUnloadDllOnCompletion (NTDLL.@) + */ +VOID WINAPI TpCallbackUnloadDllOnCompletion( TP_CALLBACK_INSTANCE *instance, HMODULE module ) +{ + struct threadpool_instance *this = impl_from_TP_CALLBACK_INSTANCE( instance ); + + TRACE( "%p %p\n", instance, module ); + + if (!this->cleanup.library) + this->cleanup.library = module; +} + +/*********************************************************************** * TpPostWork (NTDLL.@) */ VOID WINAPI TpPostWork( TP_WORK *work )

1 0

Huw Davies : comctl32: Set the default separator width when notifying a -ve cmd id.
by Alexandre Julliard 02 Jul '15

02 Jul '15

Module: wine Branch: master Commit: 6c954455590a93f48a51c497941e547e3ea857c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c954455590a93f48a51c4979… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jul 1 21:17:18 2015 +0100 comctl32: Set the default separator width when notifying a -ve cmd id. --- dlls/comctl32/tests/toolbar.c | 3 ++- dlls/comctl32/toolbar.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/tests/toolbar.c b/dlls/comctl32/tests/toolbar.c index bb2aed8..96ec3b4 100644 --- a/dlls/comctl32/tests/toolbar.c +++ b/dlls/comctl32/tests/toolbar.c @@ -195,10 +195,10 @@ static LRESULT parent_wnd_notify(LPARAM lParam) } else { - ok( restore->tbButton.iBitmap == -1, "got %08x\n", restore->tbButton.iBitmap ); ok( *restore->pCurrent == 0xcafe0000 + restore->iItem, "got %08x\n", *restore->pCurrent ); if (restore->iItem < 7 || restore->iItem == 10) { + ok( restore->tbButton.iBitmap == -1, "got %08x\n", restore->tbButton.iBitmap ); if (restore->iItem < 7) ok( restore->tbButton.idCommand == restore->iItem * 2 + 1, "%d: got %08x\n", restore->iItem, restore->tbButton.idCommand ); else @@ -208,6 +208,7 @@ static LRESULT parent_wnd_notify(LPARAM lParam) } else { + ok( restore->tbButton.iBitmap == 8, "got %08x\n", restore->tbButton.iBitmap ); ok( restore->tbButton.idCommand == 0, "%d: got %08x\n", restore->iItem, restore->tbButton.idCommand ); if (restore->iItem == 7) ok( restore->tbButton.fsState == 0, "%d: got %02x\n", restore->iItem, restore->tbButton.fsState ); diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index e816d49..11e9678 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -4201,8 +4201,9 @@ TOOLBAR_Restore(TOOLBAR_INFO *infoPtr, const TBSAVEPARAMSW *lpSave) if (*nmtbr.pCurrent & 0x80000000) { /* separator */ + nmtbr.tbButton.iBitmap = SEPARATOR_WIDTH; nmtbr.tbButton.idCommand = 0; - nmtbr.tbButton.fsStyle = TBSTYLE_SEP; + nmtbr.tbButton.fsStyle = BTNS_SEP; if (*nmtbr.pCurrent != (DWORD)-1) nmtbr.tbButton.fsState = TBSTATE_HIDDEN; }

1 0

Huw Davies : comctl32: Implement the legacy notifications during restore.
by Alexandre Julliard 02 Jul '15

02 Jul '15

Module: wine Branch: master Commit: 2a71d13b6b4970441683486b3bd10b3888a034ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a71d13b6b4970441683486b3… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jul 1 21:17:19 2015 +0100 comctl32: Implement the legacy notifications during restore. --- dlls/comctl32/tests/toolbar.c | 84 ++++++++++++++++++++++++++++++++++++++++--- dlls/comctl32/toolbar.c | 44 ++++++++++++++++++++--- 2 files changed, 119 insertions(+), 9 deletions(-) diff --git a/dlls/comctl32/tests/toolbar.c b/dlls/comctl32/tests/toolbar.c index 96ec3b4..23eb250 100644 --- a/dlls/comctl32/tests/toolbar.c +++ b/dlls/comctl32/tests/toolbar.c @@ -66,6 +66,28 @@ static const struct message save_parent_seq[] = { { 0 } }; +static const struct message restore_parent_seq[] = { + { WM_NOTIFY, sent|id|custdraw, 0, 0, TBN_RESTORE, -1 }, + { WM_NOTIFY, sent|id|custdraw, 0, 0, TBN_RESTORE, 0 }, + { WM_NOTIFY, sent|id|custdraw, 0, 0, TBN_RESTORE, 1 }, + { WM_NOTIFY, sent|id|custdraw, 0, 0, TBN_RESTORE, 2 }, + { WM_NOTIFY, sent|id|custdraw, 0, 0, TBN_RESTORE, 3 }, + { WM_NOTIFY, sent|id|custdraw, 0, 0, TBN_RESTORE, 4 }, + { WM_NOTIFY, sent|id|custdraw, 0, 0, TBN_RESTORE, 5 }, + { WM_NOTIFY, sent|id|custdraw, 0, 0, TBN_RESTORE, 6 }, + { WM_NOTIFY, sent|id|custdraw, 0, 0, TBN_RESTORE, 7 }, + { WM_NOTIFY, sent|id|custdraw, 0, 0, TBN_RESTORE, 8 }, + { WM_NOTIFY, sent|id|custdraw, 0, 0, TBN_RESTORE, 9 }, + { WM_NOTIFY, sent|id|custdraw, 0, 0, TBN_RESTORE, 0xa }, + { WM_NOTIFY, sent|id, 0, 0, TBN_BEGINADJUST }, + { WM_NOTIFY, sent|id|custdraw, 0, 0, TBN_GETBUTTONINFOA, 0 }, + { WM_NOTIFY, sent|id|custdraw, 0, 0, TBN_GETBUTTONINFOA, 1 }, + { WM_NOTIFY, sent|id|custdraw, 0, 0, TBN_GETBUTTONINFOA, 2 }, + { WM_NOTIFY, sent|id|custdraw, 0, 0, TBN_GETBUTTONINFOA, 3 }, + { WM_NOTIFY, sent|id, 0, 0, TBN_ENDADJUST }, + { 0 } +}; + #define DEFINE_EXPECT(func) \ static BOOL expect_ ## func = FALSE, called_ ## func = FALSE @@ -105,6 +127,8 @@ static void MakeButton(TBBUTTON *p, int idCommand, int fsStyle, int nString) { p->iString = nString; } +static void *alloced_str; + static LRESULT parent_wnd_notify(LPARAM lParam) { NMHDR *hdr = (NMHDR *)lParam; @@ -245,6 +269,35 @@ static LRESULT parent_wnd_notify(LPARAM lParam) if (restore->iItem == -1) return 0; return 1; } + case TBN_GETBUTTONINFOA: + { + NMTOOLBARA *tb = (NMTOOLBARA *)lParam; + tb->tbButton.iBitmap = 0; + tb->tbButton.fsState = 0; + tb->tbButton.fsStyle = 0; + tb->tbButton.dwData = 0; + ok( tb->cchText == 128, "got %d\n", tb->cchText ); + switch (tb->iItem) + { + case 0: + tb->tbButton.idCommand = 7; + alloced_str = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, 8 ); + strcpy( alloced_str, "foo" ); + tb->tbButton.iString = (INT_PTR)alloced_str; + return 1; + case 1: + tb->tbButton.idCommand = 9; + tb->tbButton.iString = 0; + /* tb->pszText is ignored */ + strcpy( tb->pszText, "foo" ); + return 1; + case 2: + tb->tbButton.idCommand = 11; + tb->tbButton.iString = 3; + return 1; + } + return 0; + } } return 0; } @@ -271,6 +324,18 @@ static LRESULT CALLBACK parent_wnd_proc(HWND hWnd, UINT message, WPARAM wParam, msg.stage = save->iItem; } break; + case TBN_RESTORE: + { + NMTBRESTORE *restore = (NMTBRESTORE *)lParam; + msg.stage = restore->iItem; + } + break; + case TBN_GETBUTTONINFOA: + { + NMTOOLBARA *tb = (NMTOOLBARA *)lParam; + msg.stage = tb->iItem; + } + break; } } @@ -2228,9 +2293,9 @@ static void test_save(void) {0, 1, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, {0, 3, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 1, 2}, {0, 5, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 2, 0}, - {0, 7, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 3, 0}, - {0, 9, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 4, 0}, - {0, 11, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 5, 0}, + {0, 7, 0, BTNS_BUTTON, {0}, 0, (INT_PTR)"foo"}, + {0, 9, 0, BTNS_BUTTON, {0}, 0, 0}, + {0, 11, 0, BTNS_BUTTON, {0}, 0, 3}, {0, 13, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 6, 0}, {0, 0, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 7, 0}, {0, 0, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 8, 0}, @@ -2263,8 +2328,11 @@ static void test_save(void) wnd = NULL; rebuild_toolbar( &wnd ); + + flush_sequences(sequences, NUM_MSG_SEQUENCES); res = SendMessageW( wnd, TB_SAVERESTOREW, FALSE, (LPARAM)&params ); ok( res, "restoring failed\n" ); + ok_sequence(sequences, PARENT_SEQ_INDEX, restore_parent_seq, "restore", FALSE); count = SendMessageW( wnd, TB_BUTTONCOUNT, 0, 0 ); ok( count == sizeof(expect_btns) / sizeof(expect_btns[0]), "got %d\n", count ); @@ -2278,7 +2346,15 @@ static void test_save(void) ok( tb.fsState == expect_btns[i].fsState, "%d: got %02x\n", i, tb.fsState ); ok( tb.fsStyle == expect_btns[i].fsStyle, "%d: got %02x\n", i, tb.fsStyle ); ok( tb.dwData == expect_btns[i].dwData, "%d: got %lx\n", i, tb.dwData ); - ok( tb.iString == expect_btns[i].iString, "%d: got %lx\n", i, tb.iString ); + if (IS_INTRESOURCE(expect_btns[i].iString)) + ok( tb.iString == expect_btns[i].iString, "%d: got %lx\n", i, tb.iString ); + else + ok( !strcmp( (char *)tb.iString, (char *)expect_btns[i].iString ), + "%d: got %s\n", i, (char *)tb.iString ); + + /* In fact the ptr value set in TBN_GETBUTTONINFOA is simply copied */ + if (tb.idCommand == 7) + ok( tb.iString == (INT_PTR)alloced_str, "string not set\n"); } DestroyWindow( wnd ); diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index 11e9678..c777f5b 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -247,6 +247,8 @@ static LRESULT TOOLBAR_AutoSize(TOOLBAR_INFO *infoPtr); static void TOOLBAR_CheckImageListIconSize(TOOLBAR_INFO *infoPtr); static void TOOLBAR_TooltipAddTool(const TOOLBAR_INFO *infoPtr, const TBUTTON_INFO *button); static void TOOLBAR_TooltipSetRect(const TOOLBAR_INFO *infoPtr, const TBUTTON_INFO *button); +static LRESULT TOOLBAR_SetButtonInfo(TOOLBAR_INFO *infoPtr, INT Id, + const TBBUTTONINFOW *lptbbi, BOOL isW); static inline int default_top_margin(const TOOLBAR_INFO *infoPtr) @@ -4151,6 +4153,7 @@ TOOLBAR_Restore(TOOLBAR_INFO *infoPtr, const TBSAVEPARAMSW *lpSave) DWORD dwType; DWORD dwSize = 0; NMTBRESTORE nmtbr; + NMHDR hdr; /* restore toolbar information */ TRACE("restore from %s %s\n", debugstr_w(lpSave->pszSubKey), @@ -4221,13 +4224,44 @@ TOOLBAR_Restore(TOOLBAR_INFO *infoPtr, const TBSAVEPARAMSW *lpSave) TOOLBAR_InsertButtonT(infoPtr, -1, &nmtbr.tbButton, TRUE); } - /* do legacy notifications */ - if (infoPtr->iVersion < 5) + TOOLBAR_SendNotify( &hdr, infoPtr, TBN_BEGINADJUST ); + for (i = 0; ; i++) { - /* FIXME: send TBN_BEGINADJUST */ - FIXME("send TBN_GETBUTTONINFO for each button\n"); - /* FIXME: send TBN_ENDADJUST */ + NMTOOLBARW tb; + TBBUTTONINFOW bi; + WCHAR buf[128]; + UINT code = infoPtr->bUnicode ? TBN_GETBUTTONINFOW : TBN_GETBUTTONINFOA; + INT idx; + + memset( &tb, 0, sizeof(tb) ); + tb.iItem = i; + tb.cchText = sizeof(buf) / sizeof(buf[0]); + tb.pszText = buf; + + /* Use the same struct for both A and W versions since the layout is the same. */ + if (!TOOLBAR_SendNotify( &tb.hdr, infoPtr, code )) + break; + + idx = TOOLBAR_GetButtonIndex( infoPtr, tb.tbButton.idCommand, FALSE ); + if (idx == -1) continue; + + /* tb.pszText is ignored - the string comes from tb.tbButton.iString, which may + be an index or a ptr. Either way it is simply copied. There is no api to change + the string index, so we set it manually. The other properties can be set with SetButtonInfo. */ + free_string( infoPtr->buttons + idx ); + infoPtr->buttons[idx].iString = tb.tbButton.iString; + + memset( &bi, 0, sizeof(bi) ); + bi.cbSize = sizeof(bi); + bi.dwMask = TBIF_IMAGE | TBIF_STATE | TBIF_STYLE | TBIF_LPARAM; + bi.iImage = tb.tbButton.iBitmap; + bi.fsState = tb.tbButton.fsState; + bi.fsStyle = tb.tbButton.fsStyle; + bi.lParam = tb.tbButton.dwData; + + TOOLBAR_SetButtonInfo( infoPtr, tb.tbButton.idCommand, &bi, TRUE ); } + TOOLBAR_SendNotify( &hdr, infoPtr, TBN_ENDADJUST ); /* remove all uninitialised buttons * note: loop backwards to avoid having to fixup i on a

1 0

Michael Stefaniuc : dmime: DMMarkerTrack doesn't have IDirectMusicTrack8.
by Alexandre Julliard 02 Jul '15

02 Jul '15

Module: wine Branch: master Commit: 724fe43db6263480c7b447e973747ba52edcac33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=724fe43db6263480c7b447e97… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jul 2 11:45:55 2015 +0200 dmime: DMMarkerTrack doesn't have IDirectMusicTrack8. --- dlls/dmime/markertrack.c | 124 +++++++++++++++++++++-------------------------- 1 file changed, 55 insertions(+), 69 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=724fe43db6263480c7b44…

1 0

Michael Stefaniuc : dmime: DMTimeSigTrack doesn't have IDirectMusicTrack8.
by Alexandre Julliard 02 Jul '15

02 Jul '15

Module: wine Branch: master Commit: edfa74fe454ecf9b9d301a210be0eaedba35379e URL: http://source.winehq.org/git/wine.git/?a=commit;h=edfa74fe454ecf9b9d301a210… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jul 2 11:48:48 2015 +0200 dmime: DMTimeSigTrack doesn't have IDirectMusicTrack8. --- dlls/dmime/timesigtrack.c | 120 ++++++++++++++++++++-------------------------- 1 file changed, 51 insertions(+), 69 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=edfa74fe454ecf9b9d301…

1 0

Michael Stefaniuc : dmime/tests: Deal with DMTrack objects without IDirectMusicTrack8.
by Alexandre Julliard 02 Jul '15

02 Jul '15

Module: wine Branch: master Commit: 5525f5d0fa02e9ca360faded570a066cb10e37cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=5525f5d0fa02e9ca360faded5… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jul 2 11:49:22 2015 +0200 dmime/tests: Deal with DMTrack objects without IDirectMusicTrack8. --- dlls/dmime/tests/dmime.c | 63 +++++++++++++++++++++++++++--------------------- 1 file changed, 35 insertions(+), 28 deletions(-) diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c index 7738332..e0cc313 100644 --- a/dlls/dmime/tests/dmime.c +++ b/dlls/dmime/tests/dmime.c @@ -302,6 +302,7 @@ static void test_COM_segmentstate(void) static void test_COM_track(void) { + IDirectMusicTrack *dmt; IDirectMusicTrack8 *dmt8; IPersistStream *ps; IUnknown *unk; @@ -311,21 +312,23 @@ static void test_COM_track(void) const struct { REFCLSID clsid; const char *name; + BOOL has_dmt8; } class[] = { - { X(DirectMusicLyricsTrack) }, - { X(DirectMusicMarkerTrack) }, - { X(DirectMusicParamControlTrack) }, - { X(DirectMusicSegmentTriggerTrack) }, - { X(DirectMusicSeqTrack) }, - { X(DirectMusicSysExTrack) }, - { X(DirectMusicTempoTrack) }, - { X(DirectMusicTimeSigTrack) }, - { X(DirectMusicWaveTrack) } + { X(DirectMusicLyricsTrack), TRUE }, + { X(DirectMusicMarkerTrack), FALSE }, + { X(DirectMusicParamControlTrack), TRUE }, + { X(DirectMusicSegmentTriggerTrack), TRUE }, + { X(DirectMusicSeqTrack), TRUE }, + { X(DirectMusicSysExTrack), TRUE }, + { X(DirectMusicTempoTrack), TRUE }, + { X(DirectMusicTimeSigTrack), FALSE }, + { X(DirectMusicWaveTrack), TRUE } }; #undef X unsigned int i; for (i = 0; i < ARRAY_SIZE(class); i++) { + trace("Testing %s\n", class[i].name); /* COM aggregation */ dmt8 = (IDirectMusicTrack8*)0xdeadbeef; hr = CoCreateInstance(class[i].clsid, (IUnknown*)&dmt8, CLSCTX_INPROC_SERVER, &IID_IUnknown, @@ -345,29 +348,37 @@ static void test_COM_track(void) class[i].name, hr); /* Same refcount for all DirectMusicTrack interfaces */ - hr = CoCreateInstance(class[i].clsid, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicTrack8, - (void**)&dmt8); - if (hr == E_NOINTERFACE && !dmt8) { - skip("%s not created with CoCreateInstance()\n", class[i].name); - continue; - } + hr = CoCreateInstance(class[i].clsid, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicTrack, + (void**)&dmt); ok(hr == S_OK, "%s create failed: %08x, expected S_OK\n", class[i].name, hr); - refcount = IDirectMusicTrack8_AddRef(dmt8); + refcount = IDirectMusicTrack_AddRef(dmt); ok(refcount == 2, "refcount == %u, expected 2\n", refcount); - hr = IDirectMusicTrack8_QueryInterface(dmt8, &IID_IPersistStream, (void**)&ps); + hr = IDirectMusicTrack_QueryInterface(dmt, &IID_IPersistStream, (void**)&ps); ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr); refcount = IPersistStream_AddRef(ps); ok(refcount == 4, "refcount == %u, expected 4\n", refcount); IPersistStream_Release(ps); - hr = IDirectMusicTrack8_QueryInterface(dmt8, &IID_IUnknown, (void**)&unk); + hr = IDirectMusicTrack_QueryInterface(dmt, &IID_IUnknown, (void**)&unk); ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %08x\n", hr); refcount = IUnknown_AddRef(unk); ok(refcount == 5, "refcount == %u, expected 5\n", refcount); refcount = IUnknown_Release(unk); - while (IDirectMusicTrack8_Release(dmt8)); + hr = IDirectMusicTrack_QueryInterface(dmt, &IID_IDirectMusicTrack8, (void**)&dmt8); + if (class[i].has_dmt8) { + ok(hr == S_OK, "QueryInterface for IID_IDirectMusicTrack8 failed: %08x\n", hr); + refcount = IDirectMusicTrack8_AddRef(dmt8); + ok(refcount == 6, "refcount == %u, expected 6\n", refcount); + refcount = IDirectMusicTrack8_Release(dmt8); + } else { + ok(hr == E_NOINTERFACE, "QueryInterface for IID_IDirectMusicTrack8 failed: %08x\n", hr); + refcount = IDirectMusicTrack_AddRef(dmt); + ok(refcount == 5, "refcount == %u, expected 5\n", refcount); + } + + while (IDirectMusicTrack_Release(dmt)); } } @@ -472,7 +483,7 @@ static void test_segment(void) static void test_track(void) { - IDirectMusicTrack8 *dmt8; + IDirectMusicTrack *dmt; IPersistStream *ps; CLSID classid; ULARGE_INTEGER size; @@ -498,16 +509,12 @@ static void test_track(void) for (i = 0; i < ARRAY_SIZE(class); i++) { trace("Testing %s\n", class[i].name); - hr = CoCreateInstance(class[i].clsid, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicTrack8, - (void**)&dmt8); - if (hr == E_NOINTERFACE && !dmt8) { - skip("%s not created with CoCreateInstance()\n", class[i].name); - continue; - } + hr = CoCreateInstance(class[i].clsid, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicTrack, + (void**)&dmt); ok(hr == S_OK, "%s create failed: %08x, expected S_OK\n", class[i].name, hr); /* IPersistStream */ - hr = IDirectMusicTrack8_QueryInterface(dmt8, &IID_IPersistStream, (void**)&ps); + hr = IDirectMusicTrack_QueryInterface(dmt, &IID_IPersistStream, (void**)&ps); ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr); hr = IPersistStream_GetClassID(ps, &classid); if (class[i].todo) { @@ -532,7 +539,7 @@ static void test_track(void) hr = IPersistStream_Save(ps, NULL, TRUE); ok(hr == E_NOTIMPL, "IPersistStream_Save failed: %08x\n", hr); - while (IDirectMusicTrack8_Release(dmt8)); + while (IDirectMusicTrack_Release(dmt)); } }

1 0

Michael Stefaniuc : dmime: COM cleanup for IDirectMusicTrack of DMMarkerTrack.
by Alexandre Julliard 02 Jul '15

02 Jul '15

Module: wine Branch: master Commit: d487e5e6ce46776f8d625e0afdd367c8a8edb742 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d487e5e6ce46776f8d625e0af… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jul 2 11:50:05 2015 +0200 dmime: COM cleanup for IDirectMusicTrack of DMMarkerTrack. --- dlls/dmime/markertrack.c | 39 ++++++++++++++++++++++----------------- 1 file changed, 22 insertions(+), 17 deletions(-) diff --git a/dlls/dmime/markertrack.c b/dlls/dmime/markertrack.c index 11872e0..6261ceb 100644 --- a/dlls/dmime/markertrack.c +++ b/dlls/dmime/markertrack.c @@ -26,7 +26,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmime); */ typedef struct IDirectMusicMarkerTrack { const IUnknownVtbl *UnknownVtbl; - const IDirectMusicTrackVtbl *TrackVtbl; + IDirectMusicTrack IDirectMusicTrack_iface; const IPersistStreamVtbl *PersistStreamVtbl; LONG ref; DMUS_OBJECTDESC *pDesc; @@ -42,7 +42,7 @@ static HRESULT WINAPI IDirectMusicMarkerTrack_IUnknown_QueryInterface (LPUNKNOWN IUnknown_AddRef (iface); return S_OK; } else if (IsEqualIID (riid, &IID_IDirectMusicTrack)) { - *ppobj = &This->TrackVtbl; + *ppobj = &This->IDirectMusicTrack_iface; IUnknown_AddRef (iface); return S_OK; } else if (IsEqualIID (riid, &IID_IPersistStream)) { @@ -87,29 +87,34 @@ static const IUnknownVtbl DirectMusicMarkerTrack_Unknown_Vtbl = { }; /* IDirectMusicMarkerTrack IDirectMusicTrack8 part: */ +static inline IDirectMusicMarkerTrack *impl_from_IDirectMusicTrack(IDirectMusicTrack *iface) +{ + return CONTAINING_RECORD(iface, IDirectMusicMarkerTrack, IDirectMusicTrack_iface); +} + static HRESULT WINAPI IDirectMusicTrackImpl_QueryInterface(IDirectMusicTrack *iface, REFIID riid, void **ppobj) { - ICOM_THIS_MULTI(IDirectMusicMarkerTrack, TrackVtbl, iface); + IDirectMusicMarkerTrack *This = impl_from_IDirectMusicTrack(iface); return IUnknown_QueryInterface ((LPUNKNOWN)&This->UnknownVtbl, riid, ppobj); } static ULONG WINAPI IDirectMusicTrackImpl_AddRef(IDirectMusicTrack *iface) { - ICOM_THIS_MULTI(IDirectMusicMarkerTrack, TrackVtbl, iface); + IDirectMusicMarkerTrack *This = impl_from_IDirectMusicTrack(iface); return IUnknown_AddRef ((LPUNKNOWN)&This->UnknownVtbl); } static ULONG WINAPI IDirectMusicTrackImpl_Release(IDirectMusicTrack *iface) { - ICOM_THIS_MULTI(IDirectMusicMarkerTrack, TrackVtbl, iface); + IDirectMusicMarkerTrack *This = impl_from_IDirectMusicTrack(iface); return IUnknown_Release ((LPUNKNOWN)&This->UnknownVtbl); } static HRESULT WINAPI IDirectMusicTrackImpl_Init(IDirectMusicTrack *iface, IDirectMusicSegment *pSegment) { - ICOM_THIS_MULTI(IDirectMusicMarkerTrack, TrackVtbl, iface); + IDirectMusicMarkerTrack *This = impl_from_IDirectMusicTrack(iface); FIXME("(%p, %p): stub\n", This, pSegment); return S_OK; } @@ -118,14 +123,14 @@ static HRESULT WINAPI IDirectMusicTrackImpl_InitPlay(IDirectMusicTrack *iface, IDirectMusicSegmentState *pSegmentState, IDirectMusicPerformance *pPerformance, void **ppStateData, DWORD dwVirtualTrack8ID, DWORD dwFlags) { - ICOM_THIS_MULTI(IDirectMusicMarkerTrack, TrackVtbl, iface); + IDirectMusicMarkerTrack *This = impl_from_IDirectMusicTrack(iface); FIXME("(%p, %p, %p, %p, %d, %d): stub\n", This, pSegmentState, pPerformance, ppStateData, dwVirtualTrack8ID, dwFlags); return S_OK; } static HRESULT WINAPI IDirectMusicTrackImpl_EndPlay(IDirectMusicTrack *iface, void *pStateData) { - ICOM_THIS_MULTI(IDirectMusicMarkerTrack, TrackVtbl, iface); + IDirectMusicMarkerTrack *This = impl_from_IDirectMusicTrack(iface); FIXME("(%p, %p): stub\n", This, pStateData); return S_OK; } @@ -134,7 +139,7 @@ static HRESULT WINAPI IDirectMusicTrackImpl_Play(IDirectMusicTrack *iface, void MUSIC_TIME mtStart, MUSIC_TIME mtEnd, MUSIC_TIME mtOffset, DWORD dwFlags, IDirectMusicPerformance *pPerf, IDirectMusicSegmentState *pSegSt, DWORD dwVirtualID) { - ICOM_THIS_MULTI(IDirectMusicMarkerTrack, TrackVtbl, iface); + IDirectMusicMarkerTrack *This = impl_from_IDirectMusicTrack(iface); FIXME("(%p, %p, %d, %d, %d, %d, %p, %p, %d): stub\n", This, pStateData, mtStart, mtEnd, mtOffset, dwFlags, pPerf, pSegSt, dwVirtualID); return S_OK; } @@ -142,7 +147,7 @@ static HRESULT WINAPI IDirectMusicTrackImpl_Play(IDirectMusicTrack *iface, void static HRESULT WINAPI IDirectMusicTrackImpl_GetParam(IDirectMusicTrack *iface, REFGUID rguidType, MUSIC_TIME mtTime, MUSIC_TIME *pmtNext, void *pParam) { - ICOM_THIS_MULTI(IDirectMusicMarkerTrack, TrackVtbl, iface); + IDirectMusicMarkerTrack *This = impl_from_IDirectMusicTrack(iface); FIXME("(%p, %s, %d, %p, %p): stub\n", This, debugstr_dmguid(rguidType), mtTime, pmtNext, pParam); return S_OK; } @@ -150,7 +155,7 @@ static HRESULT WINAPI IDirectMusicTrackImpl_GetParam(IDirectMusicTrack *iface, R static HRESULT WINAPI IDirectMusicTrackImpl_SetParam(IDirectMusicTrack *iface, REFGUID rguidType, MUSIC_TIME mtTime, void *pParam) { - ICOM_THIS_MULTI(IDirectMusicMarkerTrack, TrackVtbl, iface); + IDirectMusicMarkerTrack *This = impl_from_IDirectMusicTrack(iface); FIXME("(%p, %s, %d, %p): stub\n", This, debugstr_dmguid(rguidType), mtTime, pParam); return S_OK; } @@ -158,7 +163,7 @@ static HRESULT WINAPI IDirectMusicTrackImpl_SetParam(IDirectMusicTrack *iface, R static HRESULT WINAPI IDirectMusicTrackImpl_IsParamSupported(IDirectMusicTrack *iface, REFGUID rguidType) { - ICOM_THIS_MULTI(IDirectMusicMarkerTrack, TrackVtbl, iface); + IDirectMusicMarkerTrack *This = impl_from_IDirectMusicTrack(iface); TRACE("(%p, %s)\n", This, debugstr_dmguid(rguidType)); if (IsEqualGUID (rguidType, &GUID_Play_Marker) @@ -173,7 +178,7 @@ static HRESULT WINAPI IDirectMusicTrackImpl_IsParamSupported(IDirectMusicTrack * static HRESULT WINAPI IDirectMusicTrackImpl_AddNotificationType(IDirectMusicTrack *iface, REFGUID rguidNotificationType) { - ICOM_THIS_MULTI(IDirectMusicMarkerTrack, TrackVtbl, iface); + IDirectMusicMarkerTrack *This = impl_from_IDirectMusicTrack(iface); FIXME("(%p, %s): stub\n", This, debugstr_dmguid(rguidNotificationType)); return S_OK; } @@ -181,7 +186,7 @@ static HRESULT WINAPI IDirectMusicTrackImpl_AddNotificationType(IDirectMusicTrac static HRESULT WINAPI IDirectMusicTrackImpl_RemoveNotificationType(IDirectMusicTrack *iface, REFGUID rguidNotificationType) { - ICOM_THIS_MULTI(IDirectMusicMarkerTrack, TrackVtbl, iface); + IDirectMusicMarkerTrack *This = impl_from_IDirectMusicTrack(iface); FIXME("(%p, %s): stub\n", This, debugstr_dmguid(rguidNotificationType)); return S_OK; } @@ -189,12 +194,12 @@ static HRESULT WINAPI IDirectMusicTrackImpl_RemoveNotificationType(IDirectMusicT static HRESULT WINAPI IDirectMusicTrackImpl_Clone(IDirectMusicTrack *iface, MUSIC_TIME mtStart, MUSIC_TIME mtEnd, IDirectMusicTrack **ppTrack) { - ICOM_THIS_MULTI(IDirectMusicMarkerTrack, TrackVtbl, iface); + IDirectMusicMarkerTrack *This = impl_from_IDirectMusicTrack(iface); FIXME("(%p, %d, %d, %p): stub\n", This, mtStart, mtEnd, ppTrack); return S_OK; } -static const IDirectMusicTrackVtbl DirectMusicMarkerTrack_Track_Vtbl = { +static const IDirectMusicTrackVtbl dmtrack_vtbl = { IDirectMusicTrackImpl_QueryInterface, IDirectMusicTrackImpl_AddRef, IDirectMusicTrackImpl_Release, @@ -269,7 +274,7 @@ HRESULT WINAPI create_dmmarkertrack(REFIID lpcGUID, void **ppobj) return E_OUTOFMEMORY; } track->UnknownVtbl = &DirectMusicMarkerTrack_Unknown_Vtbl; - track->TrackVtbl = &DirectMusicMarkerTrack_Track_Vtbl; + track->IDirectMusicTrack_iface.lpVtbl = &dmtrack_vtbl; track->PersistStreamVtbl = &DirectMusicMarkerTrack_PersistStream_Vtbl; track->pDesc = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(DMUS_OBJECTDESC)); DM_STRUCT_INIT(track->pDesc);

1 0

Michael Stefaniuc : dmime: Remove the extraneous IUnknown from DMMarkerTrack.
by Alexandre Julliard 02 Jul '15

02 Jul '15

Module: wine Branch: master Commit: ef6a8035923cfeb328f5a219cfb5ab288cf994f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef6a8035923cfeb328f5a219c… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jul 2 11:50:31 2015 +0200 dmime: Remove the extraneous IUnknown from DMMarkerTrack. Also lock/unlock the module only on creation/destruction of the object. --- dlls/dmime/markertrack.c | 123 +++++++++++++++++++---------------------------- 1 file changed, 50 insertions(+), 73 deletions(-) diff --git a/dlls/dmime/markertrack.c b/dlls/dmime/markertrack.c index 6261ceb..70a50c3 100644 --- a/dlls/dmime/markertrack.c +++ b/dlls/dmime/markertrack.c @@ -25,67 +25,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmime); * IDirectMusicMarkerTrack implementation */ typedef struct IDirectMusicMarkerTrack { - const IUnknownVtbl *UnknownVtbl; IDirectMusicTrack IDirectMusicTrack_iface; const IPersistStreamVtbl *PersistStreamVtbl; LONG ref; DMUS_OBJECTDESC *pDesc; } IDirectMusicMarkerTrack; -/* IDirectMusicMarkerTrack IUnknown part: */ -static HRESULT WINAPI IDirectMusicMarkerTrack_IUnknown_QueryInterface (LPUNKNOWN iface, REFIID riid, LPVOID *ppobj) { - ICOM_THIS_MULTI(IDirectMusicMarkerTrack, UnknownVtbl, iface); - TRACE("(%p, %s, %p)\n", This, debugstr_dmguid(riid), ppobj); - - if (IsEqualIID (riid, &IID_IUnknown)) { - *ppobj = &This->UnknownVtbl; - IUnknown_AddRef (iface); - return S_OK; - } else if (IsEqualIID (riid, &IID_IDirectMusicTrack)) { - *ppobj = &This->IDirectMusicTrack_iface; - IUnknown_AddRef (iface); - return S_OK; - } else if (IsEqualIID (riid, &IID_IPersistStream)) { - *ppobj = &This->PersistStreamVtbl; - IUnknown_AddRef (iface); - return S_OK; - } - - WARN("(%p, %s, %p): not found\n", This, debugstr_dmguid(riid), ppobj); - return E_NOINTERFACE; -} - -static ULONG WINAPI IDirectMusicMarkerTrack_IUnknown_AddRef (LPUNKNOWN iface) { - ICOM_THIS_MULTI(IDirectMusicMarkerTrack, UnknownVtbl, iface); - ULONG ref = InterlockedIncrement(&This->ref); - - TRACE("(%p): AddRef from %d\n", This, ref - 1); - - DMIME_LockModule(); - - return ref; -} - -static ULONG WINAPI IDirectMusicMarkerTrack_IUnknown_Release (LPUNKNOWN iface) { - ICOM_THIS_MULTI(IDirectMusicMarkerTrack, UnknownVtbl, iface); - ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p): ReleaseRef to %d\n", This, ref); - - if (ref == 0) { - HeapFree(GetProcessHeap(), 0, This); - } - - DMIME_UnlockModule(); - - return ref; -} - -static const IUnknownVtbl DirectMusicMarkerTrack_Unknown_Vtbl = { - IDirectMusicMarkerTrack_IUnknown_QueryInterface, - IDirectMusicMarkerTrack_IUnknown_AddRef, - IDirectMusicMarkerTrack_IUnknown_Release -}; - /* IDirectMusicMarkerTrack IDirectMusicTrack8 part: */ static inline IDirectMusicMarkerTrack *impl_from_IDirectMusicTrack(IDirectMusicTrack *iface) { @@ -93,22 +38,50 @@ static inline IDirectMusicMarkerTrack *impl_from_IDirectMusicTrack(IDirectMusicT } static HRESULT WINAPI IDirectMusicTrackImpl_QueryInterface(IDirectMusicTrack *iface, REFIID riid, - void **ppobj) + void **ret_iface) { IDirectMusicMarkerTrack *This = impl_from_IDirectMusicTrack(iface); - return 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)) + *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 IDirectMusicTrackImpl_AddRef(IDirectMusicTrack *iface) { IDirectMusicMarkerTrack *This = impl_from_IDirectMusicTrack(iface); - return IUnknown_AddRef ((LPUNKNOWN)&This->UnknownVtbl); + LONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + return ref; } static ULONG WINAPI IDirectMusicTrackImpl_Release(IDirectMusicTrack *iface) { IDirectMusicMarkerTrack *This = impl_from_IDirectMusicTrack(iface); - return IUnknown_Release ((LPUNKNOWN)&This->UnknownVtbl); + LONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + if (!ref) { + HeapFree(GetProcessHeap(), 0, This); + DMIME_UnlockModule(); + } + + return ref; } static HRESULT WINAPI IDirectMusicTrackImpl_Init(IDirectMusicTrack *iface, @@ -218,17 +191,17 @@ static const IDirectMusicTrackVtbl dmtrack_vtbl = { /* IDirectMusicMarkerTrack IPersistStream part: */ static HRESULT WINAPI IDirectMusicMarkerTrack_IPersistStream_QueryInterface (LPPERSISTSTREAM iface, REFIID riid, LPVOID *ppobj) { ICOM_THIS_MULTI(IDirectMusicMarkerTrack, PersistStreamVtbl, iface); - return IUnknown_QueryInterface ((LPUNKNOWN)&This->UnknownVtbl, riid, ppobj); + return IDirectMusicTrack_QueryInterface(&This->IDirectMusicTrack_iface, riid, ppobj); } static ULONG WINAPI IDirectMusicMarkerTrack_IPersistStream_AddRef (LPPERSISTSTREAM iface) { ICOM_THIS_MULTI(IDirectMusicMarkerTrack, PersistStreamVtbl, iface); - return IUnknown_AddRef ((LPUNKNOWN)&This->UnknownVtbl); + return IDirectMusicTrack_AddRef(&This->IDirectMusicTrack_iface); } static ULONG WINAPI IDirectMusicMarkerTrack_IPersistStream_Release (LPPERSISTSTREAM iface) { ICOM_THIS_MULTI(IDirectMusicMarkerTrack, PersistStreamVtbl, iface); - return IUnknown_Release ((LPUNKNOWN)&This->UnknownVtbl); + return IDirectMusicTrack_Release(&This->IDirectMusicTrack_iface); } static HRESULT WINAPI IDirectMusicMarkerTrack_IPersistStream_GetClassID (LPPERSISTSTREAM iface, CLSID* pClassID) { @@ -266,21 +239,25 @@ static const IPersistStreamVtbl DirectMusicMarkerTrack_PersistStream_Vtbl = { /* for ClassFactory */ HRESULT WINAPI create_dmmarkertrack(REFIID lpcGUID, void **ppobj) { - IDirectMusicMarkerTrack* track; - - track = HeapAlloc (GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicMarkerTrack)); - if (NULL == track) { - *ppobj = NULL; - return E_OUTOFMEMORY; - } - track->UnknownVtbl = &DirectMusicMarkerTrack_Unknown_Vtbl; + IDirectMusicMarkerTrack *track; + HRESULT hr; + + track = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*track)); + if (!track) { + *ppobj = NULL; + return E_OUTOFMEMORY; + } track->IDirectMusicTrack_iface.lpVtbl = &dmtrack_vtbl; track->PersistStreamVtbl = &DirectMusicMarkerTrack_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_DirectMusicMarkerTrack; - track->ref = 0; /* will be inited by QueryInterface */ - - return IDirectMusicMarkerTrack_IUnknown_QueryInterface ((LPUNKNOWN)&track->UnknownVtbl, lpcGUID, ppobj); + track->ref = 1; + + DMIME_LockModule(); + hr = IDirectMusicTrack_QueryInterface(&track->IDirectMusicTrack_iface, lpcGUID, ppobj); + IDirectMusicTrack_Release(&track->IDirectMusicTrack_iface); + + return hr; }

1 0

Michael Stefaniuc : dmime: Use the generic IPersistStream for DMMarkerTrack.
by Alexandre Julliard 02 Jul '15

02 Jul '15

Module: wine Branch: master Commit: 5bf9d04581483ae1df73b44e0413a1c07ad56825 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5bf9d04581483ae1df73b44e0… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jul 2 11:50:59 2015 +0200 dmime: Use the generic IPersistStream for DMMarkerTrack. --- dlls/dmime/markertrack.c | 67 ++++++++++++------------------------------------ dlls/dmime/tests/dmime.c | 2 +- 2 files changed, 18 insertions(+), 51 deletions(-) diff --git a/dlls/dmime/markertrack.c b/dlls/dmime/markertrack.c index 70a50c3..852948a 100644 --- a/dlls/dmime/markertrack.c +++ b/dlls/dmime/markertrack.c @@ -18,6 +18,7 @@ */ #include "dmime_private.h" +#include "dmobject.h" WINE_DEFAULT_DEBUG_CHANNEL(dmime); @@ -26,9 +27,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmime); */ typedef struct IDirectMusicMarkerTrack { IDirectMusicTrack IDirectMusicTrack_iface; - const IPersistStreamVtbl *PersistStreamVtbl; + struct dmobject dmobj; /* IPersistStream only */ LONG ref; - DMUS_OBJECTDESC *pDesc; } IDirectMusicMarkerTrack; /* IDirectMusicMarkerTrack IDirectMusicTrack8 part: */ @@ -49,7 +49,7 @@ static HRESULT WINAPI IDirectMusicTrackImpl_QueryInterface(IDirectMusicTrack *if if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IDirectMusicTrack)) *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; @@ -188,52 +188,21 @@ static const IDirectMusicTrackVtbl dmtrack_vtbl = { IDirectMusicTrackImpl_Clone }; -/* IDirectMusicMarkerTrack IPersistStream part: */ -static HRESULT WINAPI IDirectMusicMarkerTrack_IPersistStream_QueryInterface (LPPERSISTSTREAM iface, REFIID riid, LPVOID *ppobj) { - ICOM_THIS_MULTI(IDirectMusicMarkerTrack, PersistStreamVtbl, iface); - return IDirectMusicTrack_QueryInterface(&This->IDirectMusicTrack_iface, riid, ppobj); -} - -static ULONG WINAPI IDirectMusicMarkerTrack_IPersistStream_AddRef (LPPERSISTSTREAM iface) { - ICOM_THIS_MULTI(IDirectMusicMarkerTrack, PersistStreamVtbl, iface); - return IDirectMusicTrack_AddRef(&This->IDirectMusicTrack_iface); -} - -static ULONG WINAPI IDirectMusicMarkerTrack_IPersistStream_Release (LPPERSISTSTREAM iface) { - ICOM_THIS_MULTI(IDirectMusicMarkerTrack, PersistStreamVtbl, iface); - return IDirectMusicTrack_Release(&This->IDirectMusicTrack_iface); -} - -static HRESULT WINAPI IDirectMusicMarkerTrack_IPersistStream_GetClassID (LPPERSISTSTREAM iface, CLSID* pClassID) { - return E_NOTIMPL; -} - -static HRESULT WINAPI IDirectMusicMarkerTrack_IPersistStream_IsDirty (LPPERSISTSTREAM iface) { - return E_NOTIMPL; -} - -static HRESULT WINAPI IDirectMusicMarkerTrack_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 IDirectMusicMarkerTrack_IPersistStream_Save (LPPERSISTSTREAM iface, IStream* pStm, BOOL fClearDirty) { - return E_NOTIMPL; -} - -static HRESULT WINAPI IDirectMusicMarkerTrack_IPersistStream_GetSizeMax (LPPERSISTSTREAM iface, ULARGE_INTEGER* pcbSize) { - return E_NOTIMPL; -} - -static const IPersistStreamVtbl DirectMusicMarkerTrack_PersistStream_Vtbl = { - IDirectMusicMarkerTrack_IPersistStream_QueryInterface, - IDirectMusicMarkerTrack_IPersistStream_AddRef, - IDirectMusicMarkerTrack_IPersistStream_Release, - IDirectMusicMarkerTrack_IPersistStream_GetClassID, - IDirectMusicMarkerTrack_IPersistStream_IsDirty, - IDirectMusicMarkerTrack_IPersistStream_Load, - IDirectMusicMarkerTrack_IPersistStream_Save, - IDirectMusicMarkerTrack_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 */ @@ -248,12 +217,10 @@ HRESULT WINAPI create_dmmarkertrack(REFIID lpcGUID, void **ppobj) return E_OUTOFMEMORY; } track->IDirectMusicTrack_iface.lpVtbl = &dmtrack_vtbl; - track->PersistStreamVtbl = &DirectMusicMarkerTrack_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_DirectMusicMarkerTrack; track->ref = 1; + dmobject_init(&track->dmobj, &CLSID_DirectMusicMarkerTrack, + (IUnknown *)&track->IDirectMusicTrack_iface); + track->dmobj.IPersistStream_iface.lpVtbl = &persiststream_vtbl; DMIME_LockModule(); hr = IDirectMusicTrack_QueryInterface(&track->IDirectMusicTrack_iface, lpcGUID, ppobj); diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c index e0cc313..30afee3 100644 --- a/dlls/dmime/tests/dmime.c +++ b/dlls/dmime/tests/dmime.c @@ -495,7 +495,7 @@ static void test_track(void) BOOL todo; } class[] = { { X(DirectMusicLyricsTrack), TRUE }, - { X(DirectMusicMarkerTrack), TRUE }, + { X(DirectMusicMarkerTrack), FALSE }, { X(DirectMusicParamControlTrack), TRUE }, { X(DirectMusicSegmentTriggerTrack), FALSE }, { X(DirectMusicSeqTrack), TRUE },

1 0

Michael Stefaniuc : dmime: COM cleanup for IDirectMusicTrack of DMTimeSigTrack.
by Alexandre Julliard 02 Jul '15

02 Jul '15

Module: wine Branch: master Commit: dd1dc8cc81af4180f46b196f16d7053d0310d9f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd1dc8cc81af4180f46b196f1… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jul 2 11:51:21 2015 +0200 dmime: COM cleanup for IDirectMusicTrack of DMTimeSigTrack. --- dlls/dmime/timesigtrack.c | 39 ++++++++++++++++++++++----------------- 1 file changed, 22 insertions(+), 17 deletions(-) diff --git a/dlls/dmime/timesigtrack.c b/dlls/dmime/timesigtrack.c index bae0e58..44adb30 100644 --- a/dlls/dmime/timesigtrack.c +++ b/dlls/dmime/timesigtrack.c @@ -26,7 +26,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmime); */ typedef struct IDirectMusicTimeSigTrack { const IUnknownVtbl *UnknownVtbl; - const IDirectMusicTrackVtbl *TrackVtbl; + IDirectMusicTrack IDirectMusicTrack_iface; const IPersistStreamVtbl *PersistStreamVtbl; LONG ref; DMUS_OBJECTDESC *pDesc; @@ -42,7 +42,7 @@ static HRESULT WINAPI IDirectMusicTimeSigTrack_IUnknown_QueryInterface (LPUNKNOW IUnknown_AddRef (iface); return S_OK; } else if (IsEqualIID (riid, &IID_IDirectMusicTrack)) { - *ppobj = &This->TrackVtbl; + *ppobj = &This->IDirectMusicTrack_iface; IUnknown_AddRef (iface); return S_OK; } else if (IsEqualIID (riid, &IID_IPersistStream)) { @@ -87,29 +87,34 @@ static const IUnknownVtbl DirectMusicTimeSigTrack_Unknown_Vtbl = { }; /* IDirectMusicTimeSigTrack IDirectMusicTrack8 part: */ +static inline IDirectMusicTimeSigTrack *impl_from_IDirectMusicTrack(IDirectMusicTrack *iface) +{ + return CONTAINING_RECORD(iface, IDirectMusicTimeSigTrack, IDirectMusicTrack_iface); +} + static HRESULT WINAPI IDirectMusicTrackImpl_QueryInterface(IDirectMusicTrack *iface, REFIID riid, void **ppobj) { - ICOM_THIS_MULTI(IDirectMusicTimeSigTrack, TrackVtbl, iface); + IDirectMusicTimeSigTrack *This = impl_from_IDirectMusicTrack(iface); return IUnknown_QueryInterface ((LPUNKNOWN)&This->UnknownVtbl, riid, ppobj); } static ULONG WINAPI IDirectMusicTrackImpl_AddRef(IDirectMusicTrack *iface) { - ICOM_THIS_MULTI(IDirectMusicTimeSigTrack, TrackVtbl, iface); + IDirectMusicTimeSigTrack *This = impl_from_IDirectMusicTrack(iface); return IUnknown_AddRef ((LPUNKNOWN)&This->UnknownVtbl); } static ULONG WINAPI IDirectMusicTrackImpl_Release(IDirectMusicTrack *iface) { - ICOM_THIS_MULTI(IDirectMusicTimeSigTrack, TrackVtbl, iface); + IDirectMusicTimeSigTrack *This = impl_from_IDirectMusicTrack(iface); return IUnknown_Release ((LPUNKNOWN)&This->UnknownVtbl); } static HRESULT WINAPI IDirectMusicTrackImpl_Init(IDirectMusicTrack *iface, IDirectMusicSegment *pSegment) { - ICOM_THIS_MULTI(IDirectMusicTimeSigTrack, TrackVtbl, iface); + IDirectMusicTimeSigTrack *This = impl_from_IDirectMusicTrack(iface); FIXME("(%p, %p): stub\n", This, pSegment); return S_OK; } @@ -118,14 +123,14 @@ static HRESULT WINAPI IDirectMusicTrackImpl_InitPlay(IDirectMusicTrack *iface, IDirectMusicSegmentState *pSegmentState, IDirectMusicPerformance *pPerformance, void **ppStateData, DWORD dwVirtualTrack8ID, DWORD dwFlags) { - ICOM_THIS_MULTI(IDirectMusicTimeSigTrack, TrackVtbl, iface); + IDirectMusicTimeSigTrack *This = impl_from_IDirectMusicTrack(iface); FIXME("(%p, %p, %p, %p, %d, %d): stub\n", This, pSegmentState, pPerformance, ppStateData, dwVirtualTrack8ID, dwFlags); return S_OK; } static HRESULT WINAPI IDirectMusicTrackImpl_EndPlay(IDirectMusicTrack *iface, void *pStateData) { - ICOM_THIS_MULTI(IDirectMusicTimeSigTrack, TrackVtbl, iface); + IDirectMusicTimeSigTrack *This = impl_from_IDirectMusicTrack(iface); FIXME("(%p, %p): stub\n", This, pStateData); return S_OK; } @@ -134,7 +139,7 @@ static HRESULT WINAPI IDirectMusicTrackImpl_Play(IDirectMusicTrack *iface, void MUSIC_TIME mtStart, MUSIC_TIME mtEnd, MUSIC_TIME mtOffset, DWORD dwFlags, IDirectMusicPerformance *pPerf, IDirectMusicSegmentState *pSegSt, DWORD dwVirtualID) { - ICOM_THIS_MULTI(IDirectMusicTimeSigTrack, TrackVtbl, iface); + IDirectMusicTimeSigTrack *This = impl_from_IDirectMusicTrack(iface); FIXME("(%p, %p, %d, %d, %d, %d, %p, %p, %d): stub\n", This, pStateData, mtStart, mtEnd, mtOffset, dwFlags, pPerf, pSegSt, dwVirtualID); return S_OK; } @@ -142,7 +147,7 @@ static HRESULT WINAPI IDirectMusicTrackImpl_Play(IDirectMusicTrack *iface, void static HRESULT WINAPI IDirectMusicTrackImpl_GetParam(IDirectMusicTrack *iface, REFGUID rguidType, MUSIC_TIME mtTime, MUSIC_TIME *pmtNext, void *pParam) { - ICOM_THIS_MULTI(IDirectMusicTimeSigTrack, TrackVtbl, iface); + IDirectMusicTimeSigTrack *This = impl_from_IDirectMusicTrack(iface); FIXME("(%p, %s, %d, %p, %p): stub\n", This, debugstr_dmguid(rguidType), mtTime, pmtNext, pParam); return S_OK; } @@ -150,7 +155,7 @@ static HRESULT WINAPI IDirectMusicTrackImpl_GetParam(IDirectMusicTrack *iface, R static HRESULT WINAPI IDirectMusicTrackImpl_SetParam(IDirectMusicTrack *iface, REFGUID rguidType, MUSIC_TIME mtTime, void *pParam) { - ICOM_THIS_MULTI(IDirectMusicTimeSigTrack, TrackVtbl, iface); + IDirectMusicTimeSigTrack *This = impl_from_IDirectMusicTrack(iface); FIXME("(%p, %s, %d, %p): stub\n", This, debugstr_dmguid(rguidType), mtTime, pParam); return S_OK; } @@ -158,7 +163,7 @@ static HRESULT WINAPI IDirectMusicTrackImpl_SetParam(IDirectMusicTrack *iface, R static HRESULT WINAPI IDirectMusicTrackImpl_IsParamSupported(IDirectMusicTrack *iface, REFGUID rguidType) { - ICOM_THIS_MULTI(IDirectMusicTimeSigTrack, TrackVtbl, iface); + IDirectMusicTimeSigTrack *This = impl_from_IDirectMusicTrack(iface); TRACE("(%p, %s)\n", This, debugstr_dmguid(rguidType)); if (IsEqualGUID (rguidType, &GUID_DisableTimeSig) @@ -174,7 +179,7 @@ static HRESULT WINAPI IDirectMusicTrackImpl_IsParamSupported(IDirectMusicTrack * static HRESULT WINAPI IDirectMusicTrackImpl_AddNotificationType(IDirectMusicTrack *iface, REFGUID rguidNotificationType) { - ICOM_THIS_MULTI(IDirectMusicTimeSigTrack, TrackVtbl, iface); + IDirectMusicTimeSigTrack *This = impl_from_IDirectMusicTrack(iface); FIXME("(%p, %s): stub\n", This, debugstr_dmguid(rguidNotificationType)); return S_OK; } @@ -182,7 +187,7 @@ static HRESULT WINAPI IDirectMusicTrackImpl_AddNotificationType(IDirectMusicTrac static HRESULT WINAPI IDirectMusicTrackImpl_RemoveNotificationType(IDirectMusicTrack *iface, REFGUID rguidNotificationType) { - ICOM_THIS_MULTI(IDirectMusicTimeSigTrack, TrackVtbl, iface); + IDirectMusicTimeSigTrack *This = impl_from_IDirectMusicTrack(iface); FIXME("(%p, %s): stub\n", This, debugstr_dmguid(rguidNotificationType)); return S_OK; } @@ -190,12 +195,12 @@ static HRESULT WINAPI IDirectMusicTrackImpl_RemoveNotificationType(IDirectMusicT static HRESULT WINAPI IDirectMusicTrackImpl_Clone(IDirectMusicTrack *iface, MUSIC_TIME mtStart, MUSIC_TIME mtEnd, IDirectMusicTrack **ppTrack) { - ICOM_THIS_MULTI(IDirectMusicTimeSigTrack, TrackVtbl, iface); + IDirectMusicTimeSigTrack *This = impl_from_IDirectMusicTrack(iface); FIXME("(%p, %d, %d, %p): stub\n", This, mtStart, mtEnd, ppTrack); return S_OK; } -static const IDirectMusicTrackVtbl DirectMusicTimeSigTrack_Track_Vtbl = { +static const IDirectMusicTrackVtbl dmtack_vtbl = { IDirectMusicTrackImpl_QueryInterface, IDirectMusicTrackImpl_AddRef, IDirectMusicTrackImpl_Release, @@ -270,7 +275,7 @@ HRESULT WINAPI create_dmtimesigtrack(REFIID lpcGUID, void **ppobj) return E_OUTOFMEMORY; } track->UnknownVtbl = &DirectMusicTimeSigTrack_Unknown_Vtbl; - track->TrackVtbl = &DirectMusicTimeSigTrack_Track_Vtbl; + track->IDirectMusicTrack_iface.lpVtbl = &dmtack_vtbl; track->PersistStreamVtbl = &DirectMusicTimeSigTrack_PersistStream_Vtbl; track->pDesc = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(DMUS_OBJECTDESC)); DM_STRUCT_INIT(track->pDesc);

1 0