April 2024 - Wine-commits - list.winehq.org

Alexandre Julliard : widl: Use the correct type for non-encapsulated union discriminants.
by Alexandre Julliard 02 Apr '24

02 Apr '24

Module: wine Branch: master Commit: 4f8958eb56bb302b20f1c34b7aef9f65f7954ce1 URL: https://gitlab.winehq.org/wine/wine/-/commit/4f8958eb56bb302b20f1c34b7aef9f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 1 15:34:32 2024 +0200 widl: Use the correct type for non-encapsulated union discriminants. --- tools/widl/typegen.c | 97 ++++++++++++++++++++++++++-------------------------- 1 file changed, 48 insertions(+), 49 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 0b2caea8a19..a714ff8df71 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -1621,6 +1621,41 @@ static int write_base_type(FILE *file, const type_t *type, unsigned int *typestr return 1; } +static unsigned char get_correlation_type( const type_t *correlation_var ) +{ + unsigned char fc; + + switch (type_get_type(correlation_var)) + { + case TYPE_BASIC: + fc = get_basic_fc(correlation_var); + switch (fc) + { + case FC_SMALL: + case FC_USMALL: + case FC_SHORT: + case FC_USHORT: + case FC_LONG: + case FC_ULONG: + return fc; + case FC_CHAR: + return FC_SMALL; + case FC_BYTE: + return FC_USMALL; + case FC_WCHAR: + return FC_SHORT; + } + break; + case TYPE_ENUM: + return (get_enum_fc(correlation_var) == FC_ENUM32) ? FC_LONG : FC_SHORT; + case TYPE_POINTER: + return (pointer_size == 8) ? FC_HYPER : FC_LONG; + default: + break; + } + return 0; +} + /* write conformance / variance descriptor */ static unsigned int write_conf_or_var_desc(FILE *file, const type_t *cont_type, unsigned int baseoff, const type_t *type, @@ -1714,7 +1749,7 @@ static unsigned int write_conf_or_var_desc(FILE *file, const type_t *cont_type, if (subexpr->type == EXPR_IDENTIFIER) { const type_t *correlation_variable = NULL; - unsigned char param_type = 0; + unsigned char param_type; unsigned int offset = 0; const var_t *var; struct expr_loc expr_loc; @@ -1760,51 +1795,8 @@ static unsigned int write_conf_or_var_desc(FILE *file, const type_t *cont_type, offset -= baseoff; - if (type_get_type(correlation_variable) == TYPE_BASIC) - { - switch (get_basic_fc(correlation_variable)) - { - case FC_CHAR: - case FC_SMALL: - param_type = FC_SMALL; - break; - case FC_BYTE: - case FC_USMALL: - param_type = FC_USMALL; - break; - case FC_WCHAR: - case FC_SHORT: - param_type = FC_SHORT; - break; - case FC_USHORT: - param_type = FC_USHORT; - break; - case FC_LONG: - param_type = FC_LONG; - break; - case FC_ULONG: - param_type = FC_ULONG; - break; - default: - error("write_conf_or_var_desc: conformance variable type not supported 0x%x\n", - get_basic_fc(correlation_variable)); - } - } - else if (type_get_type(correlation_variable) == TYPE_ENUM) - { - if (get_enum_fc(correlation_variable) == FC_ENUM32) - param_type = FC_LONG; - else - param_type = FC_SHORT; - } - else if (type_get_type(correlation_variable) == TYPE_POINTER) - { - if (pointer_size == 8) - param_type = FC_HYPER; - else - param_type = FC_LONG; - } - else + param_type = get_correlation_type( correlation_variable ); + if (!param_type) { error("write_conf_or_var_desc: non-arithmetic type used as correlation variable %s\n", subexpr->u.sval); @@ -2505,13 +2497,20 @@ static void write_descriptors(FILE *file, type_t *type, unsigned int *tfsoff) { short reloff; unsigned int absoff = ft->typestring_offset; + unsigned char fc; + const expr_t *switch_is = get_attrp(f->attrs, ATTR_SWITCHIS); + struct expr_loc expr_loc = { .v = f }; + + fc = get_correlation_type( expr_resolve_type( &expr_loc, current_structure, switch_is )); + if (!fc) fc = FC_LONG; + if (is_attr(ft->attrs, ATTR_SWITCHTYPE)) absoff += 8; /* we already have a corr descr, skip it */ print_file(file, 0, "/* %d */\n", *tfsoff); print_file(file, 2, "0x%x,\t/* FC_NON_ENCAPSULATED_UNION */\n", FC_NON_ENCAPSULATED_UNION); - print_file(file, 2, "0x%x,\t/* FIXME: always FC_LONG */\n", FC_LONG); - *tfsoff += 2 + write_conf_or_var_desc(file, current_structure, offset, ft, - get_attrp(f->attrs, ATTR_SWITCHIS), 0); + print_file(file, 2, "0x%x,\t/* %s */\n", fc, string_of_type(fc)); + + *tfsoff += 2 + write_conf_or_var_desc(file, current_structure, offset, ft, switch_is, 0); reloff = absoff - *tfsoff; print_file(file, 2, "NdrFcShort(0x%hx),\t/* Offset= %hd (%u) */\n", (unsigned short)reloff, reloff, absoff);

