- Wine-Commits - list.winehq.org

Alistair Leslie-Hughes : include: Add missing TreeView_* defines.
by Alexandre Julliard May 31, 2024

May 31, 2024

Module: wine Branch: master Commit: 6f927b9e93f164c973c46200452109abe2aa79b4 URL: https://gitlab.winehq.org/wine/wine/-/commit/6f927b9e93f164c973c46200452109… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri May 31 18:32:14 2024 +1000 include: Add missing TreeView_* defines. --- include/commctrl.h | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/include/commctrl.h b/include/commctrl.h index 7c5b09f6e72..ece751a0d35 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -3022,6 +3022,8 @@ typedef struct tagTVKEYDOWN #define TreeView_GetCheckState(hwndTV, hti) \ ((((UINT)(SNDMSG((hwndTV), TVM_GETITEMSTATE, (WPARAM)(hti), \ TVIS_STATEIMAGEMASK))) >> 12) -1) +#define TreeView_SetCheckState(hwndTV, hti, check) \ + TreeView_SetItemState(hwndTV, hti, INDEXTOSTATEIMAGEMASK((check) ? 2 : 1), TVIS_STATEIMAGEMASK) #define TreeView_SetLineColor(hwnd, clr) \ (COLORREF)SNDMSG((hwnd), TVM_SETLINECOLOR, 0, (LPARAM)(clr)) @@ -3040,6 +3042,34 @@ typedef struct tagTVKEYDOWN #define TreeView_GetUnicodeFormat(hwnd) \ (BOOL)SNDMSG((hwnd), TVM_GETUNICODEFORMAT, 0, 0) +#define TreeView_SetExtendedStyle(hwnd, style, mask) \ + (DWORD)SNDMSG((hwnd), TVM_SETEXTENDEDSTYLE, mask, style) + +#define TreeView_GetExtendedStyle(hwnd) \ + (DWORD)SNDMSG((hwnd), TVM_GETEXTENDEDSTYLE, 0, 0) + +#define TreeView_SetAutoScrollInfo(hwnd, pps, updatetime) \ + SNDMSG((hwnd), TVM_SETAUTOSCROLLINFO, (WPARAM)(pps), (LPARAM)(updatetime)) + +#define TreeView_SetHot(hwnd, hitem) \ + SNDMSG((hwnd), TVM_SETHOT, 0, (LPARAM)(hitem)) + +#define TreeView_GetSelectedCount(hwnd) \ + (DWORD)SNDMSG((hwnd), TVM_GETSELECTEDCOUNT, 0, 0) + +#define TreeView_ShowInfoTip(hwnd, hitem) \ + (DWORD)SNDMSG((hwnd), TVM_SHOWINFOTIP, 0, (LPARAM)(hitem)) + +#define TreeView_GetItemPartRect(hwnd, hitem, rect, part) \ +{ \ + TVGETITEMPARTRECTINFO info; \ + info.hti = (hitem); \ + info.prc = (rect); \ + info.partID = (part); \ + SNDMSG((hwnd), TVM_GETITEMPARTRECT, 0, (LPARAM)&info); \ +} + + /* Listview control */ #define WC_LISTVIEWA "SysListView32"

1 0

Yuxuan Shui : shell32: Fix ShellExecute for non-filespec paths.
by Alexandre Julliard May 31, 2024

May 31, 2024

