- Wine-Commits - list.winehq.org

Ziqing Hui : winegstreamer: Implement wg_muxer_start.
by Alexandre Julliard Nov. 6, 2023

Nov. 6, 2023

Module: wine Branch: master Commit: 7cee5e5580decd8071dc0dfeb7158d4f7ef74bcd URL: https://gitlab.winehq.org/wine/wine/-/commit/7cee5e5580decd8071dc0dfeb7158d… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Mon Sep 25 11:52:29 2023 +0800 winegstreamer: Implement wg_muxer_start. --- dlls/winegstreamer/gst_private.h | 1 + dlls/winegstreamer/main.c | 15 ++++ dlls/winegstreamer/media_sink.c | 9 ++- dlls/winegstreamer/unix_private.h | 1 + dlls/winegstreamer/unixlib.h | 1 + dlls/winegstreamer/wg_muxer.c | 160 +++++++++++++++++++++++++++++++------- dlls/winegstreamer/wg_parser.c | 2 + 7 files changed, 159 insertions(+), 30 deletions(-)

1 0

Alex Henrie : winmm/tests: Use CRT allocation functions.
by Alexandre Julliard Nov. 6, 2023

Nov. 6, 2023

Module: wine Branch: master Commit: bb6bcaf83e91882e0a523a4455ed7174b3ce3ad4 URL: https://gitlab.winehq.org/wine/wine/-/commit/bb6bcaf83e91882e0a523a4455ed71… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Nov 1 23:28:24 2023 -0600 winmm/tests: Use CRT allocation functions. --- dlls/winmm/tests/capture.c | 15 +++++++-------- dlls/winmm/tests/midi.c | 16 ++++++++-------- dlls/winmm/tests/mixer.c | 10 ++++------ dlls/winmm/tests/wave.c | 29 ++++++++++++++--------------- 4 files changed, 33 insertions(+), 37 deletions(-)

1 0

Alex Henrie : gdi32/tests: Use CRT allocation functions.
by Alexandre Julliard Nov. 6, 2023

Nov. 6, 2023

Module: wine Branch: master Commit: 0b7eed0310a2d1272a97d8a45ec37fa03a9c26c8 URL: https://gitlab.winehq.org/wine/wine/-/commit/0b7eed0310a2d1272a97d8a45ec37f… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Nov 2 00:16:14 2023 -0600 gdi32/tests: Use CRT allocation functions. --- dlls/gdi32/tests/bitmap.c | 72 +++++++++++++++++------------------ dlls/gdi32/tests/dc.c | 18 ++++----- dlls/gdi32/tests/dib.c | 20 +++++----- dlls/gdi32/tests/font.c | 91 ++++++++++++++++++++++----------------------- dlls/gdi32/tests/metafile.c | 40 ++++++++++---------- dlls/gdi32/tests/path.c | 8 ++-- 6 files changed, 124 insertions(+), 125 deletions(-)

1 0

Alex Henrie : setupapi/tests: Use CRT allocation functions.
by Alexandre Julliard Nov. 6, 2023

Nov. 6, 2023

