March 2022 - Wine-commits - list.winehq.org

Rémi Bernon : winebus.sys: Remove the now unused HID haptics combined waveform report.
by Alexandre Julliard 14 Mar '22

14 Mar '22

Module: wine Branch: master Commit: ecc881f731fed583af9af3f626409758c28c86a3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ecc881f731fed583af9af3f6… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Mar 14 10:29:38 2022 +0100 winebus.sys: Remove the now unused HID haptics combined waveform report. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/hid.c | 107 +--------------------------------------- dlls/winebus.sys/unix_private.h | 20 -------- 2 files changed, 2 insertions(+), 125 deletions(-) diff --git a/dlls/winebus.sys/hid.c b/dlls/winebus.sys/hid.c index 46336716a70..5b18da5d8ed 100644 --- a/dlls/winebus.sys/hid.c +++ b/dlls/winebus.sys/hid.c @@ -331,12 +331,6 @@ BOOL hid_device_add_axes(struct unix_device *iface, BYTE count, USAGE usage_page } #include "pshpack1.h" -struct hid_haptics_waveform -{ - UINT16 intensity; - BYTE manual_trigger; - BYTE repeat_count; -}; struct hid_haptics_intensity { UINT16 rumble_intensity; @@ -348,68 +342,7 @@ BOOL hid_device_add_haptics(struct unix_device *iface) { struct hid_report_descriptor *desc = &iface->hid_report_descriptor; const BYTE haptics_features_report = ++desc->next_report_id[HidP_Feature]; - const BYTE haptics_waveform_report = ++desc->next_report_id[HidP_Output]; const BYTE haptics_intensity_report = ++desc->next_report_id[HidP_Output]; - const BYTE waveforms_template[] = - { - USAGE_PAGE(2, HID_USAGE_PAGE_HAPTICS), - USAGE(1, HID_USAGE_HAPTICS_SIMPLE_CONTROLLER), - COLLECTION(1, Logical), - REPORT_ID(1, haptics_features_report), - - USAGE(1, HID_USAGE_HAPTICS_WAVEFORM_LIST), - COLLECTION(1, NamedArray), - USAGE(4, (HID_USAGE_PAGE_ORDINAL<<16)|HAPTICS_WAVEFORM_RUMBLE_ORDINAL), /* HID_USAGE_HAPTICS_WAVEFORM_RUMBLE */ - USAGE(4, (HID_USAGE_PAGE_ORDINAL<<16)|HAPTICS_WAVEFORM_BUZZ_ORDINAL), /* HID_USAGE_HAPTICS_WAVEFORM_BUZZ */ - REPORT_COUNT(1, 2), - REPORT_SIZE(1, 16), - FEATURE(1, Data|Var|Abs|Null), - END_COLLECTION, - - USAGE(1, HID_USAGE_HAPTICS_DURATION_LIST), - COLLECTION(1, NamedArray), - USAGE(4, (HID_USAGE_PAGE_ORDINAL<<16)|HAPTICS_WAVEFORM_RUMBLE_ORDINAL), /* 0 (HID_USAGE_HAPTICS_WAVEFORM_RUMBLE) */ - USAGE(4, (HID_USAGE_PAGE_ORDINAL<<16)|HAPTICS_WAVEFORM_BUZZ_ORDINAL), /* 0 (HID_USAGE_HAPTICS_WAVEFORM_BUZZ) */ - REPORT_COUNT(1, 2), - REPORT_SIZE(1, 16), - FEATURE(1, Data|Var|Abs|Null), - END_COLLECTION, - - USAGE(1, HID_USAGE_HAPTICS_WAVEFORM_CUTOFF_TIME), - UNIT(2, 0x1001), /* seconds */ - UNIT_EXPONENT(1, -3), /* 10^-3 */ - LOGICAL_MINIMUM(4, 0x00000000), - LOGICAL_MAXIMUM(4, 0x7fffffff), - REPORT_SIZE(1, 32), - REPORT_COUNT(1, 1), - FEATURE(1, Data|Var|Abs), - /* reset global items */ - UNIT(1, 0), /* None */ - UNIT_EXPONENT(1, 0), - - REPORT_ID(1, haptics_waveform_report), - USAGE(1, HID_USAGE_HAPTICS_INTENSITY), - LOGICAL_MINIMUM(4, 0x00000000), - LOGICAL_MAXIMUM(4, 0x0000ffff), - REPORT_SIZE(1, 16), - REPORT_COUNT(1, 1), - OUTPUT(1, Data|Var|Abs), - - USAGE(1, HID_USAGE_HAPTICS_MANUAL_TRIGGER), - LOGICAL_MINIMUM(1, HAPTICS_WAVEFORM_NONE_ORDINAL), - LOGICAL_MAXIMUM(1, HAPTICS_WAVEFORM_LAST_ORDINAL), - REPORT_SIZE(1, 8), - REPORT_COUNT(1, 1), - OUTPUT(1, Data|Var|Abs), - - USAGE(1, HID_USAGE_HAPTICS_REPEAT_COUNT), - LOGICAL_MINIMUM(1, 0), - LOGICAL_MAXIMUM(1, 1), - REPORT_SIZE(1, 8), - REPORT_COUNT(1, 1), - OUTPUT(1, Data|Var|Abs), - END_COLLECTION, - }; const BYTE haptics_template[] = { USAGE_PAGE(2, HID_USAGE_PAGE_HAPTICS), @@ -419,6 +352,7 @@ BOOL hid_device_add_haptics(struct unix_device *iface) USAGE(1, HID_USAGE_HAPTICS_WAVEFORM_LIST), COLLECTION(1, NamedArray), + /* ordinal 1 and 2 are reserved for implicit waveforms */ USAGE(4, (HID_USAGE_PAGE_ORDINAL<<16)|3), REPORT_SIZE(1, 16), REPORT_COUNT(1, 1), @@ -427,6 +361,7 @@ BOOL hid_device_add_haptics(struct unix_device *iface) USAGE(1, HID_USAGE_HAPTICS_DURATION_LIST), COLLECTION(1, NamedArray), + /* ordinal 1 and 2 are reserved for implicit waveforms */ USAGE(4, (HID_USAGE_PAGE_ORDINAL<<16)|3), REPORT_SIZE(1, 16), REPORT_COUNT(1, 1), @@ -456,13 +391,7 @@ BOOL hid_device_add_haptics(struct unix_device *iface) }; iface->hid_haptics.features_report = haptics_features_report; - iface->hid_haptics.waveform_report = haptics_waveform_report; iface->hid_haptics.intensity_report = haptics_intensity_report; - iface->hid_haptics.features.waveform_list[0] = HID_USAGE_HAPTICS_WAVEFORM_RUMBLE; - iface->hid_haptics.features.waveform_list[1] = HID_USAGE_HAPTICS_WAVEFORM_BUZZ; - iface->hid_haptics.features.duration_list[0] = 0; - iface->hid_haptics.features.duration_list[1] = 0; - iface->hid_haptics.features.waveform_cutoff_time_ms = 1000; iface->hid_haptics.features.rumble.waveform = HID_USAGE_HAPTICS_WAVEFORM_RUMBLE; iface->hid_haptics.features.rumble.duration = 0; iface->hid_haptics.features.rumble.cutoff_time_ms = 1000; @@ -470,9 +399,6 @@ BOOL hid_device_add_haptics(struct unix_device *iface) iface->hid_haptics.features.buzz.duration = 0; iface->hid_haptics.features.buzz.cutoff_time_ms = 1000; - if (!hid_report_descriptor_append(desc, waveforms_template, sizeof(waveforms_template))) - return FALSE; - if (!hid_report_descriptor_append(desc, haptics_template, sizeof(haptics_template))) return FALSE; if (!hid_report_descriptor_append(desc, haptics_template, sizeof(haptics_template))) @@ -1153,34 +1079,6 @@ static void hid_device_set_output_report(struct unix_device *iface, HID_XFER_PAC io->Status = iface->hid_vtbl->haptics_start(iface, duration_ms, report->rumble_intensity, report->buzz_intensity); } } - else if (packet->reportId == haptics->waveform_report) - { - struct hid_haptics_waveform *report = (struct hid_haptics_waveform *)(packet->reportBuffer + 1); - UINT16 *rumble_intensity = haptics->waveform_intensity + HAPTICS_WAVEFORM_RUMBLE_ORDINAL; - UINT16 *buzz_intensity = haptics->waveform_intensity + HAPTICS_WAVEFORM_BUZZ_ORDINAL; - ULONG duration_ms; - - io->Information = sizeof(*report) + 1; - assert(packet->reportBufferLen == io->Information); - - if (report->manual_trigger == 0 || report->manual_trigger > HAPTICS_WAVEFORM_LAST_ORDINAL) - io->Status = STATUS_INVALID_PARAMETER; - else - { - if (report->manual_trigger == HAPTICS_WAVEFORM_STOP_ORDINAL) - { - memset(haptics->waveform_intensity, 0, sizeof(haptics->waveform_intensity)); - io->Status = iface->hid_vtbl->haptics_stop(iface); - } - else - { - haptics->waveform_intensity[report->manual_trigger] = report->intensity; - duration_ms = haptics->features.waveform_cutoff_time_ms; - if (!report->repeat_count) io->Status = STATUS_SUCCESS; - else io->Status = iface->hid_vtbl->haptics_start(iface, duration_ms, *rumble_intensity, *buzz_intensity); - } - } - } else if (packet->reportId == physical->device_control_report) { struct pid_device_control *report = (struct pid_device_control *)(packet->reportBuffer + 1); @@ -1387,7 +1285,6 @@ static void hid_device_set_feature_report(struct unix_device *iface, HID_XFER_PA io->Information = sizeof(*features) + 1; assert(packet->reportBufferLen == io->Information); - haptics->features.waveform_cutoff_time_ms = features->waveform_cutoff_time_ms; haptics->features.rumble.cutoff_time_ms = features->rumble.cutoff_time_ms; haptics->features.buzz.cutoff_time_ms = features->buzz.cutoff_time_ms; io->Status = STATUS_SUCCESS; diff --git a/dlls/winebus.sys/unix_private.h b/dlls/winebus.sys/unix_private.h index 081e57dc53d..0763d084823 100644 --- a/dlls/winebus.sys/unix_private.h +++ b/dlls/winebus.sys/unix_private.h @@ -123,21 +123,6 @@ struct hid_report_descriptor BYTE next_report_id[3]; }; -/* HID spec uses None / Stop names for the first two implicit waveforms, - * where Windows SDK headers use STOP / NULL for the corresponding HID - * usage constants. We're not actually using the usages anyway are we - * stick to the HID spec here. - */ -enum haptics_waveform_ordinal -{ - HAPTICS_WAVEFORM_NONE_ORDINAL = 1, /* implicit, not included in waveform_list / duration_list */ - HAPTICS_WAVEFORM_STOP_ORDINAL = 2, /* implicit, not included in waveform_list / duration_list */ - HAPTICS_WAVEFORM_RUMBLE_ORDINAL = 3, - HAPTICS_WAVEFORM_BUZZ_ORDINAL = 4, - HAPTICS_WAVEFORM_FIRST_ORDINAL = HAPTICS_WAVEFORM_RUMBLE_ORDINAL, - HAPTICS_WAVEFORM_LAST_ORDINAL = HAPTICS_WAVEFORM_BUZZ_ORDINAL, -}; - #include "pshpack1.h" struct hid_haptics_feature { @@ -148,9 +133,6 @@ struct hid_haptics_feature struct hid_haptics_features { - WORD waveform_list[HAPTICS_WAVEFORM_LAST_ORDINAL - HAPTICS_WAVEFORM_FIRST_ORDINAL + 1]; - WORD duration_list[HAPTICS_WAVEFORM_LAST_ORDINAL - HAPTICS_WAVEFORM_FIRST_ORDINAL + 1]; - UINT waveform_cutoff_time_ms; struct hid_haptics_feature rumble; struct hid_haptics_feature buzz; }; @@ -159,9 +141,7 @@ struct hid_haptics_features struct hid_haptics { struct hid_haptics_features features; - UINT16 waveform_intensity[HAPTICS_WAVEFORM_LAST_ORDINAL + 1]; BYTE features_report; - BYTE waveform_report; BYTE intensity_report; };