Module: wine Branch: master Commit: 0bad544aab9e2c9ee93bbabac0386e02c58a39c0 URL: https://gitlab.winehq.org/wine/wine/-/commit/0bad544aab9e2c9ee93bbabac0386e… Author: Yuxuan Shui <yshui(a)codeweavers.com> Date: Mon May 20 09:51:07 2024 +0100 shell32: Fix ShellExecute for non-filespec paths. --- dlls/shell32/shlexec.c | 60 ++++++++++++++++++++++++++++++++++---------- dlls/shell32/tests/shlexec.c | 13 +++++++++- 2 files changed, 59 insertions(+), 14 deletions(-) diff --git a/dlls/shell32/shlexec.c b/dlls/shell32/shlexec.c index f0cf27c5098..828c7168a34 100644 --- a/dlls/shell32/shlexec.c +++ b/dlls/shell32/shlexec.c @@ -49,6 +49,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(exec); typedef UINT_PTR (*SHELL_ExecuteW32)(const WCHAR *lpCmd, WCHAR *env, BOOL shWait, const SHELLEXECUTEINFOW *sei, LPSHELLEXECUTEINFOW sei_out); extern BOOL WINAPI PathResolveAW(void *path, const void **paths, DWORD flags); +extern BOOL WINAPI PathFileExistsDefExtW(LPWSTR lpszPath,DWORD dwWhich); static inline BOOL isSpace(WCHAR c) { @@ -627,24 +628,57 @@ static UINT SHELL_FindExecutable(LPCWSTR lpPath, LPCWSTR lpFile, LPCWSTR lpVerb, return 33; } - if (lpPath && *lpPath) + GetCurrentDirectoryW(ARRAY_SIZE(curdir), curdir); + if (!PathIsFileSpecW(lpFile)) { - search_paths[0] = lpPath; - search_paths[1] = curdir; + BOOL found = FALSE; + if (lpPath && *lpPath) + { + TRACE("ASDF %s\n", debugstr_w(lpPath)); + PathCombineW(xlpFile, lpPath, lpFile); + if (PathFileExistsDefExtW(xlpFile, 0xbf)) + { + GetFullPathNameW(xlpFile, ARRAY_SIZE(xlpFile), xlpFile, NULL); + found = TRUE; + } + } + if (!found) + { + lstrcpyW(xlpFile, lpFile); + if (PathFileExistsDefExtW(xlpFile, 0xbf)) + { + GetFullPathNameW(xlpFile, ARRAY_SIZE(xlpFile), xlpFile, NULL); + found = TRUE; + } + } + if (found) + { + lpFile = xlpFile; + lstrcpyW(lpResult, xlpFile); + } + else + xlpFile[0] = '\0'; } else - search_paths[0] = curdir; - GetCurrentDirectoryW(ARRAY_SIZE(curdir), curdir); - lstrcpyW(xlpFile, lpFile); - if (PathResolveAW(xlpFile, (const void **)search_paths, PRF_TRYPROGRAMEXTENSIONS | PRF_VERIFYEXISTS)) { - TRACE("PathResolveAW returned non-zero\n"); - lpFile = xlpFile; - lstrcpyW(lpResult, xlpFile); - /* The file was found in lpPath or one of the directories in the system-wide search path */ + if (lpPath && *lpPath) + { + search_paths[0] = lpPath; + search_paths[1] = curdir; + } + else + search_paths[0] = curdir; + lstrcpyW(xlpFile, lpFile); + if (PathResolveAW(xlpFile, (const void **)search_paths, PRF_TRYPROGRAMEXTENSIONS | PRF_VERIFYEXISTS)) + { + TRACE("PathResolveAW returned non-zero\n"); + lpFile = xlpFile; + lstrcpyW(lpResult, xlpFile); + /* The file was found in lpPath or one of the directories in the system-wide search path */ + } + else + xlpFile[0] = '\0'; } - else - xlpFile[0] = '\0'; attribs = GetFileAttributesW(lpFile); if (attribs!=INVALID_FILE_ATTRIBUTES && (attribs&FILE_ATTRIBUTE_DIRECTORY)) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index 0f537d829f4..bd32ece8705 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -2267,9 +2267,11 @@ static void test_exes(void) char filename[2 * MAX_PATH + 17]; char params[1024]; char curdir[MAX_PATH]; - char *basename = strrchr(argv0, '\\') + 1; + char relative_basename[MAX_PATH]; + char *basename = strrchr(argv0, '\\') + 1, *dirname = strdup(argv0); INT_PTR rc; + *strrchr(dirname, '\\') = '\0'; sprintf(params, "shlexec \"%s\" Exec", child_file); /* We need NOZONECHECKS on Win2003 to block a dialog */ @@ -2279,6 +2281,15 @@ static void test_exes(void) okChildInt("argcA", 4); okChildString("argvA3", "Exec"); + /* Check non-filespec paths */ + snprintf(relative_basename, ARRAY_SIZE(relative_basename), ".\\\\%s", basename); + rc=shell_execute_ex(SEE_MASK_NOZONECHECKS | SEE_MASK_FLAG_NO_UI, NULL, relative_basename, params, + dirname, NULL); + okShell(rc > 32, "returned %Iu\n", rc); + okChildInt("argcA", 4); + okChildString("argvA3", "Exec"); + free(dirname); + rc=shell_execute_ex(SEE_MASK_NOZONECHECKS | SEE_MASK_CLASSNAME | SEE_MASK_FLAG_NO_UI, NULL, argv0, params, NULL, ".exe"); okShell(rc > 32, "returned %Iu\n", rc);