Module: wine Branch: master Commit: eea358e6cbe8e9ee5c0b211d42bd7fe2a13449d9 URL: https://gitlab.winehq.org/wine/wine/-/commit/eea358e6cbe8e9ee5c0b211d42bd7f… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sat Nov 4 20:54:49 2023 -0700 setupapi/tests: Use CRT allocation functions. --- dlls/setupapi/tests/devinst.c | 5 ++--- dlls/setupapi/tests/install.c | 6 +++--- dlls/setupapi/tests/misc.c | 8 ++++---- dlls/setupapi/tests/query.c | 18 +++++++++--------- 4 files changed, 18 insertions(+), 19 deletions(-) diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index be0831f6882..2dc891d61f1 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -33,7 +33,6 @@ #include "cfgmgr32.h" #include "cguid.h" -#include "wine/heap.h" #include "wine/test.h" /* This is a unique guid for testing purposes */ @@ -1233,7 +1232,7 @@ static void test_device_iface_detail(void) expected_size = FIELD_OFFSET(SP_DEVICE_INTERFACE_DETAIL_DATA_A, DevicePath[strlen(path) + 1]); ok(size == expected_size, "Expected size %lu, got %lu.\n", expected_size, size); - detail = heap_alloc(size * 2); + detail = malloc(size * 2); detail->cbSize = 0; SetLastError(0xdeadbeef); @@ -1283,7 +1282,7 @@ static void test_device_iface_detail(void) ok(size == expected_size, "Expected size %lu, got %lu.\n", expected_size, size); ok(IsEqualGUID(&device.ClassGuid, &guid), "Got unexpected class %s.\n", wine_dbgstr_guid(&device.ClassGuid)); - heap_free(detail); + free(detail); SetupDiDestroyDeviceInfoList(set); } diff --git a/dlls/setupapi/tests/install.c b/dlls/setupapi/tests/install.c index 318f1294210..d33925f128e 100644 --- a/dlls/setupapi/tests/install.c +++ b/dlls/setupapi/tests/install.c @@ -207,17 +207,17 @@ static BOOL CDECL get_temp_file(char *pszTempName, int cbTempName, void *pv) { LPSTR tempname; - tempname = HeapAlloc(GetProcessHeap(), 0, MAX_PATH); + tempname = malloc(MAX_PATH); GetTempFileNameA(".", "xx", 0, tempname); if (tempname && (strlen(tempname) < (unsigned)cbTempName)) { lstrcpyA(pszTempName, tempname); - HeapFree(GetProcessHeap(), 0, tempname); + free(tempname); return TRUE; } - HeapFree(GetProcessHeap(), 0, tempname); + free(tempname); return FALSE; } diff --git a/dlls/setupapi/tests/misc.c b/dlls/setupapi/tests/misc.c index b9eb3e6c75f..6fda69f9e39 100644 --- a/dlls/setupapi/tests/misc.c +++ b/dlls/setupapi/tests/misc.c @@ -109,7 +109,7 @@ static void test_original_file_name(LPCSTR original, LPCSTR dest) res = SetupGetInfInformationA(hinf, INFINFO_INF_SPEC_IS_HINF, NULL, 0, &size); ok(res, "SetupGetInfInformation failed with error %ld\n", GetLastError()); - pspii = HeapAlloc(GetProcessHeap(), 0, size); + pspii = malloc(size); res = SetupGetInfInformationA(hinf, INFINFO_INF_SPEC_IS_HINF, pspii, size, NULL); ok(res, "SetupGetInfInformation failed with error %ld\n", GetLastError()); @@ -125,7 +125,7 @@ static void test_original_file_name(LPCSTR original, LPCSTR dest) ok(!spofi.OriginalCatalogName[0], "spofi.OriginalCatalogName should have been \"\" instead of \"%s\"\n", spofi.OriginalCatalogName); ok(!strcmp(original, spofi.OriginalInfName), "spofi.OriginalInfName of %s didn't match real original name %s\n", spofi.OriginalInfName, original); - HeapFree(GetProcessHeap(), 0, pspii); + free(pspii); SetupCloseInfFile(hinf); } @@ -371,12 +371,12 @@ static BOOL compare_file_data(LPSTR file, const BYTE *data, DWORD size) LPBYTE buffer; handle = CreateFileA(file, GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); - buffer = HeapAlloc(GetProcessHeap(), 0, size); + buffer = malloc(size); if (buffer) { ReadFile(handle, buffer, size, &read, NULL); if (read == size && !memcmp(data, buffer, size)) ret = TRUE; - HeapFree(GetProcessHeap(), 0, buffer); + free(buffer); } CloseHandle(handle); return ret; diff --git a/dlls/setupapi/tests/query.c b/dlls/setupapi/tests/query.c index 6258727c076..f7aeba41153 100644 --- a/dlls/setupapi/tests/query.c +++ b/dlls/setupapi/tests/query.c @@ -120,7 +120,7 @@ static BOOL check_info_filename(PSP_INF_INFORMATION info, LPSTR test) if (!SetupQueryInfFileInformationA(info, 0, NULL, 0, &size)) return FALSE; - filename = HeapAlloc(GetProcessHeap(), 0, size); + filename = malloc(size); if (!filename) return FALSE; @@ -129,7 +129,7 @@ static BOOL check_info_filename(PSP_INF_INFORMATION info, LPSTR test) if (!lstrcmpiA(test, filename)) ret = TRUE; - HeapFree(GetProcessHeap(), 0, filename); + free(filename); return ret; } @@ -142,7 +142,7 @@ static PSP_INF_INFORMATION alloc_inf_info(LPCSTR filename, DWORD search, PDWORD if (!ret) return NULL; - info = HeapAlloc(GetProcessHeap(), 0, *size); + info = malloc(*size); return info; } @@ -234,7 +234,7 @@ static void test_SetupGetInfInformation(void) ret = SetupGetInfInformationA(inf_filename, INFINFO_INF_NAME_IS_ABSOLUTE, NULL, size, NULL); ok(ret == FALSE, "Expected SetupGetInfInformation to fail\n"); - info = HeapAlloc(GetProcessHeap(), 0, size); + info = malloc(size); /* try valid ReturnBuffer but too small size */ SetLastError(0xbeefcafe); @@ -248,7 +248,7 @@ static void test_SetupGetInfInformation(void) ok(ret == TRUE, "Expected SetupGetInfInformation to succeed\n"); ok(check_info_filename(info, inf_filename), "Expected returned filename to be equal\n"); - HeapFree(GetProcessHeap(), 0, info); + free(info); /* try the INFINFO_INF_SPEC_IS_HINF search flag */ hinf = SetupOpenInfFileA(inf_filename, NULL, INF_STYLE_WIN4, NULL); @@ -269,7 +269,7 @@ static void test_SetupGetInfInformation(void) } ok(ret, "can't create inf file %lu\n", GetLastError()); - HeapFree(GetProcessHeap(), 0, info); + free(info); info = alloc_inf_info("test.inf", INFINFO_DEFAULT_SEARCH, &size); /* check if system32 is searched for inf */ @@ -284,7 +284,7 @@ static void test_SetupGetInfInformation(void) lstrcatA(inf_one, "test.inf"); create_inf_file(inf_one, inf_data1, sizeof(inf_data1) - 1); - HeapFree(GetProcessHeap(), 0, info); + free(info); info = alloc_inf_info("test.inf", INFINFO_DEFAULT_SEARCH, &size); /* test the INFINFO_DEFAULT_SEARCH search flag */ @@ -292,7 +292,7 @@ static void test_SetupGetInfInformation(void) ok(ret == TRUE, "Expected SetupGetInfInformation to succeed: %ld\n", GetLastError()); ok(check_info_filename(info, inf_one), "Expected returned filename to be equal\n"); - HeapFree(GetProcessHeap(), 0, info); + free(info); info = alloc_inf_info("test.inf", INFINFO_REVERSE_DEFAULT_SEARCH, &size); /* test the INFINFO_REVERSE_DEFAULT_SEARCH search flag */ @@ -301,7 +301,7 @@ static void test_SetupGetInfInformation(void) ok(check_info_filename(info, revfile), "Expected returned filename to be equal\n"); done: - HeapFree(GetProcessHeap(), 0, info); + free(info); DeleteFileA(inf_filename); DeleteFileA(inf_one); DeleteFileA(inf_two);

