October 2023 - Wine-commits

Gabriel Ivăncescu : shdoclc: Add a basic generic html page for navigation errors.
by Alexandre Julliard 07 Oct '23

07 Oct '23

Module: wine Branch: master Commit: e3c768ab551b4751937a14d55ae470e5618ff272 URL: https://gitlab.winehq.org/wine/wine/-/commit/e3c768ab551b4751937a14d55ae470… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Oct 5 18:57:46 2023 +0300 shdoclc: Add a basic generic html page for navigation errors. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/shdoclc/ERROR.HTM | 13 +++++++++++++ dlls/shdoclc/shdoclc.rc | 3 +++ 2 files changed, 16 insertions(+) diff --git a/dlls/shdoclc/ERROR.HTM b/dlls/shdoclc/ERROR.HTM new file mode 100644 index 00000000000..e74efa15608 --- /dev/null +++ b/dlls/shdoclc/ERROR.HTM @@ -0,0 +1,13 @@ +<!DOCTYPE HTML> +<html> +<head> + <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> + <title>Page Load Error</title> +</head> +<body onload="javascript: if(window.location.search) document.getElementById('err').innerHTML = unescape(window.location.search.substr(1))"> +<div style="margin-left:45px; width:720px;"> + <h2>The page cannot be loaded because of an error</h2> + <p>Error code: <b id="err">Unknown</b></p> +</div> +</body> +</html> diff --git a/dlls/shdoclc/shdoclc.rc b/dlls/shdoclc/shdoclc.rc index 57b03e152d4..a350438e0fb 100644 --- a/dlls/shdoclc/shdoclc.rc +++ b/dlls/shdoclc/shdoclc.rc @@ -241,3 +241,6 @@ IDR_BROWSE_CONTEXT_MENU MENU MENUITEM "Scroll Right", IDM_SCROLL_RIGHT } } + +/* @makedep: ERROR.HTM */ +ERROR.HTM HTML "ERROR.HTM"

1 0

Gabriel Ivăncescu : ieframe: Implement IEHTMLWindow2_get_document.
by Alexandre Julliard 07 Oct '23

07 Oct '23

Module: wine Branch: master Commit: 125c390f61e09bcc2e988ecf39aed92b8b54951b URL: https://gitlab.winehq.org/wine/wine/-/commit/125c390f61e09bcc2e988ecf39aed9… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Oct 5 18:57:46 2023 +0300 ieframe: Implement IEHTMLWindow2_get_document. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/ieframe/iehtmlwnd.c | 37 +++++++++++++++++++++++++++++++++++-- 1 file changed, 35 insertions(+), 2 deletions(-) diff --git a/dlls/ieframe/iehtmlwnd.c b/dlls/ieframe/iehtmlwnd.c index 44e58a2cdff..de211fc784f 100644 --- a/dlls/ieframe/iehtmlwnd.c +++ b/dlls/ieframe/iehtmlwnd.c @@ -22,6 +22,25 @@ WINE_DEFAULT_DEBUG_CHANNEL(ieframe); +HRESULT get_window(DocHost *doc_host, IHTMLWindow2 **ret) +{ + IHTMLDocument2 *doc_obj; + HRESULT hres; + + if(!doc_host->document) { + *ret = NULL; + return S_OK; + } + + hres = IUnknown_QueryInterface(doc_host->document, &IID_IHTMLDocument2, (void**)&doc_obj); + if(FAILED(hres)) + return hres; + + hres = IHTMLDocument2_get_parentWindow(doc_obj, ret); + IHTMLDocument2_Release(doc_obj); + return hres; +} + static inline IEHTMLWindow *impl_from_IHTMLWindow2(IHTMLWindow2 *iface) { return CONTAINING_RECORD(iface, IEHTMLWindow, IHTMLWindow2_iface); @@ -432,8 +451,22 @@ static HRESULT WINAPI IEHTMLWindow2_get_onscroll(IHTMLWindow2 *iface, VARIANT *p static HRESULT WINAPI IEHTMLWindow2_get_document(IHTMLWindow2 *iface, IHTMLDocument2 **p) { IEHTMLWindow *This = impl_from_IHTMLWindow2(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + IHTMLWindow2 *window; + HRESULT hres; + + TRACE("(%p)->(%p)\n", This, p); + + hres = get_window(This->doc_host, &window); + if(FAILED(hres)) + return hres; + + if(!window) + *p = NULL; + else { + hres = IHTMLWindow2_get_document(window, p); + IHTMLWindow2_Release(window); + } + return hres; } static HRESULT WINAPI IEHTMLWindow2_get_event(IHTMLWindow2 *iface, IHTMLEventObj **p)

