- Wine-Commits - list.winehq.org

Alexandre Julliard : ntdll: Fix some CPU information tests on ARM64.
by Alexandre Julliard March 14, 2023

March 14, 2023

Module: wine Branch: master Commit: b72c2dca0184efb732619d5dbd14b0672a7bb3e8 URL: https://gitlab.winehq.org/wine/wine/-/commit/b72c2dca0184efb732619d5dbd14b0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 14 16:39:06 2023 +0100 ntdll: Fix some CPU information tests on ARM64. --- dlls/ntdll/tests/info.c | 112 +++++++++++++++++++++++++++-------------------- dlls/ntdll/unix/system.c | 2 + 2 files changed, 67 insertions(+), 47 deletions(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index cf074076c96..2cd76a8c87e 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -303,68 +303,76 @@ static void test_query_basic(void) static void test_query_cpu(void) { - DWORD status; - ULONG ReturnLength; - SYSTEM_CPU_INFORMATION sci, sci2; + NTSTATUS status; + ULONG len; + SYSTEM_CPU_INFORMATION sci, sci2, sci3; memset(&sci, 0xcc, sizeof(sci)); - status = pNtQuerySystemInformation(SystemCpuInformation, &sci, sizeof(sci), &ReturnLength); + status = pNtQuerySystemInformation(SystemCpuInformation, &sci, sizeof(sci), &len); ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status); - ok( sizeof(sci) == ReturnLength, "Inconsistent length %ld\n", ReturnLength); - - /* Check if we have some return values */ - if (winetest_debug > 1) trace("Processor FeatureSet : %08lx\n", sci.ProcessorFeatureBits); - ok( sci.ProcessorFeatureBits != 0, "Expected some features for this processor, got %08lx\n", - sci.ProcessorFeatureBits); + ok( sizeof(sci) == len, "Inconsistent length %ld\n", len); memset(&sci2, 0xcc, sizeof(sci2)); - status = pRtlGetNativeSystemInformation(SystemCpuInformation, &sci2, sizeof(sci2), &ReturnLength); + status = pRtlGetNativeSystemInformation(SystemCpuInformation, &sci2, sizeof(sci2), &len); ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx.\n", status); - ok( sizeof(sci2) == ReturnLength, "Unexpected length %lu.\n", ReturnLength); + ok( sizeof(sci2) == len, "Unexpected length %lu.\n", len); if (is_wow64) { ok( sci.ProcessorArchitecture == PROCESSOR_ARCHITECTURE_INTEL, "ProcessorArchitecture wrong %x\n", sci.ProcessorArchitecture ); todo_wine - ok( sci2.ProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64, "ProcessorArchitecture wrong %x\n", - sci2.ProcessorArchitecture ); + ok( sci2.ProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64 || + sci2.ProcessorArchitecture == PROCESSOR_ARCHITECTURE_ARM64, + "ProcessorArchitecture wrong %x\n", sci2.ProcessorArchitecture ); } else ok( sci.ProcessorArchitecture == sci2.ProcessorArchitecture, "ProcessorArchitecture differs %x / %x\n", sci.ProcessorArchitecture, sci2.ProcessorArchitecture ); - ok( sci.ProcessorLevel == sci2.ProcessorLevel, "ProcessorLevel differs %x / %x\n", - sci.ProcessorLevel, sci2.ProcessorLevel ); - ok( sci.ProcessorRevision == sci2.ProcessorRevision, "ProcessorRevision differs %x / %x\n", - sci.ProcessorRevision, sci2.ProcessorRevision ); - ok( sci.MaximumProcessors == sci2.MaximumProcessors, "MaximumProcessors differs %x / %x\n", - sci.MaximumProcessors, sci2.MaximumProcessors ); - ok( sci.ProcessorFeatureBits == sci2.ProcessorFeatureBits, "ProcessorFeatureBits differs %lx / %lx\n", - sci.ProcessorFeatureBits, sci2.ProcessorFeatureBits ); + if (sci2.ProcessorArchitecture != PROCESSOR_ARCHITECTURE_ARM64) + { + /* Check if we have some return values */ + if (winetest_debug > 1) trace("Processor FeatureSet : %08lx\n", sci.ProcessorFeatureBits); + ok( sci.ProcessorFeatureBits != 0, "Expected some features for this processor, got %08lx\n", + sci.ProcessorFeatureBits); - memset(&sci2, 0xcc, sizeof(sci2)); - status = pNtQuerySystemInformation(SystemEmulationProcessorInformation, &sci2, sizeof(sci2), &ReturnLength); + ok( sci.ProcessorLevel == sci2.ProcessorLevel, "ProcessorLevel differs %x / %x\n", + sci.ProcessorLevel, sci2.ProcessorLevel ); + ok( sci.ProcessorRevision == sci2.ProcessorRevision, "ProcessorRevision differs %x / %x\n", + sci.ProcessorRevision, sci2.ProcessorRevision ); + ok( sci.MaximumProcessors == sci2.MaximumProcessors, "MaximumProcessors differs %x / %x\n", + sci.MaximumProcessors, sci2.MaximumProcessors ); + ok( sci.ProcessorFeatureBits == sci2.ProcessorFeatureBits, "ProcessorFeatureBits differs %lx / %lx\n", + sci.ProcessorFeatureBits, sci2.ProcessorFeatureBits ); + } + + memset(&sci3, 0xcc, sizeof(sci3)); + status = pNtQuerySystemInformation(SystemEmulationProcessorInformation, &sci3, sizeof(sci3), &len); ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx.\n", status); - ok( sizeof(sci2) == ReturnLength, "Unexpected length %lu.\n", ReturnLength); + ok( sizeof(sci3) == len, "Unexpected length %lu.\n", len); #ifdef _WIN64 - ok( sci2.ProcessorArchitecture == PROCESSOR_ARCHITECTURE_INTEL, "ProcessorArchitecture wrong %x\n", - sci2.ProcessorArchitecture ); + if (sci2.ProcessorArchitecture == PROCESSOR_ARCHITECTURE_ARM64) + ok( sci3.ProcessorArchitecture == PROCESSOR_ARCHITECTURE_ARM, "ProcessorArchitecture wrong %x\n", + sci3.ProcessorArchitecture ); + else + ok( sci3.ProcessorArchitecture == PROCESSOR_ARCHITECTURE_INTEL, "ProcessorArchitecture wrong %x\n", + sci3.ProcessorArchitecture ); #else - ok( sci.ProcessorArchitecture == sci2.ProcessorArchitecture, + ok( sci.ProcessorArchitecture == sci3.ProcessorArchitecture, "ProcessorArchitecture differs %x / %x\n", - sci.ProcessorArchitecture, sci2.ProcessorArchitecture ); + sci.ProcessorArchitecture, sci3.ProcessorArchitecture ); #endif - ok( sci.ProcessorLevel == sci2.ProcessorLevel, "ProcessorLevel differs %x / %x\n", - sci.ProcessorLevel, sci2.ProcessorLevel ); - ok( sci.ProcessorRevision == sci2.ProcessorRevision, "ProcessorRevision differs %x / %x\n", - sci.ProcessorRevision, sci2.ProcessorRevision ); - ok( sci.MaximumProcessors == sci2.MaximumProcessors, "MaximumProcessors differs %x / %x\n", - sci.MaximumProcessors, sci2.MaximumProcessors ); - ok( sci.ProcessorFeatureBits == sci2.ProcessorFeatureBits, "ProcessorFeatureBits differs %lx / %lx\n", - sci.ProcessorFeatureBits, sci2.ProcessorFeatureBits ); + ok( sci.ProcessorLevel == sci3.ProcessorLevel, "ProcessorLevel differs %x / %x\n", + sci.ProcessorLevel, sci3.ProcessorLevel ); + ok( sci.ProcessorRevision == sci3.ProcessorRevision, "ProcessorRevision differs %x / %x\n", + sci.ProcessorRevision, sci3.ProcessorRevision ); + ok( sci.MaximumProcessors == sci3.MaximumProcessors, "MaximumProcessors differs %x / %x\n", + sci.MaximumProcessors, sci3.MaximumProcessors ); + ok( sci.ProcessorFeatureBits == sci3.ProcessorFeatureBits, "ProcessorFeatureBits differs %lx / %lx\n", + sci.ProcessorFeatureBits, sci3.ProcessorFeatureBits ); } static void test_query_performance(void) @@ -1133,9 +1141,9 @@ static void test_query_logicalproc(void) GetSystemInfo(&si); status = pNtQuerySystemInformation(SystemLogicalProcessorInformation, NULL, 0, &len); - if (status == STATUS_INVALID_INFO_CLASS) /* wow64 win8+ */ + if (status == STATUS_INVALID_INFO_CLASS) /* wow64 win8+, arm64 */ { - win_skip("SystemLogicalProcessorInformation is not supported\n"); + skip("SystemLogicalProcessorInformation is not supported\n"); return; } ok(status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08lx\n", status); @@ -3308,19 +3316,29 @@ static void test_thread_start_address(void) static void test_query_data_alignment(void) { - ULONG ReturnLength; + SYSTEM_CPU_INFORMATION sci; + ULONG len; NTSTATUS status; DWORD value; value = 0xdeadbeef; - status = pNtQuerySystemInformation(SystemRecommendedSharedDataAlignment, &value, sizeof(value), &ReturnLength); + status = pNtQuerySystemInformation(SystemRecommendedSharedDataAlignment, &value, sizeof(value), &len); ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status); - ok(sizeof(value) == ReturnLength, "Inconsistent length %lu\n", ReturnLength); -#ifdef __arm__ - ok(value == 32, "Expected 32, got %lu\n", value); -#else - ok(value == 64, "Expected 64, got %lu\n", value); -#endif + ok(sizeof(value) == len, "Inconsistent length %lu\n", len); + + pRtlGetNativeSystemInformation(SystemCpuInformation, &sci, sizeof(sci), &len); + switch (sci.ProcessorArchitecture) + { + case PROCESSOR_ARCHITECTURE_ARM: + ok(value == 32, "Expected 32, got %lu\n", value); + break; + case PROCESSOR_ARCHITECTURE_ARM64: + ok(value == 128, "Expected 128, got %lu\n", value); + break; + default: + ok(value == 64, "Expected 64, got %lu\n", value); + break; + } } static void test_thread_lookup(void) diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index 33e93bbdf32..dd652a29f21 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -2958,6 +2958,8 @@ NTSTATUS WINAPI NtQuerySystemInformation( SYSTEM_INFORMATION_CLASS class, { #ifdef __arm__ *((DWORD *)info) = 32; +#elif defined __aarch64__ + *((DWORD *)info) = 128; #else *((DWORD *)info) = 64; #endif

