February 2023 - Wine-Commits

Alistair Leslie-Hughes : msado15: Field ActualSize return a default size.
by Alexandre Julliard Feb. 20, 2023

Feb. 20, 2023

Module: wine Branch: master Commit: 493751197dcf286558623e24f284eac3e7877196 URL: https://gitlab.winehq.org/wine/wine/-/commit/493751197dcf286558623e24f284ea… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Feb 20 13:21:16 2023 +1100 msado15: Field ActualSize return a default size. --- dlls/msado15/recordset.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c index ea5c233f95a..b8c4487d4c9 100644 --- a/dlls/msado15/recordset.c +++ b/dlls/msado15/recordset.c @@ -198,8 +198,10 @@ static HRESULT WINAPI field_get_Properties( Field *iface, Properties **obj ) static HRESULT WINAPI field_get_ActualSize( Field *iface, ADO_LONGPTR *size ) { - FIXME( "%p, %p\n", iface, size ); - return E_NOTIMPL; + struct field *field = impl_from_Field( iface ); + FIXME( "%p, %p\n", field, size ); + *size = 0; + return S_OK; } static HRESULT WINAPI field_get_Attributes( Field *iface, LONG *attrs )

1 0

Alistair Leslie-Hughes : msado15: Semi-stub _Recordset get/put Filter.
by Alexandre Julliard Feb. 20, 2023

Feb. 20, 2023

Module: wine Branch: master Commit: 669107f6c5e54f520a846caec9649163675784a4 URL: https://gitlab.winehq.org/wine/wine/-/commit/669107f6c5e54f520a846caec96491… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Apr 23 12:09:28 2021 +1000 msado15: Semi-stub _Recordset get/put Filter. --- dlls/msado15/recordset.c | 26 ++++++++++++++++++++++---- dlls/msado15/tests/msado15.c | 39 ++++++++++++++++++++++++++++++++++++++- 2 files changed, 60 insertions(+), 5 deletions(-) diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c index aa2db6e2968..ea5c233f95a 100644 --- a/dlls/msado15/recordset.c +++ b/dlls/msado15/recordset.c @@ -48,6 +48,7 @@ struct recordset CursorTypeEnum cursor_type; IRowset *row_set; EditModeEnum editmode; + VARIANT filter; }; struct fields @@ -1588,14 +1589,30 @@ static HRESULT WINAPI recordset_get_EditMode( _Recordset *iface, EditModeEnum *m static HRESULT WINAPI recordset_get_Filter( _Recordset *iface, VARIANT *criteria ) { - FIXME( "%p, %p\n", iface, criteria ); - return E_NOTIMPL; + struct recordset *recordset = impl_from_Recordset( iface ); + TRACE( "%p, %p\n", iface, criteria ); + + if (!criteria) return MAKE_ADO_HRESULT( adErrInvalidArgument ); + + VariantCopy(criteria, &recordset->filter); + return S_OK; } static HRESULT WINAPI recordset_put_Filter( _Recordset *iface, VARIANT criteria ) { - FIXME( "%p, %s\n", iface, debugstr_variant(&criteria) ); - return E_NOTIMPL; + struct recordset *recordset = impl_from_Recordset( iface ); + TRACE( "%p, %s\n", recordset, debugstr_variant(&criteria) ); + + if (V_VT(&criteria) != VT_I2 && V_VT(&criteria) != VT_I4 && V_VT(&criteria) != VT_BSTR) + return MAKE_ADO_HRESULT( adErrInvalidArgument ); + + if (V_VT(&criteria) == VT_BSTR && recordset->state == adStateOpen) + { + FIXME("Validating fields not preformed\n"); + } + + VariantCopy(&recordset->filter, &criteria); + return S_OK; } static HRESULT WINAPI recordset_get_PageCount( _Recordset *iface, ADO_LONGPTR *count ) @@ -2131,6 +2148,7 @@ HRESULT Recordset_create( void **obj ) recordset->cursor_type = adOpenForwardOnly; recordset->row_set = NULL; recordset->editmode = adEditNone; + VariantInit( &recordset->filter ); *obj = &recordset->Recordset_iface; TRACE( "returning iface %p\n", *obj ); diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index b39adf58b22..724787870e0 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -59,7 +59,7 @@ static void test_Recordset(void) CursorTypeEnum cursor; BSTR name; HRESULT hr; - VARIANT bookmark; + VARIANT bookmark, filter; EditModeEnum editmode; hr = CoCreateInstance( &CLSID_Recordset, NULL, CLSCTX_INPROC_SERVER, &IID__Recordset, (void **)&recordset ); @@ -123,6 +123,26 @@ static void test_Recordset(void) hr = _Recordset_put_Bookmark( recordset, bookmark ); ok( hr == MAKE_ADO_HRESULT( adErrObjectClosed ), "got %08lx\n", hr ); + VariantInit( &filter ); + hr = _Recordset_put_Filter( recordset, filter ); + ok( hr == MAKE_ADO_HRESULT( adErrInvalidArgument ), "got %08lx\n", hr ); + + V_VT(&filter) = VT_BSTR; + V_BSTR(&filter) = SysAllocString( L"field1 = 1" ); + hr = _Recordset_put_Filter( recordset, filter ); + ok( hr == S_OK, "got %08lx\n", hr ); + VariantClear(&filter); + + V_VT(&filter) = VT_I4; + V_I4(&filter) = 0; + hr = _Recordset_put_Filter( recordset, filter ); + ok( hr == S_OK, "got %08lx\n", hr ); + + V_VT(&filter) = VT_I2; + V_I2(&filter) = 0; + hr = _Recordset_put_Filter( recordset, filter ); + ok( hr == S_OK, "got %08lx\n", hr ); + VariantInit( &missing ); hr = _Recordset_AddNew( recordset, missing, missing ); ok( hr == MAKE_ADO_HRESULT( adErrObjectClosed ), "got %08lx\n", hr ); @@ -248,6 +268,23 @@ static void test_Recordset(void) ok( fields2 == fields, "expected same object\n" ); Fields_Release( fields2 ); + V_VT(&filter) = VT_BSTR; + V_BSTR(&filter) = SysAllocString( L"field1 = 1" ); + hr = _Recordset_put_Filter( recordset, filter ); + todo_wine ok( hr == MAKE_ADO_HRESULT( adErrItemNotFound ), "got %08lx\n", hr ); + VariantClear(&filter); + + V_VT(&filter) = VT_BSTR; + V_BSTR(&filter) = SysAllocString( L"field = 1" ); + hr = _Recordset_put_Filter( recordset, filter ); + ok( hr == S_OK, "got %08lx\n", hr ); + VariantClear(&filter); + + V_VT(&filter) = VT_I4; + V_I4(&filter) = 0; + hr = _Recordset_put_Filter( recordset, filter ); + ok( hr == S_OK, "got %08lx\n", hr ); + count = -1; hr = Fields_get_Count( fields2, &count ); ok( count == 1, "got %ld\n", count );