1 0

Gabriel Ivăncescu : ieframe: Navigate to a basic error page on failed navigation.
by Alexandre Julliard 07 Oct '23

07 Oct '23

Module: wine Branch: master Commit: 8a67308f7466fed8f8f3b4968b7022ec8bc12459 URL: https://gitlab.winehq.org/wine/wine/-/commit/8a67308f7466fed8f8f3b4968b7022… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Oct 5 18:57:46 2023 +0300 ieframe: Navigate to a basic error page on failed navigation. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/ieframe/ieframe.h | 1 + dlls/ieframe/navigate.c | 49 +++++++++++++-- dlls/ieframe/tests/ie.c | 156 ++++++++++++++++++++++++++++++++++++++++++++++-- 3 files changed, 198 insertions(+), 8 deletions(-)

1 0

Gabriel Ivăncescu : ieframe: Use the original URL for error pages' address bar.
by Alexandre Julliard 07 Oct '23

07 Oct '23

Module: wine Branch: master Commit: 76b198000f3df8e32c63174dc728d88f625e85f7 URL: https://gitlab.winehq.org/wine/wine/-/commit/76b198000f3df8e32c63174dc728d8… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Oct 5 18:57:46 2023 +0300 ieframe: Use the original URL for error pages' address bar. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/ieframe/ieframe.h | 1 + dlls/ieframe/iexplore.c | 4 ++++ dlls/ieframe/shellbrowser.c | 18 ++++++++++++++++++ 3 files changed, 23 insertions(+) diff --git a/dlls/ieframe/ieframe.h b/dlls/ieframe/ieframe.h index b03fe6e8e83..602bb1c5d36 100644 --- a/dlls/ieframe/ieframe.h +++ b/dlls/ieframe/ieframe.h @@ -281,6 +281,7 @@ HRESULT get_window(DocHost*,IHTMLWindow2**); HRESULT get_location_url(DocHost*,BSTR*); HRESULT set_dochost_url(DocHost*,const WCHAR*); void handle_navigation_error(DocHost*,HRESULT,BSTR,IHTMLWindow2*); +const WCHAR *error_url_frag(const WCHAR*); HRESULT dochost_object_available(DocHost*,IUnknown*); void set_doc_state(DocHost*,READYSTATE); void activate_document(DocHost*); diff --git a/dlls/ieframe/iexplore.c b/dlls/ieframe/iexplore.c index acf7a18e3f3..43ecf5ee3f1 100644 --- a/dlls/ieframe/iexplore.c +++ b/dlls/ieframe/iexplore.c @@ -783,6 +783,10 @@ static void DocHostContainer_on_command_state_change(DocHost *iface, LONG comman static void DocHostContainer_set_url(DocHost* iface, const WCHAR *url) { InternetExplorer *This = impl_from_DocHost(iface); + const WCHAR *orig_url = error_url_frag(url); + + if(orig_url) + url = orig_url; This->nohome = FALSE; SendMessageW(This->frame_hwnd, WM_UPDATEADDRBAR, 0, (LPARAM)url); diff --git a/dlls/ieframe/shellbrowser.c b/dlls/ieframe/shellbrowser.c index a5666fd761b..d3f8c6f8ddb 100644 --- a/dlls/ieframe/shellbrowser.c +++ b/dlls/ieframe/shellbrowser.c @@ -29,6 +29,24 @@ WINE_DEFAULT_DEBUG_CHANNEL(ieframe); +const WCHAR *error_url_frag(const WCHAR *url) +{ + if(!wcsncmp(url, L"res://", ARRAY_SIZE(L"res://")-1)) { + WCHAR buf[MAX_PATH]; + UINT len = GetSystemDirectoryW(buf, ARRAY_SIZE(buf)); + + if(len && !wcsncmp(url + ARRAY_SIZE(L"res://")-1, buf, len)) { + len += ARRAY_SIZE(L"res://")-1; + if(!wcsncmp(url + len, L"\\shdoclc.dll/ERROR.HTM", ARRAY_SIZE(L"\\shdoclc.dll/ERROR.HTM")-1)) { + len += ARRAY_SIZE(L"\\shdoclc.dll/ERROR.HTM")-1; + url = wcschr(url + len, '#'); + return url ? url + 1 : NULL; + } + } + } + return NULL; +} + static inline ShellBrowser *impl_from_IShellBrowser(IShellBrowser *iface) { return CONTAINING_RECORD(iface, ShellBrowser, IShellBrowser_iface);

