June 2023 - Wine-commits - list.winehq.org

Zebediah Figura : d3d11/tests: Use more aligned offsets in test_clear_buffer_unordered_access_view().
by Alexandre Julliard 27 Jun '23

27 Jun '23

Module: wine Branch: master Commit: fdd64782ffaa9d41829f82f790a72661dd5708f5 URL: https://gitlab.winehq.org/wine/wine/-/commit/fdd64782ffaa9d41829f82f790a726… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Jun 10 15:14:34 2023 -0500 d3d11/tests: Use more aligned offsets in test_clear_buffer_unordered_access_view(). Creating a view with an unaligned offset is legal in d3d and apparently works, both on Windows and Linux, but may violate the Vulkan specification: VUID-VkBufferViewCreateInfo-offset-00926(ERROR / SPEC): msgNum: -833749292 - Validation Error: [ VUID-VkBufferViewCreateInfo-offset-00926 ] Object 0: handle = 0x3c000000003c, type = VK_OBJECT_TYPE_BUFFER; | MessageID = 0xce4dfed4 | vkCreateBufferView(): VkBufferViewCreateInfo offset (36) must be a multiple of VkPhysicalDeviceLimits::minTexelBufferOffsetAlignment (16). The Vulkan spec states: offset must be a multiple of VkPhysicalDeviceLimits::minTexelBufferOffsetAlignment (https://www.khronos.org/registry/vulkan/specs/1.2-khr-extensions/html/vkspe…) Without any reason to test unaligned buffer views here, just resolve this by changing the test. --- dlls/d3d11/tests/d3d11.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 9d120e99f6f..cc3139f759f 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -16638,8 +16638,8 @@ static void test_clear_buffer_unordered_access_view(void) U(uav_desc).Buffer.Flags = 0; hr = ID3D11Device_CreateUnorderedAccessView(device, (ID3D11Resource *)buffer, &uav_desc, &uav); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); - U(uav_desc).Buffer.FirstElement = 9; - U(uav_desc).Buffer.NumElements = 7; + U(uav_desc).Buffer.FirstElement = 8; + U(uav_desc).Buffer.NumElements = 8; hr = ID3D11Device_CreateUnorderedAccessView(device, (ID3D11Resource *)buffer, &uav_desc, &uav2); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);

1 0

Nikolay Sivov : mfmediaengine/tests: Allocate notification object on heap for frame transfer tests.
by Alexandre Julliard 27 Jun '23

27 Jun '23