1 0

Eric Pouech : cmd: Add test for substring handling in 'magic' variable expansion.
by Alexandre Julliard 01 Apr '24

01 Apr '24

Module: wine Branch: master Commit: b868d82391d5c535ba0e740f1287e23b7671e706 URL: https://gitlab.winehq.org/wine/wine/-/commit/b868d82391d5c535ba0e740f1287e2… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Sun Mar 31 09:44:42 2024 +0200 cmd: Add test for substring handling in 'magic' variable expansion. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- programs/cmd/tests/test_builtins.cmd | 6 ++++++ programs/cmd/tests/test_builtins.cmd.exp | 2 ++ 2 files changed, 8 insertions(+) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 1ab2935aec4..7517cca343f 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -622,7 +622,13 @@ echo %WINE_VAR:~2,-1% echo %WINE_VAR:~2,-3% echo '%WINE_VAR:~-2,-4%' echo %WINE_VAR:~-3,-2% +echo %WINE_VAR:~4,4% set WINE_VAR= +mkdir dummydir +cd dummydir +echo %CD:~-6,6% +cd .. +rmdir dummydir echo ------------ Testing variable substitution ------------ echo --- in FOR variables diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 0fb4a597ac5..7030748d549 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -532,6 +532,8 @@ ert(a)or_broken@qwerty e(a)or_broken@qwerty ''@or_broken@'qwerty' r(a)or_broken@qwerty +ty +(a)todo_wine@mmydir ------------ Testing variable substitution ------------ --- in FOR variables "A B"

1 0

Eric Pouech : cmd: Fix substring expansion for 'magic' variables.
by Alexandre Julliard 01 Apr '24

01 Apr '24