1 0

Giovanni Mascellani : mfplat: Properly align memory allocated by IMF2DBuffer.
by Alexandre Julliard 14 Mar '22

14 Mar '22

Module: wine Branch: master Commit: 4b36913660bfedb7e0b73c6ab1ea40caf63a9170 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4b36913660bfedb7e0b73c6a… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Mon Mar 14 17:47:17 2022 +0300 mfplat: Properly align memory allocated by IMF2DBuffer. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/buffer.c | 2 +- dlls/mfplat/tests/mfplat.c | 22 ++++++++++++++++++++++ 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/dlls/mfplat/buffer.c b/dlls/mfplat/buffer.c index 1cb84cba944..2ec714c1419 100644 --- a/dlls/mfplat/buffer.c +++ b/dlls/mfplat/buffer.c @@ -1385,7 +1385,7 @@ static HRESULT create_2d_buffer(DWORD width, DWORD height, DWORD fourcc, BOOL bo max_length = pitch * height; } - if (FAILED(hr = memory_buffer_init(object, max_length, MF_1_BYTE_ALIGNMENT, &memory_1d_2d_buffer_vtbl))) + if (FAILED(hr = memory_buffer_init(object, max_length, row_alignment, &memory_1d_2d_buffer_vtbl))) { free(object); return hr; diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index d9c25edaa72..83877041694 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -6005,6 +6005,28 @@ static void test_MFCreate2DMediaBuffer(void) IMFMediaBuffer_Release(buffer); } + + /* Alignment tests */ + for (i = 0; i < ARRAY_SIZE(_2d_buffer_tests); ++i) + { + const struct _2d_buffer_test *ptr = &_2d_buffer_tests[i]; + + hr = pMFCreate2DMediaBuffer(ptr->width, ptr->height, ptr->fourcc, FALSE, &buffer); + ok(hr == S_OK, "Failed to create a buffer, hr %#lx.\n", hr); + + hr = IMFMediaBuffer_QueryInterface(buffer, &IID_IMF2DBuffer, (void **)&_2dbuffer); + ok(hr == S_OK, "Failed to get interface, hr %#lx.\n", hr); + + hr = IMF2DBuffer_Lock2D(_2dbuffer, &data, &pitch); + ok(hr == S_OK, "Failed to lock buffer, hr %#lx.\n", hr); + ok(((uintptr_t)data & MF_64_BYTE_ALIGNMENT) == 0, "Misaligned data at %p.\n", data); + + hr = IMF2DBuffer_Unlock2D(_2dbuffer); + ok(hr == S_OK, "Failed to unlock buffer, hr %#lx.\n", hr); + + IMF2DBuffer_Release(_2dbuffer); + IMFMediaBuffer_Release(buffer); + } } static void test_MFCreateMediaBufferFromMediaType(void)

