February 2019 - Wine-devel - list.winehq.org

[PATCH vkd3d 3/8] vkd3d-shader: Add more advanced helper for vector shuffle.
by Józef Kucia 26 Feb '19

26 Feb '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 43 +++++++++++++++++++++++++-------------- 1 file changed, 28 insertions(+), 15 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index a925d68eeeb4..9aee6928e993 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2669,22 +2669,22 @@ static uint32_t vkd3d_dxbc_compiler_emit_swizzle(struct vkd3d_dxbc_compiler *com } static uint32_t vkd3d_dxbc_compiler_emit_vector_shuffle(struct vkd3d_dxbc_compiler *compiler, - uint32_t vector1_id, uint32_t vector2_id, uint32_t write_mask, + uint32_t vector1_id, uint32_t vector2_id, unsigned int swizzle, unsigned int write_mask, enum vkd3d_component_type component_type, unsigned int component_count) { struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; uint32_t components[VKD3D_VEC4_SIZE]; - unsigned int i, component_idx; uint32_t type_id; + unsigned int i; assert(component_count <= ARRAY_SIZE(components)); - for (i = 0, component_idx = 0; i < component_count; ++i) + for (i = 0; i < component_count; ++i) { if (write_mask & (VKD3DSP_WRITEMASK_0 << i)) - components[i] = VKD3D_VEC4_SIZE + component_idx++; + components[i] = vkd3d_swizzle_get_component(swizzle, i); else - components[i] = i; + components[i] = VKD3D_VEC4_SIZE + vkd3d_swizzle_get_component(swizzle, i); } type_id = vkd3d_spirv_get_type_id(builder, component_type, component_count); @@ -2926,6 +2926,8 @@ static void vkd3d_dxbc_compiler_emit_store(struct vkd3d_dxbc_compiler *compiler, { struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; unsigned int component_count, dst_component_count; + uint32_t components[VKD3D_VEC4_SIZE]; + unsigned int i, component_idx; uint32_t type_id, dst_val_id; assert(write_mask); @@ -2944,8 +2946,18 @@ static void vkd3d_dxbc_compiler_emit_store(struct vkd3d_dxbc_compiler *compiler, type_id = vkd3d_spirv_get_type_id(builder, component_type, dst_component_count); dst_val_id = vkd3d_spirv_build_op_load(builder, type_id, dst_id, SpvMemoryAccessMaskNone); - val_id = vkd3d_dxbc_compiler_emit_vector_shuffle(compiler, - dst_val_id, val_id, write_mask, component_type, dst_component_count); + assert(component_count <= ARRAY_SIZE(components)); + + for (i = 0, component_idx = 0; i < dst_component_count; ++i) + { + if (write_mask & (VKD3DSP_WRITEMASK_0 << i)) + components[i] = VKD3D_VEC4_SIZE + component_idx++; + else + components[i] = i; + } + + val_id = vkd3d_spirv_build_op_vector_shuffle(builder, + type_id, dst_val_id, val_id, components, dst_component_count); } vkd3d_spirv_build_op_store(builder, dst_id, val_id, SpvMemoryAccessMaskNone); @@ -4039,23 +4051,18 @@ static void vkd3d_dxbc_compiler_emit_store_shader_output(struct vkd3d_dxbc_compi uint32_t type_id, zero_id, ptr_type_id, chain_id, object_id; uint32_t write_mask, use_mask, uninit_mask, swizzle, mask; uint32_t output_id, indexes[1]; - unsigned int component_count; unsigned int i, index; write_mask = output->mask & 0xff; use_mask = (output->mask >> 8) & 0xff; - swizzle = get_shader_output_swizzle(compiler, output->register_index); - val_id = vkd3d_dxbc_compiler_emit_swizzle(compiler, - val_id, VKD3DSP_WRITEMASK_ALL, VKD3D_TYPE_FLOAT, swizzle, write_mask); - - component_count = vkd3d_write_mask_component_count(write_mask); if (output_info->component_type != VKD3D_TYPE_FLOAT) { - type_id = vkd3d_spirv_get_type_id(builder, output_info->component_type, component_count); + type_id = vkd3d_spirv_get_type_id(builder, output_info->component_type, VKD3D_VEC4_SIZE); val_id = vkd3d_spirv_build_op_bitcast(builder, type_id, val_id); } + swizzle = get_shader_output_swizzle(compiler, output->register_index); uninit_mask = write_mask & use_mask; if (uninit_mask) { @@ -4063,7 +4070,13 @@ static void vkd3d_dxbc_compiler_emit_store_shader_output(struct vkd3d_dxbc_compi zero_id = vkd3d_dxbc_compiler_get_constant_vector(compiler, output_info->component_type, VKD3D_VEC4_SIZE, 0); val_id = vkd3d_dxbc_compiler_emit_vector_shuffle(compiler, - val_id, zero_id, uninit_mask, output_info->component_type, component_count); + zero_id, val_id, swizzle, uninit_mask, output_info->component_type, + vkd3d_write_mask_component_count(write_mask)); + } + else + { + val_id = vkd3d_dxbc_compiler_emit_swizzle(compiler, + val_id, VKD3DSP_WRITEMASK_ALL, output_info->component_type, swizzle, write_mask); } output_id = output_info->id; -- 2.19.2