Module: wine Branch: master Commit: 7f60584a9032664c3904ac563e65efe70be60814 URL: https://gitlab.winehq.org/wine/wine/-/commit/7f60584a9032664c3904ac563e65ef… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Sat Mar 30 16:00:42 2024 +0100 cmd: Fix substring expansion for 'magic' variables. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56498 Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- programs/cmd/tests/test_builtins.cmd.exp | 2 +- programs/cmd/wcmdmain.c | 32 +++++++++++++------------------- 2 files changed, 14 insertions(+), 20 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 7030748d549..1365a5c3474 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -533,7 +533,7 @@ e(a)or_broken@qwerty ''@or_broken@'qwerty' r(a)or_broken@qwerty ty -(a)todo_wine@mmydir +mmydir ------------ Testing variable substitution ------------ --- in FOR variables "A B" diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 1867c5afb92..eb66b29836e 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -614,25 +614,19 @@ static WCHAR *WCMD_expand_envvar(WCHAR *start, WCHAR startchar) /* Handle DATE, TIME, ERRORLEVEL and CD replacements allowing */ /* override if existing env var called that name */ if (WCMD_is_magic_envvar(thisVar, L"ERRORLEVEL")) { - wsprintfW(thisVarContents, L"%d", errorlevel); - len = lstrlenW(thisVarContents); + len = wsprintfW(thisVarContents, L"%d", errorlevel); } else if (WCMD_is_magic_envvar(thisVar, L"DATE")) { - GetDateFormatW(LOCALE_USER_DEFAULT, DATE_SHORTDATE, NULL, - NULL, thisVarContents, MAXSTRING); - len = lstrlenW(thisVarContents); + len = GetDateFormatW(LOCALE_USER_DEFAULT, DATE_SHORTDATE, NULL, + NULL, thisVarContents, ARRAY_SIZE(thisVarContents)); } else if (WCMD_is_magic_envvar(thisVar, L"TIME")) { - GetTimeFormatW(LOCALE_USER_DEFAULT, TIME_NOSECONDS, NULL, - NULL, thisVarContents, MAXSTRING); - len = lstrlenW(thisVarContents); + len = GetTimeFormatW(LOCALE_USER_DEFAULT, TIME_NOSECONDS, NULL, + NULL, thisVarContents, ARRAY_SIZE(thisVarContents)); } else if (WCMD_is_magic_envvar(thisVar, L"CD")) { - GetCurrentDirectoryW(MAXSTRING, thisVarContents); - len = lstrlenW(thisVarContents); + len = GetCurrentDirectoryW(ARRAY_SIZE(thisVarContents), thisVarContents); } else if (WCMD_is_magic_envvar(thisVar, L"RANDOM")) { - wsprintfW(thisVarContents, L"%d", rand() % 32768); - len = lstrlenW(thisVarContents); + len = wsprintfW(thisVarContents, L"%d", rand() % 32768); } else { - - len = ExpandEnvironmentStringsW(thisVar, thisVarContents, ARRAY_SIZE(thisVarContents)); + if ((len = ExpandEnvironmentStringsW(thisVar, thisVarContents, ARRAY_SIZE(thisVarContents)))) len--; } if (len == 0) @@ -704,9 +698,9 @@ static WCHAR *WCMD_expand_envvar(WCHAR *start, WCHAR startchar) /* Check bounds */ if (substrposition >= 0) { - startCopy = &thisVarContents[min(substrposition, len)]; + startCopy = &thisVarContents[min(substrposition, len - 1)]; } else { - startCopy = &thisVarContents[max(0, len+substrposition-1)]; + startCopy = &thisVarContents[max(0, len + substrposition)]; } if (commapos == NULL) { @@ -714,12 +708,12 @@ static WCHAR *WCMD_expand_envvar(WCHAR *start, WCHAR startchar) WCMD_strsubstW(start, endOfVar + 1, startCopy, -1); } else if (substrlength < 0) { - int copybytes = (len+substrlength-1)-(startCopy-thisVarContents); - if (copybytes > len) copybytes = len; + int copybytes = len + substrlength - (startCopy - thisVarContents); + if (copybytes >= len) copybytes = len - 1; else if (copybytes < 0) copybytes = 0; WCMD_strsubstW(start, endOfVar + 1, startCopy, copybytes); } else { - substrlength = min(substrlength, len - (startCopy- thisVarContents + 1)); + substrlength = min(substrlength, len - (startCopy - thisVarContents)); WCMD_strsubstW(start, endOfVar + 1, startCopy, substrlength); }

1 0

Alexandre Julliard : msi/tests: Delete the temp .msi file in all failure cases.
by Alexandre Julliard 01 Apr '24

01 Apr '24

