July 2021 - Wine-Commits - list.winehq.org

Alexandre Julliard : wow64: Add thunks for some misc file creation syscalls.
by Alexandre Julliard July 28, 2021

July 28, 2021

Module: wine Branch: master Commit: fdd459455475c0cada9ebe90e944f6e953937653 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fdd459455475c0cada9ebe90… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 28 18:14:35 2021 +0200 wow64: Add thunks for some misc file creation syscalls. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wow64/file.c | 80 ++++++++++++++++++++++++++++++++++++++++++++++++++++ dlls/wow64/syscall.h | 3 ++ 2 files changed, 83 insertions(+) diff --git a/dlls/wow64/file.c b/dlls/wow64/file.c index 5fb0fe97699..ca87fabe868 100644 --- a/dlls/wow64/file.c +++ b/dlls/wow64/file.c @@ -99,6 +99,86 @@ NTSTATUS WINAPI wow64_NtCreateFile( UINT *args ) } +/********************************************************************** + * wow64_NtCreateMailslotFile + */ +NTSTATUS WINAPI wow64_NtCreateMailslotFile( UINT *args ) +{ + ULONG *handle_ptr = get_ptr( &args ); + ACCESS_MASK access = get_ulong( &args ); + OBJECT_ATTRIBUTES32 *attr32 = get_ptr( &args ); + IO_STATUS_BLOCK32 *io32 = get_ptr( &args ); + ULONG options = get_ulong( &args ); + ULONG quota = get_ulong( &args ); + ULONG msg_size = get_ulong( &args ); + LARGE_INTEGER *timeout = get_ptr( &args ); + + struct object_attr64 attr; + IO_STATUS_BLOCK io; + HANDLE handle = 0; + NTSTATUS status; + + *handle_ptr = 0; + status = NtCreateMailslotFile( &handle, access, objattr_32to64( &attr, attr32 ), + iosb_32to64( &io, io32 ), options, quota, msg_size, timeout ); + put_handle( handle_ptr, handle ); + put_iosb( io32, &io ); + return status; +} + + +/********************************************************************** + * wow64_NtCreateNamedPipeFile + */ +NTSTATUS WINAPI wow64_NtCreateNamedPipeFile( UINT *args ) +{ + ULONG *handle_ptr = get_ptr( &args ); + ACCESS_MASK access = get_ulong( &args ); + OBJECT_ATTRIBUTES32 *attr32 = get_ptr( &args ); + IO_STATUS_BLOCK32 *io32 = get_ptr( &args ); + ULONG sharing = get_ulong( &args ); + ULONG dispo = get_ulong( &args ); + ULONG options = get_ulong( &args ); + ULONG pipe_type = get_ulong( &args ); + ULONG read_mode = get_ulong( &args ); + ULONG completion_mode = get_ulong( &args ); + ULONG max_inst = get_ulong( &args ); + ULONG inbound_quota = get_ulong( &args ); + ULONG outbound_quota = get_ulong( &args ); + LARGE_INTEGER *timeout = get_ptr( &args ); + + struct object_attr64 attr; + IO_STATUS_BLOCK io; + HANDLE handle = 0; + NTSTATUS status; + + *handle_ptr = 0; + status = NtCreateNamedPipeFile( &handle, access, objattr_32to64( &attr, attr32 ), + iosb_32to64( &io, io32 ), sharing, dispo, options, + pipe_type, read_mode, completion_mode, max_inst, + inbound_quota, outbound_quota, timeout ); + put_handle( handle_ptr, handle ); + put_iosb( io32, &io ); + return status; +} + + +/********************************************************************** + * wow64_NtCreatePagingFile + */ +NTSTATUS WINAPI wow64_NtCreatePagingFile( UINT *args ) +{ + UNICODE_STRING32 *str32 = get_ptr( &args ); + LARGE_INTEGER *min_size = get_ptr( &args ); + LARGE_INTEGER *max_size = get_ptr( &args ); + LARGE_INTEGER *actual_size = get_ptr( &args ); + + UNICODE_STRING str; + + return NtCreatePagingFile( unicode_str_32to64( &str, str32 ), min_size, max_size, actual_size ); +} + + /********************************************************************** * wow64_NtDeleteFile */ diff --git a/dlls/wow64/syscall.h b/dlls/wow64/syscall.h index 1990dc335f3..93896ae4ca3 100644 --- a/dlls/wow64/syscall.h +++ b/dlls/wow64/syscall.h @@ -46,7 +46,10 @@ SYSCALL_ENTRY( NtCreateKey ) \ SYSCALL_ENTRY( NtCreateKeyTransacted ) \ SYSCALL_ENTRY( NtCreateKeyedEvent ) \ + SYSCALL_ENTRY( NtCreateMailslotFile ) \ SYSCALL_ENTRY( NtCreateMutant ) \ + SYSCALL_ENTRY( NtCreateNamedPipeFile ) \ + SYSCALL_ENTRY( NtCreatePagingFile ) \ SYSCALL_ENTRY( NtCreatePort ) \ SYSCALL_ENTRY( NtCreatePowerRequest ) \ SYSCALL_ENTRY( NtCreateSection ) \

1 0

Paul Gofman : ntdll: Only queue IO callback if IO is pending in ioqueue_thread_proc().
by Alexandre Julliard July 28, 2021

July 28, 2021