1 0

Gabriel Ivăncescu : ieframe: Send the original URL for error pages in FireNavigationComplete2 notification.
by Alexandre Julliard 07 Oct '23

07 Oct '23

Module: wine Branch: master Commit: 82c03141d871d8bf651132817bfa6bc117ed0d8b URL: https://gitlab.winehq.org/wine/wine/-/commit/82c03141d871d8bf651132817bfa6b… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Oct 5 18:57:46 2023 +0300 ieframe: Send the original URL for error pages in FireNavigationComplete2 notification. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/ieframe/shellbrowser.c | 8 ++++++++ dlls/ieframe/tests/ie.c | 1 - 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/ieframe/shellbrowser.c b/dlls/ieframe/shellbrowser.c index d3f8c6f8ddb..58ff851fb0b 100644 --- a/dlls/ieframe/shellbrowser.c +++ b/dlls/ieframe/shellbrowser.c @@ -758,6 +758,7 @@ static HRESULT WINAPI DocObjectService_FireNavigateComplete2( ShellBrowser *This = impl_from_IDocObjectService(iface); DocHost *doc_host = This->doc_host; IHTMLPrivateWindow *priv_window; + const WCHAR *orig_url; VARIANTARG params[2]; DISPPARAMS dp = {params, NULL, 2, 0}; VARIANT url_var; @@ -786,6 +787,13 @@ static HRESULT WINAPI DocObjectService_FireNavigateComplete2( TRACE("got URL %s\n", debugstr_w(url)); set_dochost_url(This->doc_host, url); + orig_url = error_url_frag(url); + if(orig_url) { + BSTR tmp = SysAllocString(orig_url); + SysFreeString(url); + url = tmp; + } + V_VT(params) = (VT_BYREF|VT_VARIANT); V_VARIANTREF(params) = &url_var; diff --git a/dlls/ieframe/tests/ie.c b/dlls/ieframe/tests/ie.c index 5e52baedb68..8a91efb3af5 100644 --- a/dlls/ieframe/tests/ie.c +++ b/dlls/ieframe/tests/ie.c @@ -186,7 +186,6 @@ static HRESULT WINAPI Dispatch_Invoke(IDispatch *iface, DISPID dispIdMember, REF arg = pDispParams->rgvarg; ok(V_VT(arg) == (VT_BYREF | VT_VARIANT), "VT = %d\n", V_VT(arg)); ok(V_VT(V_VARIANTREF(arg)) == VT_BSTR, "VT = %d\n", V_VT(V_VARIANTREF(arg))); - todo_wine_if(called_Invoke_NAVIGATEERROR) ok(!wcscmp(V_BSTR(V_VARIANTREF(arg)), navigate_url), "url = %s\n", wine_dbgstr_w(V_BSTR(V_VARIANTREF(arg)))); arg = pDispParams->rgvarg + 1;

1 0

Gabriel Ivăncescu : ieframe: Send the original URL for error pages in FireDocumentComplete notification.
by Alexandre Julliard 07 Oct '23

07 Oct '23