Module: wine Branch: master Commit: 43fb0ecd0717ad1a6aa0702ed68368ee35d3ecda URL: https://gitlab.winehq.org/wine/wine/-/commit/43fb0ecd0717ad1a6aa0702ed68368… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 29 22:41:36 2024 +0100 msi/tests: Delete the temp .msi file in all failure cases. --- dlls/msi/tests/automation.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msi/tests/automation.c b/dlls/msi/tests/automation.c index 45354cc2bb2..d61ee82b1a2 100644 --- a/dlls/msi/tests/automation.c +++ b/dlls/msi/tests/automation.c @@ -423,7 +423,6 @@ static BOOL delete_pf(const CHAR *rel_path, BOOL is_file) static void delete_test_files(void) { - DeleteFileA(msifile); DeleteFileA("msitest\\cabout\\new\\five.txt"); DeleteFileA("msitest\\cabout\\four.txt"); DeleteFileA("msitest\\second\\three.txt"); @@ -2691,6 +2690,7 @@ static void test_Installer(void) /* Installer::InstallProduct and other tests that depend on our product being installed */ test_Installer_InstallProduct(); + DeleteFileA(msifile); } START_TEST(automation)

1 0

Rémi Bernon : mf/session: Avoid leaking samples in transform_node_deliver_samples.
by Alexandre Julliard 01 Apr '24

01 Apr '24

Module: wine Branch: master Commit: 593dcb1b5c78dbf0fc8146cba94372c78a1550b0 URL: https://gitlab.winehq.org/wine/wine/-/commit/593dcb1b5c78dbf0fc8146cba94372… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Mar 13 10:27:26 2024 +0100 mf/session: Avoid leaking samples in transform_node_deliver_samples. --- dlls/mf/session.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index 9074ad2de25..ba18261674d 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -3334,7 +3334,10 @@ static void transform_node_deliver_samples(struct media_session *session, struct stream = &topo_node->u.transform.inputs[input]; if (SUCCEEDED(transform_stream_pop_sample(stream, &sample))) + { session_deliver_sample_to_node(session, topo_node->node, input, sample); + IMFSample_Release(sample); + } else if (FAILED(hr = IMFTopologyNode_GetInput(topo_node->node, input, &up_node, &output))) WARN("Failed to get node %p/%lu input, hr %#lx\n", topo_node->node, input, hr); else

1 0

Jacek Caban : ntdll: Use __ASM_GLOBAL_IMPORT for RtlUnwind.
by Alexandre Julliard 01 Apr '24

01 Apr '24

Module: wine Branch: master Commit: aa2aa2033cd1d56a36546a49fe1b795fe6cdc077 URL: https://gitlab.winehq.org/wine/wine/-/commit/aa2aa2033cd1d56a36546a49fe1b79… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 1 16:59:41 2024 +0200 ntdll: Use __ASM_GLOBAL_IMPORT for RtlUnwind. Avoids importing locally defined symbols on ARM and ARM64, where we call it from winecrt0. --- dlls/ntdll/unwind.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/ntdll/unwind.c b/dlls/ntdll/unwind.c index 06779247da1..5d830536688 100644 --- a/dlls/ntdll/unwind.c +++ b/dlls/ntdll/unwind.c @@ -2329,6 +2329,8 @@ void WINAPI RtlUnwind( void *frame, void *target_ip, EXCEPTION_RECORD *rec, void RtlUnwindEx( frame, target_ip, rec, retval, &context, NULL ); } +__ASM_GLOBAL_IMPORT(RtlUnwind) + /******************************************************************* * _local_unwind (NTDLL.@)

1 0

Nikolay Sivov : d2d1/effect: Use effect property types identifier directly in initializers.
by Alexandre Julliard 01 Apr '24

01 Apr '24

