wine-commits November 2022

wine-commits@winehq.org

1 participants
1171 discussions

Alexandre Julliard : winebuild: Remove support for "hybrid" Unix libraries.
by Alexandre Julliard 11 Nov '22

11 Nov '22

Module: wine Branch: master Commit: ac17191530c6fdaebe7e8761ed85212764ae3eb7 URL: https://gitlab.winehq.org/wine/wine/-/commit/ac17191530c6fdaebe7e8761ed8521… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 11 12:07:41 2022 +0100 winebuild: Remove support for "hybrid" Unix libraries. --- tools/winebuild/build.h | 1 - tools/winebuild/import.c | 10 ---------- tools/winebuild/main.c | 4 +--- tools/winebuild/spec32.c | 1 - tools/winebuild/winebuild.man.in | 3 --- 5 files changed, 1 insertion(+), 18 deletions(-) diff --git a/tools/winebuild/build.h b/tools/winebuild/build.h index a7ef23b199e..576304cd2b8 100644 --- a/tools/winebuild/build.h +++ b/tools/winebuild/build.h @@ -360,7 +360,6 @@ extern int force_pointer_size; extern int unwind_tables; extern int use_dlltool; extern int use_msvcrt; -extern int unix_lib; extern int safe_seh; extern int prefer_native; extern int data_only; diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index c934e456cfe..9f87adcf593 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -497,8 +497,6 @@ static int has_stubs( const DLLSPEC *spec ) { int i; - if (unix_lib) return 0; - for (i = 0; i < spec->nb_entry_points; i++) { ORDDEF *odp = &spec->entry_points[i]; @@ -543,8 +541,6 @@ static void check_undefined_forwards( DLLSPEC *spec ) char *link_name, *api_name, *dll_name, *p; int i; - if (unix_lib) return; - for (i = 0; i < spec->nb_entry_points; i++) { ORDDEF *odp = &spec->entry_points[i]; @@ -575,8 +571,6 @@ static void check_undefined_exports( DLLSPEC *spec ) { int i; - if (unix_lib) return; - for (i = 0; i < spec->nb_entry_points; i++) { ORDDEF *odp = &spec->entry_points[i]; @@ -616,8 +610,6 @@ static char *create_undef_symbols_file( DLLSPEC *spec ) int i; unsigned int j; - if (unix_lib) return NULL; - as_file = open_temp_output_file( ".s" ); output( "\t.data\n" ); @@ -1375,8 +1367,6 @@ void output_syscalls( DLLSPEC *spec ) int i, count; ORDDEF **syscalls = NULL; - if (unix_lib) return; - for (i = count = 0; i < spec->nb_entry_points; i++) { ORDDEF *odp = &spec->entry_points[i]; diff --git a/tools/winebuild/main.c b/tools/winebuild/main.c index 77339b2b4e7..875bf45f0a1 100644 --- a/tools/winebuild/main.c +++ b/tools/winebuild/main.c @@ -44,7 +44,6 @@ int force_pointer_size = 0; int unwind_tables = 0; int use_dlltool = 1; int use_msvcrt = 0; -int unix_lib = 0; int safe_seh = 0; int prefer_native = 0; int data_only = 0; @@ -408,7 +407,6 @@ static void option_callback( int optc, char *optarg ) else if (!strcmp( optarg, "arm" )) thumb_mode = 0; else if (!strcmp( optarg, "thumb" )) thumb_mode = 1; else if (!strcmp( optarg, "no-cygwin" )) use_msvcrt = 1; - else if (!strcmp( optarg, "unix" )) unix_lib = 1; else if (!strcmp( optarg, "unicode" )) main_spec->unicode_app = 1; else if (!strncmp( optarg, "cpu=", 4 )) cpu_option = xstrdup( optarg + 4 ); else if (!strncmp( optarg, "fpu=", 4 )) fpu_option = xstrdup( optarg + 4 ); @@ -646,7 +644,7 @@ int main(int argc, char **argv) case MODE_EXE: files = load_resources( files, spec ); if (spec_file_name && !parse_input_file( spec )) break; - if (!spec->init_func && !unix_lib) spec->init_func = xstrdup( get_default_entry_point( spec )); + if (!spec->init_func) spec->init_func = xstrdup( get_default_entry_point( spec )); if (fake_module) { diff --git a/tools/winebuild/spec32.c b/tools/winebuild/spec32.c index c09e58084cc..a4a95f09c43 100644 --- a/tools/winebuild/spec32.c +++ b/tools/winebuild/spec32.c @@ -108,7 +108,6 @@ static int has_relays( DLLSPEC *spec ) static int get_exports_count( DLLSPEC *spec ) { - if (unix_lib) return 0; if (spec->base > spec->limit) return 0; return spec->limit - spec->base + 1; } diff --git a/tools/winebuild/winebuild.man.in b/tools/winebuild/winebuild.man.in index 7f93a5befdc..23ef3495744 100644 --- a/tools/winebuild/winebuild.man.in +++ b/tools/winebuild/winebuild.man.in @@ -186,9 +186,6 @@ Set code generation options for the assembler. Build a library that uses the Windows runtime instead of the Unix C library. .TP -.B \-munix -Build the Unix counterpart of a builtin module. -.TP .BI \-M,\ --main-module= module When building a 16-bit dll, set the name of its 32-bit counterpart to \fImodule\fR. This is used to enforce that the load order for the