Module: wine Branch: master Commit: fa9bbe8a226e3b4cad078155887f25be280a87f5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fa9bbe8a226e3b4cad078155… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Jul 28 01:07:00 2021 +0300 ntdll: Only queue IO callback if IO is pending in ioqueue_thread_proc(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/threadpool.c | 18 ++++++++++++++++++ dlls/ntdll/threadpool.c | 29 +++++++++++++++++------------ 2 files changed, 35 insertions(+), 12 deletions(-) diff --git a/dlls/ntdll/tests/threadpool.c b/dlls/ntdll/tests/threadpool.c index 6b301eafcbd..986cbbcf8f1 100644 --- a/dlls/ntdll/tests/threadpool.c +++ b/dlls/ntdll/tests/threadpool.c @@ -2139,6 +2139,24 @@ static void test_tp_io(void) ok(!userdata.length, "got length %lu\n", userdata.length); ok(userdata.io == io, "expected %p, got %p\n", io, userdata.io); + userdata.count = 0; + pTpStartAsyncIoOperation(io); + pTpCancelAsyncIoOperation(io); + ret = ReadFile(server, in, sizeof(in), NULL, &ovl); + ok(!ret, "wrong ret %d\n", ret); + ret = WriteFile(client, out, sizeof(out), &ret_size, NULL); + ok(ret, "WriteFile() failed, error %u\n", GetLastError()); + ok(GetLastError() == ERROR_IO_PENDING, "wrong error %u\n", GetLastError()); + + pTpWaitForIoCompletion(io, FALSE); + if (0) + { + /* Add a sleep to check that callback is not called later. Commented out to + * save the test time. */ + Sleep(200); + } + ok(userdata.count == 0, "callback ran %u times\n", userdata.count); + CloseHandle(ovl.hEvent); CloseHandle(client); CloseHandle(server); diff --git a/dlls/ntdll/threadpool.c b/dlls/ntdll/threadpool.c index b82d06e5e42..c27f6d4a145 100644 --- a/dlls/ntdll/threadpool.c +++ b/dlls/ntdll/threadpool.c @@ -1536,22 +1536,25 @@ static void CALLBACK ioqueue_thread_proc( void *param ) { RtlEnterCriticalSection( &io->pool->cs ); - --io->u.io.pending_count; + TRACE( "pending_count %u.\n", io->u.io.pending_count ); - if (!array_reserve((void **)&io->u.io.completions, &io->u.io.completion_max, - io->u.io.completion_count + 1, sizeof(*io->u.io.completions))) + if (io->u.io.pending_count) { - ERR("Failed to allocate memory.\n"); - RtlLeaveCriticalSection( &io->pool->cs ); - continue; - } - - completion = &io->u.io.completions[io->u.io.completion_count++]; - completion->iosb = iosb; - completion->cvalue = value; + --io->u.io.pending_count; + if (!array_reserve((void **)&io->u.io.completions, &io->u.io.completion_max, + io->u.io.completion_count + 1, sizeof(*io->u.io.completions))) + { + ERR( "Failed to allocate memory.\n" ); + RtlLeaveCriticalSection( &io->pool->cs ); + continue; + } - tp_object_submit( io, FALSE ); + completion = &io->u.io.completions[io->u.io.completion_count++]; + completion->iosb = iosb; + completion->cvalue = value; + tp_object_submit( io, FALSE ); + } RtlLeaveCriticalSection( &io->pool->cs ); } @@ -2525,6 +2528,8 @@ void WINAPI TpCancelAsyncIoOperation( TP_IO *io ) RtlEnterCriticalSection( &this->pool->cs ); + TRACE("pending_count %u.\n", this->u.io.pending_count); + this->u.io.pending_count--; if (object_is_finished( this, TRUE )) RtlWakeAllConditionVariable( &this->group_finished_event );

1 0

Paul Gofman : ntdll: Clear thread_running flag on exiting ioqueue_thread_proc().
by Alexandre Julliard July 28, 2021

July 28, 2021

Module: wine Branch: master Commit: 4dcc87cfff4e9faf8d5e60504bd95fa6fb5c4b2e URL: https://source.winehq.org/git/wine.git/?a=commit;h=4dcc87cfff4e9faf8d5e6050… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Jul 28 01:07:01 2021 +0300 ntdll: Clear thread_running flag on exiting ioqueue_thread_proc(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/threadpool.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ntdll/threadpool.c b/dlls/ntdll/threadpool.c index c27f6d4a145..50433b7c009 100644 --- a/dlls/ntdll/threadpool.c +++ b/dlls/ntdll/threadpool.c @@ -1570,6 +1570,7 @@ static void CALLBACK ioqueue_thread_proc( void *param ) } } + ioqueue.thread_running = FALSE; RtlLeaveCriticalSection( &ioqueue.cs ); TRACE( "terminating I/O completion thread\n" );

1 0

Jacek Caban : gdi32: Use get_dc_attr in GetGraphicsMode.
by Alexandre Julliard July 28, 2021

July 28, 2021

Module: wine Branch: master Commit: 871d14f88b7ef588c9980bdb2f3889e54cdb8323 URL: https://source.winehq.org/git/wine.git/?a=commit;h=871d14f88b7ef588c9980bdb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 28 11:39:46 2021 +0200 gdi32: Use get_dc_attr in GetGraphicsMode. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/dc.c | 16 ---------------- dlls/gdi32/gdidc.c | 9 +++++++++ 2 files changed, 9 insertions(+), 16 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 3f7806735e2..3725bd1abf6 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -982,22 +982,6 @@ BOOL WINAPI GetDCOrgEx( HDC hDC, LPPOINT lpp ) } -/*********************************************************************** - * GetGraphicsMode (GDI32.@) - */ -INT WINAPI GetGraphicsMode( HDC hdc ) -{ - INT ret = 0; - DC * dc = get_dc_ptr( hdc ); - if (dc) - { - ret = dc->attr->graphics_mode; - release_dc_ptr( dc ); - } - return ret; -} - - /*********************************************************************** * SetGraphicsMode (GDI32.@) */ diff --git a/dlls/gdi32/gdidc.c b/dlls/gdi32/gdidc.c index 10ba4d1eaac..d16d6c8d94a 100644 --- a/dlls/gdi32/gdidc.c +++ b/dlls/gdi32/gdidc.c @@ -106,6 +106,15 @@ INT WINAPI SetBkMode( HDC hdc, INT mode ) return ret; } +/*********************************************************************** + * GetGraphicsMode (GDI32.@) + */ +INT WINAPI GetGraphicsMode( HDC hdc ) +{ + DC_ATTR *dc_attr = get_dc_attr( hdc ); + return dc_attr ? dc_attr->graphics_mode : 0; +} + /*********************************************************************** * GetLayout (GDI32.@) */

1 0

Jacek Caban : gdi32: Remove no longer used driver entry points.
by Alexandre Julliard July 28, 2021

July 28, 2021

Module: wine Branch: master Commit: e13e935be361f582ac64c49dd95699a32fabe1bc URL: https://source.winehq.org/git/wine.git/?a=commit;h=e13e935be361f582ac64c49d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 28 11:39:55 2021 +0200 gdi32: Remove no longer used driver entry points. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/dibdrv/dc.c | 6 ------ dlls/gdi32/driver.c | 18 ------------------ dlls/gdi32/enhmfdrv/init.c | 3 --- dlls/gdi32/font.c | 3 --- dlls/gdi32/mfdrv/init.c | 3 --- dlls/gdi32/path.c | 3 --- dlls/wineandroid.drv/init.c | 3 --- dlls/winemac.drv/gdi.c | 3 --- dlls/wineps.drv/init.c | 3 --- dlls/winex11.drv/init.c | 3 --- dlls/winex11.drv/xrender.c | 3 --- include/wine/gdi_driver.h | 5 +---- 12 files changed, 1 insertion(+), 55 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e13e935be361f582ac64…