1 0

Eric Pouech : user32/tests: Enable compilation with long types.
by Alexandre Julliard 14 Mar '22

14 Mar '22

Module: wine Branch: master Commit: 4e40e2cb2e1105bdb9f09609f472fae453e841db URL: https://source.winehq.org/git/wine.git/?a=commit;h=4e40e2cb2e1105bdb9f09609… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Sat Mar 12 09:37:14 2022 +0100 user32/tests: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/menu.c | 333 ++++++++++++++++++++++++----------------------- 1 file changed, 167 insertions(+), 166 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4e40e2cb2e1105bdb9f0…

1 0

Eric Pouech : user32/tests: Enable compilation with long types.
by Alexandre Julliard 14 Mar '22

14 Mar '22

Module: wine Branch: master Commit: 66ec7ae37a97205114067d493eedad175db8de90 URL: https://source.winehq.org/git/wine.git/?a=commit;h=66ec7ae37a97205114067d49… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Sat Mar 12 09:37:18 2022 +0100 user32/tests: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/monitor.c | 435 ++++++++++++++++++++++---------------------- 1 file changed, 218 insertions(+), 217 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=66ec7ae37a9720511406…

1 0

Eric Pouech : user32/tests: Enable compilation with long types.
by Alexandre Julliard 14 Mar '22

