March 2024 - Wine-commits - list.winehq.org

Brendan Shanks : server: Remove support for msg_accrights FD passing.
by Alexandre Julliard 11 Mar '24

11 Mar '24

Module: wine Branch: master Commit: befd7abe1079b1d87bee82e403d485cadb1adbcb URL: https://gitlab.winehq.org/wine/wine/-/commit/befd7abe1079b1d87bee82e403d485… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Fri Mar 8 21:51:11 2024 -0800 server: Remove support for msg_accrights FD passing. --- configure | 13 ------------- configure.ac | 2 +- include/config.h.in | 3 --- server/request.c | 44 ++++++++++++++++---------------------------- 4 files changed, 17 insertions(+), 45 deletions(-) diff --git a/configure b/configure index 59848dcdaf4..804a03c8fd3 100755 --- a/configure +++ b/configure @@ -21014,19 +21014,6 @@ printf "%s\n" "#define HAVE_LINUX_GETHOSTBYNAME_R_6 1" >>confdefs.h fi -ac_fn_c_check_member "$LINENO" "struct msghdr" "msg_accrights" "ac_cv_member_struct_msghdr_msg_accrights" "#include <sys/types.h> -#include <sys/socket.h> -#ifdef HAVE_SYS_UN_H -# include <sys/un.h> -#endif -" -if test "x$ac_cv_member_struct_msghdr_msg_accrights" = xyes -then : - -printf "%s\n" "#define HAVE_STRUCT_MSGHDR_MSG_ACCRIGHTS 1" >>confdefs.h - - -fi ac_fn_c_check_member "$LINENO" "struct sockaddr_un" "sun_len" "ac_cv_member_struct_sockaddr_un_sun_len" "#include <sys/types.h> #include <sys/socket.h> #ifdef HAVE_SYS_UN_H diff --git a/configure.ac b/configure.ac index 2282758fd10..872cb1591f8 100644 --- a/configure.ac +++ b/configure.ac @@ -2163,7 +2163,7 @@ AC_CACHE_CHECK([whether we can use re-entrant gethostbyname_r Linux style], fi dnl Check for socket structure members -AC_CHECK_MEMBERS([struct msghdr.msg_accrights, struct sockaddr_un.sun_len],,, +AC_CHECK_MEMBERS([struct sockaddr_un.sun_len],,, [#include <sys/types.h> #include <sys/socket.h> #ifdef HAVE_SYS_UN_H diff --git a/include/config.h.in b/include/config.h.in index 8f4d5e575ce..184771d94f2 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -414,9 +414,6 @@ /* Define to 1 if `ips_total' is a member of `struct ip_stats'. */ #undef HAVE_STRUCT_IP_STATS_IPS_TOTAL -/* Define to 1 if `msg_accrights' is a member of `struct msghdr'. */ -#undef HAVE_STRUCT_MSGHDR_MSG_ACCRIGHTS - /* Define to 1 if `mt_blkno' is a member of `struct mtget'. */ #undef HAVE_STRUCT_MTGET_MT_BLKNO diff --git a/server/request.c b/server/request.c index 7021741c765..82b4a722d61 100644 --- a/server/request.c +++ b/server/request.c @@ -379,28 +379,22 @@ int receive_fd( struct process *process ) struct iovec vec; struct send_fd data; struct msghdr msghdr; - int fd = -1, ret; - -#ifdef HAVE_STRUCT_MSGHDR_MSG_ACCRIGHTS - msghdr.msg_accrightslen = sizeof(int); - msghdr.msg_accrights = (void *)&fd; -#else /* HAVE_STRUCT_MSGHDR_MSG_ACCRIGHTS */ char cmsg_buffer[256]; - msghdr.msg_control = cmsg_buffer; - msghdr.msg_controllen = sizeof(cmsg_buffer); - msghdr.msg_flags = 0; -#endif /* HAVE_STRUCT_MSGHDR_MSG_ACCRIGHTS */ + int fd = -1, ret; msghdr.msg_name = NULL; msghdr.msg_namelen = 0; msghdr.msg_iov = &vec; msghdr.msg_iovlen = 1; + msghdr.msg_control = cmsg_buffer; + msghdr.msg_controllen = sizeof(cmsg_buffer); + msghdr.msg_flags = 0; + vec.iov_base = (void *)&data; vec.iov_len = sizeof(data); ret = recvmsg( get_unix_fd( process->msg_fd ), &msghdr, 0 ); -#ifndef HAVE_STRUCT_MSGHDR_MSG_ACCRIGHTS if (ret > 0) { struct cmsghdr *cmsg; @@ -410,7 +404,6 @@ int receive_fd( struct process *process ) if (cmsg->cmsg_type == SCM_RIGHTS) fd = *(int *)CMSG_DATA(cmsg); } } -#endif /* HAVE_STRUCT_MSGHDR_MSG_ACCRIGHTS */ if (ret == sizeof(data)) { @@ -465,33 +458,28 @@ int send_client_fd( struct process *process, int fd, obj_handle_t handle ) { struct iovec vec; struct msghdr msghdr; - int ret; - -#ifdef HAVE_STRUCT_MSGHDR_MSG_ACCRIGHTS - msghdr.msg_accrightslen = sizeof(fd); - msghdr.msg_accrights = (void *)&fd; -#else /* HAVE_STRUCT_MSGHDR_MSG_ACCRIGHTS */ char cmsg_buffer[256]; struct cmsghdr *cmsg; - msghdr.msg_control = cmsg_buffer; - msghdr.msg_controllen = sizeof(cmsg_buffer); - msghdr.msg_flags = 0; - cmsg = CMSG_FIRSTHDR( &msghdr ); - cmsg->cmsg_len = CMSG_LEN( sizeof(fd) ); - cmsg->cmsg_level = SOL_SOCKET; - cmsg->cmsg_type = SCM_RIGHTS; - *(int *)CMSG_DATA(cmsg) = fd; - msghdr.msg_controllen = cmsg->cmsg_len; -#endif /* HAVE_STRUCT_MSGHDR_MSG_ACCRIGHTS */ + int ret; msghdr.msg_name = NULL; msghdr.msg_namelen = 0; msghdr.msg_iov = &vec; msghdr.msg_iovlen = 1; + msghdr.msg_control = cmsg_buffer; + msghdr.msg_controllen = sizeof(cmsg_buffer); + msghdr.msg_flags = 0; vec.iov_base = (void *)&handle; vec.iov_len = sizeof(handle); + cmsg = CMSG_FIRSTHDR( &msghdr ); + cmsg->cmsg_len = CMSG_LEN( sizeof(fd) ); + cmsg->cmsg_level = SOL_SOCKET; + cmsg->cmsg_type = SCM_RIGHTS; + *(int *)CMSG_DATA(cmsg) = fd; + msghdr.msg_controllen = cmsg->cmsg_len; + if (debug_level) fprintf( stderr, "%04x: *fd* %04x -> %d\n", current ? current->id : process->id, handle, fd );