2 1

[PATCH vkd3d 1/8] tests: Add test for SV_RenderTargetArrayIndex in pixel shader.
by Józef Kucia 26 Feb '19

26 Feb '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- tests/d3d12.c | 154 ++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 150 insertions(+), 4 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 7e74fbfec2ae..d8a13a711156 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -21633,7 +21633,6 @@ static void test_layered_rendering(void) D3D12_VERTEX_BUFFER_VIEW vbv; struct test_context context; ID3D12CommandQueue *queue; - ID3D12PipelineState *pso; ID3D12Device *device; ID3D12Resource *vb; HRESULT hr; @@ -21794,7 +21793,7 @@ static void test_layered_rendering(void) context.render_target_desc.Format, &vs, &ps, &input_layout); pso_desc.GS = gs; hr = ID3D12Device_CreateGraphicsPipelineState(device, &pso_desc, - &IID_ID3D12PipelineState, (void **)&pso); + &IID_ID3D12PipelineState, (void **)&context.pipeline_state); ok(hr == S_OK, "Failed to create graphics pipeline state, hr %#x.\n", hr); vb = create_upload_buffer(context.device, sizeof(vertices), vertices); @@ -21808,7 +21807,7 @@ static void test_layered_rendering(void) ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect); ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); - ID3D12GraphicsCommandList_SetPipelineState(command_list, pso); + ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state); ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP); ID3D12GraphicsCommandList_IASetVertexBuffers(command_list, 0, 1, &vbv); ID3D12GraphicsCommandList_DrawInstanced(command_list, 12, 1, 0, 0); @@ -21825,7 +21824,153 @@ static void test_layered_rendering(void) check_sub_resource_uint(context.render_target, 3, queue, command_list, 0xffffff00, 0); ID3D12Resource_Release(vb); - ID3D12PipelineState_Release(pso); + destroy_test_context(&context); +} + +static void test_ps_layer(void) +{ + D3D12_GRAPHICS_PIPELINE_STATE_DESC pso_desc; + ID3D12GraphicsCommandList *command_list; + struct test_context_desc desc; + struct test_context context; + ID3D12CommandQueue *queue; + ID3D12Device *device; + unsigned int i; + HRESULT hr; + + static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; + static const DWORD vs_code[] = + { +#if 0 + void main(in uint vertex_id : SV_VertexID, out uint layer : LAYER) + { + layer = vertex_id; + } +#endif + 0x43425844, 0xd2b4abd8, 0xf9adf7df, 0xed1b4eb0, 0x4bf54391, 0x00000001, 0x000000d8, 0x00000003, + 0x0000002c, 0x00000060, 0x00000090, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, + 0x00000000, 0x00000006, 0x00000001, 0x00000000, 0x00000101, 0x565f5653, 0x65747265, 0x00444978, + 0x4e47534f, 0x00000028, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000001, + 0x00000000, 0x00000e01, 0x4559414c, 0xabab0052, 0x58454853, 0x00000040, 0x00010050, 0x00000010, + 0x0100086a, 0x04000060, 0x00101012, 0x00000000, 0x00000006, 0x03000065, 0x00102012, 0x00000000, + 0x05000036, 0x00102012, 0x00000000, 0x0010100a, 0x00000000, 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE vs = {vs_code, sizeof(vs_code)}; + static const DWORD gs_code[] = + { +#if 0 + struct gs_in + { + uint layer : LAYER; + }; + + struct gs_out + { + float4 position : SV_Position; + uint layer : SV_RenderTargetArrayIndex; + }; + + [maxvertexcount(3)] + void main(point gs_in vin[1], inout TriangleStream<gs_out> vout) + { + gs_out o; + + o.layer = vin[0].layer; + + o.position = float4(-1, 1, 0, 1); + vout.Append(o); + + o.position = float4(3, 1, 0, 1); + vout.Append(o); + + o.position = float4(-1, -3, 0, 1); + vout.Append(o); + } +#endif + 0x43425844, 0x2589d822, 0x7557587c, 0x7d7e9cc0, 0x6bad86aa, 0x00000001, 0x000001fc, 0x00000003, + 0x0000002c, 0x0000005c, 0x000000cc, 0x4e475349, 0x00000028, 0x00000001, 0x00000008, 0x00000020, + 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000101, 0x4559414c, 0xabab0052, 0x3547534f, + 0x00000068, 0x00000002, 0x00000008, 0x00000000, 0x00000040, 0x00000000, 0x00000001, 0x00000003, + 0x00000000, 0x0000000f, 0x00000000, 0x0000004c, 0x00000000, 0x00000004, 0x00000001, 0x00000001, + 0x00000e01, 0x505f5653, 0x7469736f, 0x006e6f69, 0x525f5653, 0x65646e65, 0x72615472, 0x41746567, + 0x79617272, 0x65646e49, 0xabab0078, 0x58454853, 0x00000128, 0x00020050, 0x0000004a, 0x0100086a, + 0x0400005f, 0x00201012, 0x00000001, 0x00000000, 0x0100085d, 0x0300008f, 0x00110000, 0x00000000, + 0x0100285c, 0x04000067, 0x001020f2, 0x00000000, 0x00000001, 0x04000067, 0x00102012, 0x00000001, + 0x00000004, 0x0200005e, 0x00000003, 0x08000036, 0x001020f2, 0x00000000, 0x00004002, 0xbf800000, + 0x3f800000, 0x00000000, 0x3f800000, 0x06000036, 0x00102012, 0x00000001, 0x0020100a, 0x00000000, + 0x00000000, 0x03000075, 0x00110000, 0x00000000, 0x08000036, 0x001020f2, 0x00000000, 0x00004002, + 0x40400000, 0x3f800000, 0x00000000, 0x3f800000, 0x06000036, 0x00102012, 0x00000001, 0x0020100a, + 0x00000000, 0x00000000, 0x03000075, 0x00110000, 0x00000000, 0x08000036, 0x001020f2, 0x00000000, + 0x00004002, 0xbf800000, 0xc0400000, 0x00000000, 0x3f800000, 0x06000036, 0x00102012, 0x00000001, + 0x0020100a, 0x00000000, 0x00000000, 0x03000075, 0x00110000, 0x00000000, 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE gs = {gs_code, sizeof(gs_code)}; + static const DWORD ps_code[] = + { +#if 0 + float4 main(float4 p : SV_Position, uint layer : SV_RenderTargetArrayIndex) : SV_Target0 + { + return layer / 255.0; + } +#endif + 0x43425844, 0x53474926, 0xbd247b84, 0x389660f4, 0x331cf598, 0x00000001, 0x00000140, 0x00000003, + 0x0000002c, 0x00000094, 0x000000c8, 0x4e475349, 0x00000060, 0x00000002, 0x00000008, 0x00000038, + 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000000f, 0x00000044, 0x00000000, 0x00000004, + 0x00000001, 0x00000001, 0x00000101, 0x505f5653, 0x7469736f, 0x006e6f69, 0x525f5653, 0x65646e65, + 0x72615472, 0x41746567, 0x79617272, 0x65646e49, 0xabab0078, 0x4e47534f, 0x0000002c, 0x00000001, + 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x0000000f, 0x545f5653, + 0x65677261, 0xabab0074, 0x58454853, 0x00000070, 0x00000050, 0x0000001c, 0x0100086a, 0x04000864, + 0x00101012, 0x00000001, 0x00000004, 0x03000065, 0x001020f2, 0x00000000, 0x02000068, 0x00000001, + 0x05000056, 0x00100012, 0x00000000, 0x0010100a, 0x00000001, 0x0a000038, 0x001020f2, 0x00000000, + 0x00100006, 0x00000000, 0x00004002, 0x3b808081, 0x3b808081, 0x3b808081, 0x3b808081, 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE ps = {ps_code, sizeof(ps_code)}; + static const unsigned int expected_results[] = + { + 0x00000000, + 0x01010101, + 0x02020202, + 0x03030303, + 0x04040404, + 0x05050505, + }; + + memset(&desc, 0, sizeof(desc)); + desc.rt_array_size = 6; + desc.no_pipeline = true; + if (!init_test_context(&context, &desc)) + return; + device = context.device; + command_list = context.list; + queue = context.queue; + + init_pipeline_state_desc(&pso_desc, context.root_signature, + context.render_target_desc.Format, &vs, &ps, NULL); + pso_desc.GS = gs; + pso_desc.PrimitiveTopologyType = D3D12_PRIMITIVE_TOPOLOGY_TYPE_POINT; + hr = ID3D12Device_CreateGraphicsPipelineState(device, &pso_desc, + &IID_ID3D12PipelineState, (void **)&context.pipeline_state); + ok(hr == S_OK, "Failed to create graphics pipeline state, hr %#x.\n", hr); + + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL); + + ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, FALSE, NULL); + ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect); + ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); + ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); + ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state); + ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_POINTLIST); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 6, 1, 0, 0); + + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + + for (i = 0; i < ARRAY_SIZE(expected_results); ++i) + { + check_sub_resource_uint(context.render_target, i, queue, command_list, expected_results[i], 0); + reset_command_list(command_list, context.allocator); + } + destroy_test_context(&context); } @@ -25108,6 +25253,7 @@ START_TEST(d3d12) run_test(test_multithread_command_queue_exec); run_test(test_geometry_shader); run_test(test_layered_rendering); + run_test(test_ps_layer); run_test(test_nop_tessellation_shaders); run_test(test_quad_tessellation); run_test(test_tessellation_dcl_index_range); -- 2.19.2

