January 2019 - Wine-commits

Józef Kucia : vkd3d: Avoid passing 0 miplevels to Vulkan.
by Alexandre Julliard 25 Jan '19

25 Jan '19

Module: vkd3d Branch: master Commit: 2aa7c6b753aa184575da3ca1a0fab009b90d7021 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=2aa7c6b753aa184575da3ca… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jan 25 14:52:52 2019 +0100 vkd3d: Avoid passing 0 miplevels to Vulkan. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/resource.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 75a5201..6eba450 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -623,12 +623,20 @@ HRESULT vkd3d_get_image_allocation_info(struct d3d12_device *device, { static const D3D12_HEAP_PROPERTIES heap_properties = {D3D12_HEAP_TYPE_DEFAULT}; const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; + D3D12_RESOURCE_DESC validated_desc; VkMemoryRequirements requirements; VkImage vk_image; HRESULT hr; assert(desc->Dimension != D3D12_RESOURCE_DIMENSION_BUFFER); + if (!desc->MipLevels) + { + validated_desc = *desc; + validated_desc.MipLevels = max_miplevel_count(desc); + desc = &validated_desc; + } + /* XXX: We have to create an image to get its memory requirements. */ if (SUCCEEDED(hr = vkd3d_create_image(device, &heap_properties, 0, desc, &vk_image))) {

1 0

Andrew Eikum : readme: Expand on building and using vkd3d.
by Alexandre Julliard 25 Jan '19

25 Jan '19

Module: vkd3d Branch: master Commit: 3b1af3c85d84341405af13e6c94aa60cf596c561 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=3b1af3c85d84341405af13e… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Jan 25 21:56:57 2019 +0330 readme: Expand on building and using vkd3d. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- README | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/README b/README index f353c36..bec91a9 100644 --- a/README +++ b/README @@ -4,3 +4,27 @@ The vkd3d 3D Graphics Library Vkd3d is a 3D graphics library built on top of Vulkan. It has an API very similar, but not identical, to Direct3D 12. + +============== +Building vkd3d +============== + +Vkd3d depends on SPIRV-Headers and Vulkan-Headers (>= 1.1.88). + +Vkd3d generates some of its headers from IDL files. If you are using the +release tarballs, then these headers are pre-generated and are included. If +you are building from git, then they will be generated at build-time using +widl. By default, vkd3d will use the widl found in `PATH'. If widl is not +available or is not recent (>= 3.0 or so), then you can build Wine with +`make tools/widl' to avoid building all of Wine. You can then point vkd3d's +configure at that widl binary with `WIDL="/path/to/widl"'. + +=========== +Using vkd3d +=========== + +Vkd3d can be used by projects that target Direct3D 12 as a drop-in replacement +at build-time with some modest source modifications. + +If vkd3d is available when building Wine, then Wine will use it to support +Direct3D 12 applications.

1 0

Józef Kucia : vkd3d: Fix assert() condition for sample mask array size.
by Alexandre Julliard 25 Jan '19

25 Jan '19

Module: vkd3d Branch: master Commit: d74133fda564a643234532f8064d65a667166458 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=d74133fda564a643234532f… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jan 25 13:23:27 2019 +0100 vkd3d: Fix assert() condition for sample mask array size. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/state.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 6daeab7..08f2f3c 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -2438,7 +2438,7 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s graphics->ms_desc.pSampleMask = NULL; if (desc->SampleMask != ~0u) { - assert(DIV_ROUND_UP(sample_count, 32) < ARRAY_SIZE(graphics->sample_mask)); + assert(DIV_ROUND_UP(sample_count, 32) <= ARRAY_SIZE(graphics->sample_mask)); graphics->sample_mask[0] = desc->SampleMask; graphics->sample_mask[1] = 0xffffffffu; graphics->ms_desc.pSampleMask = graphics->sample_mask;

1 0

Józef Kucia : vkd3d-shader: Translate dcl_tessellator_output_primitive instructions.
by Alexandre Julliard 25 Jan '19

25 Jan '19

Module: vkd3d Branch: master Commit: 2838ee5833ce0aa933ea02724f3be51296c0351a URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=2838ee5833ce0aa933ea027… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jan 25 13:23:28 2019 +0100 vkd3d-shader: Translate dcl_tessellator_output_primitive instructions. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/spirv.c | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index ddcaead..ae0490e 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -4558,6 +4558,33 @@ static void vkd3d_dxbc_compiler_emit_dcl_tessellator_domain(struct vkd3d_dxbc_co vkd3d_dxbc_compiler_emit_execution_mode(compiler, mode, NULL, 0); } +static void vkd3d_dxbc_compiler_emit_dcl_tessellator_output_primitive(struct vkd3d_dxbc_compiler *compiler, + const struct vkd3d_shader_instruction *instruction) +{ + enum vkd3d_tessellator_output_primitive primitive = instruction->declaration.tessellator_output_primitive; + SpvExecutionMode mode; + + switch (primitive) + { + case VKD3D_TESSELLATOR_OUTPUT_POINT: + mode = SpvExecutionModePointMode; + break; + case VKD3D_TESSELLATOR_OUTPUT_LINE: + return; + case VKD3D_TESSELLATOR_OUTPUT_TRIANGLE_CW: + mode = SpvExecutionModeVertexOrderCw; + break; + case VKD3D_TESSELLATOR_OUTPUT_TRIANGLE_CCW: + mode = SpvExecutionModeVertexOrderCcw; + break; + default: + FIXME("Invalid tessellator output primitive %#x.\n", primitive); + return; + } + + vkd3d_dxbc_compiler_emit_execution_mode(compiler, mode, NULL, 0); +} + static void vkd3d_dxbc_compiler_emit_dcl_tessellator_partitioning(struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_instruction *instruction) { @@ -6870,6 +6897,9 @@ int vkd3d_dxbc_compiler_handle_instruction(struct vkd3d_dxbc_compiler *compiler, case VKD3DSIH_DCL_TESSELLATOR_DOMAIN: vkd3d_dxbc_compiler_emit_dcl_tessellator_domain(compiler, instruction); break; + case VKD3DSIH_DCL_TESSELLATOR_OUTPUT_PRIMITIVE: + vkd3d_dxbc_compiler_emit_dcl_tessellator_output_primitive(compiler, instruction); + break; case VKD3DSIH_DCL_TESSELLATOR_PARTITIONING: vkd3d_dxbc_compiler_emit_dcl_tessellator_partitioning(compiler, instruction); break;

1 0

Józef Kucia : vkd3d-shader: Add more general support for SPIR-V aggregates.
by Alexandre Julliard 25 Jan '19

25 Jan '19

Module: vkd3d Branch: master Commit: 495d4b94740ff9424236e59b66723db3068f0dc5 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=495d4b94740ff9424236e59… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jan 25 13:23:29 2019 +0100 vkd3d-shader: Add more general support for SPIR-V aggregates. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/spirv.c | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index ae0490e..1140f50 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -1718,6 +1718,7 @@ struct vkd3d_symbol_register_data enum vkd3d_component_type component_type; unsigned int write_mask; unsigned int structure_stride; + bool is_aggregate; /* An aggregate, i.e. a structure or an array. */ }; struct vkd3d_symbol_resource_data @@ -2414,6 +2415,7 @@ struct vkd3d_shader_register_info unsigned int write_mask; uint32_t member_idx; unsigned int structure_stride; + bool is_aggregate; }; static bool vkd3d_dxbc_compiler_get_register_info(const struct vkd3d_dxbc_compiler *compiler, @@ -2432,6 +2434,8 @@ static bool vkd3d_dxbc_compiler_get_register_info(const struct vkd3d_dxbc_compil register_info->component_type = VKD3D_TYPE_FLOAT; register_info->write_mask = VKD3DSP_WRITEMASK_ALL; register_info->member_idx = 0; + register_info->structure_stride = 0; + register_info->is_aggregate = false; return true; } @@ -2450,6 +2454,7 @@ static bool vkd3d_dxbc_compiler_get_register_info(const struct vkd3d_dxbc_compil register_info->write_mask = symbol->info.reg.write_mask; register_info->structure_stride = symbol->info.reg.structure_stride; register_info->member_idx = symbol->info.reg.member_idx; + register_info->is_aggregate = symbol->info.reg.is_aggregate; return true; } @@ -2476,8 +2481,11 @@ static void vkd3d_dxbc_compiler_emit_dereference_register(struct vkd3d_dxbc_comp { indexes[index_count++] = vkd3d_dxbc_compiler_emit_register_addressing(compiler, &reg->idx[1]); } - else if (reg->type == VKD3DSPR_COVERAGE || reg->type == VKD3DSPR_SAMPLEMASK) + else if (register_info->is_aggregate) { + if (reg->idx[0].rel_addr || reg->idx[1].rel_addr) + FIXME("Relative addressing not implemented.\n"); + indexes[index_count++] = vkd3d_dxbc_compiler_get_constant_uint(compiler, register_info->member_idx); } else @@ -3390,6 +3398,7 @@ static uint32_t vkd3d_dxbc_compiler_emit_input(struct vkd3d_dxbc_compiler *compi reg_symbol.info.reg.component_type = use_private_var ? VKD3D_TYPE_FLOAT : component_type; reg_symbol.info.reg.write_mask = use_private_var ? vkd3d_write_mask_from_component_count(component_count) : signature_element->mask & 0xff; + reg_symbol.info.reg.is_aggregate = false; vkd3d_dxbc_compiler_put_symbol(compiler, &reg_symbol); vkd3d_dxbc_compiler_emit_register_debug_name(builder, var_id, reg); @@ -3467,6 +3476,7 @@ static void vkd3d_dxbc_compiler_emit_input_register(struct vkd3d_dxbc_compiler * reg_symbol.info.reg.member_idx = 0; reg_symbol.info.reg.component_type = builtin->component_type; reg_symbol.info.reg.write_mask = vkd3d_write_mask_from_component_count(builtin->component_count); + reg_symbol.info.reg.is_aggregate = builtin->is_spirv_array; vkd3d_dxbc_compiler_put_symbol(compiler, &reg_symbol); vkd3d_dxbc_compiler_emit_register_debug_name(builder, input_id, reg); } @@ -3616,6 +3626,7 @@ static void vkd3d_dxbc_compiler_emit_output_register(struct vkd3d_dxbc_compiler reg_symbol.info.reg.member_idx = 0; reg_symbol.info.reg.component_type = builtin->component_type; reg_symbol.info.reg.write_mask = vkd3d_write_mask_from_component_count(builtin->component_count); + reg_symbol.info.reg.is_aggregate = builtin->is_spirv_array; vkd3d_dxbc_compiler_put_symbol(compiler, &reg_symbol); vkd3d_dxbc_compiler_emit_register_debug_name(builder, output_id, reg); } @@ -3722,6 +3733,7 @@ static void vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *compiler reg_symbol.info.reg.storage_class = storage_class; reg_symbol.info.reg.component_type = use_private_variable ? VKD3D_TYPE_FLOAT : component_type; reg_symbol.info.reg.write_mask = VKD3DSP_WRITEMASK_ALL; + reg_symbol.info.reg.is_aggregate = false; vkd3d_dxbc_compiler_put_symbol(compiler, &reg_symbol); vkd3d_dxbc_compiler_emit_register_debug_name(builder, var_id, reg); @@ -3848,6 +3860,7 @@ static void vkd3d_dxbc_compiler_emit_dcl_indexable_temp(struct vkd3d_dxbc_compil reg_symbol.info.reg.storage_class = SpvStorageClassFunction; reg_symbol.info.reg.component_type = VKD3D_TYPE_FLOAT; reg_symbol.info.reg.write_mask = VKD3DSP_WRITEMASK_ALL; + reg_symbol.info.reg.is_aggregate = false; vkd3d_dxbc_compiler_put_symbol(compiler, &reg_symbol); } @@ -3916,6 +3929,7 @@ static void vkd3d_dxbc_compiler_emit_push_constant_buffers(struct vkd3d_dxbc_com reg_symbol.info.reg.member_idx = j; reg_symbol.info.reg.component_type = VKD3D_TYPE_FLOAT; reg_symbol.info.reg.write_mask = VKD3DSP_WRITEMASK_ALL; + reg_symbol.info.reg.is_aggregate = false; vkd3d_dxbc_compiler_put_symbol(compiler, &reg_symbol); ++j; @@ -3978,6 +3992,7 @@ static void vkd3d_dxbc_compiler_emit_dcl_constant_buffer(struct vkd3d_dxbc_compi reg_symbol.info.reg.member_idx = 0; reg_symbol.info.reg.component_type = VKD3D_TYPE_FLOAT; reg_symbol.info.reg.write_mask = VKD3DSP_WRITEMASK_ALL; + reg_symbol.info.reg.is_aggregate = false; vkd3d_dxbc_compiler_put_symbol(compiler, &reg_symbol); } @@ -4013,6 +4028,7 @@ static void vkd3d_dxbc_compiler_emit_dcl_immediate_constant_buffer(struct vkd3d_ reg_symbol.info.reg.storage_class = SpvStorageClassPrivate; reg_symbol.info.reg.component_type = VKD3D_TYPE_FLOAT; reg_symbol.info.reg.write_mask = VKD3DSP_WRITEMASK_ALL; + reg_symbol.info.reg.is_aggregate = false; vkd3d_dxbc_compiler_put_symbol(compiler, &reg_symbol); } @@ -4041,6 +4057,7 @@ static void vkd3d_dxbc_compiler_emit_dcl_sampler(struct vkd3d_dxbc_compiler *com vkd3d_symbol_make_register(&reg_symbol, reg); reg_symbol.id = var_id; reg_symbol.info.reg.storage_class = storage_class; + reg_symbol.info.reg.is_aggregate = false; vkd3d_dxbc_compiler_put_symbol(compiler, &reg_symbol); } @@ -4350,6 +4367,7 @@ static void vkd3d_dxbc_compiler_emit_workgroup_memory(struct vkd3d_dxbc_compiler reg_symbol.info.reg.component_type = VKD3D_TYPE_UINT; reg_symbol.info.reg.write_mask = VKD3DSP_WRITEMASK_0; reg_symbol.info.reg.structure_stride = structure_stride; + reg_symbol.info.reg.is_aggregate = false; vkd3d_dxbc_compiler_put_symbol(compiler, &reg_symbol); }

1 0

Józef Kucia : vkd3d-shader: Use proper vkd3d_spirv_builtin for PS fragment coordinates.
by Alexandre Julliard 25 Jan '19

25 Jan '19

Module: vkd3d Branch: master Commit: bcd91910e4b89f88065b914a4cf4a00785dfbbdc URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=bcd91910e4b89f88065b914… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jan 25 13:23:30 2019 +0100 vkd3d-shader: Use proper vkd3d_spirv_builtin for PS fragment coordinates. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/spirv.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 1140f50..d0cbf56 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2977,10 +2977,6 @@ static void vkd3d_dxbc_compiler_decorate_builtin(struct vkd3d_dxbc_compiler *com switch (builtin) { - case SpvBuiltInPosition: - if (compiler->shader_type == VKD3D_SHADER_TYPE_PIXEL) - builtin = SpvBuiltInFragCoord; - break; case SpvBuiltInFragDepth: vkd3d_dxbc_compiler_emit_execution_mode(compiler, SpvExecutionModeDepthReplacing, NULL, 0); break; @@ -3110,6 +3106,10 @@ vkd3d_system_value_builtins[] = {VKD3D_SIV_CLIP_DISTANCE, {VKD3D_TYPE_FLOAT, 1, SpvBuiltInClipDistance, NULL, true}}, {VKD3D_SIV_CULL_DISTANCE, {VKD3D_TYPE_FLOAT, 1, SpvBuiltInCullDistance, NULL, true}}, }; +static const struct vkd3d_spirv_builtin vkd3d_pixel_shader_position_builtin = +{ + VKD3D_TYPE_FLOAT, 4, SpvBuiltInFragCoord, +}; static const struct { enum vkd3d_shader_register_type reg_type; @@ -3160,6 +3160,10 @@ static const struct vkd3d_spirv_builtin *get_spirv_builtin_for_sysval( if (!sysval) return NULL; + /* In pixel shaders, SV_Position is mapped to SpvBuiltInFragCoord. */ + if (sysval == VKD3D_SIV_POSITION && compiler->shader_type == VKD3D_SHADER_TYPE_PIXEL) + return &vkd3d_pixel_shader_position_builtin; + target = vkd3d_dxbc_compiler_get_target(compiler); for (i = 0; i < ARRAY_SIZE(vkd3d_system_value_builtins); ++i) {

1 0

Zebediah Figura : hal: Limit exports to the appropriate architectures.
by Alexandre Julliard 24 Jan '19

24 Jan '19

Module: wine Branch: master Commit: b6ea5f347e84644f38b3f5fffc88890c9e0af633 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b6ea5f347e84644f38b3f5ff… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jan 23 23:50:32 2019 -0600 hal: Limit exports to the appropriate architectures. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hal/hal.c | 81 +++++++++++++++++++++---------------------------------- dlls/hal/hal.spec | 26 +++++++++--------- 2 files changed, 43 insertions(+), 64 deletions(-) diff --git a/dlls/hal/hal.c b/dlls/hal/hal.c index 51bf55d..5560d9b 100644 --- a/dlls/hal/hal.c +++ b/dlls/hal/hal.c @@ -47,53 +47,42 @@ WINE_DEFAULT_DEBUG_CHANNEL(ntoskrnl); "pushl %ecx\n\t" \ "pushl %eax\n\t" \ "jmp " __ASM_NAME("__regs_") #name __ASM_STDCALL(8)) -#endif - -#ifdef DEFINE_FASTCALL1_ENTRYPOINT DEFINE_FASTCALL1_ENTRYPOINT( ExAcquireFastMutex ) VOID WINAPI DECLSPEC_HIDDEN __regs_ExAcquireFastMutex(PFAST_MUTEX FastMutex) -#else -VOID WINAPI ExAcquireFastMutex(PFAST_MUTEX FastMutex) -#endif { FIXME("%p: stub\n", FastMutex); } -#ifdef DEFINE_FASTCALL1_ENTRYPOINT DEFINE_FASTCALL1_ENTRYPOINT( ExReleaseFastMutex ) VOID WINAPI DECLSPEC_HIDDEN __regs_ExReleaseFastMutex(PFAST_MUTEX FastMutex) -#else -VOID WINAPI ExReleaseFastMutex(PFAST_MUTEX FastMutex) -#endif { FIXME("%p: stub\n", FastMutex); } -#ifdef DEFINE_FASTCALL1_ENTRYPOINT DEFINE_FASTCALL1_ENTRYPOINT( ExTryToAcquireFastMutex ) BOOLEAN WINAPI DECLSPEC_HIDDEN __regs_ExTryToAcquireFastMutex(PFAST_MUTEX FastMutex) -#else -BOOLEAN WINAPI ExTryToAcquireFastMutex(PFAST_MUTEX FastMutex) -#endif { FIXME("(%p) stub\n", FastMutex); return TRUE; } -#ifdef DEFINE_FASTCALL1_ENTRYPOINT DEFINE_FASTCALL1_ENTRYPOINT( KfAcquireSpinLock ) KIRQL WINAPI DECLSPEC_HIDDEN __regs_KfAcquireSpinLock(PKSPIN_LOCK SpinLock) -#else -KIRQL WINAPI KfAcquireSpinLock(PKSPIN_LOCK SpinLock) -#endif { FIXME( "(%p) stub!\n", SpinLock ); return 0; } +DEFINE_FASTCALL2_ENTRYPOINT( KfReleaseSpinLock ) +VOID WINAPI DECLSPEC_HIDDEN __regs_KfReleaseSpinLock(PKSPIN_LOCK SpinLock, KIRQL NewIrql) +{ + FIXME( "(%p %u) stub!\n", SpinLock, NewIrql ); +} +#endif /* __i386__ */ +#if defined(__i386__) || defined(__arm__) || defined(__aarch64__) #ifdef DEFINE_FASTCALL1_ENTRYPOINT DEFINE_FASTCALL1_ENTRYPOINT( KfLowerIrql ) VOID WINAPI DECLSPEC_HIDDEN __regs_KfLowerIrql(KIRQL NewIrql) @@ -117,39 +106,6 @@ KIRQL WINAPI KfRaiseIrql(KIRQL NewIrql) return 0; } - -#ifdef DEFINE_FASTCALL2_ENTRYPOINT -DEFINE_FASTCALL2_ENTRYPOINT( KfReleaseSpinLock ) -VOID WINAPI DECLSPEC_HIDDEN __regs_KfReleaseSpinLock(PKSPIN_LOCK SpinLock, KIRQL NewIrql) -#else -VOID WINAPI KfReleaseSpinLock(PKSPIN_LOCK SpinLock, KIRQL NewIrql) -#endif -{ - FIXME( "(%p %u) stub!\n", SpinLock, NewIrql ); -} - -ULONG WINAPI HalGetBusData(BUS_DATA_TYPE BusDataType, ULONG BusNumber, ULONG SlotNumber, PVOID Buffer, ULONG Length) -{ - FIXME("(%u %u %u %p %u) stub!\n", BusDataType, BusNumber, SlotNumber, Buffer, Length); - /* Claim that there is no such bus */ - return 0; -} - -ULONG WINAPI HalGetBusDataByOffset(BUS_DATA_TYPE BusDataType, ULONG BusNumber, ULONG SlotNumber, PVOID Buffer, ULONG Offset, ULONG Length) -{ - FIXME("(%u %u %u %p %u %u) stub!\n", BusDataType, BusNumber, SlotNumber, Buffer, Offset, Length); - /* Claim that there is no such bus */ - return 0; -} - -BOOLEAN WINAPI HalTranslateBusAddress(INTERFACE_TYPE InterfaceType, ULONG BusNumber, PHYSICAL_ADDRESS BusAddress, - PULONG AddressSpace, PPHYSICAL_ADDRESS TranslatedAddress) -{ - FIXME("(%d %d %s %p %p) stub!\n", InterfaceType, BusNumber, - wine_dbgstr_longlong(BusAddress.QuadPart), AddressSpace, TranslatedAddress); - return FALSE; -} - KIRQL WINAPI KeGetCurrentIrql(VOID) { FIXME( " stub!\n"); @@ -177,6 +133,29 @@ void WINAPI WRITE_PORT_ULONG(ULONG *port, ULONG value) { FIXME("(%p %d) stub!\n", port, value); } +#endif /* __i386__ || __arm__ || __arm64__ */ + +ULONG WINAPI HalGetBusData(BUS_DATA_TYPE BusDataType, ULONG BusNumber, ULONG SlotNumber, PVOID Buffer, ULONG Length) +{ + FIXME("(%u %u %u %p %u) stub!\n", BusDataType, BusNumber, SlotNumber, Buffer, Length); + /* Claim that there is no such bus */ + return 0; +} + +ULONG WINAPI HalGetBusDataByOffset(BUS_DATA_TYPE BusDataType, ULONG BusNumber, ULONG SlotNumber, PVOID Buffer, ULONG Offset, ULONG Length) +{ + FIXME("(%u %u %u %p %u %u) stub!\n", BusDataType, BusNumber, SlotNumber, Buffer, Offset, Length); + /* Claim that there is no such bus */ + return 0; +} + +BOOLEAN WINAPI HalTranslateBusAddress(INTERFACE_TYPE InterfaceType, ULONG BusNumber, PHYSICAL_ADDRESS BusAddress, + PULONG AddressSpace, PPHYSICAL_ADDRESS TranslatedAddress) +{ + FIXME("(%d %d %s %p %p) stub!\n", InterfaceType, BusNumber, + wine_dbgstr_longlong(BusAddress.QuadPart), AddressSpace, TranslatedAddress); + return FALSE; +} ULONGLONG WINAPI KeQueryPerformanceCounter(LARGE_INTEGER *frequency) { diff --git a/dlls/hal/hal.spec b/dlls/hal/hal.spec index 5dc3fa8..818e56c 100644 --- a/dlls/hal/hal.spec +++ b/dlls/hal/hal.spec @@ -1,6 +1,6 @@ -@ stdcall -norelay ExAcquireFastMutex(ptr) -@ stdcall -norelay ExReleaseFastMutex(ptr) -@ stdcall -norelay ExTryToAcquireFastMutex(ptr) +@ stdcall -arch=i386 -norelay ExAcquireFastMutex(ptr) +@ stdcall -arch=i386 -norelay ExReleaseFastMutex(ptr) +@ stdcall -arch=i386 -norelay ExTryToAcquireFastMutex(ptr) @ stub HalClearSoftwareInterrupt @ stub HalRequestSoftwareInterrupt @ stub HalSystemVectorDispatchEntry @@ -13,10 +13,10 @@ @ stub KeReleaseQueuedSpinLock @ stub KeTryToAcquireQueuedSpinLock @ stub KeTryToAcquireQueuedSpinLockRaiseToSynch -@ stdcall -norelay KfAcquireSpinLock(ptr) -@ stdcall -norelay KfLowerIrql(long) -@ stdcall -norelay KfRaiseIrql(long) -@ stdcall -norelay KfReleaseSpinLock(ptr long) +@ stdcall -arch=i386 -norelay KfAcquireSpinLock(ptr) +@ stdcall -arch=arm,arm64,i386 -norelay KfLowerIrql(long) +@ stdcall -arch=arm,arm64,i386 -norelay KfRaiseIrql(long) +@ stdcall -arch=i386 -norelay KfReleaseSpinLock(ptr long) @ stub HalAcquireDisplayOwnership @ stub HalAdjustResourceList @ stub HalAllProcessorsStarted @@ -70,23 +70,23 @@ @ stub KdComPortInUse @ stub KeAcquireSpinLock @ stub KeFlushWriteBuffer -@ stdcall KeGetCurrentIrql() +@ stdcall -arch=arm,arm64,i386 KeGetCurrentIrql() @ stub KeLowerIrql @ stdcall -ret64 KeQueryPerformanceCounter(ptr) @ stub KeRaiseIrql @ stub KeRaiseIrqlToDpcLevel @ stub KeRaiseIrqlToSynchLevel -@ stdcall KeReleaseSpinLock(ptr long) ntoskrnl.exe.KeReleaseSpinLock +@ stdcall -arch=i386 KeReleaseSpinLock(ptr long) ntoskrnl.exe.KeReleaseSpinLock @ stub KeStallExecutionProcessor @ stub READ_PORT_BUFFER_UCHAR @ stub READ_PORT_BUFFER_ULONG @ stub READ_PORT_BUFFER_USHORT -@ stdcall READ_PORT_UCHAR(ptr) -@ stdcall READ_PORT_ULONG(ptr) +@ stdcall -arch=arm,arm64,i386 READ_PORT_UCHAR(ptr) +@ stdcall -arch=arm,arm64,i386 READ_PORT_ULONG(ptr) @ stub READ_PORT_USHORT @ stub WRITE_PORT_BUFFER_UCHAR @ stub WRITE_PORT_BUFFER_ULONG @ stub WRITE_PORT_BUFFER_USHORT -@ stdcall WRITE_PORT_UCHAR(ptr long) -@ stdcall WRITE_PORT_ULONG(ptr long) +@ stdcall -arch=arm,arm64,i386 WRITE_PORT_UCHAR(ptr long) +@ stdcall -arch=arm,arm64,i386 WRITE_PORT_ULONG(ptr long) @ stub WRITE_PORT_USHORT

1 0

Zebediah Figura : ntoskrnl.exe: Implement KeInitializeSpinLock().
by Alexandre Julliard 24 Jan '19

24 Jan '19

Module: wine Branch: master Commit: 92b047e722b0b9bd783139b5bdd34c1d9a6478e4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=92b047e722b0b9bd783139b5… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jan 23 23:50:33 2019 -0600 ntoskrnl.exe: Implement KeInitializeSpinLock(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 8 -------- dlls/ntoskrnl.exe/sync.c | 9 +++++++++ include/ddk/wdm.h | 1 + 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index c46418e..06a1cbd 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2278,14 +2278,6 @@ PRKTHREAD WINAPI KeGetCurrentThread(void) } /*********************************************************************** - * KeInitializeSpinLock (NTOSKRNL.EXE.@) - */ -void WINAPI KeInitializeSpinLock( PKSPIN_LOCK SpinLock ) -{ - FIXME( "stub: %p\n", SpinLock ); -} - -/*********************************************************************** * KeInsertQueue (NTOSKRNL.EXE.@) */ LONG WINAPI KeInsertQueue(PRKQUEUE Queue, PLIST_ENTRY Entry) diff --git a/dlls/ntoskrnl.exe/sync.c b/dlls/ntoskrnl.exe/sync.c index da51ca0..bd58f33 100644 --- a/dlls/ntoskrnl.exe/sync.c +++ b/dlls/ntoskrnl.exe/sync.c @@ -373,3 +373,12 @@ NTSTATUS WINAPI KeDelayExecutionThread( KPROCESSOR_MODE mode, BOOLEAN alertable, TRACE("mode %d, alertable %u, timeout %p.\n", mode, alertable, timeout); return NtDelayExecution( alertable, timeout ); } + +/*********************************************************************** + * KeInitializeSpinLock (NTOSKRNL.EXE.@) + */ +void WINAPI KeInitializeSpinLock( KSPIN_LOCK *lock ) +{ + TRACE("lock %p.\n", lock); + *lock = 0; +} diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 077fec1..3aa1c8a 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1426,6 +1426,7 @@ PKTHREAD WINAPI KeGetCurrentThread(void); void WINAPI KeInitializeEvent(PRKEVENT,EVENT_TYPE,BOOLEAN); void WINAPI KeInitializeMutex(PRKMUTEX,ULONG); void WINAPI KeInitializeSemaphore(PRKSEMAPHORE,LONG,LONG); +void WINAPI KeInitializeSpinLock(KSPIN_LOCK*); void WINAPI KeInitializeTimerEx(PKTIMER,TIMER_TYPE); void WINAPI KeInitializeTimer(KTIMER*); void WINAPI KeQuerySystemTime(LARGE_INTEGER*);

1 0

Zebediah Figura : hal: Implement KeReleaseSpinLock().
by Alexandre Julliard 24 Jan '19

24 Jan '19

Module: wine Branch: master Commit: fa6f56b3614229baea6b42ebfd0453462df4306d URL: https://source.winehq.org/git/wine.git/?a=commit;h=fa6f56b3614229baea6b42eb… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jan 23 23:50:34 2019 -0600 hal: Implement KeReleaseSpinLock(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hal/hal.c | 11 +++++++++-- dlls/hal/hal.spec | 2 +- include/ddk/wdm.h | 1 + 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/hal/hal.c b/dlls/hal/hal.c index 5560d9b..924fd9e 100644 --- a/dlls/hal/hal.c +++ b/dlls/hal/hal.c @@ -26,6 +26,7 @@ #include "ntstatus.h" #define WIN32_NO_STATUS #include "windef.h" +#include "winbase.h" #include "winternl.h" #include "excpt.h" #include "ddk/ntddk.h" @@ -76,9 +77,15 @@ KIRQL WINAPI DECLSPEC_HIDDEN __regs_KfAcquireSpinLock(PKSPIN_LOCK SpinLock) } DEFINE_FASTCALL2_ENTRYPOINT( KfReleaseSpinLock ) -VOID WINAPI DECLSPEC_HIDDEN __regs_KfReleaseSpinLock(PKSPIN_LOCK SpinLock, KIRQL NewIrql) +void WINAPI DECLSPEC_HIDDEN __regs_KfReleaseSpinLock( KSPIN_LOCK *lock, KIRQL irql ) { - FIXME( "(%p %u) stub!\n", SpinLock, NewIrql ); + KeReleaseSpinLock( lock, irql ); +} + +void WINAPI KeReleaseSpinLock( KSPIN_LOCK *lock, KIRQL irql ) +{ + TRACE("lock %p, irql %u.\n", lock, irql); + InterlockedExchangePointer( (void **)lock, 0 ); } #endif /* __i386__ */ diff --git a/dlls/hal/hal.spec b/dlls/hal/hal.spec index 818e56c..8596052 100644 --- a/dlls/hal/hal.spec +++ b/dlls/hal/hal.spec @@ -76,7 +76,7 @@ @ stub KeRaiseIrql @ stub KeRaiseIrqlToDpcLevel @ stub KeRaiseIrqlToSynchLevel -@ stdcall -arch=i386 KeReleaseSpinLock(ptr long) ntoskrnl.exe.KeReleaseSpinLock +@ stdcall -arch=i386 KeReleaseSpinLock(ptr long) @ stub KeStallExecutionProcessor @ stub READ_PORT_BUFFER_UCHAR @ stub READ_PORT_BUFFER_ULONG diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 3aa1c8a..d964ecb 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1434,6 +1434,7 @@ void WINAPI KeQueryTickCount(LARGE_INTEGER*); ULONG WINAPI KeQueryTimeIncrement(void); LONG WINAPI KeReleaseMutex(PRKMUTEX,BOOLEAN); LONG WINAPI KeReleaseSemaphore(PRKSEMAPHORE,KPRIORITY,LONG,BOOLEAN); +void WINAPI KeReleaseSpinLock(KSPIN_LOCK*,KIRQL); LONG WINAPI KeResetEvent(PRKEVENT); LONG WINAPI KeSetEvent(PRKEVENT,KPRIORITY,BOOLEAN); KPRIORITY WINAPI KeSetPriorityThread(PKTHREAD,KPRIORITY);

1 0

Zebediah Figura : ntoskrnl.exe: Implement KeReleaseSpinLock().
by Alexandre Julliard 24 Jan '19

24 Jan '19

Module: wine Branch: master Commit: 55463d4aa8f09a4ff835464fe2c51e5e3788b04f URL: https://source.winehq.org/git/wine.git/?a=commit;h=55463d4aa8f09a4ff835464f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jan 23 23:50:35 2019 -0600 ntoskrnl.exe: Implement KeReleaseSpinLock(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 8 -------- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- dlls/ntoskrnl.exe/sync.c | 11 +++++++++++ 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 06a1cbd..dd822c0 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -3864,14 +3864,6 @@ KIRQL WINAPI KeAcquireSpinLockRaiseToDpc(KSPIN_LOCK *spinlock) } /*********************************************************************** - * KeReleaseSpinLock (NTOSKRNL.EXE.@) - */ -void WINAPI KeReleaseSpinLock( KSPIN_LOCK *spinlock, KIRQL irql ) -{ - FIXME( "stub: %p %u\n", spinlock, irql ); -} - -/*********************************************************************** * IoCreateNotificationEvent (NTOSKRNL.EXE.@) */ PKEVENT WINAPI IoCreateNotificationEvent(UNICODE_STRING *name, HANDLE *handle) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index a30459a..ed3e2c6 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -593,7 +593,7 @@ @ stub KeReleaseMutant @ stdcall KeReleaseMutex(ptr long) @ stdcall KeReleaseSemaphore(ptr long long long) -@ stdcall KeReleaseSpinLock(ptr long) +@ stdcall -arch=arm,arm64,x86_64 KeReleaseSpinLock(ptr long) @ stub KeReleaseSpinLockFromDpcLevel @ stub KeRemoveByKeyDeviceQueue @ stub KeRemoveByKeyDeviceQueueIfBusy diff --git a/dlls/ntoskrnl.exe/sync.c b/dlls/ntoskrnl.exe/sync.c index bd58f33..832b048 100644 --- a/dlls/ntoskrnl.exe/sync.c +++ b/dlls/ntoskrnl.exe/sync.c @@ -382,3 +382,14 @@ void WINAPI KeInitializeSpinLock( KSPIN_LOCK *lock ) TRACE("lock %p.\n", lock); *lock = 0; } + +#ifndef __i386__ +/*********************************************************************** + * KeReleaseSpinLock (NTOSKRNL.EXE.@) + */ +void WINAPI KeReleaseSpinLock( KSPIN_LOCK *lock, KIRQL irql ) +{ + TRACE("lock %p, irql %u.\n", lock, irql); + InterlockedExchangePointer( (void **)lock, 0 ); +} +#endif

1 0