1 0

Alex Henrie : virtdisk/tests: Use CRT allocation functions.
by Alexandre Julliard Nov. 6, 2023

Nov. 6, 2023

Module: wine Branch: master Commit: 26ad81228644168f497925c2126d90d6f5c19994 URL: https://gitlab.winehq.org/wine/wine/-/commit/26ad81228644168f497925c2126d90… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sat Nov 4 20:59:20 2023 -0700 virtdisk/tests: Use CRT allocation functions. --- dlls/virtdisk/tests/virtdisk.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/virtdisk/tests/virtdisk.c b/dlls/virtdisk/tests/virtdisk.c index bbbaf4d45e4..13c7dd7e693 100644 --- a/dlls/virtdisk/tests/virtdisk.c +++ b/dlls/virtdisk/tests/virtdisk.c @@ -20,7 +20,6 @@ #include "windef.h" #include "initguid.h" #include "virtdisk.h" -#include "wine/heap.h" #include "wine/test.h" static DWORD (WINAPI *pGetStorageDependencyInformation)(HANDLE,GET_STORAGE_DEPENDENCY_FLAG,ULONG,STORAGE_DEPENDENCY_INFO*,ULONG*); @@ -37,7 +36,7 @@ static void test_GetStorageDependencyInformation(void) ok(handle != INVALID_HANDLE_VALUE, "Expected a handle\n"); size = sizeof(STORAGE_DEPENDENCY_INFO); - info = heap_alloc(size); + info = malloc(size); ret = pGetStorageDependencyInformation(handle, GET_STORAGE_DEPENDENCY_FLAG_DISK_HANDLE, 0, info, 0); ok(ret == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %ld\n", ret); @@ -45,7 +44,7 @@ static void test_GetStorageDependencyInformation(void) ret = pGetStorageDependencyInformation(handle, GET_STORAGE_DEPENDENCY_FLAG_DISK_HANDLE, size, NULL, 0); ok(ret == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %ld\n", ret); - heap_free(info); + free(info); CloseHandle(handle); }