1 0

Alexandre Julliard : winegcc: Remove support for "hybrid" Unix libraries.
by Alexandre Julliard 11 Nov '22

11 Nov '22

Module: wine Branch: master Commit: f57c8d68bdc4c9f02d03fd65b333ccca0bdc2635 URL: https://gitlab.winehq.org/wine/wine/-/commit/f57c8d68bdc4c9f02d03fd65b333cc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 11 12:07:13 2022 +0100 winegcc: Remove support for "hybrid" Unix libraries. --- tools/winegcc/winegcc.c | 23 +++-------------------- tools/winegcc/winegcc.man.in | 2 -- 2 files changed, 3 insertions(+), 22 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index ddd513e55d0..e1efa518925 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -172,7 +172,6 @@ struct options int nodefaultlibs; int noshortwchar; int data_only; - int unix_lib; int gui_app; int unicode_app; int win16_app; @@ -404,7 +403,7 @@ static struct strarray get_link_args( struct options *opts, const char *output_n switch (opts->target.platform) { case PLATFORM_APPLE: - strarray_add( &flags, opts->unix_lib ? "-dynamiclib" : "-bundle" ); + strarray_add( &flags, "-bundle" ); strarray_add( &flags, "-multiply_defined" ); strarray_add( &flags, "suppress" ); if (opts->image_base) @@ -413,12 +412,6 @@ static struct strarray get_link_args( struct options *opts, const char *output_n strarray_add( &flags, opts->image_base ); } if (opts->strip) strarray_add( &flags, "-Wl,-x" ); - if (opts->unix_lib) - { - strarray_add( &flags, "-install_name" ); - strarray_add( &flags, strmake( "@rpath/%s.so", output_name ) ); - strarray_add( &flags, "-Wl,-rpath,@loader_path/" ); - } strarray_addall( &link_args, flags ); return link_args; @@ -522,7 +515,6 @@ static struct strarray get_link_args( struct options *opts, const char *output_n } if (!try_link( opts->prefix, link_args, "-Wl,-z,max-page-size=0x1000")) strarray_add( &flags, "-Wl,-z,max-page-size=0x1000"); - if (opts->unix_lib) strarray_add( &flags, strmake( "-Wl,-soname,%s.so", output_name )); break; } @@ -1262,7 +1254,7 @@ static void build(struct options* opts) /* set default entry point, if needed */ if (!opts->entry_point) { - if (opts->subsystem && !opts->unix_lib && !strcmp( opts->subsystem, "native" )) + if (opts->subsystem && !strcmp( opts->subsystem, "native" )) entry_point = (is_pe && opts->target.cpu == CPU_i386) ? "DriverEntry@8" : "DriverEntry"; else if (opts->use_msvcrt && !opts->shared && !opts->win16_app) entry_point = opts->unicode_app ? "wmainCRTStartup" : "mainCRTStartup"; @@ -1275,8 +1267,7 @@ static void build(struct options* opts) build_data_lib( opts, spec_file, output_file, files ); return; } - if (spec_file || !opts->unix_lib) - spec_o_name = build_spec_obj( opts, spec_file, output_file, files, lib_dirs, entry_point ); + spec_o_name = build_spec_obj( opts, spec_file, output_file, files, lib_dirs, entry_point ); if (opts->fake_module) return; /* nothing else to do */ @@ -1414,8 +1405,6 @@ static void build(struct options* opts) spawn(opts->prefix, tool, 0); } - if (opts->unix_lib) return; - if (opts->out_implib && !is_pe) { struct strarray tool, implib_args; @@ -1756,12 +1745,6 @@ int main(int argc, char **argv) { raw_compiler_arg = 0; } - else if (strcmp("-munix", opts.args.str[i]) == 0) - { - opts.unix_lib = 1; - raw_compiler_arg = 0; - raw_winebuild_arg = 1; - } else if (strcmp("-m16", opts.args.str[i]) == 0) { opts.win16_app = 1; diff --git a/tools/winegcc/winegcc.man.in b/tools/winegcc/winegcc.man.in index 87c1496fd18..cb485492bea 100644 --- a/tools/winegcc/winegcc.man.in +++ b/tools/winegcc/winegcc.man.in @@ -59,8 +59,6 @@ Set the default entry point of the application to be the Unicode This option adds -lgdi32, -lcomdlg32, and -lshell32 to the list of default libraries, and passes '--subsystem windows' to winebuild to build graphical applications. -.IP \fB-munix\fR -Set when building the Unix counterpart of a builtin module. .IP \fB-nodefaultlibs\fR Do not use the standard system libraries when linking. These include at a minimum -lkernel32, -luser32, -ladvapi32, and

