August 2022 - Wine-Commits - list.winehq.org

Zhiyi Zhang : dsdmo: Add IMediaParams stub interface.
by Alexandre Julliard Aug. 10, 2022

Aug. 10, 2022

Module: wine Branch: master Commit: 88f1d681c15578ad77edd460c45b0df24234baad URL: https://gitlab.winehq.org/wine/wine/-/commit/88f1d681c15578ad77edd460c45b0d… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Jul 26 15:01:39 2022 +0800 dsdmo: Add IMediaParams stub interface. Zuma's Revenge queries this interface. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/dsdmo/main.c | 73 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/dsdmo/tests/dsdmo.c | 1 + 2 files changed, 74 insertions(+) diff --git a/dlls/dsdmo/main.c b/dlls/dsdmo/main.c index 720d37350fe..3b106a8f633 100644 --- a/dlls/dsdmo/main.c +++ b/dlls/dsdmo/main.c @@ -34,6 +34,7 @@ struct effect { IMediaObject IMediaObject_iface; IMediaObjectInPlace IMediaObjectInPlace_iface; + IMediaParams IMediaParams_iface; IMediaParamInfo IMediaParamInfo_iface; IUnknown IUnknown_inner; IUnknown *outer_unk; @@ -68,6 +69,8 @@ static HRESULT WINAPI effect_inner_QueryInterface(IUnknown *iface, REFIID iid, v *out = &effect->IMediaObject_iface; else if (IsEqualGUID(iid, &IID_IMediaObjectInPlace)) *out = &effect->IMediaObjectInPlace_iface; + else if (IsEqualGUID(iid, &IID_IMediaParams)) + *out = &effect->IMediaParams_iface; else if (IsEqualGUID(iid, &IID_IMediaParamInfo)) *out = &effect->IMediaParamInfo_iface; else if (!(*out = effect->ops->query_interface(effect, iid))) @@ -422,6 +425,75 @@ static const IMediaObjectInPlaceVtbl effect_inplace_vtbl = effect_inplace_GetLatency, }; +static struct effect *impl_from_IMediaParams(IMediaParams *iface) +{ + return CONTAINING_RECORD(iface, struct effect, IMediaParams_iface); +} + +static HRESULT WINAPI effect_media_params_QueryInterface(IMediaParams *iface, REFIID iid, void **out) +{ + struct effect *effect = impl_from_IMediaParams(iface); + return IUnknown_QueryInterface(effect->outer_unk, iid, out); +} + +static ULONG WINAPI effect_media_params_AddRef(IMediaParams *iface) +{ + struct effect *effect = impl_from_IMediaParams(iface); + return IUnknown_AddRef(effect->outer_unk); +} + +static ULONG WINAPI effect_media_params_Release(IMediaParams *iface) +{ + struct effect *effect = impl_from_IMediaParams(iface); + return IUnknown_Release(effect->outer_unk); +} + +static HRESULT WINAPI effect_media_params_GetParam(IMediaParams *iface, DWORD index, MP_DATA *data) +{ + FIXME("iface %p, index %lu, data %p, stub!\n", iface, index, data); + return E_NOTIMPL; +} + +static HRESULT WINAPI effect_media_params_SetParam(IMediaParams *iface, DWORD index, MP_DATA data) +{ + FIXME("iface %p, index %lu, data %f, stub!\n", iface, index, data); + return E_NOTIMPL; +} + +static HRESULT WINAPI effect_media_params_AddEnvelope(IMediaParams *iface, DWORD index, DWORD count, + MP_ENVELOPE_SEGMENT *segments) +{ + FIXME("iface %p, index %lu, count %lu, segments %p, stub!\n", iface, index, count, segments); + return E_NOTIMPL; +} + +static HRESULT WINAPI effect_media_params_FlushEnvelope(IMediaParams *iface, DWORD index, + REFERENCE_TIME start, REFERENCE_TIME end) +{ + FIXME("iface %p, index %lu, start %s, end %s, stub!\n", iface, index, + wine_dbgstr_longlong(start), wine_dbgstr_longlong(end)); + return E_NOTIMPL; +} + +static HRESULT WINAPI effect_media_params_SetTimeFormat(IMediaParams *iface, GUID guid, + MP_TIMEDATA time_data) +{ + FIXME("iface %p, guid %s, time_data %lx, stub!\n", iface, wine_dbgstr_guid(&guid), time_data); + return E_NOTIMPL; +} + +static const IMediaParamsVtbl effect_media_params_vtbl = +{ + effect_media_params_QueryInterface, + effect_media_params_AddRef, + effect_media_params_Release, + effect_media_params_GetParam, + effect_media_params_SetParam, + effect_media_params_AddEnvelope, + effect_media_params_FlushEnvelope, + effect_media_params_SetTimeFormat, +}; + static struct effect *impl_from_IMediaParamInfo(IMediaParamInfo *iface) { return CONTAINING_RECORD(iface, struct effect, IMediaParamInfo_iface); @@ -501,6 +573,7 @@ static void effect_init(struct effect *effect, IUnknown *outer, const struct eff effect->IUnknown_inner.lpVtbl = &effect_inner_vtbl; effect->IMediaObject_iface.lpVtbl = &effect_vtbl; effect->IMediaObjectInPlace_iface.lpVtbl = &effect_inplace_vtbl; + effect->IMediaParams_iface.lpVtbl = &effect_media_params_vtbl; effect->IMediaParamInfo_iface.lpVtbl = &effect_media_param_info_vtbl; InitializeCriticalSection(&effect->cs); diff --git a/dlls/dsdmo/tests/dsdmo.c b/dlls/dsdmo/tests/dsdmo.c index 90b8e61f5e7..31f4dc6a473 100644 --- a/dlls/dsdmo/tests/dsdmo.c +++ b/dlls/dsdmo/tests/dsdmo.c @@ -136,6 +136,7 @@ static void test_interfaces(const GUID *clsid, const GUID *iid) { &IID_IMediaObject, &IID_IMediaObjectInPlace, + &IID_IMediaParams, &IID_IMediaParamInfo, }; IUnknown *unk, *unk2, *unk3;

