March 2023 - Wine-commits - list.winehq.org

Alexandre Julliard : ntdll: Convert WoW context to native context when running in 32-bit code.
by Alexandre Julliard 24 Mar '23

24 Mar '23

Module: wine Branch: master Commit: 5031c6d938f119580e8dbc7817ef68724d17954e URL: https://gitlab.winehq.org/wine/wine/-/commit/5031c6d938f119580e8dbc7817ef68… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 24 14:40:46 2023 +0100 ntdll: Convert WoW context to native context when running in 32-bit code. It fixes single-stepping in the kernel32:debugger tests. --- dlls/ntdll/unix/thread.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c index bf025a38188..4c8c04cf9fc 100644 --- a/dlls/ntdll/unix/thread.c +++ b/dlls/ntdll/unix/thread.c @@ -1068,7 +1068,10 @@ static void contexts_from_server( CONTEXT *context, context_t server_contexts[2] if (native_context) { context_from_server( native_context, &server_contexts[0], native_machine ); - if (wow_context) context_from_server( wow_context, &server_contexts[1], main_image_info.Machine ); + if (wow_context) + context_from_server( wow_context, &server_contexts[1], main_image_info.Machine ); + else + context_from_server( native_context, &server_contexts[1], native_machine ); } else context_from_server( wow_context, &server_contexts[0], main_image_info.Machine ); }

1 0

Alexandre Julliard : ntdll: Fully initialize the i386 FPU context on ARM64.
by Alexandre Julliard 24 Mar '23

24 Mar '23

Module: wine Branch: master Commit: d4f36570cd08260d9ac66c8795f74d87a50a8592 URL: https://gitlab.winehq.org/wine/wine/-/commit/d4f36570cd08260d9ac66c8795f74d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 24 15:44:14 2023 +0100 ntdll: Fully initialize the i386 FPU context on ARM64. --- dlls/ntdll/unix/signal_arm64.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/unix/signal_arm64.c b/dlls/ntdll/unix/signal_arm64.c index 2736c43e3b5..da78a7a8036 100644 --- a/dlls/ntdll/unix/signal_arm64.c +++ b/dlls/ntdll/unix/signal_arm64.c @@ -1615,6 +1615,7 @@ void DECLSPEC_HIDDEN call_init_thunk( LPTHREAD_START_ROUTINE entry, void *arg, B if ((i386_context = get_cpu_area( IMAGE_FILE_MACHINE_I386 ))) { + XMM_SAVE_AREA32 *fpu = (XMM_SAVE_AREA32 *)i386_context->ExtendedRegisters; i386_context->ContextFlags = CONTEXT_I386_ALL; i386_context->Eax = (ULONG_PTR)entry; i386_context->Ebx = (arg == peb ? (ULONG_PTR)wow_peb : (ULONG_PTR)arg); @@ -1627,8 +1628,9 @@ void DECLSPEC_HIDDEN call_init_thunk( LPTHREAD_START_ROUTINE entry, void *arg, B i386_context->SegGs = 0x2b; i386_context->SegSs = 0x2b; i386_context->EFlags = 0x202; - i386_context->FloatSave.ControlWord = 0x27f; - ((XSAVE_FORMAT *)i386_context->ExtendedRegisters)->MxCsr = 0x1f80; + fpu->ControlWord = 0x27f; + fpu->MxCsr = 0x1f80; + fpux_to_fpu( &i386_context->FloatSave, fpu ); } else if ((arm_context = get_cpu_area( IMAGE_FILE_MACHINE_ARMNT ))) {

1 0

Alexandre Julliard : kernelbase: Fix pattern checking for genitive month names in get_date_format().
by Alexandre Julliard 24 Mar '23

24 Mar '23