Module: wine Branch: master Commit: 6b9eb2d09fc97d6e868e84c97ec8e286a43141eb URL: https://gitlab.winehq.org/wine/wine/-/commit/6b9eb2d09fc97d6e868e84c97ec8e2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jun 27 16:31:28 2023 +0200 mfmediaengine/tests: Allocate notification object on heap for frame transfer tests. --- dlls/mfmediaengine/tests/mfmediaengine.c | 78 ++++++++++++++++++++++---------- 1 file changed, 55 insertions(+), 23 deletions(-) diff --git a/dlls/mfmediaengine/tests/mfmediaengine.c b/dlls/mfmediaengine/tests/mfmediaengine.c index 655b19af050..26f006a2335 100644 --- a/dlls/mfmediaengine/tests/mfmediaengine.c +++ b/dlls/mfmediaengine/tests/mfmediaengine.c @@ -1136,12 +1136,18 @@ static IMFByteStream *load_resource(const WCHAR *name, const WCHAR *mime) struct test_transfer_notify { IMFMediaEngineNotify IMFMediaEngineNotify_iface; + LONG refcount; IMFMediaEngineEx *media_engine; HANDLE ready_event; HRESULT error; }; +static struct test_transfer_notify *impl_from_test_transfer_notify(IMFMediaEngineNotify *iface) +{ + return CONTAINING_RECORD(iface, struct test_transfer_notify, IMFMediaEngineNotify_iface); +} + static HRESULT WINAPI test_transfer_notify_QueryInterface(IMFMediaEngineNotify *iface, REFIID riid, void **obj) { if (IsEqualIID(riid, &IID_IUnknown) @@ -1158,17 +1164,27 @@ static HRESULT WINAPI test_transfer_notify_QueryInterface(IMFMediaEngineNotify * static ULONG WINAPI test_transfer_notify_AddRef(IMFMediaEngineNotify *iface) { - return 2; + struct test_transfer_notify *notify = impl_from_test_transfer_notify(iface); + return InterlockedIncrement(&notify->refcount); } static ULONG WINAPI test_transfer_notify_Release(IMFMediaEngineNotify *iface) { - return 1; + struct test_transfer_notify *notify = impl_from_test_transfer_notify(iface); + ULONG refcount = InterlockedDecrement(&notify->refcount); + + if (!refcount) + { + CloseHandle(notify->ready_event); + free(notify); + } + + return refcount; } static HRESULT WINAPI test_transfer_notify_EventNotify(IMFMediaEngineNotify *iface, DWORD event, DWORD_PTR param1, DWORD param2) { - struct test_transfer_notify *notify = CONTAINING_RECORD(iface, struct test_transfer_notify, IMFMediaEngineNotify_iface); + struct test_transfer_notify *notify = impl_from_test_transfer_notify(iface); IMFMediaEngineEx *media_engine = notify->media_engine; DWORD width, height; HRESULT hr; @@ -1211,13 +1227,26 @@ static IMFMediaEngineNotifyVtbl test_transfer_notify_vtbl = test_transfer_notify_EventNotify, }; +static struct test_transfer_notify *create_transfer_notify(void) +{ + struct test_transfer_notify *object; + + object = calloc(1, sizeof(*object)); + object->IMFMediaEngineNotify_iface.lpVtbl = &test_transfer_notify_vtbl; + object->refcount = 1; + object->ready_event = CreateEventW(NULL, FALSE, FALSE, NULL); + ok(!!object->ready_event, "Failed to create an event, error %lu.\n", GetLastError()); + + return object; +} + static void test_TransferVideoFrame(void) { - struct test_transfer_notify notify = {{&test_transfer_notify_vtbl}}; + struct test_transfer_notify *notify; WCHAR url[] = {L"i420-64x64.avi"}; - ID3D11Texture2D *texture, *rb_texture; + ID3D11Texture2D *texture = NULL, *rb_texture; D3D11_MAPPED_SUBRESOURCE map_desc; - IMFMediaEngineEx *media_engine; + IMFMediaEngineEx *media_engine = NULL; IMFDXGIDeviceManager *manager; ID3D11DeviceContext *context; D3D11_TEXTURE2D_DESC desc; @@ -1230,13 +1259,12 @@ static void test_TransferVideoFrame(void) stream = load_resource(L"i420-64x64.avi", L"video/avi"); - notify.ready_event = CreateEventW(NULL, FALSE, FALSE, NULL); - ok(!!notify.ready_event, "CreateEventW failed, error %lu\n", GetLastError()); + notify = create_transfer_notify(); if (!(device = create_d3d11_device())) { skip("Failed to create a D3D11 device, skipping tests.\n"); - return; + goto done; } hr = pMFCreateDXGIDeviceManager(&token, &manager); @@ -1244,13 +1272,12 @@ static void test_TransferVideoFrame(void) hr = IMFDXGIDeviceManager_ResetDevice(manager, (IUnknown *)device, token); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - media_engine = create_media_engine_ex(&notify.IMFMediaEngineNotify_iface, - manager, DXGI_FORMAT_B8G8R8X8_UNORM); + media_engine = create_media_engine_ex(&notify->IMFMediaEngineNotify_iface, manager, DXGI_FORMAT_B8G8R8X8_UNORM); IMFDXGIDeviceManager_Release(manager); - if (!(notify.media_engine = media_engine)) - return; + if (!(notify->media_engine = media_engine)) + goto done; memset(&desc, 0, sizeof(desc)); desc.Width = 64; @@ -1266,12 +1293,12 @@ static void test_TransferVideoFrame(void) ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); IMFByteStream_Release(stream); - res = WaitForSingleObject(notify.ready_event, 5000); + res = WaitForSingleObject(notify->ready_event, 5000); ok(!res, "Unexpected res %#lx.\n", res); - if (FAILED(notify.error)) + if (FAILED(notify->error)) { - win_skip("Media engine reported error %#lx, skipping tests.\n", notify.error); + win_skip("Media engine reported error %#lx, skipping tests.\n", notify->error); goto done; } @@ -1281,13 +1308,13 @@ static void test_TransferVideoFrame(void) ok(res == 1, "Unexpected stream count %lu.\n", res); /* FIXME: Wine first video frame is often full of garbage, wait for another update */ - res = WaitForSingleObject(notify.ready_event, 500); + res = WaitForSingleObject(notify->ready_event, 500); /* It's also missing the MF_MEDIA_ENGINE_EVENT_TIMEUPDATE notifications */ todo_wine ok(!res, "Unexpected res %#lx.\n", res); SetRect(&dst_rect, 0, 0, desc.Width, desc.Height); - hr = IMFMediaEngineEx_TransferVideoFrame(notify.media_engine, (IUnknown *)texture, NULL, NULL, NULL); + hr = IMFMediaEngineEx_TransferVideoFrame(notify->media_engine, (IUnknown *)texture, NULL, NULL, NULL); ok(hr == S_OK || broken(hr == E_POINTER) /* w1064v1507 */, "Unexpected hr %#lx.\n", hr); if (hr == E_POINTER) goto done; @@ -1317,13 +1344,18 @@ static void test_TransferVideoFrame(void) ID3D11Texture2D_Release(rb_texture); done: - IMFMediaEngineEx_Shutdown(media_engine); - IMFMediaEngineEx_Release(media_engine); + if (media_engine) + { + IMFMediaEngineEx_Shutdown(media_engine); + IMFMediaEngineEx_Release(media_engine); + } - ID3D11Texture2D_Release(texture); - ID3D11Device_Release(device); + if (texture) + ID3D11Texture2D_Release(texture); + if (device) + ID3D11Device_Release(device); - CloseHandle(notify.ready_event); + IMFMediaEngineNotify_Release(&notify->IMFMediaEngineNotify_iface); } START_TEST(mfmediaengine)