1 0

Alexandre Julliard : makedep: Remove support for "hybrid" Unix libraries.
by Alexandre Julliard 11 Nov '22

11 Nov '22

Module: wine Branch: master Commit: dbe93c8a5ccd53c03cccfaf06e2a2b4302288645 URL: https://gitlab.winehq.org/wine/wine/-/commit/dbe93c8a5ccd53c03cccfaf06e2a2b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 11 12:05:04 2022 +0100 makedep: Remove support for "hybrid" Unix libraries. --- tools/makedep.c | 60 +++++---------------------------------------------------- 1 file changed, 5 insertions(+), 55 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index a042621cec7..3ae1e2db4cf 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -198,7 +198,6 @@ struct makefile const char *staticlib; const char *importlib; const char *unixlib; - int native_unix_lib; int use_msvcrt; int data_only; int is_win16; @@ -2075,7 +2074,7 @@ static const char *get_static_lib( const struct makefile *make, const char *name */ static const char *get_native_unix_lib( const struct makefile *make, const char *name ) { - if (!make->native_unix_lib) return NULL; + if (!make->unixlib) return NULL; if (strncmp( make->unixlib, name, strlen(name) )) return NULL; if (make->unixlib[strlen(name)] != '.') return NULL; return obj_dir_path( make, make->unixlib ); @@ -3257,23 +3256,6 @@ static const struct }; -/******************************************************************* - * get_unix_lib_name - */ -static char *get_unix_lib_name( struct makefile *make ) -{ - struct incl_file *source; - - if (!*dll_ext) return NULL; - LIST_FOR_EACH_ENTRY( source, &make->sources, struct incl_file, entry ) - { - if (!(source->file->flags & FLAG_C_UNIX)) continue; - return strmake( "%s%s", get_base_name( make->module ), dll_ext ); - } - return NULL; -} - - /******************************************************************* * output_fake_module */ @@ -3424,49 +3406,19 @@ static void output_import_lib( struct makefile *make, unsigned int arch ) */ static void output_unix_lib( struct makefile *make ) { - struct strarray unix_libs = empty_strarray; struct strarray unix_deps = empty_strarray; - char *spec_file = src_dir_path( make, replace_extension( make->module, ".dll", ".spec" )); + struct strarray unix_libs = add_unix_libraries( make, &unix_deps ); unsigned int arch = 0; /* unix libs are always native */ - if (!make->native_unix_lib) - { - struct strarray unix_imports = empty_strarray; - - strarray_add( &unix_imports, "ntdll" ); - strarray_add( &unix_deps, obj_dir_path( top_makefile, "dlls/ntdll/ntdll.so" )); - strarray_add( &unix_imports, "winecrt0" ); - if (spec_file) strarray_add( &unix_deps, spec_file ); - - strarray_addall( &unix_libs, add_import_libs( make, &unix_deps, unix_imports, IMPORT_TYPE_DIRECT, 0 )); - strarray_addall( &unix_libs, get_expanded_make_var_array( make, "UNIX_LIBS" )); - strarray_addall( &unix_libs, libs ); - } - else unix_libs = add_unix_libraries( make, &unix_deps ); - strarray_add( &make->all_targets[arch], make->unixlib ); add_install_rule( make, make->module, arch, make->unixlib, strmake( "p%s%s", arch_install_dirs[arch], make->unixlib )); output( "%s:", obj_dir_path( make, make->unixlib )); output_filenames_obj_dir( make, make->unixobj_files ); output_filenames( unix_deps ); - - if (make->native_unix_lib) - { - output( "\n" ); - output( "\t%s$(CC) -o $@", cmd_prefix( "CCLD" )); - output_filenames( get_expanded_make_var_array( make, "UNIXLDFLAGS" )); - } - else - { - output_filename( tools_path( make, "winebuild" )); - output_filename( tools_path( make, "winegcc" )); - output( "\n" ); - output_winegcc_command( make, 0 ); - output_filename( "-munix" ); - output_filename( "-shared" ); - if (spec_file) output_filename( spec_file ); - } + output( "\n" ); + output( "\t%s$(CC) -o $@", cmd_prefix( "CCLD" )); + output_filenames( get_expanded_make_var_array( make, "UNIXLDFLAGS" )); output_filenames_obj_dir( make, make->unixobj_files ); output_filenames( unix_libs ); output_filename( "$(LDFLAGS)" ); @@ -4297,7 +4249,6 @@ static void load_sources( struct makefile *make ) !strarray_exists( &make->extradllflags, "-mcygwin" ); make->is_exe = strarray_exists( &make->extradllflags, "-mconsole" ) || strarray_exists( &make->extradllflags, "-mwindows" ); - make->native_unix_lib = !!make->unixlib; if (make->use_msvcrt) strarray_add_uniq( &make->extradllflags, "-mno-cygwin" ); @@ -4356,7 +4307,6 @@ static void load_sources( struct makefile *make ) } add_generated_sources( make ); - if (!make->unixlib) make->unixlib = get_unix_lib_name( make ); if (make->use_msvcrt) strarray_add( &make->define_args, get_crt_define( make ));

