February 2021 - Wine-commits

André Hentschel : wrc: Add PPC64 support.
by Alexandre Julliard 09 Feb '21

09 Feb '21

Module: wine Branch: master Commit: 9419eadd04e3286466ae8ef4a6d123498abc5330 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9419eadd04e3286466ae8ef4… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Jan 31 18:34:16 2021 +0100 wrc: Add PPC64 support. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/wrc/wrc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/wrc/wrc.c b/tools/wrc/wrc.c index b260e20af07..fec05148adc 100644 --- a/tools/wrc/wrc.c +++ b/tools/wrc/wrc.c @@ -328,7 +328,8 @@ static void set_target( const char *target ) if (!(p = strchr( cpu, '-' ))) error( "Invalid target specification '%s'\n", target ); *p = 0; if (!strcmp( cpu, "amd64" ) || !strcmp( cpu, "x86_64" ) || - !strcmp( cpu, "ia64" ) || !strcmp( cpu, "aarch64" )) + !strcmp( cpu, "ia64" ) || !strcmp( cpu, "aarch64" ) || + !strcmp( cpu, "powerpc64" ) || !strcmp( cpu, "powerpc64le" )) pointer_size = 8; else pointer_size = 4;

1 0

Alexandre Julliard : ntdll: Pass the full NT path name to load_builtin_dll().
by Alexandre Julliard 09 Feb '21

09 Feb '21

