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

Paul Gofman : jscript: Store the head of statement list instead of the list structure.
by Alexandre Julliard 30 Jul '21

30 Jul '21

Module: wine Branch: master Commit: cfeb815ff455b26f8e627416f7d160baf1c57bbe URL: https://source.winehq.org/git/wine.git/?a=commit;h=cfeb815ff455b26f8e627416… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Jul 30 15:42:40 2021 +0300 jscript: Store the head of statement list instead of the list structure. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/compile.c | 6 +++--- dlls/jscript/parser.h | 9 ++------- dlls/jscript/parser.y | 14 +++++++------- 3 files changed, 12 insertions(+), 17 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index 4672a8c31f1..482805cc52d 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -2510,7 +2510,7 @@ static HRESULT init_code(compiler_ctx_t *compiler, const WCHAR *source, UINT64 s return S_OK; } -static HRESULT compile_function(compiler_ctx_t *ctx, statement_list_t *source, function_expression_t *func_expr, +static HRESULT compile_function(compiler_ctx_t *ctx, statement_t *source, function_expression_t *func_expr, BOOL from_eval, function_code_t *func) { function_expression_t *iter; @@ -2568,7 +2568,7 @@ static HRESULT compile_function(compiler_ctx_t *ctx, statement_list_t *source, f return E_OUTOFMEMORY; } - hres = visit_block_statement(ctx, NULL, source ? source->head : NULL); + hres = visit_block_statement(ctx, NULL, source); if(FAILED(hres)) return hres; @@ -2609,7 +2609,7 @@ static HRESULT compile_function(compiler_ctx_t *ctx, statement_list_t *source, f ctx->current_function_expr = ctx->func_head; off = ctx->code_off; - hres = compile_block_statement(ctx, NULL, source ? source->head : NULL); + hres = compile_block_statement(ctx, NULL, source); if(FAILED(hres)) return hres; diff --git a/dlls/jscript/parser.h b/dlls/jscript/parser.h index fde0b540d63..9e212138480 100644 --- a/dlls/jscript/parser.h +++ b/dlls/jscript/parser.h @@ -19,11 +19,6 @@ typedef struct _expression_t expression_t; typedef struct _statement_t statement_t; -typedef struct _statement_list_t { - statement_t *head; - statement_t *tail; -} statement_list_t; - struct _bytecode_t; typedef struct { @@ -41,7 +36,7 @@ typedef struct _parser_ctx_t { script_ctx_t *script; struct _compiler_ctx_t *compiler; - statement_list_t *source; + statement_t *source; BOOL nl; BOOL implicit_nl_semicolon; BOOL is_html; @@ -301,7 +296,7 @@ typedef struct _function_expression_t { const WCHAR *identifier; const WCHAR *event_target; parameter_t *parameter_list; - statement_list_t *statement_list; + statement_t *statement_list; const WCHAR *src_str; DWORD src_len; unsigned func_id; diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index 9fc7ea61dc3..0ebdc2b932b 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -65,6 +65,11 @@ typedef struct _case_list_t { case_clausule_t *tail; } case_list_t; +typedef struct _statement_list_t { + statement_t *head; + statement_t *tail; +} statement_list_t; + static catch_block_t *new_catch_block(parser_ctx_t*,const WCHAR*,statement_t*); static case_clausule_t *new_case_clausule(parser_ctx_t*,unsigned,expression_t*,statement_list_t*); static case_list_t *new_case_list(parser_ctx_t*,case_clausule_t*); @@ -98,11 +103,6 @@ static statement_t *new_switch_statement(parser_ctx_t*,unsigned,expression_t*,ca static statement_t *new_throw_statement(parser_ctx_t*,unsigned,expression_t*); static statement_t *new_try_statement(parser_ctx_t*,statement_t*,catch_block_t*,statement_t*,unsigned); -struct statement_list_t { - statement_t *head; - statement_t *tail; -}; - static statement_list_t *new_statement_list(parser_ctx_t*,statement_t*); static statement_list_t *statement_list_add(statement_list_t*,statement_t*); @@ -249,7 +249,7 @@ static expression_t *new_prop_and_value_expression(parser_ctx_t*,property_list_t /* ECMA-262 10th Edition 15.1 */ Script - : ScriptBody HtmlComment { ctx->source = $1; } + : ScriptBody HtmlComment { ctx->source = $1 ? $1->head : NULL; } /* ECMA-262 10th Edition 15.1 */ ScriptBody @@ -1440,7 +1440,7 @@ static expression_t *new_function_expression(parser_ctx_t *ctx, const WCHAR *ide ret->identifier = identifier; ret->parameter_list = parameter_list ? parameter_list->head : NULL; - ret->statement_list = statement_list; + ret->statement_list = statement_list ? statement_list->head : NULL; ret->event_target = event_target; ret->src_str = src_str; ret->src_len = src_len;

