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

Jacek Caban : win32u: Move NtUserGetDCEx implementation from user32.
by Alexandre Julliard March 14, 2022

March 14, 2022

Module: wine Branch: master Commit: ace24ec946f10459eee756f657d9d9c71d4c319e URL: https://source.winehq.org/git/wine.git/?a=commit;h=ace24ec946f10459eee756f6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 14 11:43:55 2022 +0100 win32u: Move NtUserGetDCEx 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/caret.c | 4 +- dlls/user32/class.c | 20 -- dlls/user32/controls.h | 2 - dlls/user32/driver.c | 21 +- dlls/user32/listbox.c | 6 +- dlls/user32/menu.c | 6 +- dlls/user32/nonclient.c | 4 +- dlls/user32/painting.c | 551 ++---------------------------------------- dlls/user32/scroll.c | 5 +- dlls/user32/user32.spec | 2 +- dlls/user32/user_main.c | 1 - dlls/user32/user_private.h | 2 - dlls/user32/winpos.c | 2 +- dlls/win32u/class.c | 20 +- dlls/win32u/dce.c | 557 +++++++++++++++++++++++++++++++++++++++++++ dlls/win32u/driver.c | 8 + dlls/win32u/gdiobj.c | 2 +- dlls/win32u/ntuser_private.h | 7 +- dlls/win32u/sysparams.c | 6 + dlls/win32u/win32u.spec | 3 +- dlls/win32u/win32u_private.h | 7 +- dlls/win32u/window.c | 18 +- dlls/win32u/wrappers.c | 12 +- include/ntuser.h | 3 + 24 files changed, 661 insertions(+), 608 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ace24ec946f10459eee7…

1 0

Paul Gofman : winhttp: Also select for error in netconn_create().
by Alexandre Julliard March 14, 2022

March 14, 2022

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 : win32u: Move NtUserEndPaint implementation from user32.
by Alexandre Julliard March 14, 2022

March 14, 2022

