- Wine-Commits - list.winehq.org

Rémi Bernon : rpcrt4/tests: Avoid invalid free of static string.
by Alexandre Julliard Jan. 13, 2023

Jan. 13, 2023

Module: wine Branch: master Commit: 3356ba6810513cd19e87b4d773458f1894e6d6f1 URL: https://gitlab.winehq.org/wine/wine/-/commit/3356ba6810513cd19e87b4d773458f… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Dec 5 23:04:38 2022 +0100 rpcrt4/tests: Avoid invalid free of static string. --- dlls/rpcrt4/tests/server.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/rpcrt4/tests/server.c b/dlls/rpcrt4/tests/server.c index 5fe803e5a1d..8e87a468f86 100644 --- a/dlls/rpcrt4/tests/server.c +++ b/dlls/rpcrt4/tests/server.c @@ -867,7 +867,9 @@ s123_t * __cdecl s_get_s123(void) str_t __cdecl s_get_filename(void) { - return (char *)__FILE__; + void *ptr = MIDL_user_allocate(strlen(__FILE__) + 1); + strcpy(ptr, __FILE__); + return (char *)ptr; } int __cdecl s_echo_ranged_int(int i, int j, int k)

1 0

Conor McCarthy : d3d11: Apply the 'KEEP' options when sending RTVs and UAVs to wined3d.
by Alexandre Julliard Jan. 13, 2023

Jan. 13, 2023

Module: wine Branch: master Commit: 696515d8d4d322f6bfbb1b7ca8015cbd02dde041 URL: https://gitlab.winehq.org/wine/wine/-/commit/696515d8d4d322f6bfbb1b7ca8015c… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Fri Jan 13 14:36:31 2023 +1000 d3d11: Apply the 'KEEP' options when sending RTVs and UAVs to wined3d. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53761 --- dlls/d3d11/device.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 65706a414d8..5cb84c59dee 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -1156,8 +1156,9 @@ static void STDMETHODCALLTYPE d3d11_device_context_OMSetRenderTargetsAndUnordere } } - wined3d_device_context_set_render_targets_and_unordered_access_views(context->wined3d_context, ARRAY_SIZE(wined3d_rtvs), - wined3d_rtvs, dsv ? dsv->wined3d_view : NULL, ARRAY_SIZE(wined3d_uavs), wined3d_uavs, + wined3d_device_context_set_render_targets_and_unordered_access_views(context->wined3d_context, + render_target_view_count == ~0u ? ~0u : ARRAY_SIZE(wined3d_rtvs), wined3d_rtvs, + dsv ? dsv->wined3d_view : NULL, uav_count == ~0u ? ~0u : ARRAY_SIZE(wined3d_uavs), wined3d_uavs, wined3d_initial_counts); }

1 0

Gerald Pfeifer : wrc: Avoid undefined behavior in the FreeBSD case.
by Alexandre Julliard Jan. 13, 2023

Jan. 13, 2023

Module: wine Branch: master Commit: f221465a3c689e6c20c29b99f9c9f6a50ec7ff38 URL: https://gitlab.winehq.org/wine/wine/-/commit/f221465a3c689e6c20c29b99f9c9f6… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Fri Jan 13 13:10:55 2023 +0100 wrc: Avoid undefined behavior in the FreeBSD case. init_argv0_dir has a special case for FreeBSD where one branch led to an unitialized variable and undefined behavior. Initialize properly. --- tools/wrc/wrc.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/wrc/wrc.c b/tools/wrc/wrc.c index a1e59c3d2b3..9f231603ad4 100644 --- a/tools/wrc/wrc.c +++ b/tools/wrc/wrc.c @@ -305,6 +305,8 @@ static void init_argv0_dir( const char *argv0 ) char *path = xmalloc( path_size ); if (!sysctl( pathname, ARRAY_SIZE(pathname), path, &path_size, NULL, 0 )) dir = realpath( path, NULL ); + else + dir = NULL; free( path ); #else dir = realpath( argv0, NULL );

1 0