14 Mar '22

Module: wine Branch: master Commit: 3d39354998d1f4375a03773dab635d4d3f0b1f05 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3d39354998d1f4375a03773d… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Sat Mar 12 09:37:22 2022 +0100 user32/tests: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/msg.c | 973 ++++++++++++++++++++++++------------------------ 1 file changed, 487 insertions(+), 486 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3d39354998d1f4375a03…

1 0

Eric Pouech : user32/tests: Enable compilation with long types.
by Alexandre Julliard 14 Mar '22

14 Mar '22

Module: wine Branch: master Commit: 4607d822d9bc626f90b7b841df80e7b68db69d17 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4607d822d9bc626f90b7b841… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Sat Mar 12 09:37:26 2022 +0100 user32/tests: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/scroll.c | 93 +++++++++++++++++++++++----------------------- 1 file changed, 47 insertions(+), 46 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4607d822d9bc626f90b7…

1 0

Eric Pouech : user32/tests: Enable compilation with long types.
by Alexandre Julliard 14 Mar '22

14 Mar '22

Module: wine Branch: master Commit: 8a52d3e93f5690fd0833c228d54a996a784afad7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8a52d3e93f5690fd0833c228… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Sat Mar 12 09:37:32 2022 +0100 user32/tests: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/static.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/user32/tests/static.c b/dlls/user32/tests/static.c index 0899f4c6187..39cd93c54da 100644 --- a/dlls/user32/tests/static.c +++ b/dlls/user32/tests/static.c @@ -16,6 +16,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#undef WINE_NO_LONG_TYPES /* temporary for migration */ #include <stdarg.h> #include <stdio.h> @@ -85,19 +86,19 @@ static void test_updates(int style) exstyle = GetWindowLongW(hStatic, GWL_EXSTYLE); if (style == SS_ETCHEDHORZ || style == SS_ETCHEDVERT || style == SS_SUNKEN) - ok(exstyle == WS_EX_STATICEDGE, "expected WS_EX_STATICEDGE, got %d\n", exstyle); + ok(exstyle == WS_EX_STATICEDGE, "expected WS_EX_STATICEDGE, got %ld\n", exstyle); else - ok(exstyle == 0, "expected 0, got %d\n", exstyle); + ok(exstyle == 0, "expected 0, got %ld\n", exstyle); GetClientRect(hStatic, &rcClient); if (style == SS_ETCHEDVERT) - ok(rcClient.right == 0, "expected zero width, got %d\n", rcClient.right); + ok(rcClient.right == 0, "expected zero width, got %ld\n", rcClient.right); else - ok(rcClient.right > 0, "expected non-zero width, got %d\n", rcClient.right); + ok(rcClient.right > 0, "expected non-zero width, got %ld\n", rcClient.right); if (style == SS_ETCHEDHORZ) - ok(rcClient.bottom == 0, "expected zero height, got %d\n", rcClient.bottom); + ok(rcClient.bottom == 0, "expected zero height, got %ld\n", rcClient.bottom); else - ok(rcClient.bottom > 0, "expected non-zero height, got %d\n", rcClient.bottom); + ok(rcClient.bottom > 0, "expected non-zero height, got %ld\n", rcClient.bottom); g_nReceivedColorStatic = 0; /* during each update parent WndProc will test the WM_CTLCOLORSTATIC message */ @@ -217,10 +218,10 @@ static void test_STM_SETIMAGE(void) for (type = SS_LEFT; type < SS_ETCHEDFRAME; type++) { - winetest_push_context("%u", type); + winetest_push_context("%lu", type); hwnd = build_static(type); - ok(hwnd != 0, "failed to create static type %#x\n", type); + ok(hwnd != 0, "failed to create static type %#lx\n", type); /* set icon */ g_nReceivedColorStatic = 0;

1 0

Paul Gofman : winhttp: Also select for error in netconn_create().
by Alexandre Julliard 14 Mar '22

14 Mar '22