Module: wine Branch: master Commit: 31a044efa5aca292f3443f7a23f54af6b407426a URL: https://source.winehq.org/git/wine.git/?a=commit;h=31a044efa5aca292f3443f7a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 14 11:44:41 2022 +0100 win32u: Move NtUserEndPaint 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/button.c | 2 +- dlls/user32/combo.c | 4 ++-- dlls/user32/defwnd.c | 2 +- dlls/user32/edit.c | 2 +- dlls/user32/listbox.c | 2 +- dlls/user32/menu.c | 2 +- dlls/user32/painting.c | 13 ------------- dlls/user32/scroll.c | 2 +- dlls/user32/static.c | 2 +- dlls/user32/user32.spec | 2 +- dlls/user32/user_main.c | 1 + dlls/win32u/dce.c | 12 ++++++++++++ dlls/win32u/gdiobj.c | 1 + dlls/win32u/ntuser_private.h | 1 + dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 1 + dlls/win32u/wrappers.c | 6 ++++++ include/ntuser.h | 1 + 18 files changed, 34 insertions(+), 24 deletions(-) diff --git a/dlls/user32/button.c b/dlls/user32/button.c index 37b5fe317e1..f4b570126f7 100644 --- a/dlls/user32/button.c +++ b/dlls/user32/button.c @@ -253,7 +253,7 @@ LRESULT ButtonWndProc_common(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, (btnPaintFunc[btn_type])( hWnd, hdc, ODA_DRAWENTIRE ); SetBkMode(hdc, nOldMode); /* reset painting mode */ } - if ( !wParam ) EndPaint( hWnd, &ps ); + if (!wParam) NtUserEndPaint( hWnd, &ps ); break; } diff --git a/dlls/user32/combo.c b/dlls/user32/combo.c index 21de55ad479..7fc75e8038a 100644 --- a/dlls/user32/combo.c +++ b/dlls/user32/combo.c @@ -832,8 +832,8 @@ static LRESULT COMBO_Paint(LPHEADCOMBO lphc, HDC hParamDC) SelectObject( hDC, hPrevBrush ); } - if( !hParamDC ) - EndPaint(lphc->self, &ps); + if (!hParamDC) + NtUserEndPaint( lphc->self, &ps ); return 0; } diff --git a/dlls/user32/defwnd.c b/dlls/user32/defwnd.c index 9804c3b5418..c4de8928462 100644 --- a/dlls/user32/defwnd.c +++ b/dlls/user32/defwnd.c @@ -381,7 +381,7 @@ static LRESULT DEFWND_DefWinProc( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPa wine_dbgstr_rect(&ps.rcPaint)); DrawIcon( hdc, x, y, hIcon ); } - EndPaint( hwnd, &ps ); + NtUserEndPaint( hwnd, &ps ); } return 0; } diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index e56fd85926d..9bbfa2727b2 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -3776,7 +3776,7 @@ static void EDIT_WM_Paint(EDITSTATE *es, HDC hdc) SelectObject(dc, old_font); if (!hdc) - EndPaint(es->hwndSelf, &ps); + NtUserEndPaint( es->hwndSelf, &ps ); } diff --git a/dlls/user32/listbox.c b/dlls/user32/listbox.c index 29ed35be331..fedd32711fd 100644 --- a/dlls/user32/listbox.c +++ b/dlls/user32/listbox.c @@ -3092,7 +3092,7 @@ LRESULT ListBoxWndProc_common( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam PAINTSTRUCT ps; HDC hdc = ( wParam ) ? ((HDC)wParam) : NtUserBeginPaint( descr->self, &ps ); ret = LISTBOX_Paint( descr, hdc ); - if( !wParam ) EndPaint( descr->self, &ps ); + if (!wParam) NtUserEndPaint( descr->self, &ps ); } return ret; case WM_SIZE: diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index 430d7ca8402..c0d03d30d0f 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -3584,7 +3584,7 @@ LRESULT WINAPI PopupMenuWndProc( HWND hwnd, UINT message, WPARAM wParam, LPARAM NtUserBeginPaint( hwnd, &ps ); MENU_DrawPopupMenu( hwnd, ps.hdc, (HMENU)GetWindowLongPtrW( hwnd, 0 ) ); - EndPaint( hwnd, &ps ); + NtUserEndPaint( hwnd, &ps ); return 0; } diff --git a/dlls/user32/painting.c b/dlls/user32/painting.c index 3cc1f802abd..218f57f1670 100644 --- a/dlls/user32/painting.c +++ b/dlls/user32/painting.c @@ -550,19 +550,6 @@ static HWND fix_caret(HWND hWnd, const RECT *scroll_rect, INT dx, INT dy, } -/*********************************************************************** - * EndPaint (USER32.@) - */ -BOOL WINAPI EndPaint( HWND hwnd, const PAINTSTRUCT *lps ) -{ - ShowCaret( hwnd ); - flush_window_surfaces( FALSE ); - if (!lps) return FALSE; - release_dc( hwnd, lps->hdc, TRUE ); - return TRUE; -} - - /*********************************************************************** * GetDC (USER32.@) * diff --git a/dlls/user32/scroll.c b/dlls/user32/scroll.c index 090d0bc1c7e..f1b5da5165f 100644 --- a/dlls/user32/scroll.c +++ b/dlls/user32/scroll.c @@ -1523,7 +1523,7 @@ LRESULT WINAPI USER_ScrollBarProc( HWND hwnd, UINT message, WPARAM wParam, LPARA PAINTSTRUCT ps; HDC hdc = wParam ? (HDC)wParam : NtUserBeginPaint( hwnd, &ps ); SCROLL_DrawScrollBar( hwnd, hdc, SB_CTL, g_tracking_info.hit_test, &g_tracking_info, TRUE, TRUE ); - if (!wParam) EndPaint(hwnd, &ps); + if (!wParam) NtUserEndPaint( hwnd, &ps ); } break; diff --git a/dlls/user32/static.c b/dlls/user32/static.c index 88ccb83c687..013e5c20312 100644 --- a/dlls/user32/static.c +++ b/dlls/user32/static.c @@ -385,7 +385,7 @@ LRESULT StaticWndProc_common( HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam (staticPaintFunc[style])( hwnd, hdc, hbrush, full_style ); SelectClipRgn( hdc, hrgn ); if (hrgn) DeleteObject( hrgn ); - if (!wParam) EndPaint(hwnd, &ps); + if (!wParam) NtUserEndPaint( hwnd, &ps ); } break; diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index 00decbbfade..8b339f7bfac 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -211,7 +211,7 @@ @ stdcall EndDeferWindowPos(long) @ stdcall EndDialog(long long) @ stdcall EndMenu() -@ stdcall EndPaint(long ptr) +@ stdcall EndPaint(long ptr) NtUserEndPaint @ stub EndTask # @ stub EnterReaderModeHelper @ stdcall EnumChildWindows(long ptr long) diff --git a/dlls/user32/user_main.c b/dlls/user32/user_main.c index d1d7a7ef1b2..1b4e8833a89 100644 --- a/dlls/user32/user_main.c +++ b/dlls/user32/user_main.c @@ -151,6 +151,7 @@ static const struct user_callbacks user_funcs = SendMessageW, SendNotifyMessageW, SetWindowPos, + ShowCaret, WaitForInputIdle, notify_ime, register_builtin_classes, diff --git a/dlls/win32u/dce.c b/dlls/win32u/dce.c index 5055e909351..218f502f848 100644 --- a/dlls/win32u/dce.c +++ b/dlls/win32u/dce.c @@ -926,3 +926,15 @@ HDC WINAPI NtUserBeginPaint( HWND hwnd, PAINTSTRUCT *ps ) ps->hdc = hdc; return hdc; } + +/*********************************************************************** + * NtUserEndPaint (win32u.@) + */ +BOOL WINAPI NtUserEndPaint( HWND hwnd, const PAINTSTRUCT *ps ) +{ + if (user_callbacks) user_callbacks->pShowCaret( hwnd ); + flush_window_surfaces( FALSE ); + if (!ps) return FALSE; + release_dc( hwnd, ps->hdc, TRUE ); + return TRUE; +} diff --git a/dlls/win32u/gdiobj.c b/dlls/win32u/gdiobj.c index a186c05a7cf..68cde8936a3 100644 --- a/dlls/win32u/gdiobj.c +++ b/dlls/win32u/gdiobj.c @@ -1162,6 +1162,7 @@ static struct unix_funcs unix_funcs = NtUserCountClipboardFormats, NtUserDestroyCursor, NtUserDrawIconEx, + NtUserEndPaint, NtUserEnumDisplayDevices, NtUserEnumDisplayMonitors, NtUserEnumDisplaySettings, diff --git a/dlls/win32u/ntuser_private.h b/dlls/win32u/ntuser_private.h index b870d0d0bcd..0e73be6fcd0 100644 --- a/dlls/win32u/ntuser_private.h +++ b/dlls/win32u/ntuser_private.h @@ -38,6 +38,7 @@ struct user_callbacks LRESULT (WINAPI *pSendMessageW)( HWND, UINT, WPARAM, LPARAM ); BOOL (WINAPI *pSendNotifyMessageW)( HWND, UINT, WPARAM, LPARAM ); BOOL (WINAPI *pSetWindowPos)( HWND, HWND, INT, INT, INT, INT, UINT ); + BOOL (WINAPI *pShowCaret)( HWND hwnd ); DWORD (WINAPI *pWaitForInputIdle)( HANDLE, DWORD ); void (CDECL *notify_ime)( HWND hwnd, UINT param ); void (CDECL *register_builtin_classes)(void); diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec index 1c1cb19ae94..ad24113adff 100644 --- a/dlls/win32u/win32u.spec +++ b/dlls/win32u/win32u.spec @@ -874,7 +874,7 @@ @ stub NtUserEnableWindowResizeOptimization @ stub NtUserEndDeferWindowPosEx @ stub NtUserEndMenu -@ stub NtUserEndPaint +@ stdcall NtUserEndPaint(long ptr) @ stdcall NtUserEnumDisplayDevices(ptr long ptr long) @ stdcall NtUserEnumDisplayMonitors(long ptr ptr long) @ stdcall NtUserEnumDisplaySettings(ptr long ptr long) diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index 6350813037c..b67a90c26c7 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -198,6 +198,7 @@ struct unix_funcs BOOL (WINAPI *pNtUserDestroyCursor)( HCURSOR cursor, ULONG arg ); BOOL (WINAPI *pNtUserDrawIconEx)( HDC hdc, INT x0, INT y0, HICON icon, INT width, INT height, UINT istep, HBRUSH hbr, UINT flags ); + BOOL (WINAPI *pNtUserEndPaint)( HWND hwnd, const PAINTSTRUCT *ps ); NTSTATUS (WINAPI *pNtUserEnumDisplayDevices)( UNICODE_STRING *device, DWORD index, DISPLAY_DEVICEW *info, DWORD flags ); BOOL (WINAPI *pNtUserEnumDisplayMonitors)( HDC hdc, RECT *rect, MONITORENUMPROC proc, LPARAM lp ); diff --git a/dlls/win32u/wrappers.c b/dlls/win32u/wrappers.c index a69e81e8e10..40100c7cde2 100644 --- a/dlls/win32u/wrappers.c +++ b/dlls/win32u/wrappers.c @@ -149,6 +149,12 @@ INT WINAPI NtGdiEndPage( HDC hdc ) return unix_funcs->pNtGdiEndPage( hdc ); } +BOOL WINAPI NtUserEndPaint( HWND hwnd, const PAINTSTRUCT *ps ) +{ + if (!unix_funcs) return FALSE; + return unix_funcs->pNtUserEndPaint( hwnd, ps ); +} + BOOL WINAPI NtGdiEnumFonts( HDC hdc, ULONG type, ULONG win32_compat, ULONG face_name_len, const WCHAR *face_name, ULONG charset, ULONG *count, void *buf ) { diff --git a/include/ntuser.h b/include/ntuser.h index 455d81a10fb..e27ef262403 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -297,6 +297,7 @@ BOOL WINAPI NtUserDestroyAcceleratorTable( HACCEL handle ); BOOL WINAPI NtUserDestroyCursor( HCURSOR cursor, ULONG arg ); BOOL WINAPI NtUserDrawIconEx( HDC hdc, INT x0, INT y0, HICON icon, INT width, INT height, UINT istep, HBRUSH hbr, UINT flags ); +BOOL WINAPI NtUserEndPaint( HWND hwnd, const PAINTSTRUCT *ps ); NTSTATUS WINAPI NtUserEnumDisplayDevices( UNICODE_STRING *device, DWORD index, DISPLAY_DEVICEW *info, DWORD flags ); BOOL WINAPI NtUserEnumDisplayMonitors( HDC hdc, RECT *rect, MONITORENUMPROC proc, LPARAM lp );