Module: wine Branch: master Commit: 43ce2bf5da1620e8b4a4756b65efc571fa1f5f59 URL: https://gitlab.winehq.org/wine/wine/-/commit/43ce2bf5da1620e8b4a4756b65efc5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Mar 31 17:52:33 2024 +0200 d2d1/effect: Use effect property types identifier directly in initializers. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d2d1/effect.c | 38 +++++++++++++++++++------------------- dlls/d2d1/factory.c | 38 +++++++++++++++++++------------------- 2 files changed, 38 insertions(+), 38 deletions(-) diff --git a/dlls/d2d1/effect.c b/dlls/d2d1/effect.c index 8dc006c1293..7f1f726b7a5 100644 --- a/dlls/d2d1/effect.c +++ b/dlls/d2d1/effect.c @@ -361,25 +361,25 @@ static HRESULT d2d_effect_properties_internal_add(struct d2d_effect_properties * { static const UINT32 sizes[] = { - 0, /* D2D1_PROPERTY_TYPE_UNKNOWN */ - 0, /* D2D1_PROPERTY_TYPE_STRING */ - sizeof(BOOL), /* D2D1_PROPERTY_TYPE_BOOL */ - sizeof(UINT32), /* D2D1_PROPERTY_TYPE_UINT32 */ - sizeof(INT32), /* D2D1_PROPERTY_TYPE_INT32 */ - sizeof(float), /* D2D1_PROPERTY_TYPE_FLOAT */ - 2 * sizeof(float), /* D2D1_PROPERTY_TYPE_VECTOR2 */ - 3 * sizeof(float), /* D2D1_PROPERTY_TYPE_VECTOR3 */ - 4 * sizeof(float), /* D2D1_PROPERTY_TYPE_VECTOR4 */ - 0, /* FIXME: D2D1_PROPERTY_TYPE_BLOB */ - sizeof(void *), /* D2D1_PROPERTY_TYPE_IUNKNOWN */ - sizeof(UINT32), /* D2D1_PROPERTY_TYPE_ENUM */ - sizeof(UINT32), /* D2D1_PROPERTY_TYPE_ARRAY */ - sizeof(CLSID), /* D2D1_PROPERTY_TYPE_CLSID */ - 6 * sizeof(float), /* D2D1_PROPERTY_TYPE_MATRIX_3X2 */ - 12 * sizeof(float), /* D2D1_PROPERTY_TYPE_MATRIX_4X3 */ - 16 * sizeof(float), /* D2D1_PROPERTY_TYPE_MATRIX_4X4 */ - 20 * sizeof(float), /* D2D1_PROPERTY_TYPE_MATRIX_5X4 */ - sizeof(void *), /* D2D1_PROPERTY_TYPE_COLOR_CONTEXT */ + [D2D1_PROPERTY_TYPE_UNKNOWN] = 0, + [D2D1_PROPERTY_TYPE_STRING] = 0, + [D2D1_PROPERTY_TYPE_BOOL] = sizeof(BOOL), + [D2D1_PROPERTY_TYPE_UINT32] = sizeof(UINT32), + [D2D1_PROPERTY_TYPE_INT32] = sizeof(INT32), + [D2D1_PROPERTY_TYPE_FLOAT] = sizeof(float), + [D2D1_PROPERTY_TYPE_VECTOR2] = sizeof(D2D_VECTOR_2F), + [D2D1_PROPERTY_TYPE_VECTOR3] = sizeof(D2D_VECTOR_3F), + [D2D1_PROPERTY_TYPE_VECTOR4] = sizeof(D2D_VECTOR_4F), + [D2D1_PROPERTY_TYPE_BLOB] = 0 /* FIXME */, + [D2D1_PROPERTY_TYPE_IUNKNOWN] = sizeof(IUnknown *), + [D2D1_PROPERTY_TYPE_ENUM] = sizeof(UINT32), + [D2D1_PROPERTY_TYPE_ARRAY] = sizeof(UINT32), + [D2D1_PROPERTY_TYPE_CLSID] = sizeof(CLSID), + [D2D1_PROPERTY_TYPE_MATRIX_3X2] = sizeof(D2D_MATRIX_3X2_F), + [D2D1_PROPERTY_TYPE_MATRIX_4X3] = sizeof(D2D_MATRIX_4X3_F), + [D2D1_PROPERTY_TYPE_MATRIX_4X4] = sizeof(D2D_MATRIX_4X4_F), + [D2D1_PROPERTY_TYPE_MATRIX_5X4] = sizeof(D2D_MATRIX_5X4_F), + [D2D1_PROPERTY_TYPE_COLOR_CONTEXT] = sizeof(ID2D1ColorContext *), }; struct d2d_effect_property *p; HRESULT hr; diff --git a/dlls/d2d1/factory.c b/dlls/d2d1/factory.c index 0d74becf5a1..379e1b6b694 100644 --- a/dlls/d2d1/factory.c +++ b/dlls/d2d1/factory.c @@ -677,25 +677,25 @@ static HRESULT parse_effect_get_property_type(IXmlReader *reader, D2D1_PROPERTY_ { static const WCHAR *types[] = { - L"", /* D2D1_PROPERTY_TYPE_UNKNOWN */ - L"string", /* D2D1_PROPERTY_TYPE_STRING */ - L"bool", /* D2D1_PROPERTY_TYPE_BOOL */ - L"uint32", /* D2D1_PROPERTY_TYPE_UINT32 */ - L"int32", /* D2D1_PROPERTY_TYPE_INT32 */ - L"float", /* D2D1_PROPERTY_TYPE_FLOAT */ - L"vector2", /* D2D1_PROPERTY_TYPE_VECTOR2 */ - L"vector3", /* D2D1_PROPERTY_TYPE_VECTOR3 */ - L"vector4", /* D2D1_PROPERTY_TYPE_VECTOR4 */ - L"blob", /* D2D1_PROPERTY_TYPE_BLOB */ - L"iunknown", /* D2D1_PROPERTY_TYPE_IUNKNOWN */ - L"enum", /* D2D1_PROPERTY_TYPE_ENUM */ - L"array", /* D2D1_PROPERTY_TYPE_ARRAY */ - L"clsid", /* D2D1_PROPERTY_TYPE_CLSID */ - L"matrix3x2", /* D2D1_PROPERTY_TYPE_MATRIX_3X2 */ - L"matrix4x3", /* D2D1_PROPERTY_TYPE_MATRIX_4X3 */ - L"matrix4x4", /* D2D1_PROPERTY_TYPE_MATRIX_4X4 */ - L"matrix5x4", /* D2D1_PROPERTY_TYPE_MATRIX_5X4 */ - L"colorcontext", /* D2D1_PROPERTY_TYPE_COLOR_CONTEXT */ + [D2D1_PROPERTY_TYPE_UNKNOWN] = L"", + [D2D1_PROPERTY_TYPE_STRING] = L"string", + [D2D1_PROPERTY_TYPE_BOOL] = L"bool", + [D2D1_PROPERTY_TYPE_UINT32] = L"uint32", + [D2D1_PROPERTY_TYPE_INT32] = L"int32", + [D2D1_PROPERTY_TYPE_FLOAT] = L"float", + [D2D1_PROPERTY_TYPE_VECTOR2] = L"vector2", + [D2D1_PROPERTY_TYPE_VECTOR3] = L"vector3", + [D2D1_PROPERTY_TYPE_VECTOR4] = L"vector4", + [D2D1_PROPERTY_TYPE_BLOB] = L"blob", + [D2D1_PROPERTY_TYPE_IUNKNOWN] = L"iunknown", + [D2D1_PROPERTY_TYPE_ENUM] = L"enum", + [D2D1_PROPERTY_TYPE_ARRAY] = L"array", + [D2D1_PROPERTY_TYPE_CLSID] = L"clsid", + [D2D1_PROPERTY_TYPE_MATRIX_3X2] = L"matrix3x2", + [D2D1_PROPERTY_TYPE_MATRIX_4X3] = L"matrix4x3", + [D2D1_PROPERTY_TYPE_MATRIX_4X4] = L"matrix4x4", + [D2D1_PROPERTY_TYPE_MATRIX_5X4] = L"matrix5x4", + [D2D1_PROPERTY_TYPE_COLOR_CONTEXT] = L"colorcontext", }; unsigned int i; WCHAR *value;

