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

Huw Davies : comctl32: Don't leak button text.
by Alexandre Julliard July 1, 2015

July 1, 2015

Module: wine Branch: master Commit: 199f51ff78c94925bdbdd13a0c431035358f682b URL: http://source.winehq.org/git/wine.git/?a=commit;h=199f51ff78c94925bdbdd13a0… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jul 1 09:14:53 2015 +0100 comctl32: Don't leak button text. --- dlls/comctl32/toolbar.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index 19d45a0..aa9ffcd 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -4088,6 +4088,7 @@ TOOLBAR_DeleteAllButtons(TOOLBAR_INFO *infoPtr) for (i = 0; i < infoPtr->nNumButtons; i++) { + free_string( infoPtr->buttons + i ); TOOLBAR_TooltipDelTool(infoPtr, &infoPtr->buttons[i]); }

1 0

Huw Davies : comctl32: Add a helper to free button text.
by Alexandre Julliard July 1, 2015

July 1, 2015

Module: wine Branch: master Commit: 01cd45cce1ba05069ebe88670c23c9478cadb6e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=01cd45cce1ba05069ebe88670… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jul 1 09:14:52 2015 +0100 comctl32: Add a helper to free button text. --- dlls/comctl32/toolbar.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index bbfc6b7..19d45a0 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -353,6 +353,12 @@ static void set_stringT( TBUTTON_INFO *btn, const WCHAR *str, BOOL unicode ) set_string_index( btn, (DWORD_PTR)str, unicode ); } +static void free_string( TBUTTON_INFO *btn ) +{ + set_string_index( btn, 0, TRUE ); + +} + /*********************************************************************** * TOOLBAR_CheckStyle * @@ -3224,8 +3230,7 @@ TOOLBAR_DeleteButton (TOOLBAR_INFO *infoPtr, INT nIndex) if (infoPtr->nNumButtons == 1) { TRACE(" simple delete!\n"); - if (TOOLBAR_ButtonHasString(infoPtr->buttons)) - Free((LPWSTR)infoPtr->buttons[0].iString); + free_string( infoPtr->buttons ); Free (infoPtr->buttons); infoPtr->buttons = NULL; infoPtr->nNumButtons = 0; @@ -3246,8 +3251,7 @@ TOOLBAR_DeleteButton (TOOLBAR_INFO *infoPtr, INT nIndex) (infoPtr->nNumButtons - nIndex) * sizeof(TBUTTON_INFO)); } - if (TOOLBAR_ButtonHasString(&oldButtons[nIndex])) - Free((LPWSTR)oldButtons[nIndex].iString); + free_string( oldButtons + nIndex ); Free (oldButtons); } @@ -5227,8 +5231,7 @@ TOOLBAR_Destroy (TOOLBAR_INFO *infoPtr) /* delete button data */ for (i = 0; i < infoPtr->nNumButtons; i++) - if (TOOLBAR_ButtonHasString(&infoPtr->buttons[i])) - Free ((LPWSTR)infoPtr->buttons[i].iString); + free_string( infoPtr->buttons + i ); Free (infoPtr->buttons); /* delete strings */

1 0

Huw Davies : riched20: Free the script cache when updating the default style.
by Alexandre Julliard July 1, 2015

July 1, 2015

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

Dmitry Timoshkov : user32/tests: Add some tests to show that WS_CLIPCHILDREN doesn' t exclude children from update region.
by Alexandre Julliard July 1, 2015

July 1, 2015

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

Huw Davies : comctl32: Reset the string and lparam fields between notifications.
by Alexandre Julliard July 1, 2015

July 1, 2015

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

Aric Stewart : hid: Implement HidP_MaxUsageListLength.
by Alexandre Julliard July 1, 2015

July 1, 2015