1 0

Zhiyi Zhang : include: Add IMediaParams definitions.
by Alexandre Julliard Aug. 10, 2022

Aug. 10, 2022

Module: wine Branch: master Commit: bc712170a5bd514e32ac47de8607b4a1640e1145 URL: https://gitlab.winehq.org/wine/wine/-/commit/bc712170a5bd514e32ac47de8607b4… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Jul 26 15:01:08 2022 +0800 include: Add IMediaParams definitions. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- include/medparam.idl | 39 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 38 insertions(+), 1 deletion(-) diff --git a/include/medparam.idl b/include/medparam.idl index f3b7f2f463e..f32dd49827d 100644 --- a/include/medparam.idl +++ b/include/medparam.idl @@ -16,10 +16,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -import "unknwn.idl"; +import "strmif.idl"; typedef float MP_DATA; typedef DWORD MP_CAPS; +typedef DWORD MP_FLAGS; typedef DWORD MP_TIMEDATA; typedef enum _MP_Type @@ -42,6 +43,28 @@ typedef struct _MP_PARAMINFO WCHAR szLabel[32]; } MP_PARAMINFO; +typedef enum _MP_CURVE_TYPE { + MP_CURVE_JUMP = 0x0001, + MP_CURVE_LINEAR = 0x0002, + MP_CURVE_SQUARE = 0x0004, + MP_CURVE_INVSQUARE = 0x0008, + MP_CURVE_SINE = 0x0010, +} MP_CURVE_TYPE; + +const MP_FLAGS MPF_ENVLP_STANDARD = 0x0000; +const MP_FLAGS MPF_ENVLP_BEGIN_CURRENTVAL = 0x0001; +const MP_FLAGS MPF_ENVLP_BEGIN_NEUTRALVAL = 0x0002; + +typedef struct _MP_ENVELOPE_SEGMENT +{ + REFERENCE_TIME rtStart; + REFERENCE_TIME rtEnd; + MP_DATA valStart; + MP_DATA valEnd; + MP_CURVE_TYPE iCurve; + MP_FLAGS flags; +} MP_ENVELOPE_SEGMENT; + [ object, uuid(6D6CBB60-A223-44AA-842F-A2F06750BE6D), @@ -56,3 +79,17 @@ interface IMediaParamInfo : IUnknown HRESULT GetSupportedTimeFormat([in] DWORD index, [out] GUID *guid); HRESULT GetCurrentTimeFormat([out] GUID *guid, [out] MP_TIMEDATA *time_data); } + +[ +object, +uuid(6d6cbb61-a223-44aa-842f-a2f06750be6e), +version(1.0) +] +interface IMediaParams : IUnknown +{ + HRESULT GetParam([in] DWORD index, [out] MP_DATA *data); + HRESULT SetParam([in] DWORD index, [in] MP_DATA data); + HRESULT AddEnvelope([in] DWORD index, [in] DWORD count, [in] MP_ENVELOPE_SEGMENT *segments); + HRESULT FlushEnvelope([in] DWORD index, [in] REFERENCE_TIME start, [in] REFERENCE_TIME end); + HRESULT SetTimeFormat([in] GUID guid, [in] MP_TIMEDATA time_data); +}

1 0

Zebediah Figura : winhttp/tests: Add some more tests for newline handling in custom header parsing.
by Alexandre Julliard Aug. 10, 2022

Aug. 10, 2022