1 0

Alexandre Julliard : ntdll: Implement the SystemProcessorBrandString query.
by Alexandre Julliard March 14, 2023

March 14, 2023

Module: wine Branch: master Commit: 72422be6d212cccaee7df23d3d4ae1394d1c2c02 URL: https://gitlab.winehq.org/wine/wine/-/commit/72422be6d212cccaee7df23d3d4ae1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 14 17:30:24 2023 +0100 ntdll: Implement the SystemProcessorBrandString query. --- dlls/ntdll/tests/info.c | 27 ++++++++++++++++++++++++++- dlls/ntdll/unix/system.c | 29 +++++++++++++++++++++++++++++ dlls/wow64/system.c | 1 + 3 files changed, 56 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 2cd76a8c87e..e7e560a64b8 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -304,7 +304,7 @@ static void test_query_basic(void) static void test_query_cpu(void) { NTSTATUS status; - ULONG len; + ULONG len, buffer[16]; SYSTEM_CPU_INFORMATION sci, sci2, sci3; memset(&sci, 0xcc, sizeof(sci)); @@ -373,6 +373,31 @@ static void test_query_cpu(void) sci.MaximumProcessors, sci3.MaximumProcessors ); ok( sci.ProcessorFeatureBits == sci3.ProcessorFeatureBits, "ProcessorFeatureBits differs %lx / %lx\n", sci.ProcessorFeatureBits, sci3.ProcessorFeatureBits ); + + len = 0xdeadbeef; + status = pNtQuerySystemInformation( SystemProcessorBrandString, buffer, sizeof(buffer), &len ); + if (status != STATUS_NOT_SUPPORTED) + { + ok( !status, "SystemProcessorBrandString failed %lx\n", status ); + ok( len == 49, "wrong len %lu\n", len ); + trace( "got %s len %u\n", debugstr_a( (char *)buffer ), lstrlenA( (char *)buffer )); + + len = 0xdeadbeef; + status = pNtQuerySystemInformation( SystemProcessorBrandString, buffer, 49, &len ); + ok( !status, "SystemProcessorBrandString failed %lx\n", status ); + ok( len == 49, "wrong len %lu\n", len ); + + len = 0xdeadbeef; + status = pNtQuerySystemInformation( SystemProcessorBrandString, buffer, 48, &len ); + ok( status == STATUS_INFO_LENGTH_MISMATCH, "SystemProcessorBrandString failed %lx\n", status ); + ok( len == 49, "wrong len %lu\n", len ); + + len = 0xdeadbeef; + status = pNtQuerySystemInformation( SystemProcessorBrandString, (char *)buffer + 1, 49, &len ); + ok( status == STATUS_DATATYPE_MISALIGNMENT, "SystemProcessorBrandString failed %lx\n", status ); + ok( len == 0xdeadbeef, "wrong len %lu\n", len ); + } + else skip( "SystemProcessorBrandString is not supported\n" ); } static void test_query_performance(void) diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index dd652a29f21..cb00336e884 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -229,6 +229,7 @@ struct smbios_chassis_args #define RSMB 0x52534D42 SYSTEM_CPU_INFORMATION cpu_info = { 0 }; +static char cpu_name[49]; static SYSTEM_LOGICAL_PROCESSOR_INFORMATION *logical_proc_info; static unsigned int logical_proc_info_len, logical_proc_info_alloc_len; static SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX *logical_proc_info_ex; @@ -325,6 +326,22 @@ static inline BOOL have_sse_daz_mode(void) #endif } +static void get_cpuid_name( char *buffer ) +{ + unsigned int regs[4]; + + do_cpuid( 0x80000002, 0, regs ); + memcpy( buffer, regs, sizeof(regs) ); + buffer += sizeof(regs); + do_cpuid( 0x80000003, 0, regs ); + memcpy( buffer, regs, sizeof(regs) ); + buffer += sizeof(regs); + do_cpuid( 0x80000004, 0, regs ); + memcpy( buffer, regs, sizeof(regs) ); + buffer += sizeof(regs); + *buffer = 0; +} + static void get_cpuinfo( SYSTEM_CPU_INFORMATION *info ) { unsigned int regs[4], regs2[4], regs3[4]; @@ -399,6 +416,7 @@ static void get_cpuinfo( SYSTEM_CPU_INFORMATION *info ) if (regs2[3] & (1 << 27)) info->ProcessorFeatureBits |= CPU_FEATURE_TSC; if (regs2[3] & (1u << 31)) info->ProcessorFeatureBits |= CPU_FEATURE_3DNOW; } + if (regs[0] >= 0x80000004) get_cpuid_name( cpu_name ); } else if (regs[1] == GENU && regs[3] == INEI && regs[2] == NTEL) { @@ -420,6 +438,7 @@ static void get_cpuinfo( SYSTEM_CPU_INFORMATION *info ) if (regs2[3] & (1 << 20)) info->ProcessorFeatureBits |= CPU_FEATURE_NX; if (regs2[3] & (1 << 27)) info->ProcessorFeatureBits |= CPU_FEATURE_TSC; } + if (regs[0] >= 0x80000004) get_cpuid_name( cpu_name ); } else { @@ -3157,6 +3176,16 @@ NTSTATUS WINAPI NtQuerySystemInformation( SYSTEM_INFORMATION_CLASS class, break; } + case SystemProcessorBrandString: /* 105 */ + if (!cpu_name[0]) return STATUS_NOT_SUPPORTED; + if ((ULONG_PTR)info & 3) return STATUS_DATATYPE_MISALIGNMENT; + len = sizeof(cpu_name); + if (size >= len) + memcpy( info, cpu_name, len ); + else + ret = STATUS_INFO_LENGTH_MISMATCH; + break; + case SystemKernelDebuggerInformationEx: /* 149 */ { SYSTEM_KERNEL_DEBUGGER_INFORMATION_EX skdi; diff --git a/dlls/wow64/system.c b/dlls/wow64/system.c index c5c1563afc2..28a5a994174 100644 --- a/dlls/wow64/system.c +++ b/dlls/wow64/system.c @@ -330,6 +330,7 @@ NTSTATUS WINAPI wow64_NtQuerySystemInformation( UINT *args ) case SystemCodeIntegrityInformation: /* SYSTEM_CODEINTEGRITY_INFORMATION */ case SystemKernelDebuggerInformationEx: /* SYSTEM_KERNEL_DEBUGGER_INFORMATION_EX */ case SystemCpuSetInformation: /* SYSTEM_CPU_SET_INFORMATION */ + case SystemProcessorBrandString: /* char[] */ case SystemWineVersionInformation: /* char[] */ return NtQuerySystemInformation( class, ptr, len, retlen );