Module: wine Branch: master Commit: 1174fc63adac9ccb6046898bd33973a33ff2e1db URL: http://source.winehq.org/git/wine.git/?a=commit;h=1174fc63adac9ccb6046898bd… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Jun 30 07:40:32 2015 -0500 hid: Implement HidP_MaxUsageListLength. --- dlls/hid/hid.spec | 2 +- dlls/hid/hidp.c | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++ include/ddk/hidpi.h | 2 +- 3 files changed, 55 insertions(+), 2 deletions(-) diff --git a/dlls/hid/hid.spec b/dlls/hid/hid.spec index 2dad3c7..8772a35 100644 --- a/dlls/hid/hid.spec +++ b/dlls/hid/hid.spec @@ -33,7 +33,7 @@ @ stdcall HidP_GetValueCaps(long ptr ptr ptr) @ stdcall HidP_InitializeReportForID(long long ptr ptr long) @ stub HidP_MaxDataListLength -@ stub HidP_MaxUsageListLength +@ stdcall HidP_MaxUsageListLength(long long ptr) @ stub HidP_SetData @ stub HidP_SetScaledUsageValue @ stub HidP_SetUsageValue diff --git a/dlls/hid/hidp.c b/dlls/hid/hidp.c index d680f78..d263880 100644 --- a/dlls/hid/hidp.c +++ b/dlls/hid/hidp.c @@ -421,3 +421,56 @@ NTSTATUS WINAPI HidP_InitializeReportForID(HIDP_REPORT_TYPE ReportType, UCHAR Re return HIDP_STATUS_SUCCESS; } + +ULONG WINAPI HidP_MaxUsageListLength(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, PHIDP_PREPARSED_DATA PreparsedData) +{ + PWINE_HIDP_PREPARSED_DATA data = (PWINE_HIDP_PREPARSED_DATA)PreparsedData; + WINE_HID_REPORT *report = NULL; + int r_count; + int i; + int count = 0; + + TRACE("(%i, %x, %p)\n", ReportType, UsagePage, PreparsedData); + + if (data->magic != HID_MAGIC) + return 0; + + switch(ReportType) + { + case HidP_Input: + report = HID_INPUT_REPORTS(data); + r_count = data->dwInputReportCount; + break; + case HidP_Output: + report = HID_OUTPUT_REPORTS(data); + r_count = data->dwOutputReportCount; + break; + case HidP_Feature: + report = HID_FEATURE_REPORTS(data); + r_count = data->dwFeatureReportCount; + break; + default: + return HIDP_STATUS_INVALID_REPORT_TYPE; + } + + if (!r_count || !report) + return 0; + + for (i = 0; i < r_count; i++) + { + int j; + for (j = 0; j < report->elementCount; j++) + { + if (report->Elements[j].caps.button.UsagePage == UsagePage) + { + if (report->Elements[j].caps.button.IsRange) + count += (report->Elements[j].caps.button.u.Range.UsageMax - + report->Elements[j].caps.button.u.Range.UsageMin) + 1; + else + count++; + } + } + report = HID_NEXT_REPORT(data, report); + } + return count; +} diff --git a/include/ddk/hidpi.h b/include/ddk/hidpi.h index f4da89d..40821de 100644 --- a/include/ddk/hidpi.h +++ b/include/ddk/hidpi.h @@ -142,7 +142,7 @@ NTSTATUS WINAPI HidP_GetUsages(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USH NTSTATUS WINAPI HidP_GetUsageValue(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USHORT LinkCollection, USAGE Usage, PULONG UsageValue, PHIDP_PREPARSED_DATA PreparsedData, PCHAR Report, ULONG ReportLength); 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); #ifndef FACILITY_HID_ERROR_CODE #define FACILITY_HID_ERROR_CODE 0x11

1 0

Aric Stewart : hid: Implement HidP_InitializeReportForID.
by Alexandre Julliard July 1, 2015

July 1, 2015

