wine-commits May 2021

wine-commits@winehq.org

2 participants
770 discussions

Zebediah Figura : vkd3d-shader: Write SM1 constant definitions.
by Alexandre Julliard 10 May '21

10 May '21

Module: vkd3d Branch: master Commit: 16e549e5798b769073c0d510f447504290d8f27e URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=16e549e5798b769073c0d51… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Apr 27 12:14:17 2021 -0500 vkd3d-shader: Write SM1 constant definitions. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_d3d9types.h | 41 +++++++++++++ libs/vkd3d-shader/hlsl.h | 11 ++++ libs/vkd3d-shader/hlsl_codegen.c | 121 +++++++++++++++++++++++++++++++++++---- 3 files changed, 162 insertions(+), 11 deletions(-) diff --git a/include/vkd3d_d3d9types.h b/include/vkd3d_d3d9types.h index 7a8c15f..ba7dcbf 100644 --- a/include/vkd3d_d3d9types.h +++ b/include/vkd3d_d3d9types.h @@ -27,6 +27,19 @@ ((DWORD)(BYTE)(ch2) << 16) | ((DWORD)(BYTE)(ch3) << 24 )) #endif +#define D3DSI_INSTLENGTH_SHIFT 24 + +#define D3DSP_REGTYPE_SHIFT 28 +#define D3DSP_REGTYPE_SHIFT2 8 +#define D3DSP_REGTYPE_MASK (0x7 << D3DSP_REGTYPE_SHIFT) +#define D3DSP_REGTYPE_MASK2 0x00001800 + +#define D3DSP_WRITEMASK_0 0x00010000 +#define D3DSP_WRITEMASK_1 0x00020000 +#define D3DSP_WRITEMASK_2 0x00040000 +#define D3DSP_WRITEMASK_3 0x00080000 +#define D3DSP_WRITEMASK_ALL 0x000f0000 + #define D3DPS_VERSION(major, minor) (0xffff0000 | ((major) << 8) | (minor)) #define D3DVS_VERSION(major, minor) (0xfffe0000 | ((major) << 8) | (minor)) @@ -123,5 +136,33 @@ typedef enum _D3DSHADER_INSTRUCTION_OPCODE_TYPE D3DSIO_FORCE_DWORD = 0x7fffffff, } D3DSHADER_INSTRUCTION_OPCODE_TYPE; +typedef enum _D3DSHADER_PARAM_REGISTER_TYPE +{ + D3DSPR_TEMP = 0x00, + D3DSPR_INPUT = 0x01, + D3DSPR_CONST = 0x02, + D3DSPR_ADDR = 0x03, + D3DSPR_TEXTURE = 0x03, + D3DSPR_RASTOUT = 0x04, + D3DSPR_ATTROUT = 0x05, + D3DSPR_TEXCRDOUT = 0x06, + D3DSPR_OUTPUT = 0x06, + D3DSPR_CONSTINT = 0x07, + D3DSPR_COLOROUT = 0x08, + D3DSPR_DEPTHOUT = 0x09, + D3DSPR_SAMPLER = 0x0a, + D3DSPR_CONST2 = 0x0b, + D3DSPR_CONST3 = 0x0c, + D3DSPR_CONST4 = 0x0d, + D3DSPR_CONSTBOOL = 0x0e, + D3DSPR_LOOP = 0x0f, + D3DSPR_TEMPFLOAT16 = 0x10, + D3DSPR_MISCTYPE = 0x11, + D3DSPR_LABEL = 0x12, + D3DSPR_PREDICATE = 0x13, + + D3DSPR_FORCE_DWORD = 0x7fffffff, +} D3DSHADER_PARAM_REGISTER_TYPE; + #endif /* _d3d9TYPES_H_ */ #endif /* __VKD3D_D3D9TYPES_H */ diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 0c755f4..d65c25e 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -407,6 +407,11 @@ struct hlsl_profile_info bool software; }; +struct hlsl_vec4 +{ + float f[4]; +}; + struct hlsl_ctx { const struct hlsl_profile_info *profile; @@ -440,6 +445,12 @@ struct hlsl_ctx } builtin_types; struct list static_initializers; + + struct hlsl_constant_defs + { + struct hlsl_vec4 *values; + size_t count, size; + } constant_defs; }; enum hlsl_error_level diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 0fd1f6b..b3e59bc 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -804,8 +804,9 @@ static void allocate_temp_registers_recurse(struct list *instrs, struct liveness } } -static void allocate_const_registers_recurse(struct list *instrs, struct liveness *liveness) +static void allocate_const_registers_recurse(struct hlsl_ctx *ctx, struct list *instrs, struct liveness *liveness) { + struct hlsl_constant_defs *defs = &ctx->constant_defs; struct hlsl_ir_node *instr; LIST_FOR_EACH_ENTRY(instr, instrs, struct hlsl_ir_node, entry) @@ -815,28 +816,84 @@ static void allocate_const_registers_recurse(struct list *instrs, struct livenes case HLSL_IR_CONSTANT: { struct hlsl_ir_constant *constant = hlsl_ir_constant(instr); + const struct hlsl_type *type = instr->data_type; + unsigned int reg_size = type->reg_size; + unsigned int x, y, i, writemask; - if (instr->data_type->reg_size > 1) - constant->reg = allocate_range(liveness, 1, UINT_MAX, instr->data_type->reg_size); + if (reg_size > 1) + constant->reg = allocate_range(liveness, 1, UINT_MAX, reg_size); else - constant->reg = allocate_register(liveness, 1, UINT_MAX, instr->data_type->dimx); - TRACE("Allocated constant @%u to %s.\n", instr->index, - debug_register('c', constant->reg, instr->data_type)); + constant->reg = allocate_register(liveness, 1, UINT_MAX, type->dimx); + TRACE("Allocated constant @%u to %s.\n", instr->index, debug_register('c', constant->reg, type)); + + if (!vkd3d_array_reserve((void **)&defs->values, &defs->size, + constant->reg.id + reg_size, sizeof(*defs->values))) + { + ctx->failed = true; + return; + } + defs->count = max(defs->count, constant->reg.id + reg_size); + + assert(type->type <= HLSL_CLASS_LAST_NUMERIC); + + if (!(writemask = constant->reg.writemask)) + writemask = (1u << type->dimx) - 1; + + for (y = 0; y < type->dimy; ++y) + { + for (x = 0, i = 0; x < 4; ++x) + { + float f; + + if (!(writemask & (1u << x))) + continue; + + switch (type->base_type) + { + case HLSL_TYPE_BOOL: + f = constant->value.b[i++]; + break; + + case HLSL_TYPE_FLOAT: + case HLSL_TYPE_HALF: + f = constant->value.f[i++]; + break; + + case HLSL_TYPE_INT: + f = constant->value.i[i++]; + break; + + case HLSL_TYPE_UINT: + f = constant->value.u[i++]; + break; + + case HLSL_TYPE_DOUBLE: + FIXME("Double constant.\n"); + return; + + default: + assert(0); + return; + } + defs->values[constant->reg.id + y].f[x] = f; + } + } + break; } case HLSL_IR_IF: { struct hlsl_ir_if *iff = hlsl_ir_if(instr); - allocate_const_registers_recurse(&iff->then_instrs, liveness); - allocate_const_registers_recurse(&iff->else_instrs, liveness); + allocate_const_registers_recurse(ctx, &iff->then_instrs, liveness); + allocate_const_registers_recurse(ctx, &iff->else_instrs, liveness); break; } case HLSL_IR_LOOP: { struct hlsl_ir_loop *loop = hlsl_ir_loop(instr); - allocate_const_registers_recurse(&loop->body, liveness); + allocate_const_registers_recurse(ctx, &loop->body, liveness); break; } @@ -851,6 +908,8 @@ static void allocate_const_registers(struct hlsl_ctx *ctx, struct hlsl_ir_functi struct liveness liveness = {0}; struct hlsl_ir_var *var; + allocate_const_registers_recurse(ctx, entry_func->body, &liveness); + LIST_FOR_EACH_ENTRY(var, &ctx->extern_vars, struct hlsl_ir_var, extern_entry) { if (var->is_uniform && var->last_read) @@ -865,8 +924,6 @@ static void allocate_const_registers(struct hlsl_ctx *ctx, struct hlsl_ir_functi TRACE("Allocated %s to %s.\n", var->name, debug_register('c', var->reg, var->data_type)); } } - - allocate_const_registers_recurse(entry_func->body, &liveness); } /* Simple greedy temporary register allocation pass that just assigns a unique @@ -904,6 +961,18 @@ static unsigned int put_dword(struct bytecode_buffer *buffer, uint32_t value) return index; } +/* Returns the token index. */ +static unsigned int put_float(struct bytecode_buffer *buffer, float value) +{ + union + { + float f; + uint32_t u; + } u; + u.f = value; + return put_dword(buffer, u.u); +} + static void set_dword(struct bytecode_buffer *buffer, unsigned int index, uint32_t value) { if (buffer->status) @@ -1186,6 +1255,34 @@ static void write_sm1_uniforms(struct hlsl_ctx *ctx, struct bytecode_buffer *buf set_dword(buffer, size_offset, D3DSIO_COMMENT | ((buffer->count - (ctab_start - 1)) << 16)); } +static uint32_t sm1_encode_register_type(D3DSHADER_PARAM_REGISTER_TYPE type) +{ + return ((type << D3DSP_REGTYPE_SHIFT) & D3DSP_REGTYPE_MASK) + | ((type << D3DSP_REGTYPE_SHIFT2) & D3DSP_REGTYPE_MASK2); +} + +static void write_sm1_constant_defs(struct hlsl_ctx *ctx, struct bytecode_buffer *buffer) +{ + unsigned int i, x; + + for (i = 0; i < ctx->constant_defs.count; ++i) + { + uint32_t token = D3DSIO_DEF; + + if (ctx->profile->major_version > 1) + token |= 5 << D3DSI_INSTLENGTH_SHIFT; + put_dword(buffer, token); + + token = (1u << 31); + token |= sm1_encode_register_type(D3DSPR_CONST); + token |= D3DSP_WRITEMASK_ALL; + token |= i; + put_dword(buffer, token); + for (x = 0; x < 4; ++x) + put_float(buffer, ctx->constant_defs.values[i].f[x]); + } +} + static int write_sm1_shader(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry_func, struct vkd3d_shader_code *out) { @@ -1196,6 +1293,8 @@ static int write_sm1_shader(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl * write_sm1_uniforms(ctx, &buffer, entry_func); + write_sm1_constant_defs(ctx, &buffer); + put_dword(&buffer, D3DSIO_END); if (!(ret = buffer.status))

