February 2021 - Wine-Commits

André Hentschel : wrc: Add PPC64 support.
by Alexandre Julliard Feb. 9, 2021

Feb. 9, 2021

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

Jactry Zeng : shell32: Implement IFileOperation stub.
by Alexandre Julliard Feb. 9, 2021

Feb. 9, 2021

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 Feb. 9, 2021

Feb. 9, 2021

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

Paul Gofman : vcomp100: Share the source with vcomp.
by Alexandre Julliard Feb. 9, 2021

Feb. 9, 2021

Module: wine Branch: master Commit: 761481ba2a1bcc67715eecc3f7bd54e6e7fa9df3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=761481ba2a1bcc67715eecc3… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Feb 9 02:44:11 2021 +0300 vcomp100: Share the source with vcomp. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vcomp100/Makefile.in | 7 ++ dlls/vcomp100/vcomp100.spec | 202 ++++++++++++++++++++++---------------------- 2 files changed, 108 insertions(+), 101 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=761481ba2a1bcc67715e…

1 0

Alexandre Julliard : ntdll: Pass the full NT path name to load_builtin_dll().
by Alexandre Julliard Feb. 9, 2021

Feb. 9, 2021

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

Timothy Pearson : widl: Add PPC64 support.
by Alexandre Julliard Feb. 9, 2021

Feb. 9, 2021

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

Alexandre Julliard : ntdll: Pass the NT name in the create_file request.
by Alexandre Julliard Feb. 9, 2021

Feb. 9, 2021

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 : server: Store the NT name in the fd object.
by Alexandre Julliard Feb. 9, 2021

Feb. 9, 2021

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

Rémi Bernon : widl: Support WinRT static attribute parsing.
by Alexandre Julliard Feb. 9, 2021

Feb. 9, 2021

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

Alexandre Julliard : server: Return the NT name for the ProcessImageFileName query.
by Alexandre Julliard Feb. 9, 2021

Feb. 9, 2021

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