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

Alexandre Julliard : wow64: Add thunks for some misc file creation syscalls.
by Alexandre Julliard 28 Jul '21

28 Jul '21

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

Alexandre Julliard : wow64: Add support for file system redirection.
by Alexandre Julliard 28 Jul '21

28 Jul '21

Module: wine Branch: master Commit: 90e1907ded822bbb4a1ad39b3e7dd62e66492118 URL: https://source.winehq.org/git/wine.git/?a=commit;h=90e1907ded822bbb4a1ad39b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 28 18:28:16 2021 +0200 wow64: Add support for file system redirection. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wow64/file.c | 184 ++++++++++++++++++++++++++++++++++++++++++--- dlls/wow64/syscall.c | 2 + dlls/wow64/wow64_private.h | 12 +++ 3 files changed, 189 insertions(+), 9 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=90e1907ded822bbb4a1a…

1 0

Paul Gofman : ntdll: Decrement IO pending count in ioqueue_thread_proc().
by Alexandre Julliard 28 Jul '21

28 Jul '21

Module: wine Branch: master Commit: 217ae19d03f67836cfc0add2f9aeeeaeb34cdb77 URL: https://source.winehq.org/git/wine.git/?a=commit;h=217ae19d03f67836cfc0add2… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Jul 28 01:06:59 2021 +0300 ntdll: Decrement IO pending count in 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 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/threadpool.c b/dlls/ntdll/threadpool.c index 9e99398bdee..b82d06e5e42 100644 --- a/dlls/ntdll/threadpool.c +++ b/dlls/ntdll/threadpool.c @@ -1536,6 +1536,8 @@ static void CALLBACK ioqueue_thread_proc( void *param ) { RtlEnterCriticalSection( &io->pool->cs ); + --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))) { @@ -2138,7 +2140,6 @@ static void tp_object_execute( struct threadpool_object *object, BOOL wait_threa { assert( object->u.io.completion_count ); completion = object->u.io.completions[--object->u.io.completion_count]; - object->u.io.pending_count--; } /* Leave critical section and do the actual callback. */

1 0

Paul Gofman : ntdll: Only queue IO callback if IO is pending in ioqueue_thread_proc().
by Alexandre Julliard 28 Jul '21

28 Jul '21

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 28 Jul '21

28 Jul '21

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

Paul Gofman : ntdll: Manage TPIO object destruction based on the expected completions.
by Alexandre Julliard 28 Jul '21

28 Jul '21

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

Jacek Caban : gdi32: Move disabled flag to DC_ATTR.
by Alexandre Julliard 28 Jul '21

28 Jul '21