Module: wine Branch: master Commit: cba0d5c5d5e35da0de6043fce3c25337e92279cb URL: https://gitlab.winehq.org/wine/wine/-/commit/cba0d5c5d5e35da0de6043fce3c253… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Aug 9 17:19:35 2022 -0500 winhttp/tests: Add some more tests for newline handling in custom header parsing. --- dlls/winhttp/tests/winhttp.c | 76 +++++++++++++++++++++++++++++++++----------- 1 file changed, 58 insertions(+), 18 deletions(-) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 3c615656373..4e03a3752fd 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -2529,6 +2529,18 @@ static DWORD CALLBACK server_thread(LPVOID param) send(c, page1, sizeof page1 - 1, 0); last_request = 1; } + if (strstr(buffer, "POST /bad_headers")) + { + ok(!!strstr(buffer, "Content-Type: text/html\r\n"), "Header missing from request %s.\n", debugstr_a(buffer)); + todo_wine ok(!!strstr(buffer, "Test1: Value1\r\n"), "Header missing from request %s.\n", debugstr_a(buffer)); + todo_wine ok(!!strstr(buffer, "Test2: Value2\r\n"), "Header missing from request %s.\n", debugstr_a(buffer)); + ok(!!strstr(buffer, "Test3: Value3\r\n"), "Header missing from request %s.\n", debugstr_a(buffer)); + ok(!!strstr(buffer, "Test4: Value4\r\n"), "Header missing from request %s.\n", debugstr_a(buffer)); + ok(!!strstr(buffer, "Test5: Value5\r\n"), "Header missing from request %s.\n", debugstr_a(buffer)); + ok(!!strstr(buffer, "Test6: Value6\r\n"), "Header missing from request %s.\n", debugstr_a(buffer)); + ok(!!strstr(buffer, "Cookie: 111\r\n"), "Header missing from request %s.\n", debugstr_a(buffer)); + send(c, okmsg, sizeof(okmsg) - 1, 0); + } shutdown(c, 2); closesocket(c); c = -1; @@ -3597,37 +3609,65 @@ static void test_bad_header( int port ) WCHAR buffer[32]; HINTERNET ses, con, req; DWORD index, len; + unsigned int i; BOOL ret; + static const WCHAR bad_headers[] = + L"Content-Type: text/html\n\r" + L"Test1: Value1\n" + L"Test2: Value2\n\n\n" + L"Test3: Value3\r\r\r" + L"Test4: Value4\r\n\r\n" + L"Cookie: 111"; + + static const struct + { + const WCHAR *header; + const WCHAR *value; + } + header_tests[] = + { + {L"Content-Type", L"text/html"}, + {L"Test1", L"Value1"}, + {L"Test2", L"Value2"}, + {L"Test3", L"Value3"}, + {L"Test4", L"Value4"}, + {L"Cookie", L"111"}, + }; + ses = WinHttpOpen( L"winetest", WINHTTP_ACCESS_TYPE_NO_PROXY, NULL, NULL, 0 ); ok( ses != NULL, "failed to open session %lu\n", GetLastError() ); con = WinHttpConnect( ses, L"localhost", port, 0 ); ok( con != NULL, "failed to open a connection %lu\n", GetLastError() ); - req = WinHttpOpenRequest( con, NULL, NULL, NULL, NULL, NULL, 0 ); + req = WinHttpOpenRequest( con, L"POST", L"/bad_headers", NULL, NULL, NULL, 0 ); ok( req != NULL, "failed to open a request %lu\n", GetLastError() ); - ret = WinHttpAddRequestHeaders( req, L"Content-Type: text/html\n\rContent-Length:6\rCookie:111", ~0u, WINHTTP_ADDREQ_FLAG_ADD ); + ret = WinHttpAddRequestHeaders( req, bad_headers, ~0u, WINHTTP_ADDREQ_FLAG_ADD ); ok( ret, "failed to add header %lu\n", GetLastError() ); - index = 0; - buffer[0] = 0; - len = sizeof(buffer); - ret = WinHttpQueryHeaders( req, WINHTTP_QUERY_CUSTOM|WINHTTP_QUERY_FLAG_REQUEST_HEADERS, - L"Content-Type", buffer, &len, &index ); - ok( ret, "failed to query headers %lu\n", GetLastError() ); - ok( !lstrcmpW( buffer, L"text/html" ), "got %s\n", wine_dbgstr_w(buffer) ); - ok( index == 1, "index = %lu\n", index ); + for (i = 0; i < ARRAY_SIZE(header_tests); ++i) + { + index = 0; + buffer[0] = 0; + len = sizeof(buffer); + ret = WinHttpQueryHeaders( req, WINHTTP_QUERY_CUSTOM | WINHTTP_QUERY_FLAG_REQUEST_HEADERS, + header_tests[i].header, buffer, &len, &index ); + todo_wine_if (i >= 1 && i <= 3) + { + ok( ret, "header %s: failed to query headers %lu\n", debugstr_w(header_tests[i].header), GetLastError() ); + ok( !wcscmp( buffer, header_tests[i].value ), "header %s: got %s\n", + debugstr_w(header_tests[i].header), debugstr_w(buffer) ); + ok( index == 1, "header %s: index = %lu\n", debugstr_w(header_tests[i].header), index ); + } + } - index = 0; - buffer[0] = 0; - len = sizeof(buffer); - ret = WinHttpQueryHeaders( req, WINHTTP_QUERY_CUSTOM|WINHTTP_QUERY_FLAG_REQUEST_HEADERS, - L"Cookie", buffer, &len, &index ); - ok( ret, "failed to query headers %lu\n", GetLastError() ); - ok( !lstrcmpW( buffer, L"111" ), "got %s\n", wine_dbgstr_w(buffer) ); - ok( index == 1, "index = %lu\n", index ); + ret = WinHttpSendRequest( req, L"Test5: Value5\rTest6: Value6", ~0u, NULL, 0, 0, 0 ); + ok( ret, "failed to send request %lu\n", GetLastError() ); + + ret = WinHttpReceiveResponse( req, NULL ); + ok( ret, "failed to receive response %lu\n", GetLastError() ); WinHttpCloseHandle( req ); WinHttpCloseHandle( con );

1 0

Tim Clem : kernelbase: Don't assume the length of the process image name.
by Alexandre Julliard Aug. 10, 2022

