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

Zhiyi Zhang : light.msstyles: Add Toolbar parts.
by Alexandre Julliard June 25, 2021

June 25, 2021

Module: wine Branch: master Commit: 28a08e90cbc28a6c169b7975b1b369f5ecedc6b9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=28a08e90cbc28a6c169b7975… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Jun 25 09:58:15 2021 +0800 light.msstyles: Add Toolbar parts. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/light.msstyles/Makefile.in | 8 +- dlls/light.msstyles/blue_toolbar_buttons.bmp | Bin 0 -> 4890 bytes dlls/light.msstyles/blue_toolbar_buttons.svg | 20 +++++ dlls/light.msstyles/blue_toolbar_buttons_split.bmp | Bin 0 -> 3306 bytes dlls/light.msstyles/blue_toolbar_buttons_split.svg | 18 +++++ .../blue_toolbar_buttons_split_dropdown.bmp | Bin 0 -> 2778 bytes .../blue_toolbar_buttons_split_dropdown.svg | 18 +++++ .../blue_toolbar_buttons_split_dropdown_glyph.bmp | Bin 0 -> 2298 bytes .../blue_toolbar_buttons_split_dropdown_glyph.svg | 28 +++++++ .../blue_toolbar_separator_horizontal.bmp | Bin 0 -> 298 bytes .../blue_toolbar_separator_horizontal.svg | 13 ++++ .../blue_toolbar_separator_vertical.bmp | Bin 0 -> 298 bytes .../blue_toolbar_separator_vertical.svg | 13 ++++ dlls/light.msstyles/light.rc | 86 +++++++++++++++++++++ 14 files changed, 203 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=28a08e90cbc28a6c169b…

1 0

Rémi Bernon : hid: Rewrite HidP_SetUsageValue using enum_value_caps.
by Alexandre Julliard June 25, 2021

June 25, 2021