2 1

[PATCH 7/9] ntoskrnl.exe: Add partial ObReferenceObjectByHandle implementation.
by Jacek Caban 26 Feb '19

26 Feb '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 80 ++++++++++++++++++++++------ dlls/ntoskrnl.exe/ntoskrnl_private.h | 5 +- dlls/ntoskrnl.exe/tests/driver.c | 9 ++-- 3 files changed, 70 insertions(+), 24 deletions(-)

2 1

[PATCH 5/9] ntoskrnl.exe: Add missing ObReferenceObject call to ObReferenceObjectByName.
by Jacek Caban 26 Feb '19

26 Feb '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)

2 1

[PATCH 4/9] ntoskrnl.exe: Use kernel object allocators for device object.
by Jacek Caban 26 Feb '19

26 Feb '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)

2 1

[PATCH] mf/tests: Fix typos in test messages.
by Nikolay Sivov 26 Feb '19

26 Feb '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- Thanks, Józef. dlls/mf/tests/mf.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index c56428d27e..ba11a27c33 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -297,7 +297,7 @@ static void test_topology(void) IMFCollection_Release(collection); hr = IMFTopology_GetOutputNodeCollection(topology, &collection); - ok(hr == S_OK || broken(hr == E_FAIL) /* before Win8 */, "Failed to get source node collection, hr %#x.\n", hr); + ok(hr == S_OK || broken(hr == E_FAIL) /* before Win8 */, "Failed to get output node collection, hr %#x.\n", hr); if (SUCCEEDED(hr)) { ok(!!collection, "Unexpected object pointer.\n"); @@ -313,7 +313,7 @@ static void test_topology(void) IMFTopologyNode_Release(node); hr = IMFTopology_GetOutputNodeCollection(topology, &collection); - ok(hr == S_OK, "Failed to get source node collection, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to get output node collection, hr %#x.\n", hr); ok(!!collection, "Unexpected object pointer.\n"); hr = IMFCollection_GetElementCount(collection, &size); ok(hr == S_OK, "Failed to get item count, hr %#x.\n", hr); -- 2.20.1