1 0

Nikolay Sivov : mfmediaengine/tests: Use correct type for url argument in SetSourceFromByteStream().
by Alexandre Julliard 27 Jun '23

27 Jun '23

Module: wine Branch: master Commit: 36fcbba73ef377ff08e81618b752a9eafa59cdd4 URL: https://gitlab.winehq.org/wine/wine/-/commit/36fcbba73ef377ff08e81618b752a9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jun 27 16:38:38 2023 +0200 mfmediaengine/tests: Use correct type for url argument in SetSourceFromByteStream(). --- dlls/mfmediaengine/tests/mfmediaengine.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/mfmediaengine/tests/mfmediaengine.c b/dlls/mfmediaengine/tests/mfmediaengine.c index 26f006a2335..1af6858aca3 100644 --- a/dlls/mfmediaengine/tests/mfmediaengine.c +++ b/dlls/mfmediaengine/tests/mfmediaengine.c @@ -1243,7 +1243,6 @@ static struct test_transfer_notify *create_transfer_notify(void) static void test_TransferVideoFrame(void) { struct test_transfer_notify *notify; - WCHAR url[] = {L"i420-64x64.avi"}; ID3D11Texture2D *texture = NULL, *rb_texture; D3D11_MAPPED_SUBRESOURCE map_desc; IMFMediaEngineEx *media_engine = NULL; @@ -1256,6 +1255,7 @@ static void test_TransferVideoFrame(void) UINT token; HRESULT hr; DWORD res; + BSTR url; stream = load_resource(L"i420-64x64.avi", L"video/avi"); @@ -1289,8 +1289,10 @@ static void test_TransferVideoFrame(void) hr = ID3D11Device_CreateTexture2D(device, &desc, NULL, &texture); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + url = SysAllocString(L"i420-64x64.avi"); hr = IMFMediaEngineEx_SetSourceFromByteStream(media_engine, stream, url); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + SysFreeString(url); IMFByteStream_Release(stream); res = WaitForSingleObject(notify->ready_event, 5000);

1 0

Michael Stefaniuc : windows.gaming.input: Drop superfluous casts to self.
by Alexandre Julliard 27 Jun '23

27 Jun '23