Module: wine Branch: master Commit: 94456eb46db4f3cf04e89928c6f71c962ed94c82 URL: https://gitlab.winehq.org/wine/wine/-/commit/94456eb46db4f3cf04e89928c6f71c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 24 16:05:39 2023 +0100 kernelbase: Fix pattern checking for genitive month names in get_date_format(). --- dlls/kernelbase/locale.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index 632f5b6d88a..45180f4bb8a 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -7771,7 +7771,7 @@ static int get_date_format( const NLS_LOCALE_DATA *locale, DWORD flags, const SY val = (count == 3 ? LOCALE_SABBREVMONTHNAME1 : LOCALE_SMONTHNAME1) + time.wMonth - 1; if (!genitive) { - for (i = count; format[i]; i += get_pattern_len( format, L"yMd" )) + for (i = count; format[i]; i += get_pattern_len( format + i, L"yMd" )) { if (format[i] != 'd') continue; if (format[i + 1] != 'd' || format[i + 2] != 'd')

1 0

Tag vkd3d-1.7 : Alexandre Julliard : Release 1.7
by Alexandre Julliard 24 Mar '23

24 Mar '23

Module: vkd3d Branch: refs/tags/vkd3d-1.7 Tag: f4975128f055b98e5521d32101abda34cc08be1f URL: https://gitlab.winehq.org/wine/vkd3d/-/tags/f4975128f055b98e5521d32101abda3… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 24 12:51:01 2023 +0100 Release 1.7

1 0

Henri Verbeet : Release 1.7.
by Alexandre Julliard 24 Mar '23

24 Mar '23

Module: vkd3d Branch: master Commit: 57d92a15cf93d9448f2deb91a8614f9c4c085216 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/57d92a15cf93d9448f2deb91a8614… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 14 17:29:04 2023 +0100 Release 1.7. --- ANNOUNCE | 76 +++++++++++++++++++++---------------- AUTHORS | 1 + COPYING | 2 +- Makefile.am | 6 +-- configure.ac | 2 +- demos/demo_xcb.h | 2 +- include/vkd3d.h | 1 + include/vkd3d_shader.h | 1 + libs/vkd3d-shader/spirv.c | 2 +- libs/vkd3d-utils/vkd3d_utils_main.c | 4 +- libs/vkd3d/state.c | 4 +- programs/vkd3d-compiler/main.c | 2 +- 12 files changed, 58 insertions(+), 45 deletions(-)

1 0

Zebediah Figura : include: Add D3D10CalcSubresource().
by Alexandre Julliard 23 Mar '23

23 Mar '23

Module: wine Branch: master Commit: d8d8774568a6fc16bc4cb60c1e9438d3619bb2ff URL: https://gitlab.winehq.org/wine/wine/-/commit/d8d8774568a6fc16bc4cb60c1e9438… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Sep 2 13:16:19 2022 +0530 include: Add D3D10CalcSubresource(). --- include/d3d10.idl | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/include/d3d10.idl b/include/d3d10.idl index c35e44a0d92..794fa33ce67 100644 --- a/include/d3d10.idl +++ b/include/d3d10.idl @@ -252,6 +252,13 @@ cpp_quote("#define MAKE_D3D10_STATUS(code) MAKE_HRESULT( 0, _ cpp_quote("#define D3D10_ERROR_TOO_MANY_UNIQUE_STATE_OBJECTS MAKE_D3D10_HRESULT(1)") cpp_quote("#define D3D10_ERROR_FILE_NOT_FOUND MAKE_D3D10_HRESULT(2)") +cpp_quote("#if defined(__cplusplus) && !defined(D3D10_NO_HELPERS)") +cpp_quote("inline unsigned int D3D10CalcSubresource(unsigned int level, unsigned int layer, unsigned int level_count)") +cpp_quote("{") +cpp_quote(" return layer * level_count + level;") +cpp_quote("}") +cpp_quote("#endif") + typedef enum D3D10_BLEND { D3D10_BLEND_ZERO = 1, D3D10_BLEND_ONE = 2,

1 0

Rémi Bernon : widl: Rename (error|warning)_loc_info to (error|warning)_at.
by Alexandre Julliard 23 Mar '23

23 Mar '23

Module: wine Branch: master Commit: edca5937fba5874f6550bd7f0f0f0d4ec1b8beab URL: https://gitlab.winehq.org/wine/wine/-/commit/edca5937fba5874f6550bd7f0f0f0d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Mar 21 10:40:25 2023 +0100 widl: Rename (error|warning)_loc_info to (error|warning)_at. --- tools/widl/expr.c | 62 ++++++++++------------- tools/widl/parser.y | 64 ++++++++++------------- tools/widl/typetree.c | 134 ++++++++++++++++++++++++++----------------------- tools/widl/typetree.h | 2 +- tools/widl/utils.c | 70 ++++++++++---------------- tools/widl/utils.h | 8 +-- tools/widl/widltypes.h | 9 ++-- 7 files changed, 157 insertions(+), 192 deletions(-)