Rémi Bernon : dinput/tests: Remove the async cancel tests.
by Alexandre Julliard Jan. 13, 2023

Jan. 13, 2023

Module: wine Branch: master Commit: 3a0de91ecf7c0b2b968c51bf90f9c1e5f9904a88 URL: https://gitlab.winehq.org/wine/wine/-/commit/3a0de91ecf7c0b2b968c51bf90f9c1… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jan 13 10:30:45 2023 +0100 dinput/tests: Remove the async cancel tests. The tests are actually racy, and the async operation is cancellable in a very short period of time after its creation, but before it started executing. This will be hard to test precisely and it's not related to dinput tests in any way. Let's remove this to fix some spurious Windows failures. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54283 --- dlls/dinput/tests/force_feedback.c | 105 ------------------------------------- 1 file changed, 105 deletions(-) diff --git a/dlls/dinput/tests/force_feedback.c b/dlls/dinput/tests/force_feedback.c index b40c8446e09..1e68748a07d 100644 --- a/dlls/dinput/tests/force_feedback.c +++ b/dlls/dinput/tests/force_feedback.c @@ -5605,24 +5605,6 @@ static void test_windows_gaming_input(void) .report_len = 2, .report_buf = {1, 0x04}, }; - static struct hid_expect expect_reset_delay[] = - { - /* device control */ - { - .code = IOCTL_HID_WRITE_REPORT, - .ret_status = STATUS_PENDING, - .report_id = 1, - .report_len = 2, - .report_buf = {1, 0x01}, - }, - /* device gain */ - { - .code = IOCTL_HID_WRITE_REPORT, - .report_id = 6, - .report_len = 2, - .report_buf = {6, 0x7f}, - }, - }; struct hid_expect expect_reset[] = { /* device control */ @@ -6274,93 +6256,6 @@ static void test_windows_gaming_input(void) IAsyncOperation_boolean_Release( bool_async ); - /* canceling the async op is just ignored */ - - set_hid_expect( file, expect_reset_delay, sizeof(expect_reset_delay) ); - hr = IForceFeedbackMotor_TryResetAsync( motor, &bool_async ); - ok( hr == S_OK, "TryResetAsync returned %#lx\n", hr ); - check_bool_async( bool_async, 1, Started, S_OK, FALSE ); - - bool_async_handler = default_bool_async_handler; - bool_async_handler.event = CreateEventW( NULL, FALSE, FALSE, NULL ); - ok( !!bool_async_handler.event, "CreateEventW failed, error %lu\n", GetLastError() ); - - hr = IAsyncOperation_boolean_put_Completed( bool_async, &bool_async_handler.IAsyncOperationCompletedHandler_boolean_iface ); - ok( hr == S_OK, "put_Completed returned %#lx\n", hr ); - ok( !bool_async_handler.invoked, "handler invoked\n" ); - hr = IAsyncOperation_boolean_get_Completed( bool_async, &tmp_handler ); - ok( hr == S_OK, "get_Completed returned %#lx\n", hr ); - ok( tmp_handler == &bool_async_handler.IAsyncOperationCompletedHandler_boolean_iface, - "got handler %p\n", tmp_handler ); - - hr = IAsyncOperation_boolean_QueryInterface( bool_async, &IID_IAsyncInfo, (void **)&async_info ); - ok( hr == S_OK, "QueryInterface returned %#lx\n", hr ); - hr = IAsyncInfo_Cancel( async_info ); - ok( hr == S_OK, "Cancel returned %#lx\n", hr ); - check_bool_async( bool_async, 1, Canceled, S_OK, FALSE ); - ok( !bool_async_handler.invoked, "handler invoked\n" ); - IAsyncInfo_Release( async_info ); - - wait_hid_pending( file, 100 ); - ret = WaitForSingleObject( bool_async_handler.event, 500 ); - ok( ret == 0, "WaitForSingleObject returned %#lx\n", ret ); - CloseHandle( bool_async_handler.event ); - check_bool_async( bool_async, 1, Completed, S_OK, TRUE ); - - ok( bool_async_handler.invoked, "handler not invoked\n" ); - ok( bool_async_handler.async == bool_async, "got async %p\n", bool_async_handler.async ); - ok( bool_async_handler.status == Completed, "got status %u\n", bool_async_handler.status ); - hr = IAsyncOperation_boolean_get_Completed( bool_async, &tmp_handler ); - ok( hr == S_OK, "get_Completed returned %#lx\n", hr ); - ok( tmp_handler == NULL, "got handler %p\n", tmp_handler ); - - IAsyncOperation_boolean_Release( bool_async ); - - - /* canceling then closing it calls the handler with closed state */ - - set_hid_expect( file, expect_reset_delay, sizeof(expect_reset_delay) ); - hr = IForceFeedbackMotor_TryResetAsync( motor, &bool_async ); - ok( hr == S_OK, "TryResetAsync returned %#lx\n", hr ); - check_bool_async( bool_async, 1, Started, S_OK, FALSE ); - - bool_async_handler = default_bool_async_handler; - bool_async_handler.event = CreateEventW( NULL, FALSE, FALSE, NULL ); - ok( !!bool_async_handler.event, "CreateEventW failed, error %lu\n", GetLastError() ); - - hr = IAsyncOperation_boolean_put_Completed( bool_async, &bool_async_handler.IAsyncOperationCompletedHandler_boolean_iface ); - ok( hr == S_OK, "put_Completed returned %#lx\n", hr ); - ok( !bool_async_handler.invoked, "handler invoked\n" ); - - hr = IAsyncOperation_boolean_QueryInterface( bool_async, &IID_IAsyncInfo, (void **)&async_info ); - ok( hr == S_OK, "QueryInterface returned %#lx\n", hr ); - hr = IAsyncInfo_Close( async_info ); - ok( hr == E_ILLEGAL_STATE_CHANGE, "Close returned %#lx\n", hr ); - hr = IAsyncInfo_Cancel( async_info ); - ok( hr == S_OK, "Cancel returned %#lx\n", hr ); - check_bool_async( bool_async, 1, Canceled, S_OK, FALSE ); - ok( !bool_async_handler.invoked, "handler invoked\n" ); - hr = IAsyncInfo_Close( async_info ); - ok( hr == S_OK, "Close returned %#lx\n", hr ); - check_bool_async( bool_async, 1, 4, S_OK, FALSE ); - ok( !bool_async_handler.invoked, "handler invoked\n" ); - IAsyncInfo_Release( async_info ); - - wait_hid_pending( file, 100 ); - ret = WaitForSingleObject( bool_async_handler.event, 500 ); - ok( ret == 0, "WaitForSingleObject returned %#lx\n", ret ); - CloseHandle( bool_async_handler.event ); - check_bool_async( bool_async, 1, 4, S_OK, FALSE ); - - ok( bool_async_handler.invoked, "handler not invoked\n" ); - ok( bool_async_handler.async == bool_async, "got async %p\n", bool_async_handler.async ); - ok( bool_async_handler.status == 4, "got status %u\n", bool_async_handler.status ); - hr = IAsyncOperation_boolean_get_Completed( bool_async, &tmp_handler ); - ok( hr == E_ILLEGAL_METHOD_CALL, "get_Completed returned %#lx\n", hr ); - - IAsyncOperation_boolean_Release( bool_async ); - - set_hid_expect( file, &expect_enable, sizeof(expect_enable) ); hr = IForceFeedbackMotor_TryEnableAsync( motor, &bool_async ); ok( hr == S_OK, "TryEnableAsync returned %#lx\n", hr );