Module: wine Branch: master Commit: 30480a236956d5e1c96d5368b4b418ead1e45d08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=30480a236956d5e1c96d5368b… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Jun 30 07:40:10 2015 -0500 hid: Implement HidP_InitializeReportForID. --- dlls/hid/hid.spec | 2 +- dlls/hid/hidp.c | 63 +++++++++++++++++++++++++++++++++++++++++++++++++++++ include/ddk/hidpi.h | 1 + 3 files changed, 65 insertions(+), 1 deletion(-) diff --git a/dlls/hid/hid.spec b/dlls/hid/hid.spec index b8b4e7f..5659a88 100644 --- a/dlls/hid/hid.spec +++ b/dlls/hid/hid.spec @@ -31,7 +31,7 @@ @ stdcall HidP_GetUsages(long long long ptr ptr ptr ptr long) @ stub HidP_GetUsagesEx @ stdcall HidP_GetValueCaps(long ptr ptr ptr) -@ stub HidP_InitializeReportForID +@ stdcall HidP_InitializeReportForID(long long ptr ptr long) @ stub HidP_MaxDataListLength @ stub HidP_MaxUsageListLength @ stub HidP_SetData diff --git a/dlls/hid/hidp.c b/dlls/hid/hidp.c index 07c82cf..d680f78 100644 --- a/dlls/hid/hidp.c +++ b/dlls/hid/hidp.c @@ -358,3 +358,66 @@ NTSTATUS WINAPI HidP_GetValueCaps(HIDP_REPORT_TYPE ReportType, PHIDP_VALUE_CAPS *ValueCapsLength = v_count; return HIDP_STATUS_SUCCESS; } + +NTSTATUS WINAPI HidP_InitializeReportForID(HIDP_REPORT_TYPE ReportType, UCHAR ReportID, + PHIDP_PREPARSED_DATA PreparsedData, PCHAR Report, + ULONG ReportLength) +{ + int size; + PWINE_HIDP_PREPARSED_DATA data = (PWINE_HIDP_PREPARSED_DATA)PreparsedData; + WINE_HID_REPORT *report = NULL; + BOOL found=FALSE; + int r_count; + int i; + + TRACE("(%i, %i, %p, %p, %i)\n",ReportType, ReportID, PreparsedData, Report, ReportLength); + + if (data->magic != HID_MAGIC) + return HIDP_STATUS_INVALID_PREPARSED_DATA; + + switch(ReportType) + { + case HidP_Input: + size = data->caps.InputReportByteLength; + report = HID_INPUT_REPORTS(data); + r_count = data->dwInputReportCount; + break; + case HidP_Output: + size = data->caps.OutputReportByteLength; + report = HID_OUTPUT_REPORTS(data); + r_count = data->dwOutputReportCount; + break; + case HidP_Feature: + size = data->caps.FeatureReportByteLength; + report = HID_FEATURE_REPORTS(data); + r_count = data->dwFeatureReportCount; + break; + default: + return HIDP_STATUS_INVALID_REPORT_TYPE; + } + + if (!r_count || !size || !report) + return HIDP_STATUS_REPORT_DOES_NOT_EXIST; + + if (size != ReportLength) + return HIDP_STATUS_INVALID_REPORT_LENGTH; + + ZeroMemory(Report, size); + + for (i = 0; i < r_count; i++) + { + if (report->reportID == ReportID) + { + found = TRUE; + if (report->reportID) + Report[0] = ReportID; + /* TODO: Handle null and default values */ + } + report = HID_NEXT_REPORT(data, report); + } + + if (!found) + return HIDP_STATUS_REPORT_DOES_NOT_EXIST; + + return HIDP_STATUS_SUCCESS; +} diff --git a/include/ddk/hidpi.h b/include/ddk/hidpi.h index 45361d2..f4da89d 100644 --- a/include/ddk/hidpi.h +++ b/include/ddk/hidpi.h @@ -141,6 +141,7 @@ NTSTATUS WINAPI HidP_GetCaps(PHIDP_PREPARSED_DATA PreparsedData, PHIDP_CAPS Capa NTSTATUS WINAPI HidP_GetUsages(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USHORT LinkCollection, PUSAGE UsageList, PULONG UsageLength, PHIDP_PREPARSED_DATA PreparsedData, PCHAR Report, ULONG ReportLength); NTSTATUS WINAPI HidP_GetUsageValue(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USHORT LinkCollection, USAGE Usage, PULONG UsageValue, PHIDP_PREPARSED_DATA PreparsedData, PCHAR Report, ULONG ReportLength); 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); #ifndef FACILITY_HID_ERROR_CODE

1 0

Aric Stewart : hid: Implement HidP_GetUsageValue.
by Alexandre Julliard July 1, 2015

July 1, 2015

