wine-commits February 2021

wine-commits@winehq.org

2 participants
915 discussions

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 : 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 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

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

Timothy Pearson : widl: Add PPC64 support.
by Alexandre Julliard 09 Feb '21

09 Feb '21

Module: wine Branch: master Commit: fe723c267368bea1745363f22ed0888a018eff7a URL: https://source.winehq.org/git/wine.git/?a=commit;h=fe723c267368bea1745363f2… Author: Timothy Pearson <tpearson(a)raptorengineering.com> Date: Sun Jan 31 18:34:15 2021 +0100 widl: Add PPC64 support. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/widl.c | 38 +++++++++++++++++++++++--------------- tools/widl/widl.h | 2 +- 2 files changed, 24 insertions(+), 16 deletions(-) diff --git a/tools/widl/widl.c b/tools/widl/widl.c index 333351bc11b..99b24e86fdc 100644 --- a/tools/widl/widl.c +++ b/tools/widl/widl.c @@ -97,6 +97,8 @@ static const char version_string[] = "Wine IDL Compiler version " PACKAGE_VERSIO enum target_cpu target_cpu = CPU_x86; #elif defined(__x86_64__) enum target_cpu target_cpu = CPU_x86_64; +#elif defined(__powerpc64__) +enum target_cpu target_cpu = CPU_POWERPC64; #elif defined(__powerpc__) enum target_cpu target_cpu = CPU_POWERPC; #elif defined(__arm__) @@ -281,21 +283,23 @@ static void set_target( const char *target ) enum target_cpu cpu; } cpu_names[] = { - { "i386", CPU_x86 }, - { "i486", CPU_x86 }, - { "i586", CPU_x86 }, - { "i686", CPU_x86 }, - { "i786", CPU_x86 }, - { "amd64", CPU_x86_64 }, - { "x86_64", CPU_x86_64 }, - { "powerpc", CPU_POWERPC }, - { "arm", CPU_ARM }, - { "armv5", CPU_ARM }, - { "armv6", CPU_ARM }, - { "armv7", CPU_ARM }, - { "armv7a", CPU_ARM }, - { "arm64", CPU_ARM64 }, - { "aarch64", CPU_ARM64 }, + { "i386", CPU_x86 }, + { "i486", CPU_x86 }, + { "i586", CPU_x86 }, + { "i686", CPU_x86 }, + { "i786", CPU_x86 }, + { "amd64", CPU_x86_64 }, + { "x86_64", CPU_x86_64 }, + { "powerpc", CPU_POWERPC }, + { "powerpc64", CPU_POWERPC64 }, + { "powerpc64le", CPU_POWERPC64 }, + { "arm", CPU_ARM }, + { "armv5", CPU_ARM }, + { "armv6", CPU_ARM }, + { "armv7", CPU_ARM }, + { "armv7a", CPU_ARM }, + { "arm64", CPU_ARM64 }, + { "aarch64", CPU_ARM64 }, }; unsigned int i; @@ -796,6 +800,10 @@ int main(int argc,char *argv[]) if (pointer_size == 4) error( "Cannot build 32-bit code for this CPU\n" ); pointer_size = 8; break; + case CPU_POWERPC64: + if (pointer_size == 4) error( "Cannot build 32-bit code for this CPU\n" ); + pointer_size = 8; + break; default: if (pointer_size == 8) error( "Cannot build 64-bit code for this CPU\n" ); pointer_size = 4; diff --git a/tools/widl/widl.h b/tools/widl/widl.h index 4f4252e3ea3..bc6226c54fe 100644 --- a/tools/widl/widl.h +++ b/tools/widl/widl.h @@ -76,7 +76,7 @@ extern int char_number; enum target_cpu { - CPU_x86, CPU_x86_64, CPU_POWERPC, CPU_ARM, CPU_ARM64, CPU_LAST = CPU_ARM64 + CPU_x86, CPU_x86_64, CPU_POWERPC, CPU_ARM, CPU_ARM64, CPU_POWERPC64, CPU_LAST = CPU_POWERPC64 }; extern enum target_cpu target_cpu;