1 0

Paul Gofman : winhttp: Return an winhttp error from netconn_create() on connection failure.
by Alexandre Julliard March 14, 2022

March 14, 2022

Module: wine Branch: master Commit: 550fdbd1de2872da7f3758c264bf27afcb23063a URL: https://source.winehq.org/git/wine.git/?a=commit;h=550fdbd1de2872da7f3758c2… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Mar 14 13:31:27 2022 +0300 winhttp: Return an winhttp error from netconn_create() on connection failure. 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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index 09ed5e222d1..5e4c55fad6a 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -246,7 +246,7 @@ DWORD netconn_create( struct hostdata *host, const struct sockaddr_storage *sock WARN( "unable to connect to host (%lu)\n", ret ); closesocket( conn->socket ); free( conn ); - return ret; + return ret == ERROR_WINHTTP_TIMEOUT ? ERROR_WINHTTP_TIMEOUT : ERROR_WINHTTP_CANNOT_CONNECT; } *ret_conn = conn;

1 0

Michael Stefaniuc : d2d1/tests: Actually test the return of ID2D1TransformedGeometry_GetBounds.
by Alexandre Julliard March 14, 2022

March 14, 2022

Module: wine Branch: master Commit: 9bfe419e67cf432a48dfa3a7b96867d4c7a3d80e URL: https://source.winehq.org/git/wine.git/?a=commit;h=9bfe419e67cf432a48dfa3a7… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Mar 11 20:36:20 2022 +0100 d2d1/tests: Actually test the return of ID2D1TransformedGeometry_GetBounds. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/tests/d2d1.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 90445ba84fc..722f46bffe6 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -4163,7 +4163,7 @@ static void test_rectangle_geometry(BOOL d3d11) hr = ID2D1Factory_CreateTransformedGeometry(factory, (ID2D1Geometry *)geometry, &matrix, &transformed_geometry); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); - ID2D1TransformedGeometry_GetBounds(transformed_geometry, NULL, &rect); + hr = ID2D1TransformedGeometry_GetBounds(transformed_geometry, NULL, &rect); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); match = compare_rect(&rect, -7.85640717e+01f, 1.79903809e+02f, 1.07179594e+01f, 2.73205078e+02f, 1); ok(match, "Got unexpected bounds {%.8e, %.8e, %.8e, %.8e}.\n", @@ -4184,7 +4184,7 @@ static void test_rectangle_geometry(BOOL d3d11) set_matrix_identity(&matrix); rotate_matrix(&matrix, M_PI / -3.0f); scale_matrix(&matrix, 0.25f, 0.2f); - ID2D1TransformedGeometry_GetBounds(transformed_geometry, &matrix, &rect); + hr = ID2D1TransformedGeometry_GetBounds(transformed_geometry, &matrix, &rect); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); match = compare_rect(&rect, 30.0f, 20.0f, 40.0f, 40.0f, 2); ok(match, "Got unexpected bounds {%.8e, %.8e, %.8e, %.8e}.\n", @@ -4198,7 +4198,7 @@ static void test_rectangle_geometry(BOOL d3d11) set_matrix_identity(&matrix); scale_matrix(&matrix, 2.0f, 0.0f); - ID2D1TransformedGeometry_GetBounds(transformed_geometry, &matrix, &rect); + hr = ID2D1TransformedGeometry_GetBounds(transformed_geometry, &matrix, &rect); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); match = compare_rect(&rect, -1.57128143e+02f, 0.00000000e+00f, 2.14359188e+01f, 0.00000000e+00f, 1); ok(match, "Got unexpected bounds {%.8e, %.8e, %.8e, %.8e}.\n", @@ -4212,7 +4212,7 @@ static void test_rectangle_geometry(BOOL d3d11) set_matrix_identity(&matrix); scale_matrix(&matrix, 0.0f, 0.5f); - ID2D1TransformedGeometry_GetBounds(transformed_geometry, &matrix, &rect); + hr = ID2D1TransformedGeometry_GetBounds(transformed_geometry, &matrix, &rect); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); match = compare_rect(&rect, 0.00000000e+00f, 8.99519043e+01f, 0.00000000e+00, 1.36602539e+02f, 1); ok(match, "Got unexpected bounds {%.8e, %.8e, %.8e, %.8e}.\n",