1 0

Henri Verbeet : wined3d: Sort the exports.
by Alexandre Julliard March 14, 2023

March 14, 2023

Module: wine Branch: master Commit: 34139937b0453055b54553cbf4eb46887f10da2c URL: https://gitlab.winehq.org/wine/wine/-/commit/34139937b0453055b54553cbf4eb46… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 14 11:23:45 2023 +0100 wined3d: Sort the exports. For the most part these were already sorted, but a few exceptions appear to have crept in. --- dlls/wined3d/wined3d.spec | 70 +++++++++++++++++++++++------------------------ 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index b22adf07c9c..2980568d94e 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -95,11 +95,11 @@ @ cdecl wined3d_device_context_copy_resource(ptr ptr ptr) @ cdecl wined3d_device_context_copy_sub_resource_region(ptr ptr long long long long ptr long ptr long) @ cdecl wined3d_device_context_copy_uav_counter(ptr ptr long ptr) +@ cdecl wined3d_device_context_dispatch(ptr long long long) +@ cdecl wined3d_device_context_dispatch_indirect(ptr ptr long) @ cdecl wined3d_device_context_draw(ptr long long long long) @ cdecl wined3d_device_context_draw_indexed(ptr long long long long long) @ cdecl wined3d_device_context_draw_indirect(ptr ptr long long) -@ cdecl wined3d_device_context_dispatch(ptr long long long) -@ cdecl wined3d_device_context_dispatch_indirect(ptr ptr long) @ cdecl wined3d_device_context_execute_command_list(ptr ptr long) @ cdecl wined3d_device_context_flush(ptr) @ cdecl wined3d_device_context_generate_mipmaps(ptr ptr) @@ -133,6 +133,7 @@ @ cdecl wined3d_device_context_set_predication(ptr ptr long) @ cdecl wined3d_device_context_set_primitive_type(ptr long long) @ cdecl wined3d_device_context_set_rasterizer_state(ptr ptr) +@ cdecl wined3d_device_context_set_render_targets_and_unordered_access_views(ptr long ptr ptr long ptr ptr) @ cdecl wined3d_device_context_set_rendertarget_views(ptr long long ptr long) @ cdecl wined3d_device_context_set_samplers(ptr long long long ptr) @ cdecl wined3d_device_context_set_scissor_rects(ptr long ptr) @@ -142,7 +143,6 @@ @ cdecl wined3d_device_context_set_stream_outputs(ptr ptr) @ cdecl wined3d_device_context_set_stream_sources(ptr long long ptr) @ cdecl wined3d_device_context_set_unordered_access_views(ptr long long long ptr ptr) -@ cdecl wined3d_device_context_set_render_targets_and_unordered_access_views(ptr long ptr ptr long ptr ptr) @ cdecl wined3d_device_context_set_vertex_declaration(ptr ptr) @ cdecl wined3d_device_context_set_viewports(ptr long ptr) @ cdecl wined3d_device_context_unmap(ptr ptr long) @@ -160,10 +160,10 @@ @ cdecl wined3d_output_set_gamma_ramp(ptr ptr) @ cdecl wined3d_output_take_ownership(ptr long) +@ cdecl wined3d_palette_apply_to_dc(ptr ptr) @ cdecl wined3d_palette_create(ptr long long ptr ptr) @ cdecl wined3d_palette_decref(ptr) @ cdecl wined3d_palette_get_entries(ptr long long long ptr) -@ cdecl wined3d_palette_apply_to_dc(ptr ptr) @ cdecl wined3d_palette_incref(ptr) @ cdecl wined3d_palette_set_entries(ptr long long long ptr) @@ -181,15 +181,6 @@ @ cdecl wined3d_rasterizer_state_get_parent(ptr) @ cdecl wined3d_rasterizer_state_incref(ptr) -@ cdecl wined3d_resource_get_desc(ptr ptr) -@ cdecl wined3d_resource_get_parent(ptr) -@ cdecl wined3d_resource_get_priority(ptr) -@ cdecl wined3d_resource_map(ptr long ptr ptr long) -@ cdecl wined3d_resource_preload(ptr) -@ cdecl wined3d_resource_set_parent(ptr ptr) -@ cdecl wined3d_resource_set_priority(ptr long) -@ cdecl wined3d_resource_unmap(ptr long) - @ cdecl wined3d_rendertarget_view_create(ptr ptr ptr ptr ptr) @ cdecl wined3d_rendertarget_view_create_from_sub_resource(ptr long ptr ptr ptr) @ cdecl wined3d_rendertarget_view_decref(ptr) @@ -199,6 +190,15 @@ @ cdecl wined3d_rendertarget_view_incref(ptr) @ cdecl wined3d_rendertarget_view_set_parent(ptr ptr) +@ cdecl wined3d_resource_get_desc(ptr ptr) +@ cdecl wined3d_resource_get_parent(ptr) +@ cdecl wined3d_resource_get_priority(ptr) +@ cdecl wined3d_resource_map(ptr long ptr ptr long) +@ cdecl wined3d_resource_preload(ptr) +@ cdecl wined3d_resource_set_parent(ptr ptr) +@ cdecl wined3d_resource_set_priority(ptr long) +@ cdecl wined3d_resource_unmap(ptr long) + @ cdecl wined3d_sampler_create(ptr ptr ptr ptr ptr) @ cdecl wined3d_sampler_decref(ptr) @ cdecl wined3d_sampler_get_parent(ptr) @@ -267,12 +267,12 @@ @ cdecl wined3d_swapchain_create(ptr ptr ptr ptr ptr ptr) @ cdecl wined3d_swapchain_decref(ptr) @ cdecl wined3d_swapchain_get_back_buffer(ptr long) +@ cdecl wined3d_swapchain_get_desc(ptr ptr) @ cdecl wined3d_swapchain_get_device(ptr) @ cdecl wined3d_swapchain_get_display_mode(ptr ptr ptr) @ cdecl wined3d_swapchain_get_front_buffer_data(ptr ptr long) @ cdecl wined3d_swapchain_get_gamma_ramp(ptr ptr) @ cdecl wined3d_swapchain_get_parent(ptr) -@ cdecl wined3d_swapchain_get_desc(ptr ptr) @ cdecl wined3d_swapchain_get_raster_status(ptr ptr) @ cdecl wined3d_swapchain_get_state(ptr) @ cdecl wined3d_swapchain_incref(ptr) @@ -322,41 +322,41 @@ @ cdecl wined3d_vertex_declaration_get_parent(ptr) @ cdecl wined3d_vertex_declaration_incref(ptr) -@ cdecl vkd3d_create_instance(ptr ptr) -@ cdecl vkd3d_instance_decref(ptr) -@ cdecl vkd3d_instance_get_vk_instance(ptr) -@ cdecl vkd3d_instance_incref(ptr) +@ cdecl vkd3d_acquire_vk_queue(ptr) @ cdecl vkd3d_create_device(ptr ptr ptr) +@ cdecl vkd3d_create_image_resource(ptr ptr ptr) +@ cdecl vkd3d_create_instance(ptr ptr) +@ cdecl vkd3d_create_root_signature_deserializer(ptr long ptr ptr) +@ cdecl vkd3d_create_versioned_root_signature_deserializer(ptr long ptr ptr) @ cdecl vkd3d_get_device_parent(ptr) +@ cdecl vkd3d_get_dxgi_format(long) @ cdecl vkd3d_get_vk_device(ptr) +@ cdecl vkd3d_get_vk_format(long) @ cdecl vkd3d_get_vk_physical_device(ptr) -@ cdecl vkd3d_instance_from_device(ptr) @ cdecl vkd3d_get_vk_queue_family_index(ptr) -@ cdecl vkd3d_acquire_vk_queue(ptr) +@ cdecl vkd3d_instance_decref(ptr) +@ cdecl vkd3d_instance_from_device(ptr) +@ cdecl vkd3d_instance_get_vk_instance(ptr) +@ cdecl vkd3d_instance_incref(ptr) @ cdecl vkd3d_release_vk_queue(ptr) -@ cdecl vkd3d_create_image_resource(ptr ptr ptr) @ cdecl vkd3d_resource_decref(ptr) @ cdecl vkd3d_resource_incref(ptr) @ cdecl vkd3d_serialize_root_signature(ptr long ptr ptr) -@ cdecl vkd3d_create_root_signature_deserializer(ptr long ptr ptr) -@ cdecl vkd3d_get_vk_format(long) -@ cdecl vkd3d_get_dxgi_format(long) @ cdecl vkd3d_serialize_versioned_root_signature(ptr ptr ptr) -@ cdecl vkd3d_create_versioned_root_signature_deserializer(ptr long ptr ptr) -@ cdecl vkd3d_shader_get_version(ptr ptr) -@ cdecl vkd3d_shader_get_supported_source_types(ptr) -@ cdecl vkd3d_shader_get_supported_target_types(long ptr) @ cdecl vkd3d_shader_compile(ptr ptr ptr) +@ cdecl vkd3d_shader_convert_root_signature(ptr long ptr) +@ cdecl vkd3d_shader_find_signature_element(ptr ptr long long) @ cdecl vkd3d_shader_free_messages(ptr) -@ cdecl vkd3d_shader_free_shader_code(ptr) -@ cdecl vkd3d_shader_parse_root_signature(ptr ptr ptr) @ cdecl vkd3d_shader_free_root_signature(ptr) -@ cdecl vkd3d_shader_serialize_root_signature(ptr ptr ptr) -@ cdecl vkd3d_shader_convert_root_signature(ptr long ptr) -@ cdecl vkd3d_shader_scan(ptr ptr) @ cdecl vkd3d_shader_free_scan_descriptor_info(ptr) -@ cdecl vkd3d_shader_parse_input_signature(ptr ptr ptr) -@ cdecl vkd3d_shader_find_signature_element(ptr ptr long long) +@ cdecl vkd3d_shader_free_shader_code(ptr) @ cdecl vkd3d_shader_free_shader_signature(ptr) +@ cdecl vkd3d_shader_get_supported_source_types(ptr) +@ cdecl vkd3d_shader_get_supported_target_types(long ptr) +@ cdecl vkd3d_shader_get_version(ptr ptr) +@ cdecl vkd3d_shader_parse_input_signature(ptr ptr ptr) +@ cdecl vkd3d_shader_parse_root_signature(ptr ptr ptr) @ cdecl vkd3d_shader_preprocess(ptr ptr ptr) +@ cdecl vkd3d_shader_scan(ptr ptr) +@ cdecl vkd3d_shader_serialize_root_signature(ptr ptr ptr)

