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

Alexandre Julliard : user32: Switch to the window DPI awareness in ShowWindow().
by Alexandre Julliard 24 Aug '18

24 Aug '18

Module: wine Branch: master Commit: 0da23418abf63f8c2abe5e0e328d5fb4daa9dfb7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0da23418abf63f8c2abe5e0e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 24 12:29:40 2018 +0200 user32: Switch to the window DPI awareness in ShowWindow(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/winpos.c | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index 98eec62..75b1452 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -1066,6 +1066,7 @@ static BOOL show_window( HWND hwnd, INT cmd ) { WND *wndPtr; HWND parent; + DPI_AWARENESS_CONTEXT context; LONG style = GetWindowLongW( hwnd, GWL_STYLE ); BOOL wasVisible = (style & WS_VISIBLE) != 0; BOOL showFlag = TRUE; @@ -1074,10 +1075,12 @@ static BOOL show_window( HWND hwnd, INT cmd ) TRACE("hwnd=%p, cmd=%d, wasVisible %d\n", hwnd, cmd, wasVisible); + context = SetThreadDpiAwarenessContext( GetWindowDpiAwarenessContext( hwnd )); + switch(cmd) { case SW_HIDE: - if (!wasVisible) return FALSE; + if (!wasVisible) goto done; showFlag = FALSE; swp |= SWP_HIDEWINDOW | SWP_NOSIZE | SWP_NOMOVE; if (style & WS_CHILD) swp |= SWP_NOACTIVATE | SWP_NOZORDER; @@ -1091,14 +1094,14 @@ static BOOL show_window( HWND hwnd, INT cmd ) case SW_SHOWMINIMIZED: swp |= SWP_SHOWWINDOW | SWP_FRAMECHANGED; swp |= WINPOS_MinMaximize( hwnd, cmd, &newPos ); - if ((style & WS_MINIMIZE) && wasVisible) return TRUE; + if ((style & WS_MINIMIZE) && wasVisible) goto done; break; case SW_SHOWMAXIMIZED: /* same as SW_MAXIMIZE */ if (!wasVisible) swp |= SWP_SHOWWINDOW; swp |= SWP_FRAMECHANGED; swp |= WINPOS_MinMaximize( hwnd, SW_MAXIMIZE, &newPos ); - if ((style & WS_MAXIMIZE) && wasVisible) return TRUE; + if ((style & WS_MAXIMIZE) && wasVisible) goto done; break; case SW_SHOWNA: @@ -1106,7 +1109,7 @@ static BOOL show_window( HWND hwnd, INT cmd ) if (style & WS_CHILD) swp |= SWP_NOZORDER; break; case SW_SHOW: - if (wasVisible) return TRUE; + if (wasVisible) goto done; swp |= SWP_SHOWWINDOW | SWP_NOSIZE | SWP_NOMOVE; if (style & WS_CHILD) swp |= SWP_NOACTIVATE | SWP_NOZORDER; break; @@ -1126,19 +1129,19 @@ static BOOL show_window( HWND hwnd, INT cmd ) } else { - if (wasVisible) return TRUE; + if (wasVisible) goto done; swp |= SWP_NOSIZE | SWP_NOMOVE; } if (style & WS_CHILD && !(swp & SWP_STATECHANGED)) swp |= SWP_NOACTIVATE | SWP_NOZORDER; break; default: - return wasVisible; + goto done; } if ((showFlag != wasVisible || cmd == SW_SHOWNA) && cmd != SW_SHOWMAXIMIZED && !(swp & SWP_STATECHANGED)) { SendMessageW( hwnd, WM_SHOWWINDOW, showFlag, 0 ); - if (!IsWindow( hwnd )) return wasVisible; + if (!IsWindow( hwnd )) goto done; } swp = USER_Driver->pShowWindow( hwnd, cmd, &newPos, swp ); @@ -1176,12 +1179,12 @@ static BOOL show_window( HWND hwnd, INT cmd ) if (parent == GetDesktopWindow()) parent = 0; SetFocus(parent); } - return wasVisible; + goto done; } if (IsIconic(hwnd)) WINPOS_ShowIconTitle( hwnd, TRUE ); - if (!(wndPtr = WIN_GetPtr( hwnd )) || wndPtr == WND_OTHER_PROCESS) return wasVisible; + if (!(wndPtr = WIN_GetPtr( hwnd )) || wndPtr == WND_OTHER_PROCESS) goto done; if (wndPtr->flags & WIN_NEED_SIZE) { @@ -1209,6 +1212,8 @@ static BOOL show_window( HWND hwnd, INT cmd ) /* if previous state was minimized Windows sets focus to the window */ if (style & WS_MINIMIZE) SetFocus( hwnd ); +done: + SetThreadDpiAwarenessContext( context ); return wasVisible; }