1 0

Nikolay Sivov : d2d1/effect: Use a helper internally instead of IsShaderLoaded().
by Alexandre Julliard 01 Apr '24

01 Apr '24

Module: wine Branch: master Commit: 51b675ef7ff70bc6b6e2aa4f5bbe3320ce4f1b3d URL: https://gitlab.winehq.org/wine/wine/-/commit/51b675ef7ff70bc6b6e2aa4f5bbe33… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Mar 31 18:01:22 2024 +0200 d2d1/effect: Use a helper internally instead of IsShaderLoaded(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d2d1/effect.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d2d1/effect.c b/dlls/d2d1/effect.c index 7f1f726b7a5..50c4b01de12 100644 --- a/dlls/d2d1/effect.c +++ b/dlls/d2d1/effect.c @@ -813,7 +813,7 @@ static HRESULT STDMETHODCALLTYPE d2d_effect_context_LoadPixelShader(ID2D1EffectC TRACE("iface %p, shader_id %s, buffer %p, buffer_size %u.\n", iface, debugstr_guid(shader_id), buffer, buffer_size); - if (ID2D1EffectContext_IsShaderLoaded(iface, shader_id)) + if (d2d_device_is_shader_loaded(effect_context->device_context->device, shader_id)) return S_OK; if (FAILED(hr = ID3D11Device1_CreatePixelShader(effect_context->device_context->d3d_device, @@ -839,7 +839,7 @@ static HRESULT STDMETHODCALLTYPE d2d_effect_context_LoadVertexShader(ID2D1Effect TRACE("iface %p, shader_id %s, buffer %p, buffer_size %u.\n", iface, debugstr_guid(shader_id), buffer, buffer_size); - if (ID2D1EffectContext_IsShaderLoaded(iface, shader_id)) + if (d2d_device_is_shader_loaded(effect_context->device_context->device, shader_id)) return S_OK; if (FAILED(hr = ID3D11Device1_CreateVertexShader(effect_context->device_context->d3d_device, @@ -865,7 +865,7 @@ static HRESULT STDMETHODCALLTYPE d2d_effect_context_LoadComputeShader(ID2D1Effec TRACE("iface %p, shader_id %s, buffer %p, buffer_size %u.\n", iface, debugstr_guid(shader_id), buffer, buffer_size); - if (ID2D1EffectContext_IsShaderLoaded(iface, shader_id)) + if (d2d_device_is_shader_loaded(effect_context->device_context->device, shader_id)) return S_OK; if (FAILED(hr = ID3D11Device1_CreateComputeShader(effect_context->device_context->d3d_device,