Module: wine Branch: master Commit: 5d17e7e4a877d75c024e016b1cc888b31f3fad10 URL: https://gitlab.winehq.org/wine/wine/-/commit/5d17e7e4a877d75c024e016b1cc888… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Oct 5 18:57:46 2023 +0300 ieframe: Send the original URL for error pages in FireDocumentComplete notification. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/ieframe/shellbrowser.c | 8 ++++++++ dlls/ieframe/tests/ie.c | 1 - 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/ieframe/shellbrowser.c b/dlls/ieframe/shellbrowser.c index 58ff851fb0b..ca229c0ac8b 100644 --- a/dlls/ieframe/shellbrowser.c +++ b/dlls/ieframe/shellbrowser.c @@ -839,6 +839,7 @@ static HRESULT WINAPI DocObjectService_FireDocumentComplete( { ShellBrowser *This = impl_from_IDocObjectService(iface); IHTMLPrivateWindow *priv_window; + const WCHAR *orig_url; VARIANTARG params[2]; DISPPARAMS dp = {params, NULL, 2, 0}; VARIANT url_var; @@ -858,6 +859,13 @@ static HRESULT WINAPI DocObjectService_FireDocumentComplete( TRACE("got URL %s\n", debugstr_w(url)); + orig_url = error_url_frag(url); + if(orig_url) { + BSTR tmp = SysAllocString(orig_url); + SysFreeString(url); + url = tmp; + } + V_VT(params) = (VT_BYREF|VT_VARIANT); V_VARIANTREF(params) = &url_var; diff --git a/dlls/ieframe/tests/ie.c b/dlls/ieframe/tests/ie.c index 8a91efb3af5..d6e1f643952 100644 --- a/dlls/ieframe/tests/ie.c +++ b/dlls/ieframe/tests/ie.c @@ -215,7 +215,6 @@ static HRESULT WINAPI Dispatch_Invoke(IDispatch *iface, DISPID dispIdMember, REF arg = pDispParams->rgvarg; ok(V_VT(arg) == (VT_BYREF | VT_VARIANT), "VT = %d\n", V_VT(arg)); ok(V_VT(V_VARIANTREF(arg)) == VT_BSTR, "VT = %d\n", V_VT(V_VARIANTREF(arg))); - todo_wine_if(called_Invoke_NAVIGATEERROR) ok(!wcscmp(V_BSTR(V_VARIANTREF(arg)), navigate_url), "url = %s\n", wine_dbgstr_w(V_BSTR(V_VARIANTREF(arg)))); arg = pDispParams->rgvarg + 1;

1 0

Gabriel Ivăncescu : ieframe: Implement DocObjectService_IsErrorUrl.
by Alexandre Julliard 07 Oct '23

07 Oct '23

Module: wine Branch: master Commit: c737b283d0c9716f5ea7e93afac93b8c34e8fc16 URL: https://gitlab.winehq.org/wine/wine/-/commit/c737b283d0c9716f5ea7e93afac93b… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Oct 5 18:57:46 2023 +0300 ieframe: Implement DocObjectService_IsErrorUrl. Needed to prevent an infinite loop when the error page itself fails to load (mshtml bails out early). Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/ieframe/shellbrowser.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/ieframe/shellbrowser.c b/dlls/ieframe/shellbrowser.c index ca229c0ac8b..e2c4c451741 100644 --- a/dlls/ieframe/shellbrowser.c +++ b/dlls/ieframe/shellbrowser.c @@ -930,9 +930,10 @@ static HRESULT WINAPI DocObjectService_IsErrorUrl( BOOL *pfIsError) { ShellBrowser *This = impl_from_IDocObjectService(iface); - FIXME("%p %s %p\n", This, debugstr_w(lpszUrl), pfIsError); - *pfIsError = FALSE; + TRACE("(%p)->(%s %p)\n", This, debugstr_w(lpszUrl), pfIsError); + + *pfIsError = !!error_url_frag(lpszUrl); return S_OK; }

1 0

Joel Holdsworth : ntdll/tests: Add tests for FILE_RENAME_IGNORE_READONLY_ATTRIBUTE.
by Alexandre Julliard 05 Oct '23

05 Oct '23