Aug. 10, 2022

Module: wine Branch: master Commit: a7937e83b2f8606aa777098eb5e738241a5458e1 URL: https://gitlab.winehq.org/wine/wine/-/commit/a7937e83b2f8606aa777098eb5e738… Author: Tim Clem <tclem(a)codeweavers.com> Date: Tue Aug 9 13:10:15 2022 -0700 kernelbase: Don't assume the length of the process image name. NtQueryInformationProcess(ProcessImageFileNameWin32) may return an empty string in some circumstances, which leads QueryFullProcessImageNameW to crash if called with flags including PROCESS_NAME_NATIVE, as that path assumed the image name had a length of at least 2. --- dlls/kernelbase/debug.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernelbase/debug.c b/dlls/kernelbase/debug.c index 9e954e3ffbe..cd8e0d7f87d 100644 --- a/dlls/kernelbase/debug.c +++ b/dlls/kernelbase/debug.c @@ -1575,7 +1575,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH QueryFullProcessImageNameW( HANDLE process, DWORD if (status) goto cleanup; - if (flags & PROCESS_NAME_NATIVE) + if (flags & PROCESS_NAME_NATIVE && result->Length > 2 * sizeof(WCHAR)) { WCHAR drive[3]; WCHAR device[1024];

1 0

David Gow : quartz: Test: Files opened with FileSource can be deleted.
by Alexandre Julliard Aug. 10, 2022

Aug. 10, 2022

Module: wine Branch: master Commit: cf41f6d9b5ca04125031b454cf22a423612628ea URL: https://gitlab.winehq.org/wine/wine/-/commit/cf41f6d9b5ca04125031b454cf22a4… Author: David Gow <david(a)ingeniumdigital.com> Date: Tue Aug 9 21:02:40 2022 +0800 quartz: Test: Files opened with FileSource can be deleted. Some games (such as Digimon Survive) will delete a file while it's open as a FileSource. Signed-off-by: David Gow <david(a)ingeniumdigital.com> --- dlls/quartz/tests/filesource.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/dlls/quartz/tests/filesource.c b/dlls/quartz/tests/filesource.c index c383d9f6579..268b265ac77 100644 --- a/dlls/quartz/tests/filesource.c +++ b/dlls/quartz/tests/filesource.c @@ -1476,6 +1476,24 @@ static void test_connect_pin(void) ok(ret, "Failed to delete file, error %lu.\n", GetLastError()); } +static void test_file_share_delete(void) +{ + const WCHAR *filename = load_resource(L"test.avi"); + IBaseFilter *filter = create_file_source(); + ULONG ref; + BOOL ret; + + load_file(filter, filename); + + /* Test that we can delete the file while it's open. */ + ret = DeleteFileW(filename); + ok(ret, "Failed to delete file, error %lu.\n", GetLastError()); + + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %ld.\n", ref); +} + + START_TEST(filesource) { CoInitialize(NULL); @@ -1490,6 +1508,7 @@ START_TEST(filesource) test_async_reader(); test_enum_media_types(); test_connect_pin(); + test_file_share_delete(); CoUninitialize(); }

1 0

David Gow : quartz: Open files with FILE_SHARE_DELETE in FileSource.
by Alexandre Julliard Aug. 10, 2022

Aug. 10, 2022

Module: wine Branch: master Commit: 9cfd5d00ca5a0643e15279d7ea7ca7db5be698a4 URL: https://gitlab.winehq.org/wine/wine/-/commit/9cfd5d00ca5a0643e15279d7ea7ca7… Author: David Gow <david(a)ingeniumdigital.com> Date: Sun Jul 31 09:58:09 2022 +0800 quartz: Open files with FILE_SHARE_DELETE in FileSource. Some games (such as Digimon Survive) create temporary video files and will hang if deleting them fails. Open the files with FILE_SHARE_DELETE, which will allow this deletion to go ahead even if the FileSource hasn't yet been closed. Note that many windows codec packs do themselves open files without FILE_SHARE_DELETE, so a similar hang can be observed in some windows configurations. I haven't checked that this is the file share mode used on windows (alas, I don't have a windows machine available), so I haven't removed the FIXME comment. Equally, I also updated the CreateFileW() call in get_media_type(), but that _may_ be unnecessary. Signed-off-by: David Gow <david(a)ingeniumdigital.com> --- dlls/quartz/filesource.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index 6ffae606df4..0579f564af7 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -214,7 +214,7 @@ BOOL get_media_type(const WCHAR *filename, GUID *majortype, GUID *subtype, GUID } } - if ((file = CreateFileW(filename, GENERIC_READ, FILE_SHARE_READ, NULL, + if ((file = CreateFileW(filename, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_DELETE, NULL, OPEN_EXISTING, 0, NULL)) == INVALID_HANDLE_VALUE) { WARN("Failed to open file %s, error %lu.\n", debugstr_w(filename), GetLastError()); @@ -464,7 +464,7 @@ static HRESULT WINAPI FileSource_Load(IFileSourceFilter * iface, LPCOLESTR pszFi /* open file */ /* FIXME: check the sharing values that native uses */ - hFile = CreateFileW(pszFileName, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_FLAG_OVERLAPPED, NULL); + hFile = CreateFileW(pszFileName, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_DELETE, NULL, OPEN_EXISTING, FILE_FLAG_OVERLAPPED, NULL); if (hFile == INVALID_HANDLE_VALUE) {

