August 2018 - Wine-Commits - list.winehq.org

Alexandre Julliard : user32: Scale coordinates in Get/SetWindowPlacement() based on DPI awareness.
by Alexandre Julliard Aug. 24, 2018

Aug. 24, 2018

Module: wine Branch: master Commit: 87e49000a1206635d4acba52703525bd81a2df09 URL: https://source.winehq.org/git/wine.git/?a=commit;h=87e49000a1206635d4acba52… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 24 12:23:28 2018 +0200 user32: Scale coordinates in Get/SetWindowPlacement() based on DPI awareness. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/sysparams.c | 20 ++++++++++++++++++++ dlls/user32/win.h | 3 +++ dlls/user32/winpos.c | 12 ++++++------ 3 files changed, 29 insertions(+), 6 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index a971062..9d7c256 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -3245,6 +3245,16 @@ POINT point_win_to_thread_dpi( HWND hwnd, POINT pt ) } /********************************************************************** + * point_thread_to_win_dpi + */ +POINT point_thread_to_win_dpi( HWND hwnd, POINT pt ) +{ + UINT dpi = get_thread_dpi(); + if (!dpi) dpi = get_win_monitor_dpi( hwnd ); + return map_dpi_point( pt, dpi, GetDpiForWindow( hwnd )); +} + +/********************************************************************** * map_dpi_rect */ RECT map_dpi_rect( RECT rect, UINT dpi_from, UINT dpi_to ) @@ -3270,6 +3280,16 @@ RECT rect_win_to_thread_dpi( HWND hwnd, RECT rect ) } /********************************************************************** + * rect_thread_to_win_dpi + */ +RECT rect_thread_to_win_dpi( HWND hwnd, RECT rect ) +{ + UINT dpi = get_thread_dpi(); + if (!dpi) dpi = get_win_monitor_dpi( hwnd ); + return map_dpi_rect( rect, dpi, GetDpiForWindow( hwnd ) ); +} + +/********************************************************************** * SetProcessDpiAwarenessContext (USER32.@) */ BOOL WINAPI SetProcessDpiAwarenessContext( DPI_AWARENESS_CONTEXT context ) diff --git a/dlls/user32/win.h b/dlls/user32/win.h index b912ef8..f30b004 100644 --- a/dlls/user32/win.h +++ b/dlls/user32/win.h @@ -133,8 +133,11 @@ extern UINT get_win_monitor_dpi( HWND hwnd ) DECLSPEC_HIDDEN; extern UINT get_thread_dpi(void) DECLSPEC_HIDDEN; extern POINT map_dpi_point( POINT pt, UINT dpi_from, UINT dpi_to ) DECLSPEC_HIDDEN; extern POINT point_win_to_thread_dpi( HWND hwnd, POINT pt ) DECLSPEC_HIDDEN; +extern POINT point_thread_to_win_dpi( HWND hwnd, POINT pt ) DECLSPEC_HIDDEN; extern RECT map_dpi_rect( RECT rect, UINT dpi_from, UINT dpi_to ) DECLSPEC_HIDDEN; extern RECT rect_win_to_thread_dpi( HWND hwnd, RECT rect ) DECLSPEC_HIDDEN; +extern RECT rect_thread_to_win_dpi( HWND hwnd, RECT rect ) DECLSPEC_HIDDEN; + extern BOOL set_window_pos( HWND hwnd, HWND insert_after, UINT swp_flags, const RECT *window_rect, const RECT *client_rect, const RECT *valid_rects ) DECLSPEC_HIDDEN; diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index 1dd9c12..98eec62 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -1342,9 +1342,9 @@ BOOL WINAPI GetWindowPlacement( HWND hwnd, WINDOWPLACEMENT *wndpl ) wndpl->flags = WPF_RESTORETOMAXIMIZED; else wndpl->flags = 0; - wndpl->ptMinPosition = pWnd->min_pos; - wndpl->ptMaxPosition = pWnd->max_pos; - wndpl->rcNormalPosition = pWnd->normal_rect; + wndpl->ptMinPosition = EMPTYPOINT(pWnd->min_pos) ? pWnd->min_pos : point_win_to_thread_dpi( hwnd, pWnd->min_pos ); + wndpl->ptMaxPosition = EMPTYPOINT(pWnd->max_pos) ? pWnd->max_pos : point_win_to_thread_dpi( hwnd, pWnd->max_pos ); + wndpl->rcNormalPosition = rect_win_to_thread_dpi( hwnd, pWnd->normal_rect ); WIN_ReleasePtr( pWnd ); TRACE( "%p: returning min %d,%d max %d,%d normal %s\n", @@ -1419,9 +1419,9 @@ static BOOL WINPOS_SetPlacement( HWND hwnd, const WINDOWPLACEMENT *wndpl, UINT f if (!pWnd || pWnd == WND_OTHER_PROCESS || pWnd == WND_DESKTOP) return FALSE; - if( flags & PLACE_MIN ) pWnd->min_pos = wp.ptMinPosition; - if( flags & PLACE_MAX ) pWnd->max_pos = wp.ptMaxPosition; - if( flags & PLACE_RECT) pWnd->normal_rect = wp.rcNormalPosition; + if (flags & PLACE_MIN) pWnd->min_pos = point_thread_to_win_dpi( hwnd, wp.ptMinPosition ); + if (flags & PLACE_MAX) pWnd->max_pos = point_thread_to_win_dpi( hwnd, wp.ptMaxPosition ); + if (flags & PLACE_RECT) pWnd->normal_rect = rect_thread_to_win_dpi( hwnd, wp.rcNormalPosition ); style = pWnd->dwStyle;

1 0

Zhiyi Zhang : winhttp: Add support for WINHTTP_ENABLE_SSL_REVOCATION.
by Alexandre Julliard Aug. 24, 2018