1 0

[PATCH 3/3] Add proper reporting of CPU information for ppc64 systems
by Timothy Pearson 26 Feb '19

26 Feb '19

--- dlls/ntdll/nt.c | 38 ++++++++++++++++++++++++++++++++++++ dlls/setupapi/fakedll.c | 2 ++ programs/wineboot/wineboot.c | 33 +++++++++++++++++++++++++++++++ 3 files changed, 73 insertions(+) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index 792c7f06e1..2d43d8a7db 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -1140,7 +1140,45 @@ static inline void get_cpuinfo(SYSTEM_CPU_INFORMATION* info) static inline void get_cpuinfo(SYSTEM_CPU_INFORMATION* info) { +#ifdef linux + char line[512]; + char *s, *value; + FILE *f = fopen("/proc/cpuinfo", "r"); + if (f) + { + while (fgets(line, sizeof(line), f) != NULL) + { + /* NOTE: the ':' is the only character we can rely on */ + if (!(value = strchr(line,':'))) + continue; + /* terminate the valuename */ + s = value - 1; + while ((s >= line) && isspace(*s)) s--; + *(s + 1) = '\0'; + /* and strip leading spaces from value */ + value += 1; + while (isspace(*value)) value++; + if ((s = strchr(value,'\n'))) + *s='\0'; + if (!strcasecmp(line, "cpu")) + { + if (isdigit(value[5])) + info->Level = atoi(value+5); + continue; + } + if (!strcasecmp(line, "revision")) + { + if (isdigit(value[0])) + info->Revision = (atof(value) * 100); + continue; + } + } + fclose(f); + } +#else FIXME("CPU Feature detection not implemented.\n"); +#endif + info->Level = max(info->Level, 8); /* Default to POWER8 if unable to detect CPU series */ info->Architecture = PROCESSOR_ARCHITECTURE_PPC64; } diff --git a/dlls/setupapi/fakedll.c b/dlls/setupapi/fakedll.c index 8c68a50346..87be2b51dd 100644 --- a/dlls/setupapi/fakedll.c +++ b/dlls/setupapi/fakedll.c @@ -719,6 +719,8 @@ static BOOL CALLBACK register_manifest( HMODULE module, const WCHAR *type, WCHAR static const char current_arch[] = "arm"; #elif defined __aarch64__ static const char current_arch[] = "arm64"; +#elif defined __powerpc64__ + static const char current_arch[] = "ppc64"; #else static const char current_arch[] = "none"; #endif diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c index b85a3b6b6e..41ad61ff37 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -277,11 +277,16 @@ static void create_hardware_registry_keys(void) static const WCHAR ProcessorNameStringW[] = {'P','r','o','c','e','s','s','o','r','N','a','m','e','S','t','r','i','n','g',0}; static const WCHAR SysidW[] = {'A','T',' ','c','o','m','p','a','t','i','b','l','e',0}; static const WCHAR ARMSysidW[] = {'A','R','M',' ','p','r','o','c','e','s','s','o','r',' ','f','a','m','i','l','y',0}; + static const WCHAR PPCSysidW[] = {'P','o','w','e','r','P','C',' ','p','r','o','c','e','s','s','o','r',' ','f','a','m','i','l','y',0}; static const WCHAR mhzKeyW[] = {'~','M','H','z',0}; static const WCHAR VendorIdentifierW[] = {'V','e','n','d','o','r','I','d','e','n','t','i','f','i','e','r',0}; static const WCHAR PercentDW[] = {'%','d',0}; static const WCHAR ARMCpuDescrW[] = {'A','R','M',' ','F','a','m','i','l','y',' ','%','d',' ','M','o','d','e','l',' ','%','d', ' ','R','e','v','i','s','i','o','n',' ','%','d',0}; + static const WCHAR PPCCpuDescrW[] = {'P','o','w','e','r','P','C',' ','F','a','m','i','l','y',' ','%','d',' ','M','o','d','e','l',' ','%','d', + ' ','R','e','v','i','s','i','o','n',' ','%','d',0}; + static const WCHAR PPC64CpuDescrW[] = {'P','o','w','e','r','P','C','6','4',' ','F','a','m','i','l','y',' ','%','d',' ','M','o','d','e','l',' ','%','d', + ' ','R','e','v','i','s','i','o','n',' ','%','d',0}; static const WCHAR x86W[] = {'x','8','6',0}; static const WCHAR intel64W[] = {'I','n','t','e','l','6','4',0}; static const WCHAR amd64W[] = {'A','M','D','6','4',0}; @@ -310,6 +315,13 @@ static void create_hardware_registry_keys(void) sprintfW( id, ARMCpuDescrW, sci.Level, HIBYTE(sci.Revision), LOBYTE(sci.Revision) ); break; + case PROCESSOR_ARCHITECTURE_PPC: + sprintfW( id, PPCCpuDescrW, sci.Level, HIBYTE(sci.Revision), LOBYTE(sci.Revision) ); + break; + case PROCESSOR_ARCHITECTURE_PPC64: + sprintfW( id, PPC64CpuDescrW, sci.Level, HIBYTE(sci.Revision), LOBYTE(sci.Revision) ); + break; + case PROCESSOR_ARCHITECTURE_AMD64: get_identifier( id, !strcmpW(vendorid, authenticamdW) ? amd64W : intel64W ); break; @@ -334,6 +346,11 @@ static void create_hardware_registry_keys(void) set_reg_value( system_key, IdentifierW, ARMSysidW ); break; + case PROCESSOR_ARCHITECTURE_PPC: + case PROCESSOR_ARCHITECTURE_PPC64: + set_reg_value( system_key, IdentifierW, PPCSysidW ); + break; + case PROCESSOR_ARCHITECTURE_INTEL: case PROCESSOR_ARCHITECTURE_AMD64: default: @@ -411,6 +428,7 @@ static void create_environment_registry_keys( void ) static const WCHAR intel64W[] = {'I','n','t','e','l','6','4',0}; static const WCHAR amd64W[] = {'A','M','D','6','4',0}; static const WCHAR authenticamdW[] = {'A','u','t','h','e','n','t','i','c','A','M','D',0}; + static const WCHAR ppc64W[] = {'P','o','w','e','r','P','C','6','4',0}; static const WCHAR commaW[] = {',',' ',0}; static const WCHAR ProcIdW[] = {'P','R','O','C','E','S','S','O','R','_','I','D','E','N','T','I','F','I','E','R',0}; static const WCHAR ProcLvlW[] = {'P','R','O','C','E','S','S','O','R','_','L','E','V','E','L',0}; @@ -419,6 +437,10 @@ static void create_environment_registry_keys( void ) static const WCHAR Percent04XW[] = {'%','0','4','x',0}; static const WCHAR ARMCpuDescrW[] = {'A','R','M',' ','F','a','m','i','l','y',' ','%','d',' ','M','o','d','e','l',' ','%','d', ' ','R','e','v','i','s','i','o','n',' ','%','d',0}; + static const WCHAR PPCCpuDescrW[] = {'P','o','w','e','r','P','C',' ','F','a','m','i','l','y',' ','%','d',' ','M','o','d','e','l',' ','%','d', + ' ','R','e','v','i','s','i','o','n',' ','%','d',0}; + static const WCHAR PPC64CpuDescrW[] = {'P','o','w','e','r','P','C','6','4',' ','F','a','m','i','l','y',' ','%','d',' ','M','o','d','e','l',' ','%','d', + ' ','R','e','v','i','s','i','o','n',' ','%','d',0}; HKEY env_key; SYSTEM_CPU_INFORMATION sci; WCHAR buffer[60], vendorid[13]; @@ -439,6 +461,10 @@ static void create_environment_registry_keys( void ) parch = !strcmpW(vendorid, authenticamdW) ? amd64W : intel64W; break; + case PROCESSOR_ARCHITECTURE_PPC64: + arch = parch = ppc64W; + break; + case PROCESSOR_ARCHITECTURE_INTEL: default: arch = parch = x86W; @@ -453,6 +479,13 @@ static void create_environment_registry_keys( void ) sprintfW( buffer, ARMCpuDescrW, sci.Level, HIBYTE(sci.Revision), LOBYTE(sci.Revision) ); break; + case PROCESSOR_ARCHITECTURE_PPC: + sprintfW( buffer, PPCCpuDescrW, sci.Level, HIBYTE(sci.Revision), LOBYTE(sci.Revision) ); + break; + case PROCESSOR_ARCHITECTURE_PPC64: + sprintfW( buffer, PPC64CpuDescrW, sci.Level, HIBYTE(sci.Revision), LOBYTE(sci.Revision) ); + break; + case PROCESSOR_ARCHITECTURE_AMD64: case PROCESSOR_ARCHITECTURE_INTEL: default: -- 2.20.1

2 1

[PATCH 9/9] ntoskrnl.exe: Implement file object constructor.
by Jacek Caban 26 Feb '19

26 Feb '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 12 +++++++++++- dlls/ntoskrnl.exe/tests/driver.c | 4 ++++ 2 files changed, 15 insertions(+), 1 deletion(-)

1 0

[PATCH 8/9] ntoskrnl.exe: Implement ObReferenceObject and ObDereferenceObject.
by Jacek Caban 26 Feb '19

26 Feb '19

NULL checks are meant to prevent regressions in applications trying to reference NULL objects returned from stubs. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 64 +++++++++++++++++++++--------------- 1 file changed, 37 insertions(+), 27 deletions(-)

1 0

[PATCH 6/9] ntoskrnl.exe: Use kernel object allocators for file object.
by Jacek Caban 26 Feb '19

26 Feb '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)

1 0