Module: wine Branch: master Commit: ecc619650829db0ea6dd15ad59773598495efa48 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ecc619650829db0ea6dd15ad5… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Jun 30 07:40:04 2015 -0500 hid: Implement HidP_GetUsageValue. --- dlls/hid/hid.spec | 2 +- dlls/hid/hidp.c | 65 +++++++++++++++++++++++++++++++++++++++++++++++++++++ include/ddk/hidpi.h | 1 + 3 files changed, 67 insertions(+), 1 deletion(-) diff --git a/dlls/hid/hid.spec b/dlls/hid/hid.spec index 5b63267..b8b4e7f 100644 --- a/dlls/hid/hid.spec +++ b/dlls/hid/hid.spec @@ -26,7 +26,7 @@ @ stub HidP_GetScaledUsageValue @ stub HidP_GetSpecificButtonCaps @ stub HidP_GetSpecificValueCaps -@ stub HidP_GetUsageValue +@ stdcall HidP_GetUsageValue(long long long long ptr ptr ptr long) @ stub HidP_GetUsageValueArray @ stdcall HidP_GetUsages(long long long ptr ptr ptr ptr long) @ stub HidP_GetUsagesEx diff --git a/dlls/hid/hidp.c b/dlls/hid/hidp.c index 0cdad0c..07c82cf 100644 --- a/dlls/hid/hidp.c +++ b/dlls/hid/hidp.c @@ -151,6 +151,71 @@ NTSTATUS WINAPI HidP_GetCaps(PHIDP_PREPARSED_DATA PreparsedData, } +NTSTATUS WINAPI HidP_GetUsageValue(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USHORT LinkCollection, + USAGE Usage, PULONG UsageValue, PHIDP_PREPARSED_DATA PreparsedData, + PCHAR Report, ULONG ReportLength) +{ + 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); + + if (data->magic != HID_MAGIC) + return HIDP_STATUS_INVALID_PREPARSED_DATA; + + switch(ReportType) + { + case HidP_Input: + v_count = data->caps.NumberInputValueCaps; + r_count = data->dwInputReportCount; + report = HID_INPUT_REPORTS(data); + break; + case HidP_Output: + v_count = data->caps.NumberOutputValueCaps; + r_count = data->dwOutputReportCount; + report = HID_OUTPUT_REPORTS(data); + break; + case HidP_Feature: + v_count = data->caps.NumberFeatureValueCaps; + r_count = data->dwFeatureReportCount; + report = HID_FEATURE_REPORTS(data); + break; + default: + return HIDP_STATUS_INVALID_REPORT_TYPE; + } + + if (!r_count || !v_count || !report) + return HIDP_STATUS_USAGE_NOT_FOUND; + + for (i = 0; i < r_count; i++) + { + if (!report->reportID || report->reportID == Report[0]) + break; + report = HID_NEXT_REPORT(data, report); + } + + if (i == r_count) + return HIDP_STATUS_REPORT_DOES_NOT_EXIST; + + for (i = 0; i < report->elementCount; i++) + { + if (report->Elements[i].ElementType == ValueElement && + 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); + } + } + + return HIDP_STATUS_USAGE_NOT_FOUND; +} + + NTSTATUS WINAPI HidP_GetUsages(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USHORT LinkCollection, PUSAGE UsageList, PULONG UsageLength, PHIDP_PREPARSED_DATA PreparsedData, PCHAR Report, ULONG ReportLength) diff --git a/include/ddk/hidpi.h b/include/ddk/hidpi.h index fddfa02..45361d2 100644 --- a/include/ddk/hidpi.h +++ b/include/ddk/hidpi.h @@ -139,6 +139,7 @@ typedef struct _HIDP_CAPS NTSTATUS WINAPI HidP_GetButtonCaps(HIDP_REPORT_TYPE ReportType, PHIDP_BUTTON_CAPS ButtonCaps, PUSHORT ButtonCapsLength, PHIDP_PREPARSED_DATA PreparsedData); NTSTATUS WINAPI HidP_GetCaps(PHIDP_PREPARSED_DATA PreparsedData, PHIDP_CAPS Capabilities); NTSTATUS WINAPI HidP_GetUsages(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USHORT LinkCollection, PUSAGE UsageList, PULONG UsageLength, PHIDP_PREPARSED_DATA PreparsedData, PCHAR Report, ULONG ReportLength); +NTSTATUS WINAPI HidP_GetUsageValue(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USHORT LinkCollection, USAGE Usage, PULONG UsageValue, PHIDP_PREPARSED_DATA PreparsedData, PCHAR Report, ULONG ReportLength); NTSTATUS WINAPI HidP_GetValueCaps(HIDP_REPORT_TYPE ReportType, PHIDP_VALUE_CAPS ValueCaps, PUSHORT ValueCapsLength, PHIDP_PREPARSED_DATA PreparsedData);

1 0

Aric Stewart : hid: Implement HidP_GetValueCaps.
by Alexandre Julliard July 1, 2015

July 1, 2015