1 0

Zebediah Figura : vkd3d-shader: Return the current buffer offset from put_dword() and put_string().
by Alexandre Julliard 10 May '21

10 May '21

Module: vkd3d Branch: master Commit: d0ab65c7a193608d59cd0daa2d7f0059b10d8038 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=d0ab65c7a193608d59cd0da… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Apr 27 12:14:16 2021 -0500 vkd3d-shader: Return the current buffer offset from put_dword() and put_string(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl_codegen.c | 42 ++++++++++++++++++++++------------------ 1 file changed, 23 insertions(+), 19 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 2c07171..0fd1f6b 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -886,17 +886,22 @@ struct bytecode_buffer int status; }; -static void put_dword(struct bytecode_buffer *buffer, uint32_t value) +/* Returns the token index. */ +static unsigned int put_dword(struct bytecode_buffer *buffer, uint32_t value) { + unsigned int index = buffer->count; + if (buffer->status) - return; + return index; if (!vkd3d_array_reserve((void **)&buffer->data, &buffer->size, buffer->count + 1, sizeof(*buffer->data))) { buffer->status = VKD3D_ERROR_OUT_OF_MEMORY; - return; + return index; } buffer->data[buffer->count++] = value; + + return index; } static void set_dword(struct bytecode_buffer *buffer, unsigned int index, uint32_t value) @@ -908,23 +913,26 @@ static void set_dword(struct bytecode_buffer *buffer, unsigned int index, uint32 buffer->data[index] = value; } -static void put_string(struct bytecode_buffer *buffer, const char *str) +/* Returns the token index. */ +static unsigned int put_string(struct bytecode_buffer *buffer, const char *str) { + unsigned int index = buffer->count; size_t len = strlen(str) + 1; unsigned int token_count = (len + 3) / sizeof(*buffer->data); if (buffer->status) - return; + return index; if (!vkd3d_array_reserve((void **)&buffer->data, &buffer->size, buffer->count + token_count, sizeof(*buffer->data))) { buffer->status = E_OUTOFMEMORY; - return; + return index; } buffer->data[buffer->count + token_count - 1] = 0xabababab; memcpy(buffer->data + buffer->count, str, len); buffer->count += token_count; + return index; } static uint32_t sm1_version(enum vkd3d_shader_type type, unsigned int major, unsigned int minor) @@ -1051,8 +1059,7 @@ static void write_sm1_type(struct bytecode_buffer *buffer, struct hlsl_type *typ { LIST_FOR_EACH_ENTRY(field, array_type->e.elements, struct hlsl_struct_field, entry) { - field->name_bytecode_offset = buffer->count; - put_string(buffer, field->name); + field->name_bytecode_offset = put_string(buffer, field->name); write_sm1_type(buffer, field->type, ctab_start); } @@ -1066,8 +1073,7 @@ static void write_sm1_type(struct bytecode_buffer *buffer, struct hlsl_type *typ } } - type->bytecode_offset = buffer->count; - put_dword(buffer, sm1_class(type) | (sm1_base_type(type) << 16)); + type->bytecode_offset = put_dword(buffer, sm1_class(type) | (sm1_base_type(type) << 16)); put_dword(buffer, type->dimy | (type->dimx << 16)); put_dword(buffer, array_size | (field_count << 16)); put_dword(buffer, fields_offset); @@ -1104,7 +1110,7 @@ static void sm1_sort_externs(struct hlsl_ctx *ctx) static void write_sm1_uniforms(struct hlsl_ctx *ctx, struct bytecode_buffer *buffer, struct hlsl_ir_function_decl *entry_func) { - unsigned int ctab_start, vars_start; + unsigned int ctab_start, vars_start, size_offset, creator_offset, offset; unsigned int uniform_count = 0; struct hlsl_ir_var *var; @@ -1133,13 +1139,11 @@ static void write_sm1_uniforms(struct hlsl_ctx *ctx, struct bytecode_buffer *buf sm1_sort_externs(ctx); - put_dword(buffer, 0); /* COMMENT tag + size */ + size_offset = put_dword(buffer, 0); put_dword(buffer, MAKEFOURCC('C','T','A','B')); - ctab_start = buffer->count; - - put_dword(buffer, sizeof(D3DXSHADER_CONSTANTTABLE)); /* size of this header */ - put_dword(buffer, 0); /* creator */ + ctab_start = put_dword(buffer, sizeof(D3DXSHADER_CONSTANTTABLE)); + creator_offset = put_dword(buffer, 0); put_dword(buffer, sm1_version(ctx->profile->type, ctx->profile->major_version, ctx->profile->minor_version)); put_dword(buffer, uniform_count); put_dword(buffer, sizeof(D3DXSHADER_CONSTANTTABLE)); /* offset of constants */ @@ -1176,10 +1180,10 @@ static void write_sm1_uniforms(struct hlsl_ctx *ctx, struct bytecode_buffer *buf } } - set_dword(buffer, ctab_start + 1, (buffer->count - ctab_start) * sizeof(*buffer->data)); - put_string(buffer, vkd3d_shader_get_version(NULL, NULL)); + offset = put_string(buffer, vkd3d_shader_get_version(NULL, NULL)); + set_dword(buffer, creator_offset, (offset - ctab_start) * sizeof(*buffer->data)); - set_dword(buffer, ctab_start - 2, D3DSIO_COMMENT | ((buffer->count - (ctab_start - 1)) << 16)); + set_dword(buffer, size_offset, D3DSIO_COMMENT | ((buffer->count - (ctab_start - 1)) << 16)); } static int write_sm1_shader(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry_func,

1 0

Zebediah Figura : vkd3d-shader: Rename name_offset to name_bytecode_offset.
by Alexandre Julliard 10 May '21

10 May '21

Module: vkd3d Branch: master Commit: aab948275892cbad2b1c84951a5c5400a9036350 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=aab948275892cbad2b1c849… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Apr 27 12:14:15 2021 -0500 vkd3d-shader: Rename name_offset to name_bytecode_offset. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.h | 4 ++-- libs/vkd3d-shader/hlsl_codegen.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 3dc7a26..0c755f4 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -136,9 +136,9 @@ struct hlsl_struct_field struct hlsl_type *type; const char *name; const char *semantic; - unsigned int reg_offset; - unsigned int name_offset; + + unsigned int name_bytecode_offset; }; struct hlsl_reg diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 1b5e8a2..2c07171 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -1051,7 +1051,7 @@ static void write_sm1_type(struct bytecode_buffer *buffer, struct hlsl_type *typ { LIST_FOR_EACH_ENTRY(field, array_type->e.elements, struct hlsl_struct_field, entry) { - field->name_offset = buffer->count; + field->name_bytecode_offset = buffer->count; put_string(buffer, field->name); write_sm1_type(buffer, field->type, ctab_start); } @@ -1060,7 +1060,7 @@ static void write_sm1_type(struct bytecode_buffer *buffer, struct hlsl_type *typ LIST_FOR_EACH_ENTRY(field, array_type->e.elements, struct hlsl_struct_field, entry) { - put_dword(buffer, (field->name_offset - ctab_start) * sizeof(*buffer->data)); + put_dword(buffer, (field->name_bytecode_offset - ctab_start) * sizeof(*buffer->data)); put_dword(buffer, (field->type->bytecode_offset - ctab_start) * sizeof(*buffer->data)); ++field_count; }

1 0

Alexandre Julliard : Wine release 6.8
by Alexandre Julliard 07 May '21

07 May '21

Module: website Branch: master Commit: a873ac8daa6a5871fd0278e31658a38fd3777a74 URL: https://source.winehq.org/git/website.git/?a=commit;h=a873ac8daa6a5871fd027… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 7 22:42:18 2021 +0200 Wine release 6.8 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2021050701.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/en/2021050701.xml b/news/en/2021050701.xml new file mode 100644 index 00000000..21f35590 --- /dev/null +++ b/news/en/2021050701.xml @@ -0,0 +1,16 @@ +<news> +<date>May 7, 2021</date> +<title>Wine 6.8 Released</title> +<body> + The Wine development release 6.8 is now available. + <a href="{$root}/announce/6.8">What's new</a> in this release: +<ul> + <li>Libraries installed into architecture-specific subdirectories.</li> + <li>Secur32 library converted to PE.</li> + <li>Support for Map object in JavaScript.</li> + <li>Various bug fixes.</li> +</ul> + +The source is <a href="//dl.winehq.org/wine/source/6.x/wine-6.8.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

Tag wine-6.8 : Alexandre Julliard : Release 6.8
by Alexandre Julliard 07 May '21

07 May '21

Module: wine Branch: refs/tags/wine-6.8 Tag: 6a2ffce10cb2ba65869d6e596df19cf3241aeeaf URL: https://source.winehq.org/git/wine.git/?a=tag;h=6a2ffce10cb2ba65869d6e596df… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 7 22:40:28 2021 +0200 Release 6.8

1 0

Alexandre Julliard : Release 6.8.
by Alexandre Julliard 07 May '21

07 May '21

Module: wine Branch: master Commit: 99e47361a37a4bf16de131401a0c231f86214a43 URL: https://source.winehq.org/git/wine.git/?a=commit;h=99e47361a37a4bf16de13140… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 7 22:40:28 2021 +0200 Release 6.8. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 970 +++++++++++++++++++++++++++++--------------------------------- VERSION | 2 +- configure | 18 +- 3 files changed, 462 insertions(+), 528 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=99e47361a37a4bf16de1…

1 0

Dmitry Timoshkov : msxml3/tests: Add more tests for processing instruction attributes.
by Alexandre Julliard 07 May '21

07 May '21

Module: wine Branch: master Commit: a0dd105c655898de087c1e58fcc5a5cae6e191df URL: https://source.winehq.org/git/wine.git/?a=commit;h=a0dd105c655898de087c1e58… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Apr 27 12:29:42 2021 +0300 msxml3/tests: Add more tests for processing instruction attributes. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/tests/domdoc.c | 43 +++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 41 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index ba8453430c6..59a8a243c87 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -46,6 +46,8 @@ #include "wine/heap.h" #include "wine/test.h" +#define XML_E_UNEXPECTED_ATTRIBUTE 0xC00CE56C + /* undef the #define in msxml2 so that we can access all versions */ #undef CLSID_DOMDocument @@ -8529,10 +8531,11 @@ static void test_createProcessingInstruction(void) static const char xml3_wine[] = "<?xml version=\"1.0\" standalone=\"yes\"?>\n<test/>\n"; IXMLDOMProcessingInstruction *pi; IXMLDOMDocument *doc; - IXMLDOMNode *node; + IXMLDOMNode *node, *item; + IXMLDOMNamedNodeMap *node_map; IXMLDOMElement *element; WCHAR buff[10]; - BSTR xml; + BSTR xml, bstr; VARIANT var; HRESULT hr; IStream *stream; @@ -8543,6 +8546,10 @@ static void test_createProcessingInstruction(void) doc = create_document(&IID_IXMLDOMDocument); + hr = IXMLDOMDocument_createProcessingInstruction(doc, _bstr_("xml"), _bstr_("version=\"1.0\" encoding=\"windows-1252\" dummy=\"value\""), &pi); +todo_wine + ok(hr == XML_E_UNEXPECTED_ATTRIBUTE, "got 0x%08x\n", hr); + /* test for BSTR handling, pass broken BSTR */ memcpy(&buff[2], L"test", 5 * sizeof(WCHAR)); /* just a big length */ @@ -8561,6 +8568,38 @@ static void test_createProcessingInstruction(void) ok(hr == S_OK, "got 0x%08x\n", hr); hr = IXMLDOMDocument_appendChild(doc, node, NULL); ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXMLDOMNode_get_attributes(node, &node_map); + ok(hr == S_OK, "got 0x%08x\n", hr); + + item = (void *)0xdeadbeef; + hr = IXMLDOMNamedNodeMap_getNamedItem(node_map, _bstr_("xml"), &item); + ok(hr == S_FALSE, "got 0x%08x\n", hr); + ok(!item, "got %p\n", item); + + item = NULL; + hr = IXMLDOMNamedNodeMap_getNamedItem(node_map, _bstr_("encoding"), &item); +todo_wine + ok(hr == S_OK, "got 0x%08x\n", hr); +todo_wine + ok(item != NULL, "got NULL\n"); + +if (hr == S_OK) +{ + hr = IXMLDOMNode_get_nodeName(item, &bstr); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(bstr, L"encoding"), "got %s\n", wine_dbgstr_w(bstr)); + SysFreeString(bstr); + + VariantInit(&var); + hr = IXMLDOMNode_get_nodeValue(item, &var); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(V_VT(&var) == VT_BSTR, "got %u\n", V_VT(&var)); + ok(!lstrcmpW(V_BSTR(&var), L"windows-1252"), "got %s\n", wine_dbgstr_w(V_BSTR(&var))); + VariantClear(&var); +} + + IXMLDOMNamedNodeMap_Release(node_map); IXMLDOMNode_Release(node); IXMLDOMProcessingInstruction_Release(pi);

1 0

Dmitry Timoshkov : msxml3/tests: Don't '\0' terminate output after ::save().
by Alexandre Julliard 07 May '21

07 May '21

Module: wine Branch: master Commit: ee49f13ab2c6d1f0f2e970b272880d3cf4a7c3f8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ee49f13ab2c6d1f0f2e970b2… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Apr 27 12:29:39 2021 +0300 msxml3/tests: Don't '\0' terminate output after ::save(). This fixes heap corruption when running the domdoc tests. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/tests/domdoc.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 6f8e2b44ed3..ba8453430c6 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -8586,8 +8586,7 @@ todo_wine hr = GetHGlobalFromStream(stream, &global); ok(hr == S_OK, "got 0x%08x\n", hr); p = GlobalLock(global); - p[GlobalSize(global)] = 0; - ok(!strcmp(p, xml2) || !strcmp(p, xml2_wine), "got %s\n", wine_dbgstr_a(p)); + ok(!memcmp(p, xml2, sizeof(xml2) - 1) || !memcmp(p, xml2_wine, sizeof(xml2_wine) - 1), "got %s\n", wine_dbgstr_a(p)); GlobalUnlock(global); /* Verify the result after load+save */ @@ -8609,8 +8608,7 @@ todo_wine hr = GetHGlobalFromStream(stream, &global); ok(hr == S_OK, "got 0x%08x\n", hr); p = GlobalLock(global); - p[GlobalSize(global)] = 0; - ok(!strcmp(p, xml2) || !strcmp(p, xml2_wine), "got %s\n", wine_dbgstr_a(p)); + ok(!memcmp(p, xml2, sizeof(xml2) - 1) || !memcmp(p, xml2_wine, sizeof(xml2_wine) - 1), "got %s\n", wine_dbgstr_a(p)); GlobalUnlock(global); IStream_Release(stream); @@ -8631,8 +8629,7 @@ todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); p = GlobalLock(global); - p[GlobalSize(global)] = 0; - ok(!strcmp(p, xml3) || !strcmp(p, xml3_wine), "got %s\n", wine_dbgstr_a(p)); + ok(!memcmp(p, xml3, sizeof(xml3) - 1) || !memcmp(p, xml3_wine, sizeof(xml3_wine) - 1), "got %s\n", wine_dbgstr_a(p)); GlobalUnlock(global); IStream_Release(stream);

1 0

Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard 07 May '21

07 May '21

Module: wine Branch: master Commit: 87ee0af5cd4c9cecbcbf098a0d91b3900e31abf3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=87ee0af5cd4c9cecbcbf098a… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Fri May 7 20:59:21 2021 +0300 po: Update Finnish translation. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/fi.po | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/po/fi.po b/po/fi.po index 84cc113116a..5d6e85d91c1 100644 --- a/po/fi.po +++ b/po/fi.po @@ -3964,10 +3964,8 @@ msgid "Cannot modify non-writable property '|'" msgstr "Kirjoitussuojattua ominaisuutta '|' ei voi muokata" #: dlls/jscript/jscript.rc:77 -#, fuzzy -#| msgid "'[object]' is not a date object" msgid "'this' is not a Map object" -msgstr "'[objekti]' ei ole päivämääräobjekti" +msgstr "'this' ei ole Map-objekti" #: dlls/jscript/jscript.rc:78 msgid "Property cannot have both accessors and a value" @@ -14653,10 +14651,8 @@ msgstr "" "\n" #: programs/reg/reg.rc:172 -#, fuzzy -#| msgid "reg: Invalid system key [%1]\n" msgid "reg: Invalid system key\n" -msgstr "reg: Järjestelmäavain [%1] ei kelpaa\n" +msgstr "reg: Järjestelmäavain ei kelpaa\n" #: programs/reg/reg.rc:173 msgid "The file '%1' already exists. Do you want to overwrite it?" @@ -14687,10 +14683,8 @@ msgstr "" "\n" #: programs/reg/reg.rc:180 -#, fuzzy -#| msgid "reg: Unable to find the specified registry key\n" msgid "reg: Unable to access or create the specified registry key\n" -msgstr "reg: Annettua rekisteriavainta ei löydy\n" +msgstr "reg: Annetun rekisteriavaimen käyttö tai luonti ei onnistu\n" #: programs/regedit/regedit.rc:34 msgid "&Registry"

1 0

Jacek Caban : kernel32/tests: Add syscall context handling tests.
by Alexandre Julliard 07 May '21

07 May '21

Module: wine Branch: master Commit: 058e9c773c157f1425d47bd61fb0070922194980 URL: https://source.winehq.org/git/wine.git/?a=commit;h=058e9c773c157f1425d47bd6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 7 17:37:39 2021 +0200 kernel32/tests: Add syscall context handling tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/debugger.c | 177 +++++++++++++++++++++++++++++++++++++++-- 1 file changed, 171 insertions(+), 6 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=058e9c773c157f1425d4…

1 0

← Newer
1
...
56
57
58
59
60
61
62
...
77
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2021