1 0

Jinoh Kang : tools/gitlab: Run make_specfiles before building.
by Alexandre Julliard 11 Mar '24

11 Mar '24

Module: wine Branch: master Commit: b527b232cfb50a59c4a58da0b60b5a023c9c711c URL: https://gitlab.winehq.org/wine/wine/-/commit/b527b232cfb50a59c4a58da0b60b5a… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Mon Mar 11 22:12:17 2024 +0900 tools/gitlab: Run make_specfiles before building. Since wine commit 401288a78dd (make_specfiles: Generate a list of syscalls from the corresponding spec files., 2023-11-16), spec files are used to auto-generate the following files: - dlls/ntdll/ntsyscalls.h (from dlls/ntdll/ntdll.spec) - dlls/win32u/win32syscalls.h (from dlls/win32u/win32u.spec) --- tools/gitlab/build-clang | 1 + tools/gitlab/build-linux | 1 + tools/gitlab/build-mac | 1 + 3 files changed, 3 insertions(+) diff --git a/tools/gitlab/build-clang b/tools/gitlab/build-clang index 3ed87b3b173..a8bb41693f8 100755 --- a/tools/gitlab/build-clang +++ b/tools/gitlab/build-clang @@ -6,6 +6,7 @@ echo "---" set -Eeuxo pipefail ./tools/make_requests +./tools/make_specfiles ./tools/make_makefiles autoreconf -f diff --git a/tools/gitlab/build-linux b/tools/gitlab/build-linux index d77ca9cdb8e..a592c4f5918 100755 --- a/tools/gitlab/build-linux +++ b/tools/gitlab/build-linux @@ -6,6 +6,7 @@ echo "---" set -Eeuxo pipefail ./tools/make_requests +./tools/make_specfiles ./tools/make_makefiles autoreconf -f diff --git a/tools/gitlab/build-mac b/tools/gitlab/build-mac index 5c37aa6bcc9..98df7731ad1 100755 --- a/tools/gitlab/build-mac +++ b/tools/gitlab/build-mac @@ -6,6 +6,7 @@ echo "---" set -Eeuxo pipefail ./tools/make_requests +./tools/make_specfiles ./tools/make_makefiles autoreconf -f

