February 2019 - Wine-Commits

Józef Kucia : vkd3d: Set object names for Vulkan compute pipelines.
by Alexandre Julliard Feb. 5, 2019

Feb. 5, 2019

Module: vkd3d Branch: master Commit: 257ac5c3a1cd03368cb7e196df02f9a341ca1869 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=257ac5c3a1cd03368cb7e19… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Feb 1 09:42:52 2019 +0100 vkd3d: Set object names for Vulkan compute pipelines. 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 | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index ba4c06b..5c7d303 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -1195,6 +1195,12 @@ static HRESULT STDMETHODCALLTYPE d3d12_pipeline_state_SetName(ID3D12PipelineStat TRACE("iface %p, name %s.\n", iface, debugstr_w(name, state->device->wchar_size)); + if (d3d12_pipeline_state_is_compute(state)) + { + return vkd3d_set_vk_object_name(state->device, (uint64_t)state->u.compute.vk_pipeline, + VK_DEBUG_REPORT_OBJECT_TYPE_PIPELINE_EXT, name); + } + return name ? S_OK : E_INVALIDARG; }

1 0

Zhiyi Zhang : vkd3d: Implement d3d12_command_queue_SetName().
by Alexandre Julliard Feb. 5, 2019

Feb. 5, 2019

Module: vkd3d Branch: master Commit: de88b33e4deb106af5296e21ac06e5b3f5343539 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=de88b33e4deb106af5296e2… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Feb 1 11:37:58 2019 +0800 vkd3d: Implement d3d12_command_queue_SetName(). Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/command.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index dd0d564..f334f9e 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -4549,10 +4549,21 @@ static HRESULT STDMETHODCALLTYPE d3d12_command_queue_SetPrivateDataInterface(ID3 static HRESULT STDMETHODCALLTYPE d3d12_command_queue_SetName(ID3D12CommandQueue *iface, const WCHAR *name) { struct d3d12_command_queue *command_queue = impl_from_ID3D12CommandQueue(iface); + VkQueue vk_queue; + HRESULT hr; - FIXME("iface %p, name %s stub!\n", iface, debugstr_w(name, command_queue->device->wchar_size)); + TRACE("iface %p, name %s.\n", iface, debugstr_w(name, command_queue->device->wchar_size)); - return E_NOTIMPL; + if (!(vk_queue = vkd3d_queue_acquire(command_queue->vkd3d_queue))) + { + ERR("Failed to acquire queue %p.\n", command_queue->vkd3d_queue); + return E_FAIL; + } + + hr = vkd3d_set_vk_object_name(command_queue->device, (uint64_t)(uintptr_t)vk_queue, + VK_DEBUG_REPORT_OBJECT_TYPE_QUEUE_EXT, name); + vkd3d_queue_release(command_queue->vkd3d_queue); + return hr; } static HRESULT STDMETHODCALLTYPE d3d12_command_queue_GetDevice(ID3D12CommandQueue *iface,

1 0

Józef Kucia : vkd3d: Add support for patch list primitive topology.
by Alexandre Julliard Feb. 5, 2019

Feb. 5, 2019

Module: vkd3d Branch: master Commit: c36688f1a35015dc7f5138bb94b5e970648de156 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=c36688f1a35015dc7f5138b… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Feb 1 09:42:49 2019 +0100 vkd3d: Add support for patch list primitive topology. 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/command.c | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index f334f9e..4002431 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -2929,6 +2929,39 @@ static enum VkPrimitiveTopology vk_topology_from_d3d12_topology(D3D12_PRIMITIVE_ return VK_PRIMITIVE_TOPOLOGY_TRIANGLE_LIST; case D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP: return VK_PRIMITIVE_TOPOLOGY_TRIANGLE_STRIP; + case D3D_PRIMITIVE_TOPOLOGY_1_CONTROL_POINT_PATCHLIST: + case D3D_PRIMITIVE_TOPOLOGY_2_CONTROL_POINT_PATCHLIST: + case D3D_PRIMITIVE_TOPOLOGY_3_CONTROL_POINT_PATCHLIST: + case D3D_PRIMITIVE_TOPOLOGY_4_CONTROL_POINT_PATCHLIST: + case D3D_PRIMITIVE_TOPOLOGY_5_CONTROL_POINT_PATCHLIST: + case D3D_PRIMITIVE_TOPOLOGY_6_CONTROL_POINT_PATCHLIST: + case D3D_PRIMITIVE_TOPOLOGY_7_CONTROL_POINT_PATCHLIST: + case D3D_PRIMITIVE_TOPOLOGY_8_CONTROL_POINT_PATCHLIST: + case D3D_PRIMITIVE_TOPOLOGY_9_CONTROL_POINT_PATCHLIST: + case D3D_PRIMITIVE_TOPOLOGY_10_CONTROL_POINT_PATCHLIST: + case D3D_PRIMITIVE_TOPOLOGY_11_CONTROL_POINT_PATCHLIST: + case D3D_PRIMITIVE_TOPOLOGY_12_CONTROL_POINT_PATCHLIST: + case D3D_PRIMITIVE_TOPOLOGY_13_CONTROL_POINT_PATCHLIST: + case D3D_PRIMITIVE_TOPOLOGY_14_CONTROL_POINT_PATCHLIST: + case D3D_PRIMITIVE_TOPOLOGY_15_CONTROL_POINT_PATCHLIST: + case D3D_PRIMITIVE_TOPOLOGY_16_CONTROL_POINT_PATCHLIST: + case D3D_PRIMITIVE_TOPOLOGY_17_CONTROL_POINT_PATCHLIST: + case D3D_PRIMITIVE_TOPOLOGY_18_CONTROL_POINT_PATCHLIST: + case D3D_PRIMITIVE_TOPOLOGY_19_CONTROL_POINT_PATCHLIST: + case D3D_PRIMITIVE_TOPOLOGY_20_CONTROL_POINT_PATCHLIST: + case D3D_PRIMITIVE_TOPOLOGY_21_CONTROL_POINT_PATCHLIST: + case D3D_PRIMITIVE_TOPOLOGY_22_CONTROL_POINT_PATCHLIST: + case D3D_PRIMITIVE_TOPOLOGY_23_CONTROL_POINT_PATCHLIST: + case D3D_PRIMITIVE_TOPOLOGY_24_CONTROL_POINT_PATCHLIST: + case D3D_PRIMITIVE_TOPOLOGY_25_CONTROL_POINT_PATCHLIST: + case D3D_PRIMITIVE_TOPOLOGY_26_CONTROL_POINT_PATCHLIST: + case D3D_PRIMITIVE_TOPOLOGY_27_CONTROL_POINT_PATCHLIST: + case D3D_PRIMITIVE_TOPOLOGY_28_CONTROL_POINT_PATCHLIST: + case D3D_PRIMITIVE_TOPOLOGY_29_CONTROL_POINT_PATCHLIST: + case D3D_PRIMITIVE_TOPOLOGY_30_CONTROL_POINT_PATCHLIST: + case D3D_PRIMITIVE_TOPOLOGY_31_CONTROL_POINT_PATCHLIST: + case D3D_PRIMITIVE_TOPOLOGY_32_CONTROL_POINT_PATCHLIST: + return VK_PRIMITIVE_TOPOLOGY_PATCH_LIST; default: FIXME("Unhandled primitive topology %#x.\n", topology); return VK_PRIMITIVE_TOPOLOGY_POINT_LIST;

1 0

Józef Kucia : vkd3d: Compile pipelines with tessellation state create info.
by Alexandre Julliard Feb. 5, 2019

Feb. 5, 2019

Module: vkd3d Branch: master Commit: 6a3c75d0d1d9788eb9f332c89cddd039245ed10d URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=6a3c75d0d1d9788eb9f332c… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Feb 1 09:42:50 2019 +0100 vkd3d: Compile pipelines with tessellation state create info. 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/command.c | 57 ++----------------------------- libs/vkd3d/state.c | 84 +++++++++++++++++++++++++++++++++++++++------- libs/vkd3d/vkd3d_private.h | 4 +-- 3 files changed, 76 insertions(+), 69 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=6a3c75d0d1d9788eb9f…

1 0

Józef Kucia : vkd3d-shader: Introduce vkd3d_spirv_build_op_access_chain1().
by Alexandre Julliard Feb. 5, 2019

Feb. 5, 2019

Module: vkd3d Branch: master Commit: 363beefa9bd5d958e6768697bdf29377191664eb URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=363beefa9bd5d958e676869… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Feb 1 09:42:48 2019 +0100 vkd3d-shader: Introduce vkd3d_spirv_build_op_access_chain1(). 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 | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index d0cbf56..0ece33c 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -1082,6 +1082,12 @@ static uint32_t vkd3d_spirv_build_op_access_chain(struct vkd3d_spirv_builder *bu SpvOpAccessChain, result_type, base_id, indexes, index_count); } +static uint32_t vkd3d_spirv_build_op_access_chain1(struct vkd3d_spirv_builder *builder, + uint32_t result_type, uint32_t base_id, uint32_t index) +{ + return vkd3d_spirv_build_op_access_chain(builder, result_type, base_id, &index, 1); +} + static uint32_t vkd3d_spirv_build_op_in_bounds_access_chain(struct vkd3d_spirv_builder *builder, uint32_t result_type, uint32_t base_id, uint32_t *indexes, uint32_t index_count) { @@ -6211,8 +6217,7 @@ static void vkd3d_dxbc_compiler_emit_ld_tgsm(struct vkd3d_dxbc_compiler *compile coordinate_id = vkd3d_spirv_build_op_iadd(builder, type_id, coordinate_id, vkd3d_dxbc_compiler_get_constant_uint(compiler, component_idx)); - ptr_id = vkd3d_spirv_build_op_access_chain(builder, ptr_type_id, - reg_info.id, &coordinate_id, 1); + ptr_id = vkd3d_spirv_build_op_access_chain1(builder, ptr_type_id, reg_info.id, coordinate_id); constituents[j++] = vkd3d_spirv_build_op_load(builder, type_id, ptr_id, SpvMemoryAccessMaskNone); } assert(dst->reg.data_type == VKD3D_DATA_UINT); @@ -6312,8 +6317,7 @@ static void vkd3d_dxbc_compiler_emit_store_tgsm(struct vkd3d_dxbc_compiler *comp coordinate_id = vkd3d_spirv_build_op_iadd(builder, type_id, coordinate_id, vkd3d_dxbc_compiler_get_constant_uint(compiler, component_idx)); - ptr_id = vkd3d_spirv_build_op_access_chain(builder, ptr_type_id, - reg_info.id, &coordinate_id, 1); + ptr_id = vkd3d_spirv_build_op_access_chain1(builder, ptr_type_id, reg_info.id, coordinate_id); vkd3d_spirv_build_op_store(builder, ptr_id, data_id, SpvMemoryAccessMaskNone); } } @@ -6536,8 +6540,7 @@ static void vkd3d_dxbc_compiler_emit_atomic_instruction(struct vkd3d_dxbc_compil { component_type = VKD3D_TYPE_UINT; ptr_type_id = vkd3d_spirv_get_op_type_pointer(builder, reg_info.storage_class, type_id); - pointer_id = vkd3d_spirv_build_op_access_chain(builder, ptr_type_id, - reg_info.id, &coordinate_id, 1); + pointer_id = vkd3d_spirv_build_op_access_chain1(builder, ptr_type_id, reg_info.id, coordinate_id); } else {

1 0

Zhiyi Zhang : vkd3d: Implement d3d12_command_list_SetName().
by Alexandre Julliard Feb. 5, 2019

Feb. 5, 2019

Module: vkd3d Branch: master Commit: be6ffa6b79b0d5dd1007549eae8fe3fb5704b267 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=be6ffa6b79b0d5dd1007549… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Feb 1 11:36:59 2019 +0800 vkd3d: Implement d3d12_command_list_SetName(). Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/command.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 9af1ec9..abee0e2 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -1694,9 +1694,9 @@ static HRESULT STDMETHODCALLTYPE d3d12_command_list_SetName(ID3D12GraphicsComman { struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList(iface); - FIXME("iface %p, name %s stub!\n", iface, debugstr_w(name, list->device->wchar_size)); + TRACE("iface %p, name %s.\n", iface, debugstr_w(name, list->device->wchar_size)); - return E_NOTIMPL; + return name ? S_OK : E_INVALIDARG; } static HRESULT STDMETHODCALLTYPE d3d12_command_list_GetDevice(ID3D12GraphicsCommandList *iface,

1 0

Zhiyi Zhang : vkd3d: Implement d3d12_device_SetName().
by Alexandre Julliard Feb. 5, 2019

Feb. 5, 2019

Module: vkd3d Branch: master Commit: bff7218091914e01a95a4d1286f7584232d43a60 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=bff7218091914e01a95a4d1… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Feb 1 11:29:17 2019 +0800 vkd3d: Implement d3d12_device_SetName(). Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/device.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 4b5f522..5265ec9 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -1564,9 +1564,10 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_SetName(ID3D12Device *iface, const { struct d3d12_device *device = impl_from_ID3D12Device(iface); - FIXME("iface %p, name %s stub!\n", iface, debugstr_w(name, device->wchar_size)); + TRACE("iface %p, name %s.\n", iface, debugstr_w(name, device->wchar_size)); - return E_NOTIMPL; + return vkd3d_set_vk_object_name(device, (uint64_t)(uintptr_t)device->vk_device, + VK_DEBUG_REPORT_OBJECT_TYPE_DEVICE_EXT, name); } static UINT STDMETHODCALLTYPE d3d12_device_GetNodeCount(ID3D12Device *iface)

1 0

Alexandre Julliard : Wine release 4.1
by Alexandre Julliard Feb. 4, 2019

Feb. 4, 2019

Module: website Branch: master Commit: 37e88b0c783d7bf70ce5b1774e3c9104a1c446ea URL: https://source.winehq.org/git/website.git/?a=commit;h=37e88b0c783d7bf70ce5b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 4 20:30:13 2019 +0100 Wine release 4.1 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2019020401.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/en/2019020401.xml b/news/en/2019020401.xml new file mode 100644 index 0000000..81a3abe --- /dev/null +++ b/news/en/2019020401.xml @@ -0,0 +1,17 @@ +<news> +<date>February 4, 2019</date> +<title>Wine 4.1 Released</title> +<body> + The Wine development release 4.1 is now available. + <a href="{$root}/announce/4.1">What's new</a> in this release: +<ul> + <li>Support for NT kernel spinlocks.</li> + <li>Better glyph positioning in DirectWrite.</li> + <li>More accurate reporting of CPU information.</li> + <li>Context handle fixes in the IDL compiler.</li> + <li>Preloader fixes on macOS.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/4.x/wine-4.1.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Jacek Caban : ntoskrnl.exe: Implement KeExpandKernelStackAndCallout and KeExpandKernelStackAndCalloutEx.
by Alexandre Julliard Feb. 4, 2019

Feb. 4, 2019

Module: wine Branch: master Commit: 5bfbcb735bd05a5df9a8d7e96d832b3c1205b45f URL: https://source.winehq.org/git/wine.git/?a=commit;h=5bfbcb735bd05a5df9a8d7e9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 1 16:28:16 2019 +0100 ntoskrnl.exe: Implement KeExpandKernelStackAndCallout and KeExpandKernelStackAndCalloutEx. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 19 +++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 + dlls/ntoskrnl.exe/tests/driver.c | 84 +++++++++++++++++++++++++++++++++++-- include/ddk/ntddk.h | 3 ++ 4 files changed, 105 insertions(+), 3 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 298247b..f21d6f7 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2308,6 +2308,25 @@ VOID WINAPI IoRegisterFileSystem(PDEVICE_OBJECT DeviceObject) } /*********************************************************************** + * KeExpandKernelStackAndCalloutEx (NTOSKRNL.EXE.@) + */ +NTSTATUS WINAPI KeExpandKernelStackAndCalloutEx(PEXPAND_STACK_CALLOUT callout, void *parameter, SIZE_T size, + BOOLEAN wait, void *context) +{ + WARN("(%p %p %lu %x %p) semi-stub: ignoring stack expand\n", callout, parameter, size, wait, context); + callout(parameter); + return STATUS_SUCCESS; +} + +/*********************************************************************** + * KeExpandKernelStackAndCallout (NTOSKRNL.EXE.@) + */ +NTSTATUS WINAPI KeExpandKernelStackAndCallout(PEXPAND_STACK_CALLOUT callout, void *parameter, SIZE_T size) +{ + return KeExpandKernelStackAndCalloutEx(callout, parameter, size, TRUE, NULL); +} + +/*********************************************************************** * IoUnregisterFileSystem (NTOSKRNL.EXE.@) */ VOID WINAPI IoUnregisterFileSystem(PDEVICE_OBJECT DeviceObject) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index df2f15b..40f5b27 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -44,6 +44,8 @@ @ stdcall -arch=arm,arm64,x86_64 KeAcquireInStackQueuedSpinLock(ptr ptr) @ stdcall -norelay KeAcquireInStackQueuedSpinLockAtDpcLevel(ptr ptr) @ stdcall KeEnterGuardedRegion() +@ stdcall KeExpandKernelStackAndCallout(ptr ptr long) +@ stdcall KeExpandKernelStackAndCalloutEx(ptr ptr long long ptr) @ stdcall KeLeaveGuardedRegion() @ stdcall -arch=arm,arm64,x86_64 KeReleaseInStackQueuedSpinLock(ptr) @ stdcall -norelay KeReleaseInStackQueuedSpinLockFromDpcLevel(ptr) diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index 5c34b41..cbf8bdc 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -28,6 +28,7 @@ #include "winbase.h" #include "winternl.h" #include "winioctl.h" +#include "ddk/ntddk.h" #include "ddk/wdm.h" #include "driver.h" @@ -68,10 +69,9 @@ static void WINAPIV kprintf(const char *format, ...) __ms_va_end(valist); } -static void WINAPIV ok_(const char *file, int line, int condition, const char *msg, ...) +static void WINAPIV vok_(const char *file, int line, int condition, const char *msg, __ms_va_list args) { const char *current_file; - __ms_va_list args; if (!(current_file = drv_strrchr(file, '/')) && !(current_file = drv_strrchr(file, '\\'))) @@ -79,7 +79,6 @@ static void WINAPIV ok_(const char *file, int line, int condition, const char *m else current_file++; - __ms_va_start(args, msg); if (todo_level) { if (condition) @@ -113,6 +112,39 @@ static void WINAPIV ok_(const char *file, int line, int condition, const char *m InterlockedIncrement(&successes); } } +} + +static void WINAPIV ok_(const char *file, int line, int condition, const char *msg, ...) +{ + __ms_va_list args; + __ms_va_start(args, msg); + vok_(file, line, condition, msg, args); + __ms_va_end(args); +} + +void vskip_(const char *file, int line, const char *msg, __ms_va_list args) +{ + const char *current_file; + + if (!(current_file = drv_strrchr(file, '/')) && + !(current_file = drv_strrchr(file, '\\'))) + current_file = file; + else + current_file++; + + kprintf("%s:%d: Tests skipped: ", current_file, line); + kvprintf(msg, args); + skipped++; +} + +void WINAPIV win_skip_(const char *file, int line, const char *msg, ...) +{ + __ms_va_list args; + __ms_va_start(args, msg); + if (running_under_wine) + vok_(file, line, 0, msg, args); + else + vskip_(file, line, msg, args); __ms_va_end(args); } @@ -140,6 +172,7 @@ static void winetest_end_todo(void) winetest_end_todo()) #define todo_wine todo_if(running_under_wine) #define todo_wine_if(is_todo) todo_if((is_todo) && running_under_wine) +#define win_skip(...) win_skip_(__FILE__, __LINE__, __VA_ARGS__) static void test_currentprocess(void) { @@ -498,6 +531,50 @@ static void test_sync(void) KeCancelTimer(&timer); } +static int callout_cnt; + +static void WINAPI callout(void *parameter) +{ + ok(parameter == (void*)0xdeadbeef, "parameter = %p\n", parameter); + callout_cnt++; +} + +static void test_stack_callout(void) +{ + NTSTATUS (WINAPI *pKeExpandKernelStackAndCallout)(PEXPAND_STACK_CALLOUT,void*,SIZE_T); + NTSTATUS (WINAPI *pKeExpandKernelStackAndCalloutEx)(PEXPAND_STACK_CALLOUT,void*,SIZE_T,BOOLEAN,void*); + UNICODE_STRING str; + NTSTATUS ret; + + static const WCHAR KeExpandKernelStackAndCalloutW[] = + {'K','e','E','x','p','a','n','d','K','e','r','n','e','l','S','t','a','c','k','A','n','d','C','a','l','l','o','u','t',0}; + static const WCHAR KeExpandKernelStackAndCalloutExW[] = + {'K','e','E','x','p','a','n','d','K','e','r','n','e','l','S','t','a','c','k','A','n','d','C','a','l','l','o','u','t','E','x',0}; + + + RtlInitUnicodeString(&str, KeExpandKernelStackAndCalloutW); + pKeExpandKernelStackAndCallout = MmGetSystemRoutineAddress(&str); + if (pKeExpandKernelStackAndCallout) + { + callout_cnt = 0; + ret = pKeExpandKernelStackAndCallout(callout, (void*)0xdeadbeef, 4096); + ok(ret == STATUS_SUCCESS, "KeExpandKernelStackAndCallout failed: %#x\n", ret); + ok(callout_cnt == 1, "callout_cnt = %u\n", callout_cnt); + } + else win_skip("KeExpandKernelStackAndCallout is not available\n"); + + RtlInitUnicodeString(&str, KeExpandKernelStackAndCalloutExW); + pKeExpandKernelStackAndCalloutEx = MmGetSystemRoutineAddress(&str); + if (pKeExpandKernelStackAndCalloutEx) + { + callout_cnt = 0; + ret = pKeExpandKernelStackAndCalloutEx(callout, (void*)0xdeadbeef, 4096, FALSE, NULL); + ok(ret == STATUS_SUCCESS, "KeExpandKernelStackAndCalloutEx failed: %#x\n", ret); + ok(callout_cnt == 1, "callout_cnt = %u\n", callout_cnt); + } + else win_skip("KeExpandKernelStackAndCalloutEx is not available\n"); +} + static NTSTATUS main_test(IRP *irp, IO_STACK_LOCATION *stack, ULONG_PTR *info) { ULONG length = stack->Parameters.DeviceIoControl.OutputBufferLength; @@ -527,6 +604,7 @@ static NTSTATUS main_test(IRP *irp, IO_STACK_LOCATION *stack, ULONG_PTR *info) test_init_funcs(); test_load_driver(); test_sync(); + test_stack_callout(); /* print process report */ if (test_input->winetest_debug) diff --git a/include/ddk/ntddk.h b/include/ddk/ntddk.h index dc051e1..452e510 100644 --- a/include/ddk/ntddk.h +++ b/include/ddk/ntddk.h @@ -200,11 +200,14 @@ typedef VOID (WINAPI *PDRIVER_REINITIALIZE)(PDRIVER_OBJECT,PVOID,ULONG); typedef VOID (WINAPI *PLOAD_IMAGE_NOTIFY_ROUTINE)(PUNICODE_STRING,HANDLE,PIMAGE_INFO); typedef NTSTATUS (WINAPI *PIO_QUERY_DEVICE_ROUTINE)(PVOID,PUNICODE_STRING,INTERFACE_TYPE,ULONG, PKEY_VALUE_FULL_INFORMATION*,CONFIGURATION_TYPE,ULONG,PKEY_VALUE_FULL_INFORMATION*); +typedef void (NTAPI EXPAND_STACK_CALLOUT)(void*); +typedef EXPAND_STACK_CALLOUT *PEXPAND_STACK_CALLOUT; NTSTATUS WINAPI IoQueryDeviceDescription(PINTERFACE_TYPE,PULONG,PCONFIGURATION_TYPE,PULONG, PCONFIGURATION_TYPE,PULONG,PIO_QUERY_DEVICE_ROUTINE,PVOID); void WINAPI IoRegisterDriverReinitialization(PDRIVER_OBJECT,PDRIVER_REINITIALIZE,PVOID); NTSTATUS WINAPI IoRegisterShutdownNotification(PDEVICE_OBJECT); +NTSTATUS WINAPI KeExpandKernelStackAndCallout(PEXPAND_STACK_CALLOUT,void*,SIZE_T); void WINAPI KeSetTargetProcessorDpc(PRKDPC,CCHAR); BOOLEAN WINAPI MmIsAddressValid(void *); NTSTATUS WINAPI PsSetLoadImageNotifyRoutine(PLOAD_IMAGE_NOTIFY_ROUTINE);

1 0

Hans Leidekker : crypt32: Add support for PFX objects in CryptQueryObject.
by Alexandre Julliard Feb. 4, 2019

Feb. 4, 2019

Module: wine Branch: master Commit: 962aed51205d9ee8245904a107d79b6c5aa3cdb5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=962aed51205d9ee8245904a1… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Feb 1 15:30:31 2019 +0100 crypt32: Add support for PFX objects in CryptQueryObject. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/object.c | 53 ++++++++++++++++++++++++++++++++++++++++++++-- dlls/crypt32/tests/store.c | 34 +++++++++++++++++++++++++++++ 2 files changed, 85 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/object.c b/dlls/crypt32/object.c index 3dc28af..1993a0a 100644 --- a/dlls/crypt32/object.c +++ b/dlls/crypt32/object.c @@ -696,6 +696,48 @@ static BOOL CRYPT_QueryEmbeddedMessageObject(DWORD dwObjectType, return ret; } +static BOOL CRYPT_QueryPFXObject(DWORD dwObjectType, const void *pvObject, + DWORD dwExpectedContentTypeFlags, DWORD dwExpectedFormatTypeFlags, + DWORD *pdwMsgAndCertEncodingType, DWORD *pdwContentType, DWORD *pdwFormatType, + HCERTSTORE *phCertStore, HCRYPTMSG *phMsg) +{ + CRYPT_DATA_BLOB blob = {0}, *ptr; + BOOL ret; + + TRACE("(%d, %p, %08x, %08x, %p, %p, %p, %p, %p)\n", dwObjectType, pvObject, + dwExpectedContentTypeFlags, dwExpectedFormatTypeFlags, + pdwMsgAndCertEncodingType, pdwContentType, pdwFormatType, phCertStore, + phMsg); + + switch (dwObjectType) + { + case CERT_QUERY_OBJECT_FILE: + if (!CRYPT_ReadBlobFromFile(pvObject, &blob)) return FALSE; + ptr = &blob; + break; + + case CERT_QUERY_OBJECT_BLOB: + ptr = (CRYPT_DATA_BLOB *)pvObject; + break; + + default: + return FALSE; + } + + ret = PFXIsPFXBlob(ptr); + if (ret) + { + if (pdwMsgAndCertEncodingType) *pdwMsgAndCertEncodingType = X509_ASN_ENCODING; + if (pdwContentType) *pdwContentType = CERT_QUERY_CONTENT_PFX; + if (pdwFormatType) *pdwFormatType = CERT_QUERY_FORMAT_BINARY; + if (phCertStore) *phCertStore = NULL; + if (phMsg) *phMsg = NULL; + } + + CryptMemFree(blob.pbData); + return ret; +} + BOOL WINAPI CryptQueryObject(DWORD dwObjectType, const void *pvObject, DWORD dwExpectedContentTypeFlags, DWORD dwExpectedFormatTypeFlags, DWORD dwFlags, DWORD *pdwMsgAndCertEncodingType, DWORD *pdwContentType, @@ -703,8 +745,7 @@ BOOL WINAPI CryptQueryObject(DWORD dwObjectType, const void *pvObject, const void **ppvContext) { static const DWORD unimplementedTypes = - CERT_QUERY_CONTENT_FLAG_PKCS10 | CERT_QUERY_CONTENT_FLAG_PFX | - CERT_QUERY_CONTENT_FLAG_CERT_PAIR; + CERT_QUERY_CONTENT_FLAG_PKCS10 | CERT_QUERY_CONTENT_FLAG_CERT_PAIR; BOOL ret = TRUE; TRACE("(%08x, %p, %08x, %08x, %08x, %p, %p, %p, %p, %p, %p)\n", @@ -779,6 +820,14 @@ BOOL WINAPI CryptQueryObject(DWORD dwObjectType, const void *pvObject, dwExpectedContentTypeFlags, pdwMsgAndCertEncodingType, pdwContentType, phCertStore, phMsg); } + if (!ret && + (dwExpectedContentTypeFlags & CERT_QUERY_CONTENT_FLAG_PFX)) + { + ret = CRYPT_QueryPFXObject(dwObjectType, pvObject, + dwExpectedContentTypeFlags, dwExpectedFormatTypeFlags, + pdwMsgAndCertEncodingType, pdwContentType, pdwFormatType, + phCertStore, phMsg); + } if (!ret) SetLastError(CRYPT_E_NO_MATCH); TRACE("returning %d\n", ret); diff --git a/dlls/crypt32/tests/store.c b/dlls/crypt32/tests/store.c index b13fee6..f3fb420 100644 --- a/dlls/crypt32/tests/store.c +++ b/dlls/crypt32/tests/store.c @@ -3326,6 +3326,39 @@ static void test_PFXImportCertStore(void) CertCloseStore( store, 0 ); } +static void test_CryptQueryObject(void) +{ + CRYPT_DATA_BLOB pfx; + DWORD encoding_type, content_type, format_type; + HCERTSTORE store; + HCRYPTMSG msg; + const void *ctx; + BOOL ret; + + SetLastError( 0xdeadbeef ); + ret = CryptQueryObject( CERT_QUERY_OBJECT_BLOB, NULL, CERT_QUERY_CONTENT_FLAG_ALL, + CERT_QUERY_FORMAT_FLAG_BINARY, 0, NULL, NULL, NULL, NULL, NULL, NULL ); + ok( !ret, "success\n" ); + ok( GetLastError() == E_INVALIDARG, "got %u\n", GetLastError() ); + + pfx.pbData = (BYTE *)pfxdata; + pfx.cbData = sizeof(pfxdata); + encoding_type = content_type = format_type = 0xdeadbeef; + store = (HCERTSTORE *)0xdeadbeef; + msg = (HCRYPTMSG *)0xdeadbeef; + ctx = (void *)0xdeadbeef; + ret = CryptQueryObject( CERT_QUERY_OBJECT_BLOB, &pfx, CERT_QUERY_CONTENT_FLAG_ALL, + CERT_QUERY_FORMAT_FLAG_BINARY, 0, &encoding_type, &content_type, &format_type, + &store, &msg, &ctx ); + ok( ret, "got %u\n", GetLastError() ); + ok( encoding_type == X509_ASN_ENCODING, "got %08x\n", encoding_type ); + ok( content_type == CERT_QUERY_CONTENT_PFX, "got %08x\n", content_type ); + ok( format_type == CERT_QUERY_FORMAT_BINARY, "got %08x\n", format_type ); + ok( store == NULL, "got %p\n", store ); + ok( msg == NULL, "got %p\n", msg ); + ok( ctx == NULL, "got %p\n", ctx ); +} + START_TEST(store) { /* various combinations of CertOpenStore */ @@ -3357,4 +3390,5 @@ START_TEST(store) test_I_UpdateStore(); test_PFXImportCertStore(); + test_CryptQueryObject(); }

1 0