1 0

Francois Gouget : d3d8/tests: Remove an unused call to IDirect3D8_GetAdapterDisplayMode().
by Alexandre Julliard March 14, 2023

March 14, 2023

Module: wine Branch: master Commit: d3c32ccfe1172d2a9477afc33898bde27f9a9a35 URL: https://gitlab.winehq.org/wine/wine/-/commit/d3c32ccfe1172d2a9477afc33898bd… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Mar 13 12:13:30 2023 +0100 d3d8/tests: Remove an unused call to IDirect3D8_GetAdapterDisplayMode(). It is no longer used now that test_fpu_setup() uses create_device(). --- dlls/d3d8/tests/device.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 7639e58808e..6a585458bae 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -3758,7 +3758,6 @@ static void test_fpu_setup(void) #if defined(D3D8_TEST_SET_FPU_CW) && defined(D3D8_TEST_GET_FPU_CW) struct device_desc device_desc; IDirect3DDevice8 *device; - D3DDISPLAYMODE d3ddm; IDirect3D8 *d3d8; HWND window; HRESULT hr; @@ -3771,9 +3770,6 @@ static void test_fpu_setup(void) d3d8 = Direct3DCreate8(D3D_SDK_VERSION); ok(!!d3d8, "Failed to create a D3D object.\n"); - hr = IDirect3D8_GetAdapterDisplayMode(d3d8, D3DADAPTER_DEFAULT, &d3ddm); - ok(SUCCEEDED(hr), "GetAdapterDisplayMode failed, hr %#lx.\n", hr); - device_desc.adapter_ordinal = D3DADAPTER_DEFAULT; device_desc.device_window = window; device_desc.width = 640;

