- Wine-Commits - list.winehq.org

Alexandre Julliard : ntdll/tests: Handle another possible status when SystemProcessorFeaturesInformation is not supported.
by Alexandre Julliard March 15, 2023

March 15, 2023

Module: wine Branch: master Commit: 29cd79829c5c8ea32a5ce6a9c9fef6a48dab813c URL: https://gitlab.winehq.org/wine/wine/-/commit/29cd79829c5c8ea32a5ce6a9c9fef6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 15 09:05:47 2023 +0100 ntdll/tests: Handle another possible status when SystemProcessorFeaturesInformation is not supported. --- dlls/ntdll/tests/info.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 9a1e790e673..f500fc09092 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -377,7 +377,7 @@ static void test_query_cpu(void) len = 0xdeadbeef; status = pNtQuerySystemInformation( SystemProcessorFeaturesInformation, &features, sizeof(features), &len ); - if (status != STATUS_NOT_SUPPORTED) + if (status != STATUS_NOT_SUPPORTED && status != STATUS_INVALID_INFO_CLASS) { ok( !status, "SystemProcessorFeaturesInformation failed %lx\n", status ); ok( len == sizeof(features), "wrong len %lu\n", len );

1 0

Alexandre Julliard : ntdll/tests: Update some todos that succeed with the new wow64 architecture.
by Alexandre Julliard March 15, 2023

March 15, 2023

Module: wine Branch: master Commit: 6114944106b9493485f0e5ba4eab9d3e3129e100 URL: https://gitlab.winehq.org/wine/wine/-/commit/6114944106b9493485f0e5ba4eab9d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 15 10:59:05 2023 +0100 ntdll/tests: Update some todos that succeed with the new wow64 architecture. --- dlls/ntdll/tests/wow64.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/tests/wow64.c b/dlls/ntdll/tests/wow64.c index 8150ee0fff1..ddb63b7cae8 100644 --- a/dlls/ntdll/tests/wow64.c +++ b/dlls/ntdll/tests/wow64.c @@ -40,6 +40,7 @@ static NTSTATUS (WINAPI *pNtWow64WriteVirtualMemory64)(HANDLE,ULONG64,const void #endif static BOOL is_wow64; +static BOOL old_wow64; /* Wine old-style wow64 */ static void *code_mem; #ifdef __i386__ @@ -99,6 +100,7 @@ static void init(void) native_machine = IMAGE_FILE_MACHINE_AMD64; break; case PROCESSOR_ARCHITECTURE_INTEL: + old_wow64 = TRUE; native_machine = IMAGE_FILE_MACHINE_AMD64; break; } @@ -715,7 +717,7 @@ static void enum_modules64( void (*func)(ULONG64,const WCHAR *) ) ok( process != 0, "failed to open current process %lu\n", GetLastError() ); status = pNtWow64ReadVirtualMemory64( process, teb64->Peb, &peb64, sizeof(peb64), NULL ); ok( !status, "NtWow64ReadVirtualMemory64 failed %lx\n", status ); - todo_wine + todo_wine_if( old_wow64 ) ok( peb64.LdrData, "LdrData not initialized\n" ); if (!peb64.LdrData) goto done; status = pNtWow64ReadVirtualMemory64( process, peb64.LdrData, &ldr, sizeof(ldr), NULL ); @@ -816,7 +818,7 @@ static void test_modules(void) if (!is_wow64) return; if (!pNtWow64ReadVirtualMemory64) return; enum_modules64( check_module ); - todo_wine + todo_wine_if( old_wow64 ) { ok( main_module, "main module not found\n" ); ok( ntdll_module, "64-bit ntdll not found\n" ); @@ -913,7 +915,7 @@ static void test_nt_wow64(void) ptr = 0x9876543210ull; status = pNtWow64AllocateVirtualMemory64( process, &ptr, 0, &size, MEM_RESERVE | MEM_COMMIT, PAGE_READONLY ); - todo_wine + todo_wine_if( !is_wow64 || old_wow64 ) ok( !status || broken( status == STATUS_CONFLICTING_ADDRESSES ), "NtWow64AllocateVirtualMemory64 failed %lx\n", status ); if (!status) ok( ptr == 0x9876540000ull || broken(ptr == 0x76540000), /* win 8.1 */ @@ -942,7 +944,7 @@ static void test_nt_wow64(void) ok( len == sizeof(sbi2), "wrong length %ld\n", len ); ok( sbi.HighestUserAddress == (void *)0x7ffeffff, "wrong limit %p\n", sbi.HighestUserAddress); - todo_wine_if( is_wow64 ) + todo_wine_if( old_wow64 ) ok( sbi2.HighestUserAddress == (is_wow64 ? (void *)0xfffeffff : (void *)0x7ffeffff), "wrong limit %p\n", sbi.HighestUserAddress); @@ -1093,7 +1095,8 @@ static void test_init_block(void) CHECK_FUNC( block64[6], "KiUserCallbackDispatcher" ); CHECK_FUNC( block64[7], "RtlUserThreadStart" ); CHECK_FUNC( block64[8], "RtlpQueryProcessDebugInformationRemote" ); - todo_wine ok( block64[9] == (ULONG_PTR)ntdll, "got %p for ntdll %p\n", + todo_wine_if( old_wow64 ) + ok( block64[9] == (ULONG_PTR)ntdll, "got %p for ntdll %p\n", (void *)(ULONG_PTR)block64[9], ntdll ); CHECK_FUNC( block64[10], "LdrSystemDllInitBlock" ); CHECK_FUNC( block64[11], "RtlpFreezeTimeBias" );

