October 2023 - Wine-Commits

Nikolay Sivov : d3d10/tests: Compact returned arrays checks.
by Alexandre Julliard Oct. 3, 2023

Oct. 3, 2023

Module: wine Branch: master Commit: 2043ffa083fba31408c06d72bb414e2c627baed2 URL: https://gitlab.winehq.org/wine/wine/-/commit/2043ffa083fba31408c06d72bb414e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Sep 29 12:37:52 2023 +0200 d3d10/tests: Compact returned arrays checks. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3d10/tests/effect.c | 98 ++++++++++++++++------------------------------- 1 file changed, 34 insertions(+), 64 deletions(-)

1 0

Nikolay Sivov : d3d10/effect: Add support for 'buge'/'bult' instructions.
by Alexandre Julliard Oct. 3, 2023

Oct. 3, 2023

Module: wine Branch: master Commit: fdc0f3771429b497fc1df2a9e45c16a600c3564a URL: https://gitlab.winehq.org/wine/wine/-/commit/fdc0f3771429b497fc1df2a9e45c16… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Sep 29 12:26:05 2023 +0200 d3d10/effect: Add support for 'buge'/'bult' instructions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3d10/effect.c | 30 +++++++++ dlls/d3d10/tests/effect.c | 162 ++++++++++++++++++++++++++++++++-------------- 2 files changed, 142 insertions(+), 50 deletions(-)

1 0

Gabriel Ivăncescu : mshtml: Traverse EventTarget listeners.
by Alexandre Julliard Oct. 3, 2023

Oct. 3, 2023

Module: wine Branch: master Commit: 35a6c314d4cf5098ed61aa8da43b146ba2d0bd16 URL: https://gitlab.winehq.org/wine/wine/-/commit/35a6c314d4cf5098ed61aa8da43b14… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Oct 2 21:39:22 2023 +0300 mshtml: Traverse EventTarget listeners. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlevent.c | 11 +++++++++++ dlls/mshtml/htmlevent.h | 1 + dlls/mshtml/htmlnode.c | 1 + dlls/mshtml/htmlwindow.c | 1 + dlls/mshtml/xmlhttprequest.c | 1 + 5 files changed, 15 insertions(+) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 800ec30cbad..d6ad65b1d0b 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -4587,6 +4587,17 @@ void EventTarget_Init(EventTarget *event_target, dispex_static_data_t *dispex_da wine_rb_init(&event_target->handler_map, event_id_cmp); } +void traverse_event_target(EventTarget *event_target, nsCycleCollectionTraversalCallback *cb) +{ + listener_container_t *iter; + event_listener_t *listener; + + RB_FOR_EACH_ENTRY(iter, &event_target->handler_map, listener_container_t, entry) + LIST_FOR_EACH_ENTRY(listener, &iter->listeners, event_listener_t, entry) + if(listener->function) + note_cc_edge((nsISupports*)listener->function, "EventTarget.listener", cb); +} + void release_event_target(EventTarget *event_target) { listener_container_t *iter, *iter2; diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h index c072b159a56..b50c74c029f 100644 --- a/dlls/mshtml/htmlevent.h +++ b/dlls/mshtml/htmlevent.h @@ -97,6 +97,7 @@ typedef struct DOMEvent { const WCHAR *get_event_name(eventid_t); void check_event_attr(HTMLDocumentNode*,nsIDOMElement*); +void traverse_event_target(EventTarget*,nsCycleCollectionTraversalCallback*); void release_event_target(EventTarget*); HRESULT set_event_handler(EventTarget*,eventid_t,VARIANT*); HRESULT get_event_handler(EventTarget*,eventid_t,VARIANT*); diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index 6ece8435f1f..cc458c82e32 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -1425,6 +1425,7 @@ void HTMLDOMNode_traverse(DispatchEx *dispex, nsCycleCollectionTraversalCallback { HTMLDOMNode *This = HTMLDOMNode_from_DispatchEx(dispex); + traverse_event_target(&This->event_target, cb); if(This->nsnode) note_cc_edge((nsISupports*)This->nsnode, "nsnode", cb); if(This->doc && &This->doc->node != This) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index ebdde0abe2b..398fef9bde7 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -3922,6 +3922,7 @@ static void HTMLWindow_traverse(DispatchEx *dispex, nsCycleCollectionTraversalCa HTMLInnerWindow *This = impl_from_DispatchEx(dispex); HTMLOuterWindow *child; + traverse_event_target(&This->event_target, cb); LIST_FOR_EACH_ENTRY(child, &This->children, HTMLOuterWindow, sibling_entry) note_cc_edge((nsISupports*)&child->base.IHTMLWindow2_iface, "child", cb); if(This->doc) diff --git a/dlls/mshtml/xmlhttprequest.c b/dlls/mshtml/xmlhttprequest.c index a76532e972f..44f83dd8809 100644 --- a/dlls/mshtml/xmlhttprequest.c +++ b/dlls/mshtml/xmlhttprequest.c @@ -1514,6 +1514,7 @@ static void HTMLXMLHttpRequest_traverse(DispatchEx *dispex, nsCycleCollectionTra note_cc_edge((nsISupports*)&This->pending_progress_event->IDOMEvent_iface, "pending_progress_event", cb); if(This->nsxhr) note_cc_edge((nsISupports*)This->nsxhr, "nsxhr", cb); + traverse_event_target(&This->event_target, cb); } static void HTMLXMLHttpRequest_unlink(DispatchEx *dispex)