1 0

Jactry Zeng : shell32: Implement IFileOperation stub.
by Alexandre Julliard 09 Feb '21

09 Feb '21

Module: wine Branch: master Commit: 4a1bd593f39b0852ca8fccbf0e54f7c00b3783ec URL: https://source.winehq.org/git/wine.git/?a=commit;h=4a1bd593f39b0852ca8fccbf… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Sun Jan 24 21:08:51 2021 +0800 shell32: Implement IFileOperation stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48848 Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shell32_classes.idl | 6 + dlls/shell32/shell32_main.h | 1 + dlls/shell32/shellole.c | 1 + dlls/shell32/shlfileop.c | 249 +++++++++++++++++++++++++++++++++++++++ dlls/shell32/tests/shlfileop.c | 29 +++++ 5 files changed, 286 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4a1bd593f39b0852ca8f…

1 0

Jactry Zeng : include: Add IFileOperation interface.
by Alexandre Julliard 09 Feb '21

09 Feb '21

Module: wine Branch: master Commit: 0c19e2e487d36a89531daf4897c0b6390d82a843 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0c19e2e487d36a89531daf48… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Sun Jan 24 21:08:50 2021 +0800 include: Add IFileOperation interface. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/shobjidl.idl | 117 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 117 insertions(+) diff --git a/include/shobjidl.idl b/include/shobjidl.idl index 42ef264ed86..e264a3b18e4 100644 --- a/include/shobjidl.idl +++ b/include/shobjidl.idl @@ -3871,4 +3871,121 @@ library ShellObjects { interface IApplicationActivationManager; } + + [ + uuid(3ad05575-8857-4850-9277-11b85bdb8e09) + ] + coclass FileOperation + { + interface IFileOperation; + } +} + +[v1_enum] enum _OPPROGDLGF +{ + OPPROGDLG_DEFAULT = 0x00000000, + OPPROGDLG_ENABLEPAUSE = 0x00000080, + OPPROGDLG_ALLOWUNDO = 0x00000100, + OPPROGDLG_DONTDISPLAYSOURCEPATH = 0x00000200, + OPPROGDLG_DONTDISPLAYDESTPATH = 0x00000400, + OPPROGDLG_NOMULTIDAYESTIMATES = 0x00000800, + OPPROGDLG_DONTDISPLAYLOCATIONS = 0x00001000, +}; +typedef DWORD OPPROGDLGF; + +typedef [v1_enum] enum _SPACTION { + SPACTION_NONE, + SPACTION_MOVING, + SPACTION_COPYING, + SPACTION_RECYCLING, + SPACTION_APPLYINGATTRIBS, + SPACTION_DOWNLOADING, + SPACTION_SEARCHING_INTERNET, + SPACTION_CALCULATING, + SPACTION_UPLOADING, + SPACTION_SEARCHING_FILES, + SPACTION_DELETING, + SPACTION_RENAMING, + SPACTION_FORMATTING, + SPACTION_COPY_MOVING, +} SPACTION; + +[ + object, + uuid(0c9fb851-e5c9-43eb-a370-f0677b13874c), + pointer_default(unique) +] +interface IOperationsProgressDialog : IUnknown +{ + [v1_enum] enum _PDMODE + { + PDM_DEFAULT = 0x00000000, + PDM_RUN = 0x00000001, + PDM_PREFLIGHT = 0x00000002, + PDM_UNDOING = 0x00000004, + PDM_ERRORSBLOCKING = 0x00000008, + PDM_INDETERMINATE = 0x00000010, + }; + typedef DWORD PDMODE; + + typedef [v1_enum] enum PDOPSTATUS + { + PDOPS_RUNNING = 1, + PDOPS_PAUSED, + PDOPS_CANCELLED, + PDOPS_STOPPED, + PDOPS_ERRORS + } PDOPSTATUS; + + HRESULT StartProgressDialog([in, unique] HWND owner, [in] OPPROGDLGF flags); + HRESULT StopProgressDialog(); + HRESULT SetOperation([in] SPACTION action); + HRESULT SetMode([in] PDMODE mode); + HRESULT UpdateProgress([in] ULONGLONG current_points, [in] ULONGLONG total_points, + [in] ULONGLONG current_size, [in] ULONGLONG total_size, + [in] ULONGLONG current_item, [in] ULONGLONG total_item); + HRESULT UpdateLocations([in, unique] IShellItem *source, [in, unique] IShellItem *target, + [in, unique] IShellItem *item); + HRESULT ResetTimer(); + HRESULT PauseTimer(); + HRESULT ResumeTimer(); + HRESULT GetMilliseconds([out] ULONGLONG *elapsed, [out] ULONGLONG *remaining); + HRESULT GetOperationStatus([out] PDOPSTATUS *status); +} + +[ + object, + uuid(947aab5f-0a5c-4c13-b4d6-4bf7836fc9f8), + pointer_default(unique) +] +interface IFileOperation : IUnknown +{ + HRESULT Advise([in] IFileOperationProgressSink *sink, [out] DWORD *cookie); + HRESULT Unadvise([in] DWORD cookie); + HRESULT SetOperationFlags([in] DWORD flags); + HRESULT SetProgressMessage([in, string] LPCWSTR message); + HRESULT SetProgressDialog([in] IOperationsProgressDialog *dialog); + HRESULT SetProperties([in] IPropertyChangeArray *array); + HRESULT SetOwnerWindow([in] HWND owner); + HRESULT ApplyPropertiesToItem([in] IShellItem *item); + HRESULT ApplyPropertiesToItems([in] IUnknown *items); + HRESULT RenameItem([in] IShellItem *item, [in, string] LPCWSTR name, + [in, unique] IFileOperationProgressSink *sink); + HRESULT RenameItems([in] IUnknown *items, [in, string] LPCWSTR name); + HRESULT MoveItem([in] IShellItem *item, [in] IShellItem *folder, + [in, unique, string] LPCWSTR name, + [in, unique] IFileOperationProgressSink *sink); + HRESULT MoveItems([in] IUnknown *items, [in] IShellItem *folder); + HRESULT CopyItem([in] IShellItem *item, [in] IShellItem *folder, + [in, unique, string] LPCWSTR name, + [in, unique] IFileOperationProgressSink *sink); + HRESULT CopyItems([in] IUnknown *items, [in] IShellItem *folder); + HRESULT DeleteItem([in] IShellItem *item, + [in, unique] IFileOperationProgressSink *sink); + HRESULT DeleteItems([in] IUnknown *items); + HRESULT NewItem([in] IShellItem *folder, [in] DWORD attributes, + [in, unique, string] LPCWSTR name, [in, unique, string] LPCWSTR template, + [in, unique] IFileOperationProgressSink *sink); + HRESULT PerformOperations(); + HRESULT GetAnyOperationsAborted([out] BOOL *aborted); }