Module: wine Branch: master Commit: 07e40a6f9f70338d9810d50b606696b7be984d98 URL: https://gitlab.winehq.org/wine/wine/-/commit/07e40a6f9f70338d9810d50b606696… Author: Joel Holdsworth <joel(a)airwebreathe.org.uk> Date: Wed Sep 20 11:34:09 2023 +0100 ntdll/tests: Add tests for FILE_RENAME_IGNORE_READONLY_ATTRIBUTE. Signed-off-by: Joel Holdsworth <joel(a)airwebreathe.org.uk> --- dlls/ntdll/tests/file.c | 97 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 96 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index cf04ccc1264..5164e864888 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -1502,7 +1502,9 @@ static void test_file_all_information(void) static void delete_object( WCHAR *path ) { - BOOL ret = DeleteFileW( path ); + BOOL ret = SetFileAttributesW( path, FILE_ATTRIBUTE_NORMAL ); + ok( ret || GetLastError() == ERROR_FILE_NOT_FOUND, "SetFileAttribute failed with %lu\n", GetLastError() ); + ret = DeleteFileW( path ); ok( ret || GetLastError() == ERROR_FILE_NOT_FOUND || GetLastError() == ERROR_ACCESS_DENIED, "DeleteFileW failed with %lu\n", GetLastError() ); if (!ret && GetLastError() == ERROR_ACCESS_DENIED) @@ -2178,6 +2180,98 @@ static void test_file_rename_information(FILE_INFORMATION_CLASS class) delete_object( oldpath ); } +static void test_file_rename_information_ex(void) +{ + static const WCHAR fooW[] = {'f','o','o',0}; + WCHAR tmp_path[MAX_PATH], oldpath[MAX_PATH + 16], newpath[MAX_PATH + 16]; + FILE_RENAME_INFORMATION *fri; + BOOL fileDeleted; + UNICODE_STRING name_str; + HANDLE handle, handle2; + IO_STATUS_BLOCK io; + NTSTATUS res; + + GetTempPathW( MAX_PATH, tmp_path ); + + /* oldpath is a file, newpath is a read-only file, with FILE_RENAME_REPLACE_IF_EXISTS */ + res = GetTempFileNameW( tmp_path, fooW, 0, oldpath ); + ok( res != 0, "failed to create temp file\n" ); + handle = CreateFileW( oldpath, GENERIC_WRITE | DELETE, 0, NULL, CREATE_ALWAYS, 0, 0 ); + ok( handle != INVALID_HANDLE_VALUE, "CreateFileW failed\n" ); + + res = GetTempFileNameW( tmp_path, fooW, 0, newpath ); + ok( res != 0, "failed to create temp file\n" ); + DeleteFileW( newpath ); + handle2 = CreateFileW( newpath, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_READONLY, 0 ); + ok( handle2 != INVALID_HANDLE_VALUE, "CreateFileW failed\n" ); + CloseHandle( handle2 ); + pRtlDosPathNameToNtPathName_U( newpath, &name_str, NULL, NULL ); + fri = HeapAlloc( GetProcessHeap(), 0, sizeof(FILE_RENAME_INFORMATION) + name_str.Length ); + fri->Flags = FILE_RENAME_REPLACE_IF_EXISTS; + fri->RootDirectory = NULL; + fri->FileNameLength = name_str.Length; + memcpy( fri->FileName, name_str.Buffer, name_str.Length ); + pRtlFreeUnicodeString( &name_str ); + + io.Status = 0xdeadbeef; + res = pNtSetInformationFile( handle, &io, fri, sizeof(FILE_RENAME_INFORMATION) + fri->FileNameLength, FileRenameInformationEx ); + + if (res == STATUS_NOT_IMPLEMENTED || res == STATUS_INVALID_INFO_CLASS) + { + win_skip( "FileRenameInformationEx not supported\n" ); + CloseHandle( handle ); + HeapFree( GetProcessHeap(), 0, fri ); + delete_object( oldpath ); + return; + } + + todo_wine ok( io.Status == 0xdeadbeef, "io.Status expected 0xdeadbeef, got %lx\n", io.Status ); + todo_wine ok( res == STATUS_ACCESS_DENIED, "res expected STATUS_ACCESS_DENIED, got %lx\n", res ); + fileDeleted = GetFileAttributesW( oldpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; + todo_wine ok( !fileDeleted, "file should exist\n" ); + fileDeleted = GetFileAttributesW( newpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; + ok( !fileDeleted, "file should exist\n" ); + + CloseHandle( handle ); + HeapFree( GetProcessHeap(), 0, fri ); + delete_object( oldpath ); + delete_object( newpath ); + + /* oldpath is a file, newpath is a read-only file, with FILE_RENAME_REPLACE_IF_EXISTS and FILE_RENAME_IGNORE_READONLY_ATTRIBUTE */ + res = GetTempFileNameW( tmp_path, fooW, 0, oldpath ); + ok( res != 0, "failed to create temp file\n" ); + handle = CreateFileW( oldpath, GENERIC_WRITE | DELETE, 0, NULL, CREATE_ALWAYS, 0, 0 ); + ok( handle != INVALID_HANDLE_VALUE, "CreateFileW failed\n" ); + + res = GetTempFileNameW( tmp_path, fooW, 0, newpath ); + ok( res != 0, "failed to create temp file\n" ); + DeleteFileW( newpath ); + handle2 = CreateFileW( newpath, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_READONLY, 0 ); + ok( handle2 != INVALID_HANDLE_VALUE, "CreateFileW failed\n" ); + CloseHandle( handle2 ); + pRtlDosPathNameToNtPathName_U( newpath, &name_str, NULL, NULL ); + fri = HeapAlloc( GetProcessHeap(), 0, sizeof(FILE_RENAME_INFORMATION) + name_str.Length ); + fri->Flags = FILE_RENAME_REPLACE_IF_EXISTS | FILE_RENAME_IGNORE_READONLY_ATTRIBUTE; + fri->RootDirectory = NULL; + fri->FileNameLength = name_str.Length; + memcpy( fri->FileName, name_str.Buffer, name_str.Length ); + pRtlFreeUnicodeString( &name_str ); + + io.Status = 0xdeadbeef; + res = pNtSetInformationFile( handle, &io, fri, sizeof(FILE_RENAME_INFORMATION) + fri->FileNameLength, FileRenameInformationEx ); + ok( io.Status == STATUS_SUCCESS, "io.Status expected STATUS_SUCCESS, got %lx\n", io.Status ); + ok( res == STATUS_SUCCESS, "res expected STATUS_SUCCESS, got %lx\n", res ); + fileDeleted = GetFileAttributesW( oldpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; + ok( fileDeleted, "file should not exist\n" ); + fileDeleted = GetFileAttributesW( newpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; + ok( !fileDeleted, "file should exist\n" ); + + CloseHandle( handle ); + HeapFree( GetProcessHeap(), 0, fri ); + delete_object( oldpath ); + delete_object( newpath ); +} + static void test_file_link_information(FILE_INFORMATION_CLASS class) { static const WCHAR foo_txtW[] = {'\\','f','o','o','.','t','x','t',0}; @@ -5699,6 +5793,7 @@ START_TEST(file) test_file_all_name_information(); test_file_rename_information(FileRenameInformation); test_file_rename_information(FileRenameInformationEx); + test_file_rename_information_ex(); test_file_link_information(FileLinkInformation); test_file_link_information(FileLinkInformationEx); test_file_disposition_information();