Module: wine Branch: master Commit: 0bb216ff35df078333656a43ffb1fe301444d605 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0bb216ff35df078333656a43f… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Jun 30 07:39:55 2015 -0500 hid: Implement HidP_GetValueCaps. --- dlls/hid/hid.spec | 2 +- dlls/hid/hidp.c | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++++ include/ddk/hidpi.h | 2 ++ 3 files changed, 61 insertions(+), 1 deletion(-) diff --git a/dlls/hid/hid.spec b/dlls/hid/hid.spec index 4bd9f4e..214fa9e 100644 --- a/dlls/hid/hid.spec +++ b/dlls/hid/hid.spec @@ -30,7 +30,7 @@ @ stub HidP_GetUsageValueArray @ stub HidP_GetUsages @ stub HidP_GetUsagesEx -@ stub HidP_GetValueCaps +@ stdcall HidP_GetValueCaps(long ptr ptr ptr) @ stub HidP_InitializeReportForID @ stub HidP_MaxDataListLength @ stub HidP_MaxUsageListLength diff --git a/dlls/hid/hidp.c b/dlls/hid/hidp.c index 47864fa..5823cfb 100644 --- a/dlls/hid/hidp.c +++ b/dlls/hid/hidp.c @@ -109,3 +109,61 @@ NTSTATUS WINAPI HidP_GetCaps(PHIDP_PREPARSED_DATA PreparsedData, return HIDP_STATUS_SUCCESS; } + + +NTSTATUS WINAPI HidP_GetValueCaps(HIDP_REPORT_TYPE ReportType, PHIDP_VALUE_CAPS ValueCaps, + PUSHORT ValueCapsLength, PHIDP_PREPARSED_DATA PreparsedData) +{ + PWINE_HIDP_PREPARSED_DATA data = (PWINE_HIDP_PREPARSED_DATA)PreparsedData; + WINE_HID_REPORT *report = NULL; + USHORT v_count = 0, r_count = 0; + int i,j,u; + + TRACE("(%i, %p, %p, %p)\n", ReportType, ValueCaps, ValueCapsLength, PreparsedData); + + if (data->magic != HID_MAGIC) + return HIDP_STATUS_INVALID_PREPARSED_DATA; + + switch(ReportType) + { + case HidP_Input: + v_count = data->caps.NumberInputValueCaps; + r_count = data->dwInputReportCount; + report = HID_INPUT_REPORTS(data); + break; + case HidP_Output: + v_count = data->caps.NumberOutputValueCaps; + r_count = data->dwOutputReportCount; + report = HID_OUTPUT_REPORTS(data); + break; + case HidP_Feature: + v_count = data->caps.NumberFeatureValueCaps; + r_count = data->dwFeatureReportCount; + report = HID_FEATURE_REPORTS(data); + break; + default: + return HIDP_STATUS_INVALID_REPORT_TYPE; + } + + if (!r_count || !v_count || !report) + { + *ValueCapsLength = 0; + return HIDP_STATUS_SUCCESS; + } + + v_count = min(v_count, *ValueCapsLength); + + u = 0; + for (j = 0; j < r_count && u < v_count; j++) + { + for (i = 0; i < report->elementCount && u < v_count; i++) + { + if (report->Elements[i].ElementType == ValueElement) + ValueCaps[u++] = report->Elements[i].caps.value; + } + report = HID_NEXT_REPORT(data, report); + } + + *ValueCapsLength = v_count; + return HIDP_STATUS_SUCCESS; +} diff --git a/include/ddk/hidpi.h b/include/ddk/hidpi.h index 729f2d9..c63d3e3 100644 --- a/include/ddk/hidpi.h +++ b/include/ddk/hidpi.h @@ -138,6 +138,8 @@ typedef struct _HIDP_CAPS NTSTATUS WINAPI HidP_GetButtonCaps(HIDP_REPORT_TYPE ReportType, PHIDP_BUTTON_CAPS ButtonCaps, PUSHORT ButtonCapsLength, PHIDP_PREPARSED_DATA PreparsedData); NTSTATUS WINAPI HidP_GetCaps(PHIDP_PREPARSED_DATA PreparsedData, PHIDP_CAPS Capabilities); +NTSTATUS WINAPI HidP_GetValueCaps(HIDP_REPORT_TYPE ReportType, PHIDP_VALUE_CAPS ValueCaps, PUSHORT ValueCapsLength, PHIDP_PREPARSED_DATA PreparsedData); + #ifndef FACILITY_HID_ERROR_CODE #define FACILITY_HID_ERROR_CODE 0x11

1 0

Sebastian Lackner : ntdll/tests: Add tests for TpAllocCleanupGroup and related functions.
by Alexandre Julliard July 1, 2015