1 0

Alexandre Julliard : msvcrt: Move common exception handling types to the header.
by Alexandre Julliard May 31, 2024

May 31, 2024

Module: wine Branch: master Commit: f3a35da445953cb48cf1854129fec0a96085de24 URL: https://gitlab.winehq.org/wine/wine/-/commit/f3a35da445953cb48cf1854129fec0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 31 12:07:02 2024 +0200 msvcrt: Move common exception handling types to the header. --- dlls/msvcrt/cppexcept.h | 109 +++++++++++++++++++++++++++++++++++++++----- dlls/msvcrt/except_i386.c | 48 ++----------------- dlls/msvcrt/except_x86_64.c | 47 ------------------- dlls/msvcrt/handler4.c | 61 +++++++++---------------- 4 files changed, 123 insertions(+), 142 deletions(-)

1 0

Alexandre Julliard : msvcrt: Share the find_caught_type() helper between platforms.
by Alexandre Julliard May 31, 2024

May 31, 2024

Module: wine Branch: master Commit: 28f5e7ac9ad054ec3c7723be4d718834c83d03c7 URL: https://gitlab.winehq.org/wine/wine/-/commit/28f5e7ac9ad054ec3c7723be4d7188… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 31 12:08:14 2024 +0200 msvcrt: Share the find_caught_type() helper between platforms. --- dlls/msvcrt/cppexcept.h | 27 +++++++++++++++++++++++++++ dlls/msvcrt/except_i386.c | 30 ++---------------------------- dlls/msvcrt/except_x86_64.c | 27 --------------------------- dlls/msvcrt/handler4.c | 26 -------------------------- 4 files changed, 29 insertions(+), 81 deletions(-) diff --git a/dlls/msvcrt/cppexcept.h b/dlls/msvcrt/cppexcept.h index ef8a2944c04..37a498c41d8 100644 --- a/dlls/msvcrt/cppexcept.h +++ b/dlls/msvcrt/cppexcept.h @@ -203,6 +203,33 @@ static inline void call_dtor( void *func, void *this ) } #endif +/* check if the exception type is caught by a given catch block, and return the type that matched */ +static inline const cxx_type_info *find_caught_type( cxx_exception_type *exc_type, uintptr_t base, + const type_info *catch_ti, UINT catch_flags ) +{ + const cxx_type_info_table *type_info_table = rtti_rva( exc_type->type_info_table, base ); + UINT i; + + for (i = 0; i < type_info_table->count; i++) + { + const cxx_type_info *type = rtti_rva( type_info_table->info[i], base ); + const type_info *ti = rtti_rva( type->type_info, base ); + + if (!catch_ti) return type; /* catch(...) matches any type */ + if (catch_ti != ti) + { + if (strcmp( catch_ti->mangled, ti->mangled )) continue; + } + /* type is the same, now check the flags */ + if ((exc_type->flags & TYPE_FLAG_CONST) && + !(catch_flags & TYPE_FLAG_CONST)) continue; + if ((exc_type->flags & TYPE_FLAG_VOLATILE) && + !(catch_flags & TYPE_FLAG_VOLATILE)) continue; + return type; /* it matched */ + } + return NULL; +} + #if _MSVCR_VER >= 80 #define EXCEPTION_MANGLED_NAME ".?AVexception(a)std@@" #else diff --git a/dlls/msvcrt/except_i386.c b/dlls/msvcrt/except_i386.c index d20b08d00c3..c326b24d54c 100644 --- a/dlls/msvcrt/except_i386.c +++ b/dlls/msvcrt/except_i386.c @@ -206,32 +206,6 @@ static void dump_function_descr( const cxx_function_descr *descr ) TRACE( "flags: %08x\n", descr->flags ); } -/* check if the exception type is caught by a given catch block, and return the type that matched */ -static const cxx_type_info *find_caught_type( cxx_exception_type *exc_type, - const type_info *catch_ti, UINT catch_flags ) -{ - UINT i; - - for (i = 0; i < exc_type->type_info_table->count; i++) - { - const cxx_type_info *type = exc_type->type_info_table->info[i]; - - if (!catch_ti) return type; /* catch(...) matches any type */ - if (catch_ti != type->type_info) - { - if (strcmp( catch_ti->mangled, type->type_info->mangled )) continue; - } - /* type is the same, now check the flags */ - if ((exc_type->flags & TYPE_FLAG_CONST) && - !(catch_flags & TYPE_FLAG_CONST)) continue; - if ((exc_type->flags & TYPE_FLAG_VOLATILE) && - !(catch_flags & TYPE_FLAG_VOLATILE)) continue; - return type; /* it matched */ - } - return NULL; -} - - /* copy the exception object where the catch block wants it */ static void copy_exception( void *object, cxx_exception_frame *frame, const catchblock_info *catchblock, const cxx_type_info *type ) @@ -363,7 +337,7 @@ static inline void call_catch_block( PEXCEPTION_RECORD rec, CONTEXT *context, const catchblock_info *catchblock = &tryblock->catchblock[j]; if(info) { - const cxx_type_info *type = find_caught_type( info, + const cxx_type_info *type = find_caught_type( info, 0, catchblock->type_info, catchblock->flags ); if (!type) continue; @@ -444,7 +418,7 @@ int CDECL __CxxExceptionFilter( PEXCEPTION_POINTERS ptrs, if (!rec) return EXCEPTION_CONTINUE_SEARCH; } - type = find_caught_type( (cxx_exception_type*)rec->ExceptionInformation[2], ti, flags ); + type = find_caught_type( (cxx_exception_type*)rec->ExceptionInformation[2], 0, ti, flags ); if (!type) return EXCEPTION_CONTINUE_SEARCH; if (copy) diff --git a/dlls/msvcrt/except_x86_64.c b/dlls/msvcrt/except_x86_64.c index ed82755e182..2afbdc821da 100644 --- a/dlls/msvcrt/except_x86_64.c +++ b/dlls/msvcrt/except_x86_64.c @@ -151,33 +151,6 @@ static inline int ip_to_state(ipmap_info *ipmap, UINT count, int ip) return ipmap[low].state; } -/* check if the exception type is caught by a given catch block, and return the type that matched */ -static const cxx_type_info *find_caught_type(cxx_exception_type *exc_type, ULONG64 exc_base, - const type_info *catch_ti, UINT catch_flags) -{ - const cxx_type_info_table *type_info_table = rva_to_ptr(exc_type->type_info_table, exc_base); - UINT i; - - for (i = 0; i < type_info_table->count; i++) - { - const cxx_type_info *type = rva_to_ptr(type_info_table->info[i], exc_base); - const type_info *ti = rva_to_ptr(type->type_info, exc_base); - - if (!catch_ti) return type; /* catch(...) matches any type */ - if (catch_ti != ti) - { - if (strcmp( catch_ti->mangled, ti->mangled )) continue; - } - /* type is the same, now check the flags */ - if ((exc_type->flags & TYPE_FLAG_CONST) && - !(catch_flags & TYPE_FLAG_CONST)) continue; - if ((exc_type->flags & TYPE_FLAG_VOLATILE) && - !(catch_flags & TYPE_FLAG_VOLATILE)) continue; - return type; /* it matched */ - } - return NULL; -} - static inline void copy_exception(void *object, ULONG64 frame, DISPATCHER_CONTEXT *dispatch, const catchblock_info *catchblock, diff --git a/dlls/msvcrt/handler4.c b/dlls/msvcrt/handler4.c index 560302d7d64..9bfde4b7ca2 100644 --- a/dlls/msvcrt/handler4.c +++ b/dlls/msvcrt/handler4.c @@ -359,32 +359,6 @@ static inline int ip_to_state4(BYTE *ip_map, UINT count, DISPATCHER_CONTEXT *dis return ret; } -static const cxx_type_info *find_caught_type(cxx_exception_type *exc_type, ULONG64 exc_base, - const type_info *catch_ti, UINT catch_flags) -{ - const cxx_type_info_table *type_info_table = rva_to_ptr(exc_type->type_info_table, exc_base); - UINT i; - - for (i = 0; i < type_info_table->count; i++) - { - const cxx_type_info *type = rva_to_ptr(type_info_table->info[i], exc_base); - const type_info *ti = rva_to_ptr(type->type_info, exc_base); - - if (!catch_ti) return type; /* catch(...) matches any type */ - if (catch_ti != ti) - { - if (strcmp( catch_ti->mangled, ti->mangled )) continue; - } - /* type is the same, now check the flags */ - if ((exc_type->flags & TYPE_FLAG_CONST) && - !(catch_flags & TYPE_FLAG_CONST)) continue; - if ((exc_type->flags & TYPE_FLAG_VOLATILE) && - !(catch_flags & TYPE_FLAG_VOLATILE)) continue; - return type; /* it matched */ - } - return NULL; -} - static inline void copy_exception(void *object, ULONG64 frame, DISPATCHER_CONTEXT *dispatch, const catchblock_info_v4 *catchblock, const cxx_type_info *type, ULONG64 exc_base) {

