May 2023 - Wine-commits - list.winehq.org

Giovanni Mascellani : vkd3d-shader/tpf: Emit constant values inline.
by Alexandre Julliard 29 May '23

29 May '23

Module: vkd3d Branch: master Commit: a471c5567acaf467292cdfb9c061e2213b348805 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/a471c5567acaf467292cdfb9c061e… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Fri May 26 14:24:07 2023 +0200 vkd3d-shader/tpf: Emit constant values inline. --- libs/vkd3d-shader/tpf.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/libs/vkd3d-shader/tpf.c b/libs/vkd3d-shader/tpf.c index feea213d..de4e9bc7 100644 --- a/libs/vkd3d-shader/tpf.c +++ b/libs/vkd3d-shader/tpf.c @@ -3540,6 +3540,14 @@ static void sm4_src_from_node(struct sm4_src_register *src, { unsigned int writemask; + if (instr->type == HLSL_IR_CONSTANT) + { + struct hlsl_ir_constant *constant = hlsl_ir_constant(instr); + + sm4_src_from_constant_value(src, &constant->value, instr->data_type->dimx, map_writemask); + return; + } + sm4_register_from_node(&src->reg, &writemask, &src->swizzle_type, instr); if (src->swizzle_type == VKD3D_SM4_SWIZZLE_VEC4) src->swizzle = hlsl_map_swizzle(hlsl_swizzle_from_writemask(writemask), map_writemask);

1 0

Giovanni Mascellani : vkd3d-shader/tpf: Do not emit HLSL_IR_CONSTANT instructions.
by Alexandre Julliard 29 May '23

29 May '23

Module: vkd3d Branch: master Commit: 7c360330d74f5c2f6de962355927ee6e7d7dfbf0 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/7c360330d74f5c2f6de962355927e… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Fri May 26 14:40:30 2023 +0200 vkd3d-shader/tpf: Do not emit HLSL_IR_CONSTANT instructions. Since constants are now inlined. --- libs/vkd3d-shader/hlsl_codegen.c | 4 ++++ libs/vkd3d-shader/tpf.c | 29 +++++++---------------------- 2 files changed, 11 insertions(+), 22 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index a9ef7f2d..2b6c595a 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -3004,6 +3004,10 @@ static void allocate_temp_registers_recurse(struct hlsl_ctx *ctx, LIST_FOR_EACH_ENTRY(instr, &block->instrs, struct hlsl_ir_node, entry) { + /* In SM4 all constants are inlined. */ + if (ctx->profile->major_version >= 4 && instr->type == HLSL_IR_CONSTANT) + continue; + if (!instr->reg.allocated && instr->last_read) { instr->reg = allocate_numeric_registers_for_type(ctx, allocator, instr->index, instr->last_read, diff --git a/libs/vkd3d-shader/tpf.c b/libs/vkd3d-shader/tpf.c index de4e9bc7..60948d64 100644 --- a/libs/vkd3d-shader/tpf.c +++ b/libs/vkd3d-shader/tpf.c @@ -4003,24 +4003,6 @@ static void write_sm4_binary_op_with_two_destinations(struct vkd3d_bytecode_buff write_sm4_instruction(buffer, &instr); } -static void write_sm4_constant(struct hlsl_ctx *ctx, - struct vkd3d_bytecode_buffer *buffer, const struct hlsl_ir_constant *constant) -{ - const unsigned int dimx = constant->node.data_type->dimx; - struct sm4_instruction instr; - - memset(&instr, 0, sizeof(instr)); - instr.opcode = VKD3D_SM4_OP_MOV; - - sm4_dst_from_node(&instr.dsts[0], &constant->node); - instr.dst_count = 1; - - sm4_src_from_constant_value(&instr.srcs[0], &constant->value, dimx, instr.dsts[0].writemask); - instr.src_count = 1; - - write_sm4_instruction(buffer, &instr); -} - static void write_sm4_ld(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *buffer, const struct hlsl_type *resource_type, const struct hlsl_ir_node *dst, const struct hlsl_deref *resource, const struct hlsl_ir_node *coords, @@ -5097,16 +5079,19 @@ static void write_sm4_block(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer * } assert(instr->data_type->class == HLSL_CLASS_SCALAR || instr->data_type->class == HLSL_CLASS_VECTOR); + + if (!instr->reg.allocated) + { + assert(instr->type == HLSL_IR_CONSTANT); + continue; + } } switch (instr->type) { case HLSL_IR_CALL: - vkd3d_unreachable(); - case HLSL_IR_CONSTANT: - write_sm4_constant(ctx, buffer, hlsl_ir_constant(instr)); - break; + vkd3d_unreachable(); case HLSL_IR_EXPR: write_sm4_expr(ctx, buffer, hlsl_ir_expr(instr));

1 0

Ethan Lee : tests: Add a test for arrays with an expression as the index.
by Alexandre Julliard 29 May '23

29 May '23

Module: vkd3d Branch: master Commit: aa17d139be999dbb2bd044d69f8258638d665896 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/aa17d139be999dbb2bd044d69f825… Author: Ethan Lee <flibitijibibo(a)gmail.com> Date: Fri Apr 28 22:28:05 2023 -0400 tests: Add a test for arrays with an expression as the index. Currently, the compiler requires that dereferences be HLSL_IR_CONSTANT, so that it can compute the offset at compile time. However, scenarios such as this test will produce a dereference with HLSL_IR_EXPR, which will generate an error. Passing this test in particular will require adding support for SM4 relative addressing, as well as support for non-constant indexing in general. Signed-off-by: Ethan Lee <flibitijibibo(a)gmail.com> --- Makefile.am | 1 + tests/array-index-expr.shader_test | 25 +++++++++++++++++++++++++ 2 files changed, 26 insertions(+) diff --git a/Makefile.am b/Makefile.am index 954b0ffd..92c6d079 100644 --- a/Makefile.am +++ b/Makefile.am @@ -50,6 +50,7 @@ vkd3d_shader_tests = \ tests/arithmetic-int.shader_test \ tests/arithmetic-int-uniform.shader_test \ tests/arithmetic-uint.shader_test \ + tests/array-index-expr.shader_test \ tests/array-parameters.shader_test \ tests/asfloat.shader_test \ tests/asuint.shader_test \ diff --git a/tests/array-index-expr.shader_test b/tests/array-index-expr.shader_test new file mode 100644 index 00000000..8dda0c99 --- /dev/null +++ b/tests/array-index-expr.shader_test @@ -0,0 +1,25 @@ +[pixel shader todo] +uniform float4 f[3]; +uniform float2 i; + +float4 main() : sv_target +{ + return f[i.x + i.y]; +} + +[test] +uniform 0 float4 1.0 2.0 3.0 4.0 +uniform 4 float4 5.0 6.0 7.0 8.0 +uniform 8 float4 9.0 10.0 11.0 12.0 +uniform 12 float4 0 0 0 0 +todo draw quad +todo probe all rgba (1.0, 2.0, 3.0, 4.0) +uniform 12 float4 1 0 0 0 +todo draw quad +todo probe all rgba (5.0, 6.0, 7.0, 8.0) +uniform 12 float4 0 1 0 0 +todo draw quad +todo probe all rgba (5.0, 6.0, 7.0, 8.0) +uniform 12 float4 1 1 0 0 +todo draw quad +todo probe all rgba (9.0, 10.0, 11.0, 12.0)

1 0

Alexandre Julliard : Wine release 8.9
by Alexandre Julliard 26 May '23

26 May '23

Module: website Branch: master Commit: 6277b09385f0b4d8d8e42d19cc4046be2ae8cedf URL: https://gitlab.winehq.org/winehq/winehq/-/commit/6277b09385f0b4d8d8e42d19cc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 26 22:31:05 2023 +0200 Wine release 8.9 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2023052601.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/en/2023052601.xml b/news/en/2023052601.xml new file mode 100644 index 00000000..26f7e236 --- /dev/null +++ b/news/en/2023052601.xml @@ -0,0 +1,17 @@ +<news> +<date>May 26, 2023</date> +<title>Wine 8.9 Released</title> +<body> + The Wine development release 8.9 is now available. + <a href="{$root}/announce/8.9">What's new</a> in this release: +<ul> + <li>Mono engine updated to version 8.0.0.</li> + <li>Completion of PE conversion in the PostScript driver.</li> + <li>Doppler shift support in DirectSound.</li> + <li>GdiPlus performance improvements.</li> + <li>Various bug fixes.</li> +</ul> + +The source is <a href="//dl.winehq.org/wine/source/8.x/wine-8.9.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-8.9 : Alexandre Julliard : Release 8.9
by Alexandre Julliard 26 May '23

26 May '23

Module: wine Branch: refs/tags/wine-8.9 Tag: 974d10988a7f309477762c2e0dc3c4d79d30227e URL: https://gitlab.winehq.org/wine/wine/-/tags/974d10988a7f309477762c2e0dc3c4d7… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 26 22:28:32 2023 +0200 Release 8.9

1 0

Alexandre Julliard : Release 8.9.
by Alexandre Julliard 26 May '23

26 May '23

Module: wine Branch: master Commit: 9ffeb2622d087a6189ca916553529824791010c3 URL: https://gitlab.winehq.org/wine/wine/-/commit/9ffeb2622d087a6189ca9165535298… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 26 22:23:00 2023 +0200 Release 8.9. --- ANNOUNCE | 705 ++++++++++++++++++++++++++++++++------------------------------ AUTHORS | 1 + VERSION | 2 +- configure | 18 +- 4 files changed, 375 insertions(+), 351 deletions(-)

1 0

Gabriel Ivăncescu : mshtml: Implement classList's length prop.
by Alexandre Julliard 26 May '23

26 May '23

Module: wine Branch: master Commit: 808fcf23c78c30997fc4e44d4b201cf5a3c2ba71 URL: https://gitlab.winehq.org/wine/wine/-/commit/808fcf23c78c30997fc4e44d4b201c… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri May 26 17:04:39 2023 +0300 mshtml: Implement classList's length prop. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlelem.c | 31 +++++++++++++++++++++++++++++-- dlls/mshtml/tests/dom.js | 5 +++++ 2 files changed, 34 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 807457b087b..fd3cf149619 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -7599,10 +7599,37 @@ static HRESULT WINAPI token_list_contains(IWineDOMTokenList *iface, BSTR token, static HRESULT WINAPI token_list_get_length(IWineDOMTokenList *iface, LONG *p) { struct token_list *token_list = impl_from_IWineDOMTokenList(iface); + unsigned length = 0; + const WCHAR *ptr; + HRESULT hres; + BSTR list; - FIXME("(%p)->(%p)\n", token_list, p); + TRACE("(%p)->(%p)\n", token_list, p); - return E_NOTIMPL; + hres = IHTMLElement_get_className(token_list->element, &list); + if(FAILED(hres)) + return hres; + + if(!list) { + *p = 0; + return S_OK; + } + + ptr = list; + do { + while(iswspace(*ptr)) + ptr++; + if(!*ptr) + break; + length++; + ptr++; + while(*ptr && !iswspace(*ptr)) + ptr++; + } while(*ptr++); + + SysFreeString(list); + *p = length; + return S_OK; } static HRESULT WINAPI token_list_item(IWineDOMTokenList *iface, LONG index, VARIANT *p) diff --git a/dlls/mshtml/tests/dom.js b/dlls/mshtml/tests/dom.js index f373cfb11ea..67eb702452d 100644 --- a/dlls/mshtml/tests/dom.js +++ b/dlls/mshtml/tests/dom.js @@ -635,15 +635,19 @@ sync_test("classList", function() { classList.add("a"); ok(elem.className === "a", "Expected className 'a', got " + elem.className); + ok(classList.length === 1, "Expected length 1 for className 'a', got " + classList.length); classList.add("b"); ok(elem.className === "a b", "Expected className 'a b', got " + elem.className); + ok(classList.length === 2, "Expected length 2 for className 'a b', got " + classList.length); classList.add("c"); ok(elem.className === "a b c", "Expected className 'a b c', got " + elem.className); + ok(classList.length === 3, "Expected length 3 for className 'a b c', got " + classList.length); classList.add(4); ok(elem.className === "a b c 4", "Expected className 'a b c 4', got " + elem.className); + ok(classList.length === 4, "Expected length 4 for className 'a b c 4', got " + classList.length); classList.add("c"); ok(elem.className === "a b c 4", "(2) Expected className 'a b c 4', got " + elem.className); @@ -820,6 +824,7 @@ sync_test("classList", function() { ok(elem.className === "abc", "toggle('123', null): got className " + elem.className); elem.className = " testclass foobar "; + ok(classList.length === 2, "Expected length 2 for className ' testclass foobar ', got " + classList.length); ok(("" + classList) === " testclass foobar ", "Expected classList value ' testclass foobar ', got " + classList); ok(classList.toString() === " testclass foobar ", "Expected classList toString ' testclass foobar ', got " + classList.toString()); });

1 0

Gabriel Ivăncescu : mshtml: Implement classList's item() method.
by Alexandre Julliard 26 May '23

26 May '23

Module: wine Branch: master Commit: e807da918ba6014e15000cd6ae364514dca5e88c URL: https://gitlab.winehq.org/wine/wine/-/commit/e807da918ba6014e15000cd6ae3645… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri May 26 17:04:39 2023 +0300 mshtml: Implement classList's item() method. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlelem.c | 47 +++++++++++++++++++++++++++++++++++++++++++++-- dlls/mshtml/tests/dom.js | 13 +++++++++++++ 2 files changed, 58 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index fd3cf149619..6f3d6c37aa4 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -7635,10 +7635,53 @@ static HRESULT WINAPI token_list_get_length(IWineDOMTokenList *iface, LONG *p) static HRESULT WINAPI token_list_item(IWineDOMTokenList *iface, LONG index, VARIANT *p) { struct token_list *token_list = impl_from_IWineDOMTokenList(iface); + BSTR list, token = NULL; + unsigned i = 0; + HRESULT hres; + WCHAR *ptr; - FIXME("(%p)->(%ld %p)\n", token_list, index, p); + TRACE("(%p)->(%ld %p)\n", token_list, index, p); - return E_NOTIMPL; + hres = IHTMLElement_get_className(token_list->element, &list); + if(FAILED(hres)) + return hres; + + if(!list) { + V_VT(p) = VT_NULL; + return S_OK; + } + + ptr = list; + do { + while(iswspace(*ptr)) + ptr++; + if(!*ptr) + break; + if(i == index) { + token = ptr++; + while(*ptr && !iswspace(*ptr)) + ptr++; + token = SysAllocStringLen(token, ptr - token); + if(!token) { + SysFreeString(list); + return E_OUTOFMEMORY; + } + break; + } + i++; + ptr++; + while(*ptr && !iswspace(*ptr)) + ptr++; + } while(*ptr++); + + SysFreeString(list); + if(!token) + V_VT(p) = VT_NULL; + else { + V_VT(p) = VT_BSTR; + V_BSTR(p) = token; + } + return S_OK; } static HRESULT WINAPI token_list_toString(IWineDOMTokenList *iface, BSTR *String) diff --git a/dlls/mshtml/tests/dom.js b/dlls/mshtml/tests/dom.js index 67eb702452d..8a60cb2e1e4 100644 --- a/dlls/mshtml/tests/dom.js +++ b/dlls/mshtml/tests/dom.js @@ -726,6 +726,19 @@ sync_test("classList", function() { ok(classList.contains("b") === true, "contains: expected 'b' to return true"); ok(classList.contains("d") === false, "contains: expected 'd' to return false"); + r = classList.item(-1); + ok(r === null, "item(-1) = " + r); + r = classList.item(0); + ok(r === "a", "item(0) = " + r); + r = classList.item(1); + ok(r === "b", "item(1) = " + r); + r = classList.item(2); + ok(r === "c", "item(2) = " + r); + r = classList.item(3); + ok(r === "4", "item(3) = " + r); + r = classList.item(4); + ok(r === null, "item(4) = " + r); + classList.remove("e"); ok(elem.className === "a b c 4", "remove: expected className 'a b c 4', got " + elem.className);

1 0

Gabriel Ivăncescu : mshtml: Implement indexed props for classList.
by Alexandre Julliard 26 May '23

26 May '23

Module: wine Branch: master Commit: 13e94072dd02c85e193f3abe89ff316b5b0d9a07 URL: https://gitlab.winehq.org/wine/wine/-/commit/13e94072dd02c85e193f3abe89ff31… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri May 26 17:04:39 2023 +0300 mshtml: Implement indexed props for classList. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlelem.c | 61 +++++++++++++++++++++++++++++++++++++++++++- dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/tests/dom.js | 33 ++++++++++++++++++++++++ 3 files changed, 94 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 6f3d6c37aa4..21a1ad69254 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -7710,6 +7710,9 @@ static const IWineDOMTokenListVtbl WineDOMTokenListVtbl = { token_list_toString }; +/* idx can be negative, so offset it halfway through custom dispids */ +#define DISPID_TOKENLIST_0 (MSHTML_DISPID_CUSTOM_MIN + (MSHTML_DISPID_CUSTOM_MAX+1 - MSHTML_DISPID_CUSTOM_MIN) / 2) + static inline struct token_list *token_list_from_DispatchEx(DispatchEx *iface) { return CONTAINING_RECORD(iface, struct token_list, dispex); @@ -7736,8 +7739,64 @@ static HRESULT token_list_value(DispatchEx *dispex, LCID lcid, WORD flags, DISPP return S_OK; } +static HRESULT token_list_get_dispid(DispatchEx *dispex, BSTR name, DWORD flags, DISPID *dispid) +{ + WCHAR *end; + LONG idx; + ULONG i; + + idx = wcstol(name, &end, 10); + if(*end) + return DISP_E_UNKNOWNNAME; + + i = idx + DISPID_TOKENLIST_0 - MSHTML_DISPID_CUSTOM_MIN; + if(i > MSHTML_CUSTOM_DISPID_CNT) + return DISP_E_UNKNOWNNAME; + + *dispid = MSHTML_DISPID_CUSTOM_MIN + i; + return S_OK; +} + +static HRESULT token_list_get_name(DispatchEx *dispex, DISPID id, BSTR *name) +{ + LONG idx = id - MSHTML_DISPID_CUSTOM_MIN; + WCHAR buf[12]; + UINT len; + + len = swprintf(buf, ARRAY_SIZE(buf), L"%d", idx); + return (*name = SysAllocStringLen(buf, len)) ? S_OK : E_OUTOFMEMORY; +} + +static HRESULT token_list_invoke(DispatchEx *dispex, DISPID id, LCID lcid, WORD flags, DISPPARAMS *params, + VARIANT *res, EXCEPINFO *ei, IServiceProvider *caller) +{ + struct token_list *token_list = token_list_from_DispatchEx(dispex); + + TRACE("(%p)->(%lx %lx %x %p %p %p %p)\n", token_list, id, lcid, flags, params, res, ei, caller); + + switch(flags) { + case DISPATCH_PROPERTYGET: + return token_list_item(&token_list->IWineDOMTokenList_iface, id - DISPID_TOKENLIST_0, res); + case DISPATCH_PROPERTYPUTREF|DISPATCH_PROPERTYPUT: + case DISPATCH_PROPERTYPUTREF: + case DISPATCH_PROPERTYPUT: + /* Ignored by IE */ + return S_OK; + case DISPATCH_METHOD|DISPATCH_PROPERTYGET: + case DISPATCH_METHOD: + return MSHTML_E_NOT_FUNC; + default: + break; + } + + return MSHTML_E_INVALID_ACTION; +} + static const dispex_static_data_vtbl_t token_list_dispex_vtbl = { - token_list_value + token_list_value, + token_list_get_dispid, + token_list_get_name, + token_list_invoke }; static const tid_t token_list_iface_tids[] = { diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 8a14d2ee47f..4bc492f7532 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -75,6 +75,7 @@ #define MSHTML_E_INVALID_PROPERTY 0x800a01b6 #define MSHTML_E_INVALID_ACTION 0x800a01bd #define MSHTML_E_NODOC 0x800a025c +#define MSHTML_E_NOT_FUNC 0x800a138a typedef struct DOMEvent DOMEvent; typedef struct HTMLDOMNode HTMLDOMNode; diff --git a/dlls/mshtml/tests/dom.js b/dlls/mshtml/tests/dom.js index 8a60cb2e1e4..4f2d1a5edc5 100644 --- a/dlls/mshtml/tests/dom.js +++ b/dlls/mshtml/tests/dom.js @@ -840,6 +840,39 @@ sync_test("classList", function() { ok(classList.length === 2, "Expected length 2 for className ' testclass foobar ', got " + classList.length); ok(("" + classList) === " testclass foobar ", "Expected classList value ' testclass foobar ', got " + classList); ok(classList.toString() === " testclass foobar ", "Expected classList toString ' testclass foobar ', got " + classList.toString()); + + r = classList[-1]; + ok(r === null, "classList[-1] = " + r); + r = classList[0]; + ok(r === "testclass", "classList[0] = " + r); + r = classList[1]; + ok(r === "foobar", "classList[1] = " + r); + r = classList[2]; + ok(r === null, "classList[2] = " + r); + + classList[0] = "barfoo"; + classList[2] = "added"; + ok(classList.toString() === " testclass foobar ", "Expected classList toString to not be changed after setting indexed props, got " + classList.toString()); + + try + { + classList[0](); + ok(false, "Expected exception calling classList[0]"); + } + catch(e) + { + ok(e.number === 0xa138a - 0x80000000, "Calling classList[0] threw " + e.number); + } + + try + { + new classList[0](); + ok(false, "Expected exception calling classList[0] as constructor"); + } + catch(e) + { + ok(e.number === 0xa01bd - 0x80000000, "Calling classList[0] as constructor threw " + e.number); + } }); sync_test("importNode", function() {

1 0

Rémi Bernon : imm32: Silence some unnecessary FIXMEs.
by Alexandre Julliard 26 May '23

26 May '23

Module: wine Branch: master Commit: 0e90213ed8961b533cdaad3179f200b5e2a81887 URL: https://gitlab.winehq.org/wine/wine/-/commit/0e90213ed8961b533cdaad3179f200… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri May 26 17:52:40 2023 +0200 imm32: Silence some unnecessary FIXMEs. --- dlls/imm32/ime.c | 7 +------ dlls/imm32/imm.c | 11 +++-------- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/dlls/imm32/ime.c b/dlls/imm32/ime.c index e15367f5fa8..fa8e94acb21 100644 --- a/dlls/imm32/ime.c +++ b/dlls/imm32/ime.c @@ -396,7 +396,6 @@ static LRESULT ime_ui_notify( HIMC himc, HWND hwnd, WPARAM wparam, LPARAM lparam case IMN_WINE_SET_COMP_STRING: return ime_set_comp_string( himc, lparam ); default: - FIXME( "himc %p, hwnd %p, wparam %s, lparam %#Ix stub!\n", hwnd, himc, debugstr_imn(wparam), lparam ); return 0; } } @@ -503,8 +502,7 @@ BOOL WINAPI ImeSelect( HIMC himc, BOOL select ) BOOL WINAPI ImeSetActiveContext( HIMC himc, BOOL flag ) { - static int once; - if (!once++) FIXME( "himc %p, flag %#x stub!\n", himc, flag ); + TRACE( "himc %p, flag %#x stub!\n", himc, flag ); return TRUE; } @@ -661,9 +659,6 @@ BOOL WINAPI NotifyIME( HIMC himc, DWORD action, DWORD index, DWORD value ) } NtUserNotifyIMEStatus( ctx->hWnd, ctx->fOpen ); break; - default: - FIXME( "himc %p, action %#lx, index %#lx, value %#lx stub!\n", himc, action, index, value ); - break; } break; diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index aa1881e0918..c2cd5415e98 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -2337,15 +2337,10 @@ BOOL WINAPI ImmRegisterWordW( HKL hkl, const WCHAR *readingW, DWORD style, const /*********************************************************************** * ImmReleaseContext (IMM32.@) */ -BOOL WINAPI ImmReleaseContext(HWND hWnd, HIMC hIMC) +BOOL WINAPI ImmReleaseContext( HWND hwnd, HIMC himc ) { - static BOOL shown = FALSE; - - if (!shown) { - FIXME("(%p, %p): stub\n", hWnd, hIMC); - shown = TRUE; - } - return TRUE; + TRACE( "hwnd %p, himc %p\n", hwnd, himc ); + return TRUE; } /***********************************************************************

1 0