1 0

Gijs Vermeulen : kernelbase: Add PathMatchSpecExA/W.
by Alexandre Julliard March 14, 2022

March 14, 2022

Module: wine Branch: master Commit: 205a9322f1a3d05763c4ae7be55350dff9967c6e URL: https://source.winehq.org/git/wine.git/?a=commit;h=205a9322f1a3d05763c4ae7b… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Sun Mar 13 01:27:34 2022 +0100 kernelbase: Add PathMatchSpecExA/W. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52645 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/kernelbase.spec | 4 ++-- dlls/kernelbase/path.c | 32 ++++++++++++++++++++++++-------- dlls/shlwapi/shlwapi.spec | 2 ++ include/shlwapi.h | 8 ++++++++ 4 files changed, 36 insertions(+), 10 deletions(-) diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index c1175af2f9f..a59d8581ff0 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -1124,8 +1124,8 @@ @ stdcall PathIsValidCharA(long long) @ stdcall PathIsValidCharW(long long) @ stdcall PathMatchSpecA(str str) -# @ stub PathMatchSpecExA -# @ stub PathMatchSpecExW +@ stdcall PathMatchSpecExA(str str long) +@ stdcall PathMatchSpecExW(wstr wstr long) @ stdcall PathMatchSpecW(wstr wstr) @ stdcall PathParseIconLocationA(str) @ stdcall PathParseIconLocationW(wstr) diff --git a/dlls/kernelbase/path.c b/dlls/kernelbase/path.c index f83c68e14f5..d59f20adb6e 100644 --- a/dlls/kernelbase/path.c +++ b/dlls/kernelbase/path.c @@ -2425,24 +2425,32 @@ BOOL WINAPI PathRelativePathToW(WCHAR *path, const WCHAR *from, DWORD attributes return TRUE; } -BOOL WINAPI PathMatchSpecA(const char *path, const char *mask) +HRESULT WINAPI PathMatchSpecExA(const char *path, const char *mask, DWORD flags) { WCHAR *pathW, *maskW; - BOOL ret; + HRESULT ret; TRACE("%s, %s\n", wine_dbgstr_a(path), wine_dbgstr_a(mask)); + if (flags) + FIXME("Ignoring flags %#lx.", flags); + if (!lstrcmpA(mask, "*.*")) - return TRUE; /* Matches every path */ + return S_OK; /* Matches every path */ pathW = heap_strdupAtoW( path ); maskW = heap_strdupAtoW( mask ); - ret = PathMatchSpecW( pathW, maskW ); + ret = PathMatchSpecExW( pathW, maskW, flags ); heap_free( pathW ); heap_free( maskW ); return ret; } +BOOL WINAPI PathMatchSpecA(const char *path, const char *mask) +{ + return PathMatchSpecExA(path, mask, 0) == S_OK; +} + static BOOL path_match_maskW(const WCHAR *name, const WCHAR *mask) { while (*name && *mask && *mask != ';') @@ -2475,12 +2483,15 @@ static BOOL path_match_maskW(const WCHAR *name, const WCHAR *mask) return FALSE; } -BOOL WINAPI PathMatchSpecW(const WCHAR *path, const WCHAR *mask) +HRESULT WINAPI PathMatchSpecExW(const WCHAR *path, const WCHAR *mask, DWORD flags) { TRACE("%s, %s\n", wine_dbgstr_w(path), wine_dbgstr_w(mask)); + if (flags) + FIXME("Ignoring flags %#lx.", flags); + if (!lstrcmpW(mask, L"*.*")) - return TRUE; /* Matches every path */ + return S_OK; /* Matches every path */ while (*mask) { @@ -2488,7 +2499,7 @@ BOOL WINAPI PathMatchSpecW(const WCHAR *path, const WCHAR *mask) mask++; /* Eat leading spaces */ if (path_match_maskW(path, mask)) - return TRUE; /* Matches the current path */ + return S_OK; /* Matches the current path */ while (*mask && *mask != ';') mask++; /* masks separated by ';' */ @@ -2497,7 +2508,12 @@ BOOL WINAPI PathMatchSpecW(const WCHAR *path, const WCHAR *mask) mask++; } - return FALSE; + return S_FALSE; +} + +BOOL WINAPI PathMatchSpecW(const WCHAR *path, const WCHAR *mask) +{ + return PathMatchSpecExW(path, mask, 0) == S_OK; } void WINAPI PathQuoteSpacesA(char *path) diff --git a/dlls/shlwapi/shlwapi.spec b/dlls/shlwapi/shlwapi.spec index c61e45b0270..801b2c9a890 100644 --- a/dlls/shlwapi/shlwapi.spec +++ b/dlls/shlwapi/shlwapi.spec @@ -642,6 +642,8 @@ @ stdcall PathMakeSystemFolderA(str) @ stdcall PathMakeSystemFolderW(wstr) @ stdcall -import PathMatchSpecA(str str) +@ stdcall -import PathMatchSpecExA(str str long) +@ stdcall -import PathMatchSpecExW(wstr wstr long) @ stdcall -import PathMatchSpecW(wstr wstr) @ stdcall -import PathParseIconLocationA(str) @ stdcall -import PathParseIconLocationW(wstr) diff --git a/include/shlwapi.h b/include/shlwapi.h index 07ca0fac837..a282ae6d993 100644 --- a/include/shlwapi.h +++ b/include/shlwapi.h @@ -482,6 +482,14 @@ BOOL WINAPI PathMatchSpecA(LPCSTR,LPCSTR); BOOL WINAPI PathMatchSpecW(LPCWSTR,LPCWSTR); #define PathMatchSpec WINELIB_NAME_AW(PathMatchSpec) +#define PMSF_NORMAL 0x00000000 +#define PMSF_MULTIPLE 0x00000001 +#define PMSF_DONT_STRIP_SPACES 0x00010000 + +HRESULT WINAPI PathMatchSpecExA(LPCSTR,LPCSTR,DWORD); +HRESULT WINAPI PathMatchSpecExW(LPCWSTR,LPCWSTR,DWORD); +#define PathMatchSpecEx WINELIB_NAME_AW(PathMatchSpecEx) + int WINAPI PathParseIconLocationA(LPSTR); int WINAPI PathParseIconLocationW(LPWSTR); #define PathParseIconLocation WINELIB_NAME_AW(PathParseIconLocation)