1 0

Henri Verbeet : d3d11: Get rid of the DXBC tag definitions.
by Alexandre Julliard March 14, 2023

March 14, 2023

Module: wine Branch: master Commit: 890877f14574e45b5b30d9bcc93d30842b7d0065 URL: https://gitlab.winehq.org/wine/wine/-/commit/890877f14574e45b5b30d9bcc93d30… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 14 11:23:46 2023 +0100 d3d11: Get rid of the DXBC tag definitions. These have been unused for a while now. --- dlls/d3d11/d3d11_private.h | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index c99c58f14d7..7cb3ba13c0a 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -38,18 +38,6 @@ #include "wine/winedxgi.h" #include "wine/rbtree.h" -#define MAKE_TAG(ch0, ch1, ch2, ch3) \ - ((DWORD)(ch0) | ((DWORD)(ch1) << 8) | \ - ((DWORD)(ch2) << 16) | ((DWORD)(ch3) << 24 )) -#define TAG_AON9 MAKE_TAG('A', 'o', 'n', '9') -#define TAG_DXBC MAKE_TAG('D', 'X', 'B', 'C') -#define TAG_ISGN MAKE_TAG('I', 'S', 'G', 'N') -#define TAG_OSG5 MAKE_TAG('O', 'S', 'G', '5') -#define TAG_OSGN MAKE_TAG('O', 'S', 'G', 'N') -#define TAG_PCSG MAKE_TAG('P', 'C', 'S', 'G') -#define TAG_SHDR MAKE_TAG('S', 'H', 'D', 'R') -#define TAG_SHEX MAKE_TAG('S', 'H', 'E', 'X') - struct d3d_device; /* TRACE helper functions */

