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

Alexandre Julliard : ntdll: One more fix for CPU information in old Wow64 mode.
by Alexandre Julliard March 24, 2023

March 24, 2023

Module: wine Branch: master Commit: 7686cba10523d5ff9a5b427c9ecc15b18cfbc677 URL: https://gitlab.winehq.org/wine/wine/-/commit/7686cba10523d5ff9a5b427c9ecc15… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 24 13:17:27 2023 +0100 ntdll: One more fix for CPU information in old Wow64 mode. --- dlls/ntdll/tests/info.c | 1 - dlls/ntdll/unix/system.c | 9 +-------- dlls/ntdll/unix/virtual.c | 13 ++++++++++++- 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index f500fc09092..ae1c8c7c89d 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -322,7 +322,6 @@ static void test_query_cpu(void) { ok( sci.ProcessorArchitecture == PROCESSOR_ARCHITECTURE_INTEL, "ProcessorArchitecture wrong %x\n", sci.ProcessorArchitecture ); - todo_wine ok( sci2.ProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64 || sci2.ProcessorArchitecture == PROCESSOR_ARCHITECTURE_ARM64, "ProcessorArchitecture wrong %x\n", sci2.ProcessorArchitecture ); diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index 3eecccc4972..04755fac5ea 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -2568,14 +2568,7 @@ NTSTATUS WINAPI NtQuerySystemInformation( SYSTEM_INFORMATION_CLASS class, } case SystemCpuInformation: /* 1 */ - if (size >= (len = sizeof(cpu_info))) - { - SYSTEM_CPU_INFORMATION cpu = cpu_info; - - if (is_old_wow64() && cpu.ProcessorArchitecture == PROCESSOR_ARCHITECTURE_INTEL) - cpu.ProcessorArchitecture = PROCESSOR_ARCHITECTURE_AMD64; - memcpy(info, &cpu, len); - } + if (size >= (len = sizeof(cpu_info))) memcpy(info, &cpu_info, len); else ret = STATUS_INFO_LENGTH_MISMATCH; break; diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 1d07744ed1a..0faf3e343e3 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -5319,10 +5319,21 @@ NTSTATUS WINAPI NtWow64WriteVirtualMemory64( HANDLE process, ULONG64 addr, const NTSTATUS WINAPI NtWow64GetNativeSystemInformation( SYSTEM_INFORMATION_CLASS class, void *info, ULONG len, ULONG *retlen ) { + NTSTATUS status; + switch (class) { - case SystemBasicInformation: case SystemCpuInformation: + status = NtQuerySystemInformation( class, info, len, retlen ); + if (!status && is_old_wow64()) + { + SYSTEM_CPU_INFORMATION *cpu = info; + + if (cpu->ProcessorArchitecture == PROCESSOR_ARCHITECTURE_INTEL) + cpu->ProcessorArchitecture = PROCESSOR_ARCHITECTURE_AMD64; + } + return status; + case SystemBasicInformation: case SystemEmulationBasicInformation: case SystemEmulationProcessorInformation: return NtQuerySystemInformation( class, info, len, retlen );

1 0

Alexandre Julliard : kernelbase: Fix pattern checking for genitive month names in get_date_format().
by Alexandre Julliard March 24, 2023

March 24, 2023

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

Alexandre Julliard : ntdll: Fully initialize the i386 FPU context on ARM64.
by Alexandre Julliard March 24, 2023

March 24, 2023

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

Tag vkd3d-1.7 : Alexandre Julliard : Release 1.7
by Alexandre Julliard March 24, 2023

March 24, 2023

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 March 24, 2023

March 24, 2023

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

Rémi Bernon : widl: Print the import stack and context in messages.
by Alexandre Julliard March 23, 2023

March 23, 2023

