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

Alexandre Julliard : secur32/tests: Update for new WineHQ certificate.
by Alexandre Julliard 05 Jun '20

05 Jun '20

Module: wine Branch: master Commit: 16254af818095216e10aee4d9032a8def3ac3344 URL: https://source.winehq.org/git/wine.git/?a=commit;h=16254af818095216e10aee4d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 5 19:23:31 2020 +0200 secur32/tests: Update for new WineHQ certificate. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/tests/schannel.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/secur32/tests/schannel.c b/dlls/secur32/tests/schannel.c index d51583d665..30022437bc 100644 --- a/dlls/secur32/tests/schannel.c +++ b/dlls/secur32/tests/schannel.c @@ -564,7 +564,7 @@ static void test_remote_cert(PCCERT_CONTEXT remote_cert) cert_cnt++; } - ok(cert_cnt == 4, "cert_cnt = %u\n", cert_cnt); + ok(cert_cnt == 2, "cert_cnt = %u\n", cert_cnt); ok(incl_remote, "context does not contain cert itself\n"); }

1 0

Alexandre Julliard : wininet/tests: Update for new WineHQ certificate.
by Alexandre Julliard 05 Jun '20

05 Jun '20

Module: wine Branch: master Commit: ccd6b205fa99360e7437f1c5bc63e0075f8e6760 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ccd6b205fa99360e7437f1c5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 5 19:23:42 2020 +0200 wininet/tests: Update for new WineHQ certificate. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/tests/http.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index e0ea78cfb4..c07d60d2a9 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -6079,13 +6079,12 @@ typedef struct { static const cert_struct_test_t test_winehq_org_cert = { "US\r\n" "55114\r\n" - "MN\r\n" + "Minnesota\r\n" "Saint Paul\r\n" "Ste 120\r\n" "700 Raymond Ave\r\n" "CodeWeavers\r\n" "IT\r\n" - "Secure Link SSL Wildcard\r\n" "*.winehq.org", "US\r\n"

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 05 Jun '20

05 Jun '20

Module: wine Branch: master Commit: f4efea22337f1099097471b48c002f6ed5290f83 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f4efea22337f1099097471b4… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Fri Jun 5 00:19:11 2020 +0300 po: Update Lithuanian translation. Signed-off-by: Aurimas Fišeras <aurimas(a)members.fsf.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/lt.po | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/po/lt.po b/po/lt.po index c61d89b1d1..5d4a4eadeb 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2020-06-04 01:06+0300\n" +"PO-Revision-Date: 2020-06-05 00:17+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -3632,10 +3632,8 @@ msgid "Subscript out of range" msgstr "Indeksas nepatenka į rėžius" #: jscript.rc:31 -#, fuzzy -#| msgid "Out of paper; " msgid "Out of stack space" -msgstr "Pasibaigęs popierius; " +msgstr "Trūksta vietos dėkle" #: jscript.rc:32 msgid "Object required"

1 0

Alexandre Julliard : ntdll: Move the rest of the thread creation code to the Unix library.
by Alexandre Julliard 05 Jun '20

05 Jun '20

Module: wine Branch: master Commit: ca3ca7b046ae94a152b1367ca982774345887e55 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ca3ca7b046ae94a152b1367c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 5 14:09:19 2020 +0200 ntdll: Move the rest of the thread creation code to the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/thread.c | 92 ++++++------------------------------------ dlls/ntdll/unix/loader.c | 1 - dlls/ntdll/unix/server.c | 2 +- dlls/ntdll/unix/sync.c | 4 +- dlls/ntdll/unix/thread.c | 91 ++++++++++++++++++++++++++++++++++++----- dlls/ntdll/unix/unix_private.h | 11 +++-- dlls/ntdll/unixlib.h | 10 ++--- 7 files changed, 109 insertions(+), 102 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ca3ca7b046ae94a152b1…

1 0

Alexandre Julliard : ntdll: Implement RtlCreateUserThread() on top of NtCreateThreadEx().
by Alexandre Julliard 05 Jun '20

05 Jun '20

Module: wine Branch: master Commit: 39e7f25e0918d23e5b9ef5fc5049948b6f56525e URL: https://source.winehq.org/git/wine.git/?a=commit;h=39e7f25e0918d23e5b9ef5fc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 5 15:09:27 2020 +0200 ntdll: Implement RtlCreateUserThread() on top of NtCreateThreadEx(). Based on a patch by Andrew Wesie. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/thread.c | 43 ++++++++++++++++++++++++++++++++----------- include/winternl.h | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 81 insertions(+), 11 deletions(-) diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 91a6a90d26..f2fa9a8b75 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -326,16 +326,33 @@ static void WINAPI call_thread_entry_point( LPTHREAD_START_ROUTINE entry, void * * NtCreateThreadEx (NTDLL.@) */ NTSTATUS WINAPI NtCreateThreadEx( HANDLE *handle_ptr, ACCESS_MASK access, OBJECT_ATTRIBUTES *attr, - HANDLE process, LPTHREAD_START_ROUTINE start, void *param, - ULONG flags, ULONG zero_bits, ULONG stack_commit, - ULONG stack_reserve, void *attribute_list ) + HANDLE process, PRTL_THREAD_START_ROUTINE start, void *param, + ULONG flags, SIZE_T zero_bits, SIZE_T stack_commit, + SIZE_T stack_reserve, PS_ATTRIBUTE_LIST *attr_list ) { - FIXME( "%p, %x, %p, %p, %p, %p, %x, %x, %x, %x, %p semi-stub!\n", handle_ptr, access, attr, - process, start, param, flags, zero_bits, stack_commit, stack_reserve, attribute_list ); + NTSTATUS status; + CLIENT_ID client_id; - return RtlCreateUserThread( process, NULL, flags & THREAD_CREATE_FLAGS_CREATE_SUSPENDED, - NULL, stack_reserve, stack_commit, (PRTL_THREAD_START_ROUTINE)start, - param, handle_ptr, NULL ); + if (!access) access = THREAD_ALL_ACCESS; + + status = unix_funcs->create_thread( handle_ptr, access, attr, process, + start, param, call_thread_entry_point, flags, + stack_commit, stack_reserve, &client_id ); + if (!status && attr_list) + { + SIZE_T i, count = (attr_list->TotalLength - sizeof(attr_list->TotalLength)) / sizeof(PS_ATTRIBUTE); + for (i = 0; i < count; i++) + { + if (attr_list->Attributes[i].Attribute == PS_ATTRIBUTE_CLIENT_ID) + { + SIZE_T size = min( attr_list->Attributes[i].Size, sizeof(client_id) ); + memcpy( attr_list->Attributes[i].ValuePtr, &client_id, size ); + if (attr_list->Attributes[i].ReturnLength) *attr_list->Attributes[i].ReturnLength = size; + } + else FIXME( "Unsupported attribute %08lx\n", attr_list->Attributes[i].Attribute ); + } + } + return status; } @@ -353,12 +370,16 @@ NTSTATUS WINAPI RtlCreateUserThread( HANDLE process, SECURITY_DESCRIPTOR *descr, NTSTATUS status; CLIENT_ID client_id; OBJECT_ATTRIBUTES attr; + PS_ATTRIBUTE_LIST attr_list = { sizeof(attr_list) }; + + attr_list.Attributes[0].Attribute = PS_ATTRIBUTE_CLIENT_ID; + attr_list.Attributes[0].Size = sizeof(client_id); + attr_list.Attributes[0].ValuePtr = &client_id; InitializeObjectAttributes( &attr, NULL, 0, NULL, descr ); - status = unix_funcs->create_thread( &handle, THREAD_ALL_ACCESS, &attr, process, - start, param, call_thread_entry_point, flags, - stack_commit, stack_reserve, &client_id ); + status = NtCreateThreadEx( &handle, THREAD_ALL_ACCESS, &attr, process, start, param, + flags, 0, stack_commit, stack_reserve, &attr_list ); if (!status) { if (id) *id = client_id; diff --git a/include/winternl.h b/include/winternl.h index f362790dbc..2342835911 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2453,6 +2453,55 @@ typedef LONG (CALLBACK *PRTL_EXCEPTION_FILTER)(PEXCEPTION_POINTERS); typedef void (CALLBACK *PTP_IO_CALLBACK)(PTP_CALLBACK_INSTANCE,void*,void*,IO_STATUS_BLOCK*,PTP_IO); +#define PS_ATTRIBUTE_THREAD 0x00010000 +#define PS_ATTRIBUTE_INPUT 0x00020000 +#define PS_ATTRIBUTE_UNKNOWN 0x00040000 + +typedef enum _PS_ATTRIBUTE_NUM +{ + PsAttributeParentProcess, + PsAttributeDebugPort, + PsAttributeToken, + PsAttributeClientId, + PsAttributeTebAddress, + PsAttributeImageName, + PsAttributeImageInfo, + PsAttributeMemoryReserve, + PsAttributePriorityClass, + PsAttributeErrorMode, + PsAttributeStdHandleInfo, + PsAttributeHandleList, + PsAttributeGroupAffinity, + PsAttributePreferredNode, + PsAttributeIdealProcessor, + PsAttributeUmsThread, + PsAttributeMitigationOptions, + PsAttributeProtectionLevel, + PsAttributeSecureProcess, + PsAttributeJobList, + PsAttributeMax +} PS_ATTRIBUTE_NUM; + +#define PS_ATTRIBUTE_CLIENT_ID (PsAttributeClientId | PS_ATTRIBUTE_THREAD) + +typedef struct _PS_ATTRIBUTE +{ + ULONG_PTR Attribute; + SIZE_T Size; + union + { + ULONG_PTR Value; + void *ValuePtr; + }; + SIZE_T *ReturnLength; +} PS_ATTRIBUTE; + +typedef struct _PS_ATTRIBUTE_LIST +{ + SIZE_T TotalLength; + PS_ATTRIBUTE Attributes[1]; +} PS_ATTRIBUTE_LIST, *PPS_ATTRIBUTE_LIST; + /*********************************************************************** * Function declarations */

1 0

Alexandre Julliard : ntdll: Use NtCreateThreadEx() for remote thread creation.
by Alexandre Julliard 05 Jun '20

05 Jun '20

Module: wine Branch: master Commit: 33c750f50ff8b6f1eae63140e8287c49a5130a60 URL: https://source.winehq.org/git/wine.git/?a=commit;h=33c750f50ff8b6f1eae63140… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 5 15:23:37 2020 +0200 ntdll: Use NtCreateThreadEx() for remote thread creation. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/server.c | 22 +++++++++++++++++----- dlls/ntdll/unix/thread.c | 8 ++++++-- include/wine/server_protocol.h | 5 +++-- include/winternl.h | 1 + server/protocol.def | 3 ++- server/trace.c | 6 +++--- 6 files changed, 32 insertions(+), 13 deletions(-) diff --git a/dlls/ntdll/unix/server.c b/dlls/ntdll/unix/server.c index 4b38a73039..a7592f5e15 100644 --- a/dlls/ntdll/unix/server.c +++ b/dlls/ntdll/unix/server.c @@ -555,6 +555,7 @@ static void invoke_system_apc( const apc_call_t *call, apc_result_t *result ) break; case APC_CREATE_THREAD: { + PS_ATTRIBUTE_LIST attr = { sizeof(attr) }; CLIENT_ID id; HANDLE handle; SIZE_T reserve = call->create_thread.reserve; @@ -566,20 +567,31 @@ static void invoke_system_apc( const apc_call_t *call, apc_result_t *result ) if (reserve == call->create_thread.reserve && commit == call->create_thread.commit && (ULONG_PTR)func == call->create_thread.func && (ULONG_PTR)arg == call->create_thread.arg) { - result->create_thread.status = RtlCreateUserThread( NtCurrentProcess(), NULL, - call->create_thread.suspend, NULL, - reserve, commit, func, arg, &handle, &id ); + attr.Attributes[0].Attribute = PS_ATTRIBUTE_CLIENT_ID; + attr.Attributes[0].Size = sizeof(id); + attr.Attributes[0].ValuePtr = &id; + result->create_thread.status = NtCreateThreadEx( &handle, THREAD_ALL_ACCESS, NULL, + NtCurrentProcess(), func, arg, + call->create_thread.flags, 0, + commit, reserve, &attr ); result->create_thread.handle = wine_server_obj_handle( handle ); + result->create_thread.pid = HandleToULong(id.UniqueProcess); result->create_thread.tid = HandleToULong(id.UniqueThread); } else result->create_thread.status = STATUS_INVALID_PARAMETER; break; } case APC_BREAK_PROCESS: + { + HANDLE handle; + result->type = APC_BREAK_PROCESS; - result->break_process.status = RtlCreateUserThread( NtCurrentProcess(), NULL, FALSE, NULL, 0, 0, - DbgUiRemoteBreakin, NULL, NULL, NULL ); + result->break_process.status = NtCreateThreadEx( &handle, THREAD_ALL_ACCESS, NULL, + NtCurrentProcess(), DbgUiRemoteBreakin, NULL, + 0, 0, 0, 0, NULL ); + if (!result->break_process.status) NtClose( handle ); break; + } default: server_protocol_error( "get_apc_request: bad type %d\n", call->type ); break; diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c index 602e0930ab..ec8f1cf8c4 100644 --- a/dlls/ntdll/unix/thread.c +++ b/dlls/ntdll/unix/thread.c @@ -185,18 +185,22 @@ NTSTATUS CDECL create_thread( HANDLE *handle, ACCESS_MASK access, OBJECT_ATTRIBU memset( &call, 0, sizeof(call) ); call.create_thread.type = APC_CREATE_THREAD; + call.create_thread.flags = flags; call.create_thread.func = wine_server_client_ptr( start ); call.create_thread.arg = wine_server_client_ptr( param ); call.create_thread.reserve = stack_reserve; call.create_thread.commit = stack_commit; - call.create_thread.suspend = flags & THREAD_CREATE_FLAGS_CREATE_SUSPENDED; status = server_queue_process_apc( process, &call, &result ); if (status != STATUS_SUCCESS) return status; if (result.create_thread.status == STATUS_SUCCESS) { - if (id) id->UniqueThread = ULongToHandle( result.create_thread.tid ); *handle = wine_server_ptr_handle( result.create_thread.handle ); + if (id) + { + id->UniqueProcess = ULongToHandle( result.create_thread.pid ); + id->UniqueThread = ULongToHandle( result.create_thread.tid ); + } } return result.create_thread.status; } diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 520251fd3d..4b40ba7772 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -557,7 +557,7 @@ typedef union struct { enum apc_type type; - int suspend; + unsigned int flags; client_ptr_t func; client_ptr_t arg; mem_size_t reserve; @@ -645,6 +645,7 @@ typedef union { enum apc_type type; unsigned int status; + process_id_t pid; thread_id_t tid; obj_handle_t handle; } create_thread; @@ -6683,7 +6684,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 607 +#define SERVER_PROTOCOL_VERSION 608 /* ### protocol_version end ### */ diff --git a/include/winternl.h b/include/winternl.h index 2342835911..ad64df9d2e 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2580,6 +2580,7 @@ NTSYSAPI NTSTATUS WINAPI NtCreateSection(HANDLE*,ACCESS_MASK,const OBJECT_ATTRI NTSYSAPI NTSTATUS WINAPI NtCreateSemaphore(PHANDLE,ACCESS_MASK,const OBJECT_ATTRIBUTES*,LONG,LONG); NTSYSAPI NTSTATUS WINAPI NtCreateSymbolicLinkObject(PHANDLE,ACCESS_MASK,POBJECT_ATTRIBUTES,PUNICODE_STRING); NTSYSAPI NTSTATUS WINAPI NtCreateThread(PHANDLE,ACCESS_MASK,POBJECT_ATTRIBUTES,HANDLE,PCLIENT_ID,PCONTEXT,PINITIAL_TEB,BOOLEAN); +NTSYSAPI NTSTATUS WINAPI NtCreateThreadEx(HANDLE*,ACCESS_MASK,OBJECT_ATTRIBUTES*,HANDLE,PRTL_THREAD_START_ROUTINE,void*,ULONG,SIZE_T,SIZE_T,SIZE_T,PS_ATTRIBUTE_LIST*); NTSYSAPI NTSTATUS WINAPI NtCreateTimer(HANDLE*, ACCESS_MASK, const OBJECT_ATTRIBUTES*, TIMER_TYPE); NTSYSAPI NTSTATUS WINAPI NtCreateToken(PHANDLE,ACCESS_MASK,POBJECT_ATTRIBUTES,TOKEN_TYPE,PLUID,PLARGE_INTEGER,PTOKEN_USER,PTOKEN_GROUPS,PTOKEN_PRIVILEGES,PTOKEN_OWNER,PTOKEN_PRIMARY_GROUP,PTOKEN_DEFAULT_DACL,PTOKEN_SOURCE); NTSYSAPI NTSTATUS WINAPI NtDelayExecution(BOOLEAN,const LARGE_INTEGER*); diff --git a/server/protocol.def b/server/protocol.def index 632c996dc0..95a3021ee8 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -573,7 +573,7 @@ typedef union struct { enum apc_type type; /* APC_CREATE_THREAD */ - int suspend; /* suspended thread? */ + unsigned int flags; /* creation flags */ client_ptr_t func; /* void (__stdcall *func)(void*); start function */ client_ptr_t arg; /* argument for start function */ mem_size_t reserve; /* reserve size for thread stack */ @@ -661,6 +661,7 @@ typedef union { enum apc_type type; /* APC_CREATE_THREAD */ unsigned int status; /* status returned by call */ + process_id_t pid; /* process id */ thread_id_t tid; /* thread id */ obj_handle_t handle; /* handle to new thread */ } create_thread; diff --git a/server/trace.c b/server/trace.c index 555e697657..83db655d3e 100644 --- a/server/trace.c +++ b/server/trace.c @@ -221,7 +221,7 @@ static void dump_apc_call( const char *prefix, const apc_call_t *call ) dump_uint64( ",arg=", &call->create_thread.arg ); dump_uint64( ",reserve=", &call->create_thread.reserve ); dump_uint64( ",commit=", &call->create_thread.commit ); - fprintf( stderr, ",suspend=%u", call->create_thread.suspend ); + fprintf( stderr, ",flags=%x", call->create_thread.flags ); break; case APC_BREAK_PROCESS: fprintf( stderr, "APC_BREAK_PROCESS" ); @@ -302,9 +302,9 @@ static void dump_apc_result( const char *prefix, const apc_result_t *result ) get_status_name( result->unmap_view.status ) ); break; case APC_CREATE_THREAD: - fprintf( stderr, "APC_CREATE_THREAD,status=%s,tid=%04x,handle=%04x", + fprintf( stderr, "APC_CREATE_THREAD,status=%s,pid=%04x,tid=%04x,handle=%04x", get_status_name( result->create_thread.status ), - result->create_thread.tid, result->create_thread.handle ); + result->create_thread.pid, result->create_thread.tid, result->create_thread.handle ); break; case APC_BREAK_PROCESS: fprintf( stderr, "APC_BREAK_PROCESS,status=%s", get_status_name( result->break_process.status ) );

1 0

Alexandre Julliard : ntdll: Move NtCreateThreadEx() to the Unix library.
by Alexandre Julliard 05 Jun '20

05 Jun '20

Module: wine Branch: master Commit: 245efd04e1456a71a6962acbb8ebc279481e9ffa URL: https://source.winehq.org/git/wine.git/?a=commit;h=245efd04e1456a71a6962acb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 5 16:37:49 2020 +0200 ntdll: Move NtCreateThreadEx() to the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/thread.c | 39 +++++-------------------- dlls/ntdll/unix/loader.c | 2 +- dlls/ntdll/unix/thread.c | 66 ++++++++++++++++++++++++++++-------------- dlls/ntdll/unix/unix_private.h | 4 --- dlls/ntdll/unixlib.h | 10 +++---- include/winternl.h | 1 + 7 files changed, 61 insertions(+), 62 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=245efd04e1456a71a696…

1 0

Alexandre Julliard : ntdll: Move DbgUiIssueRemoteBreakin() to the Unix library.
by Alexandre Julliard 05 Jun '20

05 Jun '20

Module: wine Branch: master Commit: 8e5d3042786917c04d3065755d81e7f8a751e529 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8e5d3042786917c04d306575… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 5 16:54:17 2020 +0200 ntdll: Move DbgUiIssueRemoteBreakin() to the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/process.c | 13 +------------ dlls/ntdll/unix/loader.c | 2 +- dlls/ntdll/unix/server.c | 19 ++++++++++++++++++- dlls/ntdll/unix/unix_private.h | 3 ++- dlls/ntdll/unixlib.h | 6 ++++-- 5 files changed, 26 insertions(+), 17 deletions(-) diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c index f47d3c4bc6..35937ce602 100644 --- a/dlls/ntdll/process.c +++ b/dlls/ntdll/process.c @@ -1788,16 +1788,5 @@ void WINAPI DbgUiRemoteBreakin( void *arg ) */ NTSTATUS WINAPI DbgUiIssueRemoteBreakin( HANDLE process ) { - apc_call_t call; - apc_result_t result; - NTSTATUS status; - - TRACE( "(%p)\n", process ); - - memset( &call, 0, sizeof(call) ); - - call.type = APC_BREAK_PROCESS; - status = unix_funcs->server_queue_process_apc( process, &call, &result ); - if (status) return status; - return result.break_process.status; + return unix_funcs->DbgUiIssueRemoteBreakin( process ); } diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 4502be5f87..b5ee692024 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1036,6 +1036,7 @@ static struct unix_funcs unix_funcs = NtWaitForSingleObject, NtWriteVirtualMemory, NtYieldExecution, + DbgUiIssueRemoteBreakin, get_main_args, get_paths, get_dll_path, @@ -1072,7 +1073,6 @@ static struct unix_funcs unix_funcs = wine_server_call, server_select, server_wait, - server_queue_process_apc, server_send_fd, server_get_unix_fd, server_fd_to_handle, diff --git a/dlls/ntdll/unix/server.c b/dlls/ntdll/unix/server.c index a7592f5e15..fb3f98dd57 100644 --- a/dlls/ntdll/unix/server.c +++ b/dlls/ntdll/unix/server.c @@ -727,7 +727,7 @@ unsigned int CDECL server_wait( const select_op_t *select_op, data_size_t size, /*********************************************************************** * server_queue_process_apc */ -unsigned int CDECL server_queue_process_apc( HANDLE process, const apc_call_t *call, apc_result_t *result ) +unsigned int server_queue_process_apc( HANDLE process, const apc_call_t *call, apc_result_t *result ) { for (;;) { @@ -1556,6 +1556,23 @@ size_t server_init_thread( void *entry_point, BOOL *suspend ) } +/*********************************************************************** + * DbgUiIssueRemoteBreakin + */ +NTSTATUS WINAPI DbgUiIssueRemoteBreakin( HANDLE process ) +{ + apc_call_t call; + apc_result_t result; + NTSTATUS status; + + memset( &call, 0, sizeof(call) ); + call.type = APC_BREAK_PROCESS; + status = server_queue_process_apc( process, &call, &result ); + if (status) return status; + return result.break_process.status; +} + + /****************************************************************************** * NtDuplicateObject */ diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index debc14f68c..a422fd825e 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -83,7 +83,6 @@ extern unsigned int CDECL server_select( const select_op_t *select_op, data_size user_apc_t *user_apc ) DECLSPEC_HIDDEN; extern unsigned int CDECL server_wait( const select_op_t *select_op, data_size_t size, UINT flags, const LARGE_INTEGER *timeout ) DECLSPEC_HIDDEN; -extern unsigned int CDECL server_queue_process_apc( HANDLE process, const apc_call_t *call, apc_result_t *result ) DECLSPEC_HIDDEN; extern void CDECL server_send_fd( int fd ) DECLSPEC_HIDDEN; extern int CDECL server_get_unix_fd( HANDLE handle, unsigned int wanted_access, int *unix_fd, int *needs_close, enum server_fd_type *type, @@ -127,6 +126,8 @@ extern NTSTATUS context_from_server( CONTEXT *to, const context_t *from ) DECLSP extern void wait_suspend( CONTEXT *context ) DECLSPEC_HIDDEN; extern NTSTATUS set_thread_context( HANDLE handle, const context_t *context, BOOL *self ) DECLSPEC_HIDDEN; extern NTSTATUS get_thread_context( HANDLE handle, context_t *context, unsigned int flags, BOOL *self ) DECLSPEC_HIDDEN; +extern unsigned int server_queue_process_apc( HANDLE process, const apc_call_t *call, + apc_result_t *result ) DECLSPEC_HIDDEN; extern NTSTATUS alloc_object_attributes( const OBJECT_ATTRIBUTES *attr, struct object_attributes **ret, data_size_t *ret_len ) DECLSPEC_HIDDEN; diff --git a/dlls/ntdll/unixlib.h b/dlls/ntdll/unixlib.h index 5eea152a0e..58bdad1939 100644 --- a/dlls/ntdll/unixlib.h +++ b/dlls/ntdll/unixlib.h @@ -28,7 +28,7 @@ struct ldt_copy; struct msghdr; /* increment this when you change the function table */ -#define NTDLL_UNIXLIB_VERSION 29 +#define NTDLL_UNIXLIB_VERSION 30 struct unix_funcs { @@ -131,6 +131,9 @@ struct unix_funcs SIZE_T size, SIZE_T *bytes_written ); NTSTATUS (WINAPI *NtYieldExecution)(void); + /* other Win32 API functions */ + NTSTATUS (WINAPI *DbgUiIssueRemoteBreakin)( HANDLE process ); + /* environment functions */ void (CDECL *get_main_args)( int *argc, char **argv[], char **envp[] ); void (CDECL *get_paths)( const char **builddir, const char **datadir, const char **configdir ); @@ -183,7 +186,6 @@ struct unix_funcs user_apc_t *user_apc ); unsigned int (CDECL *server_wait)( const select_op_t *select_op, data_size_t size, UINT flags, const LARGE_INTEGER *timeout ); - unsigned int (CDECL *server_queue_process_apc)( HANDLE process, const apc_call_t *call, apc_result_t *result ); void (CDECL *server_send_fd)( int fd ); int (CDECL *server_get_unix_fd)( HANDLE handle, unsigned int wanted_access, int *unix_fd, int *needs_close, enum server_fd_type *type, unsigned int *options );

1 0

Zebediah Figura : d3dcompiler: Fix up the swizzle data type when unwrapping it from the assignment LHS.
by Alexandre Julliard 05 Jun '20

05 Jun '20

Module: wine Branch: master Commit: 9ba2bb0f3b692bef812d7f3b617d41a74276785a URL: https://source.winehq.org/git/wine.git/?a=commit;h=9ba2bb0f3b692bef812d7f3b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jun 3 21:06:50 2020 -0500 d3dcompiler: Fix up the swizzle data type when unwrapping it from the assignment LHS. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/utils.c | 31 +++++++++++++++++++++++-------- 1 file changed, 23 insertions(+), 8 deletions(-) diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index 60bb5ff814..7093e9eb2c 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -1403,29 +1403,29 @@ static enum hlsl_ir_expr_op op_from_assignment(enum parse_assign_op op) return ops[op]; } -static unsigned int invert_swizzle(unsigned int *swizzle, unsigned int writemask) +static BOOL invert_swizzle(unsigned int *swizzle, unsigned int *writemask, unsigned int *ret_width) { - unsigned int i, j, bit = 0, inverted = 0, components, new_writemask = 0, new_swizzle = 0; + unsigned int i, j, bit = 0, inverted = 0, width, new_writemask = 0, new_swizzle = 0; /* Apply the writemask to the swizzle to get a new writemask and swizzle. */ for (i = 0; i < 4; ++i) { - if (writemask & (1 << i)) + if (*writemask & (1 << i)) { unsigned int s = (*swizzle >> (i * 2)) & 3; new_swizzle |= s << (bit++ * 2); if (new_writemask & (1 << s)) - return 0; + return FALSE; new_writemask |= 1 << s; } } - components = bit; + width = bit; /* Invert the swizzle. */ bit = 0; for (i = 0; i < 4; ++i) { - for (j = 0; j < components; ++j) + for (j = 0; j < width; ++j) { unsigned int s = (new_swizzle >> (j * 2)) & 3; if (s == i) @@ -1434,7 +1434,9 @@ static unsigned int invert_swizzle(unsigned int *swizzle, unsigned int writemask } *swizzle = inverted; - return new_writemask; + *writemask = new_writemask; + *ret_width = width; + return TRUE; } struct hlsl_ir_node *make_assignment(struct hlsl_ir_node *lhs, enum parse_assign_op assign_op, @@ -1463,6 +1465,8 @@ struct hlsl_ir_node *make_assignment(struct hlsl_ir_node *lhs, enum parse_assign else if (lhs->type == HLSL_IR_SWIZZLE) { struct hlsl_ir_swizzle *swizzle = swizzle_from_node(lhs); + const struct hlsl_type *swizzle_type = swizzle->node.data_type; + unsigned int width; if (lhs->data_type->type == HLSL_CLASS_MATRIX) FIXME("Assignments with writemasks and matrices on lhs are not supported yet.\n"); @@ -1472,12 +1476,23 @@ struct hlsl_ir_node *make_assignment(struct hlsl_ir_node *lhs, enum parse_assign list_add_after(&rhs->entry, &lhs->entry); swizzle->val = rhs; - if (!(writemask = invert_swizzle(&swizzle->swizzle, writemask))) + if (!invert_swizzle(&swizzle->swizzle, &writemask, &width)) { hlsl_report_message(lhs->loc, HLSL_LEVEL_ERROR, "invalid writemask"); d3dcompiler_free(assign); return NULL; } + assert(swizzle_type->type == HLSL_CLASS_VECTOR); + if (swizzle_type->dimx != width) + { + struct hlsl_type *type; + if (!(type = new_hlsl_type(NULL, HLSL_CLASS_VECTOR, swizzle_type->base_type, width, 1))) + { + d3dcompiler_free(assign); + return NULL; + } + swizzle->node.data_type = type; + } rhs = &swizzle->node; } else

1 0

Zebediah Figura : d3dcompiler: Remove a redundant check for writemasks on non-numeric types.
by Alexandre Julliard 05 Jun '20

05 Jun '20

Module: wine Branch: master Commit: 24a4f52bbf7ac482c0f9129c1afdeccc8d319702 URL: https://source.winehq.org/git/wine.git/?a=commit;h=24a4f52bbf7ac482c0f9129c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jun 3 21:06:51 2020 -0500 d3dcompiler: Remove a redundant check for writemasks on non-numeric types. This can only happen if a swizzle is emitted on a non-numeric type, but this is checked when emitting swizzles. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/utils.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index 7093e9eb2c..767d2dee50 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -1514,13 +1514,6 @@ struct hlsl_ir_node *make_assignment(struct hlsl_ir_node *lhs, enum parse_assign DWORD bitmask; enum hlsl_type_class type_class; - if (lhs->data_type->type > HLSL_CLASS_LAST_NUMERIC) - { - hlsl_report_message(lhs->loc, HLSL_LEVEL_ERROR, - "writemask on a non scalar/vector/matrix type"); - d3dcompiler_free(assign); - return NULL; - } bitmask = writemask & ((1 << lhs->data_type->dimx) - 1); while (bitmask) {

1 0