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

Rémi Bernon : hid: Rewrite HidP_SetUsageValue using enum_value_caps.
by Alexandre Julliard 25 Jun '21

25 Jun '21

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_GetUsageValue using enum_value_caps.
by Alexandre Julliard 25 Jun '21

25 Jun '21

Module: wine Branch: master Commit: 7650f87737bad9cc2a4a52bb41a104b7ee48f996 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7650f87737bad9cc2a4a52bb… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jun 25 10:06:51 2021 +0200 hid: Rewrite HidP_GetUsageValue 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 | 26 +++++++++++--------------- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 5 +---- 2 files changed, 12 insertions(+), 19 deletions(-) diff --git a/dlls/hid/hidp.c b/dlls/hid/hidp.c index 24b11d519e2..948f0c7c4dc 100644 --- a/dlls/hid/hidp.c +++ b/dlls/hid/hidp.c @@ -347,25 +347,21 @@ static NTSTATUS get_usage_value( const struct hid_value_caps *caps, void *user ) return HIDP_STATUS_NULL; } -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_GetUsageValue( 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; - - TRACE("(%i, %x, %i, %i, %p, %p, %p, %i)\n", ReportType, UsagePage, LinkCollection, Usage, UsageValue, - PreparsedData, Report, ReportLength); + 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; - rc = find_usage(ReportType, UsagePage, LinkCollection, Usage, PreparsedData, Report, 0, &element); + TRACE( "report_type %d, usage_page %x, collection %d, usage %x, value %p, preparsed_data %p, report_buf %p, report_len %u.\n", + report_type, usage_page, collection, usage, value, preparsed_data, report_buf, report_len ); - if (rc == HIDP_STATUS_SUCCESS) - { - return get_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, get_usage_value, &params, &count ); } NTSTATUS WINAPI HidP_GetUsageValueArray( 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 c0421c23fbc..b29660d4773 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -2330,12 +2330,11 @@ static void test_hidp(HANDLE file, int report_id) ok(status == HIDP_STATUS_INVALID_REPORT_TYPE, "HidP_GetUsageValue returned %#x\n", status); status = HidP_GetUsageValue(HidP_Feature, HID_USAGE_PAGE_ORDINAL, waveform_list, 3, &value, preparsed_data, report, caps.FeatureReportByteLength + 1); - todo_wine ok(status == HIDP_STATUS_INVALID_REPORT_LENGTH, "HidP_GetUsageValue returned %#x\n", status); report[0] = 1 - report_id; status = HidP_GetUsageValue(HidP_Feature, HID_USAGE_PAGE_ORDINAL, waveform_list, 3, &value, 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_GetUsageValue returned %#x\n", status); report[0] = 2; @@ -2346,14 +2345,12 @@ static void test_hidp(HANDLE file, int report_id) report[0] = report_id; status = HidP_GetUsageValue(HidP_Feature, HID_USAGE_PAGE_ORDINAL, 0xdead, 3, &value, preparsed_data, report, caps.FeatureReportByteLength); - todo_wine ok(status == HIDP_STATUS_USAGE_NOT_FOUND, "HidP_GetUsageValue returned %#x\n", status); value = 0xdeadbeef; status = HidP_GetUsageValue(HidP_Feature, HID_USAGE_PAGE_ORDINAL, waveform_list, 3, &value, preparsed_data, report, caps.FeatureReportByteLength); ok(status == HIDP_STATUS_SUCCESS, "HidP_GetUsageValue returned %#x\n", status); - todo_wine ok(value == HID_USAGE_HAPTICS_WAVEFORM_RUMBLE, "got value %x, expected %#x\n", value, HID_USAGE_HAPTICS_WAVEFORM_RUMBLE);

1 0

Rémi Bernon : hid: Rewrite HidP_GetScaledUsageValue using enum_value_caps.
by Alexandre Julliard 25 Jun '21

25 Jun '21

Module: wine Branch: master Commit: 38d863f1f70a35850e983f4ecb4ae3feae84fff1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=38d863f1f70a35850e983f4e… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jun 25 10:06:52 2021 +0200 hid: Rewrite HidP_GetScaledUsageValue 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 | 137 ++++++++++--------------------------- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 4 -- 2 files changed, 36 insertions(+), 105 deletions(-) diff --git a/dlls/hid/hidp.c b/dlls/hid/hidp.c index 948f0c7c4dc..59f18276b38 100644 --- a/dlls/hid/hidp.c +++ b/dlls/hid/hidp.c @@ -217,70 +217,6 @@ NTSTATUS WINAPI HidP_GetCaps( PHIDP_PREPARSED_DATA preparsed_data, HIDP_CAPS *ca return HIDP_STATUS_SUCCESS; } -static NTSTATUS find_usage(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USHORT LinkCollection, - USAGE Usage, PHIDP_PREPARSED_DATA PreparsedData, PCHAR Report, - USHORT bit_size, WINE_HID_ELEMENT *element) -{ - PWINE_HIDP_PREPARSED_DATA data = (PWINE_HIDP_PREPARSED_DATA)PreparsedData; - WINE_HID_ELEMENT *elems = HID_ELEMS(data); - WINE_HID_REPORT *report = NULL; - USHORT v_count = 0, r_count = 0; - int i; - - 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: - v_count = data->caps.NumberInputValueCaps; - break; - case HidP_Output: - v_count = data->caps.NumberOutputValueCaps; - break; - case HidP_Feature: - v_count = data->caps.NumberFeatureValueCaps; - 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 || !v_count) - return HIDP_STATUS_USAGE_NOT_FOUND; - - if (report->reportID && report->reportID != Report[0]) - return HIDP_STATUS_REPORT_DOES_NOT_EXIST; - - for (i = 0; i < report->elementCount; i++) - { - HIDP_VALUE_CAPS *value = &elems[report->elementIdx + i].caps; - - if ((elems[report->elementIdx + i].caps.BitSize == 1) != (bit_size == 1) || - value->UsagePage != UsagePage) - continue; - - if (value->IsRange && value->Range.UsageMin <= Usage && Usage <= value->Range.UsageMax) - { - *element = elems[report->elementIdx + i]; - element->valueStartBit += value->BitSize * (Usage - value->Range.UsageMin); - element->bitCount = elems[report->elementIdx + i].caps.BitSize; - return HIDP_STATUS_SUCCESS; - } - else if (value->NotRange.Usage == Usage) - { - *element = elems[report->elementIdx + i]; - element->bitCount = elems[report->elementIdx + i].caps.BitSize; - return HIDP_STATUS_SUCCESS; - } - } - - return HIDP_STATUS_USAGE_NOT_FOUND; -} - struct usage_value_params { void *value_buf; @@ -288,53 +224,52 @@ struct usage_value_params void *report_buf; }; -static LONG sign_extend(ULONG value, const WINE_HID_ELEMENT *element) +static LONG sign_extend( ULONG value, const struct hid_value_caps *caps ) { - UINT bit_count = element->bitCount; - - if ((value & (1 << (bit_count - 1))) - && element->caps.BitSize != 1 - && element->caps.LogicalMin < 0) - { - value -= (1 << bit_count); - } - return value; + UINT sign = 1 << (caps->bit_size - 1); + if (sign <= 1 || caps->logical_min >= 0) return value; + return value - ((value & sign) << 1); } -static LONG logical_to_physical(LONG value, const WINE_HID_ELEMENT *element) +static NTSTATUS get_scaled_usage_value( const struct hid_value_caps *caps, void *user ) { - if (element->caps.PhysicalMin || element->caps.PhysicalMax) - { - value = (((ULONGLONG)(value - element->caps.LogicalMin) - * (element->caps.PhysicalMax - element->caps.PhysicalMin)) - / (element->caps.LogicalMax - element->caps.LogicalMin)) - + element->caps.PhysicalMin; - } - return value; + struct usage_value_params *params = user; + ULONG unsigned_value = 0, bit_count = caps->bit_size * caps->report_count; + LONG signed_value, *value = params->value_buf; + + if ((bit_count + 7) / 8 > sizeof(unsigned_value)) return HIDP_STATUS_BUFFER_TOO_SMALL; + if (sizeof(LONG) > params->value_len) return HIDP_STATUS_BUFFER_TOO_SMALL; + copy_bits( (unsigned char *)&unsigned_value, params->report_buf, bit_count, -caps->start_bit ); + signed_value = sign_extend( unsigned_value, caps ); + + if (caps->logical_min > caps->logical_max || caps->physical_min > caps->physical_max) + return HIDP_STATUS_BAD_LOG_PHY_VALUES; + if (caps->logical_min > signed_value || caps->logical_max < signed_value) + return HIDP_STATUS_VALUE_OUT_OF_RANGE; + + if (!caps->physical_min && !caps->physical_max) *value = signed_value; + else *value = caps->physical_min + MulDiv( signed_value - caps->logical_min, caps->physical_max - caps->physical_min, + caps->logical_max - caps->logical_min ); + return HIDP_STATUS_NULL; } -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 WINAPI HidP_GetScaledUsageValue( HIDP_REPORT_TYPE report_type, USAGE usage_page, USHORT collection, + USAGE usage, LONG *value, PHIDP_PREPARSED_DATA preparsed_data, + char *report_buf, ULONG report_len ) { - NTSTATUS rc; - WINE_HID_ELEMENT element; - TRACE("(%i, %x, %i, %i, %p, %p, %p, %i)\n", ReportType, UsagePage, LinkCollection, Usage, UsageValue, - PreparsedData, Report, ReportLength); + 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; - rc = find_usage(ReportType, UsagePage, LinkCollection, Usage, PreparsedData, Report, 0, &element); + TRACE( "report_type %d, usage_page %x, collection %d, usage %x, value %p, preparsed_data %p, report_buf %p, report_len %u.\n", + report_type, usage_page, collection, usage, value, preparsed_data, report_buf, report_len ); - 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; - *UsageValue = logical_to_physical(sign_extend(rawValue, &element), &element); - } + *value = 0; + 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_scaled_usage_value, &params, &count ); } static NTSTATUS get_usage_value( const struct hid_value_caps *caps, void *user ) diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index b29660d4773..432bc168259 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -2085,9 +2085,7 @@ static void test_hidp(HANDLE file, int report_id) value = 0xdeadbeef; status = HidP_GetScaledUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_Z, (LONG *)&value, preparsed_data, report, caps.InputReportByteLength); - todo_wine ok(status == HIDP_STATUS_VALUE_OUT_OF_RANGE, "HidP_GetScaledUsageValue returned %#x\n", status); - todo_wine ok(value == 0, "got value %x, expected %#x\n", value, 0); value = 0xdeadbeef; status = HidP_GetUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_Z, @@ -2103,7 +2101,6 @@ static void test_hidp(HANDLE file, int report_id) status = HidP_GetScaledUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_Z, (LONG *)&value, preparsed_data, report, caps.InputReportByteLength); ok(status == HIDP_STATUS_SUCCESS, "HidP_GetScaledUsageValue returned %#x\n", status); - todo_wine ok(value == 0x7fffffff, "got value %x, expected %#x\n", value, 0x7fffffff); value = 0; @@ -2133,7 +2130,6 @@ static void test_hidp(HANDLE file, int report_id) value = 0xdeadbeef; status = HidP_GetScaledUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_RY, (LONG *)&value, preparsed_data, report, caps.InputReportByteLength); - todo_wine ok(status == HIDP_STATUS_BAD_LOG_PHY_VALUES, "HidP_GetScaledUsageValue returned %#x\n", status); ok(value == 0, "got value %x, expected %#x\n", value, 0);