1 0

Paul Gofman : ntdll: Manage TPIO object destruction based on the expected completions.
by Alexandre Julliard July 28, 2021

July 28, 2021

Module: wine Branch: master Commit: bdba5ba5f657083c3f7cd23a1c487a079d71cde3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bdba5ba5f657083c3f7cd23a… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Jul 28 01:07:02 2021 +0300 ntdll: Manage TPIO object destruction based on the expected completions. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/threadpool.c | 56 ++++++++++++++++++++++++++++++++++++-- dlls/ntdll/threadpool.c | 63 ++++++++++++++++++++++++++++++++++++------- 2 files changed, 107 insertions(+), 12 deletions(-) diff --git a/dlls/ntdll/tests/threadpool.c b/dlls/ntdll/tests/threadpool.c index 986cbbcf8f1..6c28d0642d7 100644 --- a/dlls/ntdll/tests/threadpool.c +++ b/dlls/ntdll/tests/threadpool.c @@ -2157,10 +2157,62 @@ static void test_tp_io(void) } ok(userdata.count == 0, "callback ran %u times\n", userdata.count); - CloseHandle(ovl.hEvent); - CloseHandle(client); + pTpReleaseIoCompletion(io); CloseHandle(server); + + /* Test TPIO object destruction. */ + server = CreateNamedPipeA("\\\\.\\pipe\\wine_tp_test", + PIPE_ACCESS_DUPLEX | FILE_FLAG_OVERLAPPED, 0, 1, 1024, 1024, 0, NULL); + ok(server != INVALID_HANDLE_VALUE, "Failed to create server pipe, error %u.\n", GetLastError()); + io = NULL; + status = pTpAllocIoCompletion(&io, server, io_cb, &userdata, &environment); + ok(!status, "got %#x\n", status); + + ret = HeapValidate(GetProcessHeap(), 0, io); + ok(ret, "Got unexpected ret %#x.\n", ret); pTpReleaseIoCompletion(io); + ret = HeapValidate(GetProcessHeap(), 0, io); + ok(!ret, "Got unexpected ret %#x.\n", ret); + CloseHandle(server); + CloseHandle(client); + + server = CreateNamedPipeA("\\\\.\\pipe\\wine_tp_test", + PIPE_ACCESS_DUPLEX | FILE_FLAG_OVERLAPPED, 0, 1, 1024, 1024, 0, NULL); + ok(server != INVALID_HANDLE_VALUE, "Failed to create server pipe, error %u.\n", GetLastError()); + client = CreateFileA("\\\\.\\pipe\\wine_tp_test", GENERIC_READ | GENERIC_WRITE, + 0, NULL, OPEN_EXISTING, 0, 0); + ok(client != INVALID_HANDLE_VALUE, "Failed to create client pipe, error %u.\n", GetLastError()); + + io = NULL; + status = pTpAllocIoCompletion(&io, server, io_cb, &userdata, &environment); + ok(!status, "got %#x\n", status); + pTpStartAsyncIoOperation(io); + pTpWaitForIoCompletion(io, TRUE); + ret = HeapValidate(GetProcessHeap(), 0, io); + ok(ret, "Got unexpected ret %#x.\n", ret); + pTpReleaseIoCompletion(io); + ret = HeapValidate(GetProcessHeap(), 0, io); + ok(ret, "Got unexpected ret %#x.\n", ret); + + if (0) + { + /* Object destruction will wait until one completion arrives (which was started but not cancelled). + * Commented out to save test time. */ + Sleep(1000); + ret = HeapValidate(GetProcessHeap(), 0, io); + ok(ret, "Got unexpected ret %#x.\n", ret); + ret = ReadFile(server, in, sizeof(in), NULL, &ovl); + ok(!ret, "wrong ret %d\n", ret); + ret = WriteFile(client, out, sizeof(out), &ret_size, NULL); + ok(ret, "WriteFile() failed, error %u\n", GetLastError()); + Sleep(2000); + ret = HeapValidate(GetProcessHeap(), 0, io); + ok(!ret, "Got unexpected ret %#x.\n", ret); + } + + CloseHandle(server); + CloseHandle(ovl.hEvent); + CloseHandle(client); pTpReleasePool(pool); } diff --git a/dlls/ntdll/threadpool.c b/dlls/ntdll/threadpool.c index 50433b7c009..ca323919d05 100644 --- a/dlls/ntdll/threadpool.c +++ b/dlls/ntdll/threadpool.c @@ -201,7 +201,8 @@ struct threadpool_object { PTP_IO_CALLBACK callback; /* locked via .pool->cs */ - unsigned int pending_count, completion_count, completion_max; + unsigned int pending_count, skipped_count, completion_count, completion_max; + BOOL shutting_down; struct io_completion *completions; } io; } u; @@ -1506,6 +1507,7 @@ static void CALLBACK ioqueue_thread_proc( void *param ) struct threadpool_object *io; IO_STATUS_BLOCK iosb; ULONG_PTR key, value; + BOOL destroy, skip; NTSTATUS status; TRACE( "starting I/O completion thread\n" ); @@ -1519,17 +1521,33 @@ static void CALLBACK ioqueue_thread_proc( void *param ) ERR("NtRemoveIoCompletion failed, status %#x.\n", status); RtlEnterCriticalSection( &ioqueue.cs ); + destroy = skip = FALSE; io = (struct threadpool_object *)key; - if (io && io->shutdown) + TRACE( "io %p, iosb.Status %#x.\n", io, iosb.u.Status ); + + if (io && (io->shutdown || io->u.io.shutting_down)) { - if (iosb.u.Status != STATUS_THREADPOOL_RELEASED_DURING_OPERATION) + RtlEnterCriticalSection( &io->pool->cs ); + if (!io->u.io.pending_count) { - /* Skip remaining completions until the final one. */ - continue; + if (io->u.io.skipped_count) + --io->u.io.skipped_count; + + if (io->u.io.skipped_count) + skip = TRUE; + else + destroy = TRUE; } + RtlLeaveCriticalSection( &io->pool->cs ); + if (skip) continue; + } + + if (destroy) + { --ioqueue.objcount; TRACE( "Releasing io %p.\n", io ); + io->shutdown = TRUE; tp_object_release( io ); } else if (io) @@ -2004,7 +2022,10 @@ static void tp_object_cancel( struct threadpool_object *object ) object->u.wait.signaled = 0; } if (object->type == TP_OBJECT_TYPE_IO) + { + object->u.io.skipped_count += object->u.io.pending_count; object->u.io.pending_count = 0; + } RtlLeaveCriticalSection( &pool->cs ); while (pending_callbacks--) @@ -2045,6 +2066,20 @@ static void tp_object_wait( struct threadpool_object *object, BOOL group_wait ) RtlLeaveCriticalSection( &pool->cs ); } +static void tp_ioqueue_unlock( struct threadpool_object *io ) +{ + assert( io->type == TP_OBJECT_TYPE_IO ); + + RtlEnterCriticalSection( &ioqueue.cs ); + + assert(ioqueue.objcount); + + if (!io->shutdown && !--ioqueue.objcount) + NtSetIoCompletion( ioqueue.port, 0, 0, STATUS_SUCCESS, 0 ); + + RtlLeaveCriticalSection( &ioqueue.cs ); +} + /*********************************************************************** * tp_object_prepare_shutdown (internal) * @@ -2056,6 +2091,8 @@ static void tp_object_prepare_shutdown( struct threadpool_object *object ) tp_timerqueue_unlock( object ); else if (object->type == TP_OBJECT_TYPE_WAIT) tp_waitqueue_unlock( object ); + else if (object->type == TP_OBJECT_TYPE_IO) + tp_ioqueue_unlock( object ); } /*********************************************************************** @@ -2797,15 +2834,21 @@ VOID WINAPI TpReleaseCleanupGroupMembers( TP_CLEANUP_GROUP *group, BOOL cancel_p void WINAPI TpReleaseIoCompletion( TP_IO *io ) { struct threadpool_object *this = impl_from_TP_IO( io ); + BOOL can_destroy; TRACE( "%p\n", io ); - RtlEnterCriticalSection( &ioqueue.cs ); + RtlEnterCriticalSection( &this->pool->cs ); + this->u.io.shutting_down = TRUE; + can_destroy = !this->u.io.pending_count && !this->u.io.skipped_count; + RtlLeaveCriticalSection( &this->pool->cs ); - assert( ioqueue.objcount ); - this->shutdown = TRUE; - NtSetIoCompletion( ioqueue.port, (ULONG_PTR)this, 0, STATUS_THREADPOOL_RELEASED_DURING_OPERATION, 1 ); - RtlLeaveCriticalSection( &ioqueue.cs ); + if (can_destroy) + { + tp_object_prepare_shutdown( this ); + this->shutdown = TRUE; + tp_object_release( this ); + } } /***********************************************************************

1 0

Alexandre Julliard : wow64: Implement Wow64AllocateTemp().
by Alexandre Julliard July 28, 2021

July 28, 2021

Module: wine Branch: master Commit: 65caa0f2efc810993d76dcee7d7c94319905349f URL: https://source.winehq.org/git/wine.git/?a=commit;h=65caa0f2efc810993d76dcee… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 28 15:59:06 2021 +0200 wow64: Implement Wow64AllocateTemp(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wow64/sync.c | 9 +++------ dlls/wow64/syscall.c | 42 ++++++++++++++++++++++++++++++++++++++++++ dlls/wow64/virtual.c | 7 +++---- dlls/wow64/wow64.spec | 2 +- dlls/wow64/wow64_private.h | 3 ++- include/winternl.h | 1 + 6 files changed, 52 insertions(+), 12 deletions(-) diff --git a/dlls/wow64/sync.c b/dlls/wow64/sync.c index ef7176bd199..afea4a5c531 100644 --- a/dlls/wow64/sync.c +++ b/dlls/wow64/sync.c @@ -757,7 +757,7 @@ NTSTATUS WINAPI wow64_NtQueryDirectoryObject( UINT *args ) ULONG size = size32 + sizeof(*info) - sizeof(*info32); if (!single_entry) FIXME( "not implemented\n" ); - info = RtlAllocateHeap( GetProcessHeap(), 0, size ); + info = Wow64AllocateTemp( size ); status = NtQueryDirectoryObject( handle, info, size, single_entry, restart, context, NULL ); if (!status) { @@ -771,7 +771,6 @@ NTSTATUS WINAPI wow64_NtQueryDirectoryObject( UINT *args ) memcpy( info32 + 1, info + 1, size ); if (retlen) *retlen = sizeof(*info32) + size; } - RtlFreeHeap( GetProcessHeap(), 0, info ); return status; } @@ -845,7 +844,7 @@ NTSTATUS WINAPI wow64_NtQueryObject( UINT *args ) { ULONG size = len + sizeof(OBJECT_NAME_INFORMATION) - sizeof(OBJECT_NAME_INFORMATION32); OBJECT_NAME_INFORMATION32 *info32 = ptr; - OBJECT_NAME_INFORMATION *info = RtlAllocateHeap( GetProcessHeap(), 0, size ); + OBJECT_NAME_INFORMATION *info = Wow64AllocateTemp( size ); if (!(status = NtQueryObject( handle, class, info, size, &ret_size ))) { @@ -867,7 +866,6 @@ NTSTATUS WINAPI wow64_NtQueryObject( UINT *args ) { if (retlen) *retlen = ret_size - sizeof(*info) + sizeof(*info32); } - RtlFreeHeap( GetProcessHeap(), 0, info ); return status; } @@ -894,7 +892,7 @@ NTSTATUS WINAPI wow64_NtQueryObject( UINT *args ) /* assume at most 32 types, with an average 16-char name */ ULONG ret_size, size = 32 * (sizeof(OBJECT_TYPE_INFORMATION) + 16 * sizeof(WCHAR)); - info = RtlAllocateHeap( GetProcessHeap(), 0, size ); + info = Wow64AllocateTemp( size ); if (!(status = NtQueryObject( handle, class, info, size, &ret_size ))) { OBJECT_TYPE_INFORMATION *type; @@ -915,7 +913,6 @@ NTSTATUS WINAPI wow64_NtQueryObject( UINT *args ) if (pos32 > len) status = STATUS_INFO_LENGTH_MISMATCH; if (retlen) *retlen = pos32; } - RtlFreeHeap( GetProcessHeap(), 0, info ); return status; } diff --git a/dlls/wow64/syscall.c b/dlls/wow64/syscall.c index 2f165879195..0000db54c29 100644 --- a/dlls/wow64/syscall.c +++ b/dlls/wow64/syscall.c @@ -54,6 +54,14 @@ static const char *syscall_names[] = static unsigned short syscall_map[1024]; +/* header for Wow64AllocTemp blocks; probably not the right layout */ +struct mem_header +{ + struct mem_header *next; + void *__pad; + BYTE data[1]; +}; + static SYSTEM_DLL_INIT_BLOCK *pLdrSystemDllInitBlock; void *dummy = RtlUnwind; @@ -375,6 +383,22 @@ static void process_init(void) } +/********************************************************************** + * free_temp_data + */ +static void free_temp_data(void) +{ + struct mem_header *next, *mem; + + for (mem = NtCurrentTeb()->TlsSlots[WOW64_TLS_TEMPLIST]; mem; mem = next) + { + next = mem->next; + RtlFreeHeap( GetProcessHeap(), 0, mem ); + } + NtCurrentTeb()->TlsSlots[WOW64_TLS_TEMPLIST] = NULL; +} + + /********************************************************************** * Wow64SystemServiceEx (NTDLL.@) */ @@ -397,10 +421,28 @@ NTSTATUS WINAPI Wow64SystemServiceEx( UINT num, UINT *args ) status = GetExceptionCode(); } __ENDTRY; + free_temp_data(); return status; } +/********************************************************************** + * Wow64AllocateTemp + * + * FIXME: probably not 100% compatible. + */ +void * WINAPI Wow64AllocateTemp( SIZE_T size ) +{ + struct mem_header *mem; + + if (!(mem = RtlAllocateHeap( GetProcessHeap(), 0, offsetof( struct mem_header, data[size] )))) + return NULL; + mem->next = NtCurrentTeb()->TlsSlots[WOW64_TLS_TEMPLIST]; + NtCurrentTeb()->TlsSlots[WOW64_TLS_TEMPLIST] = mem; + return mem->data; +} + + /********************************************************************** * Wow64ApcRoutine (NTDLL.@) */ diff --git a/dlls/wow64/virtual.c b/dlls/wow64/virtual.c index 36bd91d9f8c..3cf2b934c93 100644 --- a/dlls/wow64/virtual.c +++ b/dlls/wow64/virtual.c @@ -198,13 +198,12 @@ NTSTATUS WINAPI wow64_NtGetWriteWatch( UINT *args ) if (flags & ~WRITE_WATCH_FLAG_RESET) return STATUS_INVALID_PARAMETER; if (!addr_ptr) return STATUS_ACCESS_VIOLATION; - addresses = RtlAllocateHeap( GetProcessHeap(), 0, count * sizeof(*addresses) ); + addresses = Wow64AllocateTemp( count * sizeof(*addresses) ); if (!(status = NtGetWriteWatch( handle, flags, base, size, addresses, &count, granularity ))) { for (i = 0; i < count; i++) addr_ptr[i] = PtrToUlong( addresses[i] ); *count_ptr = count; } - RtlFreeHeap( GetProcessHeap(), 0, addresses ); return status; } @@ -335,7 +334,7 @@ NTSTATUS WINAPI wow64_NtQueryVirtualMemory( UINT *args ) MEMORY_SECTION_NAME32 *info32 = ptr; SIZE_T size = len + sizeof(*info) - sizeof(*info32); - info = RtlAllocateHeap( GetProcessHeap(), 0, size ); + info = Wow64AllocateTemp( size ); if (!(status = NtQueryVirtualMemory( handle, addr, class, info, size, &res_len ))) { info32->SectionFileName.Length = info->SectionFileName.Length; @@ -353,7 +352,7 @@ NTSTATUS WINAPI wow64_NtQueryVirtualMemory( UINT *args ) MEMORY_WORKING_SET_EX_INFORMATION *info; ULONG i, count = len / sizeof(*info32); - info = RtlAllocateHeap( GetProcessHeap(), 0, count * sizeof(*info) ); + info = Wow64AllocateTemp( count * sizeof(*info) ); for (i = 0; i < count; i++) info[i].VirtualAddress = ULongToPtr( info32[i].VirtualAddress ); if (!(status = NtQueryVirtualMemory( handle, addr, class, info, count * sizeof(*info), &res_len ))) { diff --git a/dlls/wow64/wow64.spec b/dlls/wow64/wow64.spec index 8f188043556..4ed20af0f29 100644 --- a/dlls/wow64/wow64.spec +++ b/dlls/wow64/wow64.spec @@ -1,6 +1,6 @@ @ stub Wow64AllocThreadHeap @ stub Wow64AllocateHeap -@ stub Wow64AllocateTemp +@ stdcall Wow64AllocateTemp(long) @ stdcall Wow64ApcRoutine(long long long ptr) @ stub Wow64CheckIfNXEnabled @ stub Wow64EmulateAtlThunk diff --git a/dlls/wow64/wow64_private.h b/dlls/wow64/wow64_private.h index 6ba77720263..e9935303cbb 100644 --- a/dlls/wow64/wow64_private.h +++ b/dlls/wow64/wow64_private.h @@ -28,7 +28,8 @@ ALL_SYSCALLS #undef SYSCALL_ENTRY -void WINAPI Wow64ApcRoutine( ULONG_PTR arg1, ULONG_PTR arg2, ULONG_PTR arg3, CONTEXT *context ) DECLSPEC_HIDDEN; +void * WINAPI Wow64AllocateTemp( SIZE_T size ) DECLSPEC_HIDDEN; +void WINAPI Wow64ApcRoutine( ULONG_PTR arg1, ULONG_PTR arg2, ULONG_PTR arg3, CONTEXT *context ) DECLSPEC_HIDDEN; extern USHORT native_machine DECLSPEC_HIDDEN; extern USHORT current_machine DECLSPEC_HIDDEN; diff --git a/include/winternl.h b/include/winternl.h index 7d732d895d9..10d6de1f9ed 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -1081,6 +1081,7 @@ typedef struct _TEB64 /* reserved TEB64 TLS slots for Wow64 */ #define WOW64_TLS_CPURESERVED 1 +#define WOW64_TLS_TEMPLIST 3 #define WOW64_TLS_FILESYSREDIR 8

1 0

Alexandre Julliard : wow64: Add thunks for the file I/O syscalls.
by Alexandre Julliard July 28, 2021

July 28, 2021

Module: wine Branch: master Commit: 668b1829200fdbfa91845d089cc37683476e4aa9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=668b1829200fdbfa91845d08… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 28 16:20:48 2021 +0200 wow64: Add thunks for the file I/O syscalls. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wow64/file.c | 163 +++++++++++++++++++++++++++++++++++++++++++++++++++ dlls/wow64/syscall.h | 7 +++ 2 files changed, 170 insertions(+) diff --git a/dlls/wow64/file.c b/dlls/wow64/file.c index 361aa1905ee..b1081735ea5 100644 --- a/dlls/wow64/file.c +++ b/dlls/wow64/file.c @@ -74,6 +74,49 @@ NTSTATUS WINAPI wow64_NtDeleteFile( UINT *args ) } +/********************************************************************** + * wow64_NtFlushBuffersFile + */ +NTSTATUS WINAPI wow64_NtFlushBuffersFile( UINT *args ) +{ + HANDLE handle = get_handle( &args ); + IO_STATUS_BLOCK32 *io32 = get_ptr( &args ); + + IO_STATUS_BLOCK io; + NTSTATUS status; + + status = NtFlushBuffersFile( handle, iosb_32to64( &io, io32 )); + put_iosb( io32, &io ); + return status; +} + + +/********************************************************************** + * wow64_NtLockFile + */ +NTSTATUS WINAPI wow64_NtLockFile( UINT *args ) +{ + HANDLE handle = get_handle( &args ); + HANDLE event = get_handle( &args ); + ULONG apc = get_ulong( &args ); + ULONG apc_param = get_ulong( &args ); + IO_STATUS_BLOCK32 *io32 = get_ptr( &args ); + LARGE_INTEGER *offset = get_ptr( &args ); + LARGE_INTEGER *count = get_ptr( &args ); + ULONG *key = get_ptr( &args ); + BOOLEAN dont_wait = get_ulong( &args ); + BOOLEAN exclusive = get_ulong( &args ); + + IO_STATUS_BLOCK io; + NTSTATUS status; + + status = NtLockFile( handle, event, apc_32to64( apc ), apc_param_32to64( apc, apc_param ), + iosb_32to64( &io, io32 ), offset, count, key, dont_wait, exclusive ); + put_iosb( io32, &io ); + return status; +} + + /********************************************************************** * wow64_NtOpenFile */ @@ -98,3 +141,123 @@ NTSTATUS WINAPI wow64_NtOpenFile( UINT *args ) put_iosb( io32, &io ); return status; } + + +/********************************************************************** + * wow64_NtReadFile + */ +NTSTATUS WINAPI wow64_NtReadFile( UINT *args ) +{ + HANDLE handle = get_handle( &args ); + HANDLE event = get_handle( &args ); + ULONG apc = get_ulong( &args ); + ULONG apc_param = get_ulong( &args ); + IO_STATUS_BLOCK32 *io32 = get_ptr( &args ); + void *buffer = get_ptr( &args ); + ULONG len = get_ulong( &args ); + LARGE_INTEGER *offset = get_ptr( &args ); + ULONG *key = get_ptr( &args ); + + IO_STATUS_BLOCK io; + NTSTATUS status; + + status = NtReadFile( handle, event, apc_32to64( apc ), apc_param_32to64( apc, apc_param ), + iosb_32to64( &io, io32 ), buffer, len, offset, key ); + put_iosb( io32, &io ); + return status; +} + + +/********************************************************************** + * wow64_NtReadFileScatter + */ +NTSTATUS WINAPI wow64_NtReadFileScatter( UINT *args ) +{ + HANDLE handle = get_handle( &args ); + HANDLE event = get_handle( &args ); + ULONG apc = get_ulong( &args ); + ULONG apc_param = get_ulong( &args ); + IO_STATUS_BLOCK32 *io32 = get_ptr( &args ); + FILE_SEGMENT_ELEMENT *segments = get_ptr( &args ); + ULONG len = get_ulong( &args ); + LARGE_INTEGER *offset = get_ptr( &args ); + ULONG *key = get_ptr( &args ); + + IO_STATUS_BLOCK io; + NTSTATUS status; + + status = NtReadFileScatter( handle, event, apc_32to64( apc ), apc_param_32to64( apc, apc_param ), + iosb_32to64( &io, io32 ), segments, len, offset, key ); + put_iosb( io32, &io ); + return status; +} + + +/********************************************************************** + * wow64_NtUnlockFile + */ +NTSTATUS WINAPI wow64_NtUnlockFile( UINT *args ) +{ + HANDLE handle = get_handle( &args ); + IO_STATUS_BLOCK32 *io32 = get_ptr( &args ); + LARGE_INTEGER *offset = get_ptr( &args ); + LARGE_INTEGER *count = get_ptr( &args ); + ULONG *key = get_ptr( &args ); + + IO_STATUS_BLOCK io; + NTSTATUS status; + + status = NtUnlockFile( handle, iosb_32to64( &io, io32 ), offset, count, key ); + put_iosb( io32, &io ); + return status; +} + + +/********************************************************************** + * wow64_NtWriteFile + */ +NTSTATUS WINAPI wow64_NtWriteFile( UINT *args ) +{ + HANDLE handle = get_handle( &args ); + HANDLE event = get_handle( &args ); + ULONG apc = get_ulong( &args ); + ULONG apc_param = get_ulong( &args ); + IO_STATUS_BLOCK32 *io32 = get_ptr( &args ); + void *buffer = get_ptr( &args ); + ULONG len = get_ulong( &args ); + LARGE_INTEGER *offset = get_ptr( &args ); + ULONG *key = get_ptr( &args ); + + IO_STATUS_BLOCK io; + NTSTATUS status; + + status = NtWriteFile( handle, event, apc_32to64( apc ), apc_param_32to64( apc, apc_param ), + iosb_32to64( &io, io32 ), buffer, len, offset, key ); + put_iosb( io32, &io ); + return status; +} + + +/********************************************************************** + * wow64_NtWriteFileGather + */ +NTSTATUS WINAPI wow64_NtWriteFileGather( UINT *args ) +{ + HANDLE handle = get_handle( &args ); + HANDLE event = get_handle( &args ); + ULONG apc = get_ulong( &args ); + ULONG apc_param = get_ulong( &args ); + IO_STATUS_BLOCK32 *io32 = get_ptr( &args ); + FILE_SEGMENT_ELEMENT *segments = get_ptr( &args ); + ULONG len = get_ulong( &args ); + LARGE_INTEGER *offset = get_ptr( &args ); + ULONG *key = get_ptr( &args ); + + IO_STATUS_BLOCK io; + NTSTATUS status; + + status = NtWriteFileGather( handle, event, apc_32to64( apc ), apc_param_32to64( apc, apc_param ), + iosb_32to64( &io, io32 ), segments, len, offset, key ); + put_iosb( io32, &io ); + return status; +} diff --git a/dlls/wow64/syscall.h b/dlls/wow64/syscall.h index 2b542658f9e..870cb3b77b8 100644 --- a/dlls/wow64/syscall.h +++ b/dlls/wow64/syscall.h @@ -61,6 +61,7 @@ SYSCALL_ENTRY( NtEnumerateKey ) \ SYSCALL_ENTRY( NtEnumerateValueKey ) \ SYSCALL_ENTRY( NtFindAtom ) \ + SYSCALL_ENTRY( NtFlushBuffersFile ) \ SYSCALL_ENTRY( NtFlushKey ) \ SYSCALL_ENTRY( NtFlushVirtualMemory ) \ SYSCALL_ENTRY( NtFreeVirtualMemory ) \ @@ -70,6 +71,7 @@ SYSCALL_ENTRY( NtListenPort ) \ SYSCALL_ENTRY( NtLoadKey ) \ SYSCALL_ENTRY( NtLoadKey2 ) \ + SYSCALL_ENTRY( NtLockFile ) \ SYSCALL_ENTRY( NtLockVirtualMemory ) \ SYSCALL_ENTRY( NtMakeTemporaryObject ) \ SYSCALL_ENTRY( NtMapViewOfSection ) \ @@ -109,6 +111,8 @@ SYSCALL_ENTRY( NtQueryTimerResolution ) \ SYSCALL_ENTRY( NtQueryValueKey ) \ SYSCALL_ENTRY( NtQueryVirtualMemory ) \ + SYSCALL_ENTRY( NtReadFile ) \ + SYSCALL_ENTRY( NtReadFileScatter ) \ SYSCALL_ENTRY( NtReadVirtualMemory ) \ SYSCALL_ENTRY( NtReleaseKeyedEvent ) \ SYSCALL_ENTRY( NtReleaseMutant ) \ @@ -136,6 +140,7 @@ SYSCALL_ENTRY( NtSignalAndWaitForSingleObject ) \ SYSCALL_ENTRY( NtTerminateJobObject ) \ SYSCALL_ENTRY( NtUnloadKey ) \ + SYSCALL_ENTRY( NtUnlockFile ) \ SYSCALL_ENTRY( NtUnlockVirtualMemory ) \ SYSCALL_ENTRY( NtUnmapViewOfSection ) \ SYSCALL_ENTRY( NtWaitForDebugEvent ) \ @@ -145,6 +150,8 @@ SYSCALL_ENTRY( NtWow64AllocateVirtualMemory64 ) \ SYSCALL_ENTRY( NtWow64ReadVirtualMemory64 ) \ SYSCALL_ENTRY( NtWow64WriteVirtualMemory64 ) \ + SYSCALL_ENTRY( NtWriteFile ) \ + SYSCALL_ENTRY( NtWriteFileGather ) \ SYSCALL_ENTRY( NtWriteVirtualMemory ) \ SYSCALL_ENTRY( NtYieldExecution )