1 0

Jacek Caban : configure: Don't explicitly enable -Wenum-conversion on Clang.
by Alexandre Julliard 11 Mar '24

11 Mar '24

Module: wine Branch: master Commit: 81111326ff34f681cd00c6be864c9d5aec4e6974 URL: https://gitlab.winehq.org/wine/wine/-/commit/81111326ff34f681cd00c6be864c9d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Mar 10 10:39:13 2024 +0100 configure: Don't explicitly enable -Wenum-conversion on Clang. Clang enables -Wenum-conversion by default anyway, we add it to CFLAGS to enable them on GCC. When explicitly enabled, Clang also enables additional warnings. Some of those warnings, like -Wenum-enum-conversion, are too strict to be practical with win32, so avoid enabling them. --- configure | 37 ++++++++++++++++++++++++++++++++++++- configure.ac | 2 +- 2 files changed, 37 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 804a03c8fd3..9a7bc56bff4 100755 --- a/configure +++ b/configure @@ -11505,7 +11505,41 @@ if eval test \"x\$"$as_ac_var"\" = x"yes" then : as_fn_append ${wine_arch}_EXTRACFLAGS " -Wabsolute-value" fi } - { as_ac_var=`printf "%s\n" "ac_cv_${wine_arch}_cflags_-Wenum-conversion" | $as_tr_sh` + { as_ac_var=`printf "%s\n" "ac_cv_${wine_arch}_cflags_-Wenum-enum-conversion" | $as_tr_sh` +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC supports -Wenum-enum-conversion" >&5 +printf %s "checking whether $CC supports -Wenum-enum-conversion... " >&6; } +if eval test \${$as_ac_var+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_wine_try_cflags_saved=$CFLAGS +ac_wine_try_cflags_saved_exeext=$ac_exeext +CFLAGS="$CFLAGS -nostdlib -nodefaultlibs -Wenum-enum-conversion" +ac_exeext=".exe" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +void *__os_arm64x_dispatch_ret = 0; +int __cdecl mainCRTStartup(void) { return 0; } +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + eval "$as_ac_var=yes" +else $as_nop + eval "$as_ac_var=no" +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext +CFLAGS=$ac_wine_try_cflags_saved +ac_exeext=$ac_wine_try_cflags_saved_exeext +fi +eval ac_res=\$$as_ac_var + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } +if eval test \"x\$"$as_ac_var"\" = x"yes" +then : + : +else $as_nop + { as_ac_var=`printf "%s\n" "ac_cv_${wine_arch}_cflags_-Wenum-conversion" | $as_tr_sh` { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC supports -Wenum-conversion" >&5 printf %s "checking whether $CC supports -Wenum-conversion... " >&6; } if eval test \${$as_ac_var+y} @@ -11538,6 +11572,7 @@ printf "%s\n" "$ac_res" >&6; } if eval test \"x\$"$as_ac_var"\" = x"yes" then : as_fn_append ${wine_arch}_EXTRACFLAGS " -Wenum-conversion" +fi } fi } { as_ac_var=`printf "%s\n" "ac_cv_${wine_arch}_cflags_-flarge-source-files -Wmisleading-indentation" | $as_tr_sh` diff --git a/configure.ac b/configure.ac index 872cb1591f8..fa81d912106 100644 --- a/configure.ac +++ b/configure.ac @@ -966,7 +966,7 @@ This is an error since --enable-archs=$wine_arch was requested.])]) WINE_TRY_PE_CFLAGS([-Wpointer-arith]) WINE_TRY_PE_CFLAGS([-Wlogical-op]) WINE_TRY_PE_CFLAGS([-Wabsolute-value]) - WINE_TRY_PE_CFLAGS([-Wenum-conversion]) + WINE_TRY_PE_CFLAGS([-Wenum-enum-conversion],[:],WINE_TRY_PE_CFLAGS([-Wenum-conversion])) dnl GCC can't handle large files when -Wmisleading-indentation is enabled (https://gcc.gnu.org/bugzilla/show_bug.cgi?id=89549) WINE_TRY_PE_CFLAGS([-flarge-source-files -Wmisleading-indentation],[AS_VAR_APPEND(${wine_arch}_EXTRACFLAGS,[" -Wno-misleading-indentation"])])