Module: wine Branch: master Commit: 1f8738d5377d3edfc719a6e75e842fbd71057bfd URL: https://source.winehq.org/git/wine.git/?a=commit;h=1f8738d5377d3edfc719a6e7… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Mar 14 13:31:28 2022 +0300 winhttp: Also select for error in netconn_create(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/net.c | 14 ++++++++++---- dlls/winhttp/tests/winhttp.c | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+), 4 deletions(-) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index 5e4c55fad6a..2fc48476513 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -228,13 +228,19 @@ DWORD netconn_create( struct hostdata *host, const struct sockaddr_storage *sock ret = WSAGetLastError(); if (ret == WSAEWOULDBLOCK || ret == WSAEINPROGRESS) { - FD_SET set; TIMEVAL timeval = { timeout / 1000, (timeout % 1000) * 1000 }; + FD_SET set_read, set_error; int res; - FD_ZERO( &set ); - FD_SET( conn->socket, &set ); - if ((res = select( conn->socket + 1, NULL, &set, NULL, &timeval )) > 0) ret = ERROR_SUCCESS; + FD_ZERO( &set_read ); + FD_SET( conn->socket, &set_read ); + FD_ZERO( &set_error ); + FD_SET( conn->socket, &set_error ); + if ((res = select( conn->socket + 1, NULL, &set_read, &set_error, &timeval )) > 0) + { + if (FD_ISSET(conn->socket, &set_read)) ret = ERROR_SUCCESS; + else assert( FD_ISSET(conn->socket, &set_error) ); + } else if (!res) ret = ERROR_WINHTTP_TIMEOUT; } } diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 9dc8ece3069..3c615656373 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -482,6 +482,41 @@ static void test_WinHttpSendRequest (void) ok(ret == TRUE, "WinHttpCloseHandle failed on closing session, got %d.\n", ret); } +static void test_connect_error(void) +{ + static const WCHAR content_type[] = L"Content-Type: application/x-www-form-urlencoded"; + DWORD header_len, optional_len, total_len, err, t1, t2; + HINTERNET session, request, connection; + static char post_data[] = "mode=Test"; + BOOL ret; + + header_len = ~0u; + total_len = optional_len = sizeof(post_data); + + session = WinHttpOpen(L"winetest", WINHTTP_ACCESS_TYPE_DEFAULT_PROXY, + WINHTTP_NO_PROXY_NAME, WINHTTP_NO_PROXY_BYPASS, 0); + ok(!!session, "WinHttpOpen failed to open session.\n"); + + connection = WinHttpConnect (session, L"127.0.0.1", 12345, 0); + ok(!!connection, "WinHttpConnect failed to open a connection, error %lu.\n", GetLastError()); + + request = WinHttpOpenRequest(connection, L"POST", L"tests/post.php", NULL, WINHTTP_NO_REFERER, + WINHTTP_DEFAULT_ACCEPT_TYPES, WINHTTP_FLAG_BYPASS_PROXY_CACHE); + ok(!!request, "WinHttpOpenrequest failed to open a request, error: %lu\n", GetLastError()); + + t1 = GetTickCount(); + ret = WinHttpSendRequest(request, content_type, header_len, post_data, optional_len, total_len, 0); + t2 = GetTickCount(); + err = GetLastError(); + ok(!ret, "WinHttpSendRequest() succeeded.\n"); + ok(err == ERROR_WINHTTP_CANNOT_CONNECT, "Got unexpected err %lu.\n", err); + ok(t2 - t1 < 5000, "Unexpected connect failure delay %lums.\n", t2 - t1); + + WinHttpCloseHandle(request); + WinHttpCloseHandle(connection); + WinHttpCloseHandle(session); +} + static void test_WinHttpTimeFromSystemTime(void) { BOOL ret; @@ -5557,6 +5592,7 @@ START_TEST (winhttp) test_WinHttpOpenRequest(); test_WinHttpSendRequest(); + test_connect_error(); test_WinHttpTimeFromSystemTime(); test_WinHttpTimeToSystemTime(); test_WinHttpAddHeaders();

1 0

Jacek Caban : user32: Fix nameA pointer in alloc_menu_nameW.
by Alexandre Julliard 14 Mar '22

14 Mar '22