1 0

Rémi Bernon : widl: Allow source location to span over multiple lines.
by Alexandre Julliard 23 Mar '23

23 Mar '23

Module: wine Branch: master Commit: be1e3082531fcd36804603f5d57931d79a28d5fe URL: https://gitlab.winehq.org/wine/wine/-/commit/be1e3082531fcd36804603f5d57931… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Mar 21 11:04:58 2023 +0100 widl: Allow source location to span over multiple lines. --- tools/widl/parser.y | 5 +++-- tools/widl/typetree.c | 42 +++++++++++++++++++++--------------------- tools/widl/utils.c | 4 ++-- tools/widl/widltypes.h | 5 ++++- 4 files changed, 30 insertions(+), 26 deletions(-)

1 0

Rémi Bernon : widl: Move diagnostic and location functions to parser.l.
by Alexandre Julliard 23 Mar '23

23 Mar '23

Module: wine Branch: master Commit: 2edd194a009f9a068f814f36b59a7092ffae5a76 URL: https://gitlab.winehq.org/wine/wine/-/commit/2edd194a009f9a068f814f36b59a70… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Mar 21 11:32:31 2023 +0100 widl: Move diagnostic and location functions to parser.l. --- tools/widl/parser.h | 9 ++++++--- tools/widl/parser.l | 51 ++++++++++++++++++++++++++++++++++++++++++++++++++ tools/widl/parser.y | 10 ++-------- tools/widl/utils.c | 45 ++------------------------------------------ tools/widl/utils.h | 2 +- tools/widl/widl.c | 2 -- tools/widl/widl.h | 3 --- tools/widl/widltypes.h | 2 -- 8 files changed, 62 insertions(+), 62 deletions(-) diff --git a/tools/widl/parser.h b/tools/widl/parser.h index 81418fca160..6111193561f 100644 --- a/tools/widl/parser.h +++ b/tools/widl/parser.h @@ -21,16 +21,19 @@ #ifndef __WIDL_PARSER_H #define __WIDL_PARSER_H +#include "widltypes.h" + int parser_parse(void); +extern void generic_msg( const struct location *where, const char *s, const char *t, va_list ap ); +extern void parser_error( const char *message ); +extern void init_location( struct location *where ); + extern FILE *parser_in; -extern char *parser_text; extern int parser_debug; extern int yy_flex_debug; extern int parse_only; -void push_import( char *import_name ); -void pop_import(void); int is_type(const char *name); diff --git a/tools/widl/parser.l b/tools/widl/parser.l index 9fc6a10c501..a89e9cc00b9 100644 --- a/tools/widl/parser.l +++ b/tools/widl/parser.l @@ -78,6 +78,7 @@ struct import struct list entry; }; static struct list imports = LIST_INIT( imports ); +static int line_number = 1; /* converts an integer in string form to an unsigned long and prints an error * on overflow */ @@ -511,6 +512,56 @@ static void switch_to_acf(void) yy_switch_to_buffer( yy_create_buffer( file, YY_BUF_SIZE ) ); } +#define CURRENT_LOCATION { input_name ? input_name : "stdin", parser_text, line_number, 0, line_number, 0 } + +static const int want_near_indication = 0; + +static void make_print(char *str) +{ + while(*str) + { + if(!isprint(*str)) + *str = ' '; + str++; + } +} + +void init_location( struct location *where ) +{ + where->input_name = input_name ? input_name : "stdin"; + where->near_text = parser_text; + where->first_line = line_number; + where->last_line = line_number; +} + +void generic_msg( const struct location *where, const char *s, const char *t, va_list ap ) +{ + struct location cur_loc = CURRENT_LOCATION; + + if (!where) where = &cur_loc; + + fprintf( stderr, "%s:%d: %s: ", where->input_name, where->first_line, t ); + vfprintf( stderr, s, ap ); + + if (want_near_indication) + { + char *cpy; + if (where->near_text) + { + cpy = xstrdup( where->near_text ); + make_print( cpy ); + fprintf( stderr, " near '%s'", cpy ); + free( cpy ); + } + } +} + +/* yyerror: yacc assumes this is not newline terminated. */ +void parser_error( const char *message ) +{ + error_loc( "%s\n", message ); +} + static void warning_disable(int warning) { warning_t *warning_entry; diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 5b45c000163..97ee48cbfa7 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -125,6 +125,8 @@ static typelib_t *current_typelib; { int parser_lex( PARSER_STYPE *yylval ); +void push_import( char *input_name ); +void pop_import(void); } @@ -3389,14 +3391,6 @@ static statement_list_t *append_statement(statement_list_t *list, statement_t *s return list; } -void init_location( struct location *where ) -{ - where->input_name = input_name ? input_name : "stdin"; - where->near_text = parser_text; - where->first_line = line_number; - where->last_line = line_number; -} - type_t *find_parameterized_type(type_t *type, typeref_list_t *params) { char *name = format_parameterized_type_name(type, params); diff --git a/tools/widl/utils.c b/tools/widl/utils.c index 979851e1b44..987301d1585 100644 --- a/tools/widl/utils.c +++ b/tools/widl/utils.c @@ -32,51 +32,11 @@ #include "utils.h" #include "parser.h" -#define CURRENT_LOCATION { input_name ? input_name : "stdin", parser_text, line_number, 0, line_number, 0 } - -static const int want_near_indication = 0; - -static void make_print(char *str) -{ - while(*str) - { - if(!isprint(*str)) - *str = ' '; - str++; - } -} - -static void generic_msg( const struct location *where, const char *s, const char *t, va_list ap ) -{ - fprintf( stderr, "%s:%d: %s: ", where->input_name, where->first_line, t ); - vfprintf( stderr, s, ap ); - - if (want_near_indication) - { - char *cpy; - if (where->near_text) - { - cpy = xstrdup( where->near_text ); - make_print( cpy ); - fprintf( stderr, " near '%s'", cpy ); - free( cpy ); - } - } -} - - -/* yyerror: yacc assumes this is not newline terminated. */ -void parser_error(const char *s) -{ - error_loc("%s\n", s); -} - void error_at( const struct location *where, const char *s, ... ) { - struct location cur_loc = CURRENT_LOCATION; va_list ap; va_start( ap, s ); - generic_msg( where ? where : &cur_loc, s, "error", ap ); + generic_msg( where, s, "error", ap ); va_end( ap ); exit( 1 ); } @@ -102,10 +62,9 @@ void warning(const char *s, ...) void warning_at( const struct location *where, const char *s, ... ) { - struct location cur_loc = CURRENT_LOCATION; va_list ap; va_start( ap, s ); - generic_msg( where ? where : &cur_loc, s, "warning", ap ); + generic_msg( where, s, "warning", ap ); va_end( ap ); } diff --git a/tools/widl/utils.h b/tools/widl/utils.h index 0196dce95fd..2a6bc7d7930 100644 --- a/tools/widl/utils.h +++ b/tools/widl/utils.h @@ -22,8 +22,8 @@ #define __WIDL_UTILS_H #include "widltypes.h" +#include "parser.h" -void parser_error(const char *s) __attribute__((noreturn)); void error(const char *s, ...) __attribute__((format (printf, 1, 2))) __attribute__((noreturn)); void error_at( const struct location *, const char *s, ... ) __attribute__((format( printf, 2, 3 ))) __attribute__((noreturn)); #define error_loc( ... ) error_at( NULL, ## __VA_ARGS__ ) diff --git a/tools/widl/widl.c b/tools/widl/widl.c index 2cb1b59ac45..5bbaeb970fb 100644 --- a/tools/widl/widl.c +++ b/tools/widl/widl.c @@ -140,8 +140,6 @@ static struct strarray dlldirs; static char *output_name; static const char *sysroot = ""; -int line_number = 1; - static FILE *idfile; unsigned int pointer_size = 0; diff --git a/tools/widl/widl.h b/tools/widl/widl.h index c63882108a8..a816ec2bb46 100644 --- a/tools/widl/widl.h +++ b/tools/widl/widl.h @@ -72,9 +72,6 @@ extern const char *prefix_server; extern unsigned int pointer_size; extern time_t now; -extern int line_number; -extern int char_number; - enum stub_mode { MODE_Os, /* inline stubs */ diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h index 4311811f051..c3371e66871 100644 --- a/tools/widl/widltypes.h +++ b/tools/widl/widltypes.h @@ -656,8 +656,6 @@ type_t *reg_type(type_t *type, const char *name, struct namespace *namespace, in var_t *make_var(char *name); var_list_t *append_var(var_list_t *list, var_t *var); -void init_location( struct location * ); - char *format_namespace(struct namespace *namespace, const char *prefix, const char *separator, const char *suffix, const char *abi_prefix); char *format_parameterized_type_name(type_t *type, typeref_list_t *params);