Module: wine Branch: master Commit: ed1fbcf75bb35de9d9836bed6b8615bae3b1eb84 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ed1fbcf75bb35de9d9836bed… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 28 11:38:58 2021 +0200 gdi32: Move disabled flag to DC_ATTR. And honour it in get_dc_attr. 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 | 6 +++--- dlls/gdi32/gdidc.c | 2 +- dlls/gdi32/ntgdi_private.h | 1 - include/ntgdi.h | 1 + 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index cba97c1231a..5f86bb524ba 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -206,7 +206,7 @@ DC *get_dc_ptr( HDC hdc ) { DC *dc = get_dc_obj( hdc ); if (!dc) return NULL; - if (dc->disabled) + if (dc->attr->disabled) { GDI_ReleaseObj( hdc ); return NULL; @@ -1258,9 +1258,9 @@ WORD WINAPI SetHookFlags( HDC hdc, WORD flags ) ret = InterlockedExchange( &dc->dirty, 0 ); if (flags & DCHF_DISABLEDC) - ret = InterlockedExchange( &dc->disabled, 1 ); + ret = InterlockedExchange( &dc->attr->disabled, 1 ); else if (flags & DCHF_ENABLEDC) - ret = InterlockedExchange( &dc->disabled, 0 ); + ret = InterlockedExchange( &dc->attr->disabled, 0 ); GDI_ReleaseObj( hdc ); diff --git a/dlls/gdi32/gdidc.c b/dlls/gdi32/gdidc.c index 3b477f920f9..1318533d100 100644 --- a/dlls/gdi32/gdidc.c +++ b/dlls/gdi32/gdidc.c @@ -34,7 +34,7 @@ static DC_ATTR *get_dc_attr( HDC hdc ) SetLastError( ERROR_INVALID_HANDLE ); return NULL; } - return dc_attr; + return dc_attr->disabled ? NULL : dc_attr; } /*********************************************************************** diff --git a/dlls/gdi32/ntgdi_private.h b/dlls/gdi32/ntgdi_private.h index 674c5085a7f..6efc3f2e7d1 100644 --- a/dlls/gdi32/ntgdi_private.h +++ b/dlls/gdi32/ntgdi_private.h @@ -79,7 +79,6 @@ typedef struct tagDC DWORD thread; /* thread owning the DC */ LONG refcount; /* thread refcount */ LONG dirty; /* dirty flag */ - LONG disabled; /* get_dc_ptr() will return NULL. Controlled by DCHF_(DISABLE|ENABLE)DC */ INT saveLevel; DC_ATTR *attr; /* DC attributes accessible by client */ struct tagDC *saved_dc; diff --git a/include/ntgdi.h b/include/ntgdi.h index f71c993e67c..f1a3436437f 100644 --- a/include/ntgdi.h +++ b/include/ntgdi.h @@ -98,6 +98,7 @@ enum typedef struct DC_ATTR { + LONG disabled; /* disabled flag, controled by DCHF_(DISABLE|ENABLE)DC */ POINT cur_pos; INT graphics_mode; WORD text_align;

1 0

Jacek Caban : gdi32: Move ROP mode to DC_ATTR.
by Alexandre Julliard 28 Jul '21

28 Jul '21

Module: wine Branch: master Commit: a0f40f2a3b77dd1c7130312a0dfb02fdf550fd82 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a0f40f2a3b77dd1c7130312a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 28 11:39:05 2021 +0200 gdi32: Move ROP mode to DC_ATTR. 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 | 25 ++++--------------------- dlls/gdi32/dibdrv/graphics.c | 4 ++-- dlls/gdi32/dibdrv/objects.c | 4 ++-- dlls/gdi32/gdidc.c | 9 +++++++++ dlls/gdi32/ntgdi_private.h | 1 - include/ntgdi.h | 1 + 6 files changed, 18 insertions(+), 26 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 5f86bb524ba..0f793dd76cc 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -82,7 +82,7 @@ static void set_initial_dc_state( DC *dc ) dc->miterLimit = 10.0f; /* 10.0 is the default, from MSDN */ dc->layout = 0; dc->font_code_page = CP_ACP; - dc->ROPmode = R2_COPYPEN; + dc->attr->rop_mode = R2_COPYPEN; dc->polyFillMode = ALTERNATE; dc->stretchBltMode = BLACKONWHITE; dc->relAbsMode = ABSOLUTE; @@ -399,7 +399,6 @@ INT CDECL nulldrv_SaveDC( PHYSDEV dev ) newdc->hFont = dc->hFont; newdc->hBitmap = dc->hBitmap; newdc->hPalette = dc->hPalette; - newdc->ROPmode = dc->ROPmode; newdc->polyFillMode = dc->polyFillMode; newdc->stretchBltMode = dc->stretchBltMode; newdc->relAbsMode = dc->relAbsMode; @@ -472,7 +471,7 @@ BOOL CDECL nulldrv_RestoreDC( PHYSDEV dev, INT level ) if (!PATH_RestorePath( dc, dcs )) return FALSE; dc->layout = dcs->layout; - dc->ROPmode = dcs->ROPmode; + dc->attr->rop_mode = dcs->attr->rop_mode; dc->polyFillMode = dcs->polyFillMode; dc->stretchBltMode = dcs->stretchBltMode; dc->relAbsMode = dcs->relAbsMode; @@ -1555,22 +1554,6 @@ INT WINAPI GetRelAbs( HDC hdc, DWORD dwIgnore ) } -/*********************************************************************** - * GetROP2 (GDI32.@) - */ -INT WINAPI GetROP2( HDC hdc ) -{ - INT ret = 0; - DC * dc = get_dc_ptr( hdc ); - if (dc) - { - ret = dc->ROPmode; - release_dc_ptr( dc ); - } - return ret; -} - - /*********************************************************************** * SetROP2 (GDI32.@) */ @@ -1590,8 +1573,8 @@ INT WINAPI SetROP2( HDC hdc, INT mode ) mode = physdev->funcs->pSetROP2( physdev, mode ); if (mode) { - ret = dc->ROPmode; - dc->ROPmode = mode; + ret = dc->attr->rop_mode; + dc->attr->rop_mode = mode; } release_dc_ptr( dc ); } diff --git a/dlls/gdi32/dibdrv/graphics.c b/dlls/gdi32/dibdrv/graphics.c index 62384601c5a..6dc79e53b36 100644 --- a/dlls/gdi32/dibdrv/graphics.c +++ b/dlls/gdi32/dibdrv/graphics.c @@ -73,7 +73,7 @@ static BOOL brush_rect( dibdrv_physdev *pdev, dib_brush *brush, const RECT *rect if (!get_clipped_rects( &pdev->dib, rect, clip, &clipped_rects )) return TRUE; ret = brush->rects( pdev, brush, &pdev->dib, clipped_rects.count, clipped_rects.rects, - &dc->brush_org, dc->ROPmode ); + &dc->brush_org, dc->attr->rop_mode ); free_clipped_rects( &clipped_rects ); return ret; } @@ -1590,7 +1590,7 @@ COLORREF CDECL dibdrv_SetPixel( PHYSDEV dev, INT x, INT y, COLORREF color ) color = pdev->dib.funcs->pixel_to_colorref( &pdev->dib, pixel ); if (!get_clipped_rects( &pdev->dib, &rect, pdev->clip, &clipped_rects )) return color; - fill_with_pixel( dc, &pdev->dib, pixel, clipped_rects.count, clipped_rects.rects, dc->ROPmode ); + fill_with_pixel( dc, &pdev->dib, pixel, clipped_rects.count, clipped_rects.rects, dc->attr->rop_mode ); free_clipped_rects( &clipped_rects ); return color; } diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index 504e3bc2438..489b2497ff2 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -819,7 +819,7 @@ static BOOL solid_pen_lines(dibdrv_physdev *pdev, int num, POINT *pts, BOOL clos DWORD color, and, xor; color = get_pixel_color( dc, &pdev->dib, pdev->pen_brush.colorref, TRUE ); - calc_and_xor_masks( dc->ROPmode, color, &and, &xor ); + calc_and_xor_masks( dc->attr->rop_mode, color, &and, &xor ); for (i = 0; i < num - 1; i++) if (!solid_pen_line( pdev, pts + i, pts + i + 1, and, xor )) @@ -1229,7 +1229,7 @@ static BOOL dashed_pen_lines(dibdrv_physdev *pdev, int num, POINT *pts, BOOL clo } else { - get_color_masks( dc, &pdev->dib, dc->ROPmode, pdev->pen_brush.colorref, + get_color_masks( dc, &pdev->dib, dc->attr->rop_mode, pdev->pen_brush.colorref, pdev->pen_is_ext ? TRANSPARENT : dc->attr->background_mode, &pdev->dash_masks[1], &pdev->dash_masks[0] ); diff --git a/dlls/gdi32/gdidc.c b/dlls/gdi32/gdidc.c index 1318533d100..df6bc75c32d 100644 --- a/dlls/gdi32/gdidc.c +++ b/dlls/gdi32/gdidc.c @@ -108,6 +108,15 @@ BOOL WINAPI GetCurrentPositionEx( HDC hdc, POINT *point ) return TRUE; } +/*********************************************************************** + * GetROP2 (GDI32.@) + */ +INT WINAPI GetROP2( HDC hdc ) +{ + DC_ATTR *dc_attr = get_dc_attr( hdc ); + return dc_attr ? dc_attr->rop_mode : 0; +} + /*********************************************************************** * SetPixel (GDI32.@) */ diff --git a/dlls/gdi32/ntgdi_private.h b/dlls/gdi32/ntgdi_private.h index 6efc3f2e7d1..812e435d664 100644 --- a/dlls/gdi32/ntgdi_private.h +++ b/dlls/gdi32/ntgdi_private.h @@ -117,7 +117,6 @@ typedef struct tagDC const struct font_gamma_ramp *font_gamma_ramp; UINT font_code_page; - WORD ROPmode; WORD polyFillMode; WORD stretchBltMode; WORD relAbsMode; diff --git a/include/ntgdi.h b/include/ntgdi.h index f1a3436437f..ec7e650d1b4 100644 --- a/include/ntgdi.h +++ b/include/ntgdi.h @@ -103,6 +103,7 @@ typedef struct DC_ATTR INT graphics_mode; WORD text_align; WORD background_mode; + WORD rop_mode; void *emf; } DC_ATTR;

1 0

Jacek Caban : gdi32: Use get_dc_attr in SetROP2.
by Alexandre Julliard 28 Jul '21

28 Jul '21

Module: wine Branch: master Commit: c00b231826d7d244f59a50610677960280823b9b URL: https://source.winehq.org/git/wine.git/?a=commit;h=c00b231826d7d244f59a5061… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 28 11:39:15 2021 +0200 gdi32: Use get_dc_attr in SetROP2. 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 | 28 ---------------------------- dlls/gdi32/enhmfdrv/dc.c | 4 ++-- dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 1 - dlls/gdi32/enhmfdrv/init.c | 2 +- dlls/gdi32/gdi_private.h | 2 ++ dlls/gdi32/gdidc.c | 23 +++++++++++++++++++++++ dlls/gdi32/mfdrv/dc.c | 4 ++-- dlls/gdi32/mfdrv/init.c | 2 +- dlls/gdi32/mfdrv/metafiledrv.h | 1 - 9 files changed, 31 insertions(+), 36 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 0f793dd76cc..dc7d0b2655d 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -1554,34 +1554,6 @@ INT WINAPI GetRelAbs( HDC hdc, DWORD dwIgnore ) } -/*********************************************************************** - * SetROP2 (GDI32.@) - */ -INT WINAPI SetROP2( HDC hdc, INT mode ) -{ - INT ret = 0; - DC *dc; - - if ((mode < R2_BLACK) || (mode > R2_WHITE)) - { - SetLastError(ERROR_INVALID_PARAMETER); - return 0; - } - if ((dc = get_dc_ptr( hdc ))) - { - PHYSDEV physdev = GET_DC_PHYSDEV( dc, pSetROP2 ); - mode = physdev->funcs->pSetROP2( physdev, mode ); - if (mode) - { - ret = dc->attr->rop_mode; - dc->attr->rop_mode = mode; - } - release_dc_ptr( dc ); - } - return ret; -} - - /*********************************************************************** * SetRelAbs (GDI32.@) */ diff --git a/dlls/gdi32/enhmfdrv/dc.c b/dlls/gdi32/enhmfdrv/dc.c index c0a53045099..ff78ab4c774 100644 --- a/dlls/gdi32/enhmfdrv/dc.c +++ b/dlls/gdi32/enhmfdrv/dc.c @@ -116,13 +116,13 @@ COLORREF CDECL EMFDRV_SetTextColor( PHYSDEV dev, COLORREF color ) return EMFDRV_WriteRecord( dev, &emr.emr ) ? color : CLR_INVALID; } -INT CDECL EMFDRV_SetROP2( PHYSDEV dev, INT rop ) +BOOL EMFDC_SetROP2( DC_ATTR *dc_attr, INT rop ) { EMRSETROP2 emr; emr.emr.iType = EMR_SETROP2; emr.emr.nSize = sizeof(emr); emr.iMode = rop; - return EMFDRV_WriteRecord( dev, &emr.emr ) ? rop : 0; + return EMFDRV_WriteRecord( dc_attr->emf, &emr.emr ); } INT CDECL EMFDRV_SetPolyFillMode( PHYSDEV dev, INT mode ) diff --git a/dlls/gdi32/enhmfdrv/enhmetafiledrv.h b/dlls/gdi32/enhmfdrv/enhmetafiledrv.h index b80e0ffafd2..a5d4a623b95 100644 --- a/dlls/gdi32/enhmfdrv/enhmetafiledrv.h +++ b/dlls/gdi32/enhmfdrv/enhmetafiledrv.h @@ -125,7 +125,6 @@ extern INT CDECL EMFDRV_SetMapMode( PHYSDEV dev, INT mode ) DECLSPEC_HIDDEN extern DWORD CDECL EMFDRV_SetMapperFlags( PHYSDEV dev, DWORD flags ) DECLSPEC_HIDDEN; extern COLORREF CDECL EMFDRV_SetPixel( PHYSDEV dev, INT x, INT y, COLORREF color ) DECLSPEC_HIDDEN; extern INT CDECL EMFDRV_SetPolyFillMode( PHYSDEV dev, INT mode ) DECLSPEC_HIDDEN; -extern INT CDECL EMFDRV_SetROP2( PHYSDEV dev, INT rop ) DECLSPEC_HIDDEN; extern INT CDECL EMFDRV_SetStretchBltMode( PHYSDEV dev, INT mode ) DECLSPEC_HIDDEN; extern COLORREF CDECL EMFDRV_SetTextColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN; extern BOOL CDECL EMFDRV_SetTextJustification( PHYSDEV dev, INT nBreakExtra, INT nBreakCount ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/enhmfdrv/init.c b/dlls/gdi32/enhmfdrv/init.c index 27856434d50..e9e8ae6eec0 100644 --- a/dlls/gdi32/enhmfdrv/init.c +++ b/dlls/gdi32/enhmfdrv/init.c @@ -141,7 +141,7 @@ static const struct gdi_dc_funcs emfdrv_driver = EMFDRV_SetMapperFlags, /* pSetMapperFlags */ EMFDRV_SetPixel, /* pSetPixel */ EMFDRV_SetPolyFillMode, /* pSetPolyFillMode */ - EMFDRV_SetROP2, /* pSetROP2 */ + NULL, /* pSetROP2 */ NULL, /* pSetRelAbs */ EMFDRV_SetStretchBltMode, /* pSetStretchBltMode */ NULL, /* pSetTextAlign */ diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 37cec4bfe78..7ffb92d83d1 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -68,6 +68,7 @@ extern BOOL METADC_RoundRect( HDC hdc, INT left, INT top, INT right, INT bottom, INT ell_width, INT ell_height ) DECLSPEC_HIDDEN; extern BOOL METADC_SetBkMode( HDC hdc, INT mode ) DECLSPEC_HIDDEN; extern BOOL METADC_SetPixel( HDC hdc, INT x, INT y, COLORREF color ) DECLSPEC_HIDDEN; +extern BOOL METADC_SetROP2( HDC hdc, INT rop ) DECLSPEC_HIDDEN; extern BOOL METADC_SetTextAlign( HDC hdc, UINT align ) DECLSPEC_HIDDEN; /* enhanced metafiles */ @@ -112,6 +113,7 @@ extern BOOL EMFDC_RoundRect( DC_ATTR *dc_attr, INT left, INT top, INT right, INT INT ell_width, INT ell_height ) DECLSPEC_HIDDEN; extern BOOL EMFDC_SetBkMode( DC_ATTR *dc_attr, INT mode ) DECLSPEC_HIDDEN; extern BOOL EMFDC_SetPixel( DC_ATTR *dc_attr, INT x, INT y, COLORREF color ) DECLSPEC_HIDDEN; +extern BOOL EMFDC_SetROP2( DC_ATTR *dc_attr, INT rop ) DECLSPEC_HIDDEN; extern BOOL EMFDC_SetTextAlign( DC_ATTR *dc_attr, UINT align ) DECLSPEC_HIDDEN; #endif /* __WINE_GDI_PRIVATE_H */ diff --git a/dlls/gdi32/gdidc.c b/dlls/gdi32/gdidc.c index df6bc75c32d..d3221610ed6 100644 --- a/dlls/gdi32/gdidc.c +++ b/dlls/gdi32/gdidc.c @@ -117,6 +117,29 @@ INT WINAPI GetROP2( HDC hdc ) return dc_attr ? dc_attr->rop_mode : 0; } +/*********************************************************************** + * SetROP2 (GDI32.@) + */ +INT WINAPI SetROP2( HDC hdc, INT mode ) +{ + DC_ATTR *dc_attr; + INT ret; + + if ((mode < R2_BLACK) || (mode > R2_WHITE)) + { + SetLastError(ERROR_INVALID_PARAMETER); + return 0; + } + + if (is_meta_dc( hdc )) return METADC_SetROP2( hdc, mode ); + if (!(dc_attr = get_dc_attr( hdc ))) return 0; + if (dc_attr->emf && !EMFDC_SetROP2( dc_attr, mode )) return 0; + + ret = dc_attr->rop_mode; + dc_attr->rop_mode = mode; + return ret; +} + /*********************************************************************** * SetPixel (GDI32.@) */ diff --git a/dlls/gdi32/mfdrv/dc.c b/dlls/gdi32/mfdrv/dc.c index 0ebb9b660e7..e20dc5666c9 100644 --- a/dlls/gdi32/mfdrv/dc.c +++ b/dlls/gdi32/mfdrv/dc.c @@ -50,9 +50,9 @@ COLORREF CDECL MFDRV_SetTextColor( PHYSDEV dev, COLORREF color ) return MFDRV_MetaParam2(dev, META_SETTEXTCOLOR, HIWORD(color), LOWORD(color)) ? color : CLR_INVALID; } -INT CDECL MFDRV_SetROP2( PHYSDEV dev, INT rop ) +BOOL METADC_SetROP2( HDC hdc, INT rop ) { - return MFDRV_MetaParam1( dev, META_SETROP2, (WORD)rop) ? rop : 0; + return metadc_param1( hdc, META_SETROP2, (WORD)rop ); } INT CDECL MFDRV_SetRelAbs( PHYSDEV dev, INT mode ) diff --git a/dlls/gdi32/mfdrv/init.c b/dlls/gdi32/mfdrv/init.c index 3733d93e554..14c9abac379 100644 --- a/dlls/gdi32/mfdrv/init.c +++ b/dlls/gdi32/mfdrv/init.c @@ -204,7 +204,7 @@ static const struct gdi_dc_funcs MFDRV_Funcs = MFDRV_SetMapperFlags, /* pSetMapperFlags */ NULL, /* pSetPixel */ MFDRV_SetPolyFillMode, /* pSetPolyFillMode */ - MFDRV_SetROP2, /* pSetROP2 */ + NULL, /* pSetROP2 */ MFDRV_SetRelAbs, /* pSetRelAbs */ MFDRV_SetStretchBltMode, /* pSetStretchBltMode */ NULL, /* pSetTextAlign */ diff --git a/dlls/gdi32/mfdrv/metafiledrv.h b/dlls/gdi32/mfdrv/metafiledrv.h index 5a9997209e7..70802a673d7 100644 --- a/dlls/gdi32/mfdrv/metafiledrv.h +++ b/dlls/gdi32/mfdrv/metafiledrv.h @@ -112,7 +112,6 @@ extern DWORD CDECL MFDRV_SetLayout( PHYSDEV dev, DWORD layout ) DECLSPEC_HIDD extern INT CDECL MFDRV_SetMapMode( PHYSDEV dev, INT mode ) DECLSPEC_HIDDEN; extern DWORD CDECL MFDRV_SetMapperFlags( PHYSDEV dev, DWORD flags ) DECLSPEC_HIDDEN; extern INT CDECL MFDRV_SetPolyFillMode( PHYSDEV dev, INT mode ) DECLSPEC_HIDDEN; -extern INT CDECL MFDRV_SetROP2( PHYSDEV dev, INT rop ) DECLSPEC_HIDDEN; extern INT CDECL MFDRV_SetRelAbs( PHYSDEV dev, INT mode ) DECLSPEC_HIDDEN; extern INT CDECL MFDRV_SetStretchBltMode( PHYSDEV dev, INT mode ) DECLSPEC_HIDDEN; extern INT CDECL MFDRV_SetTextCharacterExtra( PHYSDEV dev, INT extra ) DECLSPEC_HIDDEN;

1 0

Jacek Caban : gdi32: Move layout to DC_ATTR.
by Alexandre Julliard 28 Jul '21

28 Jul '21

Module: wine Branch: master Commit: 148a2b60a58ac7ab6295a79bd2d9a0a992bb55f9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=148a2b60a58ac7ab6295a79b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 28 11:39:26 2021 +0200 gdi32: Move layout to DC_ATTR. 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/bitblt.c | 10 +++++----- dlls/gdi32/clipping.c | 12 ++++++------ dlls/gdi32/dc.c | 31 ++++--------------------------- dlls/gdi32/dib.c | 4 ++-- dlls/gdi32/dibdrv/graphics.c | 2 +- dlls/gdi32/driver.c | 4 ++-- dlls/gdi32/font.c | 2 +- dlls/gdi32/gdidc.c | 9 +++++++++ dlls/gdi32/mapping.c | 2 +- dlls/gdi32/ntgdi_private.h | 1 - dlls/gdi32/tests/mapping.c | 2 ++ dlls/gdi32/tests/metafile.c | 2 +- include/ntgdi.h | 1 + 13 files changed, 35 insertions(+), 47 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=148a2b60a58ac7ab6295…

1 0