Module: wine Branch: master Commit: fa77147b5b105cb22196b6ca6977c1de9ec77d14 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fa77147b5b105cb22196b6ca… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 14 11:43:07 2022 +0100 user32: Fix nameA pointer in alloc_menu_nameW. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52651 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/class.c | 1 + dlls/user32/tests/class.c | 48 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+) diff --git a/dlls/user32/class.c b/dlls/user32/class.c index 3b6b70b8004..5d1c44a441d 100644 --- a/dlls/user32/class.c +++ b/dlls/user32/class.c @@ -174,6 +174,7 @@ static BOOL alloc_menu_nameW( struct client_menu_name *ret, const WCHAR *menu_na DWORD lenA = WideCharToMultiByte( CP_ACP, 0, menu_name, lenW, NULL, 0, NULL, NULL ); ret->nameW = HeapAlloc( GetProcessHeap(), 0, lenA + lenW * sizeof(WCHAR) ); if (!ret->nameW) return FALSE; + ret->nameA = (char *)(ret->nameW + lenW); memcpy( ret->nameW, menu_name, lenW * sizeof(WCHAR) ); WideCharToMultiByte( CP_ACP, 0, menu_name, lenW, ret->nameA, lenA, NULL, NULL ); } diff --git a/dlls/user32/tests/class.c b/dlls/user32/tests/class.c index 590e342585d..64fc3c014e3 100644 --- a/dlls/user32/tests/class.c +++ b/dlls/user32/tests/class.c @@ -1545,6 +1545,53 @@ static void test_uxtheme(void) UnregisterClassA(class_name, GetModuleHandleA(NULL)); } +static void test_class_name(void) +{ + WCHAR class_name[] = L"ClassNameTest"; + HINSTANCE hinst = GetModuleHandleW(0); + WNDCLASSEXW wcex; + const WCHAR *nameW; + const char *nameA; + UINT_PTR res; + HWND hwnd; + + memset(&wcex, 0, sizeof wcex); + wcex.cbSize = sizeof wcex; + wcex.lpfnWndProc = ClassTest_WndProc; + wcex.hIcon = LoadIconW(0, (LPCWSTR)IDI_APPLICATION); + wcex.hInstance = hinst; + wcex.lpszClassName = class_name; + wcex.lpszMenuName = L"menu name"; + ok(RegisterClassExW(&wcex), "RegisterClassExW returned 0\n"); + hwnd = CreateWindowExW(0, class_name, NULL, WS_OVERLAPPEDWINDOW, + 0, 0, 0, 0, NULL, NULL, hinst, 0); + ok(hwnd != NULL, "Window was not created\n"); + + nameA = (const char *)GetClassLongPtrA(hwnd, GCLP_MENUNAME); + ok(!strcmp(nameA, "menu name"), "unexpected class name %s\n", debugstr_a(nameA)); + nameW = (const WCHAR *)GetClassLongPtrW(hwnd, GCLP_MENUNAME); + ok(!wcscmp(nameW, L"menu name"), "unexpected class name %s\n", debugstr_w(nameW)); + + res = SetClassLongPtrA(hwnd, GCLP_MENUNAME, (LONG_PTR)"nameA"); + todo_wine + ok(res, "SetClassLongPtrA returned 0\n"); + nameA = (const char *)GetClassLongPtrA(hwnd, GCLP_MENUNAME); + ok(!strcmp(nameA, "nameA"), "unexpected class name %s\n", debugstr_a(nameA)); + nameW = (const WCHAR *)GetClassLongPtrW(hwnd, GCLP_MENUNAME); + ok(!wcscmp(nameW, L"nameA"), "unexpected class name %s\n", debugstr_w(nameW)); + + res = SetClassLongPtrW(hwnd, GCLP_MENUNAME, (LONG_PTR)L"nameW"); + todo_wine + ok(res, "SetClassLongPtrW returned 0\n"); + nameA = (const char *)GetClassLongPtrA(hwnd, GCLP_MENUNAME); + ok(!strcmp(nameA, "nameW"), "unexpected class name %s\n", debugstr_a(nameA)); + nameW = (const WCHAR *)GetClassLongPtrW(hwnd, GCLP_MENUNAME); + ok(!wcscmp(nameW, L"nameW"), "unexpected class name %s\n", debugstr_w(nameW)); + + DestroyWindow(hwnd); + UnregisterClassW(class_name, hinst); +} + START_TEST(class) { char **argv; @@ -1578,6 +1625,7 @@ START_TEST(class) test_icons(); test_comctl32_classes(); test_actctx_classes(); + test_class_name(); /* this test unregisters the Button class so it should be executed at the end */ test_instances();

1 0

Jacek Caban : win32u: Move NtUserWindowFromDC implementation from user32.
by Alexandre Julliard 14 Mar '22

14 Mar '22

Module: wine Branch: master Commit: e411d919580b7bc72c6a86b03d8a4dbbbc567f6d URL: https://source.winehq.org/git/wine.git/?a=commit;h=e411d919580b7bc72c6a86b0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 14 11:43:32 2022 +0100 win32u: Move NtUserWindowFromDC implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/painting.c | 27 --------------------------- dlls/user32/user32.spec | 2 +- dlls/user32/user_main.c | 1 - dlls/win32u/Makefile.in | 1 + dlls/win32u/dce.c | 42 ++++++++++++++++++++++++++++++++++++++++++ dlls/win32u/ntuser_private.h | 13 ++++++++++++- dlls/win32u/palette.c | 9 +++------ dlls/win32u/syscall.c | 1 + dlls/win32u/win32u.spec | 2 +- dlls/wow64win/syscall.h | 3 ++- dlls/wow64win/user.c | 7 +++++++ include/ntuser.h | 1 + 12 files changed, 71 insertions(+), 38 deletions(-) diff --git a/dlls/user32/painting.c b/dlls/user32/painting.c index 96a06fe98c7..2f8ab9b81f8 100644 --- a/dlls/user32/painting.c +++ b/dlls/user32/painting.c @@ -35,17 +35,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(win); -struct dce -{ - struct list entry; /* entry in global DCE list */ - HDC hdc; - HWND hwnd; - HRGN clip_rgn; - DWORD flags; - LONG count; /* usage count; 0 or 1 for cache DCEs, always 1 for window DCEs, - always >= 1 for class DCEs */ -}; - static struct list dce_list = LIST_INIT(dce_list); #define DCE_CACHE_SIZE 64 @@ -1164,22 +1153,6 @@ INT WINAPI ReleaseDC( HWND hwnd, HDC hdc ) } -/********************************************************************** - * WindowFromDC (USER32.@) - */ -HWND WINAPI WindowFromDC( HDC hdc ) -{ - struct dce *dce; - HWND hwnd = 0; - - USER_Lock(); - dce = (struct dce *)GetDCHook( hdc, NULL ); - if (dce) hwnd = dce->hwnd; - USER_Unlock(); - return hwnd; -} - - /*********************************************************************** * LockWindowUpdate (USER32.@) * diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index 4c4e795c34a..aac2e39fa6d 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -818,7 +818,7 @@ @ stdcall WinHelpA(long str long long) @ stdcall WinHelpW(long wstr long long) # @ stub WinOldAppHackoMatic -@ stdcall WindowFromDC(long) +@ stdcall WindowFromDC(long) NtUserWindowFromDC @ stdcall WindowFromPoint(int64) @ stdcall WindowFromPhysicalPoint(int64) # @ stub YieldTask diff --git a/dlls/user32/user_main.c b/dlls/user32/user_main.c index 2ef7b3f01d0..ba7462ee241 100644 --- a/dlls/user32/user_main.c +++ b/dlls/user32/user_main.c @@ -151,7 +151,6 @@ static const struct user_callbacks user_funcs = SendNotifyMessageW, SetWindowPos, WaitForInputIdle, - WindowFromDC, free_dce, notify_ime, register_builtin_classes, diff --git a/dlls/win32u/Makefile.in b/dlls/win32u/Makefile.in index ceb8f83eb97..2dea3682064 100644 --- a/dlls/win32u/Makefile.in +++ b/dlls/win32u/Makefile.in @@ -17,6 +17,7 @@ C_SRCS = \ clipping.c \ cursoricon.c \ dc.c \ + dce.c \ dib.c \ dibdrv/bitblt.c \ dibdrv/dc.c \ diff --git a/dlls/win32u/dce.c b/dlls/win32u/dce.c new file mode 100644 index 00000000000..a811f7eae7f --- /dev/null +++ b/dlls/win32u/dce.c @@ -0,0 +1,42 @@ +/* + * Window painting functions + * + * Copyright 1993, 1994, 1995, 2001, 2004, 2005, 2008 Alexandre Julliard + * Copyright 1996, 1997, 1999 Alex Korobka + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#if 0 +#pragma makedep unix +#endif + +#include "ntgdi_private.h" +#include "ntuser_private.h" + +/********************************************************************** + * NtUserWindowFromDC (win32u.@) + */ +HWND WINAPI NtUserWindowFromDC( HDC hdc ) +{ + struct dce *dce; + HWND hwnd = 0; + + user_lock(); + dce = (struct dce *)GetDCHook( hdc, NULL ); + if (dce) hwnd = dce->hwnd; + user_unlock(); + return hwnd; +} diff --git a/dlls/win32u/ntuser_private.h b/dlls/win32u/ntuser_private.h index 6c10a3e77e1..160e3ab5f14 100644 --- a/dlls/win32u/ntuser_private.h +++ b/dlls/win32u/ntuser_private.h @@ -38,7 +38,6 @@ struct user_callbacks BOOL (WINAPI *pSendNotifyMessageW)( HWND, UINT, WPARAM, LPARAM ); BOOL (WINAPI *pSetWindowPos)( HWND, HWND, INT, INT, INT, INT, UINT ); DWORD (WINAPI *pWaitForInputIdle)( HANDLE, DWORD ); - HWND (WINAPI *pWindowFromDC)( HDC ); void (WINAPI *free_dce)( struct dce *dce, HWND hwnd ); void (CDECL *notify_ime)( HWND hwnd, UINT param ); void (CDECL *register_builtin_classes)(void); @@ -196,6 +195,18 @@ typedef struct tagWINDOWPROC #define MAX_ATOM_LEN 255 +/* FIXME: make it private to dce.c */ +struct dce +{ + struct list entry; /* entry in global DCE list */ + HDC hdc; + HWND hwnd; + HRGN clip_rgn; + DWORD flags; + LONG count; /* usage count; 0 or 1 for cache DCEs, always 1 for window DCEs, + always >= 1 for class DCEs */ +}; + /* Built-in class names (see _Undocumented_Windows_ p.418) */ #define POPUPMENU_CLASS_ATOM MAKEINTATOM(32768) /* PopupMenu */ #define DESKTOP_CLASS_ATOM MAKEINTATOM(32769) /* Desktop */ diff --git a/dlls/win32u/palette.c b/dlls/win32u/palette.c index 367bfea21b4..18885c7fba8 100644 --- a/dlls/win32u/palette.c +++ b/dlls/win32u/palette.c @@ -516,7 +516,7 @@ HPALETTE WINAPI NtUserSelectPalette( HDC hdc, HPALETTE hpal, WORD bkg ) if (!bkg && hpal != get_stock_object( DEFAULT_PALETTE )) { - HWND hwnd = user_callbacks->pWindowFromDC( hdc ); + HWND hwnd = NtUserWindowFromDC( hdc ); if (hwnd) { /* set primary palette if it's related to current active */ @@ -582,7 +582,7 @@ UINT realize_palette( HDC hdc ) if (realized && is_primary) { /* send palette change notification */ - HWND hwnd = user_callbacks->pWindowFromDC( hdc ); + HWND hwnd = NtUserWindowFromDC( hdc ); if (hwnd) user_callbacks->pSendMessageTimeoutW( HWND_BROADCAST, WM_PALETTECHANGED, HandleToUlong(hwnd), 0, SMTO_ABORTIFHUNG, 2000, NULL ); @@ -591,9 +591,6 @@ UINT realize_palette( HDC hdc ) } -typedef HWND (WINAPI *WindowFromDC_funcptr)( HDC ); -typedef BOOL (WINAPI *RedrawWindow_funcptr)( HWND, const RECT *, HRGN, UINT ); - /********************************************************************** * NtGdiUpdateColors (win32u.@) * @@ -607,7 +604,7 @@ BOOL WINAPI NtGdiUpdateColors( HDC hDC ) if (!size) return FALSE; if (!user_callbacks) return TRUE; - hwnd = user_callbacks->pWindowFromDC( hDC ); + hwnd = NtUserWindowFromDC( hDC ); /* Docs say that we have to remap current drawable pixel by pixel * but it would take forever given the speed of XGet/PutPixel. diff --git a/dlls/win32u/syscall.c b/dlls/win32u/syscall.c index 41f9cfead49..abe32b8d70c 100644 --- a/dlls/win32u/syscall.c +++ b/dlls/win32u/syscall.c @@ -158,6 +158,7 @@ static void * const syscalls[] = NtUserSetWindowsHookEx, NtUserUnhookWinEvent, NtUserUnhookWindowsHookEx, + NtUserWindowFromDC, }; static BYTE arguments[ARRAY_SIZE(syscalls)]; diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec index 671d26f6805..7238e729e79 100644 --- a/dlls/win32u/win32u.spec +++ b/dlls/win32u/win32u.spec @@ -1309,7 +1309,7 @@ @ stub NtUserWaitForMsgAndEvent @ stub NtUserWaitForRedirectionStartComplete @ stub NtUserWaitMessage -@ stub NtUserWindowFromDC +@ stdcall -syscall NtUserWindowFromDC(long) @ stub NtUserWindowFromPhysicalPoint @ stdcall NtUserWindowFromPoint(long long) @ stub NtUserYieldTask diff --git a/dlls/wow64win/syscall.h b/dlls/wow64win/syscall.h index 82262cd83ab..b6cdf5edfb2 100644 --- a/dlls/wow64win/syscall.h +++ b/dlls/wow64win/syscall.h @@ -142,6 +142,7 @@ SYSCALL_ENTRY( NtUserSetWinEventHook ) \ SYSCALL_ENTRY( NtUserSetWindowsHookEx ) \ SYSCALL_ENTRY( NtUserUnhookWinEvent ) \ - SYSCALL_ENTRY( NtUserUnhookWindowsHookEx ) + SYSCALL_ENTRY( NtUserUnhookWindowsHookEx ) \ + SYSCALL_ENTRY( NtUserWindowFromDC ) #endif /* __WOW64WIN_SYSCALL_H */ diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c index 4ee05838b47..b8c4a86a352 100644 --- a/dlls/wow64win/user.c +++ b/dlls/wow64win/user.c @@ -206,6 +206,13 @@ NTSTATUS WINAPI wow64_NtUserGetWindowRgnEx( UINT *args ) return NtUserGetWindowRgnEx( hwnd, hrgn, unk ); } +NTSTATUS WINAPI wow64_NtUserWindowFromDC( UINT *args ) +{ + HDC hdc = get_handle( &args ); + + return HandleToUlong( NtUserWindowFromDC( hdc )); +} + NTSTATUS WINAPI wow64_NtUserBuildHwndList( UINT *args ) { HDESK desktop = get_handle( &args ); diff --git a/include/ntuser.h b/include/ntuser.h index 28a025059f6..fb8db926888 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -407,6 +407,7 @@ BOOL WINAPI NtUserUpdateLayeredWindow( HWND hwnd, HDC hdc_dst, const POINT *p const BLENDFUNCTION *blend, DWORD flags, const RECT *dirty ); WORD WINAPI NtUserVkKeyScanEx( WCHAR chr, HKL layout ); DWORD WINAPI NtUserWaitForInputIdle( HANDLE process, DWORD timeout, BOOL wow ); +HWND WINAPI NtUserWindowFromDC( HDC hdc ); HWND WINAPI NtUserWindowFromPoint( LONG x, LONG y ); #endif /* _NTUSER_ */

1 0