1 0

Gijs Vermeulen : include: Add more Wait Chain Traversal definitions.
by Alexandre Julliard March 14, 2022

March 14, 2022

Module: wine Branch: master Commit: e3421d50fd1b1273e1d5758666c72e069a9597f9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e3421d50fd1b1273e1d57586… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Sun Mar 13 00:27:57 2022 +0100 include: Add more Wait Chain Traversal definitions. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wct.h | 76 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) diff --git a/include/wct.h b/include/wct.h index 0cef59d7174..6c239786916 100644 --- a/include/wct.h +++ b/include/wct.h @@ -19,9 +19,85 @@ #ifndef __WINE_WCT_H #define __WINE_WCT_H +#ifdef __cplusplus +extern "C" { +#endif + +#define WCT_MAX_NODE_COUNT 16 +#define WCT_OBJNAME_LENGTH 128 + +#define WCT_ASYNC_OPEN_FLAG 0x1 +#define WCTP_OPEN_ALL_FLAGS (WCT_ASYNC_OPEN_FLAG) + +#define WCT_OUT_OF_PROC_FLAG 0x1 +#define WCT_OUT_OF_PROC_COM_FLAG 0x2 +#define WCT_OUT_OF_PROC_CS_FLAG 0x4 +#define WCT_NETWORK_IO_FLAG 0x8 +#define WCTP_GETINFO_ALL_FLAGS (WCT_OUT_OF_PROC_FLAG|WCT_OUT_OF_PROC_COM_FLAG|WCT_OUT_OF_PROC_CS_FLAG) + +typedef enum _WCT_OBJECT_TYPE +{ + WctCriticalSectionType = 1, + WctSendMessageType, + WctMutexType, + WctAlpcType, + WctComType, + WctThreadWaitType, + WctProcessWaitType, + WctThreadType, + WctComActivationType, + WctUnknownType, + WctSocketIoType, + WctSmbIoType, + WctMaxType +} WCT_OBJECT_TYPE; + +typedef enum _WCT_OBJECT_STATUS +{ + WctStatusNoAccess = 1, + WctStatusRunning, + WctStatusBlocked, + WctStatusPidOnly, + WctStatusPidOnlyRpcss, + WctStatusOwned, + WctStatusNotOwned, + WctStatusAbandoned, + WctStatusUnknown, + WctStatusError, + WctStatusMax +} WCT_OBJECT_STATUS; + +typedef struct _WAITCHAIN_NODE_INFO +{ + WCT_OBJECT_TYPE ObjectType; + WCT_OBJECT_STATUS ObjectStatus; + __C89_NAMELESS union { + struct { + WCHAR ObjectName[WCT_OBJNAME_LENGTH]; + LARGE_INTEGER Timeout; + BOOL Alertable; + } LockObject; + struct { + DWORD ProcessId; + DWORD ThreadId; + DWORD WaitTime; + DWORD ContextSwitches; + } ThreadObject; + }; +} WAITCHAIN_NODE_INFO, *PWAITCHAIN_NODE_INFO; + +typedef LPVOID HWCT; +typedef VOID (CALLBACK *PWAITCHAINCALLBACK) (HWCT,DWORD_PTR,DWORD,LPDWORD,PWAITCHAIN_NODE_INFO,LPBOOL); typedef HRESULT (WINAPI *PCOGETCALLSTATE)(int,PULONG); typedef HRESULT (WINAPI *PCOGETACTIVATIONSTATE)(GUID,DWORD,DWORD*); +VOID WINAPI CloseThreadWaitChainSession(HWCT); +BOOL WINAPI GetThreadWaitChain(HWCT,DWORD_PTR,DWORD,DWORD,LPDWORD,PWAITCHAIN_NODE_INFO,LPBOOL); +HWCT WINAPI OpenThreadWaitChainSession(DWORD,PWAITCHAINCALLBACK); void WINAPI RegisterWaitChainCOMCallback(PCOGETCALLSTATE,PCOGETACTIVATIONSTATE); +#ifdef __cplusplus +} +#endif + #endif /* __WINE_WCT_H */