1 0

Rémi Bernon : ole32: Allocate and free moniker lists with CRT allocations.
by Alexandre Julliard Jan. 13, 2023

Jan. 13, 2023

Module: wine Branch: master Commit: 93f8819c95407769992c69f75905708178f2b5ce URL: https://gitlab.winehq.org/wine/wine/-/commit/93f8819c95407769992c69f7590570… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Jan 12 20:58:16 2023 +0100 ole32: Allocate and free moniker lists with CRT allocations. The RunningObjectTableImpl_EnumRunning codepath returns a list allocated from combase MIDL_user_allocate, which uses msvcrt heap. --- dlls/ole32/moniker.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/ole32/moniker.c b/dlls/ole32/moniker.c index f98b21bdf2b..ec026758b2f 100644 --- a/dlls/ole32/moniker.c +++ b/dlls/ole32/moniker.c @@ -1033,8 +1033,8 @@ static ULONG WINAPI EnumMonikerImpl_Release(IEnumMoniker* iface) TRACE("(%p) Deleting\n",This); for (i = 0; i < This->moniker_list->size; i++) - HeapFree(GetProcessHeap(), 0, This->moniker_list->interfaces[i]); - HeapFree(GetProcessHeap(), 0, This->moniker_list); + free(This->moniker_list->interfaces[i]); + free(This->moniker_list); HeapFree(GetProcessHeap(), 0, This); } @@ -1119,7 +1119,7 @@ static HRESULT WINAPI EnumMonikerImpl_Clone(IEnumMoniker* iface, IEnumMoniker *ppenum = NULL; - moniker_list = HeapAlloc(GetProcessHeap(), 0, FIELD_OFFSET(InterfaceList, interfaces[This->moniker_list->size])); + moniker_list = malloc(FIELD_OFFSET(InterfaceList, interfaces[This->moniker_list->size])); if (!moniker_list) return E_OUTOFMEMORY; @@ -1127,13 +1127,13 @@ static HRESULT WINAPI EnumMonikerImpl_Clone(IEnumMoniker* iface, IEnumMoniker for (i = 0; i < This->moniker_list->size; i++) { SIZE_T size = FIELD_OFFSET(InterfaceData, abData[This->moniker_list->interfaces[i]->ulCntData]); - moniker_list->interfaces[i] = HeapAlloc(GetProcessHeap(), 0, size); + moniker_list->interfaces[i] = malloc(size); if (!moniker_list->interfaces[i]) { ULONG end = i; for (i = 0; i < end; i++) - HeapFree(GetProcessHeap(), 0, moniker_list->interfaces[i]); - HeapFree(GetProcessHeap(), 0, moniker_list); + free(moniker_list->interfaces[i]); + free(moniker_list); return E_OUTOFMEMORY; } memcpy(moniker_list->interfaces[i], This->moniker_list->interfaces[i], size);