Module: wine Branch: master Commit: 3dfa697b0e3944856c8d2ba1380a6f7e71ff789e URL: https://gitlab.winehq.org/wine/wine/-/commit/3dfa697b0e3944856c8d2ba1380a6f… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Jun 19 18:33:43 2023 +0200 windows.gaming.input: Drop superfluous casts to self. --- dlls/windows.gaming.input/async.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/windows.gaming.input/async.c b/dlls/windows.gaming.input/async.c index c41abe96cd1..a30004f2d24 100644 --- a/dlls/windows.gaming.input/async.c +++ b/dlls/windows.gaming.input/async.c @@ -442,7 +442,7 @@ static HRESULT WINAPI async_bool_put_Completed( IAsyncOperation_boolean *iface, IWineAsyncOperationCompletedHandler *handler = (IWineAsyncOperationCompletedHandler *)bool_handler; struct async_bool *impl = impl_from_IAsyncOperation_boolean( iface ); TRACE( "iface %p, handler %p.\n", iface, handler ); - return IWineAsyncInfoImpl_put_Completed( impl->IWineAsyncInfoImpl_inner, (IWineAsyncOperationCompletedHandler *)handler ); + return IWineAsyncInfoImpl_put_Completed( impl->IWineAsyncInfoImpl_inner, handler ); } static HRESULT WINAPI async_bool_get_Completed( IAsyncOperation_boolean *iface, IAsyncOperationCompletedHandler_boolean **bool_handler ) @@ -450,7 +450,7 @@ static HRESULT WINAPI async_bool_get_Completed( IAsyncOperation_boolean *iface, IWineAsyncOperationCompletedHandler **handler = (IWineAsyncOperationCompletedHandler **)bool_handler; struct async_bool *impl = impl_from_IAsyncOperation_boolean( iface ); TRACE( "iface %p, handler %p.\n", iface, handler ); - return IWineAsyncInfoImpl_get_Completed( impl->IWineAsyncInfoImpl_inner, (IWineAsyncOperationCompletedHandler **)handler ); + return IWineAsyncInfoImpl_get_Completed( impl->IWineAsyncInfoImpl_inner, handler ); } static HRESULT WINAPI async_bool_GetResults( IAsyncOperation_boolean *iface, BOOLEAN *results )

1 0

Michael Stefaniuc : wow64win: Remove dangling space after newline in ERR() message.
by Alexandre Julliard 27 Jun '23

27 Jun '23

Module: wine Branch: master Commit: 7ae55662a2a417eae913f4b459cfb900fb156769 URL: https://gitlab.winehq.org/wine/wine/-/commit/7ae55662a2a417eae913f4b459cfb9… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Jun 22 18:56:52 2023 +0200 wow64win: Remove dangling space after newline in ERR() message. --- dlls/wow64win/user.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c index 59c3251fe92..73854225b7f 100644 --- a/dlls/wow64win/user.c +++ b/dlls/wow64win/user.c @@ -4357,6 +4357,6 @@ NTSTATUS WINAPI wow64_NtUserDisplayConfigGetDeviceInfo( UINT *args ) NTSTATUS WINAPI wow64___wine_send_input( UINT *args ) { - ERR( "not supported\n "); + ERR( "not supported\n" ); return 0; }

1 0

Tim Clem : win32u: Detect a missed WM_LBUTTONUP in the size/move loop.
by Alexandre Julliard 27 Jun '23

27 Jun '23

Module: wine Branch: master Commit: 1e21e82859baf1298d610021c88adcbe2a529de5 URL: https://gitlab.winehq.org/wine/wine/-/commit/1e21e82859baf1298d610021c88adc… Author: Tim Clem <tclem(a)codeweavers.com> Date: Fri Jun 23 13:38:46 2023 -0700 win32u: Detect a missed WM_LBUTTONUP in the size/move loop. --- dlls/win32u/defwnd.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/dlls/win32u/defwnd.c b/dlls/win32u/defwnd.c index e5ff1a010b9..cba5f02c02e 100644 --- a/dlls/win32u/defwnd.c +++ b/dlls/win32u/defwnd.c @@ -788,6 +788,17 @@ static void sys_command_size_move( HWND hwnd, WPARAM wparam ) { NtUserTranslateMessage( &msg, 0 ); NtUserDispatchMessage( &msg ); + + /* It's possible that the window proc that handled the dispatch consumed a + * WM_LBUTTONUP. Detect that and terminate the loop as if we'd gotten it. */ + if (!(NtUserGetKeyState( VK_LBUTTON ) & 0x8000)) + { + DWORD last_pos = NtUserGetThreadInfo()->message_pos; + pt.x = ((int)(short)LOWORD( last_pos )); + pt.y = ((int)(short)HIWORD( last_pos )); + break; + } + continue; /* We are not interested in other messages */ }

1 0

Joel Holdsworth : include: Define FILE_DISPOSITION_INFORMATION_EX and friends.
by Alexandre Julliard 27 Jun '23

27 Jun '23