1 0

Joel Holdsworth : ntdll/tests: Add tests for FILE_LINK_IGNORE_READONLY_ATTRIBUTE.
by Alexandre Julliard 05 Oct '23

05 Oct '23

Module: wine Branch: master Commit: 08ca54b494fa7732ee8522adab2779f23a04ff71 URL: https://gitlab.winehq.org/wine/wine/-/commit/08ca54b494fa7732ee8522adab2779… Author: Joel Holdsworth <joel(a)airwebreathe.org.uk> Date: Wed Sep 20 10:28:10 2023 +0100 ntdll/tests: Add tests for FILE_LINK_IGNORE_READONLY_ATTRIBUTE. Signed-off-by: Joel Holdsworth <joel(a)airwebreathe.org.uk> --- dlls/ntdll/tests/file.c | 93 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 93 insertions(+) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 5164e864888..ae8956dedf4 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -3031,6 +3031,98 @@ static void test_file_link_information(FILE_INFORMATION_CLASS class) delete_object( oldpath ); } +static void test_file_link_information_ex(void) +{ + static const WCHAR fooW[] = {'f','o','o',0}; + WCHAR tmp_path[MAX_PATH], oldpath[MAX_PATH + 16], newpath[MAX_PATH + 16]; + FILE_LINK_INFORMATION *fli; + BOOL fileDeleted; + UNICODE_STRING name_str; + HANDLE handle, handle2; + IO_STATUS_BLOCK io; + NTSTATUS res; + + GetTempPathW( MAX_PATH, tmp_path ); + + /* oldpath is a file, newpath is a read-only file, with FILE_LINK_REPLACE_IF_EXISTS */ + res = GetTempFileNameW( tmp_path, fooW, 0, oldpath ); + ok( res != 0, "failed to create temp file\n" ); + handle = CreateFileW( oldpath, GENERIC_WRITE | DELETE, 0, NULL, CREATE_ALWAYS, 0, 0 ); + ok( handle != INVALID_HANDLE_VALUE, "CreateFileW failed\n" ); + + res = GetTempFileNameW( tmp_path, fooW, 0, newpath ); + ok( res != 0, "failed to create temp file\n" ); + DeleteFileW( newpath ); + handle2 = CreateFileW( newpath, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_READONLY, 0 ); + ok( handle2 != INVALID_HANDLE_VALUE, "CreateFileW failed\n" ); + CloseHandle( handle2 ); + pRtlDosPathNameToNtPathName_U( newpath, &name_str, NULL, NULL ); + fli = HeapAlloc( GetProcessHeap(), 0, sizeof(FILE_LINK_INFORMATION) + name_str.Length ); + fli->Flags = FILE_LINK_REPLACE_IF_EXISTS; + fli->RootDirectory = NULL; + fli->FileNameLength = name_str.Length; + memcpy( fli->FileName, name_str.Buffer, name_str.Length ); + pRtlFreeUnicodeString( &name_str ); + + io.Status = 0xdeadbeef; + res = pNtSetInformationFile( handle, &io, fli, sizeof(FILE_LINK_INFORMATION) + fli->FileNameLength, FileLinkInformationEx ); + + if (res == STATUS_NOT_IMPLEMENTED || res == STATUS_INVALID_INFO_CLASS) + { + win_skip( "FileLinkInformationEx not supported\n" ); + CloseHandle( handle ); + HeapFree( GetProcessHeap(), 0, fli ); + delete_object( oldpath ); + return; + } + + todo_wine ok( io.Status == 0xdeadbeef, "io.Status expected 0xdeadbeef, got %lx\n", io.Status ); + todo_wine ok( res == STATUS_ACCESS_DENIED, "res expected STATUS_ACCESS_DENIED, got %lx\n", res ); + fileDeleted = GetFileAttributesW( oldpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; + ok( !fileDeleted, "file should exist\n" ); + fileDeleted = GetFileAttributesW( newpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; + ok( !fileDeleted, "file should exist\n" ); + + CloseHandle( handle ); + HeapFree( GetProcessHeap(), 0, fli ); + delete_object( oldpath ); + delete_object( newpath ); + + /* oldpath is a file, newpath is a read-only file, with FILE_LINK_REPLACE_IF_EXISTS and FILE_LINK_IGNORE_READONLY_ATTRIBUTE */ + res = GetTempFileNameW( tmp_path, fooW, 0, oldpath ); + ok( res != 0, "failed to create temp file\n" ); + handle = CreateFileW( oldpath, GENERIC_WRITE | DELETE, 0, NULL, CREATE_ALWAYS, 0, 0 ); + ok( handle != INVALID_HANDLE_VALUE, "CreateFileW failed\n" ); + + res = GetTempFileNameW( tmp_path, fooW, 0, newpath ); + ok( res != 0, "failed to create temp file\n" ); + DeleteFileW( newpath ); + handle2 = CreateFileW( newpath, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_READONLY, 0 ); + ok( handle2 != INVALID_HANDLE_VALUE, "CreateFileW failed\n" ); + CloseHandle( handle2 ); + pRtlDosPathNameToNtPathName_U( newpath, &name_str, NULL, NULL ); + fli = HeapAlloc( GetProcessHeap(), 0, sizeof(FILE_LINK_INFORMATION) + name_str.Length ); + fli->Flags = FILE_LINK_REPLACE_IF_EXISTS | FILE_LINK_IGNORE_READONLY_ATTRIBUTE; + fli->RootDirectory = NULL; + fli->FileNameLength = name_str.Length; + memcpy( fli->FileName, name_str.Buffer, name_str.Length ); + pRtlFreeUnicodeString( &name_str ); + + io.Status = 0xdeadbeef; + res = pNtSetInformationFile( handle, &io, fli, sizeof(FILE_LINK_INFORMATION) + fli->FileNameLength, FileLinkInformationEx ); + ok( io.Status == STATUS_SUCCESS, "io.Status expected STATUS_SUCCESS, got %lx\n", io.Status ); + ok( res == STATUS_SUCCESS, "res expected STATUS_SUCCESS, got %lx\n", res ); + fileDeleted = GetFileAttributesW( oldpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; + ok( !fileDeleted, "file should exist\n" ); + fileDeleted = GetFileAttributesW( newpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; + ok( !fileDeleted, "file should exist\n" ); + + CloseHandle( handle ); + HeapFree( GetProcessHeap(), 0, fli ); + delete_object( oldpath ); + delete_object( newpath ); +} + static void test_file_both_information(void) { IO_STATUS_BLOCK io; @@ -5796,6 +5888,7 @@ START_TEST(file) test_file_rename_information_ex(); test_file_link_information(FileLinkInformation); test_file_link_information(FileLinkInformationEx); + test_file_link_information_ex(); test_file_disposition_information(); test_file_completion_information(); test_file_id_information();