1 0

André Zwing : maintainers: Change my name.
by Alexandre Julliard 30 Jul '21

30 Jul '21

Module: wine Branch: master Commit: ea8d20af620c4f0b50b6f93e9acad278261436bd URL: https://source.winehq.org/git/wine.git/?a=commit;h=ea8d20af620c4f0b50b6f93e… Author: André Zwing <nerv(a)dawncrow.de> Date: Fri Jul 30 18:41:40 2021 +0200 maintainers: Change my name. Signed-off-by: André Zwing <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- MAINTAINERS | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index e85151e9bd2..c36a70958ed 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -29,7 +29,7 @@ Maintainers List ----------------------------------- ARM, ARM64 -M: André Hentschel <nerv(a)dawncrow.de> +M: André Zwing <nerv(a)dawncrow.de> F: dlls/dbghelp/cpu_arm* F: dlls/msvcrt/except_arm.c F: dlls/ntdll/signal_arm* @@ -175,7 +175,7 @@ P: Zebediah Figura <z.figura12(a)gmail.com> F: dlls/msi/ Netstat -M: André Hentschel <nerv(a)dawncrow.de> +M: André Zwing <nerv(a)dawncrow.de> F: programs/netstat/ Network @@ -302,7 +302,7 @@ P: Erich E. Hoover <erich.e.hoover(a)wine-staging.com> F: server/ Winemaker -M: André Hentschel <nerv(a)dawncrow.de> +M: André Zwing <nerv(a)dawncrow.de> F: tools/winemaker/ WinHTTP @@ -314,7 +314,7 @@ P: Jacek Caban <jacek(a)codeweavers.com> F: dlls/wininet/ WPcap -M: André Hentschel <nerv(a)dawncrow.de> +M: André Zwing <nerv(a)dawncrow.de> F: dlls/wpcap/ X11 Driver

1 0

Alexandre Julliard : server: Store the entry point as image-relative in pe_image_info_t.
by Alexandre Julliard 30 Jul '21

30 Jul '21