Module: wine Branch: master Commit: 3149d27220acaf276bfa651e040ff006edcd6944 URL: https://gitlab.winehq.org/wine/wine/-/commit/3149d27220acaf276bfa651e040ff0… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Mar 23 09:38:23 2023 +0100 widl: Print the import stack and context in messages. --- tools/widl/parser.h | 2 +- tools/widl/parser.l | 69 ++++++++++++++++++++++++++++++-------------------- tools/widl/utils.c | 12 +++++++-- tools/widl/widltypes.h | 1 - 4 files changed, 52 insertions(+), 32 deletions(-) diff --git a/tools/widl/parser.h b/tools/widl/parser.h index 8dfde433334..7fef1e755bd 100644 --- a/tools/widl/parser.h +++ b/tools/widl/parser.h @@ -25,7 +25,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_warning( const struct location *where, const char *message ); extern void parser_error( const struct location *where, const char *message ); extern void init_location( struct location *copy, const struct location *begin, const struct location *end ); diff --git a/tools/widl/parser.l b/tools/widl/parser.l index c2008c6865c..1b16de63f0b 100644 --- a/tools/widl/parser.l +++ b/tools/widl/parser.l @@ -461,6 +461,22 @@ SAFEARRAY{ws}*/\( return tSAFEARRAY; } %% +static void print_imports(void) +{ + struct import_state *state, *next; + + if (list_empty( &import_stack )) return; + + fprintf( stderr, "In file included from " ); + LIST_FOR_EACH_ENTRY_SAFE_REV( state, next, &import_stack, struct import_state, entry ) + { + if (&next->entry == &import_stack) break; + fprintf( stderr, "%s:%d,\n", state->input_name, state->where.first_line ); + fprintf( stderr, " from "); + } + fprintf( stderr, "%s:%d:\n", state->input_name, state->where.first_line ); +} + void pop_import( struct location *where ) { struct list *entry = list_head( &import_stack ); @@ -551,18 +567,6 @@ static void end_of_line( struct location *where ) where->last_column = 1; } -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, const struct location *begin, const struct location *end ) { if (!begin) begin = &previous_location; @@ -580,30 +584,39 @@ void init_location( struct location *where, const struct location *begin, const } } -void generic_msg( const struct location *where, const char *s, const char *t, va_list ap ) +static void diagnostic( const struct location *where, const char *type, const char *message ) { + char buffer[1024], *line = NULL; + FILE *file; + int i; + if (!where) where = &previous_location; - fprintf( stderr, "%s:%d: %s: ", where->input_name, where->first_line, t ); - vfprintf( stderr, s, ap ); + print_imports(); - 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 ); - } - } + fprintf( stderr, "%s:%d:%d: %s: %s\n", where->input_name, where->first_line, where->first_column, type, message ); + + if (!where->input_name || !(file = fopen( where->input_name, "r" ))) return; + for (i = 0; i < where->first_line; i++) if (!(line = fgets( buffer, sizeof(buffer), file ))) break; + fclose( file ); + if (!line) return; + fprintf( stderr, "%s", line ); + + line = buffer; + for (i = 0; i < where->first_column - 1; i++) line += sprintf( line, " " ); + line += sprintf( line, "^" ); + for (i = where->first_column + 1; i < where->last_column; i++) line += sprintf( line, "~" ); + fprintf( stderr, "%s\n", buffer ); } -/* yyerror: yacc assumes this is not newline terminated. */ void parser_error( const struct location *where, const char *message ) { - error_at( where, "%s\n", message ); + diagnostic( where, "error", message ); +} + +void parser_warning( const struct location *where, const char *message ) +{ + diagnostic( where, "warning", message ); } static void warning_disable(int warning) diff --git a/tools/widl/utils.c b/tools/widl/utils.c index 987301d1585..4f2e9d3d602 100644 --- a/tools/widl/utils.c +++ b/tools/widl/utils.c @@ -34,10 +34,14 @@ void error_at( const struct location *where, const char *s, ... ) { + char buffer[1024]; + va_list ap; va_start( ap, s ); - generic_msg( where, s, "error", ap ); + vsnprintf( buffer, sizeof(buffer), s, ap ); va_end( ap ); + + parser_error( where, buffer ); exit( 1 ); } @@ -62,10 +66,14 @@ void warning(const char *s, ...) void warning_at( const struct location *where, const char *s, ... ) { + char buffer[1024]; + va_list ap; va_start( ap, s ); - generic_msg( where, s, "warning", ap ); + vsnprintf( buffer, sizeof(buffer), s, ap ); va_end( ap ); + + parser_warning( where, buffer ); } void chat(const char *s, ...) diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h index c3371e66871..fd108ecc473 100644 --- a/tools/widl/widltypes.h +++ b/tools/widl/widltypes.h @@ -313,7 +313,6 @@ enum type_basic_type struct location { const char *input_name; - const char *near_text; int first_line; int last_line; int first_column;

1 0

Rémi Bernon : widl: Enable bison locations option.
by Alexandre Julliard March 23, 2023