1 0

Brendan Shanks : winemac.drv: Fix minimizing windows programmatically from Win32 when Stage Manager is enabled.
by Alexandre Julliard Nov. 6, 2023

Nov. 6, 2023

Module: wine Branch: master Commit: ffdbd8357f71c515b9643d400eb43547cf235905 URL: https://gitlab.winehq.org/wine/wine/-/commit/ffdbd8357f71c515b9643d400eb435… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Fri Nov 3 14:02:03 2023 -0700 winemac.drv: Fix minimizing windows programmatically from Win32 when Stage Manager is enabled. --- dlls/winemac.drv/cocoa_window.m | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 820bb606769..1655ea98ef7 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -1340,10 +1340,20 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi { if ([self wouldBeVisible]) { - if ([self styleMask] & NSWindowStyleMaskFullScreen) + if (([self styleMask] & NSWindowStyleMaskFullScreen) || stage_manager_enabled()) { [self postDidUnminimizeEvent]; discard &= ~event_mask_for_type(WINDOW_DID_UNMINIMIZE); + + /* When Stage Manager is enabled, it's not possible to minimize the window + * (miniaturize: just moves the window to the background). + * Post an unminimize event, then miniaturize:. + */ + if (stage_manager_enabled()) + { + [self setStyleMask:([self styleMask] | NSWindowStyleMaskMiniaturizable)]; + [super miniaturize:nil]; + } } else {

1 0

Alistair Leslie-Hughes : msdasql: Use DBINITCONSTANTS to get guid values.
by Alexandre Julliard Nov. 6, 2023

Nov. 6, 2023

Module: wine Branch: master Commit: 6a6a92de143c2a7f1243038edfec508af2884406 URL: https://gitlab.winehq.org/wine/wine/-/commit/6a6a92de143c2a7f1243038edfec50… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Oct 2 19:42:35 2023 +1100 msdasql: Use DBINITCONSTANTS to get guid values. --- dlls/msdasql/msdasql_main.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/dlls/msdasql/msdasql_main.c b/dlls/msdasql/msdasql_main.c index 2f25498abca..7ec35678b6f 100644 --- a/dlls/msdasql/msdasql_main.c +++ b/dlls/msdasql/msdasql_main.c @@ -17,6 +17,7 @@ */ #define COBJMACROS +#define DBINITCONSTANTS #include <stdarg.h> @@ -38,12 +39,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(msdasql); -DEFINE_GUID(DBPROPSET_DATASOURCEINFO, 0xc8b522bb, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); -DEFINE_GUID(DBPROPSET_DBINIT, 0xc8b522bc, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); -DEFINE_GUID(DBPROPSET_ROWSET, 0xc8b522be, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); - -DEFINE_GUID(DBGUID_DEFAULT, 0xc8b521fb, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); - void dump_sql_diag_records(SQLSMALLINT type, SQLHANDLE handle) { SQLCHAR state[6], msg[SQL_MAX_MESSAGE_LENGTH];

1 0

Alistair Leslie-Hughes : include: Add some DBCOLUMN defines.
by Alexandre Julliard Nov. 6, 2023

Nov. 6, 2023