1 0

Connor McAdams : uiautomationcore: Register all UI Automation typelibs.
by Alexandre Julliard Feb. 20, 2023

Feb. 20, 2023

Module: wine Branch: master Commit: 88a1e949718cfbffedc46a63a8ad7dad05418dd1 URL: https://gitlab.winehq.org/wine/wine/-/commit/88a1e949718cfbffedc46a63a8ad7d… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Tue Dec 27 14:56:21 2022 -0500 uiautomationcore: Register all UI Automation typelibs. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/Makefile.in | 4 +++- dlls/uiautomationcore/uia_classes.idl | 1 + dlls/uiautomationcore/uia_classes_client.idl | 21 +++++++++++++++++++++ dlls/uiautomationcore/uia_classes_core.idl | 21 +++++++++++++++++++++ include/uiautomationclient.idl | 1 + include/uiautomationcore.idl | 1 + 6 files changed, 48 insertions(+), 1 deletion(-) diff --git a/dlls/uiautomationcore/Makefile.in b/dlls/uiautomationcore/Makefile.in index 9910e8e336e..a597c580b24 100644 --- a/dlls/uiautomationcore/Makefile.in +++ b/dlls/uiautomationcore/Makefile.in @@ -11,4 +11,6 @@ C_SRCS = \ uia_provider.c IDL_SRCS = \ - uia_classes.idl + uia_classes.idl \ + uia_classes_client.idl \ + uia_classes_core.idl diff --git a/dlls/uiautomationcore/uia_classes.idl b/dlls/uiautomationcore/uia_classes.idl index f0a20d61579..aee34c0221d 100644 --- a/dlls/uiautomationcore/uia_classes.idl +++ b/dlls/uiautomationcore/uia_classes.idl @@ -43,6 +43,7 @@ struct uia_pattern_info { [ version(1.0), uuid(8a9ca8eb-856b-43d9-abd7-4a590054064f), + id(1), ] library UIA_wine_private { diff --git a/dlls/uiautomationcore/uia_classes_client.idl b/dlls/uiautomationcore/uia_classes_client.idl new file mode 100644 index 00000000000..f6dcb236bea --- /dev/null +++ b/dlls/uiautomationcore/uia_classes_client.idl @@ -0,0 +1,21 @@ +/* + * Copyright 2022 Connor McAdams for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#pragma makedep regtypelib + +#include "uiautomationclient.idl" diff --git a/dlls/uiautomationcore/uia_classes_core.idl b/dlls/uiautomationcore/uia_classes_core.idl new file mode 100644 index 00000000000..3cd0a7134ed --- /dev/null +++ b/dlls/uiautomationcore/uia_classes_core.idl @@ -0,0 +1,21 @@ +/* + * Copyright 2022 Connor McAdams for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#pragma makedep regtypelib + +#include "uiautomationcore.idl" diff --git a/include/uiautomationclient.idl b/include/uiautomationclient.idl index ce0402a5d33..7a0b50288d4 100644 --- a/include/uiautomationclient.idl +++ b/include/uiautomationclient.idl @@ -69,6 +69,7 @@ typedef void * UIA_HWND; [ uuid(944de083-8fb8-45cf-bcb7-c477acb2f897), lcid(0), + id(2), version(1.0) ] library UIAutomationClient { diff --git a/include/uiautomationcore.idl b/include/uiautomationcore.idl index bd93bd04dff..319bc7be475 100644 --- a/include/uiautomationcore.idl +++ b/include/uiautomationcore.idl @@ -206,6 +206,7 @@ struct UiaChangeInfo { version(1.0), uuid(930299ce-9965-4dec-b0f4-a54848d4b667), lcid(0), + id(3), hidden ] library UIA