Module: wine Branch: master Commit: dedd130d9ecebef631ccb20eacb3ff85fae01040 URL: https://gitlab.winehq.org/wine/wine/-/commit/dedd130d9ecebef631ccb20eacb3ff… Author: Joel Holdsworth <joel(a)airwebreathe.org.uk> Date: Mon May 1 13:44:00 2023 +0100 include: Define FILE_DISPOSITION_INFORMATION_EX and friends. Signed-off-by: Joel Holdsworth <joel(a)airwebreathe.org.uk> --- dlls/ntdll/unix/file.c | 1 + include/winternl.h | 24 ++++++++++++++++++++++++ 2 files changed, 25 insertions(+) diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index ff1618f31fd..aba4e1c694b 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -4336,6 +4336,7 @@ NTSTATUS WINAPI NtQueryInformationFile( HANDLE handle, IO_STATUS_BLOCK *io, 0, /* FileReplaceCompletionInformation */ 0, /* FileHardLinkFullIdInformation */ 0, /* FileIdExtdBothDirectoryInformation */ + 0, /* FileDispositionInformationEx */ }; struct stat st; diff --git a/include/winternl.h b/include/winternl.h index 455e199f3e1..59b04faeceb 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -1255,6 +1255,19 @@ typedef enum _FILE_INFORMATION_CLASS { FileReplaceCompletionInformation, FileHardLinkFullIdInformation, FileIdExtdBothDirectoryInformation, + FileDispositionInformationEx, + FileRenameInformationEx, + FileRenameInformationExBypassAccessCheck, + FileDesiredStorageClassInformation, + FileStatInformation, + FileMemoryPartitionInformation, + FileStatLxInformation, + FileCaseSensitiveInformation, + FileLinkInformationEx, + FileLinkInformationExBypassAccessCheck, + FileStorageReserveIdInformation, + FileCaseSensitiveInformationForceAccessCheck, + FileKnownFolderInformation, FileMaximumInformation } FILE_INFORMATION_CLASS, *PFILE_INFORMATION_CLASS; @@ -1424,6 +1437,17 @@ typedef struct _FILE_DISPOSITION_INFORMATION { BOOLEAN DoDeleteFile; } FILE_DISPOSITION_INFORMATION, *PFILE_DISPOSITION_INFORMATION; +typedef struct _FILE_DISPOSITION_INFORMATION_EX { + ULONG Flags; +} FILE_DISPOSITION_INFORMATION_EX, *PFILE_DISPOSITION_INFORMATION_EX; + +#define FILE_DISPOSITION_DO_NOT_DELETE 0x00000000 +#define FILE_DISPOSITION_DELETE 0x00000001 +#define FILE_DISPOSITION_POSIX_SEMANTICS 0x00000002 +#define FILE_DISPOSITION_FORCE_IMAGE_SECTION_CHECK 0x00000004 +#define FILE_DISPOSITION_ON_CLOSE 0x00000008 +#define FILE_DISPOSITION_IGNORE_READONLY_ATTRIBUTE 0x00000010 + typedef struct _FILE_POSITION_INFORMATION { LARGE_INTEGER CurrentByteOffset; } FILE_POSITION_INFORMATION, *PFILE_POSITION_INFORMATION;

1 0

Joel Holdsworth : ntdll: Initial implementation of FileDispositionInformationEx.
by Alexandre Julliard 27 Jun '23

27 Jun '23