1 0

Gabriel Ivăncescu : mshtml: Remove unused IUnknown_iface in func_disp_t.
by Alexandre Julliard Oct. 3, 2023

Oct. 3, 2023

Module: wine Branch: master Commit: 30d88426d53ff35ba9ae7a32643e043016535943 URL: https://gitlab.winehq.org/wine/wine/-/commit/30d88426d53ff35ba9ae7a32643e04… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Oct 2 21:39:22 2023 +0300 mshtml: Remove unused IUnknown_iface in func_disp_t. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/dispex.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index 28e7d746165..e47e4d2dc45 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -89,7 +89,6 @@ typedef struct { typedef struct { DispatchEx dispex; - IUnknown IUnknown_iface; DispatchEx *obj; func_info_t *info; } func_disp_t;

1 0

Gabriel Ivăncescu : mshtml: Call handle_event on the proper dispex object.
by Alexandre Julliard Oct. 3, 2023

Oct. 3, 2023

Module: wine Branch: master Commit: 4d569803963ef44802865f6aad24d53e15e6d1b8 URL: https://gitlab.winehq.org/wine/wine/-/commit/4d569803963ef44802865f6aad24d5… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Oct 2 21:39:22 2023 +0300 mshtml: Call handle_event on the proper dispex object. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55701 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlevent.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 87039167281..800ec30cbad 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -3889,7 +3889,7 @@ static HRESULT dispatch_event_object(EventTarget *event_target, DOMEvent *event, vtbl = dispex_get_vtbl(&target_chain[i]->dispex); if(!vtbl->handle_event) continue; - hres = vtbl->handle_event(&event_target->dispex, event->event_id, event->nsevent, &prevent_default); + hres = vtbl->handle_event(&target_chain[i]->dispex, event->event_id, event->nsevent, &prevent_default); if(FAILED(hres) || event->stop_propagation) break; if(prevent_default)

1 0

Francisco Casas : vkd3d-shader/tpf: Replace sm4_src_register with vkd3d_shader_src_param.
by Alexandre Julliard Oct. 3, 2023

Oct. 3, 2023