1 0

Yuxuan Shui : shell32: Make sure array passed to PathResolve is big enough.
by Alexandre Julliard May 31, 2024

May 31, 2024

Module: wine Branch: master Commit: 436e96c5cb2887af239e1131f81d7cf002c1ac02 URL: https://gitlab.winehq.org/wine/wine/-/commit/436e96c5cb2887af239e1131f81d7c… Author: Yuxuan Shui <yshui(a)codeweavers.com> Date: Mon May 20 09:00:30 2024 +0100 shell32: Make sure array passed to PathResolve is big enough. --- dlls/shell32/shlexec.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/shlexec.c b/dlls/shell32/shlexec.c index d2fe3caed88..f0cf27c5098 100644 --- a/dlls/shell32/shlexec.c +++ b/dlls/shell32/shlexec.c @@ -599,7 +599,7 @@ static UINT SHELL_FindExecutable(LPCWSTR lpPath, LPCWSTR lpFile, LPCWSTR lpVerb, WCHAR wBuffer[256]; /* Used to GetProfileString */ UINT retval = SE_ERR_NOASSOC; WCHAR *tok; /* token pointer */ - WCHAR xlpFile[256]; /* result of SearchPath */ + WCHAR xlpFile[MAX_PATH]; /* result of SearchPath */ DWORD attribs; /* file attributes */ WCHAR curdir[MAX_PATH]; const WCHAR *search_paths[3] = {0}; @@ -634,7 +634,7 @@ static UINT SHELL_FindExecutable(LPCWSTR lpPath, LPCWSTR lpFile, LPCWSTR lpVerb, } else search_paths[0] = curdir; - GetCurrentDirectoryW(MAX_PATH, curdir); + GetCurrentDirectoryW(ARRAY_SIZE(curdir), curdir); lstrcpyW(xlpFile, lpFile); if (PathResolveAW(xlpFile, (const void **)search_paths, PRF_TRYPROGRAMEXTENSIONS | PRF_VERIFYEXISTS)) {