Module: wine Branch: master Commit: cc1d0e493d52741b05204fd371805a7d42be85b6 URL: https://gitlab.winehq.org/wine/wine/-/commit/cc1d0e493d52741b05204fd371805a… Author: Joel Holdsworth <joel(a)airwebreathe.org.uk> Date: Mon May 1 11:41:53 2023 +0100 ntdll: Initial implementation of FileDispositionInformationEx. This is required by Msys2 when running gpg-agent. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54996 Signed-off-by: Joel Holdsworth <joel(a)airwebreathe.org.uk> --- dlls/ntdll/unix/file.c | 27 ++++++++++++++++++++++++++- dlls/wow64/file.c | 1 + include/wine/server_protocol.h | 4 ++-- server/fd.c | 8 ++++---- server/protocol.def | 2 +- server/request.h | 2 +- server/trace.c | 2 +- 7 files changed, 36 insertions(+), 10 deletions(-) diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index aba4e1c694b..56b59413327 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -4755,7 +4755,32 @@ NTSTATUS WINAPI NtSetInformationFile( HANDLE handle, IO_STATUS_BLOCK *io, SERVER_START_REQ( set_fd_disp_info ) { req->handle = wine_server_obj_handle( handle ); - req->unlink = info->DoDeleteFile; + req->flags = info->DoDeleteFile ? FILE_DISPOSITION_DELETE : FILE_DISPOSITION_DO_NOT_DELETE; + status = wine_server_call( req ); + } + SERVER_END_REQ; + } + else status = STATUS_INVALID_PARAMETER_3; + break; + + case FileDispositionInformationEx: + if (len >= sizeof(FILE_DISPOSITION_INFORMATION_EX)) + { + FILE_DISPOSITION_INFORMATION_EX *info = ptr; + + if (info->Flags & FILE_DISPOSITION_POSIX_SEMANTICS) + FIXME( "FILE_DISPOSITION_POSIX_SEMANTICS not supported\n" ); + if (info->Flags & FILE_DISPOSITION_FORCE_IMAGE_SECTION_CHECK) + FIXME( "FILE_DISPOSITION_FORCE_IMAGE_SECTION_CHECK not supported\n" ); + if (info->Flags & FILE_DISPOSITION_ON_CLOSE) + FIXME( "FILE_DISPOSITION_ON_CLOSE not supported\n" ); + if (info->Flags & FILE_DISPOSITION_IGNORE_READONLY_ATTRIBUTE) + FIXME( "FILE_DISPOSITION_IGNORE_READONLY_ATTRIBUTE not supported\n" ); + + SERVER_START_REQ( set_fd_disp_info ) + { + req->handle = wine_server_obj_handle( handle ); + req->flags = info->Flags; status = wine_server_call( req ); } SERVER_END_REQ; diff --git a/dlls/wow64/file.c b/dlls/wow64/file.c index d32ef0b5455..fc867f79f28 100644 --- a/dlls/wow64/file.c +++ b/dlls/wow64/file.c @@ -787,6 +787,7 @@ NTSTATUS WINAPI wow64_NtSetInformationFile( UINT *args ) case FileIoPriorityHintInformation: /* FILE_IO_PRIORITY_HINT_INFO */ case FileValidDataLengthInformation: /* FILE_VALID_DATA_LENGTH_INFORMATION */ case FileDispositionInformation: /* FILE_DISPOSITION_INFORMATION */ + case FileDispositionInformationEx: /* FILE_DISPOSITION_INFORMATION_EX */ status = NtSetInformationFile( handle, iosb_32to64( &io, io32 ), ptr, len, class ); break; diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index d765697277b..1701a3e0420 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -5230,7 +5230,7 @@ struct set_fd_disp_info_request { struct request_header __header; obj_handle_t handle; - int unlink; + unsigned int flags; char __pad_20[4]; }; struct set_fd_disp_info_reply @@ -6418,7 +6418,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 777 +#define SERVER_PROTOCOL_VERSION 778 /* ### protocol_version end ### */ diff --git a/server/fd.c b/server/fd.c index eaebe044f37..9388d36dcfd 100644 --- a/server/fd.c +++ b/server/fd.c @@ -2463,7 +2463,7 @@ static int is_dir_empty( int fd ) } /* set disposition for the fd */ -static void set_fd_disposition( struct fd *fd, int unlink ) +static void set_fd_disposition( struct fd *fd, unsigned int flags ) { struct stat st; @@ -2479,7 +2479,7 @@ static void set_fd_disposition( struct fd *fd, int unlink ) return; } - if (unlink) + if (flags & FILE_DISPOSITION_DELETE) { struct fd *fd_ptr; @@ -2524,7 +2524,7 @@ static void set_fd_disposition( struct fd *fd, int unlink ) } } - fd->closed->unlink = unlink ? 1 : 0; + fd->closed->unlink = (flags & FILE_DISPOSITION_DELETE) ? 1 : 0; if (fd->options & FILE_DELETE_ON_CLOSE) fd->closed->unlink = -1; } @@ -2955,7 +2955,7 @@ DECL_HANDLER(set_fd_disp_info) struct fd *fd = get_handle_fd_obj( current->process, req->handle, DELETE ); if (fd) { - set_fd_disposition( fd, req->unlink ); + set_fd_disposition( fd, req->flags ); release_object( fd ); } } diff --git a/server/protocol.def b/server/protocol.def index 54059b6b580..b690817ef1d 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -3641,7 +3641,7 @@ struct handle_info /* set fd disposition information */ @REQ(set_fd_disp_info) obj_handle_t handle; /* handle to a file or directory */ - int unlink; /* whether to unlink file on close */ + unsigned int flags; /* what actions should be taken when deleting a file */ @END diff --git a/server/request.h b/server/request.h index 20e27ebdce1..0e54dc30b85 100644 --- a/server/request.h +++ b/server/request.h @@ -2207,7 +2207,7 @@ C_ASSERT( FIELD_OFFSET(struct set_fd_completion_mode_request, handle) == 12 ); C_ASSERT( FIELD_OFFSET(struct set_fd_completion_mode_request, flags) == 16 ); C_ASSERT( sizeof(struct set_fd_completion_mode_request) == 24 ); C_ASSERT( FIELD_OFFSET(struct set_fd_disp_info_request, handle) == 12 ); -C_ASSERT( FIELD_OFFSET(struct set_fd_disp_info_request, unlink) == 16 ); +C_ASSERT( FIELD_OFFSET(struct set_fd_disp_info_request, flags) == 16 ); C_ASSERT( sizeof(struct set_fd_disp_info_request) == 24 ); C_ASSERT( FIELD_OFFSET(struct set_fd_name_info_request, handle) == 12 ); C_ASSERT( FIELD_OFFSET(struct set_fd_name_info_request, rootdir) == 16 ); diff --git a/server/trace.c b/server/trace.c index 4dbc5de352f..4242e70a835 100644 --- a/server/trace.c +++ b/server/trace.c @@ -4360,7 +4360,7 @@ static void dump_set_fd_completion_mode_request( const struct set_fd_completion_ static void dump_set_fd_disp_info_request( const struct set_fd_disp_info_request *req ) { fprintf( stderr, " handle=%04x", req->handle ); - fprintf( stderr, ", unlink=%d", req->unlink ); + fprintf( stderr, ", flags=%08x", req->flags ); } static void dump_set_fd_name_info_request( const struct set_fd_name_info_request *req )