1 0

Nikolay Sivov : d2d1/tests: Add a test for a custom effect using a pixel shader.
by Alexandre Julliard 01 Apr '24

01 Apr '24

Module: wine Branch: master Commit: f38a32e64c00600a5252fe0b9ca1ca42208bd6fe URL: https://gitlab.winehq.org/wine/wine/-/commit/f38a32e64c00600a5252fe0b9ca1ca… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 1 18:52:06 2024 +0200 d2d1/tests: Add a test for a custom effect using a pixel shader. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d2d1/tests/d2d1.c | 238 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 238 insertions(+)

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 01 Apr '24

01 Apr '24

Module: wine Branch: master Commit: 29c0826e6d01cdc14f6689309a3afe0da1275eee URL: https://gitlab.winehq.org/wine/wine/-/commit/29c0826e6d01cdc14f6689309a3afe… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Sat Mar 30 00:23:11 2024 +0200 po: Update Lithuanian translation. --- po/lt.po | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/po/lt.po b/po/lt.po index d414922e797..5e869e4252c 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,14 +5,14 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2024-03-01 00:38+0200\n" +"PO-Revision-Date: 2024-03-30 00:22+0200\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 3.0.1\n" +"X-Generator: Poedit 3.4.2\n" "X-Project-Style: default\n" #: dlls/aclui/aclui.rc:29 dlls/inetcpl.cpl/inetcpl.rc:90 @@ -19397,10 +19397,8 @@ msgid "Error: Invalid syntax for PATH\n" msgstr "Klaida: Netinkama PATH sintaksė\n" #: programs/wmic/wmic.rc:32 -#, fuzzy -#| msgid "Bad command.\n" msgid "Supply a command\n" -msgstr "Bloga komanda.\n" +msgstr "Pateikite komandą\n" #: programs/wordpad/wordpad.rc:31 msgid "&New...\tCtrl+N"

1 0