1 0

Alexandre Julliard : ntdll/tests: Fix Wow64 tests failures on Windows 11 ARM64.
by Alexandre Julliard March 15, 2023

March 15, 2023

Module: wine Branch: master Commit: 6f2cf11da35abcbb8ca8125ba961d8baee44401d URL: https://gitlab.winehq.org/wine/wine/-/commit/6f2cf11da35abcbb8ca8125ba961d8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 15 10:44:45 2023 +0100 ntdll/tests: Fix Wow64 tests failures on Windows 11 ARM64. --- dlls/ntdll/tests/wow64.c | 86 +++++++++++++++++++++++++++++++++--------------- 1 file changed, 59 insertions(+), 27 deletions(-) diff --git a/dlls/ntdll/tests/wow64.c b/dlls/ntdll/tests/wow64.c index 08660b608b4..8150ee0fff1 100644 --- a/dlls/ntdll/tests/wow64.c +++ b/dlls/ntdll/tests/wow64.c @@ -42,6 +42,23 @@ static NTSTATUS (WINAPI *pNtWow64WriteVirtualMemory64)(HANDLE,ULONG64,const void static BOOL is_wow64; static void *code_mem; +#ifdef __i386__ +static USHORT current_machine = IMAGE_FILE_MACHINE_I386; +static USHORT native_machine = IMAGE_FILE_MACHINE_I386; +#elif defined __x86_64__ +static USHORT current_machine = IMAGE_FILE_MACHINE_AMD64; +static USHORT native_machine = IMAGE_FILE_MACHINE_AMD64; +#elif defined __arm__ +static USHORT current_machine = IMAGE_FILE_MACHINE_ARMNT; +static USHORT native_machine = IMAGE_FILE_MACHINE_ARMNT; +#elif defined __aarch64__ +static USHORT current_machine = IMAGE_FILE_MACHINE_ARM64; +static USHORT native_machine = IMAGE_FILE_MACHINE_ARM64; +#else +static USHORT current_machine; +static USHORT native_machine; +#endif + static void init(void) { HMODULE ntdll = GetModuleHandleA( "ntdll.dll" ); @@ -67,7 +84,28 @@ static void init(void) #endif #undef GET_PROC - code_mem = VirtualAlloc( NULL, 65536, MEM_RESERVE | MEM_COMMIT, PAGE_EXECUTE_READWRITE ); + if (is_wow64) + { + SYSTEM_CPU_INFORMATION info; + ULONG len; + + pRtlGetNativeSystemInformation( SystemCpuInformation, &info, sizeof(info), &len ); + switch (info.ProcessorArchitecture) + { + case PROCESSOR_ARCHITECTURE_ARM64: + native_machine = IMAGE_FILE_MACHINE_ARM64; + break; + case PROCESSOR_ARCHITECTURE_AMD64: + native_machine = IMAGE_FILE_MACHINE_AMD64; + break; + case PROCESSOR_ARCHITECTURE_INTEL: + native_machine = IMAGE_FILE_MACHINE_AMD64; + break; + } + } + + if (native_machine == IMAGE_FILE_MACHINE_AMD64) + code_mem = VirtualAlloc( NULL, 65536, MEM_RESERVE | MEM_COMMIT, PAGE_EXECUTE_READWRITE ); } static void test_process_architecture( HANDLE process, USHORT expect_machine, USHORT expect_native ) @@ -122,22 +160,6 @@ static void test_process_architecture( HANDLE process, USHORT expect_machine, US static void test_query_architectures(void) { -#ifdef __i386__ - USHORT current_machine = IMAGE_FILE_MACHINE_I386; - USHORT native_machine = is_wow64 ? IMAGE_FILE_MACHINE_AMD64 : IMAGE_FILE_MACHINE_I386; -#elif defined __x86_64__ - USHORT current_machine = IMAGE_FILE_MACHINE_AMD64; - USHORT native_machine = IMAGE_FILE_MACHINE_AMD64; -#elif defined __arm__ - USHORT current_machine = IMAGE_FILE_MACHINE_ARMNT; - USHORT native_machine = is_wow64 ? IMAGE_FILE_MACHINE_ARM64 : IMAGE_FILE_MACHINE_ARMNT; -#elif defined __aarch64__ - USHORT current_machine = IMAGE_FILE_MACHINE_ARM64; - USHORT native_machine = IMAGE_FILE_MACHINE_ARM64; -#else - USHORT current_machine = 0; - USHORT native_machine = 0; -#endif PROCESS_INFORMATION pi; STARTUPINFOA si = { sizeof(si) }; NTSTATUS status; @@ -209,11 +231,11 @@ static void test_query_architectures(void) ret = 0xcc; status = pRtlWow64IsWowGuestMachineSupported( IMAGE_FILE_MACHINE_ARMNT, &ret ); ok( !status, "failed %lx\n", status ); - ok( ret == (native_machine == IMAGE_FILE_MACHINE_ARM64), "wrong result %u\n", ret ); + ok( !ret || native_machine == IMAGE_FILE_MACHINE_ARM64, "wrong result %u\n", ret ); ret = 0xcc; status = pRtlWow64IsWowGuestMachineSupported( IMAGE_FILE_MACHINE_AMD64, &ret ); ok( !status, "failed %lx\n", status ); - ok( !ret, "wrong result %u\n", ret ); + ok( !ret || native_machine == IMAGE_FILE_MACHINE_ARM64, "wrong result %u\n", ret ); ret = 0xcc; status = pRtlWow64IsWowGuestMachineSupported( IMAGE_FILE_MACHINE_ARM64, &ret ); ok( !status, "failed %lx\n", status ); @@ -439,13 +461,14 @@ static void test_selectors(void) if (!pRtlWow64GetThreadContext || pRtlWow64GetThreadContext( GetCurrentThread(), &context )) { /* hardcoded values */ - context.SegCs = 0x23; #ifdef __x86_64__ + context.SegCs = 0x23; __asm__( "movw %%fs,%0" : "=m" (context.SegFs) ); __asm__( "movw %%ss,%0" : "=m" (context.SegSs) ); #else - context.SegSs = 0x2b; - context.SegFs = 0x53; + context.SegCs = 0x1b; + context.SegSs = 0x23; + context.SegFs = 0x3b; #endif } #define GET_ENTRY(info,size,ret) \ @@ -570,7 +593,7 @@ static void test_cpu_area(void) { USHORT machine; NTSTATUS expect; - ULONG align, size, offset, flag; + ULONG_PTR align, size, offset, flag; } tests[] = { { IMAGE_FILE_MACHINE_I386, 0, 4, 0x2cc, 0x00, 0x00010000 }, @@ -663,7 +686,7 @@ static NTSTATUS call_func64( ULONG64 func64, int nb_args, ULONG64 *args ) } static ULONG64 main_module, ntdll_module, wow64_module, wow64base_module, wow64con_module, - wow64cpu_module, wow64win_module; + wow64cpu_module, xtajit_module, wow64win_module; static void enum_modules64( void (*func)(ULONG64,const WCHAR *) ) { @@ -774,13 +797,16 @@ static void check_module( ULONG64 base, const WCHAR *name ) main_module = base; return; } -#define CHECK_MODULE(mod) if (!wcsicmp( name, L"" #mod ".dll" )) { mod ## _module = base; return; } +#define CHECK_MODULE(mod) do { if (!wcsicmp( name, L"" #mod ".dll" )) { mod ## _module = base; return; } } while(0) CHECK_MODULE(ntdll); CHECK_MODULE(wow64); CHECK_MODULE(wow64base); CHECK_MODULE(wow64con); - CHECK_MODULE(wow64cpu); CHECK_MODULE(wow64win); + if (native_machine == IMAGE_FILE_MACHINE_ARM64) + CHECK_MODULE(xtajit); + else + CHECK_MODULE(wow64cpu); #undef CHECK_MODULE ok( 0, "unknown module %s %s found\n", wine_dbgstr_longlong(base), wine_dbgstr_w(name)); } @@ -795,7 +821,10 @@ static void test_modules(void) ok( main_module, "main module not found\n" ); ok( ntdll_module, "64-bit ntdll not found\n" ); ok( wow64_module, "wow64.dll not found\n" ); - ok( wow64cpu_module, "wow64cpu.dll not found\n" ); + if (native_machine == IMAGE_FILE_MACHINE_ARM64) + ok( xtajit_module, "xtajit.dll not found\n" ); + else + ok( wow64cpu_module, "wow64cpu.dll not found\n" ); ok( wow64win_module, "wow64win.dll not found\n" ); } } @@ -1111,6 +1140,7 @@ static void test_iosb(void) ULONG64 args[] = { 0, 0, 0, 0, (ULONG_PTR)&iosb64, FSCTL_PIPE_LISTEN, 0, 0, 0, 0 }; if (!is_wow64) return; + if (!code_mem) return; if (!ntdll_module) return; func = get_proc_address64( ntdll_module, "NtFsControlFile" ); @@ -1217,6 +1247,7 @@ static void test_syscalls(void) NTSTATUS status; if (!is_wow64) return; + if (!code_mem) return; if (!ntdll_module) return; func = get_proc_address64( wow64_module, "Wow64SystemServiceEx" ); @@ -1300,6 +1331,7 @@ static void test_cpu_area(void) NTSTATUS status; if (!is_wow64) return; + if (!code_mem) return; if (!ntdll_module) return; if ((ptr = get_proc_address64( ntdll_module, "RtlWow64GetCurrentCpuArea" )))