1 0

Connor McAdams : uiautomationcore: Implement IUIAutomation::ElementFromHandle.
by Alexandre Julliard Feb. 20, 2023

Feb. 20, 2023

Module: wine Branch: master Commit: 2d8bf67b90ccfbc3d5cfc45bbd68ca666ecd99b4 URL: https://gitlab.winehq.org/wine/wine/-/commit/2d8bf67b90ccfbc3d5cfc45bbd68ca… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Wed Feb 1 15:26:40 2023 -0500 uiautomationcore: Implement IUIAutomation::ElementFromHandle. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/tests/uiautomation.c | 88 +++ dlls/uiautomationcore/uia_com_client.c | 936 ++++++++++++++++++++++++++++- 2 files changed, 1022 insertions(+), 2 deletions(-)

1 0

Connor McAdams : uiautomationcore: Add stub IUIAutomation implementation.
by Alexandre Julliard Feb. 20, 2023

Feb. 20, 2023

Module: wine Branch: master Commit: e8dd3adae72bbe58a66eda8f55ed8df393a9d1b9 URL: https://gitlab.winehq.org/wine/wine/-/commit/e8dd3adae72bbe58a66eda8f55ed8d… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Wed Feb 1 13:16:28 2023 -0500 uiautomationcore: Add stub IUIAutomation implementation. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/Makefile.in | 1 + dlls/uiautomationcore/tests/uiautomation.c | 55 +++ dlls/uiautomationcore/uia_com_client.c | 702 ++++++++++++++++++++++++++++ dlls/uiautomationcore/uia_main.c | 123 +++++ dlls/uiautomationcore/uia_private.h | 3 + dlls/uiautomationcore/uiautomationcore.spec | 2 +- 6 files changed, 885 insertions(+), 1 deletion(-)

1 0

Connor McAdams : uiautomationcore: Implement IUIAutomationElement::GetCurrentPropertyValueEx.
by Alexandre Julliard Feb. 20, 2023

Feb. 20, 2023

Module: wine Branch: master Commit: 6254f6635cd3b57870e77376df4ff95469e7cf8b URL: https://gitlab.winehq.org/wine/wine/-/commit/6254f6635cd3b57870e77376df4ff9… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Thu Feb 2 13:54:54 2023 -0500 uiautomationcore: Implement IUIAutomationElement::GetCurrentPropertyValueEx. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/tests/uiautomation.c | 157 ++++++++++++++++++++++++----- dlls/uiautomationcore/uia_com_client.c | 39 ++++++- 2 files changed, 170 insertions(+), 26 deletions(-)

1 0

Francisco Casas : vkd3d-shader/hlsl: Add a more specific error for missing compatible fn. definitions.
by Alexandre Julliard Feb. 20, 2023

