winehq.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2025
February
January
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
January
2003
December
November
October
September
August
July
June
May
April
March
February
January
2002
December
November
October
September
August
July
June
May
April
March
February
January
2001
December
November
October
September
August
July
June
May
April
March
February
List overview
wine-commits
January 2023
----- 2025 -----
February 2025
January 2025
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
January 2004
----- 2003 -----
December 2003
November 2003
October 2003
September 2003
August 2003
July 2003
June 2003
May 2003
April 2003
March 2003
February 2003
January 2003
----- 2002 -----
December 2002
November 2002
October 2002
September 2002
August 2002
July 2002
June 2002
May 2002
April 2002
March 2002
February 2002
January 2002
----- 2001 -----
December 2001
November 2001
October 2001
September 2001
August 2001
July 2001
June 2001
May 2001
April 2001
March 2001
February 2001
wine-commits@winehq.org
1 participants
467 discussions
Start a n
N
ew thread
Rémi Bernon : dinput/tests: Remove the async cancel tests.
by Alexandre Julliard
13 Jan '23
13 Jan '23
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
0
0
Rémi Bernon : ole32: Allocate and free moniker lists with CRT allocations.
by Alexandre Julliard
13 Jan '23
13 Jan '23
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
0
0
Rémi Bernon : ole32: Reset IMoniker data pointer to NULL on failure.
by Alexandre Julliard
13 Jan '23
13 Jan '23
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
0
0
Rémi Bernon : ole32: Allocate IEnumSTATDATA data with the process heap.
by Alexandre Julliard
13 Jan '23
13 Jan '23
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
0
0
Rémi Bernon : ole32: Use CRT allocation for MIDL_user_(allocate/free).
by Alexandre Julliard
13 Jan '23
13 Jan '23
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
0
0
Zebediah Figura : vkd3d-shader/hlsl: Get rid of the "intrinsic" field of struct hlsl_ir_function.
by Alexandre Julliard
13 Jan '23
13 Jan '23
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
0
0
Zebediah Figura : vkd3d-shader/hlsl: Forbid returning void expressions from void functions.
by Alexandre Julliard
13 Jan '23
13 Jan '23
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
0
0
Zebediah Figura : vkd3d-shader/hlsl: Generate IR for user-defined function calls.
by Alexandre Julliard
13 Jan '23
13 Jan '23
Module: vkd3d Branch: master Commit: b29d3489def0ba905ed4e9b4ee0659f8535db9c8 URL:
https://gitlab.winehq.org/wine/vkd3d/-/commit/b29d3489def0ba905ed4e9b4ee065…
Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Sep 9 21:06:38 2021 -0500 vkd3d-shader/hlsl: Generate IR for user-defined function calls. --- libs/vkd3d-shader/hlsl.c | 55 ++++++++++ libs/vkd3d-shader/hlsl.h | 17 +++ libs/vkd3d-shader/hlsl.y | 126 ++++++++++++++++------ libs/vkd3d-shader/hlsl_codegen.c | 5 + tests/hlsl-function.shader_test | 24 ++--- tests/hlsl-numthreads.shader_test | 2 +- tests/hlsl-return-implicit-conversion.shader_test | 60 +++++------ tests/hlsl-static-initializer.shader_test | 6 +- tests/uav-out-param.shader_test | 4 +- 9 files changed, 220 insertions(+), 79 deletions(-)
1
0
0
0
Zebediah Figura : vkd3d-shader/hlsl: Avoid assuming that expressions have at least one argument.
by Alexandre Julliard
13 Jan '23
13 Jan '23
Module: vkd3d Branch: master Commit: 30550c083169244c722573a0acb34cda328c0eb0 URL:
https://gitlab.winehq.org/wine/vkd3d/-/commit/30550c083169244c722573a0acb34…
Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Sep 10 16:35:54 2021 -0500 vkd3d-shader/hlsl: Avoid assuming that expressions have at least one argument. --- libs/vkd3d-shader/hlsl_codegen.c | 16 +++++++++------- libs/vkd3d-shader/hlsl_constant_ops.c | 2 ++ 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index d21e31be..2271e2ac 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -467,12 +467,12 @@ static bool lower_broadcasts(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, v if (instr->type != HLSL_IR_EXPR) return false; cast = hlsl_ir_expr(instr); + if (cast->op != HLSL_OP1_CAST) + return false; src_type = cast->operands[0].node->data_type; dst_type = cast->node.data_type; - if (cast->op == HLSL_OP1_CAST - && src_type->type <= HLSL_CLASS_VECTOR && dst_type->type <= HLSL_CLASS_VECTOR - && src_type->dimx == 1) + if (src_type->type <= HLSL_CLASS_VECTOR && dst_type->type <= HLSL_CLASS_VECTOR && src_type->dimx == 1) { struct hlsl_ir_node *replacement; struct hlsl_ir_swizzle *swizzle; @@ -1050,12 +1050,14 @@ static bool fold_redundant_casts(struct hlsl_ctx *ctx, struct hlsl_ir_node *inst if (instr->type == HLSL_IR_EXPR) { struct hlsl_ir_expr *expr = hlsl_ir_expr(instr); - const struct hlsl_type *src_type = expr->operands[0].node->data_type; const struct hlsl_type *dst_type = expr->node.data_type; + const struct hlsl_type *src_type; if (expr->op != HLSL_OP1_CAST) return false; + src_type = expr->operands[0].node->data_type; + if (hlsl_types_are_equal(src_type, dst_type) || (src_type->base_type == dst_type->base_type && is_vec1(src_type) && is_vec1(dst_type))) { @@ -1213,12 +1215,12 @@ static bool lower_narrowing_casts(struct hlsl_ctx *ctx, struct hlsl_ir_node *ins if (instr->type != HLSL_IR_EXPR) return false; cast = hlsl_ir_expr(instr); + if (cast->op != HLSL_OP1_CAST) + return false; src_type = cast->operands[0].node->data_type; dst_type = cast->node.data_type; - if (cast->op == HLSL_OP1_CAST - && src_type->type <= HLSL_CLASS_VECTOR && dst_type->type <= HLSL_CLASS_VECTOR - && dst_type->dimx < src_type->dimx) + if (src_type->type <= HLSL_CLASS_VECTOR && dst_type->type <= HLSL_CLASS_VECTOR && dst_type->dimx < src_type->dimx) { struct hlsl_ir_swizzle *swizzle; struct hlsl_ir_expr *new_cast; diff --git a/libs/vkd3d-shader/hlsl_constant_ops.c b/libs/vkd3d-shader/hlsl_constant_ops.c index 858f020c..ea59fb86 100644 --- a/libs/vkd3d-shader/hlsl_constant_ops.c +++ b/libs/vkd3d-shader/hlsl_constant_ops.c @@ -509,6 +509,8 @@ bool hlsl_fold_constant_exprs(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, if (instr->type != HLSL_IR_EXPR) return false; expr = hlsl_ir_expr(instr); + if (!expr->operands[0].node) + return false; if (instr->data_type->type > HLSL_CLASS_VECTOR) return false;
1
0
0
0
Zebediah Figura : tests: Test specifying a UAV address as an in/out parameter to a function.
by Alexandre Julliard
13 Jan '23
13 Jan '23
Module: vkd3d Branch: master Commit: 22a1a478ea8dbba922df5bdc15aa520d3d0f7299 URL:
https://gitlab.winehq.org/wine/vkd3d/-/commit/22a1a478ea8dbba922df5bdc15aa5…
Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Sep 9 21:10:14 2021 -0500 tests: Test specifying a UAV address as an in/out parameter to a function. --- Makefile.am | 1 + tests/uav-out-param.shader_test | 27 +++++++++++++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/Makefile.am b/Makefile.am index 9459bad9..464b43ae 100644 --- a/Makefile.am +++ b/Makefile.am @@ -144,6 +144,7 @@ vkd3d_shader_tests = \ tests/trigonometry.shader_test \ tests/uav.shader_test \ tests/uav-load.shader_test \ + tests/uav-out-param.shader_test \ tests/writemask-assignop-0.shader_test \ tests/writemask-assignop-1.shader_test \ tests/writemask-assignop-2.shader_test \ diff --git a/tests/uav-out-param.shader_test b/tests/uav-out-param.shader_test new file mode 100644 index 00000000..646d14f6 --- /dev/null +++ b/tests/uav-out-param.shader_test @@ -0,0 +1,27 @@ +[require] +shader model >= 5.0 + +[uav 0] +format r32g32b32a32 float +size (1, 1) + +0.1 0.2 0.3 0.4 + +[compute shader todo] + +RWTexture2D<float4> u; + +void func(inout float4 f) +{ + f.xz += 0.1; +} + + [numthreads(1, 1, 1)] +void main() +{ + func(u[uint2(0, 0)].yzwx); +} + +[test] +todo dispatch 1 1 1 +todo probe uav 0 (0, 0) rgba (0.1, 0.3, 0.3, 0.5)
1
0
0
0
← Newer
1
...
35
36
37
38
39
40
41
...
47
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
Results per page:
10
25
50
100
200