1 0

Alexandre Julliard : ntdll: Add a Wine-specific process info class for the LDT copy.
by Alexandre Julliard 11 Nov '22

11 Nov '22

Module: wine Branch: master Commit: a72c7bbc0c7531fa79dbd511abd49a55ee2e8200 URL: https://gitlab.winehq.org/wine/wine/-/commit/a72c7bbc0c7531fa79dbd511abd49a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 11 11:56:45 2022 +0100 ntdll: Add a Wine-specific process info class for the LDT copy. --- dlls/krnl386.exe16/selector.c | 4 +--- dlls/ntdll/ntdll.spec | 1 - dlls/ntdll/signal_i386.c | 2 -- dlls/ntdll/unix/loader.c | 7 ------- dlls/ntdll/unix/process.c | 14 ++++++++++++++ dlls/wow64/process.c | 3 +++ include/winternl.h | 1 + 7 files changed, 19 insertions(+), 13 deletions(-) diff --git a/dlls/krnl386.exe16/selector.c b/dlls/krnl386.exe16/selector.c index ab5881c8927..7d2984cf777 100644 --- a/dlls/krnl386.exe16/selector.c +++ b/dlls/krnl386.exe16/selector.c @@ -68,12 +68,10 @@ static LDT_ENTRY ldt_make_entry( const void *base, unsigned int limit, unsigned */ void init_selectors(void) { - const struct ldt_copy **ldt_copy_ptr; if (!is_gdt_sel( get_gs() )) first_ldt_entry += 512; if (!is_gdt_sel( get_fs() )) first_ldt_entry += 512; RtlSetBits( &ldt_bitmap, 0, first_ldt_entry ); - ldt_copy_ptr = (void *)GetProcAddress( GetModuleHandleA("ntdll.dll"), "__wine_ldt_copy" ); - if (ldt_copy_ptr) ldt_copy = *ldt_copy_ptr; + NtQueryInformationProcess( GetCurrentProcess(), ProcessWineLdtCopy, &ldt_copy, sizeof(ldt_copy), NULL ); } /*********************************************************************** diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 7a5a5afdb6b..1d4218e7b52 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1694,7 +1694,6 @@ @ stdcall -syscall __wine_unix_spawnvp(long ptr) @ stdcall __wine_ctrl_routine(ptr) @ extern __wine_syscall_dispatcher -@ extern -arch=i386 __wine_ldt_copy @ extern -arch=arm64 __wine_current_teb # Debugging diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index c8e1b495ac0..90198697051 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -59,8 +59,6 @@ static inline struct x86_thread_data *x86_thread_data(void) return (struct x86_thread_data *)&NtCurrentTeb()->GdiTebBatch; } -struct ldt_copy *__wine_ldt_copy = NULL; - /* Exception record for handling exceptions happening inside exception handlers */ typedef struct { diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 35f2e5f986f..8a6200c7454 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1062,13 +1062,6 @@ static void load_ntdll_functions( HMODULE module ) GET_FUNC( RtlUserThreadStart ); GET_FUNC( __wine_ctrl_routine ); GET_FUNC( __wine_syscall_dispatcher ); -#ifdef __i386__ - { - void **p__wine_ldt_copy; - GET_FUNC( __wine_ldt_copy ); - *p__wine_ldt_copy = &__wine_ldt_copy; - } -#endif #ifdef __aarch64__ { void **p__wine_current_teb; diff --git a/dlls/ntdll/unix/process.c b/dlls/ntdll/unix/process.c index 83888717a5c..503ef93d966 100644 --- a/dlls/ntdll/unix/process.c +++ b/dlls/ntdll/unix/process.c @@ -1500,6 +1500,20 @@ NTSTATUS WINAPI NtQueryInformationProcess( HANDLE handle, PROCESSINFOCLASS class else ret = STATUS_INFO_LENGTH_MISMATCH; break; + case ProcessWineLdtCopy: + if (handle == NtCurrentProcess()) + { +#ifdef __i386__ + len = sizeof(struct ldt_copy *); + if (size == len) *(struct ldt_copy **)info = &__wine_ldt_copy; + else ret = STATUS_INFO_LENGTH_MISMATCH; +#else + ret = STATUS_NOT_IMPLEMENTED; +#endif + } + else ret = STATUS_INVALID_PARAMETER; + break; + default: FIXME("(%p,info_class=%d,%p,0x%08x,%p) Unknown information class\n", handle, class, info, size, ret_len ); diff --git a/dlls/wow64/process.c b/dlls/wow64/process.c index a810d5e5543..46bd6bfec36 100644 --- a/dlls/wow64/process.c +++ b/dlls/wow64/process.c @@ -846,6 +846,9 @@ NTSTATUS WINAPI wow64_NtQueryInformationProcess( UINT *args ) if (retlen) *retlen = sizeof(SECTION_IMAGE_INFORMATION32); return STATUS_INFO_LENGTH_MISMATCH; + case ProcessWineLdtCopy: + return STATUS_NOT_IMPLEMENTED; + default: FIXME( "unsupported class %u\n", class ); return STATUS_INVALID_INFO_CLASS; diff --git a/include/winternl.h b/include/winternl.h index 26e61463f35..54c8903c534 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -1577,6 +1577,7 @@ typedef enum _PROCESSINFOCLASS { MaxProcessInfoClass, #ifdef __WINESRC__ ProcessWineMakeProcessSystem = 1000, + ProcessWineLdtCopy, #endif } PROCESSINFOCLASS, PROCESS_INFORMATION_CLASS;