1 0

Bernhard Kölbl : windows.media.speech: Add SpeechRecognitionListConstraint statics stub.
by Alexandre Julliard March 14, 2022

March 14, 2022

Module: wine Branch: master Commit: c0afc986b36b25fd474d26073ae18d2851adf22c URL: https://source.winehq.org/git/wine.git/?a=commit;h=c0afc986b36b25fd474d2607… Author: Bernhard Kölbl <besentv(a)gmail.com> Date: Mon Mar 14 11:06:36 2022 +0100 windows.media.speech: Add SpeechRecognitionListConstraint statics stub. Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windows.media.speech/Makefile.in | 1 + dlls/windows.media.speech/listconstraint.c | 183 +++++++++++++++++++++++++++++ dlls/windows.media.speech/main.c | 2 + dlls/windows.media.speech/private.h | 1 + dlls/windows.media.speech/tests/speech.c | 18 +-- 5 files changed, 197 insertions(+), 8 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c0afc986b36b25fd474d…

1 0

Eric Pouech : oleaut32/tests: Convert UI8 to existing integer test scheme.
by Alexandre Julliard March 14, 2022

March 14, 2022

Module: wine Branch: master Commit: df0eaf58825a83cb6d986dcd2f0c338100dffb68 URL: https://source.winehq.org/git/wine.git/?a=commit;h=df0eaf58825a83cb6d986dcd… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Sat Mar 12 09:36:30 2022 +0100 oleaut32/tests: Convert UI8 to existing integer test scheme. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/vartype.c | 152 +++++++++++++++++------------------------- 1 file changed, 63 insertions(+), 89 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=df0eaf58825a83cb6d98…

1 0

Jinoh Kang : user32: Recognise RichEdit50W window class in spy.
by Alexandre Julliard March 14, 2022

March 14, 2022

Module: wine Branch: master Commit: 411d640d3f5e6c8bf13e5109a57eb892c659a42f URL: https://source.winehq.org/git/wine.git/?a=commit;h=411d640d3f5e6c8bf13e5109… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Sat Mar 12 19:36:01 2022 +0900 user32: Recognise RichEdit50W window class in spy. Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/spy.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/user32/spy.c b/dlls/user32/spy.c index dc8e0b2a708..4d22acb43c2 100644 --- a/dlls/user32/spy.c +++ b/dlls/user32/spy.c @@ -1764,6 +1764,7 @@ static const CONTROL_CLASS cc_array[] = { {TOOLTIPS_CLASSW, tooltips_array, ARRAY_SIZE(tooltips_array)}, {UPDOWN_CLASSW, updown_array, ARRAY_SIZE(updown_array)}, {RICHEDIT_CLASS20W, richedit_array, ARRAY_SIZE(richedit_array)}, + {MSFTEDIT_CLASS, richedit_array, ARRAY_SIZE(richedit_array)}, {0, 0, 0} };

1 0