1 0

Alexandre Julliard : user32: Switch to the window DPI awareness to process WM_GETMINMAXINFO.
by Alexandre Julliard 24 Aug '18

24 Aug '18

Module: wine Branch: master Commit: 72644bb6031b82afee836b30093098586d9f5d3c URL: https://source.winehq.org/git/wine.git/?a=commit;h=72644bb6031b82afee836b30… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 24 12:28:56 2018 +0200 user32: Switch to the window DPI awareness to process WM_GETMINMAXINFO. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/winpos.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index 75b1452..267b7a6 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -748,6 +748,7 @@ static void WINPOS_ShowIconTitle( HWND hwnd, BOOL bShow ) */ MINMAXINFO WINPOS_GetMinMaxInfo( HWND hwnd ) { + DPI_AWARENESS_CONTEXT context; MINMAXINFO MinMax; HMONITOR monitor; INT xinc, yinc; @@ -757,6 +758,8 @@ MINMAXINFO WINPOS_GetMinMaxInfo( HWND hwnd ) RECT rc; WND *win; + context = SetThreadDpiAwarenessContext( GetWindowDpiAwarenessContext( hwnd )); + /* Compute default values */ GetWindowRect(hwnd, &rc); @@ -842,6 +845,7 @@ MINMAXINFO WINPOS_GetMinMaxInfo( HWND hwnd ) MinMax.ptMaxTrackSize.y = max( MinMax.ptMaxTrackSize.y, MinMax.ptMinTrackSize.y ); + SetThreadDpiAwarenessContext( context ); return MinMax; }

1 0

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

24 Aug '18

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

Zhiyi Zhang : winhttp: Add support for WINHTTP_ENABLE_SSL_REVOCATION.
by Alexandre Julliard 24 Aug '18

24 Aug '18

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

Nikolay Sivov : comctl32/tests: Fix test failures on XP.
by Alexandre Julliard 24 Aug '18

24 Aug '18

Module: wine Branch: master Commit: a5704991657800bc659ac5df44eb25f597bbda10 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a5704991657800bc659ac5df… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Aug 24 12:57:08 2018 +0300 comctl32/tests: Fix test failures on XP. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/treeview.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index 14d814d..c60aa8a 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -2225,8 +2225,8 @@ static void _check_item(HWND hwnd, HTREEITEM item, BOOL is_version_6, int line) else width = data->width; todo_wine - ok_(__FILE__, line)(width == (rect.right - rect.left), "Width %d, rect width %d.\n", - width, rect.right - rect.left); + ok_(__FILE__, line)(width == (rect.right - rect.left) || broken(is_version_6 && width == 0) /* XP */, + "Width %d, rect width %d.\n", width, rect.right - rect.left); } }

1 0

Zebediah Figura : ntdll: Also accept \\? as a UNC or device path in RtlDetermineDosPathNameType_U().
by Alexandre Julliard 24 Aug '18

24 Aug '18