1 0

Francis De Brabandere : vbscript/tests: Fix error clear call.
by Alexandre Julliard May 31, 2024

May 31, 2024

Module: wine Branch: master Commit: 1c88cb4e4ea8ffc0f7895d1f6525817896d336fd URL: https://gitlab.winehq.org/wine/wine/-/commit/1c88cb4e4ea8ffc0f7895d1f652581… Author: Francis De Brabandere <francisdb(a)gmail.com> Date: Fri May 24 13:22:42 2024 +0000 vbscript/tests: Fix error clear call. --- dlls/vbscript/tests/api.vbs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index 3974781d6a8..7b8744f4c74 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -131,7 +131,7 @@ if isEnglishLang then TestCStr true, "True" sub testCStrError() on error resume next - Error.clear() + Err.clear() CStr(null) call ok(Err.number = 94, "Err.number = " & Err.number) if isEnglishLang then call ok(Err.source = "Microsoft VBScript runtime error", "Err.source = " & Err.source)

1 0

Nikolay Sivov : vkd3d-shader/fx: Do not write shared buffers block when not compiling as a child effect.
by Alexandre Julliard May 30, 2024

May 30, 2024

Module: vkd3d Branch: master Commit: 5265fbb789703b79ef83a32ed625b9b9fa118331 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/5265fbb789703b79ef83a32ed625b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu May 30 13:59:36 2024 +0200 vkd3d-shader/fx: Do not write shared buffers block when not compiling as a child effect. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- libs/vkd3d-shader/fx.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libs/vkd3d-shader/fx.c b/libs/vkd3d-shader/fx.c index 57b4ac24..d8653dbf 100644 --- a/libs/vkd3d-shader/fx.c +++ b/libs/vkd3d-shader/fx.c @@ -1464,6 +1464,9 @@ static void write_buffers(struct fx_write_context *fx, bool shared) { struct hlsl_buffer *buffer; + if (shared && !fx->child_effect) + return; + LIST_FOR_EACH_ENTRY(buffer, &fx->ctx->buffers, struct hlsl_buffer, entry) { if (!buffer->size && !fx->include_empty_buffers)

1 0

Nikolay Sivov : tests: Add a few tests for the NULL value.
by Alexandre Julliard May 30, 2024

May 30, 2024

Module: vkd3d Branch: master Commit: 727aacca189c07e9d5ff0793cb1dec70ede5a45b URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/727aacca189c07e9d5ff0793cb1de… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 28 14:43:36 2024 +0200 tests: Add a few tests for the NULL value. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- Makefile.am | 1 + tests/hlsl/null.shader_test | 81 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 82 insertions(+) diff --git a/Makefile.am b/Makefile.am index 619bcdf4..46772fd9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -162,6 +162,7 @@ vkd3d_shader_tests = \ tests/hlsl/nointerpolation.shader_test \ tests/hlsl/non-const-indexing.shader_test \ tests/hlsl/normalize.shader_test \ + tests/hlsl/null.shader_test \ tests/hlsl/numeric-constructor-truncation.shader_test \ tests/hlsl/numeric-types.shader_test \ tests/hlsl/numthreads.shader_test \ diff --git a/tests/hlsl/null.shader_test b/tests/hlsl/null.shader_test new file mode 100644 index 00000000..bf0a0ce5 --- /dev/null +++ b/tests/hlsl/null.shader_test @@ -0,0 +1,81 @@ +[pixel shader fail] +float4 var = NULL; + +float4 main() : sv_target +{ + return 0; +} + +[pixel shader fail] +float4x4 var = NULL; + +float4 main() : sv_target +{ + return 0; +} + +[pixel shader fail] +struct s +{ + float4 f; +}; + +float4 main() : sv_target +{ + s var = (s)NULL; + return s.f; +} + +[pixel shader fail(sm<6)] +Texture var = null; + +float4 main() : sv_target +{ + return 0; +} + +[pixel shader todo] +SamplerState s +{ + UnknownField = NULL; +}; + +Texture t = NULL; +PixelShader ps = NULL; +VertexShader vs = NULL; + +float4 main() : sv_target +{ + return 0; +} + +[require] +shader model >= 4.0 + +[pixel shader fail(sm>=6) todo] +Texture2DMS<float4> t = NULL; + +RWTexture1D<float4> u1 = NULL; +RWTexture2D<float4> u2 = NULL; +RWTexture3D<float4> u3 = NULL; + +RWTexture1DArray<float4> ua1 = NULL; +RWTexture2DArray<float4> ua2 = NULL; + +RWBuffer<float4> b1 = NULL; + +float4 main() : sv_target +{ + return 0; +} + +[require] +shader model >= 5.0 + +[pixel shader fail(sm>=6) todo] +RasterizerOrderedTexture2D<uint4> t1 = NULL; + +float4 main() : sv_target +{ + return 0; +}

1 0

Henri Verbeet : vkd3d-shader/ir: Rename the "handler_idx" field of struct vkd3d_shader_instruction to "opcode".
by Alexandre Julliard May 30, 2024

May 30, 2024

Module: vkd3d Branch: master Commit: 1fe7a6581b305af724e70868472d5880ec52f9d2 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/1fe7a6581b305af724e70868472d5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 24 20:34:42 2024 +0200 vkd3d-shader/ir: Rename the "handler_idx" field of struct vkd3d_shader_instruction to "opcode". --- libs/vkd3d-shader/d3d_asm.c | 12 +-- libs/vkd3d-shader/d3dbc.c | 14 +-- libs/vkd3d-shader/dxil.c | 45 +++++----- libs/vkd3d-shader/glsl.c | 6 +- libs/vkd3d-shader/ir.c | 144 +++++++++++++++--------------- libs/vkd3d-shader/spirv.c | 146 +++++++++++++++---------------- libs/vkd3d-shader/tpf.c | 28 +++--- libs/vkd3d-shader/vkd3d_shader_main.c | 28 +++--- libs/vkd3d-shader/vkd3d_shader_private.h | 6 +- 9 files changed, 215 insertions(+), 214 deletions(-)

1 0

Nikolay Sivov : tests: Add some basic tests for ConstantBuffer type.
by Alexandre Julliard May 30, 2024

May 30, 2024

Module: vkd3d Branch: master Commit: 163aaf9729787bbcc1f348b11f12e8e8803c6a32 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/163aaf9729787bbcc1f348b11f12e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 24 09:43:39 2024 +0200 tests: Add some basic tests for ConstantBuffer type. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- tests/hlsl/cbuffer.shader_test | 89 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 89 insertions(+) diff --git a/tests/hlsl/cbuffer.shader_test b/tests/hlsl/cbuffer.shader_test index 1297b72b..733322ce 100644 --- a/tests/hlsl/cbuffer.shader_test +++ b/tests/hlsl/cbuffer.shader_test @@ -860,3 +860,92 @@ uniform 12 float4 12.0 13.0 14.0 15.0 uniform 16 float4 16.0 17.0 18.0 19.0 todo(glsl) draw quad probe all rgba (124.0, 135.0, 146.0, 150.5) + +[require] +shader model >= 5.1 + +[pixel shader fail todo] +float4 ConstantBuffer; + +float4 main() : sv_target +{ + return ConstantBuffer; +} + +[pixel shader fail] +struct s +{ + float4 m; +}; + +float4 cb; +ConstantBuffer<s> cb; + +float4 main() : sv_target +{ + return 0; +} + +[pixel shader fail(sm>=6) todo] +struct s +{ + float4 m; +}; + +float4 main() : sv_target +{ + // Local variable do not create resource definitions, + // acting like a constant + ConstantBuffer<s> cb = (s)1; + float4 var = 0.1f; + var += cb.m; + return var; +} + +[test] +todo draw quad +probe all rgba (1.1, 1.1, 1.1, 1.1) + +[pixel shader fail] +struct s +{ + float4 m; +}; + +float4 main() : sv_target +{ + ConstantBuffer<s> cb = (s)0; + cb.m = 1.0f; + return cb.m; +} + +[pixel shader todo] +struct s +{ + float4 m; +}; + +float4 var; + +ConstantBuffer<s> cb[2][3] : register(b1); +cbuffer cb +{ + float4 m2; +}; + +float4 main() : sv_target +{ + return 0; +} + +[require] +shader model >= 2.0 +shader model < 5.1 + +[pixel shader] +float4 ConstantBuffer; + +float4 main() : sv_target +{ + return ConstantBuffer; +}

1 0