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

Huw Davies : comctl32: All negative entries in the toolbar save state are special cases.
by Alexandre Julliard 01 Jul '15

01 Jul '15

Module: wine Branch: master Commit: 96a6184c305bad35737dd57cecbf1dc9c6e96753 URL: http://source.winehq.org/git/wine.git/?a=commit;h=96a6184c305bad35737dd57ce… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jul 1 09:14:56 2015 +0100 comctl32: All negative entries in the toolbar save state are special cases. --- dlls/comctl32/tests/toolbar.c | 52 +++++++++++++++++++++++++++++++++++-------- dlls/comctl32/toolbar.c | 13 +++++------ 2 files changed, 48 insertions(+), 17 deletions(-) diff --git a/dlls/comctl32/tests/toolbar.c b/dlls/comctl32/tests/toolbar.c index 9535947..022d727 100644 --- a/dlls/comctl32/tests/toolbar.c +++ b/dlls/comctl32/tests/toolbar.c @@ -150,7 +150,7 @@ static LRESULT parent_wnd_notify(LPARAM lParam) NMTBSAVE *save = (NMTBSAVE *)lParam; if (save->iItem == -1) { - save->cbData = save->cbData * 2 + sizeof(DWORD); + save->cbData = save->cbData * 2 + 11 * sizeof(DWORD); save->pData = HeapAlloc( GetProcessHeap(), 0, save->cbData ); save->pData[0] = 0xcafe; save->pCurrent = save->pData + 1; @@ -160,6 +160,22 @@ static LRESULT parent_wnd_notify(LPARAM lParam) save->pCurrent[0] = 0xcafe0000 + save->iItem; save->pCurrent++; } + + /* Add on 5 more pseudo buttons. */ + if (save->iItem == save->cButtons - 1) + { + save->pCurrent[0] = 0xffffffff; + save->pCurrent[1] = 0xcafe0007; + save->pCurrent[2] = 0xfffffffe; + save->pCurrent[3] = 0xcafe0008; + save->pCurrent[4] = 0x80000000; + save->pCurrent[5] = 0xcafe0009; + save->pCurrent[6] = 0x7fffffff; + save->pCurrent[7] = 0xcafe000a; + save->pCurrent[8] = 0x100; + save->pCurrent[9] = 0xcafe000b; + } + /* Return value is ignored */ return 1; } @@ -169,21 +185,37 @@ static LRESULT parent_wnd_notify(LPARAM lParam) if (restore->iItem == -1) { - ok( restore->cButtons == 15, "got %d\n", restore->cButtons ); + ok( restore->cButtons == 25, "got %d\n", restore->cButtons ); ok( *restore->pCurrent == 0xcafe, "got %08x\n", *restore->pCurrent ); /* Skip the last one */ - restore->cButtons = 6; + restore->cButtons = 11; restore->pCurrent++; /* BytesPerRecord is ignored */ restore->cbBytesPerRecord = 10; } else { - ok( *restore->pCurrent == 0xcafe0000 + restore->iItem, "got %08x\n", *restore->pCurrent ); ok( restore->tbButton.iBitmap == -1, "got %08x\n", restore->tbButton.iBitmap ); - ok( restore->tbButton.idCommand == restore->iItem * 2 + 1, "got %08x\n", restore->tbButton.idCommand ); - ok( restore->tbButton.fsState == 0, "got %02x\n", restore->tbButton.fsState ); - ok( restore->tbButton.fsStyle == 0, "got %02x\n", restore->tbButton.fsStyle ); + ok( *restore->pCurrent == 0xcafe0000 + restore->iItem, "got %08x\n", *restore->pCurrent ); + if (restore->iItem < 7 || restore->iItem == 10) + { + if (restore->iItem < 7) + ok( restore->tbButton.idCommand == restore->iItem * 2 + 1, "%d: got %08x\n", restore->iItem, restore->tbButton.idCommand ); + else + ok( restore->tbButton.idCommand == 0x7fffffff, "%d: got %08x\n", restore->iItem, restore->tbButton.idCommand ); + ok( restore->tbButton.fsState == 0, "%d: got %02x\n", restore->iItem, restore->tbButton.fsState ); + ok( restore->tbButton.fsStyle == 0, "%d: got %02x\n", restore->iItem, restore->tbButton.fsStyle ); + } + else + { + 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 ); + else + ok( restore->tbButton.fsState == TBSTATE_HIDDEN, "%d: got %02x\n", restore->iItem, restore->tbButton.fsState ); + ok( restore->tbButton.fsStyle == BTNS_SEP, "%d: got %02x\n", restore->iItem, restore->tbButton.fsStyle ); + } + ok( restore->tbButton.dwData == 0, "got %08lx\n", restore->tbButton.dwData ); ok( restore->tbButton.iString == 0, "got %08lx\n", restore->tbButton.iString ); @@ -2176,7 +2208,9 @@ static void test_save(void) {0, 13, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, -1} }; static const DWORD expect[] = {0xcafe, 1, 0xcafe0000, 3, 0xcafe0001, 5, 0xcafe0002, 7, 0xcafe0003, - 9, 0xcafe0004, 11, 0xcafe0005, 13, 0xcafe0006 }; + 9, 0xcafe0004, 11, 0xcafe0005, 13, 0xcafe0006, 0xffffffff, 0xcafe0007, + 0xfffffffe, 0xcafe0008, 0x80000000, 0xcafe0009, 0x7fffffff, 0xcafe000a, + 0x100, 0xcafe000b}; params.hkr = HKEY_CURRENT_USER; params.pszSubKey = subkey; @@ -2206,7 +2240,7 @@ static void test_save(void) res = SendMessageW( wnd, TB_SAVERESTOREW, FALSE, (LPARAM)&params ); ok( res, "restoring failed\n" ); res = SendMessageW( wnd, TB_BUTTONCOUNT, 0, 0 ); - ok( res == 6, "got %d\n", res ); + ok( res == 11, "got %d\n", res ); DestroyWindow( wnd ); RegOpenKeyW( HKEY_CURRENT_USER, subkey, &key ); diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index 9c3707b..e1d2cdb 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -4195,18 +4195,15 @@ TOOLBAR_Restore(TOOLBAR_INFO *infoPtr, const TBSAVEPARAMSW *lpSave) nmtbr.tbButton.iBitmap = -1; nmtbr.tbButton.fsState = 0; nmtbr.tbButton.fsStyle = 0; - nmtbr.tbButton.idCommand = 0; - if (*nmtbr.pCurrent == (DWORD)-1) + + if (*nmtbr.pCurrent & 0x80000000) { /* separator */ + nmtbr.tbButton.idCommand = 0; nmtbr.tbButton.fsStyle = TBSTYLE_SEP; - /* when inserting separators, iBitmap controls its size. - 0 sets default size (width) */ - nmtbr.tbButton.iBitmap = 0; + if (*nmtbr.pCurrent != (DWORD)-1) + nmtbr.tbButton.fsState = TBSTATE_HIDDEN; } - else if (*nmtbr.pCurrent == (DWORD)-2) - /* hidden button */ - nmtbr.tbButton.fsState = TBSTATE_HIDDEN; else nmtbr.tbButton.idCommand = (int)*nmtbr.pCurrent;