1 0

Rémi Bernon : widl: Enable bison locations option.
by Alexandre Julliard 23 Mar '23

23 Mar '23

Module: wine Branch: master Commit: 071b0a5532fa2e69ea7a547ac0d8f106789d78a1 URL: https://gitlab.winehq.org/wine/wine/-/commit/071b0a5532fa2e69ea7a547ac0d8f1… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Mar 23 09:23:43 2023 +0100 widl: Enable bison locations option. --- tools/widl/parser.h | 2 +- tools/widl/parser.l | 11 ++++++++--- tools/widl/parser.y | 4 +++- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/tools/widl/parser.h b/tools/widl/parser.h index 6111193561f..2d35a2dd279 100644 --- a/tools/widl/parser.h +++ b/tools/widl/parser.h @@ -26,7 +26,7 @@ int parser_parse(void); extern void generic_msg( const struct location *where, const char *s, const char *t, va_list ap ); -extern void parser_error( const char *message ); +extern void parser_error( const struct location *where, const char *message ); extern void init_location( struct location *where ); extern FILE *parser_in; diff --git a/tools/widl/parser.l b/tools/widl/parser.l index a89e9cc00b9..5437e6c5c5b 100644 --- a/tools/widl/parser.l +++ b/tools/widl/parser.l @@ -19,6 +19,7 @@ */ %option bison-bridge +%option bison-locations %option stack %option noinput nounput noyy_top_state %option noyywrap @@ -53,6 +54,7 @@ uuid {hd}{8}-{hd}{4}-{hd}{4}-{hd}{4}-{hd}{12} #define YYerror PARSER_error #define YYSTYPE PARSER_STYPE +#define YYLTYPE PARSER_LTYPE #define YYUNDEF PARSER_UNDEF #define yyerror parser_error @@ -197,13 +199,16 @@ static void winrt_enable( int ns_prefix ) } } <PP_LINE>[0-9]+{ws}* { - line_number = strtoul( yytext, NULL, 10 ) - 1; /* We didn't read the newline */ + yylloc->first_line = strtoul( yytext, NULL, 10 ) - 1; + yylloc->last_line = yylloc->first_line; + line_number = yylloc->first_line; yy_pop_state(); yy_push_state(PP_FILE); } <PP_FILE>\"(\\[^n]|[^"\\\n])*\"{ws}* { input_name = xstrdup( yytext + 1 ); *strchr( input_name, '"' ) = 0; + yylloc->input_name = input_name; } <PP_FILE>[^"][^\n]* { yy_pop_state(); } @@ -557,9 +562,9 @@ void generic_msg( const struct location *where, const char *s, const char *t, va } /* yyerror: yacc assumes this is not newline terminated. */ -void parser_error( const char *message ) +void parser_error( const struct location *where, const char *message ) { - error_loc( "%s\n", message ); + error_at( where, "%s\n", message ); } static void warning_disable(int warning) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 97ee48cbfa7..35a392601e4 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -124,15 +124,17 @@ static typelib_t *current_typelib; %code provides { -int parser_lex( PARSER_STYPE *yylval ); +int parser_lex( PARSER_STYPE *yylval, PARSER_LTYPE *yylloc ); void push_import( char *input_name ); void pop_import(void); } +%define api.location.type {struct location} %define api.prefix {parser_} %define api.pure full %define parse.error verbose +%locations %union { attr_t *attr;

1 0