1 0

Alexandre Julliard : wow64: Add thunks for the file creation syscalls.
by Alexandre Julliard July 28, 2021

July 28, 2021

Module: wine Branch: master Commit: 01ad0993cb6c74fd0efd960ecad9d1af54375a90 URL: https://source.winehq.org/git/wine.git/?a=commit;h=01ad0993cb6c74fd0efd960e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 28 16:15:56 2021 +0200 wow64: Add thunks for the file creation syscalls. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wow64/Makefile.in | 1 + dlls/wow64/file.c | 100 +++++++++++++++++++++++++++++++++++++++++++++ dlls/wow64/struct32.h | 10 +++++ dlls/wow64/syscall.h | 3 ++ dlls/wow64/wow64_private.h | 18 ++++++++ 5 files changed, 132 insertions(+) diff --git a/dlls/wow64/Makefile.in b/dlls/wow64/Makefile.in index 693fdefaae4..f56d1f0aad9 100644 --- a/dlls/wow64/Makefile.in +++ b/dlls/wow64/Makefile.in @@ -5,6 +5,7 @@ IMPORTS = ntdll winecrt0 EXTRADLLFLAGS = -nodefaultlibs -mno-cygwin -Wl,--image-base,0x6f000000 C_SRCS = \ + file.c \ registry.c \ sync.c \ syscall.c \ diff --git a/dlls/wow64/file.c b/dlls/wow64/file.c new file mode 100644 index 00000000000..361aa1905ee --- /dev/null +++ b/dlls/wow64/file.c @@ -0,0 +1,100 @@ +/* + * WoW64 file functions + * + * Copyright 2021 Alexandre Julliard + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include "windef.h" +#include "winbase.h" +#include "winnt.h" +#include "winternl.h" +#include "wow64_private.h" + + +/********************************************************************** + * wow64_NtCreateFile + */ +NTSTATUS WINAPI wow64_NtCreateFile( UINT *args ) +{ + ULONG *handle_ptr = get_ptr( &args ); + ACCESS_MASK access = get_ulong( &args ); + OBJECT_ATTRIBUTES32 *attr32 = get_ptr( &args ); + IO_STATUS_BLOCK32 *io32 = get_ptr( &args ); + LARGE_INTEGER *alloc_size = get_ptr( &args ); + ULONG attributes = get_ulong( &args ); + ULONG sharing = get_ulong( &args ); + ULONG disposition = get_ulong( &args ); + ULONG options = get_ulong( &args ); + void *ea_buffer = get_ptr( &args ); + ULONG ea_length = get_ulong( &args ); + + struct object_attr64 attr; + IO_STATUS_BLOCK io; + HANDLE handle = 0; + NTSTATUS status; + + *handle_ptr = 0; + status = NtCreateFile( &handle, access, objattr_32to64( &attr, attr32 ), + iosb_32to64( &io, io32 ), alloc_size, attributes, + sharing, disposition, options, ea_buffer, ea_length ); + put_handle( handle_ptr, handle ); + put_iosb( io32, &io ); + return status; +} + + +/********************************************************************** + * wow64_NtDeleteFile + */ +NTSTATUS WINAPI wow64_NtDeleteFile( UINT *args ) +{ + OBJECT_ATTRIBUTES32 *attr32 = get_ptr( &args ); + + struct object_attr64 attr; + + return NtDeleteFile( objattr_32to64( &attr, attr32 )); +} + + +/********************************************************************** + * wow64_NtOpenFile + */ +NTSTATUS WINAPI wow64_NtOpenFile( UINT *args ) +{ + ULONG *handle_ptr = get_ptr( &args ); + ACCESS_MASK access = get_ulong( &args ); + OBJECT_ATTRIBUTES32 *attr32 = get_ptr( &args ); + IO_STATUS_BLOCK32 *io32 = get_ptr( &args ); + ULONG sharing = get_ulong( &args ); + ULONG options = get_ulong( &args ); + + struct object_attr64 attr; + IO_STATUS_BLOCK io; + HANDLE handle = 0; + NTSTATUS status; + + *handle_ptr = 0; + status = NtOpenFile( &handle, access, objattr_32to64( &attr, attr32 ), + iosb_32to64( &io, io32 ), sharing, options ); + put_handle( handle_ptr, handle ); + put_iosb( io32, &io ); + return status; +} diff --git a/dlls/wow64/struct32.h b/dlls/wow64/struct32.h index 069564948d0..76055115b08 100644 --- a/dlls/wow64/struct32.h +++ b/dlls/wow64/struct32.h @@ -31,6 +31,16 @@ typedef struct ULONG SecurityQualityOfService; } OBJECT_ATTRIBUTES32; +typedef struct +{ + union + { + NTSTATUS Status; + ULONG Pointer; + }; + ULONG Information; +} IO_STATUS_BLOCK32; + typedef struct { UNICODE_STRING32 Name; diff --git a/dlls/wow64/syscall.h b/dlls/wow64/syscall.h index ab25bcb501d..2b542658f9e 100644 --- a/dlls/wow64/syscall.h +++ b/dlls/wow64/syscall.h @@ -38,6 +38,7 @@ SYSCALL_ENTRY( NtCreateDebugObject ) \ SYSCALL_ENTRY( NtCreateDirectoryObject ) \ SYSCALL_ENTRY( NtCreateEvent ) \ + SYSCALL_ENTRY( NtCreateFile ) \ SYSCALL_ENTRY( NtCreateIoCompletion ) \ SYSCALL_ENTRY( NtCreateJobObject ) \ SYSCALL_ENTRY( NtCreateKey ) \ @@ -53,6 +54,7 @@ SYSCALL_ENTRY( NtDebugContinue ) \ SYSCALL_ENTRY( NtDelayExecution ) \ SYSCALL_ENTRY( NtDeleteAtom ) \ + SYSCALL_ENTRY( NtDeleteFile ) \ SYSCALL_ENTRY( NtDeleteKey ) \ SYSCALL_ENTRY( NtDeleteValueKey ) \ SYSCALL_ENTRY( NtDuplicateObject ) \ @@ -73,6 +75,7 @@ SYSCALL_ENTRY( NtMapViewOfSection ) \ SYSCALL_ENTRY( NtOpenDirectoryObject ) \ SYSCALL_ENTRY( NtOpenEvent ) \ + SYSCALL_ENTRY( NtOpenFile ) \ SYSCALL_ENTRY( NtOpenIoCompletion ) \ SYSCALL_ENTRY( NtOpenJobObject ) \ SYSCALL_ENTRY( NtOpenKey ) \ diff --git a/dlls/wow64/wow64_private.h b/dlls/wow64/wow64_private.h index e9935303cbb..303914c540e 100644 --- a/dlls/wow64/wow64_private.h +++ b/dlls/wow64/wow64_private.h @@ -105,6 +105,13 @@ static inline void *apc_param_32to64( ULONG func, ULONG context ) return (void *)(ULONG_PTR)(((ULONG64)func << 32) | context); } +static inline IO_STATUS_BLOCK *iosb_32to64( IO_STATUS_BLOCK *io, IO_STATUS_BLOCK32 *io32 ) +{ + if (!io32) return NULL; + io->Pointer = io32; + return io; +} + static inline UNICODE_STRING *unicode_str_32to64( UNICODE_STRING *str, const UNICODE_STRING32 *str32 ) { if (!str32) return NULL; @@ -178,6 +185,17 @@ static inline void put_size( ULONG *size32, SIZE_T size ) if (size32) *size32 = min( size, MAXDWORD ); } +static inline void put_iosb( IO_STATUS_BLOCK32 *io32, const IO_STATUS_BLOCK *io ) +{ + /* sync I/O modifies the 64-bit iosb right away, so in that case we update the 32-bit one */ + /* async I/O leaves the 64-bit one untouched and updates the 32-bit one directly later on */ + if (io32 && io->Pointer != io32) + { + io32->Status = io->Status; + io32->Information = io->Information; + } +} + extern void put_section_image_info( SECTION_IMAGE_INFORMATION32 *info32, const SECTION_IMAGE_INFORMATION *info ) DECLSPEC_HIDDEN;