1 0

Nikolay Sivov : vbscript: Add support for argument list in ReDim.
by Alexandre Julliard 11 Nov '22

11 Nov '22

Module: wine Branch: master Commit: 45053135ae0c86d5ecae841ce20d61b1e34ba993 URL: https://gitlab.winehq.org/wine/wine/-/commit/45053135ae0c86d5ecae841ce20d61… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 10 22:37:49 2022 +0300 vbscript: Add support for argument list in ReDim. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53782 --- dlls/vbscript/compile.c | 23 +++++++++++++++-------- dlls/vbscript/parse.h | 9 +++++++-- dlls/vbscript/parser.y | 34 ++++++++++++++++++++++++++++------ dlls/vbscript/tests/lang.vbs | 38 ++++++++++++++++++++++++++++++++++++++ 4 files changed, 88 insertions(+), 16 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index 79819c39026..f592697f4e3 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -1165,19 +1165,26 @@ static HRESULT compile_dim_statement(compile_ctx_t *ctx, dim_statement_t *stat) static HRESULT compile_redim_statement(compile_ctx_t *ctx, redim_statement_t *stat) { + redim_decl_t *decl = stat->redim_decls; unsigned arg_cnt; HRESULT hres; - hres = compile_args(ctx, stat->dims, &arg_cnt); - if(FAILED(hres)) - return hres; + while(1) { + hres = compile_args(ctx, decl->dims, &arg_cnt); + if(FAILED(hres)) + return hres; - hres = push_instr_bstr_uint(ctx, stat->preserve ? OP_redim_preserve : OP_redim, stat->identifier, arg_cnt); - if(FAILED(hres)) - return hres; + hres = push_instr_bstr_uint(ctx, stat->preserve ? OP_redim_preserve : OP_redim, decl->identifier, arg_cnt); + if(FAILED(hres)) + return hres; - if(!emit_catch(ctx, 0)) - return E_OUTOFMEMORY; + if(!emit_catch(ctx, 0)) + return E_OUTOFMEMORY; + + if(!decl->next) + break; + decl = decl->next; + } return S_OK; } diff --git a/dlls/vbscript/parse.h b/dlls/vbscript/parse.h index 32cfcfe75c5..7c13ad72bf6 100644 --- a/dlls/vbscript/parse.h +++ b/dlls/vbscript/parse.h @@ -172,11 +172,16 @@ typedef struct _dim_statement_t { dim_decl_t *dim_decls; } dim_statement_t; +typedef struct _redim_decl_t { + const WCHAR *identifier; + expression_t *dims; + struct _redim_decl_t *next; +} redim_decl_t; + typedef struct { statement_t stat; - const WCHAR *identifier; BOOL preserve; - expression_t *dims; + redim_decl_t *redim_decls; } redim_statement_t; typedef struct _arg_decl_t { diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index 90ed921c2a9..42838d34f17 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -51,7 +51,7 @@ static statement_t *new_call_statement(parser_ctx_t*,unsigned,expression_t*); static statement_t *new_assign_statement(parser_ctx_t*,unsigned,expression_t*,expression_t*); static statement_t *new_set_statement(parser_ctx_t*,unsigned,expression_t*,expression_t*); static statement_t *new_dim_statement(parser_ctx_t*,unsigned,dim_decl_t*); -static statement_t *new_redim_statement(parser_ctx_t*,unsigned,const WCHAR*,BOOL,expression_t*); +static statement_t *new_redim_statement(parser_ctx_t*,unsigned,BOOL,redim_decl_t*); static statement_t *new_while_statement(parser_ctx_t*,unsigned,statement_type_t,expression_t*,statement_t*); static statement_t *new_forto_statement(parser_ctx_t*,unsigned,const WCHAR*,expression_t*,expression_t*,expression_t*,statement_t*); static statement_t *new_foreach_statement(parser_ctx_t*,unsigned,const WCHAR*,expression_t*,statement_t*); @@ -64,6 +64,7 @@ static statement_t *new_with_statement(parser_ctx_t*,unsigned,expression_t*,stat static dim_decl_t *new_dim_decl(parser_ctx_t*,const WCHAR*,BOOL,dim_list_t*); static dim_list_t *new_dim(parser_ctx_t*,unsigned,dim_list_t*); +static redim_decl_t *new_redim_decl(parser_ctx_t*,const WCHAR*,expression_t*); static elseif_decl_t *new_elseif_decl(parser_ctx_t*,unsigned,expression_t*,statement_t*); static function_decl_t *new_function_decl(parser_ctx_t*,const WCHAR*,function_type_t,unsigned,arg_decl_t*,statement_t*); static arg_decl_t *new_argument_decl(parser_ctx_t*,const WCHAR*,BOOL); @@ -100,6 +101,7 @@ static statement_t *link_statements(statement_t*,statement_t*); elseif_decl_t *elseif; dim_decl_t *dim_decl; dim_list_t *dim_list; + redim_decl_t *redim_decl; function_decl_t *func_decl; arg_decl_t *arg_decl; class_decl_t *class_decl; @@ -150,6 +152,7 @@ static statement_t *link_statements(statement_t*,statement_t*); %type <uint> Storage Storage_opt IntegerValue %type <dim_decl> DimDeclList DimDecl %type <dim_list> DimList +%type <redim_decl> ReDimDeclList ReDimDecl %type <const_decl> ConstDecl ConstDeclList %type <string> Identifier %type <case_clausule> CaseClausules @@ -209,8 +212,7 @@ SimpleStatement | CallExpression '=' Expression { $$ = new_assign_statement(ctx, @$, $1, $3); CHECK_ERROR; } | tDIM DimDeclList { $$ = new_dim_statement(ctx, @$, $2); CHECK_ERROR; } - | tREDIM Preserve_opt tIdentifier '(' ArgumentList ')' - { $$ = new_redim_statement(ctx, @$, $3, $2, $5); CHECK_ERROR; } + | tREDIM Preserve_opt ReDimDeclList { $$ = new_redim_statement(ctx, @$, $2, $3); CHECK_ERROR; } | IfStatement { $$ = $1; } | tWHILE Expression StSep StatementsNl_opt tWEND { $$ = new_while_statement(ctx, @$, STAT_WHILE, $2, $4); CHECK_ERROR; } @@ -251,6 +253,13 @@ Preserve_opt : /* empty */ { $$ = FALSE; } | tPRESERVE { $$ = TRUE; } +ReDimDecl + : tIdentifier '(' ArgumentList ')' { $$ = new_redim_decl(ctx, $1, $3); CHECK_ERROR; } + +ReDimDeclList + : ReDimDecl { $$ = $1; } + | ReDimDecl ',' ReDimDeclList { $1->next = $3; $$ = $1; } + DimDeclList : DimDecl { $$ = $1; } | DimDecl ',' DimDeclList { $1->next = $3; $$ = $1; } @@ -846,7 +855,21 @@ static statement_t *new_dim_statement(parser_ctx_t *ctx, unsigned loc, dim_decl_ return &stat->stat; } -static statement_t *new_redim_statement(parser_ctx_t *ctx, unsigned loc, const WCHAR *identifier, BOOL preserve, expression_t *dims) +static redim_decl_t *new_redim_decl(parser_ctx_t *ctx, const WCHAR *identifier, expression_t *dims) +{ + redim_decl_t *decl; + + decl = parser_alloc(ctx, sizeof(*decl)); + if(!decl) + return NULL; + + decl->identifier = identifier; + decl->dims = dims; + decl->next = NULL; + return decl; +} + +static statement_t *new_redim_statement(parser_ctx_t *ctx, unsigned loc, BOOL preserve, redim_decl_t *decls) { redim_statement_t *stat; @@ -854,9 +877,8 @@ static statement_t *new_redim_statement(parser_ctx_t *ctx, unsigned loc, const W if(!stat) return NULL; - stat->identifier = identifier; stat->preserve = preserve; - stat->dims = dims; + stat->redim_decls = decls; return &stat->stat; } diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index f147351b1af..2467b814eff 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -1503,6 +1503,44 @@ e = err.number on error goto 0 todo_wine_ok e = 10, "e = " & e +sub TestReDimList + dim x, y + + x = Array(1) + y = Array(1) + redim x(1, 3), y(2) + ok ubound(x, 1) = 1, "ubound(x, 1) = " & ubound(x, 1) + ok ubound(x, 2) = 3, "ubound(x, 2) = " & ubound(x, 2) + ok ubound(y, 1) = 2, "ubound(y, 1) = " & ubound(y, 1) + + x(0,0) = 1.1 + x(0,1) = 1.2 + x(0,2) = 1.3 + x(0,3) = 1.4 + x(1,0) = 2.1 + x(1,1) = 2.2 + x(1,2) = 2.3 + x(1,3) = 2.4 + + y(0) = 2.1 + y(1) = 2.2 + y(2) = 2.3 + + redim preserve x(1,1), y(3) + ok ubound(x, 1) = 1, "ubound(x, 1) = " & ubound(x, 1) + ok ubound(x, 2) = 1, "ubound(x, 2) = " & ubound(x, 2) + ok x(0,0) = 1.1, "x(0,0) = " & x(0,0) + ok x(0,1) = 1.2, "x(0,1) = " & x(0,1) + ok x(1,0) = 2.1, "x(1,0) = " & x(1,0) + ok x(1,1) = 2.2, "x(1,1) = " & x(1,1) + ok ubound(y, 1) = 3, "ubound(y, 1) = " & ubound(y, 1) + ok y(0) = 2.1, "y(0) = " & y(0) + ok y(1) = 2.2, "y(1) = " & y(1) + ok y(2) = 2.3, "y(2) = " & y(2) + ok y(3) = vbEmpty, "y(3) = " & y(3) +end sub +call TestReDimList + Class ArrClass Dim classarr(3) Dim classnoarr()