Aug. 24, 2018

Module: wine Branch: master Commit: b55f5683833059abfea714d59e4799204dcc39f4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b55f5683833059abfea714d5… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Aug 24 16:32:49 2018 +0800 winhttp: Add support for WINHTTP_ENABLE_SSL_REVOCATION. This also fixes a regression caused by 0b61334b9d6392e8c8a9772d762efaf0c2eb0835, which is causing Office 2013 to fail to login, saying that there is a problem with your account. Signed-off-by: Zhiyi Zhang <zzhang(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/request.c | 2 +- dlls/winhttp/session.c | 12 ++++++++++++ dlls/winhttp/tests/winhttp.c | 31 +++++++++++++++++++++++++++++++ dlls/winhttp/winhttp_private.h | 3 ++- 5 files changed, 54 insertions(+), 8 deletions(-) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index d577a64..2625e4a 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -160,7 +160,7 @@ static int sock_recv(int fd, void *msg, size_t len, int flags) return ret; } -static DWORD netconn_verify_cert( PCCERT_CONTEXT cert, WCHAR *server, DWORD security_flags ) +static DWORD netconn_verify_cert( PCCERT_CONTEXT cert, WCHAR *server, DWORD security_flags, BOOL check_revocation ) { HCERTSTORE store = cert->hCertStore; BOOL ret; @@ -173,9 +173,10 @@ static DWORD netconn_verify_cert( PCCERT_CONTEXT cert, WCHAR *server, DWORD secu TRACE("verifying %s\n", debugstr_w( server )); chainPara.RequestedUsage.Usage.cUsageIdentifier = 1; chainPara.RequestedUsage.Usage.rgpszUsageIdentifier = server_auth; - if ((ret = CertGetCertificateChain( NULL, cert, NULL, store, &chainPara, - CERT_CHAIN_REVOCATION_CHECK_CHAIN_EXCLUDE_ROOT, - NULL, &chain ))) + ret = CertGetCertificateChain( NULL, cert, NULL, store, &chainPara, + check_revocation ? CERT_CHAIN_REVOCATION_CHECK_CHAIN_EXCLUDE_ROOT : 0, + NULL, &chain ); + if (ret) { if (chain->TrustStatus.dwErrorStatus) { @@ -370,7 +371,8 @@ BOOL netconn_close( netconn_t *conn ) return TRUE; } -BOOL netconn_secure_connect( netconn_t *conn, WCHAR *hostname, DWORD security_flags, CredHandle *cred_handle ) +BOOL netconn_secure_connect( netconn_t *conn, WCHAR *hostname, DWORD security_flags, CredHandle *cred_handle, + BOOL check_revocation) { SecBuffer out_buf = {0, SECBUFFER_TOKEN, NULL}, in_bufs[2] = {{0, SECBUFFER_TOKEN}, {0, SECBUFFER_EMPTY}}; SecBufferDesc out_desc = {SECBUFFER_VERSION, 1, &out_buf}, in_desc = {SECBUFFER_VERSION, 2, in_bufs}; @@ -466,7 +468,7 @@ BOOL netconn_secure_connect( netconn_t *conn, WCHAR *hostname, DWORD security_fl status = QueryContextAttributesW(&ctx, SECPKG_ATTR_REMOTE_CERT_CONTEXT, (void*)&cert); if(status == SEC_E_OK) { - res = netconn_verify_cert(cert, hostname, security_flags); + res = netconn_verify_cert(cert, hostname, security_flags, check_revocation); CertFreeCertificateContext(cert); if(res != ERROR_SUCCESS) { WARN("cert verify failed: %u\n", res); diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 5e5b229..65d641f 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -1769,7 +1769,7 @@ static BOOL open_connection( request_t *request ) if (!ensure_cred_handle( connect->session ) || !netconn_secure_connect( netconn, connect->hostname, request->security_flags, - &connect->session->cred_handle )) + &connect->session->cred_handle, request->check_revocation )) { heap_free( addressW ); netconn_close( netconn ); diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index fb81568..788f7c6 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -1020,6 +1020,18 @@ static BOOL request_set_option( object_header_t *hdr, DWORD option, LPVOID buffe } FIXME("WINHTTP_OPTION_CLIENT_CERT_CONTEXT\n"); return TRUE; + case WINHTTP_OPTION_ENABLE_FEATURE: + if(buflen == sizeof( DWORD ) && *(DWORD *)buffer == WINHTTP_ENABLE_SSL_REVOCATION) + { + request->check_revocation = TRUE; + SetLastError( NO_ERROR ); + return TRUE; + } + else + { + SetLastError( ERROR_INVALID_PARAMETER ); + return FALSE; + } default: FIXME("unimplemented option %u\n", option); set_last_error( ERROR_WINHTTP_INVALID_OPTION ); diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index c9e053f..2e903e1 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -201,6 +201,37 @@ static void test_QueryOption(void) ok(GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); + feature = 0xdeadbeef; + size = sizeof(feature); + SetLastError(0xdeadbeef); + ret = WinHttpQueryOption(request, WINHTTP_OPTION_ENABLE_FEATURE, &feature, &size); + ok(!ret, "should fail to query enabled features for a request\n"); + ok(feature == 0xdeadbeef, "expect feature 0xdeadbeef, got %u\n", feature); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); + + feature = WINHTTP_ENABLE_SSL_REVOCATION; + SetLastError(0xdeadbeef); + ret = WinHttpSetOption(request, WINHTTP_OPTION_ENABLE_FEATURE, 0, sizeof(feature)); + ok(!ret, "should fail to enable WINHTTP_ENABLE_SSL_REVOCATION with invalid parameters\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = WinHttpSetOption(request, WINHTTP_OPTION_ENABLE_FEATURE, &feature, 0); + ok(!ret, "should fail to enable WINHTTP_ENABLE_SSL_REVOCATION with invalid parameters\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = WinHttpSetOption(request, WINHTTP_OPTION_ENABLE_FEATURE, &feature, sizeof(feature)); + ok(ret, "failed to set feature\n"); + ok(GetLastError() == NO_ERROR || broken(GetLastError() == 0xdeadbeef), /* Doesn't set error code on Vista or older */ + "expected NO_ERROR, got %u\n", GetLastError()); + + feature = 0xdeadbeef; + SetLastError(0xdeadbeef); + ret = WinHttpSetOption(request, WINHTTP_OPTION_ENABLE_FEATURE, &feature, sizeof(feature)); + ok(!ret, "should fail to enable WINHTTP_ENABLE_SSL_REVOCATION with invalid parameters\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); + SetLastError(0xdeadbeef); ret = WinHttpCloseHandle(request); ok(ret, "WinHttpCloseHandle failed on closing request: %u\n", GetLastError()); diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index d639a2d..f1aa562 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -210,6 +210,7 @@ typedef struct DWORD optional_len; netconn_t *netconn; DWORD security_flags; + BOOL check_revocation; const CERT_CONTEXT *server_cert; int resolve_timeout; int connect_timeout; @@ -306,7 +307,7 @@ void netconn_unload( void ) DECLSPEC_HIDDEN; ULONG netconn_query_data_available( netconn_t * ) DECLSPEC_HIDDEN; BOOL netconn_recv( netconn_t *, void *, size_t, int, int * ) DECLSPEC_HIDDEN; BOOL netconn_resolve( WCHAR *, INTERNET_PORT, struct sockaddr_storage *, int ) DECLSPEC_HIDDEN; -BOOL netconn_secure_connect( netconn_t *, WCHAR *, DWORD, CredHandle * ) DECLSPEC_HIDDEN; +BOOL netconn_secure_connect( netconn_t *, WCHAR *, DWORD, CredHandle *, BOOL ) DECLSPEC_HIDDEN; BOOL netconn_send( netconn_t *, const void *, size_t, int * ) DECLSPEC_HIDDEN; DWORD netconn_set_timeout( netconn_t *, BOOL, int ) DECLSPEC_HIDDEN; BOOL netconn_is_alive( netconn_t * ) DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : user32: Switch to the window DPI awareness in update_window_state().
by Alexandre Julliard Aug. 24, 2018

Aug. 24, 2018

Module: wine Branch: master Commit: 56b05ded78665feef68184b9409cbc0f6cd80905 URL: https://source.winehq.org/git/wine.git/?a=commit;h=56b05ded78665feef68184b9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 24 12:35:16 2018 +0200 user32: Switch to the window DPI awareness in update_window_state(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/win.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index e3edbf6..e7bbc4e 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -446,13 +446,16 @@ static void send_parent_notify( HWND hwnd, UINT msg ) */ static void update_window_state( HWND hwnd ) { + DPI_AWARENESS_CONTEXT context; RECT window_rect, client_rect, valid_rects[2]; + context = SetThreadDpiAwarenessContext( GetWindowDpiAwarenessContext( hwnd )); WIN_GetRectangles( hwnd, COORDS_PARENT, &window_rect, &client_rect ); valid_rects[0] = valid_rects[1] = client_rect; set_window_pos( hwnd, 0, SWP_NOSIZE | SWP_NOMOVE | SWP_NOCLIENTSIZE | SWP_NOCLIENTMOVE | SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOREDRAW, &window_rect, &client_rect, valid_rects ); + SetThreadDpiAwarenessContext( context ); }

1 0

Alexandre Julliard : server: Map region to the window DPI in redraw_region ().
by Alexandre Julliard Aug. 24, 2018

Aug. 24, 2018

Module: wine Branch: master Commit: 8698b600c64931b6fe3ed759227e0d902b6531d5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8698b600c64931b6fe3ed759… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 24 12:45:43 2018 +0200 server: Map region to the window DPI in redraw_region(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/region.c | 12 ++++++++++++ server/user.h | 1 + server/window.c | 27 ++++++++++++++++++++++----- 3 files changed, 35 insertions(+), 5 deletions(-) diff --git a/server/region.c b/server/region.c index 0e52f2f..9f377ee 100644 --- a/server/region.c +++ b/server/region.c @@ -724,6 +724,18 @@ void mirror_region( const rectangle_t *client_rect, struct region *region ) } +/* scale a region for a given dpi factor */ +void scale_region( struct region *region, unsigned int dpi_from, unsigned int dpi_to ) +{ + rectangle_t *rect, *end; + + if (!region->num_rects) return; + for (rect = region->rects, end = rect + region->num_rects; rect < end; rect++) + scale_dpi_rect( rect, dpi_from, dpi_to ); + scale_dpi_rect( &region->extents, dpi_from, dpi_to ); +} + + /* make a copy of a region; returns dst or NULL on error */ struct region *copy_region( struct region *dst, const struct region *src ) { diff --git a/server/user.h b/server/user.h index fe3aa09..eb1b7ce 100644 --- a/server/user.h +++ b/server/user.h @@ -135,6 +135,7 @@ extern int is_region_empty( const struct region *region ); extern void get_region_extents( const struct region *region, rectangle_t *rect ); extern void offset_region( struct region *region, int x, int y ); extern void mirror_region( const rectangle_t *client_rect, struct region *region ); +extern void scale_region( struct region *region, unsigned int dpi_from, unsigned int dpi_to ); extern struct region *copy_region( struct region *dst, const struct region *src ); extern struct region *intersect_region( struct region *dst, const struct region *src1, const struct region *src2 ); diff --git a/server/window.c b/server/window.c index e45cf38..8d056a2 100644 --- a/server/window.c +++ b/server/window.c @@ -649,6 +649,15 @@ static void map_dpi_rect( struct window *win, rectangle_t *rect, unsigned int fr scale_dpi_rect( rect, from, to ); } +/* map a region between different DPI scaling levels */ +static void map_dpi_region( struct window *win, struct region *region, unsigned int from, unsigned int to ) +{ + if (!from) from = get_monitor_dpi( win ); + if (!to) to = get_monitor_dpi( win ); + if (from == to) return; + scale_region( region, from, to ); +} + /* check if window and all its ancestors are visible */ static int is_visible( const struct window *win ) { @@ -1388,7 +1397,7 @@ static void validate_parents( struct window *child ) /* add/subtract a region (in client coordinates) to the update region of the window */ static void redraw_window( struct window *win, struct region *region, int frame, unsigned int flags ) { - struct region *tmp; + struct region *child_rgn, *tmp; struct window *child; if (flags & RDW_INVALIDATE) @@ -1450,11 +1459,19 @@ static void redraw_window( struct window *win, struct region *region, int frame, LIST_FOR_EACH_ENTRY( child, &win->children, struct window, entry ) { if (!(child->style & WS_VISIBLE)) continue; - if (!rect_in_region( tmp, &child->window_rect )) continue; - offset_region( tmp, -child->client_rect.left, -child->client_rect.top ); - redraw_window( child, tmp, 1, flags ); - offset_region( tmp, child->client_rect.left, child->client_rect.top ); + if (!(child_rgn = create_empty_region())) continue; + if (copy_region( child_rgn, tmp )) + { + map_dpi_region( child, child_rgn, win->dpi, child->dpi ); + if (rect_in_region( child_rgn, &child->window_rect )) + { + offset_region( child_rgn, -child->client_rect.left, -child->client_rect.top ); + redraw_window( child, child_rgn, 1, flags ); + } + } + free_region( child_rgn ); } + free_region( tmp ); }

1 0

Alexandre Julliard : user32: Scale coordinates in MapWindowPoints() based on DPI awareness.
by Alexandre Julliard Aug. 24, 2018

Aug. 24, 2018

Module: wine Branch: master Commit: 8de1b2c2ceda0a69257f4390540e2239ec592272 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8de1b2c2ceda0a69257f4390… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 24 12:12:44 2018 +0200 user32: Scale coordinates in MapWindowPoints() based on DPI awareness. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/sysparams.c | 23 ++++++++++++++++++++ dlls/user32/win.h | 2 ++ dlls/user32/winpos.c | 12 ++++++++--- include/wine/server_protocol.h | 4 ++-- server/protocol.def | 1 + server/request.h | 1 + server/trace.c | 1 + server/window.c | 48 ++++++++++++++++++++++-------------------- 8 files changed, 64 insertions(+), 28 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 2dc5cb2..a971062 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -3222,6 +3222,29 @@ UINT get_thread_dpi(void) } /********************************************************************** + * map_dpi_point + */ +POINT map_dpi_point( POINT pt, UINT dpi_from, UINT dpi_to ) +{ + if (dpi_from && dpi_to && dpi_from != dpi_to) + { + pt.x = MulDiv( pt.x, dpi_to, dpi_from ); + pt.y = MulDiv( pt.y, dpi_to, dpi_from ); + } + return pt; +} + +/********************************************************************** + * point_win_to_thread_dpi + */ +POINT point_win_to_thread_dpi( HWND hwnd, POINT pt ) +{ + UINT dpi = get_thread_dpi(); + if (!dpi) dpi = get_win_monitor_dpi( hwnd ); + return map_dpi_point( pt, GetDpiForWindow( hwnd ), dpi ); +} + +/********************************************************************** * map_dpi_rect */ RECT map_dpi_rect( RECT rect, UINT dpi_from, UINT dpi_to ) diff --git a/dlls/user32/win.h b/dlls/user32/win.h index 3fff0fc..b912ef8 100644 --- a/dlls/user32/win.h +++ b/dlls/user32/win.h @@ -131,6 +131,8 @@ extern void WINPOS_SysCommandSizeMove( HWND hwnd, WPARAM wParam ) DECLSPEC_HIDDE extern UINT get_monitor_dpi( HMONITOR monitor ) DECLSPEC_HIDDEN; extern UINT get_win_monitor_dpi( HWND hwnd ) DECLSPEC_HIDDEN; extern UINT get_thread_dpi(void) DECLSPEC_HIDDEN; +extern POINT map_dpi_point( POINT pt, UINT dpi_from, UINT dpi_to ) DECLSPEC_HIDDEN; +extern POINT point_win_to_thread_dpi( HWND hwnd, POINT pt ) DECLSPEC_HIDDEN; extern RECT map_dpi_rect( RECT rect, UINT dpi_from, UINT dpi_to ) DECLSPEC_HIDDEN; extern RECT rect_win_to_thread_dpi( HWND hwnd, RECT rect ) DECLSPEC_HIDDEN; extern BOOL set_window_pos( HWND hwnd, HWND insert_after, UINT swp_flags, diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index e26dc6e..1dd9c12 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -446,6 +446,7 @@ static BOOL WINPOS_GetWinOffset( HWND hwndFrom, HWND hwndTo, BOOL *mirrored, POI } } if (wndPtr && wndPtr != WND_DESKTOP) WIN_ReleasePtr( wndPtr ); + offset = point_win_to_thread_dpi( hwndFrom, offset ); } } @@ -460,15 +461,16 @@ static BOOL WINPOS_GetWinOffset( HWND hwndFrom, HWND hwndTo, BOOL *mirrored, POI if (wndPtr == WND_OTHER_PROCESS) goto other_process; if (wndPtr != WND_DESKTOP) { + POINT pt = { 0, 0 }; if (wndPtr->dwExStyle & WS_EX_LAYOUTRTL) { mirror_to = TRUE; - offset.x -= wndPtr->client_rect.right - wndPtr->client_rect.left; + pt.x += wndPtr->client_rect.right - wndPtr->client_rect.left; } while (wndPtr->parent) { - offset.x -= wndPtr->client_rect.left; - offset.y -= wndPtr->client_rect.top; + pt.x += wndPtr->client_rect.left; + pt.y += wndPtr->client_rect.top; hwnd = wndPtr->parent; WIN_ReleasePtr( wndPtr ); if (!(wndPtr = WIN_GetPtr( hwnd ))) break; @@ -481,6 +483,9 @@ static BOOL WINPOS_GetWinOffset( HWND hwndFrom, HWND hwndTo, BOOL *mirrored, POI } } if (wndPtr && wndPtr != WND_DESKTOP) WIN_ReleasePtr( wndPtr ); + pt = point_win_to_thread_dpi( hwndTo, pt ); + offset.x -= pt.x; + offset.y -= pt.y; } } @@ -494,6 +499,7 @@ static BOOL WINPOS_GetWinOffset( HWND hwndFrom, HWND hwndTo, BOOL *mirrored, POI { req->from = wine_server_user_handle( hwndFrom ); req->to = wine_server_user_handle( hwndTo ); + req->dpi = get_thread_dpi(); if ((ret = !wine_server_call_err( req ))) { ret_offset->x = reply->x; diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 9c5deca..a888a63 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -3743,7 +3743,7 @@ struct get_windows_offset_request struct request_header __header; user_handle_t from; user_handle_t to; - char __pad_20[4]; + int dpi; }; struct get_windows_offset_reply { @@ -6533,6 +6533,6 @@ union generic_reply struct terminate_job_reply terminate_job_reply; }; -#define SERVER_PROTOCOL_VERSION 557 +#define SERVER_PROTOCOL_VERSION 558 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/protocol.def b/server/protocol.def index 43f5f01..f1f4709 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -2685,6 +2685,7 @@ enum coords_relative @REQ(get_windows_offset) user_handle_t from; /* handle to the first window */ user_handle_t to; /* handle to the second window */ + int dpi; /* DPI to map to, or zero for per-monitor DPI */ @REPLY int x; /* x coordinate offset */ int y; /* y coordinate offset */ diff --git a/server/request.h b/server/request.h index c3aed96..ddf8a68 100644 --- a/server/request.h +++ b/server/request.h @@ -1786,6 +1786,7 @@ C_ASSERT( FIELD_OFFSET(struct set_window_text_request, handle) == 12 ); C_ASSERT( sizeof(struct set_window_text_request) == 16 ); C_ASSERT( FIELD_OFFSET(struct get_windows_offset_request, from) == 12 ); C_ASSERT( FIELD_OFFSET(struct get_windows_offset_request, to) == 16 ); +C_ASSERT( FIELD_OFFSET(struct get_windows_offset_request, dpi) == 20 ); C_ASSERT( sizeof(struct get_windows_offset_request) == 24 ); C_ASSERT( FIELD_OFFSET(struct get_windows_offset_reply, x) == 8 ); C_ASSERT( FIELD_OFFSET(struct get_windows_offset_reply, y) == 12 ); diff --git a/server/trace.c b/server/trace.c index 1d773fb..6886688 100644 --- a/server/trace.c +++ b/server/trace.c @@ -3259,6 +3259,7 @@ static void dump_get_windows_offset_request( const struct get_windows_offset_req { fprintf( stderr, " from=%08x", req->from ); fprintf( stderr, ", to=%08x", req->to ); + fprintf( stderr, ", dpi=%d", req->dpi ); } static void dump_get_windows_offset_reply( const struct get_windows_offset_reply *req ) diff --git a/server/window.c b/server/window.c index c286a0a..e45cf38 100644 --- a/server/window.c +++ b/server/window.c @@ -630,6 +630,16 @@ static inline void inc_window_paint_count( struct window *win, int incr ) if (win->thread) inc_queue_paint_count( win->thread, incr ); } +/* map a point between different DPI scaling levels */ +static void map_dpi_point( struct window *win, int *x, int *y, unsigned int from, unsigned int to ) +{ + if (!from) from = get_monitor_dpi( win ); + if (!to) to = get_monitor_dpi( win ); + if (from == to) return; + *x = scale_dpi( *x, from, to ); + *y = scale_dpi( *y, from, to ); +} + /* map a window rectangle between different DPI scaling levels */ static void map_dpi_rect( struct window *win, rectangle_t *rect, unsigned int from, unsigned int to ) { @@ -2401,38 +2411,30 @@ DECL_HANDLER(set_window_text) DECL_HANDLER(get_windows_offset) { struct window *win; - int mirror_from = 0, mirror_to = 0; + int x, y, mirror_from = 0, mirror_to = 0; reply->x = reply->y = 0; if (req->from) { if (!(win = get_window( req->from ))) return; - if (win->ex_style & WS_EX_LAYOUTRTL) - { - mirror_from = 1; - reply->x += win->client_rect.right - win->client_rect.left; - } - while (win && !is_desktop_window(win)) - { - reply->x += win->client_rect.left; - reply->y += win->client_rect.top; - win = win->parent; - } + if (win->ex_style & WS_EX_LAYOUTRTL) mirror_from = 1; + x = mirror_from ? win->client_rect.right - win->client_rect.left : 0; + y = 0; + client_to_screen( win, &x, &y ); + map_dpi_point( win, &x, &y, win->dpi, req->dpi ); + reply->x += x; + reply->y += y; } if (req->to) { if (!(win = get_window( req->to ))) return; - if (win->ex_style & WS_EX_LAYOUTRTL) - { - mirror_to = 1; - reply->x -= win->client_rect.right - win->client_rect.left; - } - while (win && !is_desktop_window(win)) - { - reply->x -= win->client_rect.left; - reply->y -= win->client_rect.top; - win = win->parent; - } + if (win->ex_style & WS_EX_LAYOUTRTL) mirror_to = 1; + x = mirror_to ? win->client_rect.right - win->client_rect.left : 0; + y = 0; + client_to_screen( win, &x, &y ); + map_dpi_point( win, &x, &y, win->dpi, req->dpi ); + reply->x -= x; + reply->y -= y; } if (mirror_from) reply->x = -reply->x; reply->mirror = mirror_from ^ mirror_to;

1 0

Michael Stefaniuc : mshtml: Use the ARRAY_SIZE() macro.
by Alexandre Julliard Aug. 24, 2018

Aug. 24, 2018

Module: wine Branch: master Commit: 12b85004aaf6cc2b9ebc8e8f4c5074c93908c3b3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=12b85004aaf6cc2b9ebc8e8f… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Aug 23 23:31:15 2018 +0200 mshtml: Use the ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Jacek Caban<jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/dispex.c | 6 +++--- dlls/mshtml/htmlbody.c | 2 +- dlls/mshtml/htmldoc.c | 2 +- dlls/mshtml/htmlelem.c | 2 +- dlls/mshtml/htmlevent.c | 8 ++++---- dlls/mshtml/htmlimg.c | 2 +- dlls/mshtml/htmllocation.c | 2 +- dlls/mshtml/htmlstyle.c | 18 +++++++++--------- dlls/mshtml/htmlwindow.c | 9 +++------ dlls/mshtml/main.c | 8 ++++---- dlls/mshtml/mutation.c | 6 +++--- dlls/mshtml/navigate.c | 4 ++-- dlls/mshtml/nsembed.c | 8 ++++---- dlls/mshtml/nsio.c | 21 ++++++++++----------- dlls/mshtml/olecmd.c | 11 ++++------- dlls/mshtml/pluginhost.c | 4 ++-- dlls/mshtml/protocol.c | 26 +++++++++++++------------- dlls/mshtml/script.c | 4 ++-- dlls/mshtml/view.c | 6 ++---- 19 files changed, 70 insertions(+), 79 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=12b85004aaf6cc2b9ebc…

1 0

Gabriel Ivăncescu : ntdll: Properly set the current directory for UNC paths.
by Alexandre Julliard Aug. 24, 2018

Aug. 24, 2018

Module: wine Branch: master Commit: 3acc0b0968fc2fd92220708f6a6629d2dfd28815 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3acc0b0968fc2fd92220708f… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Aug 23 17:14:18 2018 +0300 ntdll: Properly set the current directory for UNC paths. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=37834 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/path.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/ntdll/path.c b/dlls/ntdll/path.c index 9794b67..11483fa 100644 --- a/dlls/ntdll/path.c +++ b/dlls/ntdll/path.c @@ -1048,6 +1048,14 @@ NTSTATUS WINAPI RtlSetCurrentDirectory_U(const UNICODE_STRING* dir) size -= 4; if (size && ptr[size - 1] != '\\') ptr[size++] = '\\'; + /* convert \??\UNC\ path to \\ prefix */ + if (size >= 4 && !strncmpiW(ptr, UncPfxW, 4)) + { + ptr += 2; + size -= 2; + *ptr = '\\'; + } + memcpy( curdir->DosPath.Buffer, ptr, size * sizeof(WCHAR)); curdir->DosPath.Buffer[size] = 0; curdir->DosPath.Length = size * sizeof(WCHAR);

1 0

Zebediah Figura : quartz: Return E_NOTIMPL from IBasicAudio methods if no filter supporting IBasicAudio is attached.
by Alexandre Julliard Aug. 24, 2018

Aug. 24, 2018

Module: wine Branch: master Commit: 702e4a4ca11bd5918d650bb13833da14d1f64379 URL: https://source.winehq.org/git/wine.git/?a=commit;h=702e4a4ca11bd5918d650bb1… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Aug 23 12:43:14 2018 -0500 quartz: Return E_NOTIMPL from IBasicAudio methods if no filter supporting IBasicAudio is attached. Based on a patch by Alistair Leslie-Hughes. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45366 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filtergraph.c | 4 ++-- dlls/quartz/tests/filtergraph.c | 4 ---- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 0113674..aa4b0c9 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -2963,7 +2963,7 @@ static const IObjectWithSiteVtbl IObjectWithSite_VTable = static HRESULT GetTargetInterface(IFilterGraphImpl* pGraph, REFIID riid, LPVOID* ppvObj) { - HRESULT hr = E_NOINTERFACE; + HRESULT hr; int i; int entry; @@ -3003,7 +3003,7 @@ static HRESULT GetTargetInterface(IFilterGraphImpl* pGraph, REFIID riid, LPVOID* return hr; } - return hr; + return IsEqualGUID(riid, &IID_IBasicAudio) ? E_NOTIMPL : E_NOINTERFACE; } static inline IFilterGraphImpl *impl_from_IBasicAudio(IBasicAudio *iface) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index de7b904..6a8afb3 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -2304,7 +2304,6 @@ static void test_control_delegation(void) hr = IFilterGraph2_QueryInterface(graph, &IID_IBasicAudio, (void **)&audio); ok(hr == S_OK, "got %#x\n", hr); -todo_wine { hr = IBasicAudio_put_Volume(audio, -10); ok(hr == E_NOTIMPL, "got %#x\n", hr); hr = IBasicAudio_get_Volume(audio, &val); @@ -2313,7 +2312,6 @@ todo_wine { ok(hr == E_NOTIMPL, "got %#x\n", hr); hr = IBasicAudio_get_Balance(audio, &val); ok(hr == E_NOTIMPL, "got %#x\n", hr); -} hr = CoCreateInstance(&CLSID_DSoundRender, NULL, CLSCTX_INPROC_SERVER, &IID_IBaseFilter, (void **)&renderer); if (hr != VFW_E_NO_AUDIO_HARDWARE) @@ -2349,7 +2347,6 @@ todo_wine { IBasicAudio_Release(filter_audio); } -todo_wine { hr = IBasicAudio_put_Volume(audio, -10); ok(hr == E_NOTIMPL, "got %#x\n", hr); hr = IBasicAudio_get_Volume(audio, &val); @@ -2358,7 +2355,6 @@ todo_wine { ok(hr == E_NOTIMPL, "got %#x\n", hr); hr = IBasicAudio_get_Balance(audio, &val); ok(hr == E_NOTIMPL, "got %#x\n", hr); -} IBasicAudio_Release(audio);

1 0

Zebediah Figura : ntdll/tests: Add more tests for RtlGetFullPathName_U().
by Alexandre Julliard Aug. 24, 2018

Aug. 24, 2018

Module: wine Branch: master Commit: bbafba6d582326aadde37fbe1f1197bda64ecae7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bbafba6d582326aadde37fbe… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Aug 23 22:50:05 2018 -0500 ntdll/tests: Add more tests for RtlGetFullPathName_U(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/path.c | 56 ++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 49 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/tests/path.c b/dlls/ntdll/tests/path.c index 94b76c1..b2a6955 100644 --- a/dlls/ntdll/tests/path.c +++ b/dlls/ntdll/tests/path.c @@ -266,6 +266,7 @@ static void test_RtlGetFullPathName_U(void) static const struct test tests[] = { { "c:/test", "c:\\test", "test"}, + { "c:/test/", "c:\\test\\", NULL}, { "c:/test ", "c:\\test", "test"}, { "c:/test.", "c:\\test", "test"}, { "c:/test .... .. ", "c:\\test", "test"}, @@ -287,22 +288,61 @@ static void test_RtlGetFullPathName_U(void) { "c:/test../file", "c:\\test.\\file", "file", "c:\\test..\\file", "file"}, /* vista */ { "c:\\test", "c:\\test", "test"}, - { NULL, NULL, NULL} + { "C:\\test", "C:\\test", "test"}, + { "c:/", "c:\\", NULL}, + { "c:.", "C:\\windows", "windows"}, + { "c:foo", "C:\\windows\\foo", "foo"}, + { "c:foo/bar", "C:\\windows\\foo\\bar", "bar"}, + { "c:./foo", "C:\\windows\\foo", "foo"}, + { "\\foo", "C:\\foo", "foo"}, + { "foo", "C:\\windows\\foo", "foo"}, + { ".", "C:\\windows", "windows"}, + { "..", "C:\\", NULL}, + { "...", "C:\\windows\\", NULL}, + { "./foo", "C:\\windows\\foo", "foo"}, + { "foo/..", "C:\\windows", "windows"}, + { "AUX", "\\\\.\\AUX", NULL}, + { "COM1", "\\\\.\\COM1", NULL}, + { "?<>*\"|:", "C:\\windows\\?<>*\"|:", "?<>*\"|:"}, + + { "\\\\foo", "\\\\foo", NULL}, + { "//foo", "\\\\foo", NULL}, + { "\\/foo", "\\\\foo", NULL}, + { "//", "\\\\", NULL}, + { "//foo/", "\\\\foo\\", NULL}, + + { "//.", "\\\\.\\", NULL}, + { "//./", "\\\\.\\", NULL}, + { "//.//", "\\\\.\\", NULL}, + { "//./foo", "\\\\.\\foo", "foo"}, + { "//./foo/", "\\\\.\\foo\\", NULL}, + { "//./foo/bar", "\\\\.\\foo\\bar", "bar"}, + { "//./foo/.", "\\\\.\\foo", "foo"}, + { "//./foo/..", "\\\\.\\", NULL}, + + { "//?/", "\\\\?\\", NULL}, + { "//?//", "\\\\?\\", NULL}, + { "//?/foo", "\\\\?\\foo", "foo"}, + { "//?/foo/", "\\\\?\\foo\\", NULL}, + { "//?/foo/bar", "\\\\?\\foo\\bar", "bar"}, + { "//?/foo/.", "\\\\?\\foo", "foo"}, + { "//?/foo/..", "\\\\?\\", NULL}, + + /* RtlGetFullPathName_U() can't understand the global namespace prefix */ + { "\\??\\foo", "C:\\??\\foo", "foo"}, + { 0 } }; const struct test *test; WCHAR pathbufW[2*MAX_PATH], rbufferW[MAX_PATH]; - CHAR rbufferA[MAX_PATH], rfileA[MAX_PATH]; + char rbufferA[MAX_PATH], rfileA[MAX_PATH], curdir[MAX_PATH]; ULONG ret; WCHAR *file_part; DWORD reslen; UINT len; - if (!pRtlGetFullPathName_U) - { - win_skip("RtlGetFullPathName_U is not available\n"); - return; - } + GetCurrentDirectoryA(sizeof(curdir), curdir); + SetCurrentDirectoryA("C:\\windows\\"); file_part = (WCHAR *)0xdeadbeef; lstrcpyW(rbufferW, deadbeefW); @@ -348,6 +388,8 @@ static void test_RtlGetFullPathName_U(void) ok( !test->rfile, "Got NULL expected \"%s\"\n", test->rfile ); } } + + SetCurrentDirectoryA(curdir); } static void test_RtlDosPathNameToNtPathName_U_WithStatus(void)

1 0

Zebediah Figura : ntdll: Also accept \?? \ as a global namespace prefix in RtlDosPathNameToNtPathName_U().
by Alexandre Julliard Aug. 24, 2018

Aug. 24, 2018

Module: wine Branch: master Commit: d683d243f7420785d5207aab1523b4fdd3de066b URL: https://source.winehq.org/git/wine.git/?a=commit;h=d683d243f7420785d5207aab… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Aug 23 22:50:07 2018 -0500 ntdll: Also accept \??\ as a global namespace prefix in RtlDosPathNameToNtPathName_U(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45654 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/path.c | 6 ++++-- dlls/ntdll/tests/path.c | 25 +++++++++++++++++++++++++ 2 files changed, 29 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/path.c b/dlls/ntdll/path.c index 8fe61da..9794b67 100644 --- a/dlls/ntdll/path.c +++ b/dlls/ntdll/path.c @@ -340,7 +340,8 @@ ULONG WINAPI RtlIsDosDeviceName_U( PCWSTR dos_name ) NTSTATUS WINAPI RtlDosPathNameToNtPathName_U_WithStatus(const WCHAR *dos_path, UNICODE_STRING *ntpath, WCHAR **file_part, CURDIR *cd) { - static const WCHAR LongFileNamePfxW[] = {'\\','\\','?','\\'}; + static const WCHAR global_prefix[] = {'\\','\\','?','\\'}; + static const WCHAR global_prefix2[] = {'\\','?','?','\\'}; ULONG sz, offset; WCHAR local[MAX_PATH]; LPWSTR ptr; @@ -356,7 +357,8 @@ NTSTATUS WINAPI RtlDosPathNameToNtPathName_U_WithStatus(const WCHAR *dos_path, U if (!dos_path || !*dos_path) return STATUS_OBJECT_NAME_INVALID; - if (!strncmpW(dos_path, LongFileNamePfxW, 4)) + if (!memcmp(dos_path, global_prefix, sizeof(global_prefix)) || + (!memcmp(dos_path, global_prefix2, sizeof(global_prefix2)) && dos_path[4])) { ntpath->Length = strlenW(dos_path) * sizeof(WCHAR); ntpath->MaximumLength = ntpath->Length + sizeof(WCHAR); diff --git a/dlls/ntdll/tests/path.c b/dlls/ntdll/tests/path.c index a032092..7baf474 100644 --- a/dlls/ntdll/tests/path.c +++ b/dlls/ntdll/tests/path.c @@ -396,6 +396,8 @@ static void test_RtlGetFullPathName_U(void) static void test_RtlDosPathNameToNtPathName_U(void) { + static const WCHAR broken_global_prefix[] = {'\\','?','?','\\','C',':','\\','?','?'}; + char curdir[MAX_PATH]; WCHAR path[MAX_PATH]; UNICODE_STRING nameW; @@ -487,6 +489,22 @@ static void test_RtlDosPathNameToNtPathName_U(void) { "\\\\?\\foo\\bar", "\\??\\foo\\bar", 8, STATUS_SUCCESS }, { "\\\\?\\foo\\.", "\\??\\foo\\.", 8, STATUS_SUCCESS }, { "\\\\?\\foo\\..", "\\??\\foo\\..", 8, STATUS_SUCCESS }, + + { "\\??", "\\??\\C:\\??", 7, STATUS_SUCCESS }, + { "\\??\\", "\\??\\C:\\??\\", -1, STATUS_SUCCESS }, + + { "\\??\\/", "\\??\\/", 4, STATUS_SUCCESS }, + { "\\??\\foo", "\\??\\foo", 4, STATUS_SUCCESS }, + { "\\??\\foo/", "\\??\\foo/", 4, STATUS_SUCCESS }, + { "\\??\\foo/bar", "\\??\\foo/bar", 4, STATUS_SUCCESS }, + { "\\??\\foo/.", "\\??\\foo/.", 4, STATUS_SUCCESS }, + { "\\??\\foo/..", "\\??\\foo/..", 4, STATUS_SUCCESS }, + { "\\??\\\\", "\\??\\\\", -1, STATUS_SUCCESS }, + { "\\??\\\\\\", "\\??\\\\\\", -1, STATUS_SUCCESS }, + { "\\??\\foo\\", "\\??\\foo\\", -1, STATUS_SUCCESS }, + { "\\??\\foo\\bar", "\\??\\foo\\bar", 8, STATUS_SUCCESS }, + { "\\??\\foo\\.", "\\??\\foo\\.", 8, STATUS_SUCCESS }, + { "\\??\\foo\\..", "\\??\\foo\\..", 8, STATUS_SUCCESS }, }; GetCurrentDirectoryA(sizeof(curdir), curdir); @@ -509,6 +527,13 @@ static void test_RtlDosPathNameToNtPathName_U(void) if (ret != TRUE) continue; + if (!strncmp(tests[i].dos, "\\??\\", 4) && tests[i].dos[4] && + broken(!memcmp(nameW.Buffer, broken_global_prefix, sizeof(broken_global_prefix)))) + { + /* Windows version prior to 2003 don't interpret the \??\ prefix */ + continue; + } + MultiByteToWideChar(CP_ACP, 0, tests[i].nt, -1, path, sizeof(path)); ok(!lstrcmpW(nameW.Buffer, path), "%s: Expected %s, got %s.\n", tests[i].dos, tests[i].nt, wine_dbgstr_w(nameW.Buffer));

1 0