Module: wine Branch: master Commit: cc3a0320ed16748bd7964206650997116364e497 URL: https://gitlab.winehq.org/wine/wine/-/commit/cc3a0320ed16748bd7964206650997… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Oct 2 19:42:35 2023 +1100 include: Add some DBCOLUMN defines. --- dlls/oledb32/datainit.c | 1 - include/dbs.idl | 13 ++++++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/oledb32/datainit.c b/dlls/oledb32/datainit.c index 325de558584..3694ac67fec 100644 --- a/dlls/oledb32/datainit.c +++ b/dlls/oledb32/datainit.c @@ -33,7 +33,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(oledb); -DEFINE_GUID(DB_NULLGUID, 0x00000000, 0x0000, 0x0000, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00); DEFINE_GUID(DBGUID_SESSION, 0xc8b522f5, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); DEFINE_GUID(DBGUID_ROWSET, 0xc8b522f6, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); DEFINE_GUID(DBGUID_ROW, 0xc8b522f7, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); diff --git a/include/dbs.idl b/include/dbs.idl index d3cc46b4010..fd04f7b1ae0 100644 --- a/include/dbs.idl +++ b/include/dbs.idl @@ -510,12 +510,18 @@ cpp_quote(" const GUID name DECLSPEC_HIDDEN; \\") cpp_quote(" const GUID name = \\") cpp_quote(" { l, w1, w2, { b1, b2, b3, b4, b5, b6, b7, b8 } }") cpp_quote("#endif") +cpp_quote("#define DEFINE_DBID(name, dbguid, kind, val) \\") +cpp_quote(" const DBID name = { {dbguid}, kind, {(LPOLESTR)val} };") cpp_quote("#else") cpp_quote("#define DEFINE_DBGUID(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \\") cpp_quote(" EXTERN_C const GUID name DECLSPEC_HIDDEN") +cpp_quote("#define DEFINE_DBID(name, dbguid, kind, val) \\") +cpp_quote(" EXTERN_C const DBID name;") cpp_quote("#endif") -cpp_quote("DEFINE_DBGUID(DB_NULLGUID, 0x00000000, 0x0000, 0x0000, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00);") +cpp_quote("#define DBCIDGUID {0x0c733a81, 0x2a1c, 0x11ce, {0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d}}") +cpp_quote("#define DB_NULLGUID {0x00000000, 0x0000, 0x0000, {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}") + cpp_quote("DEFINE_DBGUID(DBGUID_SQL, 0xc8b522d7, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d);") cpp_quote("DEFINE_DBGUID(DBGUID_DEFAULT, 0xc8b521fb, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d);") cpp_quote("DEFINE_DBGUID(DBGUID_SESSION, 0xc8b522f5, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d);") @@ -538,6 +544,11 @@ cpp_quote("DEFINE_DBGUID(DBPROPSET_SESSIONALL, 0xc8b522c7, 0x5cf3, 0x11ce cpp_quote("DEFINE_DBGUID(DBPROPSET_DBINITALL, 0xc8b522ca, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d);") cpp_quote("DEFINE_DBGUID(DBPROPSET_PROPERTIESINERROR, 0xc8b522d4, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d);") +cpp_quote("DEFINE_DBID(DB_NULLID, DB_NULLGUID, 0, 0)") +cpp_quote("DEFINE_DBID(DBCOLUMN_BASECOLUMNNAME, DBCIDGUID, DBKIND_GUID_PROPID, 10)") +cpp_quote("DEFINE_DBID(DBCOLUMN_BASETABLENAME, DBCIDGUID, DBKIND_GUID_PROPID, 11)") +cpp_quote("DEFINE_DBID(DBCOLUMN_KEYCOLUMN, DBCIDGUID, DBKIND_GUID_PROPID, 41)") + cpp_quote("#define DBPROMPT_PROMPT 0x01") cpp_quote("#define DBPROMPT_COMPLETE 0x02") cpp_quote("#define DBPROMPT_COMPLETEREQUIRED 0x03")

1 0

Zebediah Figura : vkd3d-shader/hlsl: Consistently use HLSL allocation functions.
by Alexandre Julliard Nov. 6, 2023

Nov. 6, 2023