1 0

Huw Davies : comctl32: Reset the string and lparam fields between notifications.
by Alexandre Julliard 01 Jul '15

01 Jul '15

Module: wine Branch: master Commit: eddfefa54fefc6464f4a5653b7b33b25905d7165 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eddfefa54fefc6464f4a5653b… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jul 1 09:14:57 2015 +0100 comctl32: Reset the string and lparam fields between notifications. --- dlls/comctl32/tests/toolbar.c | 46 +++++++++++++++++++++++++++++++++++++++---- dlls/comctl32/toolbar.c | 5 +++-- 2 files changed, 45 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/tests/toolbar.c b/dlls/comctl32/tests/toolbar.c index 022d727..bb2aed8 100644 --- a/dlls/comctl32/tests/toolbar.c +++ b/dlls/comctl32/tests/toolbar.c @@ -222,7 +222,17 @@ static LRESULT parent_wnd_notify(LPARAM lParam) restore->tbButton.iBitmap = 0; restore->tbButton.fsState = TBSTATE_ENABLED; restore->tbButton.fsStyle = 0; - restore->tbButton.iString = -1; + restore->tbButton.dwData = restore->iItem; + + if (restore->iItem == 0) + { + restore->tbButton.iString = (INT_PTR)HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, 8 ); + strcpy( (char *)restore->tbButton.iString, "foo" ); + } + else if (restore->iItem == 1) + restore->tbButton.iString = 2; + else + restore->tbButton.iString = -1; restore->pCurrent++; /* Altering cButtons after the 1st call makes no difference. */ @@ -2201,7 +2211,8 @@ static void test_save(void) LONG res; HKEY key; BYTE data[100]; - DWORD size = sizeof(data), type; + DWORD size = sizeof(data), type, i, count; + TBBUTTON tb; static const TBBUTTON more_btns[2] = { {0, 11, TBSTATE_HIDDEN, BTNS_BUTTON, {0}, 0, -1}, @@ -2211,6 +2222,20 @@ static void test_save(void) 9, 0xcafe0004, 11, 0xcafe0005, 13, 0xcafe0006, 0xffffffff, 0xcafe0007, 0xfffffffe, 0xcafe0008, 0x80000000, 0xcafe0009, 0x7fffffff, 0xcafe000a, 0x100, 0xcafe000b}; + static const TBBUTTON expect_btns[] = + { + {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, 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}, + {0, 0, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 9, 0}, + {0, 0x7fffffff, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0xa, 0}, + }; params.hkr = HKEY_CURRENT_USER; params.pszSubKey = subkey; @@ -2239,8 +2264,21 @@ static void test_save(void) rebuild_toolbar( &wnd ); res = SendMessageW( wnd, TB_SAVERESTOREW, FALSE, (LPARAM)&params ); ok( res, "restoring failed\n" ); - res = SendMessageW( wnd, TB_BUTTONCOUNT, 0, 0 ); - ok( res == 11, "got %d\n", res ); + count = SendMessageW( wnd, TB_BUTTONCOUNT, 0, 0 ); + ok( count == sizeof(expect_btns) / sizeof(expect_btns[0]), "got %d\n", count ); + + for (i = 0; i < count; i++) + { + res = SendMessageW( wnd, TB_GETBUTTON, i, (LPARAM)&tb ); + ok( res, "got %d\n", res ); + + ok( tb.iBitmap == expect_btns[i].iBitmap, "%d: got %d\n", i, tb.iBitmap ); + ok( tb.idCommand == expect_btns[i].idCommand, "%d: got %d\n", i, tb.idCommand ); + 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 ); + } DestroyWindow( wnd ); RegOpenKeyW( HKEY_CURRENT_USER, subkey, &key ); diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index e1d2cdb..e816d49 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -4195,6 +4195,8 @@ TOOLBAR_Restore(TOOLBAR_INFO *infoPtr, const TBSAVEPARAMSW *lpSave) nmtbr.tbButton.iBitmap = -1; nmtbr.tbButton.fsState = 0; nmtbr.tbButton.fsStyle = 0; + nmtbr.tbButton.dwData = 0; + nmtbr.tbButton.iString = 0; if (*nmtbr.pCurrent & 0x80000000) { @@ -4211,8 +4213,7 @@ TOOLBAR_Restore(TOOLBAR_INFO *infoPtr, const TBSAVEPARAMSW *lpSave) TOOLBAR_SendNotify(&nmtbr.hdr, infoPtr, TBN_RESTORE); - /* can't contain real string as we don't know whether - * the client put an ANSI or Unicode string in there */ + /* All returned ptrs and -1 are ignored */ if (!IS_INTRESOURCE(nmtbr.tbButton.iString)) nmtbr.tbButton.iString = 0;

1 0

Dmitry Timoshkov : user32/tests: Add some tests to show that WS_CLIPCHILDREN doesn' t exclude children from update region.
by Alexandre Julliard 01 Jul '15

01 Jul '15

Module: wine Branch: master Commit: 55a78fd19be332eb920a240ed242b416346cd613 URL: http://source.winehq.org/git/wine.git/?a=commit;h=55a78fd19be332eb920a240ed… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Jun 29 17:53:52 2015 +0800 user32/tests: Add some tests to show that WS_CLIPCHILDREN doesn't exclude children from update region. --- dlls/user32/tests/msg.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 831a56b..03f6b5c 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -6646,6 +6646,20 @@ static void test_paint_messages(void) RedrawWindow( hparent, NULL, 0, RDW_ERASENOW ); ok_sequence( WmEmptySeq, "WmChildPaintNc3", FALSE ); + /* WS_CLIPCHILDREN doesn't exclude children from update region */ + flush_sequence(); + RedrawWindow( hparent, NULL, 0, RDW_INVALIDATE | RDW_ERASE | RDW_NOCHILDREN ); + GetClientRect( hparent, &rect ); + SetRectRgn( hrgn, rect.left, rect.top, rect.right, rect.bottom ); + check_update_rgn( hparent, hrgn ); + flush_events(); + + RedrawWindow( hparent, NULL, 0, RDW_INVALIDATE | RDW_ERASE | RDW_ALLCHILDREN ); + GetClientRect( hparent, &rect ); + SetRectRgn( hrgn, rect.left, rect.top, rect.right, rect.bottom ); + check_update_rgn( hparent, hrgn ); + flush_events(); + /* test RDW_INTERNALPAINT behavior */ flush_sequence();

1 0

Dmitry Timoshkov : winex11: Don' t call ExcludeUpdateRgn for a window with WS_CLIPCHILDREN style.
by Alexandre Julliard 01 Jul '15

01 Jul '15

Module: wine Branch: master Commit: bd24842eba26573a4587d751adfbb8344eeac9b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd24842eba26573a4587d751a… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Jun 29 17:54:07 2015 +0800 winex11: Don't call ExcludeUpdateRgn for a window with WS_CLIPCHILDREN style. --- dlls/winex11.drv/window.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 14dc44c..69f6446 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1335,7 +1335,13 @@ static void move_window_bits( HWND hwnd, Window window, const RECT *old_rect, co rgn = CreateRectRgnIndirect( &dst_rect ); SelectClipRgn( hdc_dst, rgn ); DeleteObject( rgn ); - ExcludeUpdateRgn( hdc_dst, hwnd ); + /* WS_CLIPCHILDREN doesn't exclude children from the window update + * region, and ExcludeUpdateRgn call may inappropriately clip valid + * child window contents from the copied parent window bits, but we + * still want to avoid copying invalid window bits when possible. + */ + if (!(GetWindowLongW( hwnd, GWL_STYLE ) & WS_CLIPCHILDREN )) + ExcludeUpdateRgn( hdc_dst, hwnd ); code = X11DRV_START_EXPOSURES; ExtEscape( hdc_dst, X11DRV_ESCAPE, sizeof(code), (LPSTR)&code, 0, NULL );

1 0

Huw Davies : riched20: Free the script cache when updating the default style.
by Alexandre Julliard 01 Jul '15

01 Jul '15

Module: wine Branch: master Commit: 7a3c9889e38ede659230a66a167b82c024f0dc85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a3c9889e38ede659230a66a1… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jul 1 10:48:56 2015 +0100 riched20: Free the script cache when updating the default style. --- dlls/riched20/run.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/riched20/run.c b/dlls/riched20/run.c index 38d0270..d76737a 100644 --- a/dlls/riched20/run.c +++ b/dlls/riched20/run.c @@ -776,6 +776,7 @@ void ME_SetDefaultCharFormat(ME_TextEditor *editor, CHARFORMAT2W *mod) style = ME_ApplyStyle(editor->pBuffer->pDefaultStyle, mod); editor->pBuffer->pDefaultStyle->fmt = style->fmt; editor->pBuffer->pDefaultStyle->tm = style->tm; + ScriptFreeCache( &editor->pBuffer->pDefaultStyle->script_cache ); ME_ReleaseStyle(style); ME_MarkAllForWrapping(editor); /* pcf = editor->pBuffer->pDefaultStyle->fmt; */

1 0

Aric Stewart : hid: Implement HidP_GetScaledUsageValue.
by Alexandre Julliard 01 Jul '15

01 Jul '15

Module: wine Branch: master Commit: 098efa1edc254916b7bda0fcd9a38162e5a7ad0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=098efa1edc254916b7bda0fcd… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Jun 30 07:40:41 2015 -0500 hid: Implement HidP_GetScaledUsageValue. --- dlls/hid/hid.spec | 2 +- dlls/hid/hidp.c | 65 ++++++++++++++++++++++++++++++++++++++++++++--------- include/ddk/hidpi.h | 1 + 3 files changed, 57 insertions(+), 11 deletions(-) diff --git a/dlls/hid/hid.spec b/dlls/hid/hid.spec index 8772a35..c7b056d 100644 --- a/dlls/hid/hid.spec +++ b/dlls/hid/hid.spec @@ -23,7 +23,7 @@ @ stub HidP_GetData @ stub HidP_GetExtendedAttributes @ stub HidP_GetLinkCollectionNodes -@ stub HidP_GetScaledUsageValue +@ stdcall HidP_GetScaledUsageValue(long long long long ptr ptr ptr long) @ stub HidP_GetSpecificButtonCaps @ stub HidP_GetSpecificValueCaps @ stdcall HidP_GetUsageValue(long long long long ptr ptr ptr long) diff --git a/dlls/hid/hidp.c b/dlls/hid/hidp.c index d263880..3d7a12e 100644 --- a/dlls/hid/hidp.c +++ b/dlls/hid/hidp.c @@ -150,22 +150,20 @@ NTSTATUS WINAPI HidP_GetCaps(PHIDP_PREPARSED_DATA PreparsedData, return HIDP_STATUS_SUCCESS; } - -NTSTATUS WINAPI HidP_GetUsageValue(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USHORT LinkCollection, - USAGE Usage, PULONG UsageValue, PHIDP_PREPARSED_DATA PreparsedData, - PCHAR Report, ULONG ReportLength) +static NTSTATUS find_value(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USHORT LinkCollection, + USAGE Usage, PHIDP_PREPARSED_DATA PreparsedData, PCHAR Report, + WINE_HID_ELEMENT **element) { PWINE_HIDP_PREPARSED_DATA data = (PWINE_HIDP_PREPARSED_DATA)PreparsedData; WINE_HID_REPORT *report = NULL; USHORT v_count = 0, r_count = 0; int i; - TRACE("(%i, %x, %i, %i, %p, %p, %p, %i)\n", ReportType, UsagePage, LinkCollection, Usage, UsageValue, - PreparsedData, Report, ReportLength); + TRACE("(%i, %x, %i, %i, %p, %p)\n", ReportType, UsagePage, LinkCollection, Usage, + PreparsedData, Report); if (data->magic != HID_MAGIC) return HIDP_STATUS_INVALID_PREPARSED_DATA; - switch(ReportType) { case HidP_Input: @@ -206,15 +204,62 @@ NTSTATUS WINAPI HidP_GetUsageValue(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, report->Elements[i].caps.value.UsagePage == UsagePage && report->Elements[i].caps.value.u.NotRange.Usage == Usage) { - return get_report_data((BYTE*)Report, ReportLength, - report->Elements[i].valueStartBit, - report->Elements[i].bitCount, UsageValue); + *element = &report->Elements[i]; + return HIDP_STATUS_SUCCESS; } } return HIDP_STATUS_USAGE_NOT_FOUND; } +NTSTATUS WINAPI HidP_GetScaledUsageValue(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, + USHORT LinkCollection, USAGE Usage, PLONG UsageValue, + PHIDP_PREPARSED_DATA PreparsedData, PCHAR Report, ULONG ReportLength) +{ + NTSTATUS rc; + WINE_HID_ELEMENT *element; + TRACE("(%i, %x, %i, %i, %p, %p, %p, %i)\n", ReportType, UsagePage, LinkCollection, Usage, UsageValue, + PreparsedData, Report, ReportLength); + + rc = find_value(ReportType, UsagePage, LinkCollection, Usage, PreparsedData, Report, &element); + + if (rc == HIDP_STATUS_SUCCESS) + { + ULONG rawValue; + rc = get_report_data((BYTE*)Report, ReportLength, + element->valueStartBit, element->bitCount, &rawValue); + if (rc != HIDP_STATUS_SUCCESS) + return rc; + if (element->caps.value.BitSize == 16) + rawValue = (short)rawValue; + *UsageValue = rawValue; + } + + return rc; +} + + +NTSTATUS WINAPI HidP_GetUsageValue(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USHORT LinkCollection, + USAGE Usage, PULONG UsageValue, PHIDP_PREPARSED_DATA PreparsedData, + PCHAR Report, ULONG ReportLength) +{ + WINE_HID_ELEMENT *element; + NTSTATUS rc; + + TRACE("(%i, %x, %i, %i, %p, %p, %p, %i)\n", ReportType, UsagePage, LinkCollection, Usage, UsageValue, + PreparsedData, Report, ReportLength); + + rc = find_value(ReportType, UsagePage, LinkCollection, Usage, PreparsedData, Report, &element); + + if (rc == HIDP_STATUS_SUCCESS) + { + return get_report_data((BYTE*)Report, ReportLength, + element->valueStartBit, element->bitCount, UsageValue); + } + + return rc; +} + NTSTATUS WINAPI HidP_GetUsages(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USHORT LinkCollection, PUSAGE UsageList, PULONG UsageLength, PHIDP_PREPARSED_DATA PreparsedData, diff --git a/include/ddk/hidpi.h b/include/ddk/hidpi.h index 40821de..527a966 100644 --- a/include/ddk/hidpi.h +++ b/include/ddk/hidpi.h @@ -143,6 +143,7 @@ NTSTATUS WINAPI HidP_GetUsageValue(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, NTSTATUS WINAPI HidP_GetValueCaps(HIDP_REPORT_TYPE ReportType, PHIDP_VALUE_CAPS ValueCaps, PUSHORT ValueCapsLength, PHIDP_PREPARSED_DATA PreparsedData); NTSTATUS WINAPI HidP_InitializeReportForID(HIDP_REPORT_TYPE ReportType, UCHAR ReportID, PHIDP_PREPARSED_DATA PreparsedData, PCHAR Report, ULONG ReportLength); ULONG WINAPI HidP_MaxUsageListLength(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, PHIDP_PREPARSED_DATA PreparsedData); +NTSTATUS WINAPI HidP_GetScaledUsageValue(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USHORT LinkCollection, USAGE Usage, PLONG UsageValue, PHIDP_PREPARSED_DATA PreparsedData, PCHAR Report, ULONG ReportLength); #ifndef FACILITY_HID_ERROR_CODE #define FACILITY_HID_ERROR_CODE 0x11

1 0

Michael Stefaniuc : dmstyle: Pass objects instead of ifaces to helpers.
by Alexandre Julliard 01 Jul '15

01 Jul '15

Module: wine Branch: master Commit: 040b3989976ca390351108d129029eecf0eeeb02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=040b3989976ca390351108d12… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jul 1 09:12:22 2015 +0200 dmstyle: Pass objects instead of ifaces to helpers. --- dlls/dmstyle/chordtrack.c | 8 ++++---- dlls/dmstyle/styletrack.c | 18 ++++++++++-------- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/dlls/dmstyle/chordtrack.c b/dlls/dmstyle/chordtrack.c index 40f9018..1c7cb97 100644 --- a/dlls/dmstyle/chordtrack.c +++ b/dlls/dmstyle/chordtrack.c @@ -277,9 +277,9 @@ static HRESULT WINAPI IDirectMusicChordTrack_IPersistStream_IsDirty (LPPERSISTST return S_FALSE; } -static HRESULT IDirectMusicChordTrack_IPersistStream_ParseChordTrackList (LPPERSISTSTREAM iface, DMUS_PRIVATE_CHUNK* pChunk, IStream* pStm) { - - ICOM_THIS_MULTI(IDirectMusicChordTrack, PersistStreamVtbl, iface); +static HRESULT parse_chordtrack_list(IDirectMusicChordTrack *This, DMUS_PRIVATE_CHUNK *pChunk, + IStream *pStm) +{ DMUS_PRIVATE_CHUNK Chunk; DWORD ListSize[3], ListCount[3]; LARGE_INTEGER liMove; /* used when skipping chunks */ @@ -371,7 +371,7 @@ static HRESULT WINAPI IDirectMusicChordTrack_IPersistStream_Load (LPPERSISTSTREA switch (Chunk.fccID) { case DMUS_FOURCC_CHORDTRACK_LIST: { TRACE_(dmfile)(": Chord track list\n"); - hr = IDirectMusicChordTrack_IPersistStream_ParseChordTrackList (iface, &Chunk, pStm); + hr = parse_chordtrack_list(This, &Chunk, pStm); if (FAILED(hr)) return hr; break; } diff --git a/dlls/dmstyle/styletrack.c b/dlls/dmstyle/styletrack.c index 4678552..8e02783 100644 --- a/dlls/dmstyle/styletrack.c +++ b/dlls/dmstyle/styletrack.c @@ -279,8 +279,9 @@ static HRESULT WINAPI IDirectMusicStyleTrack_IPersistStream_IsDirty (LPPERSISTST return S_FALSE; } -static HRESULT IDirectMusicStyleTrack_IPersistStream_ParseStyleRef (LPPERSISTSTREAM iface, DMUS_PRIVATE_CHUNK* pChunk, IStream* pStm) { - ICOM_THIS_MULTI(IDirectMusicStyleTrack, PersistStreamVtbl, iface); +static HRESULT parse_style_ref(IDirectMusicStyleTrack *This, DMUS_PRIVATE_CHUNK *pChunk, + IStream *pStm) +{ DMUS_PRIVATE_CHUNK Chunk; DWORD ListSize[3], ListCount[3]; LARGE_INTEGER liMove; /* used when skipping chunks */ @@ -325,7 +326,8 @@ static HRESULT IDirectMusicStyleTrack_IPersistStream_ParseStyleRef (LPPERSISTSTR */ case DMUS_FOURCC_REF_LIST: { FIXME_(dmfile)(": DMRF (DM References) list, not yet handled\n"); - hr = IDirectMusicUtils_IPersistStream_ParseReference (iface, &Chunk, pStm, &pObject); + hr = IDirectMusicUtils_IPersistStream_ParseReference((IPersistStream*)&This->PersistStreamVtbl, + &Chunk, pStm, &pObject); if (FAILED(hr)) { ERR(": could not load Reference\n"); return hr; @@ -361,9 +363,9 @@ static HRESULT IDirectMusicStyleTrack_IPersistStream_ParseStyleRef (LPPERSISTSTR return S_OK; } -static HRESULT IDirectMusicStyleTrack_IPersistStream_ParseStyleTrackList (LPPERSISTSTREAM iface, DMUS_PRIVATE_CHUNK* pChunk, IStream* pStm) { - - /*ICOM_THIS_MULTI(IDirectMusicStyleTrack, PersistStreamVtbl, iface);*/ +static HRESULT parse_styletrack_list(IDirectMusicStyleTrack *This, DMUS_PRIVATE_CHUNK *pChunk, + IStream *pStm) +{ DMUS_PRIVATE_CHUNK Chunk; DWORD ListSize[3], ListCount[3]; LARGE_INTEGER liMove; /* used when skipping chunks */ @@ -390,7 +392,7 @@ static HRESULT IDirectMusicStyleTrack_IPersistStream_ParseStyleTrackList (LPPERS switch (Chunk.fccID) { case DMUS_FOURCC_STYLE_REF_LIST: { TRACE_(dmfile)(": STYLE_REF list\n"); - hr = IDirectMusicStyleTrack_IPersistStream_ParseStyleRef (iface, &Chunk, pStm); + hr = parse_style_ref(This, &Chunk, pStm); if (FAILED(hr)) return hr; break; } @@ -434,7 +436,7 @@ static HRESULT WINAPI IDirectMusicStyleTrack_IPersistStream_Load (LPPERSISTSTREA switch (Chunk.fccID) { case DMUS_FOURCC_STYLE_TRACK_LIST: { TRACE_(dmfile)(": Chord track list\n"); - hr = IDirectMusicStyleTrack_IPersistStream_ParseStyleTrackList (iface, &Chunk, pStm); + hr = parse_styletrack_list(This, &Chunk, pStm); if (FAILED(hr)) return hr; break; }

1 0

Michael Stefaniuc : dmstyle: COM cleanup for IDirectMusicTrack8 of DMCommandTrack.
by Alexandre Julliard 01 Jul '15

01 Jul '15

Module: wine Branch: master Commit: 29e9988bf04f26db59d5c2673062ba53e15e636a URL: http://source.winehq.org/git/wine.git/?a=commit;h=29e9988bf04f26db59d5c2673… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jul 1 09:13:40 2015 +0200 dmstyle: COM cleanup for IDirectMusicTrack8 of DMCommandTrack. --- dlls/dmstyle/commandtrack.c | 151 ++++++++++++++++++++++++++------------------ 1 file changed, 91 insertions(+), 60 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=29e9988bf04f26db59d5c…

1 0

Michael Stefaniuc : dmstyle: Remove the extraneous IUnknown from DMCommandTrack.
by Alexandre Julliard 01 Jul '15

01 Jul '15

Module: wine Branch: master Commit: 28b606b0f3226337b3d1c68f2b9c3559a2f23dc8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=28b606b0f3226337b3d1c68f2… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jul 1 09:14:13 2015 +0200 dmstyle: Remove the extraneous IUnknown from DMCommandTrack. Also lock/unlock the module only on creation/destruction of the object. --- dlls/dmstyle/commandtrack.c | 130 ++++++++++++++++++-------------------------- 1 file changed, 52 insertions(+), 78 deletions(-) diff --git a/dlls/dmstyle/commandtrack.c b/dlls/dmstyle/commandtrack.c index 0ec9774..8d33fd6 100644 --- a/dlls/dmstyle/commandtrack.c +++ b/dlls/dmstyle/commandtrack.c @@ -22,14 +22,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmstyle); WINE_DECLARE_DEBUG_CHANNEL(dmfile); -static ULONG WINAPI IDirectMusicCommandTrack_IUnknown_AddRef (LPUNKNOWN iface); -static ULONG WINAPI IDirectMusicCommandTrack_IPersistStream_AddRef (LPPERSISTSTREAM iface); - /***************************************************************************** * IDirectMusicCommandTrack implementation */ typedef struct IDirectMusicCommandTrack { - const IUnknownVtbl *UnknownVtbl; IDirectMusicTrack8 IDirectMusicTrack8_iface; const IPersistStreamVtbl *PersistStreamVtbl; LONG ref; @@ -37,62 +33,6 @@ typedef struct IDirectMusicCommandTrack { struct list Commands; } IDirectMusicCommandTrack; -/* IDirectMusicCommandTrack IUnknown part: */ -static HRESULT WINAPI IDirectMusicCommandTrack_IUnknown_QueryInterface (LPUNKNOWN iface, REFIID riid, LPVOID *ppobj) { - ICOM_THIS_MULTI(IDirectMusicCommandTrack, UnknownVtbl, iface); - TRACE("(%p, %s, %p)\n", This, debugstr_dmguid(riid), ppobj); - - if (IsEqualIID (riid, &IID_IUnknown)) { - *ppobj = &This->UnknownVtbl; - IDirectMusicCommandTrack_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; - IDirectMusicCommandTrack_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 IDirectMusicCommandTrack_IUnknown_AddRef (LPUNKNOWN iface) { - ICOM_THIS_MULTI(IDirectMusicCommandTrack, UnknownVtbl, iface); - ULONG ref = InterlockedIncrement(&This->ref); - - TRACE("(%p): AddRef from %d\n", This, ref - 1); - - DMSTYLE_LockModule(); - - return ref; -} - -static ULONG WINAPI IDirectMusicCommandTrack_IUnknown_Release (LPUNKNOWN iface) { - ICOM_THIS_MULTI(IDirectMusicCommandTrack, 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 DirectMusicCommandTrack_Unknown_Vtbl = { - IDirectMusicCommandTrack_IUnknown_QueryInterface, - IDirectMusicCommandTrack_IUnknown_AddRef, - IDirectMusicCommandTrack_IUnknown_Release -}; - /* IDirectMusicCommandTrack IDirectMusicTrack8 part: */ static inline IDirectMusicCommandTrack *impl_from_IDirectMusicTrack8(IDirectMusicTrack8 *iface) { @@ -100,22 +40,51 @@ static inline IDirectMusicCommandTrack *impl_from_IDirectMusicTrack8(IDirectMusi } static HRESULT WINAPI IDirectMusicTrack8Impl_QueryInterface(IDirectMusicTrack8 *iface, REFIID riid, - void **ppobj) + void **ret_iface) { IDirectMusicCommandTrack *This = impl_from_IDirectMusicTrack8(iface); - return IDirectMusicCommandTrack_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) { IDirectMusicCommandTrack *This = impl_from_IDirectMusicTrack8(iface); - return IDirectMusicCommandTrack_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) { IDirectMusicCommandTrack *This = impl_from_IDirectMusicTrack8(iface); - return IDirectMusicCommandTrack_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, @@ -283,17 +252,17 @@ static const IDirectMusicTrack8Vtbl dmtrack8_vtbl = { /* IDirectMusicCommandTrack IPersistStream part: */ static HRESULT WINAPI IDirectMusicCommandTrack_IPersistStream_QueryInterface (LPPERSISTSTREAM iface, REFIID riid, LPVOID *ppobj) { ICOM_THIS_MULTI(IDirectMusicCommandTrack, PersistStreamVtbl, iface); - return IDirectMusicCommandTrack_IUnknown_QueryInterface ((LPUNKNOWN)&This->UnknownVtbl, riid, ppobj); + return IDirectMusicTrack8_QueryInterface(&This->IDirectMusicTrack8_iface, riid, ppobj); } static ULONG WINAPI IDirectMusicCommandTrack_IPersistStream_AddRef (LPPERSISTSTREAM iface) { ICOM_THIS_MULTI(IDirectMusicCommandTrack, PersistStreamVtbl, iface); - return IDirectMusicCommandTrack_IUnknown_AddRef ((LPUNKNOWN)&This->UnknownVtbl); + return IDirectMusicTrack8_AddRef(&This->IDirectMusicTrack8_iface); } static ULONG WINAPI IDirectMusicCommandTrack_IPersistStream_Release (LPPERSISTSTREAM iface) { ICOM_THIS_MULTI(IDirectMusicCommandTrack, PersistStreamVtbl, iface); - return IDirectMusicCommandTrack_IUnknown_Release ((LPUNKNOWN)&This->UnknownVtbl); + return IDirectMusicTrack8_Release(&This->IDirectMusicTrack8_iface); } static HRESULT WINAPI IDirectMusicCommandTrack_IPersistStream_GetClassID (LPPERSISTSTREAM iface, CLSID* pClassID) { @@ -387,22 +356,27 @@ static const IPersistStreamVtbl DirectMusicCommandTrack_PersistStream_Vtbl = { /* for ClassFactory */ HRESULT WINAPI create_dmcommandtrack(REFIID lpcGUID, void **ppobj) { - IDirectMusicCommandTrack* track; - - track = HeapAlloc (GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicCommandTrack)); - if (NULL == track) { - *ppobj = NULL; - return E_OUTOFMEMORY; - } - track->UnknownVtbl = &DirectMusicCommandTrack_Unknown_Vtbl; + IDirectMusicCommandTrack *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 = &DirectMusicCommandTrack_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_DirectMusicCommandTrack; - track->ref = 0; /* will be inited by QueryInterface */ - list_init (&track->Commands); + track->ref = 1; + list_init (&track->Commands); + + DMSTYLE_LockModule(); + hr = IDirectMusicTrack8_QueryInterface(&track->IDirectMusicTrack8_iface, + lpcGUID, ppobj); + IDirectMusicTrack8_Release(&track->IDirectMusicTrack8_iface); - return IDirectMusicCommandTrack_IUnknown_QueryInterface ((LPUNKNOWN)&track->UnknownVtbl, lpcGUID, ppobj); + return hr; }

1 0

Michael Stefaniuc : dmstyle: Use the generic IPersistStream for DMCommandTrack.
by Alexandre Julliard 01 Jul '15

01 Jul '15

Module: wine Branch: master Commit: 819d25a71789cda62ea8122bcbcf41d593e1137f URL: http://source.winehq.org/git/wine.git/?a=commit;h=819d25a71789cda62ea8122bc… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jul 1 09:16:52 2015 +0200 dmstyle: Use the generic IPersistStream for DMCommandTrack. --- dlls/dmstyle/commandtrack.c | 72 +++++++++++++++----------------------------- dlls/dmstyle/tests/dmstyle.c | 33 +++++++------------- 2 files changed, 36 insertions(+), 69 deletions(-) diff --git a/dlls/dmstyle/commandtrack.c b/dlls/dmstyle/commandtrack.c index 8d33fd6..9f798e7 100644 --- a/dlls/dmstyle/commandtrack.c +++ b/dlls/dmstyle/commandtrack.c @@ -18,6 +18,7 @@ */ #include "dmstyle_private.h" +#include "dmobject.h" WINE_DEFAULT_DEBUG_CHANNEL(dmstyle); WINE_DECLARE_DEBUG_CHANNEL(dmfile); @@ -27,9 +28,8 @@ WINE_DECLARE_DEBUG_CHANNEL(dmfile); */ typedef struct IDirectMusicCommandTrack { IDirectMusicTrack8 IDirectMusicTrack8_iface; - const IPersistStreamVtbl *PersistStreamVtbl; + struct dmobject dmobj; /* IPersistStream only */ LONG ref; - DMUS_OBJECTDESC *pDesc; struct list Commands; } IDirectMusicCommandTrack; @@ -52,7 +52,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; @@ -249,32 +249,14 @@ static const IDirectMusicTrack8Vtbl dmtrack8_vtbl = { IDirectMusicTrack8Impl_Join }; -/* IDirectMusicCommandTrack IPersistStream part: */ -static HRESULT WINAPI IDirectMusicCommandTrack_IPersistStream_QueryInterface (LPPERSISTSTREAM iface, REFIID riid, LPVOID *ppobj) { - ICOM_THIS_MULTI(IDirectMusicCommandTrack, PersistStreamVtbl, iface); - return IDirectMusicTrack8_QueryInterface(&This->IDirectMusicTrack8_iface, riid, ppobj); -} - -static ULONG WINAPI IDirectMusicCommandTrack_IPersistStream_AddRef (LPPERSISTSTREAM iface) { - ICOM_THIS_MULTI(IDirectMusicCommandTrack, PersistStreamVtbl, iface); - return IDirectMusicTrack8_AddRef(&This->IDirectMusicTrack8_iface); -} - -static ULONG WINAPI IDirectMusicCommandTrack_IPersistStream_Release (LPPERSISTSTREAM iface) { - ICOM_THIS_MULTI(IDirectMusicCommandTrack, PersistStreamVtbl, iface); - return IDirectMusicTrack8_Release(&This->IDirectMusicTrack8_iface); -} - -static HRESULT WINAPI IDirectMusicCommandTrack_IPersistStream_GetClassID (LPPERSISTSTREAM iface, CLSID* pClassID) { - return E_NOTIMPL; -} - -static HRESULT WINAPI IDirectMusicCommandTrack_IPersistStream_IsDirty (LPPERSISTSTREAM iface) { - return E_NOTIMPL; +static inline IDirectMusicCommandTrack *impl_from_IPersistStream(IPersistStream *iface) +{ + return CONTAINING_RECORD(iface, IDirectMusicCommandTrack, dmobj.IPersistStream_iface); } -static HRESULT WINAPI IDirectMusicCommandTrack_IPersistStream_Load (LPPERSISTSTREAM iface, IStream* pStm) { - ICOM_THIS_MULTI(IDirectMusicCommandTrack, PersistStreamVtbl, iface); +static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *pStm) +{ + IDirectMusicCommandTrack *This = impl_from_IPersistStream(iface); FOURCC chunkID; DWORD chunkSize, dwSizeOfStruct, nrCommands; LARGE_INTEGER liMove; /* used when skipping chunks */ @@ -299,7 +281,7 @@ static HRESULT WINAPI IDirectMusicCommandTrack_IPersistStream_Load (LPPERSISTSTR list_add_tail (&This->Commands, &pNewCommand->entry); } TRACE_(dmfile)(": reading finished\n"); - This->pDesc->dwValidData |= DMUS_OBJ_LOADED; + This->dmobj.desc.dwValidData |= DMUS_OBJ_LOADED; break; } default: { @@ -334,23 +316,21 @@ static HRESULT WINAPI IDirectMusicCommandTrack_IPersistStream_Load (LPPERSISTSTR return S_OK; } -static HRESULT WINAPI IDirectMusicCommandTrack_IPersistStream_Save (LPPERSISTSTREAM iface, IStream* pStm, BOOL fClearDirty) { - return E_NOTIMPL; -} - -static HRESULT WINAPI IDirectMusicCommandTrack_IPersistStream_GetSizeMax (LPPERSISTSTREAM iface, ULARGE_INTEGER* pcbSize) { +static HRESULT WINAPI IPersistStreamImpl_Save(IPersistStream *iface, IStream *stream, + BOOL cleardirty) +{ return E_NOTIMPL; } -static const IPersistStreamVtbl DirectMusicCommandTrack_PersistStream_Vtbl = { - IDirectMusicCommandTrack_IPersistStream_QueryInterface, - IDirectMusicCommandTrack_IPersistStream_AddRef, - IDirectMusicCommandTrack_IPersistStream_Release, - IDirectMusicCommandTrack_IPersistStream_GetClassID, - IDirectMusicCommandTrack_IPersistStream_IsDirty, - IDirectMusicCommandTrack_IPersistStream_Load, - IDirectMusicCommandTrack_IPersistStream_Save, - IDirectMusicCommandTrack_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 */ @@ -365,12 +345,10 @@ HRESULT WINAPI create_dmcommandtrack(REFIID lpcGUID, void **ppobj) return E_OUTOFMEMORY; } track->IDirectMusicTrack8_iface.lpVtbl = &dmtrack8_vtbl; - track->PersistStreamVtbl = &DirectMusicCommandTrack_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_DirectMusicCommandTrack; track->ref = 1; + dmobject_init(&track->dmobj, &CLSID_DirectMusicCommandTrack, + (IUnknown *)&track->IDirectMusicTrack8_iface); + track->dmobj.IPersistStream_iface.lpVtbl = &persiststream_vtbl; list_init (&track->Commands); DMSTYLE_LockModule(); diff --git a/dlls/dmstyle/tests/dmstyle.c b/dlls/dmstyle/tests/dmstyle.c index e98b29c..9468c39 100644 --- a/dlls/dmstyle/tests/dmstyle.c +++ b/dlls/dmstyle/tests/dmstyle.c @@ -252,14 +252,13 @@ static void test_track(void) const char *name; BOOL has_save; BOOL has_join; - BOOL todo; } class[] = { - { X(DirectMusicAuditionTrack), TRUE, FALSE, FALSE }, - { X(DirectMusicChordTrack), TRUE, TRUE, FALSE }, - { X(DirectMusicCommandTrack), TRUE, TRUE, TRUE }, - { X(DirectMusicMotifTrack), FALSE, FALSE, FALSE }, - { X(DirectMusicMuteTrack), TRUE, FALSE, FALSE }, - { X(DirectMusicStyleTrack), FALSE, TRUE, FALSE }, + { X(DirectMusicAuditionTrack), TRUE, FALSE }, + { X(DirectMusicChordTrack), TRUE, TRUE }, + { X(DirectMusicCommandTrack), TRUE, TRUE }, + { X(DirectMusicMotifTrack), FALSE, FALSE }, + { X(DirectMusicMuteTrack), TRUE, FALSE }, + { X(DirectMusicStyleTrack), FALSE, TRUE }, }; #undef X unsigned int i; @@ -329,21 +328,11 @@ static void test_track(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, &classid); - if (class[i].todo) { - todo_wine { - ok(hr == S_OK, "IPersistStream_GetClassID failed: %08x\n", hr); - ok(IsEqualGUID(&classid, class[i].clsid), - "Expected class %s got %s\n", class[i].name, wine_dbgstr_guid(&classid)); - hr = IPersistStream_IsDirty(ps); - ok(hr == S_FALSE, "IPersistStream_IsDirty failed: %08x\n", hr); - } - } else { - ok(hr == S_OK, "IPersistStream_GetClassID failed: %08x\n", hr); - ok(IsEqualGUID(&classid, class[i].clsid), - "Expected class %s got %s\n", class[i].name, wine_dbgstr_guid(&classid)); - hr = IPersistStream_IsDirty(ps); - ok(hr == S_FALSE, "IPersistStream_IsDirty failed: %08x\n", hr); - } + ok(hr == S_OK, "IPersistStream_GetClassID failed: %08x\n", hr); + ok(IsEqualGUID(&classid, class[i].clsid), + "Expected class %s got %s\n", class[i].name, wine_dbgstr_guid(&classid)); + hr = IPersistStream_IsDirty(ps); + 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);

1 0