Module: vkd3d Branch: master Commit: c92772657f47fa906b3414e3d90bbc3fcb2d2090 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/c92772657f47fa906b3414e3d90bb… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Tue Jul 18 19:54:17 2023 -0400 vkd3d-shader/tpf: Replace sm4_src_register with vkd3d_shader_src_param. --- libs/vkd3d-shader/tpf.c | 26 ++++++++++---------------- 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/libs/vkd3d-shader/tpf.c b/libs/vkd3d-shader/tpf.c index 7581e1c2..d6902f8b 100644 --- a/libs/vkd3d-shader/tpf.c +++ b/libs/vkd3d-shader/tpf.c @@ -3635,13 +3635,7 @@ struct sm4_instruction struct vkd3d_shader_dst_param dsts[2]; unsigned int dst_count; - struct sm4_src_register - { - struct vkd3d_shader_register reg; - enum vkd3d_sm4_swizzle_type swizzle_type; - DWORD swizzle; - enum vkd3d_shader_src_modifier modifiers; - } srcs[5]; + struct vkd3d_shader_src_param srcs[5]; unsigned int src_count; unsigned int byte_stride; @@ -3777,7 +3771,7 @@ static void sm4_register_from_deref(struct hlsl_ctx *ctx, struct vkd3d_shader_re } } -static void sm4_src_from_deref(const struct tpf_writer *tpf, struct sm4_src_register *src, +static void sm4_src_from_deref(const struct tpf_writer *tpf, struct vkd3d_shader_src_param *src, const struct hlsl_deref *deref, unsigned int map_writemask) { unsigned int writemask, hlsl_swizzle; @@ -3806,7 +3800,7 @@ static void sm4_dst_from_node(struct vkd3d_shader_dst_param *dst, const struct h sm4_register_from_node(&dst->reg, &dst->write_mask, instr); } -static void sm4_src_from_constant_value(struct sm4_src_register *src, +static void sm4_src_from_constant_value(struct vkd3d_shader_src_param *src, const struct hlsl_constant_value *value, unsigned int width, unsigned int map_writemask) { src->swizzle = VKD3D_SHADER_NO_SWIZZLE; @@ -3831,7 +3825,7 @@ static void sm4_src_from_constant_value(struct sm4_src_register *src, } } -static void sm4_src_from_node(const struct tpf_writer *tpf, struct sm4_src_register *src, +static void sm4_src_from_node(const struct tpf_writer *tpf, struct vkd3d_shader_src_param *src, const struct hlsl_ir_node *instr, unsigned int map_writemask) { unsigned int writemask, hlsl_swizzle; @@ -3887,7 +3881,7 @@ static void sm4_write_dst_register(const struct tpf_writer *tpf, const struct vk } } -static void sm4_write_src_register(const struct tpf_writer *tpf, const struct sm4_src_register *src) +static void sm4_write_src_register(const struct tpf_writer *tpf, const struct vkd3d_shader_src_param *src) { const struct vkd3d_sm4_register_type_info *register_type_info; struct vkd3d_bytecode_buffer *buffer = tpf->buffer; @@ -3973,7 +3967,7 @@ static void sm4_write_src_register(const struct tpf_writer *tpf, const struct sm } } -static uint32_t vkd3d_shader_dst_param_order(const struct vkd3d_shader_dst_param *dst) +static uint32_t sm4_token_count_from_dst_register(const struct vkd3d_shader_dst_param *dst) { uint32_t order = 1; if (dst->reg.type == VKD3DSPR_IMMCONST) @@ -3982,7 +3976,7 @@ static uint32_t vkd3d_shader_dst_param_order(const struct vkd3d_shader_dst_param return order; } -static uint32_t sm4_src_register_order(const struct sm4_src_register *src) +static uint32_t sm4_token_count_from_src_register(const struct vkd3d_shader_src_param *src) { uint32_t order = 1; if (src->reg.type == VKD3DSPR_IMMCONST) @@ -4001,9 +3995,9 @@ static void write_sm4_instruction(const struct tpf_writer *tpf, const struct sm4 size += instr->modifier_count; for (i = 0; i < instr->dst_count; ++i) - size += vkd3d_shader_dst_param_order(&instr->dsts[i]); + size += sm4_token_count_from_dst_register(&instr->dsts[i]); for (i = 0; i < instr->src_count; ++i) - size += sm4_src_register_order(&instr->srcs[i]); + size += sm4_token_count_from_src_register(&instr->srcs[i]); size += instr->idx_count; if (instr->byte_stride) ++size; @@ -5350,7 +5344,7 @@ static void write_sm4_gather(const struct tpf_writer *tpf, const struct hlsl_ir_ const struct hlsl_deref *resource, const struct hlsl_deref *sampler, const struct hlsl_ir_node *coords, DWORD swizzle, const struct hlsl_ir_node *texel_offset) { - struct sm4_src_register *src; + struct vkd3d_shader_src_param *src; struct sm4_instruction instr; memset(&instr, 0, sizeof(instr));

1 0

Francisco Casas : vkd3d-shader/tpf: Remove sm4_src_register.swizzle_type.
by Alexandre Julliard Oct. 3, 2023

Oct. 3, 2023

Module: vkd3d Branch: master Commit: 13f62e60e1aa1d6334b737fb826150658b0a3992 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/13f62e60e1aa1d6334b737fb82615… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Tue Jul 18 18:59:43 2023 -0400 vkd3d-shader/tpf: Remove sm4_src_register.swizzle_type. --- libs/vkd3d-shader/hlsl.h | 2 +- libs/vkd3d-shader/hlsl_codegen.c | 2 +- libs/vkd3d-shader/tpf.c | 235 +++++++++++++++++++-------------------- 3 files changed, 115 insertions(+), 124 deletions(-)

1 0

Francisco Casas : vkd3d-shader/tpf: Make sm4_src_register.mod a vkd3d_shader_src_modifier enum.
by Alexandre Julliard Oct. 3, 2023

Oct. 3, 2023

Module: vkd3d Branch: master Commit: 32f03468fc02dcd6015d9557786423d346646d99 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/32f03468fc02dcd6015d955778642… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Thu Aug 31 17:27:13 2023 -0400 vkd3d-shader/tpf: Make sm4_src_register.mod a vkd3d_shader_src_modifier enum. --- libs/vkd3d-shader/tpf.c | 57 ++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 44 insertions(+), 13 deletions(-) diff --git a/libs/vkd3d-shader/tpf.c b/libs/vkd3d-shader/tpf.c index 63771736..0b68f0f1 100644 --- a/libs/vkd3d-shader/tpf.c +++ b/libs/vkd3d-shader/tpf.c @@ -3628,7 +3628,7 @@ struct sm4_instruction struct vkd3d_shader_register reg; enum vkd3d_sm4_swizzle_type swizzle_type; DWORD swizzle; - unsigned int mod; + enum vkd3d_shader_src_modifier modifiers; } srcs[5]; unsigned int src_count; @@ -3897,7 +3897,7 @@ static void sm4_write_src_register(const struct tpf_writer *tpf, const struct sm const struct vkd3d_sm4_register_type_info *register_type_info; struct vkd3d_bytecode_buffer *buffer = tpf->buffer; uint32_t sm4_reg_type, reg_dim; - uint32_t token = 0; + uint32_t token = 0, mod_token = 0; unsigned int j; register_type_info = get_info_from_vkd3d_register_type(&tpf->lookup, src->reg.type); @@ -3921,13 +3921,44 @@ static void sm4_write_src_register(const struct tpf_writer *tpf, const struct sm token |= (uint32_t)src->swizzle_type << VKD3D_SM4_SWIZZLE_TYPE_SHIFT; token |= swizzle_to_sm4(src->swizzle) << VKD3D_SM4_SWIZZLE_SHIFT; } - if (src->mod) - token |= VKD3D_SM4_EXTENDED_OPERAND; - put_u32(buffer, token); - if (src->mod) - put_u32(buffer, (src->mod << VKD3D_SM4_REGISTER_MODIFIER_SHIFT) - | VKD3D_SM4_EXTENDED_OPERAND_MODIFIER); + switch (src->modifiers) + { + case VKD3DSPSM_NONE: + mod_token = VKD3D_SM4_REGISTER_MODIFIER_NONE; + break; + + case VKD3DSPSM_ABS: + mod_token = (VKD3D_SM4_REGISTER_MODIFIER_ABS << VKD3D_SM4_REGISTER_MODIFIER_SHIFT) + | VKD3D_SM4_EXTENDED_OPERAND_MODIFIER; + break; + + case VKD3DSPSM_NEG: + mod_token = (VKD3D_SM4_REGISTER_MODIFIER_NEGATE << VKD3D_SM4_REGISTER_MODIFIER_SHIFT) + | VKD3D_SM4_EXTENDED_OPERAND_MODIFIER; + break; + + case VKD3DSPSM_ABSNEG: + mod_token = (VKD3D_SM4_REGISTER_MODIFIER_ABS_NEGATE << VKD3D_SM4_REGISTER_MODIFIER_SHIFT) + | VKD3D_SM4_EXTENDED_OPERAND_MODIFIER; + break; + + default: + ERR("Unhandled register modifier %#x.\n", src->modifiers); + vkd3d_unreachable(); + break; + } + + if (src->modifiers) + { + token |= VKD3D_SM4_EXTENDED_OPERAND; + put_u32(buffer, token); + put_u32(buffer, mod_token); + } + else + { + put_u32(buffer, token); + } for (j = 0; j < src->reg.idx_count; ++j) { @@ -3962,7 +3993,7 @@ static uint32_t sm4_src_register_order(const struct sm4_src_register *src) if (src->reg.type == VKD3DSPR_IMMCONST) order += src->reg.dimension == VSIR_DIMENSION_VEC4 ? 4 : 1; order += src->reg.idx_count; - if (src->mod) + if (src->modifiers) ++order; return order; } @@ -4280,7 +4311,7 @@ static void write_sm4_ret(const struct tpf_writer *tpf) } static void write_sm4_unary_op(const struct tpf_writer *tpf, enum vkd3d_sm4_opcode opcode, - const struct hlsl_ir_node *dst, const struct hlsl_ir_node *src, unsigned int src_mod) + const struct hlsl_ir_node *dst, const struct hlsl_ir_node *src, enum vkd3d_shader_src_modifier src_mod) { struct sm4_instruction instr; @@ -4291,7 +4322,7 @@ static void write_sm4_unary_op(const struct tpf_writer *tpf, enum vkd3d_sm4_opco instr.dst_count = 1; sm4_src_from_node(&instr.srcs[0], src, instr.dsts[0].write_mask); - instr.srcs[0].mod = src_mod; + instr.srcs[0].modifiers = src_mod; instr.src_count = 1; write_sm4_instruction(tpf, &instr); @@ -4776,7 +4807,7 @@ static void write_sm4_expr(const struct tpf_writer *tpf, const struct hlsl_ir_ex switch (dst_type->base_type) { case HLSL_TYPE_FLOAT: - write_sm4_unary_op(tpf, VKD3D_SM4_OP_MOV, &expr->node, arg1, VKD3D_SM4_REGISTER_MODIFIER_ABS); + write_sm4_unary_op(tpf, VKD3D_SM4_OP_MOV, &expr->node, arg1, VKD3DSPSM_ABS); break; default: @@ -4857,7 +4888,7 @@ static void write_sm4_expr(const struct tpf_writer *tpf, const struct hlsl_ir_ex switch (dst_type->base_type) { case HLSL_TYPE_FLOAT: - write_sm4_unary_op(tpf, VKD3D_SM4_OP_MOV, &expr->node, arg1, VKD3D_SM4_REGISTER_MODIFIER_NEGATE); + write_sm4_unary_op(tpf, VKD3D_SM4_OP_MOV, &expr->node, arg1, VKD3DSPSM_NEG); break; case HLSL_TYPE_INT:

1 0

Andrey Gusev : vkd3d: Add ID3D12GraphicsCommandList4 interface stub.
by Alexandre Julliard Oct. 3, 2023

Oct. 3, 2023

Module: vkd3d Branch: master Commit: 679203f7172788724fd7e582f4e8f2d8ddfe5e59 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/679203f7172788724fd7e582f4e8f… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Mon Oct 2 12:55:34 2023 +0300 vkd3d: Add ID3D12GraphicsCommandList4 interface stub. --- libs/vkd3d/command.c | 332 +++++++++++++++++++++++++++------------------ libs/vkd3d/device.c | 4 +- libs/vkd3d/vkd3d_private.h | 2 +- 3 files changed, 206 insertions(+), 132 deletions(-)

1 0

Alistair Leslie-Hughes : d3dxof: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard Oct. 2, 2023

Oct. 2, 2023

Module: wine Branch: master Commit: 209b2c23c5e302ed9211d67ab044386d3fe0bef4 URL: https://gitlab.winehq.org/wine/wine/-/commit/209b2c23c5e302ed9211d67ab04438… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Oct 2 19:42:17 2023 +1100 d3dxof: Remove DECLSPEC_HIDDEN usage. --- dlls/d3dxof/d3dxof_private.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/d3dxof/d3dxof_private.h b/dlls/d3dxof/d3dxof_private.h index babc37085e8..9f208dfc9cb 100644 --- a/dlls/d3dxof/d3dxof_private.h +++ b/dlls/d3dxof/d3dxof_private.h @@ -160,12 +160,12 @@ typedef struct { LONG ref; } IDirectXFileSaveObjectImpl; -HRESULT IDirectXFileImpl_Create(IUnknown *pUnkOuter, LPVOID *ppObj) DECLSPEC_HIDDEN; +HRESULT IDirectXFileImpl_Create(IUnknown *pUnkOuter, LPVOID *ppObj); -HRESULT parse_header(parse_buffer *buf, BYTE **decomp_buffer_ptr) DECLSPEC_HIDDEN; -BOOL parse_object(parse_buffer * buf) DECLSPEC_HIDDEN; -BOOL parse_templates(parse_buffer * buf, BOOL templates_only) DECLSPEC_HIDDEN; +HRESULT parse_header(parse_buffer *buf, BYTE **decomp_buffer_ptr); +BOOL parse_object(parse_buffer * buf); +BOOL parse_templates(parse_buffer * buf, BOOL templates_only); -int mszip_decompress(int inlen, int outlen, char* inbuffer, char* outbuffer) DECLSPEC_HIDDEN; +int mszip_decompress(int inlen, int outlen, char* inbuffer, char* outbuffer); #endif /* __D3DXOF_PRIVATE_INCLUDED__ */

1 0