1 0

Alexandre Julliard : ntdll: Implement the SystemProcessorFeaturesInformation query.
by Alexandre Julliard March 14, 2023

March 14, 2023

Module: wine Branch: master Commit: c44e58c88bd1a67ecb2f58472b1c67ab5f3ccb80 URL: https://gitlab.winehq.org/wine/wine/-/commit/c44e58c88bd1a67ecb2f58472b1c67… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 14 17:37:33 2023 +0100 ntdll: Implement the SystemProcessorFeaturesInformation query. --- dlls/ntdll/tests/info.c | 12 ++++++++ dlls/ntdll/unix/system.c | 71 +++++++++++++++++++++++++++--------------------- dlls/wow64/system.c | 1 + include/winternl.h | 6 ++++ 4 files changed, 59 insertions(+), 31 deletions(-)

1 0

Rémi Bernon : imm32: Use a single ime_is_unicode helper.
by Alexandre Julliard March 14, 2023

March 14, 2023

Module: wine Branch: master Commit: 0392621858a46d7a282b3585e6cad2333a4ca61c URL: https://gitlab.winehq.org/wine/wine/-/commit/0392621858a46d7a282b3585e6cad2… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Feb 21 17:47:29 2023 +0100 imm32: Use a single ime_is_unicode helper. --- dlls/imm32/imm.c | 73 ++++++++++++++++++++++++++------------------------------ 1 file changed, 34 insertions(+), 39 deletions(-)

1 0

Rémi Bernon : imm32: Delete unnecessary uSelected struct ime member.
by Alexandre Julliard March 14, 2023

March 14, 2023