1 0

Joel Holdsworth : ntdll/tests: Add tests for FILE_DISPOSITION_IGNORE_READONLY_ATTRIBUTE.
by Alexandre Julliard 27 Jun '23

27 Jun '23

Module: wine Branch: master Commit: cbc1e4423e6d40221734544d081c718cb2a2a778 URL: https://gitlab.winehq.org/wine/wine/-/commit/cbc1e4423e6d40221734544d081c71… Author: Joel Holdsworth <joel(a)airwebreathe.org.uk> Date: Mon May 1 15:27:57 2023 +0100 ntdll/tests: Add tests for FILE_DISPOSITION_IGNORE_READONLY_ATTRIBUTE. Signed-off-by: Joel Holdsworth <joel(a)airwebreathe.org.uk> --- dlls/ntdll/tests/file.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index b96b2e5b072..3db9177ec87 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -2957,6 +2957,7 @@ static void test_file_disposition_information(void) NTSTATUS res; IO_STATUS_BLOCK io; FILE_DISPOSITION_INFORMATION fdi; + FILE_DISPOSITION_INFORMATION_EX fdie; FILE_STANDARD_INFORMATION fsi; BOOL fileDeleted; DWORD fdi2, size; @@ -3089,6 +3090,27 @@ static void test_file_disposition_information(void) SetFileAttributesA( buffer, FILE_ATTRIBUTE_NORMAL ); DeleteFileA( buffer ); + /* set disposition on readonly file ignoring readonly attribute */ + /* FileDispositionInformationEx is only supported on Windows 10 build 1809 and later */ + GetTempFileNameA( tmp_path, "dis", 0, buffer ); + DeleteFileA( buffer ); + handle = CreateFileA(buffer, GENERIC_WRITE | DELETE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_READONLY, 0); + ok( handle != INVALID_HANDLE_VALUE, "failed to create temp file\n" ); + fdie.Flags = FILE_DISPOSITION_DELETE | FILE_DISPOSITION_IGNORE_READONLY_ATTRIBUTE; + res = pNtSetInformationFile( handle, &io, &fdie, sizeof fdie, FileDispositionInformationEx ); + todo_wine + ok( res == STATUS_SUCCESS || broken(res == STATUS_INVALID_INFO_CLASS), + "unexpected FileDispositionInformationEx result (expected STATUS_SUCCESS or SSTATUS_INVALID_INFO_CLASS, got %lx)\n", res ); + CloseHandle( handle ); + if ( res == STATUS_SUCCESS ) + { + fileDeleted = GetFileAttributesA( buffer ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; + todo_wine + ok( fileDeleted, "File should have been deleted\n" ); + } + SetFileAttributesA( buffer, FILE_ATTRIBUTE_NORMAL ); + DeleteFileA( buffer ); + /* can set disposition on file and then reset it */ GetTempFileNameA( tmp_path, "dis", 0, buffer ); handle = CreateFileA(buffer, GENERIC_WRITE | DELETE, 0, NULL, CREATE_ALWAYS, 0, 0);