1 0

Brendan Shanks : mountmgr: Replace sprintf with snprintf to avoid deprecation warnings on macOS.
by Alexandre Julliard 11 Mar '24

11 Mar '24

Module: wine Branch: master Commit: a5b8e684226a5d80f57382b40fd6d1bb64a2ff6c URL: https://gitlab.winehq.org/wine/wine/-/commit/a5b8e684226a5d80f57382b40fd6d1… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Mon Mar 11 11:55:24 2024 -0700 mountmgr: Replace sprintf with snprintf to avoid deprecation warnings on macOS. --- dlls/mountmgr.sys/unixlib.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mountmgr.sys/unixlib.c b/dlls/mountmgr.sys/unixlib.c index b74b2336a34..9d7cd904769 100644 --- a/dlls/mountmgr.sys/unixlib.c +++ b/dlls/mountmgr.sys/unixlib.c @@ -127,7 +127,7 @@ static void detect_devices( const char **paths, char *names, ULONG size ) for (;;) { - int len = sprintf( unix_path, *paths, i++ ); + int len = snprintf( unix_path, sizeof(unix_path), *paths, i++ ); if (len + 2 > size) break; if (access( unix_path, F_OK ) != 0) break; strcpy( names, unix_path );

1 0

Brendan Shanks : mountmgr: Replace some malloc/sprintf/strcpy calls with asprintf.
by Alexandre Julliard 11 Mar '24

11 Mar '24

Module: wine Branch: master Commit: 3af1e7df21db5b27fc06ff91c9aa3c12fc6853b1 URL: https://gitlab.winehq.org/wine/wine/-/commit/3af1e7df21db5b27fc06ff91c9aa3c… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Mon Mar 11 11:55:44 2024 -0700 mountmgr: Replace some malloc/sprintf/strcpy calls with asprintf. --- dlls/mountmgr.sys/unixlib.c | 28 +++++++++------------------- 1 file changed, 9 insertions(+), 19 deletions(-) diff --git a/dlls/mountmgr.sys/unixlib.c b/dlls/mountmgr.sys/unixlib.c index 9d7cd904769..47c42d939c6 100644 --- a/dlls/mountmgr.sys/unixlib.c +++ b/dlls/mountmgr.sys/unixlib.c @@ -89,22 +89,14 @@ static NTSTATUS errno_to_status( int err ) static char *get_dosdevices_path( const char *dev ) { - const char *home = getenv( "HOME" ); const char *prefix = getenv( "WINEPREFIX" ); - size_t len = (prefix ? strlen(prefix) : strlen(home) + strlen("/.wine")) + sizeof("/dosdevices/") + strlen(dev); - char *path = malloc( len ); + char *path = NULL; + + if (prefix) + asprintf( &path, "%s/dosdevices/%s", prefix, dev ); + else + asprintf( &path, "%s/.wine/dosdevices/%s", getenv( "HOME" ), dev ); - if (path) - { - if (prefix) strcpy( path, prefix ); - else - { - strcpy( path, home ); - strcat( path, "/.wine" ); - } - strcat( path, "/dosdevices/" ); - strcat( path, dev ); - } return path; } @@ -420,9 +412,9 @@ static NTSTATUS read_volume_file( void *args ) { const struct read_volume_file_params *params = args; int ret, fd = -1; - char *name = malloc( strlen(params->volume) + strlen(params->file) + 2 ); + char *name = NULL; - sprintf( name, "%s/%s", params->volume, params->file ); + asprintf( &name, "%s/%s", params->volume, params->file ); if (name[0] != '/') { @@ -508,9 +500,7 @@ static NTSTATUS set_shell_folder( void *args ) if (link && (!strcmp( link, "$HOME" ) || !strncmp( link, "$HOME/", 6 )) && (home = getenv( "HOME" ))) { link += 5; - homelink = malloc( strlen(home) + strlen(link) + 1 ); - strcpy( homelink, home ); - strcat( homelink, link ); + asprintf( &homelink, "%s%s", home, link ); link = homelink; }