Module: wine Branch: master Commit: ea4b97bf4ec332f263c6aae341daba37506e7ffb URL: https://gitlab.winehq.org/wine/wine/-/commit/ea4b97bf4ec332f263c6aae341daba… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Feb 21 17:44:44 2023 +0100 imm32: Delete unnecessary uSelected struct ime member. --- dlls/imm32/imm.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index e0366961767..695e263d39b 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -64,8 +64,6 @@ struct ime WCHAR ui_class[17]; HWND ui_hwnd; - ULONG uSelected; - BOOL (WINAPI *pImeInquire)(IMEINFO *, void *, DWORD); BOOL (WINAPI *pImeConfigure)(HKL, HWND, DWORD, void *); BOOL (WINAPI *pImeDestroy)(UINT); @@ -593,7 +591,6 @@ static BOOL free_input_context_data( HIMC hIMC ) TRACE( "Destroying %p\n", hIMC ); - data->ime->uSelected--; data->ime->pImeSelect( hIMC, FALSE ); SendMessageW( data->IMC.hWnd, WM_IME_SELECT, FALSE, (LPARAM)data->ime ); @@ -928,7 +925,6 @@ static InputContextData *create_input_context(HIMC default_imc) new_context->threadID = GetCurrentThreadId(); SendMessageW( GetFocus(), WM_IME_SELECT, TRUE, (LPARAM)new_context->ime ); - new_context->ime->uSelected++; TRACE("Created context %p\n", new_context); return new_context; } @@ -3053,12 +3049,10 @@ BOOL WINAPI ImmProcessKey(HWND hwnd, HKL hKL, UINT vKey, LPARAM lKeyData, DWORD if (!(new_hkl = ime_acquire( hKL ))) return FALSE; data->ime->pImeSelect( imc, FALSE ); - data->ime->uSelected--; ime_release( data->ime ); data->ime = new_hkl; data->ime->pImeSelect( imc, TRUE ); - data->ime->uSelected++; } GetKeyboardState(state);

1 0

Rémi Bernon : imm32: Implement ImmLoadIME and ImmFreeLayout.
by Alexandre Julliard March 14, 2023

March 14, 2023

Module: wine Branch: master Commit: fa9de19a66261cdb979ec131ff14e391ddce095b URL: https://gitlab.winehq.org/wine/wine/-/commit/fa9de19a66261cdb979ec131ff14e3… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Mar 9 11:15:16 2023 +0100 imm32: Implement ImmLoadIME and ImmFreeLayout. --- dlls/imm32/imm.c | 223 ++++++++++++++++++++++++++++++++--------------- dlls/imm32/tests/imm32.c | 18 +--- 2 files changed, 154 insertions(+), 87 deletions(-)

1 0

Rémi Bernon : imm32: Rename some struct ime members.
by Alexandre Julliard March 14, 2023

March 14, 2023