Module: wine Branch: master Commit: b08b4b8213949ecfc8eb449b5676552669ec3211 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b08b4b8213949ecfc8eb449b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 30 12:14:30 2021 +0200 server: Store the entry point as image-relative in pe_image_info_t. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51539 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/loader.c | 2 +- dlls/ntdll/unix/virtual.c | 2 +- include/wine/server_protocol.h | 6 +++--- server/debugger.c | 2 +- server/mapping.c | 4 ++-- server/process.c | 4 ++-- server/protocol.def | 4 ++-- server/trace.c | 10 ++++------ 8 files changed, 16 insertions(+), 18 deletions(-) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index bbbdb90116f..0e580cd7556 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1017,7 +1017,7 @@ static void fill_builtin_image_info( void *module, pe_image_info_t *info ) const IMAGE_NT_HEADERS *nt = (IMAGE_NT_HEADERS *)((const BYTE *)dos + dos->e_lfanew); info->base = nt->OptionalHeader.ImageBase; - info->entry_point = info->base + nt->OptionalHeader.AddressOfEntryPoint; + info->entry_point = nt->OptionalHeader.AddressOfEntryPoint; info->map_size = nt->OptionalHeader.SizeOfImage; info->stack_size = nt->OptionalHeader.SizeOfStackReserve; info->stack_commit = nt->OptionalHeader.SizeOfStackCommit; diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 8976cb88f90..fbdbf79d9d5 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -4512,7 +4512,7 @@ NTSTATUS WINAPI NtUnmapViewOfSection( HANDLE process, PVOID addr ) */ void virtual_fill_image_information( const pe_image_info_t *pe_info, SECTION_IMAGE_INFORMATION *info ) { - info->TransferAddress = wine_server_get_ptr( pe_info->entry_point ); + info->TransferAddress = wine_server_get_ptr( pe_info->base + pe_info->entry_point ); info->ZeroBits = pe_info->zerobits; info->MaximumStackSize = pe_info->stack_size; info->CommittedStackSize = pe_info->stack_commit; diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 4611f38c5c4..bb4862c9669 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -767,10 +767,10 @@ typedef union typedef struct { client_ptr_t base; - client_ptr_t entry_point; - mem_size_t map_size; mem_size_t stack_size; mem_size_t stack_commit; + unsigned int entry_point; + unsigned int map_size; unsigned int zerobits; unsigned int subsystem; unsigned short subsystem_minor; @@ -6252,7 +6252,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 725 +#define SERVER_PROTOCOL_VERSION 726 /* ### protocol_version end ### */ diff --git a/server/debugger.c b/server/debugger.c index b718c7c283f..ca84a88258f 100644 --- a/server/debugger.c +++ b/server/debugger.c @@ -160,7 +160,7 @@ static void fill_create_process_event( struct debug_event *event, const void *ar const struct memory_view *view = arg; const pe_image_info_t *image_info = get_view_image_info( view, &event->data.create_process.base ); - event->data.create_process.start = image_info->entry_point; + event->data.create_process.start = event->data.create_process.base + image_info->entry_point; event->data.create_process.dbg_offset = image_info->dbg_offset; event->data.create_process.dbg_size = image_info->dbg_size; /* the doc says write access too, but this doesn't seem a good idea */ diff --git a/server/mapping.c b/server/mapping.c index a4bb000268a..a814fe8090f 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -705,7 +705,7 @@ static unsigned int get_image_params( struct mapping *mapping, file_pos_t file_s clr_size = nt.opt.hdr32.DataDirectory[IMAGE_DIRECTORY_ENTRY_COM_DESCRIPTOR].Size; mapping->image.base = nt.opt.hdr32.ImageBase; - mapping->image.entry_point = nt.opt.hdr32.ImageBase + nt.opt.hdr32.AddressOfEntryPoint; + mapping->image.entry_point = nt.opt.hdr32.AddressOfEntryPoint; mapping->image.map_size = ROUND_SIZE( nt.opt.hdr32.SizeOfImage ); mapping->image.stack_size = nt.opt.hdr32.SizeOfStackReserve; mapping->image.stack_commit = nt.opt.hdr32.SizeOfStackCommit; @@ -737,7 +737,7 @@ static unsigned int get_image_params( struct mapping *mapping, file_pos_t file_s clr_size = nt.opt.hdr64.DataDirectory[IMAGE_DIRECTORY_ENTRY_COM_DESCRIPTOR].Size; mapping->image.base = nt.opt.hdr64.ImageBase; - mapping->image.entry_point = nt.opt.hdr64.ImageBase + nt.opt.hdr64.AddressOfEntryPoint; + mapping->image.entry_point = nt.opt.hdr64.AddressOfEntryPoint; mapping->image.map_size = ROUND_SIZE( nt.opt.hdr64.SizeOfImage ); mapping->image.stack_size = nt.opt.hdr64.SizeOfStackReserve; mapping->image.stack_commit = nt.opt.hdr64.SizeOfStackCommit; diff --git a/server/process.c b/server/process.c index 15387a2affa..0870de5bb26 100644 --- a/server/process.c +++ b/server/process.c @@ -1399,7 +1399,7 @@ DECL_HANDLER(init_process_done) process->ldt_copy = req->ldt_copy; process->start_time = current_time; - current->entry_point = image_info->entry_point; + current->entry_point = base + image_info->entry_point; init_process_tracing( process ); generate_startup_debug_events( process ); @@ -1408,7 +1408,7 @@ DECL_HANDLER(init_process_done) if (image_info->subsystem != IMAGE_SUBSYSTEM_WINDOWS_CUI) process->idle_event = create_event( NULL, NULL, 0, 1, 0, NULL ); if (process->debug_obj) set_process_debug_flag( process, 1 ); - reply->entry = image_info->entry_point; + reply->entry = current->entry_point; reply->suspend = (current->suspend || process->suspend); } diff --git a/server/protocol.def b/server/protocol.def index b4049eb90e7..133d6ad0552 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -783,10 +783,10 @@ typedef union typedef struct { client_ptr_t base; - client_ptr_t entry_point; - mem_size_t map_size; mem_size_t stack_size; mem_size_t stack_commit; + unsigned int entry_point; + unsigned int map_size; unsigned int zerobits; unsigned int subsystem; unsigned short subsystem_minor; diff --git a/server/trace.c b/server/trace.c index 447710e8f80..4110b740621 100644 --- a/server/trace.c +++ b/server/trace.c @@ -1354,17 +1354,15 @@ static void dump_varargs_pe_image_info( const char *prefix, data_size_t size ) fprintf( stderr, "%s{", prefix ); dump_uint64( "base=", &info.base ); - dump_uint64( ",entry_point=", &info.entry_point ); - dump_uint64( ",map_size=", &info.map_size ); dump_uint64( ",stack_size=", &info.stack_size ); dump_uint64( ",stack_commit=", &info.stack_commit ); - fprintf( stderr, ",zerobits=%08x,subsystem=%08x,subsystem_minor=%04x,subsystem_major=%04x" + fprintf( stderr, ",entry_point=%08x,map_size=%08x,zerobits=%08x,subsystem=%08x,subsystem_minor=%04x,subsystem_major=%04x" ",osversion_major=%04x,osversion_minor=%04x,image_charact=%04x,dll_charact=%04x,machine=%04x" ",contains_code=%u,image_flags=%02x" ",loader_flags=%08x,header_size=%08x,file_size=%08x,checksum=%08x}", - info.zerobits, info.subsystem, info.subsystem_minor, info.subsystem_major, - info.osversion_major, info.osversion_minor, info.image_charact, info.dll_charact, - info.machine, info.contains_code, info.image_flags, info.loader_flags, + info.entry_point, info.map_size, info.zerobits, info.subsystem, info.subsystem_minor, + info.subsystem_major, info.osversion_major, info.osversion_minor, info.image_charact, + info.dll_charact, info.machine, info.contains_code, info.image_flags, info.loader_flags, info.header_size, info.file_size, info.checksum ); remove_data( min( size, sizeof(info) )); }

1 0

Alexandre Julliard : wow64: Add thunks for the token query/set information syscalls.
by Alexandre Julliard 30 Jul '21

30 Jul '21

Module: wine Branch: master Commit: 1aa5d8c9b809bc3632bca7121f859259b44e6c7a URL: https://source.winehq.org/git/wine.git/?a=commit;h=1aa5d8c9b809bc3632bca712… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 30 12:56:32 2021 +0200 wow64: Add thunks for the token query/set information syscalls. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wow64/security.c | 219 +++++++++++++++++++++++++++++++++++++++++++++++++- dlls/wow64/struct32.h | 27 +++++++ dlls/wow64/syscall.h | 3 + 3 files changed, 247 insertions(+), 2 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1aa5d8c9b809bc3632bc…

1 0

Alexandre Julliard : wow64: Add thunks for the job object query/set information syscalls.
by Alexandre Julliard 30 Jul '21

30 Jul '21

Module: wine Branch: master Commit: 595039be05050448e1c9b529281416e48670a388 URL: https://source.winehq.org/git/wine.git/?a=commit;h=595039be05050448e1c9b529… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 30 13:05:53 2021 +0200 wow64: Add thunks for the job object query/set information syscalls. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wow64/struct32.h | 36 ++++++++++ dlls/wow64/sync.c | 178 ++++++++++++++++++++++++++++++++++++++++++++++++++ dlls/wow64/syscall.h | 2 + 3 files changed, 216 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=595039be05050448e1c9…

1 0

Nikolay Sivov : dpnhupnp: Build with msvcrt.
by Alexandre Julliard 29 Jul '21

29 Jul '21

Module: wine Branch: master Commit: 10fb33026f2a55209dea0fb00caa279610027a0f URL: https://source.winehq.org/git/wine.git/?a=commit;h=10fb33026f2a55209dea0fb0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jul 29 16:08:25 2021 +0300 dpnhupnp: Build with msvcrt. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dpnhupnp/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dpnhupnp/Makefile.in b/dlls/dpnhupnp/Makefile.in index 6aa9ef1dd80..369f1ba276a 100644 --- a/dlls/dpnhupnp/Makefile.in +++ b/dlls/dpnhupnp/Makefile.in @@ -1,6 +1,6 @@ MODULE = dpnhupnp.dll -EXTRADLLFLAGS = -Wb,--prefer-native +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ main.c

1 0

Alexandre Julliard : wow64: Add thunks for the process/thread query information syscalls.
by Alexandre Julliard 29 Jul '21

29 Jul '21

Module: wine Branch: master Commit: ebb4d3887becc44be3dce210ce3f0eb8d34330cb URL: https://source.winehq.org/git/wine.git/?a=commit;h=ebb4d3887becc44be3dce210… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 29 15:28:34 2021 +0200 wow64: Add thunks for the process/thread query information syscalls. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wow64/process.c | 272 +++++++++++++++++++++++++++++++++++++++++++++ dlls/wow64/struct32.h | 63 +++++++++++ dlls/wow64/syscall.h | 2 + dlls/wow64/wow64_private.h | 2 + 4 files changed, 339 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ebb4d3887becc44be3dc…

1 0

Alexandre Julliard : wow64: Add thunks for the process/thread set information syscalls.
by Alexandre Julliard 29 Jul '21

29 Jul '21

Module: wine Branch: master Commit: ba74c5c6984bb19aade5ae0dfaa71b0f77d5786e URL: https://source.winehq.org/git/wine.git/?a=commit;h=ba74c5c6984bb19aade5ae0d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 29 15:32:14 2021 +0200 wow64: Add thunks for the process/thread set information syscalls. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wow64/process.c | 150 ++++++++++++++++++++++++++++++++++++++++++++++++++ dlls/wow64/struct32.h | 23 ++++++++ dlls/wow64/syscall.h | 2 + 3 files changed, 175 insertions(+) diff --git a/dlls/wow64/process.c b/dlls/wow64/process.c index 61e3ca1e91b..44380535d9c 100644 --- a/dlls/wow64/process.c +++ b/dlls/wow64/process.c @@ -816,6 +816,156 @@ NTSTATUS WINAPI wow64_NtSetContextThread( UINT *args ) } +/********************************************************************** + * wow64_NtSetInformationProcess + */ +NTSTATUS WINAPI wow64_NtSetInformationProcess( UINT *args ) +{ + HANDLE handle = get_handle( &args ); + PROCESSINFOCLASS class = get_ulong( &args ); + void *ptr = get_ptr( &args ); + ULONG len = get_ulong( &args ); + + NTSTATUS status; + + switch (class) + { + case ProcessDefaultHardErrorMode: /* ULONG */ + case ProcessPriorityClass: /* PROCESS_PRIORITY_CLASS */ + return NtSetInformationProcess( handle, class, ptr, len ); + + case ProcessAffinityMask: /* ULONG_PTR */ + if (len == sizeof(ULONG)) + { + ULONG_PTR mask = *(ULONG *)ptr; + return NtSetInformationProcess( handle, class, &mask, sizeof(mask) ); + } + else return STATUS_INVALID_PARAMETER; + + case ProcessExecuteFlags: /* ULONG */ + return STATUS_ACCESS_DENIED; + + case ProcessInstrumentationCallback: /* PROCESS_INSTRUMENTATION_CALLBACK_INFORMATION */ + if (len == sizeof(PROCESS_INSTRUMENTATION_CALLBACK_INFORMATION32)) + { + FIXME( "ProcessInstrumentationCallback stub\n" ); + return STATUS_SUCCESS; + } + else return STATUS_INFO_LENGTH_MISMATCH; + + case ProcessThreadStackAllocation: /* PROCESS_STACK_ALLOCATION_INFORMATION(_EX) */ + if (len == sizeof(PROCESS_STACK_ALLOCATION_INFORMATION_EX32)) + { + PROCESS_STACK_ALLOCATION_INFORMATION_EX32 *stack = ptr; + PROCESS_STACK_ALLOCATION_INFORMATION_EX info; + + info.PreferredNode = stack->PreferredNode; + info.Reserved0 = stack->Reserved0; + info.Reserved1 = stack->Reserved1; + info.Reserved2 = stack->Reserved2; + info.AllocInfo.ReserveSize = stack->AllocInfo.ReserveSize; + info.AllocInfo.ZeroBits = get_zero_bits( stack->AllocInfo.ZeroBits ); + if (!(status = NtSetInformationProcess( handle, class, &info, sizeof(info) ))) + stack->AllocInfo.StackBase = PtrToUlong( info.AllocInfo.StackBase ); + return status; + } + else if (len == sizeof(PROCESS_STACK_ALLOCATION_INFORMATION32)) + { + PROCESS_STACK_ALLOCATION_INFORMATION32 *stack = ptr; + PROCESS_STACK_ALLOCATION_INFORMATION info; + + info.ReserveSize = stack->ReserveSize; + info.ZeroBits = stack->ZeroBits ? stack->ZeroBits : 0x7fffffff; + if (!(status = NtSetInformationProcess( handle, class, &info, sizeof(info) ))) + stack->StackBase = PtrToUlong( info.StackBase ); + return status; + } + else return STATUS_INFO_LENGTH_MISMATCH; + + case ProcessWineMakeProcessSystem: /* HANDLE* */ + if (len == sizeof(ULONG)) + { + HANDLE event = 0; + status = NtSetInformationProcess( handle, class, &event, sizeof(HANDLE *) ); + put_handle( ptr, event ); + return status; + } + else return STATUS_INFO_LENGTH_MISMATCH; + + default: + FIXME( "unsupported class %u\n", class ); + return STATUS_INVALID_INFO_CLASS; + } +} + + +/********************************************************************** + * wow64_NtSetInformationThread + */ +NTSTATUS WINAPI wow64_NtSetInformationThread( UINT *args ) +{ + HANDLE handle = get_handle( &args ); + THREADINFOCLASS class = get_ulong( &args ); + void *ptr = get_ptr( &args ); + ULONG len = get_ulong( &args ); + + switch (class) + { + case ThreadZeroTlsCell: /* ULONG */ + case ThreadBasePriority: /* ULONG */ + case ThreadHideFromDebugger: /* void */ + case ThreadEnableAlignmentFaultFixup: /* BOOLEAN */ + return NtSetInformationThread( handle, class, ptr, len ); + + case ThreadImpersonationToken: /* HANDLE */ + if (len == sizeof(ULONG)) + { + HANDLE token = LongToHandle( *(ULONG *)ptr ); + return NtSetInformationThread( handle, class, &token, sizeof(token) ); + } + else return STATUS_INVALID_PARAMETER; + + case ThreadAffinityMask: /* ULONG_PTR */ + case ThreadQuerySetWin32StartAddress: /* PRTL_THREAD_START_ROUTINE */ + if (len == sizeof(ULONG)) + { + ULONG_PTR mask = *(ULONG *)ptr; + return NtSetInformationThread( handle, class, &mask, sizeof(mask) ); + } + else return STATUS_INVALID_PARAMETER; + + case ThreadWow64Context: /* WOW64_CONTEXT* */ + return STATUS_INVALID_INFO_CLASS; + + case ThreadGroupInformation: /* GROUP_AFFINITY */ + if (len == sizeof(GROUP_AFFINITY32)) + { + GROUP_AFFINITY32 *info32 = ptr; + GROUP_AFFINITY info = { info32->Mask, info32->Group }; + + return NtSetInformationThread( handle, class, &info, sizeof(info) ); + } + else return STATUS_INVALID_PARAMETER; + + case ThreadDescription: /* THREAD_DESCRIPTION_INFORMATION */ + if (len == sizeof(THREAD_DESCRIPTION_INFORMATION32)) + { + THREAD_DESCRIPTION_INFORMATION32 *info32 = ptr; + THREAD_DESCRIPTION_INFORMATION info; + + if (!unicode_str_32to64( &info.Description, &info32->Description )) + return STATUS_ACCESS_VIOLATION; + return NtSetInformationThread( handle, class, &info, sizeof(info) ); + } + else return STATUS_INFO_LENGTH_MISMATCH; + + default: + FIXME( "unsupported class %u\n", class ); + return STATUS_INVALID_INFO_CLASS; + } +} + + /********************************************************************** * wow64_NtSetThreadExecutionState */ diff --git a/dlls/wow64/struct32.h b/dlls/wow64/struct32.h index 1955b6e16e5..6d5fa86af2b 100644 --- a/dlls/wow64/struct32.h +++ b/dlls/wow64/struct32.h @@ -153,6 +153,29 @@ typedef struct ULONG InheritedFromUniqueProcessId; } PROCESS_BASIC_INFORMATION32; +typedef struct +{ + ULONG Version; + ULONG Reserved; + ULONG Callback; +} PROCESS_INSTRUMENTATION_CALLBACK_INFORMATION32; + +typedef struct +{ + ULONG ReserveSize; + ULONG ZeroBits; + ULONG StackBase; +} PROCESS_STACK_ALLOCATION_INFORMATION32; + +typedef struct +{ + ULONG PreferredNode; + ULONG Reserved0; + ULONG Reserved1; + ULONG Reserved2; + PROCESS_STACK_ALLOCATION_INFORMATION32 AllocInfo; +} PROCESS_STACK_ALLOCATION_INFORMATION_EX32; + typedef struct { ULONG Size; diff --git a/dlls/wow64/syscall.h b/dlls/wow64/syscall.h index 20f70bddda1..77b380cac8d 100644 --- a/dlls/wow64/syscall.h +++ b/dlls/wow64/syscall.h @@ -168,6 +168,8 @@ SYSCALL_ENTRY( NtSetInformationFile ) \ SYSCALL_ENTRY( NtSetInformationKey ) \ SYSCALL_ENTRY( NtSetInformationObject ) \ + SYSCALL_ENTRY( NtSetInformationProcess ) \ + SYSCALL_ENTRY( NtSetInformationThread ) \ SYSCALL_ENTRY( NtSetIoCompletion ) \ SYSCALL_ENTRY( NtSetPowerRequest ) \ SYSCALL_ENTRY( NtSetThreadExecutionState ) \

1 0

Alexandre Julliard : wow64: Add thunks for the registry notification syscalls.
by Alexandre Julliard 29 Jul '21

29 Jul '21

Module: wine Branch: master Commit: dce59f595bbb27fff8967517fc9f7b36aa8106c2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dce59f595bbb27fff8967517… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 29 11:13:47 2021 +0200 wow64: Add thunks for the registry notification syscalls. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wow64/registry.c | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++ dlls/wow64/syscall.h | 2 ++ 2 files changed, 58 insertions(+) diff --git a/dlls/wow64/registry.c b/dlls/wow64/registry.c index 67f8f509df5..e89c65c4c5e 100644 --- a/dlls/wow64/registry.c +++ b/dlls/wow64/registry.c @@ -182,6 +182,62 @@ NTSTATUS WINAPI wow64_NtLoadKey2( UINT *args ) } +/********************************************************************** + * wow64_NtNotifyChangeKey + */ +NTSTATUS WINAPI wow64_NtNotifyChangeKey( UINT *args ) +{ + HANDLE handle = get_handle( &args ); + HANDLE event = get_handle( &args ); + ULONG apc = get_ulong( &args ); + ULONG apc_param = get_ulong( &args ); + IO_STATUS_BLOCK32 *io32 = get_ptr( &args ); + ULONG filter = get_ulong( &args ); + BOOLEAN subtree = get_ulong( &args ); + void *buffer = get_ptr( &args ); + ULONG len = get_ulong( &args ); + BOOLEAN async = get_ulong( &args ); + + IO_STATUS_BLOCK io; + NTSTATUS status; + + status = NtNotifyChangeKey( handle, event, apc_32to64( apc ), apc_param_32to64( apc, apc_param ), + iosb_32to64( &io, io32 ), filter, subtree, buffer, len, async ); + put_iosb( io32, &io ); + return status; +} + + +/********************************************************************** + * wow64_NtNotifyChangeMultipleKeys + */ +NTSTATUS WINAPI wow64_NtNotifyChangeMultipleKeys( UINT *args ) +{ + HANDLE handle = get_handle( &args ); + ULONG count = get_ulong( &args ); + OBJECT_ATTRIBUTES32 *attr32 = get_ptr( &args ); + HANDLE event = get_handle( &args ); + ULONG apc = get_ulong( &args ); + ULONG apc_param = get_ulong( &args ); + IO_STATUS_BLOCK32 *io32 = get_ptr( &args ); + ULONG filter = get_ulong( &args ); + BOOLEAN subtree = get_ulong( &args ); + void *buffer = get_ptr( &args ); + ULONG len = get_ulong( &args ); + BOOLEAN async = get_ulong( &args ); + + struct object_attr64 attr; + IO_STATUS_BLOCK io; + NTSTATUS status; + + status = NtNotifyChangeMultipleKeys( handle, count, objattr_32to64( &attr, attr32 ), event, + apc_32to64( apc ), apc_param_32to64( apc, apc_param ), + iosb_32to64( &io, io32 ), filter, subtree, buffer, len, async ); + put_iosb( io32, &io ); + return status; +} + + /********************************************************************** * wow64_NtOpenKey */ diff --git a/dlls/wow64/syscall.h b/dlls/wow64/syscall.h index 77b380cac8d..ebdd2d6c6d2 100644 --- a/dlls/wow64/syscall.h +++ b/dlls/wow64/syscall.h @@ -92,6 +92,8 @@ SYSCALL_ENTRY( NtMakeTemporaryObject ) \ SYSCALL_ENTRY( NtMapViewOfSection ) \ SYSCALL_ENTRY( NtNotifyChangeDirectoryFile ) \ + SYSCALL_ENTRY( NtNotifyChangeKey ) \ + SYSCALL_ENTRY( NtNotifyChangeMultipleKeys ) \ SYSCALL_ENTRY( NtOpenDirectoryObject ) \ SYSCALL_ENTRY( NtOpenEvent ) \ SYSCALL_ENTRY( NtOpenFile ) \

1 0

Alexandre Julliard : wow64: Add thunks for a number of security syscalls.
by Alexandre Julliard 29 Jul '21

29 Jul '21

Module: wine Branch: master Commit: 19cdc3497c86c3068a6abf51de1d93aa3d56d77e URL: https://source.winehq.org/git/wine.git/?a=commit;h=19cdc3497c86c3068a6abf51… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 29 12:44:06 2021 +0200 wow64: Add thunks for a number of security syscalls. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wow64/Makefile.in | 1 + dlls/wow64/security.c | 253 +++++++++++++++++++++++++++++++++++++++++++++++++ dlls/wow64/syscall.h | 12 +++ 3 files changed, 266 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=19cdc3497c86c3068a6a…

1 0