1 0

Georg Lehmann : winevulkan: Fix handling enums in needs_alignment.
by Alexandre Julliard 11 Nov '22

11 Nov '22

Module: wine Branch: master Commit: 82182a11af3ac222eee8f0ace0aa581842567d85 URL: https://gitlab.winehq.org/wine/wine/-/commit/82182a11af3ac222eee8f0ace0aa58… Author: Georg Lehmann <dadschoorse(a)gmail.com> Date: Thu Nov 10 23:40:54 2022 +0100 winevulkan: Fix handling enums in needs_alignment. --- dlls/winevulkan/make_vulkan | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 82185557255..26045f36055 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -1168,6 +1168,9 @@ class VkVariable(object): def is_bitmask(self): return self.type_info["category"] == "bitmask" + def is_enum(self): + return self.type_info["category"] == "enum" + def is_dynamic_array(self): """ Returns if the member is an array element. Vulkan uses this for dynamically sized arrays for which @@ -1202,6 +1205,8 @@ class VkVariable(object): return True elif self.is_bitmask(): return self.type_info["data"].type == "VkFlags64" + elif self.is_enum(): + return self.type_info["data"].bitwidth == 64 elif self.is_struct() or self.is_union(): return self.type_info["data"].needs_alignment() elif self.is_handle():