1 0

Rémi Bernon : ole32: Reset IMoniker data pointer to NULL on failure.
by Alexandre Julliard Jan. 13, 2023

Jan. 13, 2023

Module: wine Branch: master Commit: a547efc094ca89461731c49302883e4d45692eb9 URL: https://gitlab.winehq.org/wine/wine/-/commit/a547efc094ca89461731c49302883e… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Dec 2 08:47:56 2022 +0100 ole32: Reset IMoniker data pointer to NULL on failure. To avoid double free when the caller releases the object. --- dlls/ole32/moniker.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ole32/moniker.c b/dlls/ole32/moniker.c index be6150bc7b6..f98b21bdf2b 100644 --- a/dlls/ole32/moniker.c +++ b/dlls/ole32/moniker.c @@ -161,6 +161,7 @@ static HRESULT get_moniker_comparison_data(IMoniker *pMoniker, MonikerComparison { ERR("Failed to copy comparison data into buffer, hr = %#lx\n", hr); HeapFree(GetProcessHeap(), 0, *moniker_data); + *moniker_data = NULL; return hr; } (*moniker_data)->ulCntData = size;

1 0

Rémi Bernon : ole32: Allocate IEnumSTATDATA data with the process heap.
by Alexandre Julliard Jan. 13, 2023

Jan. 13, 2023

