February 2019 - Wine-commits

Józef Kucia : vkd3d-shader: Introduce vkd3d_spirv_build_op_access_chain1().
by Alexandre Julliard 05 Feb '19

05 Feb '19

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

Józef Kucia : vkd3d: Add support for patch list primitive topology.
by Alexandre Julliard 05 Feb '19

05 Feb '19

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 05 Feb '19

05 Feb '19

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-common: Fix vkd3d_strdup_{w16, w32}_utf8() functions.
by Alexandre Julliard 05 Feb '19

05 Feb '19

Module: vkd3d Branch: master Commit: 0055aa67f155d1f50b7b6c647e909b436289f807 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=0055aa67f155d1f50b7b6c6… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Feb 1 09:42:51 2019 +0100 vkd3d-common: Fix vkd3d_strdup_{w16, w32}_utf8() functions. 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-common/utf8.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/libs/vkd3d-common/utf8.c b/libs/vkd3d-common/utf8.c index e48316d..8bf4eb0 100644 --- a/libs/vkd3d-common/utf8.c +++ b/libs/vkd3d-common/utf8.c @@ -107,8 +107,8 @@ static char *vkd3d_strdup_w16_utf8(const uint16_t *wstr) { const uint16_t *src = wstr; size_t dst_size = 0; + char *dst, *utf8; uint32_t c; - char *dst; while (*src) { @@ -121,14 +121,15 @@ static char *vkd3d_strdup_w16_utf8(const uint16_t *wstr) if (!(dst = vkd3d_malloc(dst_size))) return NULL; + utf8 = dst; src = wstr; while (*src) { if (!(c = vkd3d_utf16_read(&src))) continue; - vkd3d_utf8_append(&dst, c); + vkd3d_utf8_append(&utf8, c); } - *dst = 0; + *utf8 = 0; return dst; } @@ -137,7 +138,7 @@ static char *vkd3d_strdup_w32_utf8(const uint32_t *wstr) { const uint32_t *src = wstr; size_t dst_size = 0; - char *dst; + char *dst, *utf8; while (*src) dst_size += vkd3d_utf8_len(*src++); @@ -146,10 +147,11 @@ static char *vkd3d_strdup_w32_utf8(const uint32_t *wstr) if (!(dst = vkd3d_malloc(dst_size))) return NULL; + utf8 = dst; src = wstr; while (*src) - vkd3d_utf8_append(&dst, *src++); - *dst = 0; + vkd3d_utf8_append(&utf8, *src++); + *utf8 = 0; return dst; }

1 0

Józef Kucia : vkd3d: Set object names for Vulkan compute pipelines.
by Alexandre Julliard 05 Feb '19

05 Feb '19

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_device_SetName().
by Alexandre Julliard 05 Feb '19

05 Feb '19

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

Zhiyi Zhang : vkd3d: Implement d3d12_command_list_SetName().
by Alexandre Julliard 05 Feb '19

05 Feb '19

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

Alexandre Julliard : Wine release 4.1
by Alexandre Julliard 04 Feb '19

04 Feb '19

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

Alistair Leslie-Hughes : uiautomationcore: Update spec file.
by Alexandre Julliard 04 Feb '19

04 Feb '19

Module: wine Branch: master Commit: f6738761c3f7a076c39c2a48a9804265258cd0d1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f6738761c3f7a076c39c2a48… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Jan 31 23:12:57 2019 +0000 uiautomationcore: Update spec file. File version: 7.2.16299.15 (windows 10). Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uiautomationcore/uiautomationcore.spec | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/dlls/uiautomationcore/uiautomationcore.spec b/dlls/uiautomationcore/uiautomationcore.spec index 48a06b2..28eefc9 100644 --- a/dlls/uiautomationcore/uiautomationcore.spec +++ b/dlls/uiautomationcore/uiautomationcore.spec @@ -6,6 +6,7 @@ @ stub ExpandCollapsePattern_Collapse @ stub ExpandCollapsePattern_Expand @ stub GridPattern_GetItem +#@ stub IgnoreLeaksInCurrentlyTrackedMemory @ stub InvokePattern_Invoke @ stub ItemContainerPattern_FindItemByProperty @ stub LegacyIAccessiblePattern_DoDefaultAction @@ -14,6 +15,7 @@ @ stub LegacyIAccessiblePattern_SetValue @ stub MultipleViewPattern_GetViewName @ stub MultipleViewPattern_SetCurrentView +#@ stub PostTestCheckForLeaks @ stub RangeValuePattern_SetValue @ stub ScrollItemPattern_ScrollIntoView @ stub ScrollPattern_Scroll @@ -53,6 +55,8 @@ @ stub TransformPattern_Rotate @ stub UiaAddEvent @ stdcall UiaClientsAreListening() +#@ stub UiaDisconnectAllProviders +#@ stub UiaDisconnectProvider @ stub UiaEventAddWindow @ stub UiaEventRemoveWindow @ stub UiaFind @@ -69,6 +73,7 @@ @ stub UiaHUiaNodeFromVariant @ stub UiaHasServerSideProvider @ stub UiaHostProviderFromHwnd +#@ stub UiaIAccessibleFromProvider @ stdcall UiaLookupId(long ptr) @ stub UiaNavigate @ stub UiaNodeFromFocus @@ -77,15 +82,21 @@ @ stub UiaNodeFromProvider @ stub UiaNodeRelease @ stub UiaPatternRelease +#@ stub UiaProviderForNonClient +#@ stub UiaProviderFromIAccessible @ stub UiaRaiseAsyncContentLoadedEvent @ stdcall UiaRaiseAutomationEvent(ptr long) @ stub UiaRaiseAutomationPropertyChangedEvent +#@ stub UiaRaiseChangesEvent +#@ stub UiaRaiseNotificationEvent @ stub UiaRaiseStructureChangedEvent +#@ stub UiaRaiseTextEditTextChangedEvent @ stub UiaRegisterProviderCallback @ stub UiaRemoveEvent @ stdcall UiaReturnRawElementProvider(long long long ptr) @ stub UiaSetFocus @ stub UiaTextRangeRelease +#@ stub UpdateErrorLoggingCallback @ stub ValuePattern_SetValue @ stub VirtualizedItemPattern_Realize @ stub WindowPattern_Close

1 0

Hans Leidekker : secur32: Ignore spurious callbacks on macOS.
by Alexandre Julliard 04 Feb '19

04 Feb '19

Module: wine Branch: master Commit: 4782b283d8eddf315773bbde3e2857b1e31c7dd1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4782b283d8eddf315773bbde… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Feb 1 11:09:50 2019 +0100 secur32: Ignore spurious callbacks on macOS. For unknown reasons Mojave will sometimes call the schan_push_adapter callback during an SSLRead call. This confuses our code which is only prepared to handle schan_pull_adapter callbacks in this context. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/schannel_macosx.c | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/dlls/secur32/schannel_macosx.c b/dlls/secur32/schannel_macosx.c index bd080dc..29d2f65 100644 --- a/dlls/secur32/schannel_macosx.c +++ b/dlls/secur32/schannel_macosx.c @@ -181,10 +181,17 @@ enum { }; #endif +enum schan_mode { + schan_mode_NONE, + schan_mode_READ, + schan_mode_WRITE, + schan_mode_HANDSHAKE, +}; struct mac_session { SSLContextRef context; struct schan_transport *transport; + enum schan_mode mode; CRITICAL_SECTION cs; }; @@ -634,6 +641,12 @@ static OSStatus schan_pull_adapter(SSLConnectionRef transport, void *buff, TRACE("(%p/%p, %p, %p/%lu)\n", s, s->transport, buff, buff_len, *buff_len); + if (s->mode != schan_mode_READ && s->mode != schan_mode_HANDSHAKE) + { + WARN("called in mode %u\n", s->mode); + return noErr; + } + status = schan_pull(s->transport, buff, buff_len); if (status == 0) { @@ -693,6 +706,12 @@ static OSStatus schan_push_adapter(SSLConnectionRef transport, const void *buff, TRACE("(%p/%p, %p, %p/%lu)\n", s, s->transport, buff, buff_len, *buff_len); + if (s->mode != schan_mode_WRITE && s->mode != schan_mode_HANDSHAKE) + { + WARN("called in mode %u\n", s->mode); + return noErr; + } + status = schan_push(s->transport, buff, buff_len); if (status == 0) { @@ -787,6 +806,8 @@ BOOL schan_imp_create_session(schan_imp_session *session, schan_credentials *cre goto fail; } + s->mode = schan_mode_NONE; + TRACE(" -> %p/%p\n", s, s->context); *session = (schan_imp_session)s; @@ -837,7 +858,10 @@ SECURITY_STATUS schan_imp_handshake(schan_imp_session session) TRACE("(%p/%p)\n", s, s->context); + s->mode = schan_mode_HANDSHAKE; status = SSLHandshake(s->context); + s->mode = schan_mode_NONE; + if (status == noErr) { TRACE("Handshake completed\n"); @@ -1096,8 +1120,13 @@ SECURITY_STATUS schan_imp_send(schan_imp_session session, const void *buffer, TRACE("(%p/%p, %p, %p/%lu)\n", s, s->context, buffer, length, *length); EnterCriticalSection(&s->cs); + s->mode = schan_mode_WRITE; + status = SSLWrite(s->context, buffer, *length, length); + + s->mode = schan_mode_NONE; LeaveCriticalSection(&s->cs); + if (status == noErr) TRACE("Wrote %lu bytes\n", *length); else if (status == errSSLWouldBlock) @@ -1128,8 +1157,13 @@ SECURITY_STATUS schan_imp_recv(schan_imp_session session, void *buffer, TRACE("(%p/%p, %p, %p/%lu)\n", s, s->context, buffer, length, *length); EnterCriticalSection(&s->cs); + s->mode = schan_mode_READ; + status = SSLRead(s->context, buffer, *length, length); + + s->mode = schan_mode_NONE; LeaveCriticalSection(&s->cs); + if (status == noErr || status == errSSLClosedGraceful) TRACE("Read %lu bytes\n", *length); else if (status == errSSLWouldBlock)

1 0