1 0

Georg Lehmann : winevulkan: Fix handling bitmasks in needs_alignment.
by Alexandre Julliard 11 Nov '22

11 Nov '22

Module: wine Branch: master Commit: 0a2bffa74aeca9380a220c457eccb32f3c1bffc0 URL: https://gitlab.winehq.org/wine/wine/-/commit/0a2bffa74aeca9380a220c457eccb3… Author: Georg Lehmann <dadschoorse(a)gmail.com> Date: Thu Nov 10 23:36:33 2022 +0100 winevulkan: Fix handling bitmasks in needs_alignment. --- dlls/winevulkan/loader_thunks.h | 10 +- dlls/winevulkan/make_vulkan | 5 + dlls/winevulkan/vulkan_thunks.c | 510 ++++++++++++++++++++++++++++++++++++++-- include/wine/vulkan.h | 40 ++-- 4 files changed, 514 insertions(+), 51 deletions(-)

1 0

Martin Storsjö : ntdll: Readd the missed initialization of the thread register on arm.
by Alexandre Julliard 11 Nov '22

11 Nov '22

Module: wine Branch: master Commit: e05a8697026eb8d6d3e0ab4ab3df71d30e1e4a65 URL: https://gitlab.winehq.org/wine/wine/-/commit/e05a8697026eb8d6d3e0ab4ab3df71… Author: Martin Storsjö <martin(a)martin.st> Date: Fri Nov 11 11:17:04 2022 +0200 ntdll: Readd the missed initialization of the thread register on arm. This was missed in d3a68e434e9b19ac35066ebf47a01cea0a19b7da. Signed-off-by: Martin Storsjö <martin(a)martin.st> --- dlls/ntdll/unix/signal_arm.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/ntdll/unix/signal_arm.c b/dlls/ntdll/unix/signal_arm.c index fe51629838c..ba3a0ea1d8c 100644 --- a/dlls/ntdll/unix/signal_arm.c +++ b/dlls/ntdll/unix/signal_arm.c @@ -1594,6 +1594,8 @@ void DECLSPEC_HIDDEN call_init_thunk( LPTHREAD_START_ROUTINE entry, void *arg, B struct syscall_frame *frame = thread_data->syscall_frame; CONTEXT *ctx, context = { CONTEXT_ALL }; + __asm__ __volatile__( "mcr p15, 0, %0, c13, c0, 2" : : "r" (teb) ); + context.R0 = (DWORD)entry; context.R1 = (DWORD)arg; context.Sp = (DWORD)teb->Tib.StackBase;

1 0

Francisco Casas : vkd3d-shader/hlsl: Revert expr_compatible_data_types() args names to "t1" and "t2".
by Alexandre Julliard 10 Nov '22

10 Nov '22