Feb. 20, 2023

Module: vkd3d Branch: master Commit: 7f009f59cee74890ccd04f1432fa938beb285f6a URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/7f009f59cee74890ccd04f1432fa9… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Wed Feb 8 16:37:01 2023 -0300 vkd3d-shader/hlsl: Add a more specific error for missing compatible fn. definitions. --- libs/vkd3d-shader/hlsl.y | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 42acbd95..697b895d 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -3194,6 +3194,12 @@ static struct list *add_call(struct hlsl_ctx *ctx, const char *name, if (!intrinsic->handler(ctx, args, loc)) goto fail; } + else if (rb_get(&ctx->functions, name)) + { + hlsl_error(ctx, loc, VKD3D_SHADER_ERROR_HLSL_NOT_DEFINED, "No compatible %u parameter declaration for \"%s\" found.", + args->args_count, name); + goto fail; + } else { hlsl_error(ctx, loc, VKD3D_SHADER_ERROR_HLSL_NOT_DEFINED, "Function \"%s\" is not defined.", name);

1 0

Zebediah Figura : configure: Declare LFLAGS and YFLAGS as precious.
by Alexandre Julliard Feb. 20, 2023

Feb. 20, 2023

Module: vkd3d Branch: master Commit: 02e3be811b0c9d373d8e2123caaef3397119225c URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/02e3be811b0c9d373d8e2123caaef… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Nov 14 18:46:36 2022 -0600 configure: Declare LFLAGS and YFLAGS as precious. Normally AC_PROG_LEX and AC_PROG_YACC do this, but we demand flex and bison specifically. --- configure.ac | 2 ++ 1 file changed, 2 insertions(+) diff --git a/configure.ac b/configure.ac index 8258b4cc..99864651 100644 --- a/configure.ac +++ b/configure.ac @@ -32,9 +32,11 @@ AS_IF([test "x$WIDL" = "xno"], [AC_MSG_WARN([widl is required to build header fi AC_CHECK_PROGS([FLEX], [flex], [none]) AS_IF([test "$FLEX" = "none"], [AC_MSG_ERROR([no suitable flex found. Please install the 'flex' package.])]) +AC_ARG_VAR([LFLAGS], [extra flags for flex]) AC_CHECK_PROGS([BISON], [bison], [none]) AS_IF([test "$BISON" = "none"], [AC_MSG_ERROR([no suitable bison found. Please install the 'bison' package.])]) +AC_ARG_VAR([YFLAGS], [extra flags for bison]) DX_PS_FEATURE([OFF]) DX_INIT_DOXYGEN([vkd3d], [Doxyfile], [doc])

1 0

Francisco Casas : vkd3d-shader/hlsl: Parse array types in function parameters.
by Alexandre Julliard Feb. 20, 2023

Feb. 20, 2023

Module: vkd3d Branch: master Commit: d279d34801bfa852d15a699813c6a62227537c5e URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/d279d34801bfa852d15a699813c6a… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Thu Jan 26 10:13:20 2023 -0300 vkd3d-shader/hlsl: Parse array types in function parameters. --- libs/vkd3d-shader/hlsl.y | 20 ++++++++++++++++---- tests/array-parameters.shader_test | 26 ++++++++++++++++++++------ 2 files changed, 36 insertions(+), 10 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 9967db98..d1ca91b8 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -4317,10 +4317,11 @@ param_list: } parameter: - var_modifiers type_no_void any_identifier colon_attribute + var_modifiers type_no_void any_identifier arrays colon_attribute { - struct hlsl_type *type; unsigned int modifiers = $1; + struct hlsl_type *type; + unsigned int i; if (!(type = apply_type_modifiers(ctx, $2, &modifiers, @1))) YYABORT; @@ -4328,10 +4329,21 @@ parameter: $$.modifiers = modifiers; if (!($$.modifiers & (HLSL_STORAGE_IN | HLSL_STORAGE_OUT))) $$.modifiers |= HLSL_STORAGE_IN; + + for (i = 0; i < $4.count; ++i) + { + if ($4.sizes[i] == HLSL_ARRAY_ELEMENTS_COUNT_IMPLICIT) + { + hlsl_error(ctx, &@3, VKD3D_SHADER_ERROR_HLSL_INVALID_TYPE, + "Implicit size arrays not allowed in function parameters."); + } + type = hlsl_new_array_type(ctx, type, $4.sizes[i]); + } $$.type = type; + $$.name = $3; - $$.semantic = $4.semantic; - $$.reg_reservation = $4.reg_reservation; + $$.semantic = $5.semantic; + $$.reg_reservation = $5.reg_reservation; } texture_type: diff --git a/tests/array-parameters.shader_test b/tests/array-parameters.shader_test index 615aa3f4..3b7d628d 100644 --- a/tests/array-parameters.shader_test +++ b/tests/array-parameters.shader_test @@ -1,4 +1,4 @@ -[pixel shader todo] +[pixel shader] float fun(float a[2]) { return 10 * a[0] + a[1]; @@ -12,8 +12,8 @@ float4 main() : sv_target } [test] -todo draw quad -todo probe all rgba (25.0, 25.0, 25.0, 25.0) +draw quad +probe all rgba (25.0, 25.0, 25.0, 25.0) [pixel shader fail] @@ -58,7 +58,7 @@ float4 main() : sv_target } -[pixel shader todo] +[pixel shader] float4 fun(float a[2][4]) { float4 res; @@ -78,8 +78,22 @@ float4 main() : sv_target } [test] -todo draw quad -todo probe all rgba (15.0, 26.0, 37.0, 48.0) +draw quad +probe all rgba (15.0, 26.0, 37.0, 48.0) + + +[pixel shader fail] +float fun(float a[2]) +{ + return a[2]; // out of bounds. +} + +float4 main() : sv_target +{ + float f[2] = {1, 2}; + + return fun(f); +} [pixel shader fail]

1 0

Francisco Casas : vkd3d-shader/hlsl: Find compatible function overloads.
by Alexandre Julliard Feb. 20, 2023

Feb. 20, 2023

Module: vkd3d Branch: master Commit: f08c0a7c035286bdb8339c642de0de7d87abae93 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/f08c0a7c035286bdb8339c642de0d… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Mon Jan 23 17:02:40 2023 -0300 vkd3d-shader/hlsl: Find compatible function overloads. But still throw hlsl_fixme() when there is more than one. Prioritizing among multiple compatible function overloads in the same way as the native compiler would require systematic testing. --- libs/vkd3d-shader/hlsl.y | 45 ++++++++++++++++++++++++++---- tests/array-parameters.shader_test | 12 ++++---- tests/cast-broadcast.shader_test | 6 ++-- tests/cast-componentwise-equal.shader_test | 6 ++-- tests/hlsl-intrinsic-override.shader_test | 10 +++---- 5 files changed, 56 insertions(+), 23 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index d1ca91b8..42acbd95 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -2220,8 +2220,10 @@ static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_t struct find_function_call_args { + struct hlsl_ctx *ctx; const struct parse_initializer *params; struct hlsl_ir_function_decl *decl; + unsigned int compatible_overloads_count; }; static void find_function_call_exact(struct rb_entry *entry, void *context) @@ -2241,10 +2243,31 @@ static void find_function_call_exact(struct rb_entry *entry, void *context) args->decl = decl; } +static void find_function_call_compatible(struct rb_entry *entry, void *context) +{ + struct hlsl_ir_function_decl *decl = RB_ENTRY_VALUE(entry, struct hlsl_ir_function_decl, entry); + struct find_function_call_args *args = context; + unsigned int i; + + if (decl->parameters.count != args->params->args_count) + return; + + for (i = 0; i < decl->parameters.count; ++i) + { + if (!implicit_compatible_data_types(args->ctx, args->params->args[i]->data_type, + decl->parameters.vars[i]->data_type)) + return; + } + + args->compatible_overloads_count++; + args->decl = decl; +} + static struct hlsl_ir_function_decl *find_function_call(struct hlsl_ctx *ctx, - const char *name, const struct parse_initializer *params) + const char *name, const struct parse_initializer *params, + const struct vkd3d_shader_location *loc) { - struct find_function_call_args args = {.params = params}; + struct find_function_call_args args = {.ctx = ctx, .params = params}; struct hlsl_ir_function *func; struct rb_entry *entry; @@ -2254,7 +2277,13 @@ static struct hlsl_ir_function_decl *find_function_call(struct hlsl_ctx *ctx, rb_for_each_entry(&func->overloads, find_function_call_exact, &args); if (!args.decl) - FIXME("Search for compatible overloads.\n"); + { + rb_for_each_entry(&func->overloads, find_function_call_compatible, &args); + if (args.compatible_overloads_count > 1) + { + hlsl_fixme(ctx, loc, "Prioritize between multiple compatible function overloads."); + } + } return args.decl; } @@ -3055,7 +3084,7 @@ static struct list *add_call(struct hlsl_ctx *ctx, const char *name, struct intrinsic_function *intrinsic; struct hlsl_ir_function_decl *decl; - if ((decl = find_function_call(ctx, name, args))) + if ((decl = find_function_call(ctx, name, args, loc))) { struct hlsl_ir_node *call; unsigned int i; @@ -3069,8 +3098,12 @@ static struct list *add_call(struct hlsl_ctx *ctx, const char *name, if (!hlsl_types_are_equal(arg->data_type, param->data_type)) { - hlsl_fixme(ctx, &arg->loc, "Implicit cast of a function argument."); - continue; + struct hlsl_ir_node *cast; + + if (!(cast = add_cast(ctx, args->instrs, arg, param->data_type, &arg->loc))) + goto fail; + args->args[i] = cast; + arg = cast; } if (param->storage_modifiers & HLSL_STORAGE_IN) diff --git a/tests/array-parameters.shader_test b/tests/array-parameters.shader_test index 3b7d628d..6e866ceb 100644 --- a/tests/array-parameters.shader_test +++ b/tests/array-parameters.shader_test @@ -139,7 +139,7 @@ float4 main() : sv_target % Arrays with the same number of components are allowed. -[pixel shader todo] +[pixel shader] float fun(float a[2][3]) { return 100*a[0][0] + 10*a[0][2] + a[1][2]; @@ -153,11 +153,11 @@ float4 main() : sv_target } [test] -todo draw quad -todo probe all rgba (136.0, 136.0, 136.0, 136.0) +draw quad +probe all rgba (136.0, 136.0, 136.0, 136.0) -[pixel shader todo] +[pixel shader] float fun(float a[2][3]) { return 100*a[0][0] + 10*a[1][0] + a[1][2]; @@ -171,5 +171,5 @@ float4 main() : sv_target } [test] -todo draw quad -todo probe all rgba (702.0, 702.0, 702.0, 702.0) +draw quad +probe all rgba (702.0, 702.0, 702.0, 702.0) diff --git a/tests/cast-broadcast.shader_test b/tests/cast-broadcast.shader_test index a7462e76..3ec9cd40 100644 --- a/tests/cast-broadcast.shader_test +++ b/tests/cast-broadcast.shader_test @@ -82,7 +82,7 @@ float4 PSMain() : SV_TARGET } -[pixel shader todo] +[pixel shader] float4 fun(float3 f) { return f.xyxy; @@ -94,5 +94,5 @@ float4 main() : SV_TARGET } [test] -todo draw quad -todo probe all rgba (33.0, 33.0, 33.0, 33.0) +draw quad +probe all rgba (33.0, 33.0, 33.0, 33.0) diff --git a/tests/cast-componentwise-equal.shader_test b/tests/cast-componentwise-equal.shader_test index 7fe9304b..4a25f6dd 100644 --- a/tests/cast-componentwise-equal.shader_test +++ b/tests/cast-componentwise-equal.shader_test @@ -124,7 +124,7 @@ draw quad probe all rgba (4.0, 4.0, 4.0, 4.0) -[pixel shader todo] +[pixel shader] Texture2D tex; struct apple @@ -154,8 +154,8 @@ float4 main() : sv_target } [test] -todo draw quad -todo probe all rgba (5.0, 5.0, 5.0, 5.0) +draw quad +probe all rgba (5.0, 5.0, 5.0, 5.0) [pixel shader] diff --git a/tests/hlsl-intrinsic-override.shader_test b/tests/hlsl-intrinsic-override.shader_test index f9233a5c..13e1752d 100644 --- a/tests/hlsl-intrinsic-override.shader_test +++ b/tests/hlsl-intrinsic-override.shader_test @@ -1,4 +1,4 @@ -[pixel shader todo] +[pixel shader] float2 max(float2 a, float2 b) { @@ -11,10 +11,10 @@ float4 main() : sv_target } [test] -todo draw quad -probe all rgba (0.3, 0.3, 0.4, 0.6) +draw quad +todo probe all rgba (0.3, 0.3, 0.4, 0.6) -[pixel shader todo] +[pixel shader] float2 max(float2 a, float3 b) { @@ -27,5 +27,5 @@ float4 main() : sv_target } [test] -todo draw quad +draw quad probe all rgba (0.3, 0.3, 0.3, 0.4)

1 0