1 0

Alexandre Julliard : ntdll: Initialize the RealClientId field in the TEB.
by Alexandre Julliard 25 Jun '21

25 Jun '21

Module: wine Branch: master Commit: 0ffbec44f3380765353c3cf382f88289fbc953ee URL: https://source.winehq.org/git/wine.git/?a=commit;h=0ffbec44f3380765353c3cf3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 25 15:21:27 2021 +0200 ntdll: Initialize the RealClientId field in the TEB. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/process.c | 33 +++++++++++++++++++++++++++++++++ dlls/ntdll/unix/thread.c | 2 ++ 2 files changed, 35 insertions(+) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 10786c52e9e..1ef4a20daea 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -80,6 +80,7 @@ static BOOL (WINAPI *pSetInformationJobObject)(HANDLE job, JOBOBJECTINFOCLASS static HANDLE (WINAPI *pCreateIoCompletionPort)(HANDLE file, HANDLE existing_port, ULONG_PTR key, DWORD threads); static BOOL (WINAPI *pGetNumaProcessorNode)(UCHAR, PUCHAR); static NTSTATUS (WINAPI *pNtQueryInformationProcess)(HANDLE, PROCESSINFOCLASS, PVOID, ULONG, PULONG); +static NTSTATUS (WINAPI *pNtQueryInformationThread)(HANDLE, THREADINFOCLASS, PVOID, ULONG, PULONG); static NTSTATUS (WINAPI *pNtQuerySystemInformationEx)(SYSTEM_INFORMATION_CLASS, void*, ULONG, void*, ULONG, ULONG*); static DWORD (WINAPI *pWTSGetActiveConsoleSessionId)(void); static HANDLE (WINAPI *pCreateToolhelp32Snapshot)(DWORD, DWORD); @@ -248,6 +249,7 @@ static BOOL init(void) hntdll = GetModuleHandleA("ntdll.dll"); pNtQueryInformationProcess = (void *)GetProcAddress(hntdll, "NtQueryInformationProcess"); + pNtQueryInformationThread = (void *)GetProcAddress(hntdll, "NtQueryInformationThread"); pNtQuerySystemInformationEx = (void *)GetProcAddress(hntdll, "NtQuerySystemInformationEx"); pGetNativeSystemInfo = (void *) GetProcAddress(hkernel32, "GetNativeSystemInfo"); @@ -3517,6 +3519,37 @@ static void test_SuspendProcessState(void) ok( child_peb.OSPlatformId == VER_PLATFORM_WIN32_NT, "OSPlatformId not set %u\n", child_peb.OSPlatformId ); ok( child_peb.SessionId == 1, "SessionId not set %u\n", child_peb.SessionId ); + if (pNtQueryInformationThread) + { + TEB child_teb; + THREAD_BASIC_INFORMATION info; + NTSTATUS status = pNtQueryInformationThread( pi.hThread, ThreadBasicInformation, + &info, sizeof(info), NULL ); + ok( !status, "NtQueryInformationProcess failed %x\n", status ); + ret = ReadProcessMemory( pi.hProcess, info.TebBaseAddress, &child_teb, sizeof(child_teb), NULL ); + ok( ret, "Failed to read TEB (%u)\n", GetLastError() ); + + ok( child_teb.Peb == peb_ptr, "wrong Peb %p / %p\n", child_teb.Peb, peb_ptr ); + ok( PtrToUlong(child_teb.ClientId.UniqueProcess) == pi.dwProcessId, "wrong pid %x / %x\n", + PtrToUlong(child_teb.ClientId.UniqueProcess), pi.dwProcessId ); + ok( PtrToUlong(child_teb.ClientId.UniqueThread) == pi.dwThreadId, "wrong tid %x / %x\n", + PtrToUlong(child_teb.ClientId.UniqueThread), pi.dwThreadId ); + ok( PtrToUlong(child_teb.RealClientId.UniqueProcess) == pi.dwProcessId, "wrong real pid %x / %x\n", + PtrToUlong(child_teb.RealClientId.UniqueProcess), pi.dwProcessId ); + ok( PtrToUlong(child_teb.RealClientId.UniqueThread) == pi.dwThreadId, "wrong real tid %x / %x\n", + PtrToUlong(child_teb.RealClientId.UniqueThread), pi.dwThreadId ); + ok( child_teb.StaticUnicodeString.MaximumLength == sizeof(child_teb.StaticUnicodeBuffer), + "StaticUnicodeString.MaximumLength wrong %x\n", child_teb.StaticUnicodeString.MaximumLength ); + ok( (char *)child_teb.StaticUnicodeString.Buffer == (char *)info.TebBaseAddress + offsetof(TEB, StaticUnicodeBuffer), + "StaticUnicodeString.Buffer wrong %p\n", child_teb.StaticUnicodeString.Buffer ); + + ok( !child_teb.CurrentLocale, "CurrentLocale set %x\n", child_teb.CurrentLocale ); + ok( !child_teb.TlsLinks.Flink, "TlsLinks.Flink set %p\n", child_teb.TlsLinks.Flink ); + ok( !child_teb.TlsLinks.Blink, "TlsLinks.Blink set %p\n", child_teb.TlsLinks.Blink ); + ok( !child_teb.TlsExpansionSlots, "TlsExpansionSlots set %p\n", child_teb.TlsExpansionSlots ); + ok( !child_teb.FlsSlots, "FlsSlots set %p\n", child_teb.FlsSlots ); + } + ret = SetThreadContext(pi.hThread, &ctx); ok(ret, "Failed to set remote thread context (%d)\n", GetLastError()); diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c index 628cc19418f..0b3880c96ca 100644 --- a/dlls/ntdll/unix/thread.c +++ b/dlls/ntdll/unix/thread.c @@ -761,10 +761,12 @@ void set_thread_id( TEB *teb, DWORD pid, DWORD tid ) teb->ClientId.UniqueProcess = ULongToHandle( pid ); teb->ClientId.UniqueThread = ULongToHandle( tid ); + teb->RealClientId = teb->ClientId; if (wow_teb) { wow_teb->ClientId.UniqueProcess = pid; wow_teb->ClientId.UniqueThread = tid; + wow_teb->RealClientId = wow_teb->ClientId; } }