Module: wine Branch: master Commit: ee5c46a55c6f982fe60a95dff4fe9fbcee1f0028 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ee5c46a55c6f982fe60a95df… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Aug 23 22:50:04 2018 -0500 ntdll: Also accept \\? as a UNC or device path in RtlDetermineDosPathNameType_U(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/path.c | 8 ++++---- dlls/ntdll/tests/path.c | 7 +++++++ 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/path.c b/dlls/ntdll/path.c index ccc95e3..8fe61da 100644 --- a/dlls/ntdll/path.c +++ b/dlls/ntdll/path.c @@ -244,10 +244,10 @@ DOS_PATHNAME_TYPE WINAPI RtlDetermineDosPathNameType_U( PCWSTR path ) if (IS_SEPARATOR(path[0])) { if (!IS_SEPARATOR(path[1])) return ABSOLUTE_PATH; /* "/foo" */ - if (path[2] != '.') return UNC_PATH; /* "//foo" */ - if (IS_SEPARATOR(path[3])) return DEVICE_PATH; /* "//./foo" */ - if (path[3]) return UNC_PATH; /* "//.foo" */ - return UNC_DOT_PATH; /* "//." */ + if (path[2] != '.' && path[2] != '?') return UNC_PATH; /* "//foo" */ + if (IS_SEPARATOR(path[3])) return DEVICE_PATH; /* "//./foo" or "//?/foo" */ + if (path[3]) return UNC_PATH; /* "//.foo" or "//?foo" */ + return UNC_DOT_PATH; /* "//." or "//?" */ } else { diff --git a/dlls/ntdll/tests/path.c b/dlls/ntdll/tests/path.c index 9369e1c..94b76c1 100644 --- a/dlls/ntdll/tests/path.c +++ b/dlls/ntdll/tests/path.c @@ -68,6 +68,13 @@ static void test_RtlDetermineDosPathNameType_U(void) { "//.foo", 1 }, { "\\\\.", 7 }, { "//.", 7 }, + { "\\\\?\\foo", 6 }, + { "//?/foo", 6 }, + { "/\\?/foo", 6 }, + { "\\\\?foo", 1 }, + { "//?foo", 1 }, + { "\\\\?", 7 }, + { "//?", 7 }, { NULL, 0 } };

1 0

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

24 Aug '18

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/tests: Add more tests for RtlDosPathNameToNtPathName_U().
by Alexandre Julliard 24 Aug '18

24 Aug '18

Module: wine Branch: master Commit: 8c7e141bb187e0a3477977dfa665ef87739908de URL: https://source.winehq.org/git/wine.git/?a=commit;h=8c7e141bb187e0a3477977df… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Aug 23 22:50:06 2018 -0500 ntdll/tests: Add more tests for RtlDosPathNameToNtPathName_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 | 139 ++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 123 insertions(+), 16 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8c7e141bb187e0a34779…

1 0

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

24 Aug '18

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

Alistair Leslie-Hughes : include: Add IWbemUnsecuredApartment interfaces.
by Alexandre Julliard 24 Aug '18

24 Aug '18

Module: wine Branch: master Commit: 8d834ca945fa7f1b82c562cd2e14a2e9fd7acd43 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8d834ca945fa7f1b82c562cd… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Aug 24 04:10:59 2018 +0000 include: Add IWbemUnsecuredApartment interfaces. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wbemcli.idl | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/include/wbemcli.idl b/include/wbemcli.idl index 4a0f4e2..54cdb88 100644 --- a/include/wbemcli.idl +++ b/include/wbemcli.idl @@ -660,3 +660,46 @@ interface IWbemQualifierSet : IUnknown HRESULT EndEnumeration(); } + + +typedef [v1_enum] enum tag_WBEM_UNSECAPP_FLAG_TYPE +{ + WBEM_FLAG_UNSECAPP_DEFAULT_CHECK_ACCESS, + WBEM_FLAG_UNSECAPP_CHECK_ACCESS, + WBEM_FLAG_UNSECAPP_DONT_CHECK_ACCESS +} WBEM_UNSECAPP_FLAG_TYPE; + +[ + object, + restricted, + uuid(1cfaba8c-1523-11d1-ad79-00c04fd8fdff) +] +interface IUnsecuredApartment : IUnknown +{ + HRESULT CreateObjectStub( + [in] IUnknown *object, + [out] IUnknown **stub); +}; + +[ + object, + restricted, + uuid(31739d04-3471-4cf4-9a7c-57a44ae71956) +] +interface IWbemUnsecuredApartment : IUnsecuredApartment +{ + HRESULT CreateSinkStub( + [in] IWbemObjectSink *sink, + [in] DWORD flags, + [in,unique] const WCHAR *reserved, + [out] IWbemObjectSink **stub); +}; + +[ + uuid(49bd2028-1523-11d1-ad79-00c04fd8fdff) +] +coclass UnsecuredApartment +{ + interface IUnsecuredApartment; + interface IWbemUnsecuredApartment; +};

1 0