1 0

Rémi Bernon : server: Grow rawinput buffer instead of allocating its maximum size.
by Alexandre Julliard 09 Feb '21

09 Feb '21

Module: wine Branch: master Commit: 50798b1320b24e7c74d350853a895b16881c376d URL: https://source.winehq.org/git/wine.git/?a=commit;h=50798b1320b24e7c74d35085… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Feb 8 12:09:43 2021 +0100 server: Grow rawinput buffer instead of allocating its maximum size. Call of Duty: WWII call GetRawInputBuffer with very large client buffer, so the maximum buffer size may be large and it causes an unnecessary load on wineserver when it allocates and clears the reply buffer. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/queue.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/server/queue.c b/server/queue.c index ad886a3ba80..e47980a4aa8 100644 --- a/server/queue.c +++ b/server/queue.c @@ -3256,12 +3256,11 @@ DECL_HANDLER(get_rawinput_buffer) struct thread_input *input = current->queue->input; data_size_t size = 0, next_size = 0; struct list *ptr; - char *buf, *cur; - int count = 0; + char *buf, *cur, *tmp; + int count = 0, buf_size = 16 * sizeof(struct hardware_msg_data); if (!req->buffer_size) buf = NULL; - else if (!(buf = mem_alloc( get_reply_max_size() ))) - return; + else if (!(buf = mem_alloc( buf_size ))) return; cur = buf; ptr = list_head( &input->msg_list ); @@ -3276,6 +3275,17 @@ DECL_HANDLER(get_rawinput_buffer) next_size = req->rawinput_size; if (size + next_size > req->buffer_size) break; if (cur + sizeof(*data) > buf + get_reply_max_size()) break; + if (cur + sizeof(*data) > buf + buf_size) + { + buf_size += buf_size / 2; + if (!(tmp = realloc( buf, buf_size ))) + { + set_error( STATUS_NO_MEMORY ); + return; + } + cur = tmp + (cur - buf); + buf = tmp; + } memcpy(cur, data, sizeof(*data)); list_remove( &msg->entry );