1 0

Francisco Casas : vkd3d-shader/hlsl: Replace register offsets with index paths in split copies.
by Alexandre Julliard Aug. 10, 2022

Aug. 10, 2022

Module: vkd3d Branch: master Commit: 577014c017d38c6b9811f0568892dd0b098988c9 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/577014c017d38c6b9811f0568892d… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Tue Jun 28 17:20:24 2022 -0400 vkd3d-shader/hlsl: Replace register offsets with index paths in split copies. hlsl_new_store() and hlsl_new_load() are deleted, so now there are no more direct ways to create derefs with offsets in hlsl.c and hlsl.h. Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.c | 32 -------------------------------- libs/vkd3d-shader/hlsl.h | 4 ---- libs/vkd3d-shader/hlsl_codegen.c | 40 +++++++++++----------------------------- 3 files changed, 11 insertions(+), 65 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 4a469d40..a47e3d2d 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -797,25 +797,6 @@ void hlsl_cleanup_deref(struct hlsl_deref *deref) hlsl_src_remove(&deref->offset); } -struct hlsl_ir_store *hlsl_new_store(struct hlsl_ctx *ctx, struct hlsl_ir_var *var, struct hlsl_ir_node *offset, - struct hlsl_ir_node *rhs, unsigned int writemask, struct vkd3d_shader_location loc) -{ - struct hlsl_ir_store *store; - - if (!writemask && type_is_single_reg(rhs->data_type)) - writemask = (1 << rhs->data_type->dimx) - 1; - - if (!(store = hlsl_alloc(ctx, sizeof(*store)))) - return NULL; - - init_node(&store->node, HLSL_IR_STORE, NULL, loc); - init_deref(ctx, &store->lhs, var, 0); - hlsl_src_from_node(&store->lhs.offset, offset); - hlsl_src_from_node(&store->rhs, rhs); - store->writemask = writemask; - return store; -} - /* Initializes a simple variable derefence, so that it can be passed to load/store functions. */ void hlsl_init_simple_deref_from_var(struct hlsl_deref *deref, struct hlsl_ir_var *var) { @@ -971,19 +952,6 @@ struct hlsl_ir_if *hlsl_new_if(struct hlsl_ctx *ctx, struct hlsl_ir_node *condit return iff; } -struct hlsl_ir_load *hlsl_new_load(struct hlsl_ctx *ctx, struct hlsl_ir_var *var, struct hlsl_ir_node *offset, - struct hlsl_type *type, const struct vkd3d_shader_location loc) -{ - struct hlsl_ir_load *load; - - if (!(load = hlsl_alloc(ctx, sizeof(*load)))) - return NULL; - init_node(&load->node, HLSL_IR_LOAD, type, loc); - init_deref(ctx, &load->src, var, 0); - hlsl_src_from_node(&load->src.offset, offset); - return load; -} - struct hlsl_ir_load *hlsl_new_load_index(struct hlsl_ctx *ctx, const struct hlsl_deref *deref, struct hlsl_ir_node *idx, const struct vkd3d_shader_location *loc) { diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 0c684ae9..7970665c 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -774,11 +774,7 @@ struct hlsl_ir_resource_load *hlsl_new_resource_load(struct hlsl_ctx *ctx, struc enum hlsl_resource_load_type type, struct hlsl_deref *resource, struct hlsl_deref *sampler, struct hlsl_ir_node *coords, struct hlsl_ir_node *texel_offset, const struct vkd3d_shader_location *loc); -struct hlsl_ir_load *hlsl_new_load(struct hlsl_ctx *ctx, struct hlsl_ir_var *var, struct hlsl_ir_node *offset, - struct hlsl_type *type, struct vkd3d_shader_location loc); struct hlsl_ir_loop *hlsl_new_loop(struct hlsl_ctx *ctx, struct vkd3d_shader_location loc); -struct hlsl_ir_store *hlsl_new_store(struct hlsl_ctx *ctx, struct hlsl_ir_var *var, struct hlsl_ir_node *offset, - struct hlsl_ir_node *rhs, unsigned int writemask, struct vkd3d_shader_location loc); struct hlsl_type *hlsl_new_struct_type(struct hlsl_ctx *ctx, const char *name, struct hlsl_struct_field *fields, size_t field_count); struct hlsl_ir_swizzle *hlsl_new_swizzle(struct hlsl_ctx *ctx, DWORD s, unsigned int components, diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 774ee824..36a417e5 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -958,39 +958,21 @@ static bool fold_redundant_casts(struct hlsl_ctx *ctx, struct hlsl_ir_node *inst * split_matrix_copies(). Inserts new instructions right before * "store". */ static bool split_copy(struct hlsl_ctx *ctx, struct hlsl_ir_store *store, - const struct hlsl_ir_load *load, const unsigned int offset, struct hlsl_type *type) + const struct hlsl_ir_load *load, const unsigned int idx, struct hlsl_type *type) { - struct hlsl_ir_node *offset_instr, *add; struct hlsl_ir_store *split_store; struct hlsl_ir_load *split_load; struct hlsl_ir_constant *c; - if (!(c = hlsl_new_uint_constant(ctx, offset, &store->node.loc))) + if (!(c = hlsl_new_uint_constant(ctx, idx, &store->node.loc))) return false; list_add_before(&store->node.entry, &c->node.entry); - offset_instr = &c->node; - if (load->src.offset.node) - { - if (!(add = hlsl_new_binary_expr(ctx, HLSL_OP2_ADD, load->src.offset.node, &c->node))) - return false; - list_add_before(&store->node.entry, &add->entry); - offset_instr = add; - } - if (!(split_load = hlsl_new_load(ctx, load->src.var, offset_instr, type, store->node.loc))) + if (!(split_load = hlsl_new_load_index(ctx, &load->src, &c->node, &store->node.loc))) return false; list_add_before(&store->node.entry, &split_load->node.entry); - offset_instr = &c->node; - if (store->lhs.offset.node) - { - if (!(add = hlsl_new_binary_expr(ctx, HLSL_OP2_ADD, store->lhs.offset.node, &c->node))) - return false; - list_add_before(&store->node.entry, &add->entry); - offset_instr = add; - } - - if (!(split_store = hlsl_new_store(ctx, store->lhs.var, offset_instr, &split_load->node, 0, store->node.loc))) + if (!(split_store = hlsl_new_store_index(ctx, &store->lhs, &c->node, &split_load->node, 0, &store->node.loc))) return false; list_add_before(&store->node.entry, &split_store->node.entry); @@ -1002,8 +984,8 @@ static bool split_array_copies(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, const struct hlsl_ir_node *rhs; struct hlsl_type *element_type; const struct hlsl_type *type; - unsigned int element_size, i; struct hlsl_ir_store *store; + unsigned int i; if (instr->type != HLSL_IR_STORE) return false; @@ -1014,7 +996,6 @@ static bool split_array_copies(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, if (type->type != HLSL_CLASS_ARRAY) return false; element_type = type->e.array.type; - element_size = hlsl_type_get_array_element_reg_size(element_type); if (rhs->type != HLSL_IR_LOAD) { @@ -1024,7 +1005,7 @@ static bool split_array_copies(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, for (i = 0; i < type->e.array.elements_count; ++i) { - if (!split_copy(ctx, store, hlsl_ir_load(rhs), i * element_size, element_type)) + if (!split_copy(ctx, store, hlsl_ir_load(rhs), i, element_type)) return false; } @@ -1062,7 +1043,7 @@ static bool split_struct_copies(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr { const struct hlsl_struct_field *field = &type->e.record.fields[i]; - if (!split_copy(ctx, store, hlsl_ir_load(rhs), field->reg_offset, field->type)) + if (!split_copy(ctx, store, hlsl_ir_load(rhs), i, field->type)) return false; } @@ -1100,7 +1081,7 @@ static bool split_matrix_copies(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr for (i = 0; i < hlsl_type_major_size(type); ++i) { - if (!split_copy(ctx, store, hlsl_ir_load(rhs), 4 * i, element_type)) + if (!split_copy(ctx, store, hlsl_ir_load(rhs), i, element_type)) return false; } @@ -2114,8 +2095,6 @@ int hlsl_emit_bytecode(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry append_output_var_copy(ctx, &body->instrs, entry_func->return_var); } - transform_ir(ctx, transform_deref_paths_into_offsets, body, NULL); /* TODO: move forward, remove when no longer needed */ - transform_ir(ctx, lower_broadcasts, body, NULL); while (transform_ir(ctx, fold_redundant_casts, body, NULL)); do @@ -2125,6 +2104,9 @@ int hlsl_emit_bytecode(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry } while (progress); transform_ir(ctx, split_matrix_copies, body, NULL); + + transform_ir(ctx, transform_deref_paths_into_offsets, body, NULL); /* TODO: move forward, remove when no longer needed */ + transform_ir(ctx, lower_narrowing_casts, body, NULL); transform_ir(ctx, lower_casts_to_bool, body, NULL); do

1 0

Francisco Casas : vkd3d-shader/hlsl: Replace register offsets with index paths in input/output copies.
by Alexandre Julliard Aug. 10, 2022

Aug. 10, 2022

Module: vkd3d Branch: master Commit: d7d2fe145f7178d4b10cf985d2757dcb4387613c URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/d7d2fe145f7178d4b10cf985d2757… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Fri Jul 1 12:06:30 2022 -0400 vkd3d-shader/hlsl: Replace register offsets with index paths in input/output copies. Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- libs/vkd3d-shader/hlsl_codegen.c | 196 +++++++++++++++++++++++++-------------- 1 file changed, 124 insertions(+), 72 deletions(-)

1 0

Francisco Casas : vkd3d-shader/hlsl: Replace register offsets with index paths in load initializations.
by Alexandre Julliard Aug. 10, 2022

Aug. 10, 2022

Module: vkd3d Branch: master Commit: 4fede46c9a3ab06461a6dabb0e6b9482d060a75e URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/4fede46c9a3ab06461a6dabb0e6b9… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Thu Jun 30 18:20:20 2022 -0400 vkd3d-shader/hlsl: Replace register offsets with index paths in load initializations. The transform_deref_paths_into_offsets pass turns these index paths back into register offsets. Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.c | 302 +++++++++++++++++++++++++++++++++++++-- libs/vkd3d-shader/hlsl.h | 35 ++++- libs/vkd3d-shader/hlsl.y | 102 +++++++------ libs/vkd3d-shader/hlsl_codegen.c | 44 ++++++ 4 files changed, 414 insertions(+), 69 deletions(-)

1 0

Francisco Casas : vkd3d-shader/hlsl: Move register offset functions to hlsl_codegen.c.
by Alexandre Julliard Aug. 10, 2022

Aug. 10, 2022

Module: vkd3d Branch: master Commit: c572adbf2a46d904e2b8ecaba9c497f5eb50a7c7 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/c572adbf2a46d904e2b8ecaba9c49… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Fri Jul 1 12:36:25 2022 -0400 vkd3d-shader/hlsl: Move register offset functions to hlsl_codegen.c. This can be done now, to ensure that register offsets are no longer used in hlsl.c and hlsl.h. Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.c | 103 --------------------------------------- libs/vkd3d-shader/hlsl.h | 6 --- libs/vkd3d-shader/hlsl_codegen.c | 103 ++++++++++++++++++++++++++++++++++++++- 3 files changed, 102 insertions(+), 110 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index bf74131a..4a469d40 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -456,109 +456,6 @@ struct hlsl_type *hlsl_get_inner_type_from_path_index(struct hlsl_ctx *ctx, cons } } -struct hlsl_ir_node *hlsl_new_offset_from_path_index(struct hlsl_ctx *ctx, struct hlsl_block *block, - struct hlsl_type *type, struct hlsl_ir_node *offset, struct hlsl_ir_node *idx, - const struct vkd3d_shader_location *loc) -{ - struct hlsl_ir_node *idx_offset = NULL; - struct hlsl_ir_constant *c; - - list_init(&block->instrs); - - switch (type->type) - { - case HLSL_CLASS_VECTOR: - idx_offset = idx; - break; - - case HLSL_CLASS_MATRIX: - { - if (!(c = hlsl_new_uint_constant(ctx, 4, loc))) - return NULL; - list_add_tail(&block->instrs, &c->node.entry); - - if (!(idx_offset = hlsl_new_binary_expr(ctx, HLSL_OP2_MUL, &c->node, idx))) - return NULL; - list_add_tail(&block->instrs, &idx_offset->entry); - - break; - } - - case HLSL_CLASS_ARRAY: - { - unsigned int size = hlsl_type_get_array_element_reg_size(type->e.array.type); - - if (!(c = hlsl_new_uint_constant(ctx, size, loc))) - return NULL; - list_add_tail(&block->instrs, &c->node.entry); - - if (!(idx_offset = hlsl_new_binary_expr(ctx, HLSL_OP2_MUL, &c->node, idx))) - return NULL; - list_add_tail(&block->instrs, &idx_offset->entry); - - break; - } - - case HLSL_CLASS_STRUCT: - { - unsigned int field_idx = hlsl_ir_constant(idx)->value[0].u; - struct hlsl_struct_field *field = &type->e.record.fields[field_idx]; - - if (!(c = hlsl_new_uint_constant(ctx, field->reg_offset, loc))) - return NULL; - list_add_tail(&block->instrs, &c->node.entry); - - idx_offset = &c->node; - - break; - } - - default: - assert(0); - return NULL; - } - - if (offset) - { - if (!(idx_offset = hlsl_new_binary_expr(ctx, HLSL_OP2_ADD, offset, idx_offset))) - return NULL; - list_add_tail(&block->instrs, &idx_offset->entry); - } - - return idx_offset; -} - -struct hlsl_ir_node *hlsl_new_offset_instr_from_deref(struct hlsl_ctx *ctx, struct hlsl_block *block, - const struct hlsl_deref *deref, const struct vkd3d_shader_location *loc) -{ - struct hlsl_ir_node *offset = NULL; - struct hlsl_type *type; - unsigned int i; - - list_init(&block->instrs); - - if (deref->offset.node) - return deref->offset.node; - - assert(deref->var); - - type = deref->var->data_type; - - for (i = 0; i < deref->path_len; ++i) - { - struct hlsl_block idx_block; - - if (!(offset = hlsl_new_offset_from_path_index(ctx, &idx_block, type, offset, deref->path[i].node, loc))) - return NULL; - - list_move_tail(&block->instrs, &idx_block.instrs); - - type = hlsl_get_inner_type_from_path_index(ctx, type, deref->path[i].node); - } - - return offset; -} - struct hlsl_type *hlsl_new_array_type(struct hlsl_ctx *ctx, struct hlsl_type *basic_type, unsigned int array_size) { struct hlsl_type *type; diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 2af22c03..0c684ae9 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -737,9 +737,6 @@ struct hlsl_ir_var *hlsl_get_var(struct hlsl_scope *scope, const char *name); struct hlsl_type *hlsl_get_inner_type_from_path_index(struct hlsl_ctx *ctx, const struct hlsl_type *type, struct hlsl_ir_node *idx); -struct hlsl_ir_node *hlsl_new_offset_from_path_index(struct hlsl_ctx *ctx, struct hlsl_block *block, - struct hlsl_type *type, struct hlsl_ir_node *offset, struct hlsl_ir_node *idx, - const struct vkd3d_shader_location *loc); struct hlsl_type *hlsl_new_array_type(struct hlsl_ctx *ctx, struct hlsl_type *basic_type, unsigned int array_size); struct hlsl_ir_node *hlsl_new_binary_expr(struct hlsl_ctx *ctx, enum hlsl_ir_expr_op op, struct hlsl_ir_node *arg1, @@ -773,9 +770,6 @@ struct hlsl_ir_store *hlsl_new_store_index(struct hlsl_ctx *ctx, const struct hl struct hlsl_ir_store *hlsl_new_store_component(struct hlsl_ctx *ctx, struct hlsl_block *block, const struct hlsl_deref *lhs, unsigned int comp, struct hlsl_ir_node *rhs); -struct hlsl_ir_node *hlsl_new_offset_instr_from_deref(struct hlsl_ctx *ctx, struct hlsl_block *block, - const struct hlsl_deref *deref, const struct vkd3d_shader_location *loc); - struct hlsl_ir_resource_load *hlsl_new_resource_load(struct hlsl_ctx *ctx, struct hlsl_type *data_type, enum hlsl_resource_load_type type, struct hlsl_deref *resource, struct hlsl_deref *sampler, struct hlsl_ir_node *coords, struct hlsl_ir_node *texel_offset, const struct vkd3d_shader_location *loc); diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 45012333..fdccd2c7 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -21,6 +21,107 @@ #include "hlsl.h" #include <stdio.h> +/* TODO: remove when no longer needed, only used for new_offset_instr_from_deref() */ +static struct hlsl_ir_node *new_offset_from_path_index(struct hlsl_ctx *ctx, struct hlsl_block *block, + struct hlsl_type *type, struct hlsl_ir_node *offset, struct hlsl_ir_node *idx, + const struct vkd3d_shader_location *loc) +{ + struct hlsl_ir_node *idx_offset = NULL; + struct hlsl_ir_constant *c; + + list_init(&block->instrs); + + switch (type->type) + { + case HLSL_CLASS_VECTOR: + idx_offset = idx; + break; + + case HLSL_CLASS_MATRIX: + { + if (!(c = hlsl_new_uint_constant(ctx, 4, loc))) + return NULL; + list_add_tail(&block->instrs, &c->node.entry); + + if (!(idx_offset = hlsl_new_binary_expr(ctx, HLSL_OP2_MUL, &c->node, idx))) + return NULL; + list_add_tail(&block->instrs, &idx_offset->entry); + + break; + } + + case HLSL_CLASS_ARRAY: + { + unsigned int size = hlsl_type_get_array_element_reg_size(type->e.array.type); + + if (!(c = hlsl_new_uint_constant(ctx, size, loc))) + return NULL; + list_add_tail(&block->instrs, &c->node.entry); + + if (!(idx_offset = hlsl_new_binary_expr(ctx, HLSL_OP2_MUL, &c->node, idx))) + return NULL; + list_add_tail(&block->instrs, &idx_offset->entry); + + break; + } + + case HLSL_CLASS_STRUCT: + { + unsigned int field_idx = hlsl_ir_constant(idx)->value[0].u; + struct hlsl_struct_field *field = &type->e.record.fields[field_idx]; + + if (!(c = hlsl_new_uint_constant(ctx, field->reg_offset, loc))) + return NULL; + list_add_tail(&block->instrs, &c->node.entry); + + idx_offset = &c->node; + + break; + } + + default: + assert(0); + return NULL; + } + + if (offset) + { + if (!(idx_offset = hlsl_new_binary_expr(ctx, HLSL_OP2_ADD, offset, idx_offset))) + return NULL; + list_add_tail(&block->instrs, &idx_offset->entry); + } + + return idx_offset; +} + +/* TODO: remove when no longer needed, only used for replace_deref_path_with_offset() */ +static struct hlsl_ir_node *new_offset_instr_from_deref(struct hlsl_ctx *ctx, struct hlsl_block *block, + const struct hlsl_deref *deref, const struct vkd3d_shader_location *loc) +{ + struct hlsl_ir_node *offset = NULL; + struct hlsl_type *type; + unsigned int i; + + list_init(&block->instrs); + + assert(deref->var); + type = deref->var->data_type; + + for (i = 0; i < deref->path_len; ++i) + { + struct hlsl_block idx_block; + + if (!(offset = new_offset_from_path_index(ctx, &idx_block, type, offset, deref->path[i].node, loc))) + return NULL; + + list_move_tail(&block->instrs, &idx_block.instrs); + + type = hlsl_get_inner_type_from_path_index(ctx, type, deref->path[i].node); + } + + return offset; +} + /* TODO: remove when no longer needed, only used for transform_deref_paths_into_offsets() */ static void replace_deref_path_with_offset(struct hlsl_ctx *ctx, struct hlsl_deref *deref, struct hlsl_ir_node *instr) @@ -34,7 +135,7 @@ static void replace_deref_path_with_offset(struct hlsl_ctx *ctx, struct hlsl_der /* register offsets shouldn't be used before this point is reached. */ assert(!deref->offset.node); - if (!(offset = hlsl_new_offset_instr_from_deref(ctx, &block, deref, &instr->loc))) + if (!(offset = new_offset_instr_from_deref(ctx, &block, deref, &instr->loc))) return; list_move_before(&instr->entry, &block.instrs);

1 0