1 0

Francois Gouget : winehq: News: Fix some spelling issues.
by Alexandre Julliard 25 Jun '21

25 Jun '21

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 25 Jun '21

25 Jun '21

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

Zhiyi Zhang : light.msstyles: Add List Box parts.
by Alexandre Julliard 24 Jun '21

24 Jun '21

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

Zebediah Figura : ntdll/tests: Fix AVX tests on processors that don't support XSAVEOPT.
by Alexandre Julliard 24 Jun '21

24 Jun '21

Module: wine Branch: master Commit: 2554daf1bfc32febd949ee349a141df5c521225a URL: https://source.winehq.org/git/wine.git/?a=commit;h=2554daf1bfc32febd949ee34… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jun 24 11:14:34 2021 -0500 ntdll/tests: Fix AVX tests on processors that don't support XSAVEOPT. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/exception.c | 58 ++++++++++++++++++++++++++++++-------------- 1 file changed, 40 insertions(+), 18 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 7e849fba1aa..1a63a717d21 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -7562,7 +7562,7 @@ static const unsigned test_extended_context_spoil_data1[8] = {0x10, 0x20, 0x30, static const unsigned test_extended_context_spoil_data2[8] = {0x15, 0x25, 0x35, 0x45, 0x55, 0x65, 0x75, 0x85}; static BOOL test_extended_context_modified_state; -static BOOL compaction_enabled; +static BOOL xsaveopt_enabled, compaction_enabled; static DWORD test_extended_context_handler(EXCEPTION_RECORD *rec, EXCEPTION_REGISTRATION_RECORD *frame, CONTEXT *context, EXCEPTION_REGISTRATION_RECORD **dispatcher) @@ -7603,9 +7603,11 @@ static DWORD test_extended_context_handler(EXCEPTION_RECORD *rec, EXCEPTION_REGI context_ymm_data = (unsigned int *)&xs->YmmContext; ok(!((ULONG_PTR)xs % 64), "Got unexpected xs %p.\n", xs); - ok((compaction_enabled && (xs->CompactionMask & (expected_compaction_mask | 3)) == expected_compaction_mask) - || (!compaction_enabled && !xs->CompactionMask), "Got unexpected CompactionMask %s, compaction %#x.\n", - wine_dbgstr_longlong(xs->CompactionMask), compaction_enabled); + if (compaction_enabled) + ok((xs->CompactionMask & (expected_compaction_mask | 3)) == expected_compaction_mask, + "Got compaction mask %#I64x.\n", xs->CompactionMask); + else + ok(!xs->CompactionMask, "Got compaction mask %#I64x.\n", xs->CompactionMask); if (test_extended_context_modified_state) { @@ -7615,9 +7617,13 @@ static DWORD test_extended_context_handler(EXCEPTION_RECORD *rec, EXCEPTION_REGI } else { - ok(!xs->Mask, "Got unexpected Mask %s.\n", wine_dbgstr_longlong(xs->Mask)); - /* The save area has garbage in this case, the state should be restored to INIT_STATE - * without using these data. */ + ok(xs->Mask == (xsaveopt_enabled ? 0 : 4), "Got unexpected Mask %#I64x.\n", xs->Mask); + /* The save area has garbage if xsaveopt is available, so we can't test + * its contents. */ + + /* Clear the mask; the state should be restored to INIT_STATE without + * using this data. */ + xs->Mask = 0; memcpy(context_ymm_data, test_extended_context_spoil_data1 + 4, sizeof(M128A)); } @@ -7897,6 +7903,7 @@ static void test_extended_context(void) int regs[4]; __cpuidex(regs, 0xd, 1); + xsaveopt_enabled = regs[0] & 1; compaction_enabled = regs[0] & 2; } @@ -8547,7 +8554,7 @@ static void test_extended_context(void) "Got unexpected bret %#x, GetLastError() %u.\n", bret, GetLastError()); ok(context->ContextFlags == expected_flags, "Got unexpected ContextFlags %#x.\n", context->ContextFlags); - ok(xs->Mask == (compaction_enabled ? 0 : 4), "Got unexpected Mask %s.\n", wine_dbgstr_longlong(xs->Mask)); + ok(xs->Mask == (compaction_enabled ? 0 : 4), "Got unexpected Mask %#I64x.\n", xs->Mask); ok(xs->CompactionMask == 4, "Got unexpected CompactionMask %s.\n", wine_dbgstr_longlong(xs->CompactionMask)); for (i = 0; i < 4; ++i) @@ -8618,7 +8625,7 @@ static void test_extended_context(void) expected_compaction = compaction_enabled ? ((ULONG64)1 << 63) | 4 : 0; xs = (XSTATE *)((BYTE *)context_ex + context_ex->XState.Offset); - ok(!xs->Mask, "Got unexpected Mask %s.\n", wine_dbgstr_longlong(xs->Mask)); + ok(xs->Mask == (xsaveopt_enabled ? 0 : 4), "Got unexpected Mask %#I64x.\n", xs->Mask); ok(xs->CompactionMask == expected_compaction, "Got unexpected CompactionMask %s.\n", wine_dbgstr_longlong(xs->CompactionMask)); @@ -8626,12 +8633,13 @@ static void test_extended_context(void) ok(!data[i], "Got unexpected data %#x, i %u.\n", data[i], i); for (i = 0; i < 4; ++i) - ok(((ULONG *)&xs->YmmContext)[i] == 0xcccccccc + ok(((ULONG *)&xs->YmmContext)[i] == ((xs->Mask & 4) ? 0 : 0xcccccccc) || broken(((ULONG *)&xs->YmmContext)[i] == test_extended_context_data[i + 4]), "Got unexpected data %#x, i %u.\n", ((ULONG *)&xs->YmmContext)[i], i); /* Test fault exception context. */ memset(data, 0xff, sizeof(data)); + xs->Mask = 0; test_extended_context_modified_state = FALSE; run_exception_test(test_extended_context_handler, NULL, except_code_reset_ymm_state, ARRAY_SIZE(except_code_reset_ymm_state), PAGE_EXECUTE_READ); @@ -8664,12 +8672,13 @@ static void test_extended_context(void) bret = GetThreadContext(thread, context); ok(bret, "Got unexpected bret %#x, GetLastError() %u.\n", bret, GetLastError()); - ok(!xs->Mask, "Got unexpected Mask %s.\n", wine_dbgstr_longlong(xs->Mask)); + todo_wine_if (!xsaveopt_enabled) + ok(xs->Mask == (xsaveopt_enabled ? 0 : 4), "Got unexpected Mask %#I64x.\n", xs->Mask); ok(xs->CompactionMask == expected_compaction, "Got unexpected CompactionMask %s.\n", wine_dbgstr_longlong(xs->CompactionMask)); for (i = 0; i < 16 * 4; ++i) - ok(((ULONG *)&xs->YmmContext)[i] == 0xcccccccc, "Got unexpected value %#x, i %u.\n", - ((ULONG *)&xs->YmmContext)[i], i); + ok(((ULONG *)&xs->YmmContext)[i] == ((xs->Mask & 4) ? 0 : 0xcccccccc), + "Got unexpected value %#x, i %u.\n", ((ULONG *)&xs->YmmContext)[i], i); pSetXStateFeaturesMask(context, 4); memset(&xs->YmmContext, 0, sizeof(xs->YmmContext)); @@ -8725,11 +8734,24 @@ static void test_extended_context(void) memset(&xs->YmmContext, 0xcc, sizeof(xs->YmmContext)); bret = GetThreadContext(thread, context); ok(bret, "Got unexpected bret %#x, GetLastError() %u.\n", bret, GetLastError()); - ok(!xs->Mask || (sizeof(void *) == 4 && xs->Mask == 4), - "Got unexpected Mask %s.\n", wine_dbgstr_longlong(xs->Mask)); - for (i = 0; i < 16 * 4; ++i) - ok(((ULONG *)&xs->YmmContext)[i] == (xs->Mask ? (i < 8 * 4 ? 0 : 0x48484848) : 0xcccccccc), - "Got unexpected value %#x, i %u.\n", ((ULONG *)&xs->YmmContext)[i], i); + todo_wine_if (!xsaveopt_enabled && sizeof(void *) != 4) + ok(xs->Mask == (xsaveopt_enabled ? 0 : 4) || (sizeof(void *) == 4 && xs->Mask == 4), + "Got unexpected Mask %#I64x.\n", xs->Mask); + if (xs->Mask == 4) + { + for (i = 0; i < 8 * sizeof(void *); ++i) + ok(((ULONG *)&xs->YmmContext)[i] == 0, + "Got unexpected value %#x, i %u.\n", ((ULONG *)&xs->YmmContext)[i], i); + for (; i < 16 * 4; ++i) + ok(((ULONG *)&xs->YmmContext)[i] == 0x48484848, + "Got unexpected value %#x, i %u.\n", ((ULONG *)&xs->YmmContext)[i], i); + } + else + { + for (i = 0; i < 16 * 4; ++i) + ok(((ULONG *)&xs->YmmContext)[i] == 0xcccccccc, + "Got unexpected value %#x, i %u.\n", ((ULONG *)&xs->YmmContext)[i], i); + } bret = ResumeThread(thread); ok(bret, "Got unexpected bret %#x, GetLastError() %u.\n", bret, GetLastError());

1 0

Zebediah Figura : ntdll/tests: Fix a failure in test_thread_context() under Wine.
by Alexandre Julliard 24 Jun '21

24 Jun '21

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 24 Jun '21

24 Jun '21

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