1 0

Joel Holdsworth : ntdll: Implement FILE_DISPOSITION_IGNORE_READONLY_ATTRIBUTE.
by Alexandre Julliard 27 Jun '23

27 Jun '23

Module: wine Branch: master Commit: 91e442b060c36e831ae1ee492ec9ddf5ba81d21b URL: https://gitlab.winehq.org/wine/wine/-/commit/91e442b060c36e831ae1ee492ec9dd… Author: Joel Holdsworth <joel(a)airwebreathe.org.uk> Date: Thu Jun 15 15:59:51 2023 +0100 ntdll: Implement FILE_DISPOSITION_IGNORE_READONLY_ATTRIBUTE. Both the Msys2 and Cygwin runtimes make use of FILE_DISPOSITION_IGNORE_READONLY_ATTRIBUTE in their implementations of the unlink() system call. This enables these routines to delete a read-only file without first modifying the attributes. https://github.com/msys2/msys2-runtime/blob/msys2-3.4.3/winsup/cygwin/sysca… https://www.cygwin.com/git/?p=newlib-cygwin.git;a=blob;f=winsup/cygwin/sysc… Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50771 Signed-off-by: Joel Holdsworth <joel(a)airwebreathe.org.uk> --- dlls/ntdll/tests/file.c | 2 -- dlls/ntdll/unix/file.c | 2 -- server/fd.c | 3 ++- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 3db9177ec87..10d66ff201a 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -3098,14 +3098,12 @@ static void test_file_disposition_information(void) ok( handle != INVALID_HANDLE_VALUE, "failed to create temp file\n" ); fdie.Flags = FILE_DISPOSITION_DELETE | FILE_DISPOSITION_IGNORE_READONLY_ATTRIBUTE; res = pNtSetInformationFile( handle, &io, &fdie, sizeof fdie, FileDispositionInformationEx ); - todo_wine ok( res == STATUS_SUCCESS || broken(res == STATUS_INVALID_INFO_CLASS), "unexpected FileDispositionInformationEx result (expected STATUS_SUCCESS or SSTATUS_INVALID_INFO_CLASS, got %lx)\n", res ); CloseHandle( handle ); if ( res == STATUS_SUCCESS ) { fileDeleted = GetFileAttributesA( buffer ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; - todo_wine ok( fileDeleted, "File should have been deleted\n" ); } SetFileAttributesA( buffer, FILE_ATTRIBUTE_NORMAL ); diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index 56b59413327..22046e63a21 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -4774,8 +4774,6 @@ NTSTATUS WINAPI NtSetInformationFile( HANDLE handle, IO_STATUS_BLOCK *io, FIXME( "FILE_DISPOSITION_FORCE_IMAGE_SECTION_CHECK not supported\n" ); if (info->Flags & FILE_DISPOSITION_ON_CLOSE) FIXME( "FILE_DISPOSITION_ON_CLOSE not supported\n" ); - if (info->Flags & FILE_DISPOSITION_IGNORE_READONLY_ATTRIBUTE) - FIXME( "FILE_DISPOSITION_IGNORE_READONLY_ATTRIBUTE not supported\n" ); SERVER_START_REQ( set_fd_disp_info ) { diff --git a/server/fd.c b/server/fd.c index 9388d36dcfd..942585b06ae 100644 --- a/server/fd.c +++ b/server/fd.c @@ -2499,7 +2499,8 @@ static void set_fd_disposition( struct fd *fd, unsigned int flags ) } if (S_ISREG( st.st_mode )) /* can't unlink files we don't have permission to write */ { - if (!(st.st_mode & (S_IWUSR | S_IWGRP | S_IWOTH))) + if (!(flags & FILE_DISPOSITION_IGNORE_READONLY_ATTRIBUTE) && + !(st.st_mode & (S_IWUSR | S_IWGRP | S_IWOTH))) { set_error( STATUS_CANNOT_DELETE ); return;

1 0