Module: wine Branch: master Commit: c76b55991ac57d821be2cbd7f62121bf38157956 URL: https://gitlab.winehq.org/wine/wine/-/commit/c76b55991ac57d821be2cbd7f62121… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Feb 21 17:43:58 2023 +0100 imm32: Rename some struct ime members. --- dlls/imm32/imm.c | 66 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 389aead8264..e0366961767 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -60,12 +60,12 @@ struct ime HMODULE module; struct list entry; - IMEINFO imeInfo; - WCHAR imeClassName[17]; /* 16 character max */ - ULONG uSelected; - HWND UIWnd; + IMEINFO info; + WCHAR ui_class[17]; + HWND ui_hwnd; + + ULONG uSelected; - /* Function Pointers */ BOOL (WINAPI *pImeInquire)(IMEINFO *, void *, DWORD); BOOL (WINAPI *pImeConfigure)(HKL, HWND, DWORD, void *); BOOL (WINAPI *pImeDestroy)(UINT); @@ -129,12 +129,12 @@ static const WCHAR szImeRegFmt[] = L"System\\CurrentControlSet\\Control\\Keyboar static inline BOOL is_himc_ime_unicode(const InputContextData *data) { - return !!(data->ime->imeInfo.fdwProperty & IME_PROP_UNICODE); + return !!(data->ime->info.fdwProperty & IME_PROP_UNICODE); } static inline BOOL is_kbd_ime_unicode( const struct ime *hkl ) { - return !!(hkl->imeInfo.fdwProperty & IME_PROP_UNICODE); + return !!(hkl->info.fdwProperty & IME_PROP_UNICODE); } static BOOL IMM_DestroyContext(HIMC hIMC); @@ -532,10 +532,10 @@ BOOL WINAPI ImmLoadIME( HKL hkl ) LOAD_FUNCPTR( ImeGetImeMenuItems ); #undef LOAD_FUNCPTR - if (!ime->pImeInquire( &ime->imeInfo, buffer, 0 )) goto failed; + if (!ime->pImeInquire( &ime->info, buffer, 0 )) goto failed; - if (is_kbd_ime_unicode( ime )) lstrcpynW( ime->imeClassName, buffer, ARRAY_SIZE(ime->imeClassName) ); - else MultiByteToWideChar( CP_ACP, 0, (char *)buffer, -1, ime->imeClassName, ARRAY_SIZE(ime->imeClassName) ); + if (is_kbd_ime_unicode( ime )) lstrcpynW( ime->ui_class, buffer, ARRAY_SIZE(ime->ui_class) ); + else MultiByteToWideChar( CP_ACP, 0, (char *)buffer, -1, ime->ui_class, ARRAY_SIZE(ime->ui_class) ); EnterCriticalSection( &ime_cs ); list_add_tail( &ime_list, &ime->entry ); @@ -579,7 +579,7 @@ static void ime_release( struct ime *ime ) ref = --ime->refcount; TRACE( "ime %p decreasing refcount to %lu.\n", ime, ref ); - if (!ref && (ime->imeInfo.fdwProperty & IME_PROP_END_UNLOAD)) + if (!ref && (ime->info.fdwProperty & IME_PROP_END_UNLOAD)) ImmFreeLayout( ime->hkl ); LeaveCriticalSection( &ime_cs ); @@ -628,7 +628,7 @@ static void IMM_FreeAllImmHkl(void) ime->pImeDestroy( 1 ); FreeLibrary( ime->module ); - if (ime->UIWnd) DestroyWindow( ime->UIWnd ); + if (ime->ui_hwnd) DestroyWindow( ime->ui_hwnd ); free( ime ); } } @@ -904,10 +904,10 @@ static InputContextData *create_input_context(HIMC default_imc) new_context->IMC.cfCandForm[i].dwIndex = ~0u; /* Initialize the IME Private */ - new_context->IMC.hPrivate = ImmCreateIMCC( new_context->ime->imeInfo.dwPrivateDataSize ); + new_context->IMC.hPrivate = ImmCreateIMCC( new_context->ime->info.dwPrivateDataSize ); - new_context->IMC.fdwConversion = new_context->ime->imeInfo.fdwConversionCaps; - new_context->IMC.fdwSentence = new_context->ime->imeInfo.fdwSentenceCaps; + new_context->IMC.fdwConversion = new_context->ime->info.fdwConversionCaps; + new_context->IMC.fdwSentence = new_context->ime->info.fdwSentenceCaps; if (!default_imc) new_context->handle = NtUserCreateInputContext((UINT_PTR)new_context); @@ -1922,11 +1922,11 @@ DWORD WINAPI ImmGetProperty( HKL hkl, DWORD index ) switch (index) { - case IGP_PROPERTY: ret = ime->imeInfo.fdwProperty; break; - case IGP_CONVERSION: ret = ime->imeInfo.fdwConversionCaps; break; - case IGP_SENTENCE: ret = ime->imeInfo.fdwSentenceCaps; break; - case IGP_SETCOMPSTR: ret = ime->imeInfo.fdwSCSCaps; break; - case IGP_SELECT: ret = ime->imeInfo.fdwSelectCaps; break; + case IGP_PROPERTY: ret = ime->info.fdwProperty; break; + case IGP_CONVERSION: ret = ime->info.fdwConversionCaps; break; + case IGP_SENTENCE: ret = ime->info.fdwSentenceCaps; break; + case IGP_SETCOMPSTR: ret = ime->info.fdwSCSCaps; break; + case IGP_SELECT: ret = ime->info.fdwSelectCaps; break; case IGP_GETIMEVERSION: ret = IMEVER_0400; break; case IGP_UI: ret = 0; break; default: ret = 0; break; @@ -2517,15 +2517,15 @@ BOOL WINAPI ImmSetCompositionWindow( data->IMC.cfCompForm = *lpCompForm; - if (IsWindowVisible( data->ime->UIWnd )) + if (IsWindowVisible( data->ime->ui_hwnd )) { reshow = TRUE; - ShowWindow( data->ime->UIWnd, SW_HIDE ); + ShowWindow( data->ime->ui_hwnd, SW_HIDE ); } /* FIXME: this is a partial stub */ - if (reshow) ShowWindow( data->ime->UIWnd, SW_SHOWNOACTIVATE ); + if (reshow) ShowWindow( data->ime->ui_hwnd, SW_SHOWNOACTIVATE ); ImmInternalSendIMENotify(data, IMN_SETCOMPOSITIONWINDOW, 0); return TRUE; @@ -2587,14 +2587,14 @@ BOOL WINAPI ImmSetOpenStatus(HIMC hIMC, BOOL fOpen) if (IMM_IsCrossThreadAccess(NULL, hIMC)) return FALSE; - if (data->ime->UIWnd == NULL) + if (data->ime->ui_hwnd == NULL) { /* create the ime window */ - data->ime->UIWnd = CreateWindowExW( WS_EX_TOOLWINDOW, data->ime->imeClassName, NULL, + data->ime->ui_hwnd = CreateWindowExW( WS_EX_TOOLWINDOW, data->ime->ui_class, NULL, WS_POPUP, 0, 0, 1, 1, 0, 0, data->ime->module, 0 ); - SetWindowLongPtrW( data->ime->UIWnd, IMMGWL_IMC, (LONG_PTR)data ); + SetWindowLongPtrW( data->ime->ui_hwnd, IMMGWL_IMC, (LONG_PTR)data ); } - else if (fOpen) SetWindowLongPtrW( data->ime->UIWnd, IMMGWL_IMC, (LONG_PTR)data ); + else if (fOpen) SetWindowLongPtrW( data->ime->ui_hwnd, IMMGWL_IMC, (LONG_PTR)data ); if (!fOpen != !data->IMC.fOpen) { @@ -2998,7 +2998,7 @@ BOOL WINAPI ImmTranslateMessage(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lKeyD list = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, list_count * sizeof(TRANSMSG) + sizeof(DWORD)); list->uMsgCount = list_count; - if (data->ime->imeInfo.fdwProperty & IME_PROP_KBD_CHAR_FIRST) + if (data->ime->info.fdwProperty & IME_PROP_KBD_CHAR_FIRST) { WCHAR chr; @@ -3116,7 +3116,7 @@ static HWND get_ui_window(HKL hkl) HWND hwnd; if (!(ime = ime_acquire( hkl ))) return 0; - hwnd = ime->UIWnd; + hwnd = ime->ui_hwnd; ime_release( ime ); return hwnd; @@ -3189,7 +3189,7 @@ static void init_messages(void) LRESULT WINAPI __wine_ime_wnd_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, BOOL ansi) { - HWND uiwnd; + HWND ui_hwnd; switch (msg) { @@ -3211,12 +3211,12 @@ LRESULT WINAPI __wine_ime_wnd_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lp if (is_ime_ui_msg(msg)) { - if ((uiwnd = get_ui_window(NtUserGetKeyboardLayout(0)))) + if ((ui_hwnd = get_ui_window(NtUserGetKeyboardLayout(0)))) { if (ansi) - return SendMessageA(uiwnd, msg, wparam, lparam); + return SendMessageA(ui_hwnd, msg, wparam, lparam); else - return SendMessageW(uiwnd, msg, wparam, lparam); + return SendMessageW(ui_hwnd, msg, wparam, lparam); } return FALSE; }

1 0