March 23, 2023

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

Rémi Bernon : widl: Allow source location to span over multiple lines.
by Alexandre Julliard March 23, 2023

March 23, 2023

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: Improve accuracy of error messages location.
by Alexandre Julliard March 23, 2023

March 23, 2023

Module: wine Branch: master Commit: 472b2ecad40edf668e7cbefed3a5cd7fafc22e86 URL: https://gitlab.winehq.org/wine/wine/-/commit/472b2ecad40edf668e7cbefed3a5cd… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Mar 23 09:38:23 2023 +0100 widl: Improve accuracy of error messages location. --- tools/widl/parser.h | 2 +- tools/widl/parser.l | 77 ++++++++++++++++++++++++++++++++++++++------------- tools/widl/parser.y | 14 ++++++---- tools/widl/typetree.c | 4 +-- 4 files changed, 70 insertions(+), 27 deletions(-) diff --git a/tools/widl/parser.h b/tools/widl/parser.h index 2d35a2dd279..8dfde433334 100644 --- a/tools/widl/parser.h +++ b/tools/widl/parser.h @@ -27,7 +27,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 struct location *where, const char *message ); -extern void init_location( struct location *where ); +extern void init_location( struct location *copy, const struct location *begin, const struct location *end ); extern FILE *parser_in; extern int parser_debug; diff --git a/tools/widl/parser.l b/tools/widl/parser.l index 5437e6c5c5b..c2008c6865c 100644 --- a/tools/widl/parser.l +++ b/tools/widl/parser.l @@ -60,6 +60,13 @@ uuid {hd}{8}-{hd}{4}-{hd}{4}-{hd}{4}-{hd}{12} #include "parser.tab.h" +static void reset_location( struct location *where, const char *input_name ); +static void update_location( struct location *where, const char *yytext ); +static void end_of_line( struct location *where ); + +#define YY_USER_INIT reset_location( yylloc, input_name ) +#define YY_USER_ACTION update_location( yylloc, yytext ); + static void switch_to_acf(void); static warning_list_t *disabled_warnings = NULL; @@ -68,7 +75,7 @@ struct import_state { YY_BUFFER_STATE buffer; char *input_name; - int line_number; + struct location where; struct list entry; }; static struct list import_stack = LIST_INIT( import_stack ); @@ -80,7 +87,7 @@ struct import struct list entry; }; static struct list imports = LIST_INIT( imports ); -static int line_number = 1; +static struct location previous_location; /* converts an integer in string form to an unsigned long and prints an error * on overflow */ @@ -183,25 +190,28 @@ static void winrt_enable( int ns_prefix ) <PP_PRAGMA>{ midl_echo/"(" { yy_pop_state(); + yylloc->first_line -= 1; return tCPPQUOTE; } winrt{ws}+ns_prefix[^\n]* { yy_pop_state(); + yylloc->first_line -= 1; winrt_enable( TRUE ); } winrt[^\n]* { yy_pop_state(); + yylloc->first_line -= 1; winrt_enable( FALSE ); } [^\n]* { yy_pop_state(); + yylloc->first_line -= 1; return token_str( aPRAGMA, yytext, yylval ); } } <PP_LINE>[0-9]+{ws}* { 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); } @@ -424,7 +434,7 @@ SAFEARRAY{ws}*/\( return tSAFEARRAY; \"(\\.|[^"\\])*\" { return token_str( aSTRING, yytext, yylval ); } \'(\\.|[^'\\])*\' { return token_str( aSQSTRING, yytext, yylval ); } - \n { line_number++; } + \n { end_of_line( yylloc ); } {ws} {} \<\< { return SHL; } \>\> { return SHR; } @@ -451,7 +461,7 @@ SAFEARRAY{ws}*/\( return tSAFEARRAY; } %% -void pop_import(void) +void pop_import( struct location *where ) { struct list *entry = list_head( &import_stack ); struct import_state *state; @@ -466,11 +476,11 @@ void pop_import(void) yy_switch_to_buffer( state->buffer ); input_name = state->input_name; - line_number = state->line_number; + *where = state->where; free( state ); } -void push_import( char *import_name ) +void push_import( const char *import_name, struct location *where ) { struct import_state *state; struct import *import; @@ -482,7 +492,7 @@ void push_import( char *import_name ) state->buffer = YY_CURRENT_BUFFER; state->input_name = input_name; - state->line_number = line_number; + state->where = *where; input_name = NULL; /* reset buffer for <<EOF>>, in case import fails or already imported */ @@ -497,7 +507,7 @@ void push_import( char *import_name ) input_name = find_input_file( import_name, state->input_name ); file = open_input_file( input_name ); - line_number = 1; + reset_location( where, input_name ); yy_switch_to_buffer( yy_create_buffer( file, YY_BUF_SIZE ) ); } @@ -511,13 +521,35 @@ static void switch_to_acf(void) input_name = xstrdup( acf_name ); file = open_input_file( input_name ); - line_number = 1; acf_name = NULL; 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 void reset_location( struct location *where, const char *input_name ) +{ + where->first_line = 1; + where->last_line = 1; + where->first_column = 1; + where->last_column = 1; + where->input_name = xstrdup( input_name ); +} + +static void update_location( struct location *where, const char *yytext ) +{ + int len = strlen( yytext ); + previous_location = *where; + where->first_column = where->last_column; + where->last_column += len; +} + +static void end_of_line( struct location *where ) +{ + where->first_line++; + where->last_line++; + where->first_column = 1; + where->last_column = 1; +} static const int want_near_indication = 0; @@ -531,19 +563,26 @@ static void make_print(char *str) } } -void init_location( struct location *where ) +void init_location( struct location *where, const struct location *begin, const struct location *end ) { - where->input_name = input_name ? input_name : "stdin"; - where->near_text = parser_text; - where->first_line = line_number; - where->last_line = line_number; + if (!begin) begin = &previous_location; + *where = *begin; + + if (end) + { + where->last_line = end->last_line; + where->last_column = end->last_column; + } + else + { + where->first_line = begin->last_line; + where->first_column = begin->last_column; + } } 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; + if (!where) where = &previous_location; fprintf( stderr, "%s:%d: %s: ", where->input_name, where->first_line, t ); vfprintf( stderr, s, ap ); diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 35a392601e4..e92bd277771 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -125,8 +125,12 @@ static typelib_t *current_typelib; { int parser_lex( PARSER_STYPE *yylval, PARSER_LTYPE *yylloc ); -void push_import( char *input_name ); -void pop_import(void); +void push_import( const char *fname, PARSER_LTYPE *yylloc ); +void pop_import( PARSER_LTYPE *yylloc ); + +# define YYLLOC_DEFAULT( cur, rhs, n ) \ + do { if (n) init_location( &(cur), &YYRHSLOC( rhs, 1 ), &YYRHSLOC( rhs, n ) ); \ + else init_location( &(cur), &YYRHSLOC( rhs, 0 ), NULL ); } while(0) } @@ -511,9 +515,9 @@ typedecl: cppquote: tCPPQUOTE '(' aSTRING ')' { $$ = $3; } ; -import_start: tIMPORT aSTRING ';' { $$ = $2; push_import($2); } +import_start: tIMPORT aSTRING ';' { $$ = $2; push_import( $2, &yylloc ); } ; -import: import_start imp_statements aEOF { pop_import(); } +import: import_start imp_statements aEOF { pop_import( &yylloc ); } ; importlib: tIMPORTLIB '(' aSTRING ')' @@ -1974,7 +1978,7 @@ var_t *make_var(char *name) init_declspec(&v->declspec, NULL); v->attrs = NULL; v->eval = NULL; - init_location( &v->where ); + init_location( &v->where, NULL, NULL ); v->declonly = FALSE; return v; } diff --git a/tools/widl/typetree.c b/tools/widl/typetree.c index 8d4837b7943..b9173a33019 100644 --- a/tools/widl/typetree.c +++ b/tools/widl/typetree.c @@ -65,7 +65,7 @@ type_t *make_type(enum type_type type) t->tfswrite = FALSE; t->checked = FALSE; t->typelib_idx = -1; - init_location( &t->where ); + init_location( &t->where, NULL, NULL ); return t; } @@ -478,7 +478,7 @@ type_t *type_new_alias(const decl_spec_t *t, const char *name) a->name = xstrdup(name); a->attrs = NULL; a->details.alias.aliasee = *t; - init_location( &a->where ); + init_location( &a->where, NULL, NULL ); return a; }

1 0

Rémi Bernon : widl: Move diagnostic and location functions to parser.l.
by Alexandre Julliard March 23, 2023

March 23, 2023

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