Module: vkd3d Branch: master Commit: a9f33e86579f62cd6ec789e92d45fa526e881204 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/a9f33e86579f62cd6ec789e92d45f… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Aug 1 15:36:24 2023 -0500 vkd3d-shader/hlsl: Consistently use HLSL allocation functions. --- libs/vkd3d-shader/hlsl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index c8677f41..1d3fd0f7 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -759,7 +759,7 @@ struct hlsl_type *hlsl_new_uav_type(struct hlsl_ctx *ctx, enum hlsl_sampler_dim { struct hlsl_type *type; - if (!(type = vkd3d_calloc(1, sizeof(*type)))) + if (!(type = hlsl_alloc(ctx, sizeof(*type)))) return NULL; type->class = HLSL_CLASS_OBJECT; type->base_type = HLSL_TYPE_UAV; @@ -1617,7 +1617,7 @@ static bool clone_block(struct hlsl_ctx *ctx, struct hlsl_block *dst_block, if (!list_empty(&src->uses)) { - if (!vkd3d_array_reserve((void **)&map->instrs, &map->capacity, map->count + 1, sizeof(*map->instrs))) + if (!hlsl_array_reserve(ctx, (void **)&map->instrs, &map->capacity, map->count + 1, sizeof(*map->instrs))) { hlsl_block_cleanup(dst_block); return false;

1 0

Henri Verbeet : vkd3d-shader/tpf: Do not write RDEF constant buffer entries for HLSL_CLASS_OBJECT variables.
by Alexandre Julliard Nov. 6, 2023

Nov. 6, 2023

Module: vkd3d Branch: master Commit: aa5380f32a89e5dd849c4b06ec99b36ab9f87cd5 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/aa5380f32a89e5dd849c4b06ec99b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 6 20:03:21 2023 +0100 vkd3d-shader/tpf: Do not write RDEF constant buffer entries for HLSL_CLASS_OBJECT variables. RWBuffer objects would trigger a vkd3d_unreachable() in sm4_base_type(). It would be easy enough to add the required case there, but (manual, unfortunately) tests show that we aren't supposed to write constant buffer entries for objects in the first place, as you'd expect. This particular path ends up being exercised by vkd3d's internal UAV clear shaders, but unfortunately it looks like our RDEF data may have more issues; the ability to write tests for it would seem helpful. --- libs/vkd3d-shader/tpf.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d-shader/tpf.c b/libs/vkd3d-shader/tpf.c index 8ae1657d..fbc04f61 100644 --- a/libs/vkd3d-shader/tpf.c +++ b/libs/vkd3d-shader/tpf.c @@ -3460,7 +3460,8 @@ static void write_sm4_rdef(struct hlsl_ctx *ctx, struct dxbc_writer *dxbc) LIST_FOR_EACH_ENTRY(var, &ctx->extern_vars, struct hlsl_ir_var, extern_entry) { - if (var->is_uniform && var->buffer == cbuffer) + if (var->is_uniform && var->buffer == cbuffer + && var->data_type->class != HLSL_CLASS_OBJECT) ++var_count; } @@ -3494,7 +3495,8 @@ static void write_sm4_rdef(struct hlsl_ctx *ctx, struct dxbc_writer *dxbc) LIST_FOR_EACH_ENTRY(var, &ctx->extern_vars, struct hlsl_ir_var, extern_entry) { - if (var->is_uniform && var->buffer == cbuffer) + if (var->is_uniform && var->buffer == cbuffer + && var->data_type->class != HLSL_CLASS_OBJECT) { uint32_t flags = 0; @@ -3521,7 +3523,8 @@ static void write_sm4_rdef(struct hlsl_ctx *ctx, struct dxbc_writer *dxbc) j = 0; LIST_FOR_EACH_ENTRY(var, &ctx->extern_vars, struct hlsl_ir_var, extern_entry) { - if (var->is_uniform && var->buffer == cbuffer) + if (var->is_uniform && var->buffer == cbuffer + && var->data_type->class != HLSL_CLASS_OBJECT) { const unsigned int var_size = (profile->major_version >= 5 ? 10 : 6); size_t var_offset = vars_start + j * var_size * sizeof(uint32_t);

1 0