- Wine-Devel - list.winehq.org

[PATCH v2 1/3] winhttp: Use a single thread pool wrapper callback for async tasks.
by Paul Gofman March 16, 2022

March 16, 2022

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- v2: - no changes. dlls/winhttp/request.c | 74 +++++++++++++++++++--------------- dlls/winhttp/winhttp_private.h | 15 +++++++ 2 files changed, 56 insertions(+), 33 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index b409c4cdced..36a3bb909b9 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -146,15 +146,23 @@ void stop_queue( struct queue *queue ) TRACE("stopped %p\n", queue); } -static DWORD queue_task( struct queue *queue, PTP_WORK_CALLBACK task, void *ctx ) +static void CALLBACK task_callback( TP_CALLBACK_INSTANCE *instance, void *ctx, TP_WORK *work ) +{ + struct task_header *task_hdr = ctx; + + task_hdr->callback( task_hdr ); +} + +static DWORD queue_task( struct queue *queue, TASK_CALLBACK task, struct task_header *task_hdr ) { TP_WORK *work; DWORD ret; if ((ret = start_queue( queue ))) return ret; - if (!(work = CreateThreadpoolWork( task, ctx, &queue->env ))) return GetLastError(); - TRACE("queueing %p in %p\n", work, queue); + if (!(work = CreateThreadpoolWork( task_callback, task_hdr, &queue->env ))) return GetLastError(); + TRACE("queueing %p in %p\n", task_hdr, queue); + task_hdr->callback = task; SubmitThreadpoolWork( work ); CloseThreadpoolWork( work ); @@ -2167,11 +2175,11 @@ end: return ret; } -static void CALLBACK task_send_request( TP_CALLBACK_INSTANCE *instance, void *ctx, TP_WORK *work ) +static void task_send_request( void *ctx ) { struct send_request *s = ctx; - TRACE("running %p\n", work); + TRACE( "running %p\n", ctx ); send_request( s->request, s->headers, s->headers_len, s->optional, s->optional_len, s->total_len, s->context, TRUE ); release_object( &s->request->hdr ); @@ -2219,7 +2227,7 @@ BOOL WINAPI WinHttpSendRequest( HINTERNET hrequest, const WCHAR *headers, DWORD s->context = context; addref_object( &request->hdr ); - if ((ret = queue_task( &request->queue, task_send_request, s ))) + if ((ret = queue_task( &request->queue, task_send_request, &s->task_hdr ))) { release_object( &request->hdr ); free( s->headers ); @@ -2753,11 +2761,11 @@ static DWORD receive_response( struct request *request, BOOL async ) return ret; } -static void CALLBACK task_receive_response( TP_CALLBACK_INSTANCE *instance, void *ctx, TP_WORK *work ) +static void task_receive_response( void *ctx ) { struct receive_response *r = ctx; - TRACE("running %p\n", work); + TRACE("running %p\n", ctx); receive_response( r->request, TRUE ); release_object( &r->request->hdr ); @@ -2794,7 +2802,7 @@ BOOL WINAPI WinHttpReceiveResponse( HINTERNET hrequest, LPVOID reserved ) r->request = request; addref_object( &request->hdr ); - if ((ret = queue_task( &request->queue, task_receive_response, r ))) + if ((ret = queue_task( &request->queue, task_receive_response, &r->task_hdr ))) { release_object( &request->hdr ); free( r ); @@ -2852,11 +2860,11 @@ done: return ret; } -static void CALLBACK task_query_data_available( TP_CALLBACK_INSTANCE *instance, void *ctx, TP_WORK *work ) +static void task_query_data_available( void *ctx ) { struct query_data *q = ctx; - TRACE("running %p\n", work); + TRACE("running %p\n", ctx); query_data_available( q->request, q->available, TRUE ); release_object( &q->request->hdr ); @@ -2895,7 +2903,7 @@ BOOL WINAPI WinHttpQueryDataAvailable( HINTERNET hrequest, LPDWORD available ) q->available = available; addref_object( &request->hdr ); - if ((ret = queue_task( &request->queue, task_query_data_available, q ))) + if ((ret = queue_task( &request->queue, task_query_data_available, &q->task_hdr ))) { release_object( &request->hdr ); free( q ); @@ -2909,11 +2917,11 @@ BOOL WINAPI WinHttpQueryDataAvailable( HINTERNET hrequest, LPDWORD available ) return !ret || ret == ERROR_IO_PENDING; } -static void CALLBACK task_read_data( TP_CALLBACK_INSTANCE *instance, void *ctx, TP_WORK *work ) +static void task_read_data( void *ctx ) { struct read_data *r = ctx; - TRACE("running %p\n", work); + TRACE("running %p\n", ctx); read_data( r->request, r->buffer, r->to_read, r->read, TRUE ); release_object( &r->request->hdr ); @@ -2954,7 +2962,7 @@ BOOL WINAPI WinHttpReadData( HINTERNET hrequest, void *buffer, DWORD to_read, DW r->read = read; addref_object( &request->hdr ); - if ((ret = queue_task( &request->queue, task_read_data, r ))) + if ((ret = queue_task( &request->queue, task_read_data, &r->task_hdr ))) { release_object( &request->hdr ); free( r ); @@ -2990,11 +2998,11 @@ static DWORD write_data( struct request *request, const void *buffer, DWORD to_w return ret; } -static void CALLBACK task_write_data( TP_CALLBACK_INSTANCE *instance, void *ctx, TP_WORK *work ) +static void task_write_data( void *ctx ) { struct write_data *w = ctx; - TRACE("running %p\n", work); + TRACE("running %p\n", ctx); write_data( w->request, w->buffer, w->to_write, w->written, TRUE ); release_object( &w->request->hdr ); @@ -3034,7 +3042,7 @@ BOOL WINAPI WinHttpWriteData( HINTERNET hrequest, const void *buffer, DWORD to_w w->written = written; addref_object( &request->hdr ); - if ((ret = queue_task( &request->queue, task_write_data, w ))) + if ((ret = queue_task( &request->queue, task_write_data, &w->task_hdr ))) { release_object( &request->hdr ); free( w ); @@ -3392,12 +3400,12 @@ static DWORD socket_send( struct socket *socket, WINHTTP_WEB_SOCKET_BUFFER_TYPE return send_frame( socket, opcode, 0, buf, len, final, ovr ); } -static void CALLBACK task_socket_send( TP_CALLBACK_INSTANCE *instance, void *ctx, TP_WORK *work ) +static void task_socket_send( void *ctx ) { struct socket_send *s = ctx; DWORD ret; - TRACE("running %p\n", work); + TRACE("running %p\n", ctx); if (s->complete_async) ret = complete_send_frame( s->socket, &s->ovr, s->buf ); else ret = socket_send( s->socket, s->type, s->buf, s->len, NULL ); @@ -3479,7 +3487,7 @@ DWORD WINAPI WinHttpWebSocketSend( HINTERNET hsocket, WINHTTP_WEB_SOCKET_BUFFER_ s->len = len; addref_object( &socket->hdr ); - if ((ret = queue_task( &socket->send_q, task_socket_send, s ))) + if ((ret = queue_task( &socket->send_q, task_socket_send, &s->task_hdr ))) { InterlockedDecrement( &socket->hdr.pending_sends ); InterlockedExchange( &socket->pending_noncontrol_send, 0 ); @@ -3596,11 +3604,11 @@ static DWORD receive_frame( struct socket *socket, DWORD *ret_len, enum socket_o return ERROR_SUCCESS; } -static void CALLBACK task_socket_send_pong( TP_CALLBACK_INSTANCE *instance, void *ctx, TP_WORK *work ) +static void task_socket_send_pong( void *ctx ) { struct socket_send *s = ctx; - TRACE("running %p\n", work); + TRACE("running %p\n", ctx); if (s->complete_async) complete_send_frame( s->socket, &s->ovr, NULL ); else send_frame( s->socket, SOCKET_OPCODE_PONG, 0, NULL, 0, TRUE, NULL ); @@ -3638,7 +3646,7 @@ static DWORD socket_send_pong( struct socket *socket ) s->complete_async = complete_async; s->socket = socket; addref_object( &socket->hdr ); - if ((ret = queue_task( &socket->send_q, task_socket_send_pong, s ))) + if ((ret = queue_task( &socket->send_q, task_socket_send_pong, &s->task_hdr ))) { InterlockedDecrement( &socket->hdr.pending_sends ); release_object( &socket->hdr ); @@ -3817,13 +3825,13 @@ static DWORD socket_receive( struct socket *socket, void *buf, DWORD len, DWORD return ret; } -static void CALLBACK task_socket_receive( TP_CALLBACK_INSTANCE *instance, void *ctx, TP_WORK *work ) +static void task_socket_receive( void *ctx ) { struct socket_receive *r = ctx; DWORD ret, count; WINHTTP_WEB_SOCKET_BUFFER_TYPE type; - TRACE("running %p\n", work); + TRACE("running %p\n", ctx); ret = socket_receive( r->socket, r->buf, r->len, &count, &type ); if (receive_io_complete( r->socket )) @@ -3893,7 +3901,7 @@ DWORD WINAPI WinHttpWebSocketReceive( HINTERNET hsocket, void *buf, DWORD len, D r->len = len; addref_object( &socket->hdr ); - if ((ret = queue_task( &socket->recv_q, task_socket_receive, r ))) + if ((ret = queue_task( &socket->recv_q, task_socket_receive, &r->task_hdr ))) { InterlockedDecrement( &socket->hdr.pending_receives ); release_object( &socket->hdr ); @@ -3919,12 +3927,12 @@ static void socket_shutdown_complete( struct socket *socket, DWORD ret ) } } -static void CALLBACK task_socket_shutdown( TP_CALLBACK_INSTANCE *instance, void *ctx, TP_WORK *work ) +static void task_socket_shutdown( void *ctx ) { struct socket_shutdown *s = ctx; DWORD ret; - TRACE("running %p\n", work); + TRACE("running %p\n", ctx); if (s->complete_async) ret = complete_send_frame( s->socket, &s->ovr, s->reason ); else ret = send_frame( s->socket, SOCKET_OPCODE_CLOSE, s->status, s->reason, s->len, TRUE, NULL ); @@ -3971,7 +3979,7 @@ static DWORD send_socket_shutdown( struct socket *socket, USHORT status, const v s->send_callback = send_callback; addref_object( &socket->hdr ); - if ((ret = queue_task( &socket->send_q, task_socket_shutdown, s ))) + if ((ret = queue_task( &socket->send_q, task_socket_shutdown, &s->task_hdr ))) { InterlockedDecrement( &socket->hdr.pending_sends ); release_object( &socket->hdr ); @@ -4057,12 +4065,12 @@ static void socket_close_complete( struct socket *socket, DWORD ret ) } } -static void CALLBACK task_socket_close( TP_CALLBACK_INSTANCE *instance, void *ctx, TP_WORK *work ) +static void task_socket_close( void *ctx ) { struct socket_shutdown *s = ctx; DWORD ret; - TRACE("running %p\n", work); + TRACE("running %p\n", ctx); ret = socket_close( s->socket ); socket_close_complete( s->socket, ret ); @@ -4132,7 +4140,7 @@ DWORD WINAPI WinHttpWebSocketClose( HINTERNET hsocket, USHORT status, void *reas s->socket = socket; addref_object( &socket->hdr ); - if ((ret = queue_task( &socket->recv_q, task_socket_close, s ))) + if ((ret = queue_task( &socket->recv_q, task_socket_close, &s->task_hdr ))) { release_object( &socket->hdr ); free( s ); diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index 19ef9a35e2d..96bd7b53747 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -273,8 +273,16 @@ struct socket BOOL last_receive_final; }; +typedef void (*TASK_CALLBACK)( void *ctx ); + +struct task_header +{ + TASK_CALLBACK callback; +}; + struct send_request { + struct task_header task_hdr; struct request *request; WCHAR *headers; DWORD headers_len; @@ -286,17 +294,20 @@ struct send_request struct receive_response { + struct task_header task_hdr; struct request *request; }; struct query_data { + struct task_header task_hdr; struct request *request; DWORD *available; }; struct read_data { + struct task_header task_hdr; struct request *request; void *buffer; DWORD to_read; @@ -305,6 +316,7 @@ struct read_data struct write_data { + struct task_header task_hdr; struct request *request; const void *buffer; DWORD to_write; @@ -313,6 +325,7 @@ struct write_data struct socket_send { + struct task_header task_hdr; struct socket *socket; WINHTTP_WEB_SOCKET_BUFFER_TYPE type; const void *buf; @@ -323,6 +336,7 @@ struct socket_send struct socket_receive { + struct task_header task_hdr; struct socket *socket; void *buf; DWORD len; @@ -330,6 +344,7 @@ struct socket_receive struct socket_shutdown { + struct task_header task_hdr; struct socket *socket; USHORT status; char reason[123]; -- 2.35.1

2 5

[PATCH] dlls: Flush CompositionString after X11DRV_XIMLookupChars.
by Alex Kwak March 16, 2022

March 16, 2022

There is no flushing after X11DRV_XIMLookupChars on wine11xdrv. for this reason, the characters of the GUI are not updated. In addition, in IME_SetResultString on wine11xdrv, the bInComposition flag is not deactivated after generating WM_IME_ENDCOMPOSITION, so that the WM_IME_STARTCOMPOSITION message is not generated in the next composition. Also, when WM_IME_COMPOSITION is processed in editor_handle_message on riched20, the existing selection is removed and the characters being entered disappear. WM_IME_STARTCOMPOSITION occurs when attempting to input after full selection, and ME_DeleteSelection is called, which causes the exact location of the cursor to be lost. Signed-off-by: Alex Kwak <take-me-home(a)kakao.com> --- dlls/riched20/editor.c | 3 +-- dlls/winex11.drv/ime.c | 5 ++--- dlls/winex11.drv/xim.c | 8 ++++++++ 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index a8cf3175591..33437a6d6e3 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -4097,8 +4097,8 @@ LRESULT editor_handle_message( ME_TextEditor *editor, UINT msg, WPARAM wParam, return 0; case WM_IME_STARTCOMPOSITION: { - editor->imeStartIndex=ME_GetCursorOfs(&editor->pCursors[0]); ME_DeleteSelection(editor); + editor->imeStartIndex=ME_GetCursorOfs(&editor->pCursors[0]); ME_CommitUndo(editor); ME_UpdateRepaint(editor, FALSE); return 0; @@ -4109,7 +4109,6 @@ LRESULT editor_handle_message( ME_TextEditor *editor, UINT msg, WPARAM wParam, ME_Style *style = style_get_insert_style( editor, editor->pCursors ); hIMC = ITextHost_TxImmGetContext(editor->texthost); - ME_DeleteSelection(editor); ME_SaveTempStyle(editor, style); if (lParam & (GCS_RESULTSTR|GCS_COMPSTR)) { diff --git a/dlls/winex11.drv/ime.c b/dlls/winex11.drv/ime.c index c1584930861..db2ff5d85cc 100644 --- a/dlls/winex11.drv/ime.c +++ b/dlls/winex11.drv/ime.c @@ -1049,10 +1049,9 @@ void IME_SetResultString(LPWSTR lpResult, DWORD dwResultLen) GenerateIMEMessage(imc, WM_IME_COMPOSITION, 0, GCS_COMPSTR); GenerateIMEMessage(imc, WM_IME_COMPOSITION, lpResult[0], GCS_RESULTSTR|GCS_RESULTCLAUSE); GenerateIMEMessage(imc, WM_IME_ENDCOMPOSITION, 0, 0); + myPrivate->bInComposition = FALSE; - if (!inComp) - ImmSetOpenStatus(imc, FALSE); - + ImmSetOpenStatus(imc, FALSE); ImmUnlockIMC(imc); } diff --git a/dlls/winex11.drv/xim.c b/dlls/winex11.drv/xim.c index 3994c2106cc..5ce6f7e5e95 100644 --- a/dlls/winex11.drv/xim.c +++ b/dlls/winex11.drv/xim.c @@ -117,6 +117,14 @@ void X11DRV_XIMLookupChars( const char *str, DWORD count ) IME_SetResultString(wcOutput, dwOutput); HeapFree(GetProcessHeap(), 0, wcOutput); + + // After then if `CompositionString` is remaining, flushing it. + // i.e., Korean + if (CompositionString) + { + IME_SetCompositionString(SCS_SETSTR, CompositionString, + dwCompStringLength, NULL, 0); + } } static BOOL XIMPreEditStateNotifyCallback(XIC xic, XPointer p, XPointer data) -- 2.32.0

1 0

[PATCH v3 1/3] ntdll: Add NtAccessCheckByTypeAndAuditAlarm stub.
by Mohamad Al-Jaf March 16, 2022

March 16, 2022

Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> --- v2: - Add entries to ntdll/unix/loader and ntdll/ntdll.spec. - Add entry to ntoskrnl.exe/ntoskrnl.exe.spec. - Add function to wow64/security. v3: - Add missing parameter. - Fix formatting. - Fix access_status type. --- dlls/ntdll/ntdll.spec | 4 ++-- dlls/ntdll/unix/loader.c | 1 + dlls/ntdll/unix/security.c | 18 +++++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 1 + dlls/wow64/security.c | 34 +++++++++++++++++++++++++++++ dlls/wow64/syscall.h | 1 + include/winnt.h | 7 ++++++ include/winternl.h | 1 + 8 files changed, 65 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index d514bca5e11..90c0f3fb649 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -131,7 +131,7 @@ @ stdcall -syscall NtAccessCheck(ptr long long ptr ptr ptr ptr ptr) @ stdcall -syscall NtAccessCheckAndAuditAlarm(ptr long ptr ptr ptr long ptr long ptr ptr ptr) # @ stub NtAccessCheckByType -# @ stub NtAccessCheckByTypeAndAuditAlarm +@ stdcall -syscall NtAccessCheckByTypeAndAuditAlarm(ptr long ptr ptr ptr ptr long long long ptr long ptr long ptr ptr ptr) # @ stub NtAccessCheckByTypeResultList # @ stub NtAccessCheckByTypeResultListAndAuditAlarm # @ stub NtAccessCheckByTypeResultListAndAuditAlarmByHandle @@ -1155,7 +1155,7 @@ @ stdcall -private -syscall ZwAccessCheck(ptr long long ptr ptr ptr ptr ptr) NtAccessCheck @ stdcall -private -syscall ZwAccessCheckAndAuditAlarm(ptr long ptr ptr ptr long ptr long ptr ptr ptr) NtAccessCheckAndAuditAlarm # @ stub ZwAccessCheckByType -# @ stub ZwAccessCheckByTypeAndAuditAlarm +@ stdcall -private -syscall ZwAccessCheckByTypeAndAuditAlarm(ptr long ptr ptr ptr ptr long long long ptr long ptr long ptr ptr ptr) NtAccessCheckByTypeAndAuditAlarm # @ stub ZwAccessCheckByTypeResultList # @ stub ZwAccessCheckByTypeResultListAndAuditAlarm # @ stub ZwAccessCheckByTypeResultListAndAuditAlarmByHandle diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 5eb201bd90b..4a0c70d5a2c 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -124,6 +124,7 @@ static void * const syscalls[] = NtAcceptConnectPort, NtAccessCheck, NtAccessCheckAndAuditAlarm, + NtAccessCheckByTypeAndAuditAlarm, NtAddAtom, NtAdjustGroupsToken, NtAdjustPrivilegesToken, diff --git a/dlls/ntdll/unix/security.c b/dlls/ntdll/unix/security.c index 2955355353e..728ee961aa2 100644 --- a/dlls/ntdll/unix/security.c +++ b/dlls/ntdll/unix/security.c @@ -796,6 +796,24 @@ NTSTATUS WINAPI NtAccessCheckAndAuditAlarm( UNICODE_STRING *subsystem, HANDLE ha } +/*********************************************************************** + * NtAccessCheckByTypeAndAuditAlarm (NTDLL.@) + */ +NTSTATUS WINAPI NtAccessCheckByTypeAndAuditAlarm( UNICODE_STRING *subsystem, HANDLE handle, + UNICODE_STRING *type_name, UNICODE_STRING *name, + PSECURITY_DESCRIPTOR descr, PSID sid, ACCESS_MASK access, + AUDIT_EVENT_TYPE type, ULONG flags, POBJECT_TYPE_LIST list, + ULONG length, GENERIC_MAPPING *mapping, BOOLEAN creation, + ACCESS_MASK *access_granted, NTSTATUS *access_status, + BOOLEAN *on_close ) +{ + FIXME( "(%s, %p, %s, %s, %p, %p, 0x%08x, %u, 0x%08x, %p, %u, %p, %d, %p, %p, %p), stub\n", + debugstr_us(subsystem), handle, debugstr_us(type_name), debugstr_us(name), descr, sid, + access, type, flags, list, length, mapping, creation, access_granted, access_status, on_close ); + return STATUS_NOT_IMPLEMENTED; +} + + /*********************************************************************** * NtQuerySecurityObject (NTDLL.@) */ diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index d445c5a5557..19b27adc891 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -1383,6 +1383,7 @@ @ stub WmiUpdateTrace @ stub XIPDispatch @ stdcall -private ZwAccessCheckAndAuditAlarm(ptr long ptr ptr ptr long ptr long ptr ptr ptr) NtAccessCheckAndAuditAlarm +@ stdcall -private ZwAccessCheckByTypeAndAuditAlarm(ptr long ptr ptr ptr ptr long long long ptr long ptr long ptr ptr ptr) NtAccessCheckByTypeAndAuditAlarm @ stub ZwAddBootEntry @ stdcall -private ZwAdjustPrivilegesToken(long long ptr long ptr ptr) NtAdjustPrivilegesToken @ stdcall -private ZwAlertThread(long) NtAlertThread diff --git a/dlls/wow64/security.c b/dlls/wow64/security.c index 680f5a6ec56..2d0ef1cd008 100644 --- a/dlls/wow64/security.c +++ b/dlls/wow64/security.c @@ -98,6 +98,40 @@ NTSTATUS WINAPI wow64_NtAccessCheckAndAuditAlarm( UINT *args ) } +/********************************************************************** + * wow64_NtAccessCheckByTypeAndAuditAlarm + */ +NTSTATUS WINAPI wow64_NtAccessCheckByTypeAndAuditAlarm( UINT *args ) +{ + UNICODE_STRING32 *subsystem32 = get_ptr( &args ); + HANDLE handle = get_handle( &args ); + UNICODE_STRING32 *typename32 = get_ptr( &args ); + UNICODE_STRING32 *objname32 = get_ptr( &args ); + SECURITY_DESCRIPTOR *sd32 = get_ptr( &args ); + SID *sid = get_ptr( &args ); + ACCESS_MASK access = get_ulong( &args ); + AUDIT_EVENT_TYPE type = get_ulong( &args ); + ULONG flags = get_ulong( &args ); + OBJECT_TYPE_LIST *list = get_ptr( &args ); + ULONG length = get_ulong( &args ); + GENERIC_MAPPING *mapping = get_ptr( &args ); + BOOLEAN creation = get_ulong( &args ); + ACCESS_MASK *access_granted = get_ptr( &args ); + NTSTATUS *access_status = get_ptr( &args ); + BOOLEAN *onclose = get_ptr( &args ); + + UNICODE_STRING subsystem, typename, objname; + SECURITY_DESCRIPTOR sd; + + return NtAccessCheckByTypeAndAuditAlarm( unicode_str_32to64( &subsystem, subsystem32 ), handle, + unicode_str_32to64( &typename, typename32 ), + unicode_str_32to64( &objname, objname32 ), + secdesc_32to64( &sd, sd32 ), sid, access, type, flags, + list, length, mapping, creation, access_granted, + access_status, onclose ); +} + + /********************************************************************** * wow64_NtAdjustGroupsToken */ diff --git a/dlls/wow64/syscall.h b/dlls/wow64/syscall.h index 0c2ba574031..17ebde65826 100644 --- a/dlls/wow64/syscall.h +++ b/dlls/wow64/syscall.h @@ -25,6 +25,7 @@ SYSCALL_ENTRY( NtAcceptConnectPort ) \ SYSCALL_ENTRY( NtAccessCheck ) \ SYSCALL_ENTRY( NtAccessCheckAndAuditAlarm ) \ + SYSCALL_ENTRY( NtAccessCheckByTypeAndAuditAlarm ) \ SYSCALL_ENTRY( NtAddAtom ) \ SYSCALL_ENTRY( NtAdjustGroupsToken ) \ SYSCALL_ENTRY( NtAdjustPrivilegesToken ) \ diff --git a/include/winnt.h b/include/winnt.h index 079858d2f7d..939c2f8d7dd 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -3633,6 +3633,13 @@ typedef PVOID PACCESS_TOKEN; typedef PVOID PSECURITY_DESCRIPTOR; typedef PVOID PSID; +typedef enum _AUDIT_EVENT_TYPE { + AuditEventObjectAccess, + AuditEventDirectoryServiceAccess +} AUDIT_EVENT_TYPE, *PAUDIT_EVENT_TYPE; + +#define AUDIT_ALLOW_NO_PRIVILEGE 0x1 + typedef enum _TOKEN_ELEVATION_TYPE { TokenElevationTypeDefault = 1, TokenElevationTypeFull, diff --git a/include/winternl.h b/include/winternl.h index 6a95c4e0fdc..8e236f9d97d 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -3912,6 +3912,7 @@ NTSYSAPI NTSTATUS WINAPI LdrUnregisterDllNotification(void*); NTSYSAPI NTSTATUS WINAPI NtAcceptConnectPort(PHANDLE,ULONG,PLPC_MESSAGE,BOOLEAN,PLPC_SECTION_WRITE,PLPC_SECTION_READ); NTSYSAPI NTSTATUS WINAPI NtAccessCheck(PSECURITY_DESCRIPTOR,HANDLE,ACCESS_MASK,PGENERIC_MAPPING,PPRIVILEGE_SET,PULONG,PULONG,NTSTATUS*); NTSYSAPI NTSTATUS WINAPI NtAccessCheckAndAuditAlarm(PUNICODE_STRING,HANDLE,PUNICODE_STRING,PUNICODE_STRING,PSECURITY_DESCRIPTOR,ACCESS_MASK,PGENERIC_MAPPING,BOOLEAN,PACCESS_MASK,PBOOLEAN,PBOOLEAN); +NTSYSAPI NTSTATUS WINAPI NtAccessCheckByTypeAndAuditAlarm(PUNICODE_STRING,HANDLE,PUNICODE_STRING,PUNICODE_STRING,PSECURITY_DESCRIPTOR,PSID,ACCESS_MASK,AUDIT_EVENT_TYPE,ULONG,POBJECT_TYPE_LIST,ULONG,PGENERIC_MAPPING,BOOLEAN,PACCESS_MASK,NTSTATUS*,PBOOLEAN); NTSYSAPI NTSTATUS WINAPI NtAddAtom(const WCHAR*,ULONG,RTL_ATOM*); NTSYSAPI NTSTATUS WINAPI NtAdjustGroupsToken(HANDLE,BOOLEAN,PTOKEN_GROUPS,ULONG,PTOKEN_GROUPS,PULONG); NTSYSAPI NTSTATUS WINAPI NtAdjustPrivilegesToken(HANDLE,BOOLEAN,PTOKEN_PRIVILEGES,DWORD,PTOKEN_PRIVILEGES,PDWORD); -- 2.35.1

1 3

[PATCH] winevulkan: Update to VK spec version 1.3.208.
by Georg Lehmann March 15, 2022

March 15, 2022

Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> --- dlls/winevulkan/make_vulkan | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 8838200403e..2a3129bacfe 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -64,7 +64,7 @@ from enum import Enum LOGGER = logging.Logger("vulkan") LOGGER.addHandler(logging.StreamHandler()) -VK_XML_VERSION = "1.3.207" +VK_XML_VERSION = "1.3.208" WINE_VK_VERSION = (1, 3) # Filenames to create. -- 2.35.1

1 0

[PATCH] wined3d: Pass mask to wined3d_next_cs_packet().
by Jan Sikorski March 15, 2022

March 15, 2022

It's not just used on the CS queue, but also on packet lists in deferred contexts. Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> --- dlls/wined3d/cs.c | 24 ++++++++++++------------ dlls/wined3d/wined3d_private.h | 2 +- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index d0ca29eaedf..9edb002ec9e 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -622,9 +622,9 @@ static const char *debug_cs_op(enum wined3d_cs_op op) return wine_dbg_sprintf("UNKNOWN_OP(%#x)", op); } -static struct wined3d_cs_packet *wined3d_next_cs_packet(const uint8_t *data, SIZE_T *offset) +static struct wined3d_cs_packet *wined3d_next_cs_packet(const uint8_t *data, SIZE_T *offset, SIZE_T mask) { - struct wined3d_cs_packet *packet = (struct wined3d_cs_packet *)&data[WINED3D_CS_QUEUE_MASK(*offset)]; + struct wined3d_cs_packet *packet = (struct wined3d_cs_packet *)&data[*offset & mask]; *offset += offsetof(struct wined3d_cs_packet, data[packet->size]); @@ -2882,7 +2882,7 @@ static void wined3d_cs_exec_execute_command_list(struct wined3d_cs *cs, const vo while (start < end) { - const struct wined3d_cs_packet *packet = wined3d_next_cs_packet(cs_data, &start); + const struct wined3d_cs_packet *packet = wined3d_next_cs_packet(cs_data, &start, WINED3D_CS_QUEUE_MASK); enum wined3d_cs_op opcode = *(const enum wined3d_cs_op *)packet->data; if (opcode >= WINED3D_CS_OP_STOP) @@ -3139,7 +3139,7 @@ static void wined3d_cs_queue_submit(struct wined3d_cs_queue *queue, struct wined struct wined3d_cs_packet *packet; size_t packet_size; - packet = (struct wined3d_cs_packet *)&queue->data[WINED3D_CS_QUEUE_MASK(queue->head)]; + packet = (struct wined3d_cs_packet *)&queue->data[queue->head & WINED3D_CS_QUEUE_MASK]; TRACE("Queuing op %s at %p.\n", debug_cs_op(*(const enum wined3d_cs_op *)packet->data), packet); packet_size = FIELD_OFFSET(struct wined3d_cs_packet, data[packet->size]); InterlockedExchange((LONG *)&queue->head, queue->head + packet_size); @@ -3163,7 +3163,7 @@ static void *wined3d_cs_queue_require_space(struct wined3d_cs_queue *queue, size size_t queue_size = ARRAY_SIZE(queue->data); size_t header_size, packet_size, remaining; struct wined3d_cs_packet *packet; - ULONG head = WINED3D_CS_QUEUE_MASK(queue->head); + ULONG head = queue->head & WINED3D_CS_QUEUE_MASK; header_size = FIELD_OFFSET(struct wined3d_cs_packet, data[0]); packet_size = FIELD_OFFSET(struct wined3d_cs_packet, data[size]); @@ -3190,19 +3190,19 @@ static void *wined3d_cs_queue_require_space(struct wined3d_cs_queue *queue, size nop->opcode = WINED3D_CS_OP_NOP; wined3d_cs_queue_submit(queue, cs); - head = WINED3D_CS_QUEUE_MASK(queue->head); + head = queue->head & WINED3D_CS_QUEUE_MASK; assert(!head); } for (;;) { - ULONG tail = WINED3D_CS_QUEUE_MASK(*(volatile ULONG *)&queue->tail); + ULONG tail = (*(volatile ULONG *)&queue->tail) & WINED3D_CS_QUEUE_MASK; ULONG new_pos; /* Empty. */ if (head == tail) break; - new_pos = WINED3D_CS_QUEUE_MASK(head + packet_size); + new_pos = (head + packet_size) & WINED3D_CS_QUEUE_MASK; /* Head ahead of tail. We checked the remaining size above, so we only * need to make sure we don't make head equal to tail. */ if (head > tail && (new_pos != tail)) @@ -3346,7 +3346,7 @@ static DWORD WINAPI wined3d_cs_run(void *ctx) spin_count = 0; tail = queue->tail; - packet = wined3d_next_cs_packet(queue->data, &tail); + packet = wined3d_next_cs_packet(queue->data, &tail, WINED3D_CS_QUEUE_MASK); if (packet->size) { opcode = *(const enum wined3d_cs_op *)packet->data; @@ -3998,7 +3998,7 @@ static void wined3d_deferred_context_submit(struct wined3d_device_context *conte struct wined3d_cs_packet *packet; assert(queue_id == WINED3D_CS_QUEUE_DEFAULT); - packet = wined3d_next_cs_packet(deferred->data, &deferred->data_size); + packet = wined3d_next_cs_packet(deferred->data, &deferred->data_size, ~(SIZE_T)0); wined3d_cs_packet_incref_objects(packet); } @@ -4241,7 +4241,7 @@ void CDECL wined3d_deferred_context_destroy(struct wined3d_device_context *conte while (offset < deferred->data_size) { - packet = wined3d_next_cs_packet(deferred->data, &offset); + packet = wined3d_next_cs_packet(deferred->data, &offset, ~(SIZE_T)0); wined3d_cs_packet_decref_objects(packet); } @@ -4372,7 +4372,7 @@ ULONG CDECL wined3d_command_list_decref(struct wined3d_command_list *list) offset = 0; while (offset < list->data_size) { - packet = wined3d_next_cs_packet(list->data, &offset); + packet = wined3d_next_cs_packet(list->data, &offset, ~(SIZE_T)0); wined3d_cs_packet_decref_objects(packet); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 577377f8dd4..5b3eb0136b0 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4894,7 +4894,7 @@ enum wined3d_push_constants #define WINED3D_CS_QUERY_POLL_INTERVAL 10u #define WINED3D_CS_QUEUE_SIZE 0x100000u #define WINED3D_CS_SPIN_COUNT 10000000u -#define WINED3D_CS_QUEUE_MASK(a) ((a) & (WINED3D_CS_QUEUE_SIZE - 1)) +#define WINED3D_CS_QUEUE_MASK (WINED3D_CS_QUEUE_SIZE - 1) struct wined3d_cs_queue { -- 2.32.0

2 1

[PATCH 2/2] kernelbase: Check for invalid value in FileTimeToSystemTime.
by Daniel Lehman March 15, 2022

March 15, 2022

1 0

[PATCH 1/2] kernel32/tests: Add test for FileTimeToSystemTime.
by Daniel Lehman March 15, 2022

March 15, 2022

1 0

[PATCH] windowscodecs: Fix rounding in premultiplied alpha conversion.
by Jinoh Kang March 15, 2022

March 15, 2022

Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> --- dlls/windowscodecs/converter.c | 12 ++++----- dlls/windowscodecs/tests/converter.c | 38 +++++++++++++++++++++++----- 2 files changed, 37 insertions(+), 13 deletions(-) diff --git a/dlls/windowscodecs/converter.c b/dlls/windowscodecs/converter.c index 8abba2dec52..e93606e938d 100644 --- a/dlls/windowscodecs/converter.c +++ b/dlls/windowscodecs/converter.c @@ -984,9 +984,9 @@ static HRESULT copypixels_to_32bppPBGRA(struct FormatConverter *This, const WICR BYTE alpha = pbBuffer[cbStride*y+4*x+3]; if (alpha != 255) { - pbBuffer[cbStride*y+4*x] = pbBuffer[cbStride*y+4*x] * alpha / 255; - pbBuffer[cbStride*y+4*x+1] = pbBuffer[cbStride*y+4*x+1] * alpha / 255; - pbBuffer[cbStride*y+4*x+2] = pbBuffer[cbStride*y+4*x+2] * alpha / 255; + pbBuffer[cbStride*y+4*x] = (pbBuffer[cbStride*y+4*x] * alpha + 127) / 255; + pbBuffer[cbStride*y+4*x+1] = (pbBuffer[cbStride*y+4*x+1] * alpha + 127) / 255; + pbBuffer[cbStride*y+4*x+2] = (pbBuffer[cbStride*y+4*x+2] * alpha + 127) / 255; } } } @@ -1017,9 +1017,9 @@ static HRESULT copypixels_to_32bppPRGBA(struct FormatConverter *This, const WICR BYTE alpha = pbBuffer[cbStride*y+4*x+3]; if (alpha != 255) { - pbBuffer[cbStride*y+4*x] = pbBuffer[cbStride*y+4*x] * alpha / 255; - pbBuffer[cbStride*y+4*x+1] = pbBuffer[cbStride*y+4*x+1] * alpha / 255; - pbBuffer[cbStride*y+4*x+2] = pbBuffer[cbStride*y+4*x+2] * alpha / 255; + pbBuffer[cbStride*y+4*x] = (pbBuffer[cbStride*y+4*x] * alpha + 127) / 255; + pbBuffer[cbStride*y+4*x+1] = (pbBuffer[cbStride*y+4*x+1] * alpha + 127) / 255; + pbBuffer[cbStride*y+4*x+2] = (pbBuffer[cbStride*y+4*x+2] * alpha + 127) / 255; } } } diff --git a/dlls/windowscodecs/tests/converter.c b/dlls/windowscodecs/tests/converter.c index 9159141d6e5..2e77db6b205 100644 --- a/dlls/windowscodecs/tests/converter.c +++ b/dlls/windowscodecs/tests/converter.c @@ -453,13 +453,21 @@ static const BYTE bits_32bppBGR[] = { 0,255,255,80, 255,0,255,80, 255,255,0,80, 255,255,255,80, 0,255,255,80, 255,0,255,80, 255,255,0,80, 255,255,255,80, 0,255,255,80, 255,0,255,80, 255,255,0,80, 255,255,255,80, 0,255,255,80, 255,0,255,80, 255,255,0,80, 255,255,255,80, 0,255,255,80, 255,0,255,80, 255,255,0,80, 255,255,255,80, 0,255,255,80, 255,0,255,80, 255,255,0,80, 255,255,255,80, - 0,255,255,80, 255,0,255,80, 255,255,0,80, 255,255,255,80, 0,255,255,80, 255,0,255,80, 255,255,0,80, 255,255,255,80}; + 0,255,255,80, 255,0,255,80, 255,255,0,80, 255,255,255,80, 0,255,255,80, 255,0,255,80, 255,255,0,80, 255,255,255,80, + 3,3,3,80, 6,6,6,80, 12,12,12,80, 15,15,15,80, 19,19,19,80, 22,22,22,80, 28,28,28,80, 31,31,31,80, + 35,35,35,80, 38,38,38,80, 41,41,41,80, 47,47,47,80, 47,47,47,80, 54,54,54,80, 57,57,57,80, 63,63,63,80, + 66,66,66,80, 70,70,70,80, 73,73,73,80, 79,79,79,80, 82,82,82,80, 86,86,86,80, 89,89,89,80, 95,95,95,80, + 98,98,98,80, 98,98,98,80, 105,105,105,80, 108,108,108,80, 114,114,114,80, 117,117,117,80, 121,121,121,80, 124,124,124,80, + 130,130,130,80, 133,133,133,80, 137,137,137,80, 140,140,140,80, 146,146,146,80, 149,149,149,80, 156,156,156,80, 156,156,156,80, + 159,159,159,80, 165,165,165,80, 168,168,168,80, 172,172,172,80, 175,175,175,80, 181,181,181,80, 184,184,184,80, 188,188,188,80, + 191,191,191,80, 197,197,197,80, 200,200,200,80, 207,207,207,80, 207,207,207,80, 213,213,213,80, 216,216,216,80, 219,219,219,80, + 223,223,223,80, 226,226,226,80, 232,232,232,80, 235,235,235,80, 239,239,239,80, 242,242,242,80, 248,248,248,80, 251,251,251,80}; static const struct bitmap_data testdata_32bppBGR = { &GUID_WICPixelFormat32bppBGR, 32, bits_32bppBGR, 32, 2, 96.0, 96.0}; static const struct bitmap_data testdata_32bppBGRA80 = { - &GUID_WICPixelFormat32bppBGRA, 32, bits_32bppBGR, 32, 2, 96.0, 96.0}; + &GUID_WICPixelFormat32bppBGRA, 32, bits_32bppBGR, 32, 4, 96.0, 96.0}; static const struct bitmap_data testdata_32bppRGBA80 = { - &GUID_WICPixelFormat32bppRGBA, 32, bits_32bppBGR, 32, 2, 96.0, 96.0}; + &GUID_WICPixelFormat32bppRGBA, 32, bits_32bppBGR, 32, 4, 96.0, 96.0}; static const BYTE bits_32bppBGRA[] = { 255,0,0,255, 0,255,0,255, 0,0,255,255, 0,0,0,255, 255,0,0,255, 0,255,0,255, 0,0,255,255, 0,0,0,255, @@ -469,7 +477,15 @@ static const BYTE bits_32bppBGRA[] = { 0,255,255,255, 255,0,255,255, 255,255,0,255, 255,255,255,255, 0,255,255,255, 255,0,255,255, 255,255,0,255, 255,255,255,255, 0,255,255,255, 255,0,255,255, 255,255,0,255, 255,255,255,255, 0,255,255,255, 255,0,255,255, 255,255,0,255, 255,255,255,255, 0,255,255,255, 255,0,255,255, 255,255,0,255, 255,255,255,255, 0,255,255,255, 255,0,255,255, 255,255,0,255, 255,255,255,255, - 0,255,255,255, 255,0,255,255, 255,255,0,255, 255,255,255,255, 0,255,255,255, 255,0,255,255, 255,255,0,255, 255,255,255,255}; + 0,255,255,255, 255,0,255,255, 255,255,0,255, 255,255,255,255, 0,255,255,255, 255,0,255,255, 255,255,0,255, 255,255,255,255, + 3,3,3,255, 6,6,6,255, 12,12,12,255, 15,15,15,255, 19,19,19,255, 22,22,22,255, 28,28,28,255, 31,31,31,80, + 35,35,35,255, 38,38,38,255, 41,41,41,255, 47,47,47,255, 47,47,47,255, 54,54,54,255, 57,57,57,255, 63,63,63,80, + 66,66,66,255, 70,70,70,255, 73,73,73,255, 79,79,79,255, 82,82,82,255, 86,86,86,255, 89,89,89,255, 95,95,95,80, + 98,98,98,255, 98,98,98,255, 105,105,105,255, 108,108,108,255, 114,114,114,255, 117,117,117,255, 121,121,121,255, 124,124,124,80, + 130,130,130,255, 133,133,133,255, 137,137,137,255, 140,140,140,255, 146,146,146,255, 149,149,149,255, 156,156,156,255, 156,156,156,80, + 159,159,159,255, 165,165,165,255, 168,168,168,255, 172,172,172,255, 175,175,175,255, 181,181,181,255, 184,184,184,255, 188,188,188,80, + 191,191,191,255, 197,197,197,255, 200,200,200,255, 207,207,207,255, 207,207,207,255, 213,213,213,255, 216,216,216,255, 219,219,219,80, + 223,223,223,255, 226,226,226,255, 232,232,232,255, 235,235,235,255, 239,239,239,255, 242,242,242,255, 248,248,248,255, 251,251,251,80}; static const BYTE bits_32bppRGBA[] = { 0,0,255,255, 0,255,0,255, 255,0,0,255, 0,0,0,255, 0,0,255,255, 0,255,0,255, 255,0,0,255, 0,0,0,255, 0,0,255,255, 0,255,0,255, 255,0,0,255, 0,0,0,255, 0,0,255,255, 0,255,0,255, 255,0,0,255, 0,0,0,255, @@ -495,11 +511,19 @@ static const BYTE bits_32bppPBGRA[] = { 0,80,80,80, 80,0,80,80, 80,80,0,80, 80,80,80,80, 0,80,80,80, 80,0,80,80, 80,80,0,80, 80,80,80,80, 0,80,80,80, 80,0,80,80, 80,80,0,80, 80,80,80,80, 0,80,80,80, 80,0,80,80, 80,80,0,80, 80,80,80,80, 0,80,80,80, 80,0,80,80, 80,80,0,80, 80,80,80,80, 0,80,80,80, 80,0,80,80, 80,80,0,80, 80,80,80,80, - 0,80,80,80, 80,0,80,80, 80,80,0,80, 80,80,80,80, 0,80,80,80, 80,0,80,80, 80,80,0,80, 80,80,80,80}; + 0,80,80,80, 80,0,80,80, 80,80,0,80, 80,80,80,80, 0,80,80,80, 80,0,80,80, 80,80,0,80, 80,80,80,80, + 1,1,1,80, 2,2,2,80, 4,4,4,80, 5,5,5,80, 6,6,6,80, 7,7,7,80, 9,9,9,80, 10,10,10,80, + 11,11,11,80, 12,12,12,80, 13,13,13,80, 15,15,15,80, 15,15,15,80, 17,17,17,80, 18,18,18,80, 20,20,20,80, + 21,21,21,80, 22,22,22,80, 23,23,23,80, 25,25,25,80, 26,26,26,80, 27,27,27,80, 28,28,28,80, 30,30,30,80, + 31,31,31,80, 31,31,31,80, 33,33,33,80, 34,34,34,80, 36,36,36,80, 37,37,37,80, 38,38,38,80, 39,39,39,80, + 41,41,41,80, 42,42,42,80, 43,43,43,80, 44,44,44,80, 46,46,46,80, 47,47,47,80, 49,49,49,80, 49,49,49,80, + 50,50,50,80, 52,52,52,80, 53,53,53,80, 54,54,54,80, 55,55,55,80, 57,57,57,80, 58,58,58,80, 59,59,59,80, + 60,60,60,80, 62,62,62,80, 63,63,63,80, 65,65,65,80, 65,65,65,80, 67,67,67,80, 68,68,68,80, 69,69,69,80, + 70,70,70,80, 71,71,71,80, 73,73,73,80, 74,74,74,80, 75,75,75,80, 76,76,76,80, 78,78,78,80, 79,79,79,80}; static const struct bitmap_data testdata_32bppPBGRA = { - &GUID_WICPixelFormat32bppPBGRA, 32, bits_32bppPBGRA, 32, 2, 96.0, 96.0}; + &GUID_WICPixelFormat32bppPBGRA, 32, bits_32bppPBGRA, 32, 4, 96.0, 96.0}; static const struct bitmap_data testdata_32bppPRGBA = { - &GUID_WICPixelFormat32bppPRGBA, 32, bits_32bppPBGRA, 32, 2, 96.0, 96.0}; + &GUID_WICPixelFormat32bppPRGBA, 32, bits_32bppPBGRA, 32, 4, 96.0, 96.0}; static const BYTE bits_64bppRGBA[] = { 128,0,128,0,128,255,128,255, 128,0,128,255,128,0,128,255, 128,255,128,0,128,0,128,255, 128,0,128,0,128,0,128,255, 128,0,128,0,128,255,128,255, 128,0,128,255,128,0,128,255, 128,255,128,0,128,0,128,255, 128,0,128,0,128,0,128,255, -- 2.34.1

2 1

[PATCH 7/7 v2] win32u: Make interface between DC and dce private.
by Jacek Caban March 15, 2022

March 15, 2022

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- v2: Fixed a comment. dlls/win32u/dc.c | 56 ++++++----------------- dlls/win32u/dce.c | 91 ++++++++++++++++++------------------- dlls/win32u/ntgdi_private.h | 20 ++++++-- dlls/win32u/sysparams.c | 2 +- include/wine/gdi_driver.h | 17 ------- 5 files changed, 76 insertions(+), 110 deletions(-)

2 1

[PATCH 6/7] win32u: Introduce NtUserEnableDC.
by Jacek Caban March 15, 2022

March 15, 2022

And use it instead of SetHookFlags in user.exe. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user.exe16/user_private.h | 3 +-- dlls/user.exe16/window.c | 3 +-- dlls/win32u/gdiobj.c | 1 - dlls/win32u/sysparams.c | 2 ++ dlls/win32u/win32u.spec | 1 - dlls/win32u/win32u_private.h | 1 - dlls/win32u/wrappers.c | 6 ------ include/ntuser.h | 1 + 8 files changed, 5 insertions(+), 13 deletions(-)

2 1