Module: wine Branch: master Commit: cb5856695cb089bb6df08a2351dfb8571d9a5546 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cb5856695cb089bb6df08a23… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jun 25 10:06:50 2021 +0200 hid: Rewrite HidP_SetUsageValue using enum_value_caps. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hid/hidp.c | 68 ++++++-------------------------------- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 6 +--- 2 files changed, 12 insertions(+), 62 deletions(-) diff --git a/dlls/hid/hidp.c b/dlls/hid/hidp.c index 929426ef536..24b11d519e2 100644 --- a/dlls/hid/hidp.c +++ b/dlls/hid/hidp.c @@ -192,48 +192,6 @@ static NTSTATUS get_report_data(BYTE *report, INT reportLength, INT startBit, IN return HIDP_STATUS_SUCCESS; } -static NTSTATUS set_report_data(BYTE *report, INT reportLength, INT startBit, INT valueSize, ULONG value) -{ - if ((startBit + valueSize) / 8 > reportLength) - return HIDP_STATUS_INVALID_REPORT_LENGTH; - - if (valueSize == 1) - { - ULONG byte_index = startBit / 8; - ULONG bit_index = startBit - (byte_index * 8); - if (value) - report[byte_index] |= (1 << bit_index); - else - report[byte_index] &= ~(1 << bit_index); - } - else - { - ULONG byte_index = (startBit + valueSize - 1) / 8; - ULONG data = value; - ULONG remainingBits = valueSize; - while (remainingBits) - { - BYTE subvalue = data & 0xff; - - data >>= 8; - - if (remainingBits >= 8) - { - report[byte_index] = subvalue; - byte_index --; - remainingBits -= 8; - } - else if (remainingBits > 0) - { - BYTE mask = (0xff << (8-remainingBits)) & subvalue; - report[byte_index] |= mask; - remainingBits = 0; - } - } - } - return HIDP_STATUS_SUCCESS; -} - NTSTATUS WINAPI HidP_GetButtonCaps( HIDP_REPORT_TYPE report_type, HIDP_BUTTON_CAPS *caps, USHORT *caps_count, PHIDP_PREPARSED_DATA preparsed_data ) { @@ -533,25 +491,21 @@ static NTSTATUS set_usage_value( const struct hid_value_caps *caps, void *user ) return HIDP_STATUS_NULL; } -NTSTATUS WINAPI HidP_SetUsageValue(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USHORT LinkCollection, - USAGE Usage, ULONG UsageValue, PHIDP_PREPARSED_DATA PreparsedData, - CHAR *Report, ULONG ReportLength) +NTSTATUS WINAPI HidP_SetUsageValue( HIDP_REPORT_TYPE report_type, USAGE usage_page, USHORT collection, USAGE usage, + ULONG value, PHIDP_PREPARSED_DATA preparsed_data, char *report_buf, ULONG report_len ) { - WINE_HID_ELEMENT element; - NTSTATUS rc; + struct usage_value_params params = {.value_buf = &value, .value_len = sizeof(value), .report_buf = report_buf}; + WINE_HIDP_PREPARSED_DATA *preparsed = (WINE_HIDP_PREPARSED_DATA *)preparsed_data; + struct caps_filter filter = {.values = TRUE, .usage_page = usage_page, .collection = collection, .usage = usage}; + USHORT count = 1; - TRACE("(%i, %x, %i, %i, %i, %p, %p, %i)\n", ReportType, UsagePage, LinkCollection, Usage, UsageValue, - PreparsedData, Report, ReportLength); + TRACE( "report_type %d, usage_page %x, collection %d, usage %x, value %u, preparsed_data %p, report_buf %p, report_len %u.\n", + report_type, usage_page, collection, usage, value, preparsed_data, report_buf, report_len ); - rc = find_usage(ReportType, UsagePage, LinkCollection, Usage, PreparsedData, Report, 0, &element); - - if (rc == HIDP_STATUS_SUCCESS) - { - return set_report_data((BYTE*)Report, ReportLength, - element.valueStartBit, element.bitCount, UsageValue); - } + if (!report_len) return HIDP_STATUS_INVALID_REPORT_LENGTH; - return rc; + filter.report_id = report_buf[0]; + return enum_value_caps( preparsed, report_type, report_len, &filter, set_usage_value, &params, &count ); } NTSTATUS WINAPI HidP_SetUsageValueArray( HIDP_REPORT_TYPE report_type, USAGE usage_page, USHORT collection, diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index ee0134ec39d..c0421c23fbc 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -2093,7 +2093,6 @@ static void test_hidp(HANDLE file, int report_id) status = HidP_GetUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_Z, &value, preparsed_data, report, caps.InputReportByteLength); ok(status == HIDP_STATUS_SUCCESS, "HidP_GetUsageValue returned %#x\n", status); - todo_wine ok(value == 0x7fffffff, "got value %x, expected %#x\n", value, 0x7fffffff); value = 0x3fffffff; @@ -2292,13 +2291,12 @@ static void test_hidp(HANDLE file, int report_id) status = HidP_SetUsageValue(HidP_Feature, HID_USAGE_PAGE_ORDINAL, waveform_list, 3, HID_USAGE_HAPTICS_WAVEFORM_RUMBLE, preparsed_data, report, caps.FeatureReportByteLength + 1); - todo_wine ok(status == HIDP_STATUS_INVALID_REPORT_LENGTH, "HidP_SetUsageValue returned %#x\n", status); report[0] = 1 - report_id; status = HidP_SetUsageValue(HidP_Feature, HID_USAGE_PAGE_ORDINAL, waveform_list, 3, HID_USAGE_HAPTICS_WAVEFORM_RUMBLE, preparsed_data, report, caps.FeatureReportByteLength); - todo_wine + todo_wine_if(!report_id) ok(status == (report_id ? HIDP_STATUS_SUCCESS : HIDP_STATUS_INCOMPATIBLE_REPORT_ID), "HidP_SetUsageValue returned %#x\n", status); report[0] = 2; @@ -2310,7 +2308,6 @@ static void test_hidp(HANDLE file, int report_id) report[0] = report_id; status = HidP_SetUsageValue(HidP_Feature, HID_USAGE_PAGE_ORDINAL, 0xdead, 3, HID_USAGE_HAPTICS_WAVEFORM_RUMBLE, preparsed_data, report, caps.FeatureReportByteLength); - todo_wine ok(status == HIDP_STATUS_USAGE_NOT_FOUND, "HidP_SetUsageValue returned %#x\n", status); status = HidP_SetUsageValue(HidP_Feature, HID_USAGE_PAGE_ORDINAL, waveform_list, 3, @@ -2323,7 +2320,6 @@ static void test_hidp(HANDLE file, int report_id) buffer[0] = report_id; value = HID_USAGE_HAPTICS_WAVEFORM_RUMBLE; memcpy(buffer + 1, &value, 2); - todo_wine ok(!memcmp(buffer, report, sizeof(buffer)), "unexpected report data\n"); status = HidP_GetUsageValue(HidP_Feature, HID_USAGE_PAGE_ORDINAL, waveform_list, 3, &value,

1 0

Rémi Bernon : hid: Rewrite HidP_GetUsageValueArray using enum_value_caps.
by Alexandre Julliard June 25, 2021

June 25, 2021

Module: wine Branch: master Commit: 0a192647fe6841e61d834f3593e100fd292ce8ba URL: https://source.winehq.org/git/wine.git/?a=commit;h=0a192647fe6841e61d834f35… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jun 25 10:06:49 2021 +0200 hid: Rewrite HidP_GetUsageValueArray using enum_value_caps. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hid/hidp.c | 81 +++++++++++--------------------------- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 1 - 2 files changed, 22 insertions(+), 60 deletions(-) diff --git a/dlls/hid/hidp.c b/dlls/hid/hidp.c index 827de20c634..929426ef536 100644 --- a/dlls/hid/hidp.c +++ b/dlls/hid/hidp.c @@ -234,46 +234,6 @@ static NTSTATUS set_report_data(BYTE *report, INT reportLength, INT startBit, IN return HIDP_STATUS_SUCCESS; } -static NTSTATUS get_report_data_array(BYTE *report, UINT reportLength, UINT startBit, UINT elemSize, - UINT numElements, PCHAR values, UINT valuesSize) -{ - BYTE byte, *end, *p = report + startBit / 8; - ULONG size = elemSize * numElements; - ULONG m, bit_index = startBit % 8; - BYTE *data = (BYTE*)values; - - if ((startBit + size) / 8 > reportLength) - return HIDP_STATUS_INVALID_REPORT_LENGTH; - - if (valuesSize < (size + 7) / 8) - return HIDP_STATUS_BUFFER_TOO_SMALL; - - end = report + (startBit + size + 7) / 8; - - data--; - byte = *p++; - while (p != end) - { - *(++data) = byte >> bit_index; - byte = *p++; - *data |= byte << (8 - bit_index); - } - - /* Handle the end and mask out bits beyond */ - m = (startBit + size) % 8; - m = m ? m : 8; - - if (m > bit_index) - *(++data) = (byte >> bit_index) & ((1 << (m - bit_index)) - 1); - else - *data &= (1 << (m + 8 - bit_index)) - 1; - - if (++data < (BYTE*)values + valuesSize) - memset(data, 0, (BYTE*)values + valuesSize - data); - - return HIDP_STATUS_SUCCESS; -} - NTSTATUS WINAPI HidP_GetButtonCaps( HIDP_REPORT_TYPE report_type, HIDP_BUTTON_CAPS *caps, USHORT *caps_count, PHIDP_PREPARSED_DATA preparsed_data ) { @@ -419,6 +379,15 @@ NTSTATUS WINAPI HidP_GetScaledUsageValue(HIDP_REPORT_TYPE ReportType, USAGE Usag return rc; } +static NTSTATUS get_usage_value( const struct hid_value_caps *caps, void *user ) +{ + struct usage_value_params *params = user; + ULONG bit_count = caps->bit_size * caps->report_count; + if ((bit_count + 7) / 8 > params->value_len) return HIDP_STATUS_BUFFER_TOO_SMALL; + memset( params->value_buf, 0, params->value_len ); + copy_bits( params->value_buf, params->report_buf, bit_count, -caps->start_bit ); + return HIDP_STATUS_NULL; +} NTSTATUS WINAPI HidP_GetUsageValue(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USHORT LinkCollection, USAGE Usage, PULONG UsageValue, PHIDP_PREPARSED_DATA PreparsedData, @@ -441,29 +410,23 @@ NTSTATUS WINAPI HidP_GetUsageValue(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, return rc; } - -NTSTATUS WINAPI HidP_GetUsageValueArray(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USHORT LinkCollection, - USAGE Usage, PCHAR UsageValue, USHORT UsageValueByteLength, - PHIDP_PREPARSED_DATA PreparsedData, PCHAR Report, ULONG ReportLength) +NTSTATUS WINAPI HidP_GetUsageValueArray( HIDP_REPORT_TYPE report_type, USAGE usage_page, USHORT collection, + USAGE usage, char *value_buf, USHORT value_len, + PHIDP_PREPARSED_DATA preparsed_data, char *report_buf, ULONG report_len ) { - WINE_HID_ELEMENT element; - NTSTATUS rc; - - TRACE("(%i, %x, %i, %i, %p, %u, %p, %p, %i)\n", ReportType, UsagePage, LinkCollection, Usage, UsageValue, - UsageValueByteLength, PreparsedData, Report, ReportLength); - - rc = find_usage(ReportType, UsagePage, LinkCollection, Usage, PreparsedData, Report, 0, &element); + struct usage_value_params params = {.value_buf = value_buf, .value_len = value_len, .report_buf = report_buf}; + WINE_HIDP_PREPARSED_DATA *preparsed = (WINE_HIDP_PREPARSED_DATA *)preparsed_data; + struct caps_filter filter = {.values = TRUE, .array = TRUE, .usage_page = usage_page, .collection = collection, .usage = usage}; + USHORT count = 1; - if (rc == HIDP_STATUS_SUCCESS) - { - if (element.caps.IsRange || element.caps.ReportCount <= 1 || !element.bitCount) - return HIDP_STATUS_NOT_VALUE_ARRAY; + TRACE( "report_type %d, usage_page %x, collection %d, usage %x, value_buf %p, value_len %u, " + "preparsed_data %p, report_buf %p, report_len %u.\n", + report_type, usage_page, collection, usage, value_buf, value_len, preparsed_data, report_buf, report_len ); - return get_report_data_array((BYTE*)Report, ReportLength, element.valueStartBit, element.bitCount, - element.caps.ReportCount, UsageValue, UsageValueByteLength); - } + if (!report_len) return HIDP_STATUS_INVALID_REPORT_LENGTH; - return rc; + filter.report_id = report_buf[0]; + return enum_value_caps( preparsed, report_type, report_len, &filter, get_usage_value, &params, &count ); } diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index 3185b0f7893..ee0134ec39d 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -2378,7 +2378,6 @@ static void test_hidp(HANDLE file, int report_id) 64, preparsed_data, report, caps.FeatureReportByteLength); ok(status == HIDP_STATUS_SUCCESS, "HidP_GetUsageValueArray returned %#x\n", status); memset(buffer + 16, 0xff, 8); - todo_wine ok(!memcmp(buffer, buffer + 16, 16), "unexpected report value\n"); HidD_FreePreparsedData(preparsed_data);

1 0

Zebediah Figura : ws2_32: Implement setsockopt(SO_DONTLINGER) on top of Win32 setsockopt(SO_LINGER).
by Alexandre Julliard June 25, 2021

June 25, 2021

Module: wine Branch: master Commit: 2ba41754593bcc5dc5bec4a163f39ef15d703cc0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2ba41754593bcc5dc5bec4a1… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jun 24 22:32:48 2021 -0500 ws2_32: Implement setsockopt(SO_DONTLINGER) on top of Win32 setsockopt(SO_LINGER). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 112376e583c..776268b381a 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3506,7 +3506,6 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, { int fd; int woptval; - struct linger linger; struct timeval tval; struct ip_mreq_source mreq_source; @@ -3529,6 +3528,21 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, case WS_SO_BROADCAST: return server_setsockopt( s, IOCTL_AFD_WINE_SET_SO_BROADCAST, optval, optlen ); + case WS_SO_DONTLINGER: + { + struct WS_linger linger; + + if (!optval) + { + SetLastError( WSAEFAULT ); + return -1; + } + + linger.l_onoff = !*(const BOOL *)optval; + linger.l_linger = 0; + return WS_setsockopt( s, WS_SOL_SOCKET, WS_SO_LINGER, (char *)&linger, sizeof(linger) ); + } + case WS_SO_ERROR: FIXME( "SO_ERROR, stub!\n" ); SetLastError( WSAENOPROTOOPT ); @@ -3545,20 +3559,6 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, * to the general case. Special options that are not passed to * setsockopt follow below that.*/ - case WS_SO_DONTLINGER: - if (!optval) - { - SetLastError(WSAEFAULT); - return SOCKET_ERROR; - } - linger.l_onoff = *(const int*)optval == 0; - linger.l_linger = 0; - level = SOL_SOCKET; - optname = SO_LINGER; - optval = (char*)&linger; - optlen = sizeof(struct linger); - break; - case WS_SO_SNDBUF: if (!*(const int *)optval) {

1 0

Francois Gouget : winehq: News: Fix some spelling issues.
by Alexandre Julliard June 25, 2021

June 25, 2021

Module: website Branch: master Commit: e67ca36ab66a3e4f86fd434647353905a42a95b3 URL: https://source.winehq.org/git/website.git/?a=commit;h=e67ca36ab66a3e4f86fd4… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Jun 25 03:26:25 2021 +0200 winehq: News: Fix some spelling issues. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2004012201.xml | 2 +- news/en/2017052601.xml | 2 +- news/en/2018070901.xml | 2 +- news/ko/2017052601.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/news/en/2004012201.xml b/news/en/2004012201.xml index 5a012d18..f9f70956 100644 --- a/news/en/2004012201.xml +++ b/news/en/2004012201.xml @@ -5,6 +5,6 @@ TransGaming released <a href="http://downloads.transgaming.com/files/point2play-1.2_releasenotes.txt">Point2Play 1.2</a> yesterday. The new version brings support for multiuser - WineX installations and translations to German and Portugese. + WineX installations and translations to German and Portuguese. </body> </news> diff --git a/news/en/2017052601.xml b/news/en/2017052601.xml index 9374dca3..0dfeca53 100644 --- a/news/en/2017052601.xml +++ b/news/en/2017052601.xml @@ -5,7 +5,7 @@ The Wine development release 2.9 is now available. <a href="{$root}/announce/2.9">What's new</a> in this release: <ul> - <li>Support for tesselation shaders in Direct3D.</li> + <li>Support for tessellation shaders in Direct3D.</li> <li>Binary mode support in WebServices.</li> <li>Clipboard changes detected through Xfixes.</li> <li>User interface improvements in RegEdit.</li> diff --git a/news/en/2018070901.xml b/news/en/2018070901.xml index 28582b31..6e082d16 100644 --- a/news/en/2018070901.xml +++ b/news/en/2018070901.xml @@ -7,7 +7,7 @@ <ul> <li>Unicode data updated to Unicode 11.0.0.</li> <li>Proxy configuration dialog in the Internet control panel.</li> - <li>Syntax fixes in the Cmd.exe command intepreter.</li> + <li>Syntax fixes in the Cmd.exe command interpreter.</li> <li>Some more glyphs in the Wingdings font.</li> <li>Various bug fixes.</li> </ul> diff --git a/news/ko/2017052601.xml b/news/ko/2017052601.xml index 57aa2ccb..2fcdb89b 100644 --- a/news/ko/2017052601.xml +++ b/news/ko/2017052601.xml @@ -5,7 +5,7 @@ 와인 개발자판 2.9(을)를 내려받을 수 있습니다. <a href="{$root}/announce/2.9">이 판</a>의 변경 및 개선점: <ul> - <li>Support for tesselation shaders in Direct3D.</li> + <li>Support for tessellation shaders in Direct3D.</li> <li>Binary mode support in WebServices.</li> <li>Clipboard changes detected through Xfixes.</li> <li>User interface improvements in RegEdit.</li>

1 0

Francois Gouget : winehq: Fix the WineConf case.
by Alexandre Julliard June 25, 2021

June 25, 2021

Module: website Branch: master Commit: 8fa5d74c470a7f0e4e395f4a191e7c80d8533cff URL: https://source.winehq.org/git/website.git/?a=commit;h=8fa5d74c470a7f0e4e395… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Jun 25 03:26:20 2021 +0200 winehq: Fix the WineConf case. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/de/2009060301.xml | 2 +- news/en/2008071301.xml | 2 +- news/en/2009060301.xml | 2 +- news/en/2009092101.xml | 2 +- wwn/en/interviews/interview_11.xml | 2 +- wwn/en/interviews/interview_2.xml | 4 ++-- wwn/en/interviews/interview_6.xml | 4 ++-- wwn/en/wn20020308_117.xml | 4 ++-- wwn/en/wn20020325_118.xml | 10 +++++----- wwn/en/wn20020331_119.xml | 8 ++++---- wwn/en/wn20030207_156.xml | 12 ++++++------ wwn/en/wn20030815_183.xml | 4 ++-- wwn/en/wn20031003_190.xml | 8 ++++---- wwn/en/wn20031108_195.xml | 4 ++-- wwn/en/wn20031205_199.xml | 10 +++++----- wwn/en/wn20040109_204.xml | 4 ++-- wwn/en/wn20040116_205.xml | 4 ++-- wwn/en/wn20040130_207.xml | 2 +- wwn/en/wn20040203_208.xml | 2 +- wwn/en/wn20040206_209.xml | 10 +++++----- wwn/en/wn20040625_228.xml | 6 +++--- wwn/en/wn20040910_239.xml | 2 +- wwn/en/wn20041015_244.xml | 16 ++++++++-------- wwn/en/wn20041022_245.xml | 2 +- wwn/en/wn20041210_252.xml | 2 +- wwn/en/wn20041224_254.xml | 2 +- wwn/en/wn20050128_259.xml | 4 ++-- wwn/en/wn20050506_273.xml | 8 ++++---- wwn/en/wn20060305_307.xml | 10 +++++----- wwn/en/wn20060402_310.xml | 4 ++-- wwn/en/wn20060428_312.xml | 6 +++--- wwn/en/wn20060810_319.xml | 2 +- wwn/en/wn20070226_323.xml | 2 +- wwn/en/wn20070430_330.xml | 2 +- wwn/en/wn20080106_338.xml | 6 +++--- wwn/en/wn20080224_341.xml | 2 +- wwn/en/wn20080714_349.xml | 14 +++++++------- wwn/en/wn20090527_357.xml | 2 +- wwn/en/wn20090603_358.xml | 2 +- wwn/en/wn20090921_360.xml | 10 +++++----- 40 files changed, 102 insertions(+), 102 deletions(-) Diff: https://source.winehq.org/git/website.git/?a=commitdiff;h=8fa5d74c470a7f0e4…

1 0

Zebediah Figura : ntdll/tests: Fix a failure in test_thread_context() under Wine.
by Alexandre Julliard June 24, 2021

June 24, 2021

Module: wine Branch: master Commit: 9eade0d245d9e4273233d5c66bc17ff33b9e1d04 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9eade0d245d9e4273233d5c6… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jun 24 11:14:35 2021 -0500 ntdll/tests: Fix a failure in test_thread_context() under Wine. Follow-up to 94ee27097228ac37f1576565c9f93f6186ff66a3. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/exception.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 1a63a717d21..24f905e86dd 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -4002,7 +4002,6 @@ static void test_thread_context(void) XMM_SAVE_AREA32 FltSave; WORD SegCs, SegDs, SegEs, SegFs, SegGs, SegSs; } expect; - XMM_SAVE_AREA32 broken_fltsave; NTSTATUS (*func_ptr)( void *arg1, void *arg2, struct expected *res, void *func ) = code_mem; static const BYTE call_func[] = @@ -4164,12 +4163,12 @@ static void test_thread_context(void) COMPARE( SegGs ); COMPARE( SegSs ); - broken_fltsave = context.FltSave; - memset( &broken_fltsave.ErrorOpcode, 0xcc, 0x12 ); + /* AMD CPUs don't save the opcode or data pointer if no exception is + * pending; see the AMD64 Architecture Programmer's Manual Volume 5 s.v. + * FXSAVE */ + memcpy( &expect.FltSave, &context.FltSave, 0x12 ); - ok( !memcmp( &context.FltSave, &expect.FltSave, offsetof( XMM_SAVE_AREA32, XmmRegisters )) || - broken( !memcmp( &broken_fltsave, &expect.FltSave, offsetof( XMM_SAVE_AREA32, XmmRegisters )) ) /* w2008, w8 */, - "wrong FltSave\n" ); + ok( !memcmp( &context.FltSave, &expect.FltSave, offsetof( XMM_SAVE_AREA32, ErrorOffset )), "wrong FltSave\n" ); for (i = 6; i < 16; i++) ok( !memcmp( &context.Xmm0 + i, &expect.FltSave.XmmRegisters[i], sizeof(context.Xmm0) ), "wrong xmm%u\n", i );

1 0

Zebediah Figura : ntdll/tests: Mark a test as conditionally succeeding under Wine.
by Alexandre Julliard June 24, 2021

June 24, 2021

Module: wine Branch: master Commit: 10cc82827e069b9fd6658e31ef88ea9a94692585 URL: https://source.winehq.org/git/wine.git/?a=commit;h=10cc82827e069b9fd6658e31… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jun 24 11:14:36 2021 -0500 ntdll/tests: Mark a test as conditionally succeeding under Wine. The stack handler doesn't return ExceptionContinueExecution if test_stage == 2. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/exception.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 24f905e86dd..7fa966b0c4e 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -3719,7 +3719,7 @@ static void run_rtlraiseexception_test(DWORD exceptioncode) todo_wine ok( !rtlraiseexception_handler_called, "Frame handler called\n" ); - todo_wine + todo_wine_if (test_stage != 2) ok( rtlraiseexception_unhandled_handler_called, "UnhandledExceptionFilter wasn't called\n" ); if (have_vectored_api)

1 0

Rémi Bernon : hid: Rewrite HidP_GetUsages using enum_value_caps.
by Alexandre Julliard June 24, 2021

June 24, 2021

Module: wine Branch: master Commit: 1184afb6404b8d817c0bb5974ffc4094d4fa102c URL: https://source.winehq.org/git/wine.git/?a=commit;h=1184afb6404b8d817c0bb597… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Jun 24 10:05:58 2021 +0200 hid: Rewrite HidP_GetUsages using enum_value_caps. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hid/hidp.c | 98 +++++++++++++------------------------- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 3 -- 2 files changed, 33 insertions(+), 68 deletions(-) diff --git a/dlls/hid/hidp.c b/dlls/hid/hidp.c index 6197e30c4da..4889a1e4014 100644 --- a/dlls/hid/hidp.c +++ b/dlls/hid/hidp.c @@ -420,82 +420,50 @@ NTSTATUS WINAPI HidP_GetUsageValueArray(HIDP_REPORT_TYPE ReportType, USAGE Usage } -NTSTATUS WINAPI HidP_GetUsages(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USHORT LinkCollection, - PUSAGE UsageList, PULONG UsageLength, PHIDP_PREPARSED_DATA PreparsedData, - PCHAR Report, ULONG ReportLength) +struct get_usage_params { - PWINE_HIDP_PREPARSED_DATA data = (PWINE_HIDP_PREPARSED_DATA)PreparsedData; - WINE_HID_ELEMENT *elems = HID_ELEMS(data); - WINE_HID_REPORT *report = NULL; - BOOL found = FALSE; - USHORT b_count = 0, r_count = 0; - int i,uCount; + USAGE *usages; + USAGE *usages_end; + char *report_buf; +}; - TRACE("(%i, %x, %i, %p, %p, %p, %p, %i)\n", ReportType, UsagePage, LinkCollection, UsageList, - UsageLength, PreparsedData, Report, ReportLength); +static NTSTATUS get_usage( const struct hid_value_caps *caps, void *user ) +{ + struct get_usage_params *params = user; + ULONG bit, last; - if (data->magic != HID_MAGIC) + for (bit = caps->start_bit, last = bit + caps->usage_max - caps->usage_min; bit <= last; ++bit) { - *UsageLength = 0; - return HIDP_STATUS_INVALID_PREPARSED_DATA; + if (!(params->report_buf[bit / 8] & (1 << (bit % 8)))) continue; + if (params->usages < params->usages_end) *params->usages = caps->usage_min + bit - caps->start_bit; + params->usages++; } - switch(ReportType) - { - case HidP_Input: - b_count = data->caps.NumberInputButtonCaps; - break; - case HidP_Output: - b_count = data->caps.NumberOutputButtonCaps; - break; - case HidP_Feature: - b_count = data->caps.NumberFeatureButtonCaps; - break; - default: - return HIDP_STATUS_INVALID_REPORT_TYPE; - } - r_count = data->reportCount[ReportType]; - report = &data->reports[data->reportIdx[ReportType][(BYTE)Report[0]]]; - - if (!r_count || !b_count) - return HIDP_STATUS_USAGE_NOT_FOUND; + return HIDP_STATUS_SUCCESS; +} - if (report->reportID && report->reportID != Report[0]) - return HIDP_STATUS_REPORT_DOES_NOT_EXIST; +NTSTATUS WINAPI HidP_GetUsages( HIDP_REPORT_TYPE report_type, USAGE usage_page, USHORT collection, USAGE *usages, + ULONG *usages_len, PHIDP_PREPARSED_DATA preparsed_data, char *report_buf, ULONG report_len ) +{ + WINE_HIDP_PREPARSED_DATA *preparsed = (WINE_HIDP_PREPARSED_DATA *)preparsed_data; + struct get_usage_params params = {.usages = usages, .usages_end = usages + *usages_len, .report_buf = report_buf}; + struct caps_filter filter = {.buttons = TRUE, .usage_page = usage_page, .collection = collection}; + NTSTATUS status; + USHORT limit = -1; - uCount = 0; - for (i = 0; i < report->elementCount && uCount < *UsageLength; i++) - { - if (elems[report->elementIdx + i].caps.BitSize == 1 && - elems[report->elementIdx + i].caps.UsagePage == UsagePage) - { - int k; - WINE_HID_ELEMENT *element = &elems[report->elementIdx + i]; - for (k=0; k < element->bitCount; k++) - { - UINT v = 0; - NTSTATUS rc = get_report_data((BYTE*)Report, ReportLength, - element->valueStartBit + k, 1, &v); - if (rc != HIDP_STATUS_SUCCESS) - return rc; - found = TRUE; - if (v) - { - if (uCount == *UsageLength) - return HIDP_STATUS_BUFFER_TOO_SMALL; - UsageList[uCount] = element->caps.Range.UsageMin + k; - uCount++; - } - } - } - } + TRACE( "report_type %d, collection %d, usages %p, usages_len %p, preparsed_data %p, report_buf %p, report_len %u.\n", + report_type, collection, usages, usages_len, preparsed_data, report_buf, report_len ); - *UsageLength = uCount; + if (!report_len) return HIDP_STATUS_INVALID_REPORT_LENGTH; - if (!found) - return HIDP_STATUS_USAGE_NOT_FOUND; + filter.report_id = report_buf[0]; + status = enum_value_caps( preparsed, report_type, report_len, &filter, get_usage, &params, &limit ); + *usages_len = params.usages - usages; + if (status != HIDP_STATUS_SUCCESS) return status; - return HIDP_STATUS_SUCCESS; + if (*usages_len == 0) return HIDP_STATUS_USAGE_NOT_FOUND; + if (params.usages > params.usages_end) return HIDP_STATUS_BUFFER_TOO_SMALL; + return status; } NTSTATUS WINAPI HidP_GetValueCaps( HIDP_REPORT_TYPE report_type, HIDP_VALUE_CAPS *caps, USHORT *caps_count, diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index 8777880fd9d..b455fe650f1 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -2190,7 +2190,6 @@ static void test_hidp(HANDLE file, int report_id) status = HidP_GetUsages(HidP_Input, HID_USAGE_PAGE_BUTTON, 0, usages, &value, preparsed_data, report, caps.InputReportByteLength); ok(status == HIDP_STATUS_BUFFER_TOO_SMALL, "HidP_GetUsages returned %#x\n", status); - todo_wine ok(value == 2, "got usage count %d, expected %d\n", value, 2); value = ARRAY_SIZE(usages); memset(usages, 0xcd, sizeof(usages)); @@ -2207,9 +2206,7 @@ static void test_hidp(HANDLE file, int report_id) report, caps.InputReportByteLength); ok(status == HIDP_STATUS_SUCCESS, "HidP_GetUsages returned %#x\n", status); ok(value == 2, "got usage count %d, expected %d\n", value, 2); - todo_wine ok(usages[0] == 6, "got usages[0] %x, expected %x\n", usages[0], 6); - todo_wine ok(usages[1] == 4, "got usages[1] %x, expected %x\n", usages[1], 4); value = ARRAY_SIZE(usage_and_pages);

1 0

Zhiyi Zhang : light.msstyles: Add List Box parts.
by Alexandre Julliard June 24, 2021

June 24, 2021

Module: wine Branch: master Commit: e4dd77a80a253aef4a3b648cea5e4db4bc8ce7ee URL: https://source.winehq.org/git/wine.git/?a=commit;h=e4dd77a80a253aef4a3b648c… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Jun 24 22:43:30 2021 +0800 light.msstyles: Add List Box parts. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/light.msstyles/light.rc | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/light.msstyles/light.rc b/dlls/light.msstyles/light.rc index bebee8788c4..cb51b8a5246 100644 --- a/dlls/light.msstyles/light.rc +++ b/dlls/light.msstyles/light.rc @@ -333,6 +333,13 @@ BLUE_INI TEXTFILE "[Edit.Edittext(ReadOnly)]\r\n" "FillColor = 245 245 245\r\n" "TextColor = 0 0 0\r\n" + +"\r\n; ListBox\r\n" +"[ListBox]\r\n" +"BgType = BorderFill\r\n" +"BorderSize = 1\r\n" +"FillColor = 255 255 255\r\n" +"BorderColor = 174 174 174\r\n" } /* Button */

1 0