1 0

Esme Povirk : user32/tests: Accept HCBT_ACTIVATE in TrackPopupMenu.
by Alexandre Julliard 11 Mar '24

11 Mar '24

Module: wine Branch: master Commit: 14f69583aa96c24668e549bba5263ece3707d8a5 URL: https://gitlab.winehq.org/wine/wine/-/commit/14f69583aa96c24668e549bba5263e… Author: Esme Povirk <esme(a)codeweavers.com> Date: Sat Mar 9 20:10:41 2024 +0000 user32/tests: Accept HCBT_ACTIVATE in TrackPopupMenu. --- dlls/user32/tests/msg.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 8ed608c5d3b..23e9f043ed8 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -2175,6 +2175,7 @@ static const struct message WmTrackPopupMenuMinimizeWindow[] = { { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam|optional, 0, 0 }, /* Win7 seems to send this twice. */ { EVENT_SYSTEM_MINIMIZESTART, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, + { HCBT_ACTIVATE, hook|optional }, /* win11 */ { WM_CANCELMODE, sent }, { EVENT_SYSTEM_CAPTUREEND, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { WM_CAPTURECHANGED, sent|defwinproc },

1 0

Conor McCarthy : tests/d3d12: Add tests for GetCopyableFootprints1().
by Alexandre Julliard 08 Mar '24

08 Mar '24