Module: wine Branch: master Commit: 85fdc7d60eb1f08f1fa169d8bfa5e1abd970c4d6 URL: https://gitlab.winehq.org/wine/wine/-/commit/85fdc7d60eb1f08f1fa169d8bfa5e1… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Dec 2 08:45:33 2022 +0100 ole32: Allocate IEnumSTATDATA data with the process heap. It will later be freed in EnumSTATDATA_Release with HeapFree, and the copy code path may allocate the member with HeapAlloc. --- dlls/ole32/datacache.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c index e6cea25aca6..b3216992af5 100644 --- a/dlls/ole32/datacache.c +++ b/dlls/ole32/datacache.c @@ -2527,7 +2527,7 @@ static HRESULT WINAPI DataCache_EnumCache(IOleCache2 *iface, count++; } - data = CoTaskMemAlloc( count * sizeof(*data) ); + data = HeapAlloc( GetProcessHeap(), 0, count * sizeof(*data) ); if (!data) return E_OUTOFMEMORY; LIST_FOR_EACH_ENTRY( cache_entry, &This->cache_list, DataCacheEntry, entry ) @@ -2559,7 +2559,7 @@ static HRESULT WINAPI DataCache_EnumCache(IOleCache2 *iface, fail: while (i--) CoTaskMemFree( data[i].formatetc.ptd ); - CoTaskMemFree( data ); + HeapFree( GetProcessHeap(), 0, data ); return hr; }

1 0

Rémi Bernon : ole32: Use CRT allocation for MIDL_user_(allocate/free).
by Alexandre Julliard Jan. 13, 2023

Jan. 13, 2023

Module: wine Branch: master Commit: af43e72860722794977d8892b05c0f05136d6299 URL: https://gitlab.winehq.org/wine/wine/-/commit/af43e72860722794977d8892b05c0f… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Jan 12 20:32:12 2023 +0100 ole32: Use CRT allocation for MIDL_user_(allocate/free). To match combase allocations, as for instance we're freeing pointers returned from InternalIrotRevoke, which are allocated using combase MIDL_user_allocate. --- dlls/ole32/moniker.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/moniker.c b/dlls/ole32/moniker.c index 09266a33aba..be6150bc7b6 100644 --- a/dlls/ole32/moniker.c +++ b/dlls/ole32/moniker.c @@ -1363,10 +1363,10 @@ HRESULT MonikerMarshal_Create(IMoniker *inner, IUnknown **outer) void * __RPC_USER MIDL_user_allocate(SIZE_T size) { - return HeapAlloc(GetProcessHeap(), 0, size); + return malloc(size); } void __RPC_USER MIDL_user_free(void *p) { - HeapFree(GetProcessHeap(), 0, p); + free(p); }

1 0

Zebediah Figura : vkd3d-shader/hlsl: Get rid of the "intrinsic" field of struct hlsl_ir_function.
by Alexandre Julliard Jan. 13, 2023

Jan. 13, 2023

Module: vkd3d Branch: master Commit: 61f0d6d151ecdb95f1a4ff3e960bb44637551a36 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/61f0d6d151ecdb95f1a4ff3e960bb… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Sep 11 17:05:14 2021 -0500 vkd3d-shader/hlsl: Get rid of the "intrinsic" field of struct hlsl_ir_function. We have a different system of generating intrinsics, which makes it easier to deal with "polymorphic" arithmetic functions. Defining and storing intrinsics as hlsl_ir_function_decls would also require more space in memory (and more optimization passes to get rid of the parameter variables), and doesn't really save us any effort in terms of source code. --- libs/vkd3d-shader/hlsl.c | 12 ------------ libs/vkd3d-shader/hlsl.h | 1 - libs/vkd3d-shader/hlsl.y | 2 +- 3 files changed, 1 insertion(+), 14 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 0c3a8a4d..a440aa39 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -2194,17 +2194,6 @@ void hlsl_add_function(struct hlsl_ctx *ctx, char *name, struct hlsl_ir_function if (func_entry) { func = RB_ENTRY_VALUE(func_entry, struct hlsl_ir_function, entry); - if (intrinsic != func->intrinsic) - { - if (intrinsic) - { - ERR("Redeclaring a user defined function as an intrinsic.\n"); - return; - } - func->intrinsic = intrinsic; - rb_destroy(&func->overloads, free_function_decl_rb, NULL); - rb_init(&func->overloads, compare_function_decl_rb); - } decl->func = func; if ((old_entry = rb_get(&func->overloads, decl->parameters))) { @@ -2239,7 +2228,6 @@ void hlsl_add_function(struct hlsl_ctx *ctx, char *name, struct hlsl_ir_function rb_init(&func->overloads, compare_function_decl_rb); decl->func = func; rb_put(&func->overloads, decl->parameters, &decl->entry); - func->intrinsic = intrinsic; rb_put(&ctx->functions, func->name, &func->entry); } diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 39079ac1..14070239 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -374,7 +374,6 @@ struct hlsl_ir_function struct rb_entry entry; const char *name; struct rb_tree overloads; - bool intrinsic; }; struct hlsl_ir_function_decl diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 2d5640aa..019c875c 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -3594,7 +3594,7 @@ hlsl_prog: const struct hlsl_ir_function_decl *decl; decl = get_func_decl(&ctx->functions, $2.name, $2.decl->parameters); - if (decl && !decl->func->intrinsic) + if (decl) { if (decl->has_body && $2.decl->has_body) {