1 0

Hans Leidekker : wbemprox: Implement Win32_LogicalDisk.Caption.
by Alexandre Julliard 09 Feb '21

09 Feb '21

Module: wine Branch: master Commit: 14905720edf61dd16e9a09ff0bf8612775ba8cf5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=14905720edf61dd16e9a09ff… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Feb 9 10:12:54 2021 +0100 wbemprox: Implement Win32_LogicalDisk.Caption. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50643 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/builtin.c | 3 +++ dlls/wbemprox/tests/query.c | 28 ++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index b86326327fb..498e3f6fc79 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -177,6 +177,7 @@ static const struct column col_ip4routetable[] = }; static const struct column col_logicaldisk[] = { + { L"Caption", CIM_STRING|COL_FLAG_DYNAMIC }, { L"DeviceId", CIM_STRING|COL_FLAG_DYNAMIC|COL_FLAG_KEY }, { L"DriveType", CIM_UINT32 }, { L"FileSystem", CIM_STRING|COL_FLAG_DYNAMIC }, @@ -585,6 +586,7 @@ struct record_ip4routetable }; struct record_logicaldisk { + const WCHAR *caption; const WCHAR *device_id; UINT32 drivetype; const WCHAR *filesystem; @@ -2501,6 +2503,7 @@ static enum fill_status fill_logicaldisk( struct table *table, const struct expr rec = (struct record_logicaldisk *)(table->data + offset); swprintf( device_id, ARRAY_SIZE( device_id ), L"%c:", 'A' + i ); + rec->caption = heap_strdupW( device_id ); rec->device_id = heap_strdupW( device_id ); rec->drivetype = type; rec->filesystem = get_filesystem( root ); diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index a0488f40e52..b5de00b5dec 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1905,6 +1905,33 @@ static void test_SystemRestore( IWbemServices *services ) SysFreeString( class ); } +static void test_Win32_LogicalDisk( IWbemServices *services ) +{ + BSTR wql = SysAllocString( L"wql" ); + BSTR query = SysAllocString( L"SELECT * FROM Win32_LogicalDisk" ); + IEnumWbemClassObject *result; + IWbemClassObject *obj; + HRESULT hr; + DWORD count; + + hr = IWbemServices_ExecQuery( services, wql, query, 0, NULL, &result ); + ok( hr == S_OK, "got %08x\n", hr ); + + for (;;) + { + hr = IEnumWbemClassObject_Next( result, 10000, 1, &obj, &count ); + if (hr != S_OK) break; + + check_property( obj, L"Caption", VT_BSTR, CIM_STRING ); + check_property( obj, L"Name", VT_BSTR, CIM_STRING ); + IWbemClassObject_Release( obj ); + } + + IEnumWbemClassObject_Release( result ); + SysFreeString( query ); + SysFreeString( wql ); +} + START_TEST(query) { BSTR path = SysAllocString( L"ROOT\\CIMV2" ); @@ -1955,6 +1982,7 @@ START_TEST(query) test_Win32_DiskDrive( services ); test_Win32_DisplayControllerConfiguration( services ); test_Win32_IP4RouteTable( services ); + test_Win32_LogicalDisk( services ); test_Win32_NetworkAdapter( services ); test_Win32_NetworkAdapterConfiguration( services ); test_Win32_OperatingSystem( services );

1 0

Esme Povirk : mscoree: Update Wine Mono to 6.0.0.
by Alexandre Julliard 09 Feb '21

09 Feb '21

Module: wine Branch: master Commit: cae84e2b06fca691e3572d68a933a98b94962e16 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cae84e2b06fca691e3572d68… Author: Esme Povirk <esme(a)codeweavers.com> Date: Mon Feb 8 15:13:32 2021 -0600 mscoree: Update Wine Mono to 6.0.0. Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/appwiz.cpl/addons.c | 4 ++-- dlls/mscoree/mscoree_private.h | 2 +- dlls/mscoree/tests/comtest.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c index cfc51155f57..b2e726422da 100644 --- a/dlls/appwiz.cpl/addons.c +++ b/dlls/appwiz.cpl/addons.c @@ -57,10 +57,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(appwizcpl); #define GECKO_SHA "???" #endif -#define MONO_VERSION "5.1.1" +#define MONO_VERSION "6.0.0" #if defined(__i386__) || defined(__x86_64__) #define MONO_ARCH "x86" -#define MONO_SHA "74541265b9385842bc22bba2bb4b90bf1d3fd8b4788b6676140700bebacb9227" +#define MONO_SHA "5c7af5976d101be359a77045c9cc8fc40feac028263d00e731578864e8b183d0" #else #define MONO_ARCH "" #define MONO_SHA "???" diff --git a/dlls/mscoree/mscoree_private.h b/dlls/mscoree/mscoree_private.h index c9edc2d68d0..da587285cfe 100644 --- a/dlls/mscoree/mscoree_private.h +++ b/dlls/mscoree/mscoree_private.h @@ -45,7 +45,7 @@ extern HRESULT assembly_get_runtime_version(ASSEMBLY *assembly, LPSTR *version) extern HRESULT assembly_get_vtable_fixups(ASSEMBLY *assembly, VTableFixup **fixups, DWORD *count) DECLSPEC_HIDDEN; extern HRESULT assembly_get_native_entrypoint(ASSEMBLY *assembly, NativeEntryPointFunc *func) DECLSPEC_HIDDEN; -#define WINE_MONO_VERSION "5.1.1" +#define WINE_MONO_VERSION "6.0.0" /* Mono embedding */ typedef struct _MonoDomain MonoDomain; diff --git a/dlls/mscoree/tests/comtest.c b/dlls/mscoree/tests/comtest.c index 4b2183bac3a..6c0d081cbd3 100644 --- a/dlls/mscoree/tests/comtest.c +++ b/dlls/mscoree/tests/comtest.c @@ -195,7 +195,7 @@ static void run_registry_test(run_type run) ok(hr == S_OK, "Got %x\n", hr); ok(i == 42, "Expected 42, got %d\n", i); hr = ITest_QueryInterface(test, &IID_ITest2, (void**)&unk); - todo_wine ok(hr == S_OK, "ITest_QueryInterface returned %x\n", hr); + ok(hr == S_OK, "ITest_QueryInterface returned %x\n", hr); if (hr == S_OK) IUnknown_Release(unk); ITest_Release(test); }

1 0

← Newer
1
...
62
63
64
65
66
67
68
...
92
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2021