Module: vkd3d Branch: master Commit: 2ed36efcb5d4c19e224a93ffcc4e932bf57ec232 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/2ed36efcb5d4c19e224a93ffcc4e9… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Mon Feb 5 13:57:45 2024 +1000 tests/d3d12: Add tests for GetCopyableFootprints1(). --- tests/d3d12.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index d8baeb2a..6d49dbae 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -20068,9 +20068,11 @@ static void check_copyable_footprints_(unsigned int line, const D3D12_RESOURCE_D static void test_get_copyable_footprints(void) { D3D12_PLACED_SUBRESOURCE_FOOTPRINT layouts[10]; + D3D12_RESOURCE_DESC1 resource_desc1; uint64_t row_sizes[10], total_size; D3D12_RESOURCE_DESC resource_desc; unsigned int sub_resource_count; + ID3D12Device8 *device8; unsigned int i, j, k; ID3D12Device *device; UINT row_counts[10]; @@ -20308,6 +20310,32 @@ static void test_get_copyable_footprints(void) check_copyable_footprints(&resource_desc, 0, 1, 0, layouts, row_counts, row_sizes, &total_size); + if (SUCCEEDED(ID3D12Device_QueryInterface(device, &IID_ID3D12Device8, (void **)&device8))) + { + resource_desc1.Dimension = resource_desc.Dimension; + resource_desc1.Alignment = resource_desc.Alignment; + resource_desc1.Width = resource_desc.Width; + resource_desc1.Height = resource_desc.Height; + resource_desc1.DepthOrArraySize = resource_desc.DepthOrArraySize; + resource_desc1.MipLevels = resource_desc.MipLevels; + resource_desc1.Format = resource_desc.Format; + resource_desc1.SampleDesc.Count = resource_desc.SampleDesc.Count; + resource_desc1.SampleDesc.Quality = resource_desc.SampleDesc.Quality; + resource_desc1.Flags = resource_desc.Flags; + memset(&resource_desc1.SamplerFeedbackMipRegion, 0, sizeof(resource_desc1.SamplerFeedbackMipRegion)); + memset(layouts, 0, sizeof(layouts)); + memset(row_counts, 0, sizeof(row_counts)); + memset(row_sizes, 0, sizeof(row_sizes)); + total_size = 0; + ID3D12Device8_GetCopyableFootprints1(device8, &resource_desc1, 0, 1, 0, + layouts, row_counts, row_sizes, &total_size); + todo + check_copyable_footprints(&resource_desc, 0, 1, 0, + layouts, row_counts, row_sizes, &total_size); + + ID3D12Device8_Release(device8); + } + for (i = 0; i < ARRAY_SIZE(invalid_descs); ++i) { resource_desc = invalid_descs[i].resource_desc;

1 0

Conor McCarthy : vkd3d: Implement GetResourceAllocationInfo2().
by Alexandre Julliard 08 Mar '24

08 Mar '24

Module: vkd3d Branch: master Commit: 6edba86a26dcddbb4767aefa93863182ef2e8d56 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/6edba86a26dcddbb4767aefa93863… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Mon Feb 5 15:02:02 2024 +1000 vkd3d: Implement GetResourceAllocationInfo2(). --- libs/vkd3d/device.c | 10 +++++++--- libs/vkd3d/resource.c | 7 +++++++ tests/d3d12.c | 2 -- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index a8647d15..df74b9c3 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -4521,11 +4521,15 @@ static D3D12_RESOURCE_ALLOCATION_INFO * STDMETHODCALLTYPE d3d12_device_GetResour D3D12_RESOURCE_ALLOCATION_INFO *info, UINT visible_mask, UINT count, const D3D12_RESOURCE_DESC1 *resource_descs, D3D12_RESOURCE_ALLOCATION_INFO1 *info1) { - FIXME("iface %p, info %p, visible_mask 0x%08x, count %u, resource_descs %p, info1 %p stub!\n", + struct d3d12_device *device = impl_from_ID3D12Device8(iface); + + TRACE("iface %p, info %p, visible_mask 0x%08x, count %u, resource_descs %p, info1 %p.\n", iface, info, visible_mask, count, resource_descs, info1); - info->Alignment = 0; - info->SizeInBytes = ~(uint64_t)0; + debug_ignored_node_mask(visible_mask); + + d3d12_device_get_resource1_allocation_info(device, info1, count, resource_descs, info); + return info; } diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 7304846f..446ef3ab 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -1857,6 +1857,7 @@ static bool d3d12_resource_validate_texture_alignment(const D3D12_RESOURCE_DESC1 HRESULT d3d12_resource_validate_desc(const D3D12_RESOURCE_DESC1 *desc, struct d3d12_device *device) { + const D3D12_MIP_REGION *mip_region = &desc->SamplerFeedbackMipRegion; const struct vkd3d_format *format; switch (desc->Dimension) @@ -1926,6 +1927,12 @@ HRESULT d3d12_resource_validate_desc(const D3D12_RESOURCE_DESC1 *desc, struct d3 d3d12_validate_resource_flags(desc->Flags); + if (mip_region->Width && mip_region->Height && mip_region->Depth) + { + FIXME("Unhandled sampler feedback mip region size (%u, %u, %u).\n", mip_region->Width, mip_region->Height, + mip_region->Depth); + } + return S_OK; } diff --git a/tests/d3d12.c b/tests/d3d12.c index 6d49dbae..9d2cd113 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -32428,10 +32428,8 @@ static void test_resource_allocation_info(void) } info = ID3D12Device8_GetResourceAllocationInfo2(device8, 0, ARRAY_SIZE(desc_array1), desc_array1, infos1); - todo ok(info.Alignment >= D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT, "Got unexpected alignment %"PRIu64".\n", info.Alignment); - todo check_alignment(info.SizeInBytes, info.Alignment); ok(info.SizeInBytes >= total, "Got unexpected size %"PRIu64".\n", info.SizeInBytes); ok(!infos1[0].Offset, "Got unexpected offset %"PRIu64".\n", infos1[0].Offset);

1 0

Conor McCarthy : vkd3d: Implement CreateCommittedResource2().
by Alexandre Julliard 08 Mar '24

08 Mar '24

Module: vkd3d Branch: master Commit: e5ae6bd3c2f75cbab379863f2668a5ae982748eb URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/e5ae6bd3c2f75cbab379863f2668a… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Sat Feb 3 00:07:30 2024 +1000 vkd3d: Implement CreateCommittedResource2(). --- libs/vkd3d/device.c | 17 ++++++++++++++--- tests/d3d12.c | 8 ++------ 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index df74b9c3..ed278a1a 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -4538,12 +4538,23 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CreateCommittedResource2(ID3D12Dev D3D12_RESOURCE_STATES initial_state, const D3D12_CLEAR_VALUE *optimized_clear_value, ID3D12ProtectedResourceSession *protected_session, REFIID iid, void **resource) { - FIXME("iface %p, heap_properties %p, heap_flags %#x, desc %p, initial_state %#x, " - "optimized_clear_value %p, protected_session %p, iid %s, resource %p stub!\n", + struct d3d12_device *device = impl_from_ID3D12Device8(iface); + struct d3d12_resource *object; + HRESULT hr; + + TRACE("iface %p, heap_properties %p, heap_flags %#x, desc %p, initial_state %#x, " + "optimized_clear_value %p, protected_session %p, iid %s, resource %p.\n", iface, heap_properties, heap_flags, desc, initial_state, optimized_clear_value, protected_session, debugstr_guid(iid), resource); - return E_NOTIMPL; + if (FAILED(hr = d3d12_committed_resource_create(device, heap_properties, heap_flags, + desc, initial_state, optimized_clear_value, protected_session, &object))) + { + *resource = NULL; + return hr; + } + + return return_interface(&object->ID3D12Resource2_iface, &IID_ID3D12Resource2, iid, resource); } static HRESULT STDMETHODCALLTYPE d3d12_device_CreatePlacedResource1(ID3D12Device8 *iface, diff --git a/tests/d3d12.c b/tests/d3d12.c index 9d2cd113..8066a474 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -1879,15 +1879,11 @@ static void test_create_committed_resource(void) hr = ID3D12Device8_CreateCommittedResource2(device8, &heap_properties, D3D12_HEAP_FLAG_NONE, &resource_desc1, D3D12_RESOURCE_STATE_RENDER_TARGET, &clear_value, NULL, &IID_ID3D12Resource2, (void **)&resource2); - todo ok(hr == S_OK, "Failed to create committed resource, hr %#x.\n", hr); - if (!hr) - { - check_interface(resource2, &IID_ID3D12Resource2, true); - ID3D12Resource2_Release(resource2); - } + check_interface(resource2, &IID_ID3D12Resource2, true); + ID3D12Resource2_Release(resource2); ID3D12Device8_Release(device8); }

1 0

Conor McCarthy : vkd3d: Implement CreatePlacedResource1().
by Alexandre Julliard 08 Mar '24

08 Mar '24

Module: vkd3d Branch: master Commit: 197f16efa9ceec4046cb940613b0b8fe0d76685d URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/197f16efa9ceec4046cb940613b0b… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Sat Feb 3 00:09:45 2024 +1000 vkd3d: Implement CreatePlacedResource1(). --- libs/vkd3d/device.c | 17 ++++++++++++++--- tests/d3d12.c | 8 ++------ 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index ed278a1a..9f6162d3 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -4562,12 +4562,23 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CreatePlacedResource1(ID3D12Device D3D12_RESOURCE_STATES initial_state, const D3D12_CLEAR_VALUE *optimized_clear_value, REFIID iid, void **resource) { - FIXME("iface %p, heap %p, heap_offset %#"PRIx64", desc %p, initial_state %#x, " - "optimized_clear_value %p, iid %s, resource %p stub!\n", + struct d3d12_device *device = impl_from_ID3D12Device8(iface); + struct d3d12_heap *heap_object; + struct d3d12_resource *object; + HRESULT hr; + + TRACE("iface %p, heap %p, heap_offset %#"PRIx64", desc %p, initial_state %#x, " + "optimized_clear_value %p, iid %s, resource %p.\n", iface, heap, heap_offset, resource_desc, initial_state, optimized_clear_value, debugstr_guid(iid), resource); - return E_NOTIMPL; + heap_object = unsafe_impl_from_ID3D12Heap(heap); + + if (FAILED(hr = d3d12_placed_resource_create(device, heap_object, heap_offset, + resource_desc, initial_state, optimized_clear_value, &object))) + return hr; + + return return_interface(&object->ID3D12Resource2_iface, &IID_ID3D12Resource2, iid, resource); } static void STDMETHODCALLTYPE d3d12_device_CreateSamplerFeedbackUnorderedAccessView(ID3D12Device8 *iface, diff --git a/tests/d3d12.c b/tests/d3d12.c index 8066a474..04b23de8 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -2255,15 +2255,11 @@ static void test_create_placed_resource(void) hr = ID3D12Device8_CreatePlacedResource1(device8, heap, 0, &resource_desc1, D3D12_RESOURCE_STATE_COMMON, NULL, &IID_ID3D12Resource2, (void **)&resource2); - todo ok(hr == S_OK, "Failed to create placed resource, hr %#x.\n", hr); - if (!hr) - { - check_interface(resource2, &IID_ID3D12Resource2, true); - ID3D12Resource2_Release(resource2); - } + check_interface(resource2, &IID_ID3D12Resource2, true); + ID3D12Resource2_Release(resource2); ID3D12Device8_Release(device8); }

1 0