July 1, 2015

Module: wine Branch: master Commit: 3606b47139d80fb480345a64cd49564ac43a3aae URL: http://source.winehq.org/git/wine.git/?a=commit;h=3606b47139d80fb480345a64c… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Jul 1 02:57:32 2015 +0200 ntdll/tests: Add tests for TpAllocCleanupGroup and related functions. --- dlls/ntdll/tests/threadpool.c | 48 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/dlls/ntdll/tests/threadpool.c b/dlls/ntdll/tests/threadpool.c index 6f164e9..4bab5d3 100644 --- a/dlls/ntdll/tests/threadpool.c +++ b/dlls/ntdll/tests/threadpool.c @@ -21,7 +21,10 @@ #include "ntdll_test.h" static HMODULE hntdll = 0; +static NTSTATUS (WINAPI *pTpAllocCleanupGroup)(TP_CLEANUP_GROUP **); static NTSTATUS (WINAPI *pTpAllocPool)(TP_POOL **,PVOID); +static VOID (WINAPI *pTpReleaseCleanupGroup)(TP_CLEANUP_GROUP *); +static VOID (WINAPI *pTpReleaseCleanupGroupMembers)(TP_CLEANUP_GROUP *,BOOL,PVOID); static VOID (WINAPI *pTpReleasePool)(TP_POOL *); static NTSTATUS (WINAPI *pTpSimpleTryPost)(PTP_SIMPLE_CALLBACK,PVOID,TP_CALLBACK_ENVIRON *); @@ -42,7 +45,10 @@ static BOOL init_threadpool(void) return FALSE; } + NTDLL_GET_PROC(TpAllocCleanupGroup); NTDLL_GET_PROC(TpAllocPool); + NTDLL_GET_PROC(TpReleaseCleanupGroup); + NTDLL_GET_PROC(TpReleaseCleanupGroupMembers); NTDLL_GET_PROC(TpReleasePool); NTDLL_GET_PROC(TpSimpleTryPost); @@ -65,13 +71,23 @@ static void CALLBACK simple_cb(TP_CALLBACK_INSTANCE *instance, void *userdata) ReleaseSemaphore(semaphore, 1, NULL); } +static void CALLBACK simple2_cb(TP_CALLBACK_INSTANCE *instance, void *userdata) +{ + trace("Running simple2 callback\n"); + Sleep(50); + InterlockedIncrement((LONG *)userdata); +} + static void test_tp_simple(void) { TP_CALLBACK_ENVIRON environment; + TP_CLEANUP_GROUP *group; HANDLE semaphore; NTSTATUS status; TP_POOL *pool; + LONG userdata; DWORD result; + int i; semaphore = CreateSemaphoreA(NULL, 0, 1, NULL); ok(semaphore != NULL, "CreateSemaphoreA failed %u\n", GetLastError()); @@ -114,7 +130,39 @@ static void test_tp_simple(void) ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); } + /* allocate a cleanup group for synchronization */ + group = NULL; + status = pTpAllocCleanupGroup(&group); + ok(!status, "TpAllocCleanupGroup failed with status %x\n", status); + ok(group != NULL, "expected pool != NULL\n"); + + /* use cleanup group to wait for a simple callback */ + userdata = 0; + memset(&environment, 0, sizeof(environment)); + environment.Version = 1; + environment.Pool = pool; + environment.CleanupGroup = group; + status = pTpSimpleTryPost(simple2_cb, &userdata, &environment); + ok(!status, "TpSimpleTryPost failed with status %x\n", status); + pTpReleaseCleanupGroupMembers(group, FALSE, NULL); + ok(userdata == 1, "expected userdata = 1, got %u\n", userdata); + + /* test cancellation of pending simple callbacks */ + userdata = 0; + memset(&environment, 0, sizeof(environment)); + environment.Version = 1; + environment.Pool = pool; + environment.CleanupGroup = group; + for (i = 0; i < 100; i++) + { + status = pTpSimpleTryPost(simple2_cb, &userdata, &environment); + ok(!status, "TpSimpleTryPost failed with status %x\n", status); + } + pTpReleaseCleanupGroupMembers(group, TRUE, NULL); + ok(userdata < 100, "expected userdata < 100, got %u\n", userdata); + /* cleanup */ + pTpReleaseCleanupGroup(group); pTpReleasePool(pool); CloseHandle(semaphore); }

1 0