1 0

Joel Holdsworth : server: Don't allow read-only files to be replaced by File{Rename,Link}Information{,Ex}.
by Alexandre Julliard 05 Oct '23

05 Oct '23

Module: wine Branch: master Commit: a8489d12eb8161cd0434ec57774e87ea70a44716 URL: https://gitlab.winehq.org/wine/wine/-/commit/a8489d12eb8161cd0434ec57774e87… Author: Joel Holdsworth <joel(a)airwebreathe.org.uk> Date: Mon Aug 7 11:30:31 2023 +0100 server: Don't allow read-only files to be replaced by File{Rename,Link}Information{,Ex}. Signed-off-by: Joel Holdsworth <joel(a)airwebreathe.org.uk> --- dlls/ntdll/tests/file.c | 16 ++++++++-------- server/fd.c | 7 +++++++ 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index ae8956dedf4..a00a425582c 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -2226,9 +2226,9 @@ static void test_file_rename_information_ex(void) } todo_wine ok( io.Status == 0xdeadbeef, "io.Status expected 0xdeadbeef, got %lx\n", io.Status ); - todo_wine ok( res == STATUS_ACCESS_DENIED, "res expected STATUS_ACCESS_DENIED, got %lx\n", res ); + ok( res == STATUS_ACCESS_DENIED, "res expected STATUS_ACCESS_DENIED, got %lx\n", res ); fileDeleted = GetFileAttributesW( oldpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; - todo_wine ok( !fileDeleted, "file should exist\n" ); + ok( !fileDeleted, "file should exist\n" ); fileDeleted = GetFileAttributesW( newpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; ok( !fileDeleted, "file should exist\n" ); @@ -2259,10 +2259,10 @@ static void test_file_rename_information_ex(void) io.Status = 0xdeadbeef; res = pNtSetInformationFile( handle, &io, fri, sizeof(FILE_RENAME_INFORMATION) + fri->FileNameLength, FileRenameInformationEx ); - ok( io.Status == STATUS_SUCCESS, "io.Status expected STATUS_SUCCESS, got %lx\n", io.Status ); - ok( res == STATUS_SUCCESS, "res expected STATUS_SUCCESS, got %lx\n", res ); + todo_wine ok( io.Status == STATUS_SUCCESS, "io.Status expected STATUS_SUCCESS, got %lx\n", io.Status ); + todo_wine ok( res == STATUS_SUCCESS, "res expected STATUS_SUCCESS, got %lx\n", res ); fileDeleted = GetFileAttributesW( oldpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; - ok( fileDeleted, "file should not exist\n" ); + todo_wine ok( fileDeleted, "file should not exist\n" ); fileDeleted = GetFileAttributesW( newpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; ok( !fileDeleted, "file should exist\n" ); @@ -3076,7 +3076,7 @@ static void test_file_link_information_ex(void) return; } - todo_wine ok( io.Status == 0xdeadbeef, "io.Status expected 0xdeadbeef, got %lx\n", io.Status ); + ok( io.Status == 0xdeadbeef, "io.Status expected 0xdeadbeef, got %lx\n", io.Status ); todo_wine ok( res == STATUS_ACCESS_DENIED, "res expected STATUS_ACCESS_DENIED, got %lx\n", res ); fileDeleted = GetFileAttributesW( oldpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; ok( !fileDeleted, "file should exist\n" ); @@ -3110,8 +3110,8 @@ static void test_file_link_information_ex(void) io.Status = 0xdeadbeef; res = pNtSetInformationFile( handle, &io, fli, sizeof(FILE_LINK_INFORMATION) + fli->FileNameLength, FileLinkInformationEx ); - ok( io.Status == STATUS_SUCCESS, "io.Status expected STATUS_SUCCESS, got %lx\n", io.Status ); - ok( res == STATUS_SUCCESS, "res expected STATUS_SUCCESS, got %lx\n", res ); + todo_wine ok( io.Status == STATUS_SUCCESS, "io.Status expected STATUS_SUCCESS, got %lx\n", io.Status ); + todo_wine ok( res == STATUS_SUCCESS, "res expected STATUS_SUCCESS, got %lx\n", res ); fileDeleted = GetFileAttributesW( oldpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; ok( !fileDeleted, "file should exist\n" ); fileDeleted = GetFileAttributesW( newpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; diff --git a/server/fd.c b/server/fd.c index 2785bd54d63..00c0e4ac847 100644 --- a/server/fd.c +++ b/server/fd.c @@ -2600,6 +2600,13 @@ static void set_fd_name( struct fd *fd, struct fd *root, const char *nameptr, da goto failed; } + /* read-only files cannot be replaced */ + if (!(st.st_mode & (S_IWUSR | S_IWGRP | S_IWOTH))) + { + set_error( STATUS_ACCESS_DENIED ); + goto failed; + } + /* can't replace an opened file */ if ((inode = get_inode( st.st_dev, st.st_ino, -1 ))) {

1 0