1 0

Nikolay Sivov : vkd3d-shader: Fix a few typos in the comments.
by Alexandre Julliard March 15, 2023

March 15, 2023

Module: vkd3d Branch: master Commit: 4110f1e54781c1f87c37f2ec6682138210d7de63 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/4110f1e54781c1f87c37f2ec66821… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 8 02:04:37 2023 +0100 vkd3d-shader: Fix a few typos in the comments. --- libs/vkd3d-shader/hlsl.c | 2 +- libs/vkd3d-shader/hlsl.h | 8 ++++---- libs/vkd3d-shader/hlsl_codegen.c | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 286c6e60..64d6e870 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -947,7 +947,7 @@ void hlsl_cleanup_deref(struct hlsl_deref *deref) hlsl_src_remove(&deref->offset); } -/* Initializes a simple variable derefence, so that it can be passed to load/store functions. */ +/* Initializes a simple variable dereference, so that it can be passed to load/store functions. */ void hlsl_init_simple_deref_from_var(struct hlsl_deref *deref, struct hlsl_ir_var *var) { memset(deref, 0, sizeof(*deref)); diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 7b516622..ec0101e1 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -181,7 +181,7 @@ struct hlsl_type struct { struct hlsl_type *type; - /* Array lenght, or HLSL_ARRAY_ELEMENTS_COUNT_IMPLICIT if it is unknown yet while parsing. */ + /* Array length, or HLSL_ARRAY_ELEMENTS_COUNT_IMPLICIT if it is not known yet at parse time. */ unsigned int elements_count; } array; /* Format of the data contained within the type if the base_type is HLSL_TYPE_TEXTURE or @@ -224,7 +224,7 @@ struct hlsl_struct_field /* Offset of the field within the type it belongs to, in register components, for each regset. */ unsigned int reg_offset[HLSL_REGSET_LAST + 1]; - /* Offset where the fields's name starts in the output bytecode, in bytes. */ + /* Offset where the field name starts in the output bytecode, in bytes. */ size_t name_bytecode_offset; }; @@ -415,7 +415,7 @@ struct hlsl_ir_function_decl struct hlsl_ir_var *return_var; struct vkd3d_shader_location loc; - /* Item entry in hlsl_ir_function.overloads. The paremeters' types are used as key. */ + /* Item entry in hlsl_ir_function.overloads. The parameters' types are used as key. */ struct rb_entry entry; /* Function to which this declaration corresponds. */ @@ -763,7 +763,7 @@ struct hlsl_ctx * compute shader profiles. It is set using the numthreads() attribute in the entry point. */ uint32_t thread_count[3]; - /* Whether the parser is inside an state block (effects' metadata) inside a variable declarition. */ + /* Whether the parser is inside a state block (effects' metadata) inside a variable declaration. */ uint32_t in_state_block : 1; /* Whether the numthreads() attribute has been provided in the entry-point function. */ uint32_t found_numthreads : 1; diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 65bd9d4c..ab598757 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -319,7 +319,7 @@ static void prepend_input_struct_copy(struct hlsl_ctx *ctx, struct list *instrs, return; list_add_after(&lhs->node.entry, &c->node.entry); - /* This redudant load is expected to be deleted later by DCE */ + /* This redundant load is expected to be deleted later by DCE. */ if (!(field_load = hlsl_new_load_index(ctx, &lhs->src, &c->node, &var->loc))) return; list_add_after(&c->node.entry, &field_load->node.entry); @@ -340,7 +340,7 @@ static void prepend_input_var_copy(struct hlsl_ctx *ctx, struct list *instrs, st { struct hlsl_ir_load *load; - /* This redudant load is expected to be deleted later by DCE */ + /* This redundant load is expected to be deleted later by DCE. */ if (!(load = hlsl_new_var_load(ctx, var, var->loc))) return; list_add_head(instrs, &load->node.entry); @@ -414,7 +414,7 @@ static void append_output_struct_copy(struct hlsl_ctx *ctx, struct list *instrs, return; list_add_tail(instrs, &c->node.entry); - /* This redudant load is expected to be deleted later by DCE */ + /* This redundant load is expected to be deleted later by DCE. */ if (!(field_load = hlsl_new_load_index(ctx, &rhs->src, &c->node, &var->loc))) return; list_add_tail(instrs, &field_load->node.entry); @@ -436,7 +436,7 @@ static void append_output_var_copy(struct hlsl_ctx *ctx, struct list *instrs, st { struct hlsl_ir_load *load; - /* This redudant load is expected to be deleted later by DCE */ + /* This redundant load is expected to be deleted later by DCE. */ if (!(load = hlsl_new_var_load(ctx, var, var->loc))) return; list_add_tail(instrs, &load->node.entry);

1 0

Henri Verbeet : d3dcompiler: Handle some newer D3D_BLOB_PART values in debug_d3dcompiler_d3d_blob_part().
by Alexandre Julliard March 14, 2023

March 14, 2023

Module: wine Branch: master Commit: 7db5431699037d03f26c065a58c400991210c7f7 URL: https://gitlab.winehq.org/wine/wine/-/commit/7db5431699037d03f26c065a58c400… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 14 13:40:46 2023 +0100 d3dcompiler: Handle some newer D3D_BLOB_PART values in debug_d3dcompiler_d3d_blob_part(). --- dlls/d3dcompiler_43/utils.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index a8c13a63b67..9a6be8db923 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -116,9 +116,15 @@ const char *debug_d3dcompiler_d3d_blob_part(D3D_BLOB_PART part) WINE_D3DCOMPILER_TO_STR(D3D_BLOB_LEGACY_SHADER); WINE_D3DCOMPILER_TO_STR(D3D_BLOB_XNA_PREPASS_SHADER); WINE_D3DCOMPILER_TO_STR(D3D_BLOB_XNA_SHADER); + WINE_D3DCOMPILER_TO_STR(D3D_BLOB_PDB); + WINE_D3DCOMPILER_TO_STR(D3D_BLOB_PRIVATE_DATA); + WINE_D3DCOMPILER_TO_STR(D3D_BLOB_ROOT_SIGNATURE); + WINE_D3DCOMPILER_TO_STR(D3D_BLOB_DEBUG_NAME); + WINE_D3DCOMPILER_TO_STR(D3D_BLOB_TEST_ALTERNATE_SHADER); WINE_D3DCOMPILER_TO_STR(D3D_BLOB_TEST_COMPILE_DETAILS); WINE_D3DCOMPILER_TO_STR(D3D_BLOB_TEST_COMPILE_PERF); + WINE_D3DCOMPILER_TO_STR(D3D_BLOB_TEST_COMPILE_REPORT); default: FIXME("Unrecognized D3D_BLOB_PART %#x\n", part); return "unrecognized";

1 0

Rémi Bernon : widl: Use noyywrap lexer option.
by Alexandre Julliard March 14, 2023

March 14, 2023

Module: wine Branch: master Commit: 37f343b4a9218e9909bcb9fa2b5207d4ff5c27f3 URL: https://gitlab.winehq.org/wine/wine/-/commit/37f343b4a9218e9909bcb9fa2b5207… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Jan 24 22:19:45 2023 +0100 widl: Use noyywrap lexer option. --- tools/widl/parser.l | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/tools/widl/parser.l b/tools/widl/parser.l index 8412ca7c64e..71ab2a0981f 100644 --- a/tools/widl/parser.l +++ b/tools/widl/parser.l @@ -20,6 +20,7 @@ %option stack %option noinput nounput noyy_top_state +%option noyywrap %option 8bit never-interactive prefix="parser_" nl \r?\n @@ -232,13 +233,6 @@ SAFEARRAY{ws}*/\( return tSAFEARRAY; } %% -#ifndef parser_wrap -int parser_wrap(void) -{ - return 1; -} -#endif - struct keyword { const char *kw; int token;

1 0

Rémi Bernon : widl: Remove unused temp_name member.
by Alexandre Julliard March 14, 2023

March 14, 2023

Module: wine Branch: master Commit: b97cf7ab5fdfb9f61216ec0fa961a4c6dffec26b URL: https://gitlab.winehq.org/wine/wine/-/commit/b97cf7ab5fdfb9f61216ec0fa961a4… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Jan 25 23:00:23 2023 +0100 widl: Remove unused temp_name member. --- tools/widl/parser.h | 1 - tools/widl/parser.l | 9 --------- tools/widl/widl.c | 1 - 3 files changed, 11 deletions(-) diff --git a/tools/widl/parser.h b/tools/widl/parser.h index 47bcf4bc5db..83832ecfcd8 100644 --- a/tools/widl/parser.h +++ b/tools/widl/parser.h @@ -30,7 +30,6 @@ extern int yy_flex_debug; extern int import_stack_ptr; int do_import(char *fname); -void abort_import(void); void pop_import(void); #define parse_only import_stack_ptr diff --git a/tools/widl/parser.l b/tools/widl/parser.l index 6dab8ab256c..85d33d6e86a 100644 --- a/tools/widl/parser.l +++ b/tools/widl/parser.l @@ -86,7 +86,6 @@ struct { YY_BUFFER_STATE state; char *input_name; int line_number; - char *temp_name; } import_stack[MAX_IMPORT_DEPTH]; int import_stack_ptr = 0; @@ -569,14 +568,6 @@ int do_import(char *fname) return 1; } -void abort_import(void) -{ - int ptr; - - for (ptr=0; ptr<import_stack_ptr; ptr++) - unlink(import_stack[ptr].temp_name); -} - static void switch_to_acf(void) { int ptr = import_stack_ptr; diff --git a/tools/widl/widl.c b/tools/widl/widl.c index 7d3fa26f8d0..1bc52a2a3a2 100644 --- a/tools/widl/widl.c +++ b/tools/widl/widl.c @@ -886,7 +886,6 @@ int main(int argc,char *argv[]) static void rm_tempfile(void) { - abort_import(); if (do_header) unlink(header_name); if (local_stubs_name)

1 0

Rémi Bernon : widl: Use bison-bridge option.
by Alexandre Julliard March 14, 2023

March 14, 2023

Module: wine Branch: master Commit: 9a047736b33fe967948ce37bd3338c555eb1fe27 URL: https://gitlab.winehq.org/wine/wine/-/commit/9a047736b33fe967948ce37bd3338c… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Jan 24 22:19:45 2023 +0100 widl: Use bison-bridge option. --- tools/widl/parser.h | 2 -- tools/widl/parser.l | 42 ++++++++++++++++++++++++------------------ tools/widl/parser.y | 11 +++++++++-- 3 files changed, 33 insertions(+), 22 deletions(-) diff --git a/tools/widl/parser.h b/tools/widl/parser.h index bc0c50792e1..47bcf4bc5db 100644 --- a/tools/widl/parser.h +++ b/tools/widl/parser.h @@ -28,8 +28,6 @@ extern char *parser_text; extern int parser_debug; extern int yy_flex_debug; -int parser_lex(void); - extern int import_stack_ptr; int do_import(char *fname); void abort_import(void); diff --git a/tools/widl/parser.l b/tools/widl/parser.l index 71ab2a0981f..6dab8ab256c 100644 --- a/tools/widl/parser.l +++ b/tools/widl/parser.l @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +%option bison-bridge %option stack %option noinput nounput noyy_top_state %option noyywrap @@ -59,6 +60,11 @@ double [0-9]+\.[0-9]+([eE][+-]?[0-9]+)* #include "parser.h" #include "wpp_private.h" +#define YYerror PARSER_error +#define YYSTYPE PARSER_STYPE +#define YYUNDEF PARSER_UNDEF +#define yyerror parser_error + #include "parser.tab.h" static void addcchar(char c); @@ -68,8 +74,8 @@ static char *cbuffer; static int cbufidx; static int cbufalloc = 0; -static int kw_token(const char *kw); -static int attr_token(const char *kw); +static int kw_token(const char *kw, YYSTYPE *yylval); +static int attr_token(const char *kw, YYSTYPE *yylval); static void switch_to_acf(void); @@ -162,24 +168,24 @@ struct uuid *parse_uuid(const char *u) } yy_pop_state(); } -<PP_PRAGMA>[^\n]* parser_lval.str = xstrdup(yytext); yy_pop_state(); return aPRAGMA; +<PP_PRAGMA>[^\n]* yylval->str = xstrdup(yytext); yy_pop_state(); return aPRAGMA; <INITIAL>^{ws}*midl_pragma{ws}+warning return tPRAGMA_WARNING; <INITIAL,ATTR>\" yy_push_state(QUOTE); cbufidx = 0; <QUOTE>\" { yy_pop_state(); - parser_lval.str = get_buffered_cstring(); + yylval->str = get_buffered_cstring(); return aSTRING; } <INITIAL,ATTR>L\" yy_push_state(WSTRQUOTE); cbufidx = 0; <WSTRQUOTE>\" { yy_pop_state(); - parser_lval.str = get_buffered_cstring(); + yylval->str = get_buffered_cstring(); return aWSTRING; } <INITIAL,ATTR>\' yy_push_state(SQUOTE); cbufidx = 0; <SQUOTE>\' { yy_pop_state(); - parser_lval.str = get_buffered_cstring(); + yylval->str = get_buffered_cstring(); return aSQSTRING; } <QUOTE,WSTRQUOTE,SQUOTE>\\\\ | @@ -189,25 +195,25 @@ struct uuid *parse_uuid(const char *u) <QUOTE,WSTRQUOTE,SQUOTE>. addcchar(yytext[0]); <INITIAL,ATTR>\[ yy_push_state(ATTR); return '['; <ATTR>\] yy_pop_state(); return ']'; -<ATTR>{cident} return attr_token(yytext); +<ATTR>{cident} return attr_token(yytext, yylval); <ATTR>{uuid} { - parser_lval.uuid = parse_uuid(yytext); + yylval->uuid = parse_uuid(yytext); return aUUID; } <INITIAL,ATTR>{hex} { - parser_lval.num = xstrtoul(yytext, NULL, 0); + yylval->num = xstrtoul(yytext, NULL, 0); return aHEXNUM; } <INITIAL,ATTR>{int} { - parser_lval.num = xstrtoul(yytext, NULL, 0); + yylval->num = xstrtoul(yytext, NULL, 0); return aNUM; } <INITIAL>{double} { - parser_lval.dbl = strtod(yytext, NULL); + yylval->dbl = strtod(yytext, NULL); return aDOUBLE; } SAFEARRAY{ws}*/\( return tSAFEARRAY; -{cident} return kw_token(yytext); +{cident} return kw_token(yytext, yylval); <INITIAL,ATTR>\n line_number++; <INITIAL,ATTR>{ws} <INITIAL,ATTR>\<\< return SHL; @@ -452,30 +458,30 @@ static int kw_cmp_func(const void *s1, const void *s2) return strcmp(KWP(s1)->kw, KWP(s2)->kw); } -static int kw_token(const char *kw) +static int kw_token(const char *kw, YYSTYPE *yylval) { struct keyword key, *kwp; key.kw = kw; kwp = bsearch(&key, keywords, NKEYWORDS, sizeof(keywords[0]), kw_cmp_func); if (kwp && (!kwp->winrt_only || winrt_mode)) { - parser_lval.str = xstrdup(kwp->kw); + yylval->str = xstrdup(kwp->kw); return kwp->token; } - parser_lval.str = xstrdup(kw); + yylval->str = xstrdup(kw); return is_type(kw) ? aKNOWNTYPE : aIDENTIFIER; } -static int attr_token(const char *kw) +static int attr_token(const char *kw, YYSTYPE *yylval) { struct keyword key, *kwp; key.kw = kw; kwp = bsearch(&key, attr_keywords, sizeof(attr_keywords)/sizeof(attr_keywords[0]), sizeof(attr_keywords[0]), kw_cmp_func); if (kwp && (!kwp->winrt_only || winrt_mode)) { - parser_lval.str = xstrdup(kwp->kw); + yylval->str = xstrdup(kwp->kw); return kwp->token; } - return kw_token(kw); + return kw_token(kw, yylval); } static void addcchar(char c) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 92de47f106b..6777a281ec7 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -121,7 +121,16 @@ static typelib_t *current_typelib; %} +%code provides +{ + +int parser_lex( PARSER_STYPE *yylval ); + +} + %define api.prefix {parser_} +%define api.pure full +%define parse.error verbose %union { attr_t *attr; @@ -347,8 +356,6 @@ static typelib_t *current_typelib; %right '!' '~' CAST PPTR POS NEG ADDRESSOF tSIZEOF %left '.' MEMBERPTR '[' ']' -%define parse.error verbose - %% input: gbl_statements m_acf { $1 = append_parameterized_type_stmts($1);

1 0

Daniel Tang : windows.networking: Stub DllGetActivationFactory().
by Alexandre Julliard March 14, 2023

March 14, 2023

Module: wine Branch: master Commit: bbb28c938bcaaff52f30175ea1326cd53079db4d URL: https://gitlab.winehq.org/wine/wine/-/commit/bbb28c938bcaaff52f30175ea1326c… Author: Daniel Tang <danielzgtg.opensource(a)gmail.com> Date: Sat Mar 11 12:51:18 2023 -0500 windows.networking: Stub DllGetActivationFactory(). --- dlls/windows.networking/Makefile.in | 1 + dlls/windows.networking/main.c | 19 +++++++++++++++++++ dlls/windows.networking/windows.networking.spec | 2 +- 3 files changed, 21 insertions(+), 1 deletion(-) diff --git a/dlls/windows.networking/Makefile.in b/dlls/windows.networking/Makefile.in index 19ca237ec36..df8bc4819eb 100644 --- a/dlls/windows.networking/Makefile.in +++ b/dlls/windows.networking/Makefile.in @@ -1,4 +1,5 @@ MODULE = windows.networking.dll +IMPORTS = combase C_SRCS = \ main.c diff --git a/dlls/windows.networking/main.c b/dlls/windows.networking/main.c index 3ac8a3042ab..84097881b6b 100644 --- a/dlls/windows.networking/main.c +++ b/dlls/windows.networking/main.c @@ -18,12 +18,31 @@ #include <windef.h> #include <winnt.h> +#include <winstring.h> #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(winsock); +static const char *debugstr_hstring(HSTRING hstr) +{ + const WCHAR *str; + UINT32 len; + if (hstr && !((ULONG_PTR)hstr >> 16)) return "(invalid)"; + str = WindowsGetStringRawBuffer(hstr, &len); + return wine_dbgstr_wn(str, len); +} + HRESULT WINAPI SetSocketMediaStreamingMode(BOOL value) { FIXME("value %d stub!\n", value); return S_OK; } + +HRESULT WINAPI DllGetActivationFactory(HSTRING classid, void **factory) +{ + FIXME("class %s, factory %p.\n", debugstr_hstring(classid), factory); + + *factory = NULL; + + return CLASS_E_CLASSNOTAVAILABLE; +} diff --git a/dlls/windows.networking/windows.networking.spec b/dlls/windows.networking/windows.networking.spec index 8220ba93a55..fb5b6838dac 100644 --- a/dlls/windows.networking/windows.networking.spec +++ b/dlls/windows.networking/windows.networking.spec @@ -1,6 +1,6 @@ 1 stub @ @ stdcall -private DllCanUnloadNow() -@ stub DllGetActivationFactory +@ stdcall -private DllGetActivationFactory(ptr ptr) @ stub DllGetClassObject @ stdcall -private DllMain(long long ptr) @ stdcall -private DllRegisterServer()

1 0

Rémi Bernon : widl: Use explicit %empty token for empty rules.
by Alexandre Julliard March 14, 2023

March 14, 2023

Module: wine Branch: master Commit: 3384e7cb632599e8b7581e86ab33307f6ef180a7 URL: https://gitlab.winehq.org/wine/wine/-/commit/3384e7cb632599e8b7581e86ab3330… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Jan 24 22:19:45 2023 +0100 widl: Use explicit %empty token for empty rules. --- tools/widl/parser.y | 89 ++++++++++++++++++++++++++++++++++++----------------- 1 file changed, 60 insertions(+), 29 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index c483eb06ff0..73ff249a993 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -366,9 +366,13 @@ input: gbl_statements m_acf { $1 = append_parameterized_type_stmts($1); } ; -m_acf: /* empty */ | aACF acf_statements +m_acf + : %empty + | aACF acf_statements + ; -decl_statements: { $$ = NULL; } +decl_statements + : %empty { $$ = NULL; } | decl_statements tINTERFACE qualified_type '<' parameterized_type_args '>' ';' { parameterized_type_stmts = append_statement(parameterized_type_stmts, make_statement_parameterized_type($3, $5)); $$ = append_statement($1, make_statement_reference(type_parameterized_type_specialize_declare($3, $5))); @@ -376,15 +380,18 @@ decl_statements: { $$ = NULL; } ; decl_block: tDECLARE '{' decl_statements '}' { $$ = $3; } + ; -imp_decl_statements: { $$ = NULL; } +imp_decl_statements + : %empty { $$ = NULL; } | imp_decl_statements tINTERFACE qualified_type '<' parameterized_type_args '>' ';' { $$ = append_statement($1, make_statement_reference(type_parameterized_type_specialize_declare($3, $5))); } ; imp_decl_block: tDECLARE '{' imp_decl_statements '}' { $$ = $3; } -gbl_statements: { $$ = NULL; } +gbl_statements + : %empty { $$ = NULL; } | gbl_statements namespacedef '{' { push_namespaces($2); } gbl_statements '}' { pop_namespaces($2); $$ = append_statements($1, $5); } | gbl_statements interface ';' { $$ = append_statement($1, make_statement_reference($2)); } @@ -409,7 +416,8 @@ gbl_statements: { $$ = NULL; } | gbl_statements decl_block { $$ = append_statements($1, $2); } ; -imp_statements: { $$ = NULL; } +imp_statements + : %empty { $$ = NULL; } | imp_statements interface ';' { $$ = append_statement($1, make_statement_reference($2)); } | imp_statements dispinterface ';' { $$ = append_statement($1, make_statement_reference($2)); } | imp_statements namespacedef '{' { push_namespaces($2); } imp_statements '}' @@ -433,11 +441,13 @@ imp_statements: { $$ = NULL; } | imp_statements imp_decl_block { $$ = append_statements($1, $2); } ; -int_statements: { $$ = NULL; } +int_statements + : %empty { $$ = NULL; } | int_statements statement { $$ = append_statement($1, $2); } ; -semicolon_opt: +semicolon_opt + : %empty | ';' ; @@ -512,7 +522,8 @@ librarydef: library_start imp_statements '}' semicolon_opt { $$ = $1; $$->stmts = $2; } ; -m_args: { $$ = NULL; } +m_args + : %empty { $$ = NULL; } | args ; @@ -545,7 +556,8 @@ array: '[' expr ']' { $$ = $2; | '[' ']' { $$ = make_expr(EXPR_VOID); } ; -m_attributes: { $$ = NULL; } +m_attributes + : %empty { $$ = NULL; } | attributes ; @@ -590,8 +602,10 @@ activatable_attr: $$ = make_exprt(EXPR_MEMBER, declare_var(NULL, $1, make_declarator(NULL), 0), $3); } | contract_req { $$ = $1; } /* activatable on the default activation factory */ + ; -attribute: { $$ = NULL; } +attribute + : %empty { $$ = NULL; } | tACTIVATABLE '(' activatable_attr ')' { $$ = make_attrp(ATTR_ACTIVATABLE, $3); } | tAGGREGATABLE { $$ = make_attr(ATTR_AGGREGATABLE); } | tANNOTATION '(' aSTRING ')' { $$ = make_attrp(ATTR_ANNOTATION, $3); } @@ -723,7 +737,8 @@ callconv: tCDECL { $$ = xstrdup("__cdecl"); } | tSTDCALL { $$ = xstrdup("__stdcall"); } ; -cases: { $$ = NULL; } +cases + : %empty { $$ = NULL; } | cases case { $$ = append_var( $1, $2 ); } ; @@ -737,7 +752,8 @@ case: tCASE expr_int_const ':' union_field { attr_t *a = make_attrp(ATTR_CASE, } ; -enums: { $$ = NULL; } +enums + : %empty { $$ = NULL; } | enum_list ',' { $$ = $1; } | enum_list ; @@ -779,7 +795,8 @@ m_exprs: m_expr { $$ = append_expr( NULL, $1 ); | m_exprs ',' m_expr { $$ = append_expr( $1, $3 ); } ; -m_expr: { $$ = make_expr(EXPR_VOID); } +m_expr + : %empty { $$ = make_expr(EXPR_VOID); } | expr ; @@ -844,7 +861,8 @@ expr_const: expr { $$ = $1; } ; -fields: { $$ = NULL; } +fields + : %empty { $$ = NULL; } | fields field { $$ = append_var_list($1, $2); } ; @@ -864,7 +882,8 @@ ne_union_field: | attributes ';' { $$ = make_var(NULL); $$->attrs = $1; } ; -ne_union_fields: { $$ = NULL; } +ne_union_fields + : %empty { $$ = NULL; } | ne_union_fields ne_union_field { $$ = append_var( $1, $2 ); } ; @@ -900,11 +919,13 @@ declaration: } ; -m_ident: { $$ = NULL; } +m_ident + : %empty { $$ = NULL; } | ident ; -m_typename: { $$ = NULL; } +m_typename + : %empty { $$ = NULL; } | typename ; @@ -928,7 +949,8 @@ base_type: tBYTE { $$ = find_type_or_error(NULL, $<str>1); } | tHANDLET { $$ = find_type_or_error(NULL, $<str>1); } ; -m_int: +m_int + : %empty | tINT ; @@ -996,7 +1018,8 @@ namespacedef: tNAMESPACE aIDENTIFIER { $$ = append_str( NULL, $2 ); } | namespacedef '.' aIDENTIFIER { $$ = append_str( $1, $3 ); } ; -class_interfaces: { $$ = NULL; } +class_interfaces + : %empty { $$ = NULL; } | class_interfaces class_interface { $$ = append_typeref( $1, $2 ); } ; @@ -1026,7 +1049,8 @@ dispinterfacedef: { $$ = type_dispinterface_define_from_iface($2, $1, $4); } ; -inherit: { $$ = NULL; } +inherit + : %empty { $$ = NULL; } | ':' qualified_type { $$ = $2; } | ':' parameterized_type { $$ = $2; } ; @@ -1062,8 +1086,10 @@ required_types: | parameterized_type { $$ = append_typeref(NULL, make_typeref($1)); } | required_types ',' qualified_type { $$ = append_typeref($1, make_typeref($3)); } | required_types ',' parameterized_type { $$ = append_typeref($1, make_typeref($3)); } + ; -requires: { $$ = NULL; } +requires + : %empty { $$ = NULL; } | tREQUIRES required_types { $$ = $2; } ; @@ -1114,7 +1140,8 @@ type_qualifier: tCONST { $$ = TYPE_QUALIFIER_CONST; } ; -m_type_qual_list: { $$ = 0; } +m_type_qual_list + : %empty { $$ = 0; } | m_type_qual_list type_qualifier { $$ = $1 | $2; } ; @@ -1129,7 +1156,8 @@ unqualified_decl_spec: unqualified_type m_decl_spec_no_type { $$ = make_decl_spec($2, $1, $3, STG_NONE, 0, 0); } ; -m_decl_spec_no_type: { $$ = NULL; } +m_decl_spec_no_type + : %empty { $$ = NULL; } | decl_spec_no_type ; @@ -1169,7 +1197,8 @@ abstract_declarator_no_direct: ; /* abstract declarator or empty */ -m_abstract_declarator: { $$ = make_declarator(NULL); } +m_abstract_declarator + : %empty { $$ = make_declarator(NULL); } | abstract_declarator ; @@ -1204,7 +1233,8 @@ any_declarator_no_direct: ; /* abstract or non-abstract declarator or empty */ -m_any_declarator: { $$ = make_declarator(NULL); } +m_any_declarator + : %empty { $$ = make_declarator(NULL); } | any_declarator ; @@ -1231,7 +1261,8 @@ declarator_list: | declarator_list ',' declarator { $$ = append_declarator( $1, $3 ); } ; -m_bitfield: { $$ = NULL; } +m_bitfield + : %empty { $$ = NULL; } | ':' expr_const { $$ = $2; } ; @@ -1310,12 +1341,12 @@ version: ; acf_statements - : /* empty */ + : %empty | acf_interface acf_statements ; acf_int_statements - : /* empty */ + : %empty | acf_int_statement acf_int_statements ; @@ -1336,7 +1367,7 @@ acf_interface ; acf_attributes - : /* empty */ { $$ = NULL; }; + : %empty { $$ = NULL; }; | '[' acf_attribute_list ']' { $$ = $2; }; ;

1 0