Module: wine Branch: master Commit: d7bdd5a5540c13690eef370e49b6ff4841a65716 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d7bdd5a5540c13690eef370e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 9 13:23:17 2021 +0100 ntdll: Pass the full NT path name to load_builtin_dll(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 16 +++++----------- dlls/ntdll/unix/loader.c | 44 +++++++++++++++++++++++++++++--------------- dlls/ntdll/unixlib.h | 4 ++-- 3 files changed, 36 insertions(+), 28 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 458f79a9197..6b76c6f406e 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2369,34 +2369,28 @@ static NTSTATUS load_so_dll( LPCWSTR load_path, const UNICODE_STRING *nt_name, /*********************************************************************** * load_builtin_dll */ -static NTSTATUS load_builtin_dll( LPCWSTR load_path, const UNICODE_STRING *nt_name, +static NTSTATUS load_builtin_dll( LPCWSTR load_path, UNICODE_STRING *nt_name, DWORD flags, WINE_MODREF** pwm ) { - const WCHAR *name, *p; NTSTATUS status; void *module, *unix_entry = NULL; SECTION_IMAGE_INFORMATION image_info; - /* Fix the name in case we have a full path and extension */ - name = nt_name->Buffer; - if ((p = wcsrchr( name, '\\' ))) name = p + 1; - if ((p = wcsrchr( name, '/' ))) name = p + 1; + TRACE("Trying built-in %s\n", debugstr_us(nt_name)); - TRACE("Trying built-in %s\n", debugstr_w(name)); - - status = unix_funcs->load_builtin_dll( name, &module, &unix_entry, &image_info ); + status = unix_funcs->load_builtin_dll( nt_name, &module, &unix_entry, &image_info ); if (status) return status; if ((*pwm = get_modref( module ))) /* already loaded */ { if ((*pwm)->ldr.LoadCount != -1) (*pwm)->ldr.LoadCount++; TRACE( "Found %s for %s at %p, count=%d\n", - debugstr_w((*pwm)->ldr.FullDllName.Buffer), debugstr_w(name), + debugstr_us(&(*pwm)->ldr.FullDllName), debugstr_us(nt_name), (*pwm)->ldr.DllBase, (*pwm)->ldr.LoadCount); return STATUS_SUCCESS; } - TRACE( "loading %s from %s\n", debugstr_w(name), debugstr_us(nt_name) ); + TRACE( "loading %s\n", debugstr_us(nt_name) ); status = build_module( load_path, nt_name, &module, &image_info, NULL, flags, pwm ); if (!status) (*pwm)->unix_entry = unix_entry; else if (module) unix_funcs->unload_builtin_dll( module ); diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index bcd1635e75c..7842713eba3 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1177,16 +1177,15 @@ static inline char *prepend( char *buffer, const char *str, size_t len ) * * Open a file for a new dll. Helper for open_builtin_file. */ -static NTSTATUS open_dll_file( const char *name, HANDLE *mapping, void **module, +static NTSTATUS open_dll_file( const char *name, OBJECT_ATTRIBUTES *attr, HANDLE *mapping, void **module, SECTION_IMAGE_INFORMATION *image_info, struct stat *st ) { struct builtin_module *builtin; - OBJECT_ATTRIBUTES attr = { sizeof(attr) }; LARGE_INTEGER size; NTSTATUS status; HANDLE handle; - if ((status = open_unix_file( &handle, name, GENERIC_READ | SYNCHRONIZE, &attr, 0, + if ((status = open_unix_file( &handle, name, GENERIC_READ | SYNCHRONIZE, attr, 0, FILE_SHARE_READ | FILE_SHARE_DELETE, FILE_OPEN, FILE_SYNCHRONOUS_IO_NONALERT | FILE_NON_DIRECTORY_FILE, NULL, 0 ))) { @@ -1244,13 +1243,13 @@ static NTSTATUS open_dll_file( const char *name, HANDLE *mapping, void **module, /*********************************************************************** * open_builtin_file */ -static NTSTATUS open_builtin_file( char *name, HANDLE *mapping, void **module, +static NTSTATUS open_builtin_file( char *name, OBJECT_ATTRIBUTES *attr, HANDLE *mapping, void **module, SECTION_IMAGE_INFORMATION *image_info, struct stat *st ) { NTSTATUS status; int fd; - status = open_dll_file( name, mapping, module, image_info, st ); + status = open_dll_file( name, attr, mapping, module, image_info, st ); if (status != STATUS_DLL_NOT_FOUND) return status; /* try .so file */ @@ -1305,17 +1304,24 @@ static NTSTATUS map_builtin_module( HANDLE mapping, void **module, struct stat * /*********************************************************************** * load_builtin_dll */ -static NTSTATUS CDECL load_builtin_dll( const WCHAR *name, void **module, void **unix_entry, +static NTSTATUS CDECL load_builtin_dll( UNICODE_STRING *nt_name, void **module, void **unix_entry, SECTION_IMAGE_INFORMATION *image_info ) { - unsigned int i, pos, len, namelen, maxlen = 0; + unsigned int i, pos, namepos, namelen, maxlen = 0; + unsigned int len = nt_name->Length / sizeof(WCHAR); char *ptr = NULL, *file, *ext = NULL; + OBJECT_ATTRIBUTES attr; NTSTATUS status = STATUS_DLL_NOT_FOUND; BOOL found_image = FALSE; HANDLE mapping; struct stat st; - len = wcslen( name ); + for (i = namepos = 0; i < len; i++) + if (nt_name->Buffer[i] == '/' || nt_name->Buffer[i] == '\\') namepos = i + 1; + len -= namepos; + if (!len) return STATUS_DLL_NOT_FOUND; + InitializeObjectAttributes( &attr, nt_name, 0, 0, NULL ); + if (build_dir) maxlen = strlen(build_dir) + sizeof("/programs/") + len; maxlen = max( maxlen, dll_path_maxlen + 1 ) + len + sizeof(".so"); @@ -1325,8 +1331,8 @@ static NTSTATUS CDECL load_builtin_dll( const WCHAR *name, void **module, void * /* we don't want to depend on the current codepage here */ for (i = 0; i < len; i++) { - if (name[i] > 127) goto done; - file[pos + i] = (char)name[i]; + if (nt_name->Buffer[namepos + i] > 127) goto done; + file[pos + i] = (char)nt_name->Buffer[namepos + i]; if (file[pos + i] >= 'A' && file[pos + i] <= 'Z') file[pos + i] += 'a' - 'A'; else if (file[pos + i] == '.') ext = file + pos + i; } @@ -1342,7 +1348,7 @@ static NTSTATUS CDECL load_builtin_dll( const WCHAR *name, void **module, void * ptr = prepend( ptr, ptr, namelen ); ptr = prepend( ptr, "/dlls", sizeof("/dlls") - 1 ); ptr = prepend( ptr, build_dir, strlen(build_dir) ); - status = open_builtin_file( ptr, &mapping, module, image_info, &st ); + status = open_builtin_file( ptr, &attr, &mapping, module, image_info, &st ); if (status != STATUS_DLL_NOT_FOUND) goto done; /* now as a program */ @@ -1353,7 +1359,7 @@ static NTSTATUS CDECL load_builtin_dll( const WCHAR *name, void **module, void * ptr = prepend( ptr, ptr, namelen ); ptr = prepend( ptr, "/programs", sizeof("/programs") - 1 ); ptr = prepend( ptr, build_dir, strlen(build_dir) ); - status = open_builtin_file( ptr, &mapping, module, image_info, &st ); + status = open_builtin_file( ptr, &attr, &mapping, module, image_info, &st ); if (status != STATUS_DLL_NOT_FOUND) goto done; } @@ -1361,13 +1367,13 @@ static NTSTATUS CDECL load_builtin_dll( const WCHAR *name, void **module, void * { file[pos + len + 1] = 0; ptr = prepend( file + pos, dll_paths[i], strlen(dll_paths[i]) ); - status = open_builtin_file( ptr, &mapping, module, image_info, &st ); + status = open_builtin_file( ptr, &attr, &mapping, module, image_info, &st ); if (status == STATUS_IMAGE_MACHINE_TYPE_MISMATCH) found_image = TRUE; else if (status != STATUS_DLL_NOT_FOUND) goto done; } if (found_image) status = STATUS_IMAGE_MACHINE_TYPE_MISMATCH; - WARN( "cannot find builtin library for %s\n", debugstr_w(name) ); + WARN( "cannot find builtin library for %s\n", debugstr_us(nt_name) ); done: if (!status && !*module) @@ -1495,15 +1501,23 @@ found: */ static void load_ntdll(void) { + static WCHAR path[] = {'\\','?','?','\\','C',':','\\','w','i','n','d','o','w','s','\\', + 's','y','s','t','e','m','3','2','\\','n','t','d','l','l','.','d','l','l',0}; NTSTATUS status; SECTION_IMAGE_INFORMATION info; + OBJECT_ATTRIBUTES attr; + UNICODE_STRING str; HANDLE mapping; struct stat st; void *module; char *name = build_path( dll_dir, "ntdll.dll.so" ); + str.Buffer = path; + str.Length = sizeof(path) - sizeof(WCHAR); + str.MaximumLength = sizeof(path); + InitializeObjectAttributes( &attr, &str, 0, 0, NULL ); name[strlen(name) - 3] = 0; /* remove .so */ - status = open_builtin_file( name, &mapping, &module, &info, &st ); + status = open_builtin_file( name, &attr, &mapping, &module, &info, &st ); if (!status && !module) { status = map_builtin_module( mapping, &module, &st ); diff --git a/dlls/ntdll/unixlib.h b/dlls/ntdll/unixlib.h index 0847c7e07ca..ed78d08559a 100644 --- a/dlls/ntdll/unixlib.h +++ b/dlls/ntdll/unixlib.h @@ -27,7 +27,7 @@ struct _DISPATCHER_CONTEXT; /* increment this when you change the function table */ -#define NTDLL_UNIXLIB_VERSION 107 +#define NTDLL_UNIXLIB_VERSION 108 struct unix_funcs { @@ -87,7 +87,7 @@ struct unix_funcs /* loader functions */ NTSTATUS (CDECL *load_so_dll)( UNICODE_STRING *nt_name, void **module ); - NTSTATUS (CDECL *load_builtin_dll)( const WCHAR *name, void **module, void **unix_entry, + NTSTATUS (CDECL *load_builtin_dll)( UNICODE_STRING *name, void **module, void **unix_entry, SECTION_IMAGE_INFORMATION *image_info ); NTSTATUS (CDECL *unload_builtin_dll)( void *module ); void (CDECL *init_builtin_dll)( void *module );

1 0

Alexandre Julliard : ntdll: Pass the NT name in the create_file request.
by Alexandre Julliard 09 Feb '21

09 Feb '21

Module: wine Branch: master Commit: 76b3284388f8802f82f2fd7d60720b41e4c488da URL: https://source.winehq.org/git/wine.git/?a=commit;h=76b3284388f8802f82f2fd7d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 9 13:29:22 2021 +0100 ntdll: Pass the NT name in the create_file request. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/env.c | 21 ++++++------- dlls/ntdll/unix/file.c | 68 +++++++++++++++++++++++++++++++----------- dlls/ntdll/unix/loader.c | 2 +- dlls/ntdll/unix/process.c | 2 +- dlls/ntdll/unix/unix_private.h | 3 +- server/file.c | 11 ++----- 6 files changed, 67 insertions(+), 40 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=76b3284388f8802f82f2…

1 0

Alexandre Julliard : ntdll: Pass the NT name in the set_fd_name_info request.
by Alexandre Julliard 09 Feb '21

09 Feb '21

Module: wine Branch: master Commit: 9e255ba4e05be3e316fe13f8c7eeec12de8d39ad URL: https://source.winehq.org/git/wine.git/?a=commit;h=9e255ba4e05be3e316fe13f8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 9 13:31:26 2021 +0100 ntdll: Pass the NT name in the set_fd_name_info request. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/file.c | 4 ++++ include/wine/server_protocol.h | 5 +++-- server/fd.c | 9 ++++++++- server/protocol.def | 2 ++ server/request.h | 5 +++-- server/trace.c | 2 ++ 6 files changed, 22 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index 84342ba469f..6337433ed80 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -4387,8 +4387,10 @@ NTSTATUS WINAPI NtSetInformationFile( HANDLE handle, IO_STATUS_BLOCK *io, { req->handle = wine_server_obj_handle( handle ); req->rootdir = wine_server_obj_handle( attr.RootDirectory ); + req->namelen = nt_name.Length; req->link = FALSE; req->replace = info->ReplaceIfExists; + wine_server_add_data( req, nt_name.Buffer, nt_name.Length ); wine_server_add_data( req, unix_name, strlen(unix_name) ); io->u.Status = wine_server_call( req ); } @@ -4425,8 +4427,10 @@ NTSTATUS WINAPI NtSetInformationFile( HANDLE handle, IO_STATUS_BLOCK *io, { req->handle = wine_server_obj_handle( handle ); req->rootdir = wine_server_obj_handle( attr.RootDirectory ); + req->namelen = nt_name.Length; req->link = TRUE; req->replace = info->ReplaceIfExists; + wine_server_add_data( req, nt_name.Buffer, nt_name.Length ); wine_server_add_data( req, unix_name, strlen(unix_name) ); io->u.Status = wine_server_call( req ); } diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index c848b71423c..a515ab2aa86 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -5130,10 +5130,11 @@ struct set_fd_name_info_request struct request_header __header; obj_handle_t handle; obj_handle_t rootdir; + data_size_t namelen; int link; int replace; + /* VARARG(name,unicode_str,namelen); */ /* VARARG(filename,string); */ - char __pad_28[4]; }; struct set_fd_name_info_reply { @@ -6279,7 +6280,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 670 +#define SERVER_PROTOCOL_VERSION 671 /* ### protocol_version end ### */ diff --git a/server/fd.c b/server/fd.c index 848203f31ec..079508c2d95 100644 --- a/server/fd.c +++ b/server/fd.c @@ -2825,6 +2825,12 @@ DECL_HANDLER(set_fd_name_info) { struct fd *fd, *root_fd = NULL; + if (req->namelen > get_req_data_size()) + { + set_error( STATUS_INVALID_PARAMETER ); + return; + } + if (req->rootdir) { struct dir *root; @@ -2837,7 +2843,8 @@ DECL_HANDLER(set_fd_name_info) if ((fd = get_handle_fd_obj( current->process, req->handle, 0 ))) { - set_fd_name( fd, root_fd, get_req_data(), get_req_data_size(), req->link, req->replace ); + set_fd_name( fd, root_fd, (const char *)get_req_data() + req->namelen, + get_req_data_size() - req->namelen, req->link, req->replace ); release_object( fd ); } if (root_fd) release_object( root_fd ); diff --git a/server/protocol.def b/server/protocol.def index 9fbe02f2f99..49a0566d09e 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -3542,8 +3542,10 @@ struct handle_info @REQ(set_fd_name_info) obj_handle_t handle; /* handle to a file or directory */ obj_handle_t rootdir; /* root directory */ + data_size_t namelen; /* length of NT name in bytes */ int link; /* link instead of renaming */ int replace; /* replace an existing file? */ + VARARG(name,unicode_str,namelen); /* NT name */ VARARG(filename,string); /* new file name */ @END diff --git a/server/request.h b/server/request.h index 39ba4377fd1..094a6d2e6fb 100644 --- a/server/request.h +++ b/server/request.h @@ -2173,8 +2173,9 @@ C_ASSERT( FIELD_OFFSET(struct set_fd_disp_info_request, unlink) == 16 ); C_ASSERT( sizeof(struct set_fd_disp_info_request) == 24 ); C_ASSERT( FIELD_OFFSET(struct set_fd_name_info_request, handle) == 12 ); C_ASSERT( FIELD_OFFSET(struct set_fd_name_info_request, rootdir) == 16 ); -C_ASSERT( FIELD_OFFSET(struct set_fd_name_info_request, link) == 20 ); -C_ASSERT( FIELD_OFFSET(struct set_fd_name_info_request, replace) == 24 ); +C_ASSERT( FIELD_OFFSET(struct set_fd_name_info_request, namelen) == 20 ); +C_ASSERT( FIELD_OFFSET(struct set_fd_name_info_request, link) == 24 ); +C_ASSERT( FIELD_OFFSET(struct set_fd_name_info_request, replace) == 28 ); C_ASSERT( sizeof(struct set_fd_name_info_request) == 32 ); C_ASSERT( FIELD_OFFSET(struct get_window_layered_info_request, handle) == 12 ); C_ASSERT( sizeof(struct get_window_layered_info_request) == 16 ); diff --git a/server/trace.c b/server/trace.c index e8636013b0e..1d495e4fb42 100644 --- a/server/trace.c +++ b/server/trace.c @@ -4292,8 +4292,10 @@ static void dump_set_fd_name_info_request( const struct set_fd_name_info_request { fprintf( stderr, " handle=%04x", req->handle ); fprintf( stderr, ", rootdir=%04x", req->rootdir ); + fprintf( stderr, ", namelen=%u", req->namelen ); fprintf( stderr, ", link=%d", req->link ); fprintf( stderr, ", replace=%d", req->replace ); + dump_varargs_unicode_str( ", name=", min(cur_size,req->namelen) ); dump_varargs_string( ", filename=", cur_size ); }

1 0

Alexandre Julliard : server: Store the NT name in the fd object.
by Alexandre Julliard 09 Feb '21

09 Feb '21

Module: wine Branch: master Commit: bb009426719080ae212639552ef3a236c3f6de3a URL: https://source.winehq.org/git/wine.git/?a=commit;h=bb009426719080ae21263955… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 9 14:11:07 2021 +0100 server: Store the NT name in the fd object. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/device.c | 4 +++- server/fd.c | 68 ++++++++++++++++++++++++++++++++++++++++++++++++++++---- server/file.c | 11 +++++---- server/file.h | 6 +++-- server/unicode.c | 5 ++++- 5 files changed, 82 insertions(+), 12 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=bb009426719080ae2126…

1 0

Alexandre Julliard : server: Return the NT name for the ProcessImageFileName query.
by Alexandre Julliard 09 Feb '21

09 Feb '21

Module: wine Branch: master Commit: 3bb53815877cd9f2694809cbfdcd95d137e7edc6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3bb53815877cd9f2694809cb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 9 16:14:27 2021 +0100 server: Return the NT name for the ProcessImageFileName query. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/debug.c | 7 ++--- dlls/ntdll/unix/process.c | 15 +++++----- include/wine/server_protocol.h | 42 +++++++++++++-------------- server/file.h | 1 + server/mapping.c | 8 ++++++ server/process.c | 64 ++++++++++++++++++++---------------------- server/protocol.def | 21 +++++++------- server/request.h | 15 +++++----- server/trace.c | 31 ++++++++++---------- 9 files changed, 102 insertions(+), 102 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3bb53815877cd9f26948…

1 0

Alexandre Julliard : server: Return the NT name for the list_processes request.
by Alexandre Julliard 09 Feb '21

09 Feb '21

Module: wine Branch: master Commit: 146ed693d60d2eee98b1afef5b4c6a3f7652c455 URL: https://source.winehq.org/git/wine.git/?a=commit;h=146ed693d60d2eee98b1afef… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 9 16:25:26 2021 +0100 server: Return the NT name for the list_processes request. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/process.c | 21 +++++++++------------ server/process.h | 6 ------ 2 files changed, 9 insertions(+), 18 deletions(-) diff --git a/server/process.c b/server/process.c index f49cfe99a82..229c8b44e95 100644 --- a/server/process.c +++ b/server/process.c @@ -1822,6 +1822,7 @@ DECL_HANDLER(list_processes) { struct process *process; struct thread *thread; + struct unicode_str nt_name; unsigned int pos = 0; char *buffer; @@ -1830,10 +1831,10 @@ DECL_HANDLER(list_processes) LIST_FOR_EACH_ENTRY( process, &process_list, struct process, entry ) { - struct process_dll *exe = get_process_exe_module( process ); + struct memory_view *view = get_exe_view( process ); + if (!view || !get_view_nt_name( view, &nt_name )) nt_name.len = 0; reply->info_size = (reply->info_size + 7) & ~7; - reply->info_size += sizeof(struct process_info); - if (exe) reply->info_size += exe->namelen; + reply->info_size += sizeof(struct process_info) + nt_name.len; reply->info_size = (reply->info_size + 7) & ~7; reply->info_size += process->running_threads * sizeof(struct thread_info); reply->process_count++; @@ -1851,12 +1852,13 @@ DECL_HANDLER(list_processes) LIST_FOR_EACH_ENTRY( process, &process_list, struct process, entry ) { struct process_info *process_info; - struct process_dll *exe = get_process_exe_module( process ); + struct memory_view *view = get_exe_view( process ); pos = (pos + 7) & ~7; + if (!view || !get_view_nt_name( view, &nt_name )) nt_name.len = 0; process_info = (struct process_info *)(buffer + pos); process_info->start_time = process->start_time; - process_info->name_len = exe ? exe->namelen : 0; + process_info->name_len = nt_name.len; process_info->thread_count = process->running_threads; process_info->priority = process->priority; process_info->pid = process->id; @@ -1864,13 +1866,8 @@ DECL_HANDLER(list_processes) process_info->handle_count = get_handle_table_count(process); process_info->unix_pid = process->unix_pid; pos += sizeof(*process_info); - - if (exe) - { - memcpy( buffer + pos, exe->filename, exe->namelen ); - pos += exe->namelen; - } - + memcpy( buffer + pos, nt_name.str, nt_name.len ); + pos += nt_name.len; pos = (pos + 7) & ~7; LIST_FOR_EACH_ENTRY( thread, &process->thread_list, struct thread, proc_entry ) { diff --git a/server/process.h b/server/process.h index caab869c8a0..0c69ede9a46 100644 --- a/server/process.h +++ b/server/process.h @@ -153,10 +153,4 @@ static inline int is_process_init_done( struct process *process ) return process->startup_state == STARTUP_DONE; } -static inline struct process_dll *get_process_exe_module( struct process *process ) -{ - struct list *ptr = list_head( &process->dlls ); - return ptr ? LIST_ENTRY( ptr, struct process_dll, entry ) : NULL; -} - #endif /* __WINE_SERVER_PROCESS_H */

1 0

Rémi Bernon : widl: Support WinRT activatable attribute parsing.
by Alexandre Julliard 09 Feb '21

09 Feb '21

Module: wine Branch: master Commit: 30129c2837244ecb8394ad47aa545818155a11cd URL: https://source.winehq.org/git/wine.git/?a=commit;h=30129c2837244ecb8394ad47… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Feb 9 10:37:19 2021 +0100 widl: Support WinRT activatable attribute parsing. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/parser.l | 1 + tools/widl/parser.y | 3 +++ tools/widl/widltypes.h | 1 + 3 files changed, 5 insertions(+) diff --git a/tools/widl/parser.l b/tools/widl/parser.l index 8acc9c9590c..d726e76744e 100644 --- a/tools/widl/parser.l +++ b/tools/widl/parser.l @@ -320,6 +320,7 @@ static const struct keyword keywords[] = { */ static const struct keyword attr_keywords[] = { + {"activatable", tACTIVATABLE, 1}, {"aggregatable", tAGGREGATABLE, 0}, {"agile", tAGILE, 1}, {"all_nodes", tALLNODES, 0}, diff --git a/tools/widl/parser.y b/tools/widl/parser.y index b43a1cdd5f2..eaeba90609d 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -166,6 +166,7 @@ static typelib_t *current_typelib; %token GREATEREQUAL LESSEQUAL %token LOGICALOR LOGICALAND %token ELLIPSIS +%token tACTIVATABLE %token tAGGREGATABLE %token tAGILE %token tALLNODES tALLOCATE tANNOTATION @@ -539,6 +540,7 @@ contract_req: decl_spec ',' contract_ver { if ($1->type->type_type != TYPE_APICO } attribute: { $$ = NULL; } + | tACTIVATABLE '(' contract_req ')' { $$ = make_attrp(ATTR_ACTIVATABLE, $3); } | tAGGREGATABLE { $$ = make_attr(ATTR_AGGREGATABLE); } | tANNOTATION '(' aSTRING ')' { $$ = make_attrp(ATTR_ANNOTATION, $3); } | tAPPOBJECT { $$ = make_attr(ATTR_APPOBJECT); } @@ -2162,6 +2164,7 @@ struct allowed_attr struct allowed_attr allowed_attr[] = { /* attr { D ACF M I Fn ARG T En Enm St Un Fi L DI M C AC R <display name> } */ + /* ATTR_ACTIVATABLE */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, "activatable" }, /* ATTR_AGGREGATABLE */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, "aggregatable" }, /* ATTR_ALLOCATE */ { 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "allocate" }, /* ATTR_ANNOTATION */ { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "annotation" }, diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h index 0fba33d6a09..5d4532d6434 100644 --- a/tools/widl/widltypes.h +++ b/tools/widl/widltypes.h @@ -69,6 +69,7 @@ typedef struct list warning_list_t; enum attr_type { + ATTR_ACTIVATABLE, ATTR_AGGREGATABLE, ATTR_ALLOCATE, ATTR_ANNOTATION,

1 0

Rémi Bernon : widl: Support WinRT static attribute parsing.
by Alexandre Julliard 09 Feb '21

09 Feb '21

Module: wine Branch: master Commit: 1442ddf942ab1c75a061380298de6f5aff2f4c06 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1442ddf942ab1c75a0613802… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Feb 9 10:37:20 2021 +0100 widl: Support WinRT static attribute parsing. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/parser.l | 1 + tools/widl/parser.y | 8 ++++++++ tools/widl/widltypes.h | 1 + 3 files changed, 10 insertions(+) diff --git a/tools/widl/parser.l b/tools/widl/parser.l index d726e76744e..9b93a53b839 100644 --- a/tools/widl/parser.l +++ b/tools/widl/parser.l @@ -427,6 +427,7 @@ static const struct keyword attr_keywords[] = {"size_is", tSIZEIS, 0}, {"source", tSOURCE, 0}, {"standard", tSTANDARD, 1}, + {"static", tSTATIC, 1}, {"strict_context_handle", tSTRICTCONTEXTHANDLE, 0}, {"string", tSTRING, 0}, {"switch_is", tSWITCHIS, 0}, diff --git a/tools/widl/parser.y b/tools/widl/parser.y index eaeba90609d..b8c916f8336 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -277,6 +277,7 @@ static typelib_t *current_typelib; %type <expr> m_expr expr expr_const expr_int_const array m_bitfield %type <expr_list> m_exprs /* exprs expr_list */ expr_list_int_const %type <expr> contract_req +%type <expr> static_attr %type <stgclass> storage_cls_spec %type <type_qualifier> type_qualifier m_type_qual_list %type <function_specifier> function_specifier @@ -539,6 +540,11 @@ contract_req: decl_spec ',' contract_ver { if ($1->type->type_type != TYPE_APICO $$ = make_exprt(EXPR_GTREQL, declare_var(NULL, $1, make_declarator(NULL), 0), $$); } +static_attr: decl_spec ',' contract_req { if ($1->type->type_type != TYPE_INTERFACE) + error_loc("type %s is not an interface\n", $1->type->name); + $$ = make_exprt(EXPR_MEMBER, declare_var(NULL, $1, make_declarator(NULL), 0), $3); + } + attribute: { $$ = NULL; } | tACTIVATABLE '(' contract_req ')' { $$ = make_attrp(ATTR_ACTIVATABLE, $3); } | tAGGREGATABLE { $$ = make_attr(ATTR_AGGREGATABLE); } @@ -637,6 +643,7 @@ attribute: { $$ = NULL; } | tRETVAL { $$ = make_attr(ATTR_RETVAL); } | tSIZEIS '(' m_exprs ')' { $$ = make_attrp(ATTR_SIZEIS, $3); } | tSOURCE { $$ = make_attr(ATTR_SOURCE); } + | tSTATIC '(' static_attr ')' { $$ = make_attrp(ATTR_STATIC, $3); } | tSTRICTCONTEXTHANDLE { $$ = make_attr(ATTR_STRICTCONTEXTHANDLE); } | tSTRING { $$ = make_attr(ATTR_STRING); } | tSWITCHIS '(' expr ')' { $$ = make_attrp(ATTR_SWITCHIS, $3); } @@ -2258,6 +2265,7 @@ struct allowed_attr allowed_attr[] = /* ATTR_RETVAL */ { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "retval" }, /* ATTR_SIZEIS */ { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, "size_is" }, /* ATTR_SOURCE */ { 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, "source" }, + /* ATTR_STATIC */ { 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, "static" }, /* ATTR_STRICTCONTEXTHANDLE */ { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "strict_context_handle" }, /* ATTR_STRING */ { 1, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, "string" }, /* ATTR_SWITCHIS */ { 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, "switch_is" }, diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h index 5d4532d6434..facfff21453 100644 --- a/tools/widl/widltypes.h +++ b/tools/widl/widltypes.h @@ -163,6 +163,7 @@ enum attr_type ATTR_RETVAL, ATTR_SIZEIS, ATTR_SOURCE, + ATTR_STATIC, ATTR_STRICTCONTEXTHANDLE, ATTR_STRING, ATTR_SWITCHIS,

1 0

Rémi Bernon : widl: Support WinRT requires keyword.
by Alexandre Julliard 09 Feb '21

09 Feb '21

Module: wine Branch: master Commit: daba929a521163d1cb49106425d5e6184bcf8e8f URL: https://source.winehq.org/git/wine.git/?a=commit;h=daba929a521163d1cb491064… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Feb 9 10:37:21 2021 +0100 widl: Support WinRT requires keyword. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/parser.l | 1 + tools/widl/parser.y | 16 +++++++++++++--- tools/widl/typetree.c | 34 +++++++++++++++++++++++++++++++++- tools/widl/typetree.h | 9 ++++++++- tools/widl/widltypes.h | 1 + 5 files changed, 56 insertions(+), 5 deletions(-) diff --git a/tools/widl/parser.l b/tools/widl/parser.l index 9b93a53b839..946dba84cd6 100644 --- a/tools/widl/parser.l +++ b/tools/widl/parser.l @@ -298,6 +298,7 @@ static const struct keyword keywords[] = { {"pascal", tPASCAL, 0}, {"properties", tPROPERTIES, 0}, {"register", tREGISTER, 0}, + {"requires", tREQUIRES, 1}, {"runtimeclass", tRUNTIMECLASS, 1}, {"short", tSHORT, 0}, {"signed", tSIGNED, 0}, diff --git a/tools/widl/parser.y b/tools/widl/parser.y index b8c916f8336..a6128074f2d 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -240,6 +240,7 @@ static typelib_t *current_typelib; %token tREADONLY tREF %token tREGISTER tREPRESENTAS %token tREQUESTEDIT +%token tREQUIRES %token tRESTRICTED %token tRETVAL %token tRUNTIMECLASS @@ -293,6 +294,7 @@ static typelib_t *current_typelib; %type <type> type unqualified_type qualified_type %type <ifref> class_interface %type <ifref_list> class_interfaces +%type <ifref_list> requires required_types %type <var> arg ne_union_field union_field s_field case enum enum_member declaration %type <var> funcdef %type <var_list> m_args arg_list args dispint_meths @@ -967,8 +969,16 @@ inherit: { $$ = NULL; } interface: tINTERFACE typename { $$ = type_interface_declare($2, current_namespace); } ; -interfacedef: attributes interface inherit - '{' int_statements '}' semicolon_opt { $$ = type_interface_define($2, $1, $3, $5); +required_types: + qualified_type { $$ = append_ifref(NULL, make_ifref($1)); } + | required_types ',' qualified_type { $$ = append_ifref($1, make_ifref($3)); } + +requires: { $$ = NULL; } + | tREQUIRES required_types { $$ = $2; } + ; + +interfacedef: attributes interface inherit requires + '{' int_statements '}' semicolon_opt { $$ = type_interface_define($2, $1, $3, $6, $4); check_async_uuid($$); } | dispinterfacedef semicolon_opt { $$ = $1; } @@ -2981,7 +2991,7 @@ static void check_async_uuid(type_t *iface) stmts = append_statement(stmts, make_statement_declaration(finish_func)); } - type_interface_define(async_iface, map_attrs(iface->attrs, async_iface_attrs), inherit, stmts); + type_interface_define(async_iface, map_attrs(iface->attrs, async_iface_attrs), inherit, stmts, NULL); iface->details.iface->async_iface = async_iface->details.iface->async_iface = async_iface; } diff --git a/tools/widl/typetree.c b/tools/widl/typetree.c index b3f0725f00e..3c2f183eb13 100644 --- a/tools/widl/typetree.c +++ b/tools/widl/typetree.c @@ -441,7 +441,7 @@ type_t *type_interface_declare(char *name, struct namespace *namespace) return type; } -type_t *type_interface_define(type_t *iface, attr_list_t *attrs, type_t *inherit, statement_list_t *stmts) +type_t *type_interface_define(type_t *iface, attr_list_t *attrs, type_t *inherit, statement_list_t *stmts, ifref_list_t *requires) { if (iface->defined) error_loc("interface %s already defined at %s:%d\n", @@ -457,6 +457,7 @@ type_t *type_interface_define(type_t *iface, attr_list_t *attrs, type_t *inherit iface->details.iface->inherit = inherit; iface->details.iface->disp_inherit = NULL; iface->details.iface->async_iface = NULL; + iface->details.iface->requires = requires; iface->defined = TRUE; compute_method_indexes(iface); return iface; @@ -485,6 +486,7 @@ type_t *type_dispinterface_define(type_t *iface, attr_list_t *attrs, var_list_t if (!iface->details.iface->inherit) error_loc("IDispatch is undefined\n"); iface->details.iface->disp_inherit = NULL; iface->details.iface->async_iface = NULL; + iface->details.iface->requires = NULL; iface->defined = TRUE; compute_method_indexes(iface); return iface; @@ -504,6 +506,7 @@ type_t *type_dispinterface_define_from_iface(type_t *dispiface, attr_list_t *att if (!dispiface->details.iface->inherit) error_loc("IDispatch is undefined\n"); dispiface->details.iface->disp_inherit = iface; dispiface->details.iface->async_iface = NULL; + dispiface->details.iface->requires = NULL; dispiface->defined = TRUE; compute_method_indexes(dispiface); return dispiface; @@ -561,6 +564,9 @@ type_t *type_runtimeclass_declare(char *name, struct namespace *namespace) type_t *type_runtimeclass_define(type_t *runtimeclass, attr_list_t *attrs, ifref_list_t *ifaces) { + ifref_t *ifref, *required, *tmp; + ifref_list_t *requires; + if (runtimeclass->defined) error_loc("runtimeclass %s already defined at %s:%d\n", runtimeclass->name, runtimeclass->loc_info.input_name, runtimeclass->loc_info.line_number); @@ -569,6 +575,28 @@ type_t *type_runtimeclass_define(type_t *runtimeclass, attr_list_t *attrs, ifref runtimeclass->defined = TRUE; if (!type_runtimeclass_get_default_iface(runtimeclass)) error_loc("missing default interface on runtimeclass %s\n", runtimeclass->name); + + LIST_FOR_EACH_ENTRY(ifref, ifaces, ifref_t, entry) + { + /* FIXME: this should probably not be allowed, here or in coclass, */ + /* but for now there's too many places in Wine IDL where it is to */ + /* even print a warning. */ + if (!(ifref->iface->defined)) continue; + if (!(requires = type_iface_get_requires(ifref->iface))) continue; + LIST_FOR_EACH_ENTRY(required, requires, ifref_t, entry) + { + int found = 0; + + LIST_FOR_EACH_ENTRY(tmp, ifaces, ifref_t, entry) + if ((found = type_is_equal(tmp->iface, required->iface))) break; + + if (!found) + error_loc("interface '%s' also requires interface '%s', " + "but runtimeclass '%s' does not implement it.\n", + ifref->iface->name, required->iface->name, runtimeclass->name); + } + } + return runtimeclass; } @@ -593,8 +621,12 @@ type_t *type_apicontract_define(type_t *apicontract, attr_list_t *attrs) int type_is_equal(const type_t *type1, const type_t *type2) { + if (type1 == type2) + return TRUE; if (type_get_type_detect_alias(type1) != type_get_type_detect_alias(type2)) return FALSE; + if (type1->namespace != type2->namespace) + return FALSE; if (type1->name && type2->name) return !strcmp(type1->name, type2->name); diff --git a/tools/widl/typetree.h b/tools/widl/typetree.h index 8e04537ab4d..9866d2a1e98 100644 --- a/tools/widl/typetree.h +++ b/tools/widl/typetree.h @@ -53,7 +53,7 @@ type_t *type_new_encapsulated_union(char *name, var_t *switch_field, var_t *unio type_t *type_new_bitfield(type_t *field_type, const expr_t *bits); type_t *type_runtimeclass_declare(char *name, struct namespace *namespace); type_t *type_interface_declare(char *name, struct namespace *namespace); -type_t *type_interface_define(type_t *iface, attr_list_t *attrs, type_t *inherit, statement_list_t *stmts); +type_t *type_interface_define(type_t *iface, attr_list_t *attrs, type_t *inherit, statement_list_t *stmts, ifref_list_t *requires); type_t *type_dispinterface_declare(char *name); type_t *type_dispinterface_define(type_t *iface, attr_list_t *attrs, var_list_t *props, var_list_t *methods); type_t *type_dispinterface_define_from_iface(type_t *dispiface, attr_list_t *attrs, type_t *iface); @@ -181,6 +181,13 @@ static inline type_t *type_iface_get_inherit(const type_t *type) return type->details.iface->inherit; } +static inline ifref_list_t *type_iface_get_requires(const type_t *type) +{ + type = type_get_real_type(type); + assert(type_get_type(type) == TYPE_INTERFACE); + return type->details.iface->requires; +} + static inline type_t *type_iface_get_async_iface(const type_t *type) { type = type_get_real_type(type); diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h index facfff21453..e22d425e85b 100644 --- a/tools/widl/widltypes.h +++ b/tools/widl/widltypes.h @@ -386,6 +386,7 @@ struct iface_details struct _type_t *inherit; struct _type_t *disp_inherit; struct _type_t *async_iface; + ifref_list_t *requires; }; struct module_details

1 0