1 0

Chip Davis : vkd3d: Pass vkd3d_pipeline_bind_point values to set_root_cbv() calls.
by Alexandre Julliard July 28, 2021

July 28, 2021

Module: vkd3d Branch: master Commit: 0efa6a2f11eb4dc9119941c90d3b7094071634b8 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=0efa6a2f11eb4dc9119941c… Author: Chip Davis <cdavis(a)codeweavers.com> Date: Tue Jul 27 22:45:58 2021 -0500 vkd3d: Pass vkd3d_pipeline_bind_point values to set_root_cbv() calls. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/command.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index cc40334..33239b8 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -4253,7 +4253,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_SetComputeRootConstantBufferVie TRACE("iface %p, root_parameter_index %u, address %#"PRIx64".\n", iface, root_parameter_index, address); - d3d12_command_list_set_root_cbv(list, VK_PIPELINE_BIND_POINT_COMPUTE, root_parameter_index, address); + d3d12_command_list_set_root_cbv(list, VKD3D_PIPELINE_BIND_POINT_COMPUTE, root_parameter_index, address); } static void STDMETHODCALLTYPE d3d12_command_list_SetGraphicsRootConstantBufferView( @@ -4264,7 +4264,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_SetGraphicsRootConstantBufferVi TRACE("iface %p, root_parameter_index %u, address %#"PRIx64".\n", iface, root_parameter_index, address); - d3d12_command_list_set_root_cbv(list, VK_PIPELINE_BIND_POINT_GRAPHICS, root_parameter_index, address); + d3d12_command_list_set_root_cbv(list, VKD3D_PIPELINE_BIND_POINT_GRAPHICS, root_parameter_index, address); } static void d3d12_command_list_set_root_descriptor(struct d3d12_command_list *list,

1 0