1 0

Zebediah Figura : vkd3d-shader/hlsl: Forbid returning void expressions from void functions.
by Alexandre Julliard Jan. 13, 2023

Jan. 13, 2023

Module: vkd3d Branch: master Commit: 9cc7aaf5a1b3fc4037870635dd305c438ff13361 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/9cc7aaf5a1b3fc4037870635dd305… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Sep 10 16:36:36 2021 -0500 vkd3d-shader/hlsl: Forbid returning void expressions from void functions. --- libs/vkd3d-shader/hlsl.y | 26 +++++++++++++++++--------- tests/hlsl-function.shader_test | 2 +- 2 files changed, 18 insertions(+), 10 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index fc0849c7..2d5640aa 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -599,21 +599,29 @@ static struct hlsl_ir_jump *add_return(struct hlsl_ctx *ctx, struct list *instrs struct hlsl_type *return_type = ctx->cur_function->return_type; struct hlsl_ir_jump *jump; - if (return_value) + if (ctx->cur_function->return_var) { - struct hlsl_ir_store *store; + if (return_value) + { + struct hlsl_ir_store *store; - if (!(return_value = add_implicit_conversion(ctx, instrs, return_value, return_type, &loc))) - return NULL; + if (!(return_value = add_implicit_conversion(ctx, instrs, return_value, return_type, &loc))) + return NULL; - if (!(store = hlsl_new_simple_store(ctx, ctx->cur_function->return_var, return_value))) + if (!(store = hlsl_new_simple_store(ctx, ctx->cur_function->return_var, return_value))) + return NULL; + list_add_after(&return_value->entry, &store->node.entry); + } + else + { + hlsl_error(ctx, &loc, VKD3D_SHADER_ERROR_HLSL_INVALID_RETURN, "Non-void functions must return a value."); return NULL; - list_add_after(&return_value->entry, &store->node.entry); + } } - else if (ctx->cur_function->return_var) + else { - hlsl_error(ctx, &loc, VKD3D_SHADER_ERROR_HLSL_INVALID_RETURN, "Non-void function must return a value."); - return NULL; + if (return_value) + hlsl_error(ctx, &loc, VKD3D_SHADER_ERROR_HLSL_INVALID_RETURN, "Void functions cannot return a value."); } if (!(jump = hlsl_new_jump(ctx, HLSL_IR_JUMP_RETURN, loc))) diff --git a/tests/hlsl-function.shader_test b/tests/hlsl-function.shader_test index 3f4908ec..e8bb80c4 100644 --- a/tests/hlsl-function.shader_test +++ b/tests/hlsl-function.shader_test @@ -89,7 +89,7 @@ float4 main() : sv_target return func(); } -[pixel shader fail todo] +[pixel shader fail] void foo() {

1 0