Module: vkd3d Branch: fixes2 Commit: bf038eb3d525f54046b623a8d6b24fad68aaf235 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/bf038eb3d525f54046b623a8d6b24… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Mon Nov 7 12:59:09 2022 -0300 vkd3d-shader/hlsl: Revert expr_compatible_data_types() args names to "t1" and "t2". Unlike compatible_data_types() and implicit_compatible_data_types(), this function is intended to be symmetrical. So it makes sense to preserve the names "t1" and "t2" for the arguments. --- libs/vkd3d-shader/hlsl.y | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 750ae9de..198eb038 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1175,34 +1175,34 @@ static unsigned int evaluate_array_dimension(struct hlsl_ir_node *node) } } -static bool expr_compatible_data_types(struct hlsl_type *src, struct hlsl_type *dst) +static bool expr_compatible_data_types(struct hlsl_type *t1, struct hlsl_type *t2) { - if (src->base_type > HLSL_TYPE_LAST_SCALAR || dst->base_type > HLSL_TYPE_LAST_SCALAR) + if (t1->base_type > HLSL_TYPE_LAST_SCALAR || t2->base_type > HLSL_TYPE_LAST_SCALAR) return false; /* Scalar vars can be converted to pretty much everything */ - if ((src->dimx == 1 && src->dimy == 1) || (dst->dimx == 1 && dst->dimy == 1)) + if ((t1->dimx == 1 && t1->dimy == 1) || (t2->dimx == 1 && t2->dimy == 1)) return true; - if (src->type == HLSL_CLASS_VECTOR && dst->type == HLSL_CLASS_VECTOR) + if (t1->type == HLSL_CLASS_VECTOR && t2->type == HLSL_CLASS_VECTOR) return true; - if (src->type == HLSL_CLASS_MATRIX || dst->type == HLSL_CLASS_MATRIX) + if (t1->type == HLSL_CLASS_MATRIX || t2->type == HLSL_CLASS_MATRIX) { /* Matrix-vector conversion is apparently allowed if either they have the same components count or the matrix is nx1 or 1xn */ - if (src->type == HLSL_CLASS_VECTOR || dst->type == HLSL_CLASS_VECTOR) + if (t1->type == HLSL_CLASS_VECTOR || t2->type == HLSL_CLASS_VECTOR) { - if (hlsl_type_component_count(src) == hlsl_type_component_count(dst)) + if (hlsl_type_component_count(t1) == hlsl_type_component_count(t2)) return true; - return (src->type == HLSL_CLASS_MATRIX && (src->dimx == 1 || src->dimy == 1)) - || (dst->type == HLSL_CLASS_MATRIX && (dst->dimx == 1 || dst->dimy == 1)); + return (t1->type == HLSL_CLASS_MATRIX && (t1->dimx == 1 || t1->dimy == 1)) + || (t2->type == HLSL_CLASS_MATRIX && (t2->dimx == 1 || t2->dimy == 1)); } /* Both matrices */ - if ((src->dimx >= dst->dimx && src->dimy >= dst->dimy) - || (src->dimx <= dst->dimx && src->dimy <= dst->dimy)) + if ((t1->dimx >= t2->dimx && t1->dimy >= t2->dimy) + || (t1->dimx <= t2->dimx && t1->dimy <= t2->dimy)) return true; }

1 0

Nikolay Sivov : d2d1/tests: Use correct flags constants with D3D11CreateDevice().
by Alexandre Julliard 10 Nov '22

10 Nov '22

Module: wine Branch: master Commit: 384b0b35c357ca31ccb080162e1f39f93ec70054 URL: https://gitlab.winehq.org/wine/wine/-/commit/384b0b35c357ca31ccb080162e1f39… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 10 21:09:42 2022 +0300 d2d1/tests: Use correct flags constants with D3D11CreateDevice(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d2d1/tests/d2d1.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index a065c8ddfb5..1dcce63381e 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -1066,13 +1066,13 @@ static ID3D11Device *create_d3d11_device(void) ID3D11Device *device; if (SUCCEEDED(D3D11CreateDevice(NULL, D3D_DRIVER_TYPE_HARDWARE, NULL, - D3D10_CREATE_DEVICE_BGRA_SUPPORT, &level, 1, D3D11_SDK_VERSION, &device, NULL, NULL))) + D3D11_CREATE_DEVICE_BGRA_SUPPORT, &level, 1, D3D11_SDK_VERSION, &device, NULL, NULL))) return device; if (SUCCEEDED(D3D11CreateDevice(NULL, D3D_DRIVER_TYPE_WARP, NULL, - D3D10_CREATE_DEVICE_BGRA_SUPPORT, &level, 1, D3D11_SDK_VERSION, &device, NULL, NULL))) + D3D11_CREATE_DEVICE_BGRA_SUPPORT, &level, 1, D3D11_SDK_VERSION, &device, NULL, NULL))) return device; if (SUCCEEDED(D3D11CreateDevice(NULL, D3D_DRIVER_TYPE_REFERENCE, NULL, - D3D10_CREATE_DEVICE_BGRA_SUPPORT, &level, 1, D3D11_SDK_VERSION, &device, NULL, NULL))) + D3D11_CREATE_DEVICE_BGRA_SUPPORT, &level, 1, D3D11_SDK_VERSION, &device, NULL, NULL))) return device; return NULL;

1 0

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 November 2022