January 2022 - Wine-Commits

Connor McAdams : secur32/tests: Add more DTLS tests.
by Alexandre Julliard Jan. 19, 2022

Jan. 19, 2022

Module: wine Branch: master Commit: 54185c9c168c9f1f3a320585ecb87c0af6779c97 URL: https://source.winehq.org/git/wine.git/?a=commit;h=54185c9c168c9f1f3a320585… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Mon Jan 17 11:59:05 2022 -0500 secur32/tests: Add more DTLS tests. Add more tests for DTLS, and clear up behavior of prior tests. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/tests/schannel.c | 57 +++++++++++++++++++++++++++++++++++++------ 1 file changed, 49 insertions(+), 8 deletions(-) diff --git a/dlls/secur32/tests/schannel.c b/dlls/secur32/tests/schannel.c index 7cb3871193c..1fceaae6a61 100644 --- a/dlls/secur32/tests/schannel.c +++ b/dlls/secur32/tests/schannel.c @@ -1517,15 +1517,25 @@ static void test_application_protocol_negotiation(void) closesocket(sock); } +static void init_dtls_output_buffer(SecBufferDesc *buffer) +{ + buffer->pBuffers[0].BufferType = SECBUFFER_TOKEN; + buffer->pBuffers[0].cbBuffer = 1420; + buffer->pBuffers[1].BufferType = SECBUFFER_ALERT; + buffer->pBuffers[1].cbBuffer = 1024; + if (!buffer->pBuffers[1].pvBuffer) + buffer->pBuffers[1].pvBuffer = HeapAlloc( GetProcessHeap(), 0, 1024 ); +} + static void test_dtls(void) { SECURITY_STATUS status; TimeStamp exp; SCHANNEL_CRED cred; CredHandle cred_handle; - CtxtHandle ctx_handle; + CtxtHandle ctx_handle, ctx_handle2; SecBufferDesc buffers[3]; - ULONG flags_req, flags_ret, attr; + ULONG flags_req, flags_ret, attr, prev_buf_len; init_cred( &cred ); cred.grbitEnabledProtocols = SP_PROT_DTLS_CLIENT | SP_PROT_DTLS1_2_CLIENT; @@ -1549,11 +1559,7 @@ static void test_dtls(void) buffers[0].pBuffers[0].cbBuffer = 2; init_buffers( &buffers[1], 2, 2048 ); - buffers[1].pBuffers[0].BufferType = SECBUFFER_TOKEN; - buffers[1].pBuffers[0].cbBuffer = 1420; - buffers[1].pBuffers[1].BufferType = SECBUFFER_ALERT; - buffers[1].pBuffers[1].cbBuffer = 1024; - buffers[1].pBuffers[1].pvBuffer = HeapAlloc( GetProcessHeap(), 0, 1024 ); + init_dtls_output_buffer(&buffers[1]); attr = 0; exp.LowPart = exp.HighPart = 0xdeadbeef; @@ -1566,22 +1572,57 @@ static void test_dtls(void) ok( attr == flags_ret, "got %08x\n", attr ); ok( !exp.LowPart, "got %08x\n", exp.LowPart ); ok( !exp.HighPart, "got %08x\n", exp.HighPart ); + ok( buffers[1].pBuffers[1].BufferType == SECBUFFER_ALERT, "Expected buffertype SECBUFFER_ALERT, got %#x\n", buffers[1].pBuffers[1].BufferType); + todo_wine ok( !buffers[1].pBuffers[1].cbBuffer, "Expected SECBUFFER_ALERT buffer to be empty, got %#x\n", buffers[1].pBuffers[1].cbBuffer); + prev_buf_len = buffers[1].pBuffers[0].cbBuffer; + /* + * If we don't set the SECBUFFER_ALERT cbBuffer value, we will get + * SEC_E_INSUFFICIENT_MEMORY. + */ buffers[1].pBuffers[0].BufferType = SECBUFFER_TOKEN; buffers[1].pBuffers[0].cbBuffer = 1420; attr = 0; exp.LowPart = exp.HighPart = 0xdeadbeef; + ctx_handle2.dwLower = ctx_handle2.dwUpper = 0xdeadbeef; status = InitializeSecurityContextA( &cred_handle, &ctx_handle, (SEC_CHAR *)"winetest", flags_req, 0, 16, NULL, 0, - &ctx_handle, &buffers[1], &attr, &exp ); + &ctx_handle2, &buffers[1], &attr, &exp ); ok( status == SEC_E_INSUFFICIENT_MEMORY, "got %08x\n", status ); flags_ret = ISC_RET_CONFIDENTIALITY | ISC_RET_SEQUENCE_DETECT | ISC_RET_REPLAY_DETECT; todo_wine ok( attr == flags_ret, "got %08x\n", attr ); ok( !exp.LowPart, "got %08x\n", exp.LowPart ); ok( !exp.HighPart, "got %08x\n", exp.HighPart ); + ok( ctx_handle2.dwLower == 0xdeadbeef, "Did not expect dwLower to be set on new context\n"); + ok( ctx_handle2.dwUpper == 0xdeadbeef, "Did not expect dwUpper to be set on new context\n"); + + /* No new input buffer value, just repeats the same behavior as before. */ + init_dtls_output_buffer(&buffers[1]); + + attr = 0; + exp.LowPart = exp.HighPart = 0xdeadbeef; + ctx_handle2.dwLower = ctx_handle2.dwUpper = 0xdeadbeef; + status = InitializeSecurityContextA( &cred_handle, &ctx_handle, (SEC_CHAR *)"winetest", flags_req, 0, 16, NULL, 0, + &ctx_handle2, &buffers[1], &attr, &exp ); + todo_wine ok( status == SEC_I_CONTINUE_NEEDED, "got %08x\n", status ); + + flags_ret = ISC_RET_MANUAL_CRED_VALIDATION | ISC_RET_STREAM | ISC_RET_EXTENDED_ERROR | ISC_RET_DATAGRAM | + ISC_RET_USED_SUPPLIED_CREDS | ISC_RET_CONFIDENTIALITY | ISC_RET_SEQUENCE_DETECT | ISC_RET_REPLAY_DETECT; + todo_wine ok( attr == flags_ret, "got %08x\n", attr ); + todo_wine ok( exp.LowPart, "got %08x\n", exp.LowPart ); + todo_wine ok( exp.HighPart, "got %08x\n", exp.HighPart ); + ok( buffers[1].pBuffers[1].BufferType == SECBUFFER_ALERT, "Expected buffertype SECBUFFER_ALERT, got %#x\n", buffers[1].pBuffers[1].BufferType); + todo_wine ok( !buffers[1].pBuffers[1].cbBuffer, "Expected SECBUFFER_ALERT buffer to be empty, got %#x\n", buffers[1].pBuffers[1].cbBuffer); + todo_wine ok( ctx_handle.dwLower == ctx_handle2.dwLower, "dwLower mismatch, expected %#lx, got %#lx\n", ctx_handle.dwLower, ctx_handle2.dwLower); + todo_wine ok( ctx_handle.dwUpper == ctx_handle2.dwUpper, "dwUpper mismatch, expected %#lx, got %#lx\n", ctx_handle.dwUpper, ctx_handle2.dwUpper); + + /* With no new input buffer, output buffer length should match prior call. */ + todo_wine ok(buffers[1].pBuffers[0].cbBuffer == prev_buf_len, "Output buffer size mismatch, expected %#x, got %#x\n", + prev_buf_len, buffers[1].pBuffers[0].cbBuffer); free_buffers( &buffers[0] ); + HeapFree(GetProcessHeap(), 0, buffers[1].pBuffers[1].pvBuffer); free_buffers( &buffers[1] ); DeleteSecurityContext( &ctx_handle ); FreeCredentialsHandle( &cred_handle );

1 0

Eric Pouech : rpcss: Fix implementation declaration to match prototype.
by Alexandre Julliard Jan. 19, 2022

Jan. 19, 2022

Module: wine Branch: master Commit: ecd84626cbe4d1b17b574fe1796553102d921d54 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ecd84626cbe4d1b17b574fe1… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Sun Jan 16 11:16:50 2022 +0100 rpcss: Fix implementation declaration to match prototype. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/rpcss/rpcss_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/rpcss/rpcss_main.c b/programs/rpcss/rpcss_main.c index 7df859155e2..af055e6000a 100644 --- a/programs/rpcss/rpcss_main.c +++ b/programs/rpcss/rpcss_main.c @@ -52,7 +52,7 @@ struct registered_class static CRITICAL_SECTION registered_classes_cs = { NULL, -1, 0, 0, 0, 0 }; static struct list registered_classes = LIST_INIT(registered_classes); -HRESULT __cdecl irpcss_server_register(handle_t h, const GUID *clsid, DWORD flags, +HRESULT __cdecl irpcss_server_register(handle_t h, const GUID *clsid, unsigned int flags, PMInterfacePointer object, unsigned int *cookie) { struct registered_class *entry;

1 0

Eric Pouech : msi: Don't call RegCloseKey with uninitialized value.
by Alexandre Julliard Jan. 19, 2022

Jan. 19, 2022

Module: wine Branch: master Commit: 4240e71a350b16d7ba048a839683c2023d03c831 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4240e71a350b16d7ba048a83… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Jan 17 10:46:21 2022 +0100 msi: Don't call RegCloseKey with uninitialized value. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/action.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 9a47c2b068b..8ee9420af55 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -6973,7 +6973,7 @@ static UINT ITERATE_RemoveEnvironmentString( MSIRECORD *rec, LPVOID param ) LPCWSTR name, value, component; WCHAR *p, *q, *deformatted = NULL, *new_value = NULL; DWORD flags, type, size, len, len_value = 0, len_new_value; - HKEY env; + HKEY env = NULL; MSICOMPONENT *comp; MSIRECORD *uirow; int action = 0;

1 0

Alexandre Julliard : Remove the translation status pages.
by Alexandre Julliard Jan. 19, 2022

Jan. 19, 2022

Module: tools Branch: master Commit: ece1759c177ecda2a945b50dc1e6d3e76dad5308 URL: https://source.winehq.org/git/tools.git/?a=commit;h=ece1759c177ecda2a945b50… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 19 11:11:46 2022 +0100 Remove the translation status pages. They have been broken by makefile changes, and since the switch to po files are no longer meaningful anyway. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- transl/.gitignore | 5 - transl/Master.sh | 63 --- transl/README | 12 - transl/config-example | 23 - transl/config.php | 5 - transl/img/bar0.gif | Bin 112 -> 0 bytes transl/img/bar1.gif | Bin 112 -> 0 bytes transl/img/bar2.gif | Bin 112 -> 0 bytes transl/img/bar3.gif | Bin 111 -> 0 bytes transl/img/bar4.gif | Bin 112 -> 0 bytes transl/img/bar5.gif | Bin 112 -> 0 bytes transl/img/bar6.gif | Bin 112 -> 0 bytes transl/img/icon-error.png | Bin 1582 -> 0 bytes transl/img/icon-missing.gif | Bin 292 -> 0 bytes transl/img/icon-ok.png | Bin 941 -> 0 bytes transl/img/icon-warning.png | Bin 1692 -> 0 bytes transl/img/iconsm-check.png | Bin 177 -> 0 bytes transl/img/tree-empty.png | Bin 97 -> 0 bytes transl/img/tree-l.png | Bin 113 -> 0 bytes transl/img/tree-t.png | Bin 116 -> 0 bytes transl/img/tree-vert.png | Bin 114 -> 0 bytes transl/index.php | 149 ------ transl/lang.php | 143 ------ transl/lib.php | 344 -------------- transl/lib_res.php | 1106 ------------------------------------------- transl/parse_resfiles.php | 365 -------------- transl/redirect.php | 9 - transl/resfile.php | 123 ----- transl/resource.php | 82 ---- transl/runlog.php | 7 - transl/style.css | 127 ----- winetest/make-winetest | 31 +- 32 files changed, 7 insertions(+), 2587 deletions(-) Diff: https://source.winehq.org/git/tools.git/?a=commitdiff;h=ece1759c177ecda2a94…

1 0

Giovanni Mascellani : vkd3d-shader/hlsl: Write SM4 equality instructions.
by Alexandre Julliard Jan. 19, 2022

Jan. 19, 2022

Module: vkd3d Branch: master Commit: f23415f4b590b70c81fc8bbeaeebef8daeff3eba URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=f23415f4b590b70c81fc8bb… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Wed Jan 19 12:52:02 2022 +0100 vkd3d-shader/hlsl: Write SM4 equality instructions. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl_sm4.c | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index 2458018..90bb32e 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -1489,6 +1489,41 @@ static void write_sm4_expr(struct hlsl_ctx *ctx, break; } + case HLSL_TYPE_BOOL: + { + switch (expr->op) + { + case HLSL_OP2_EQUAL: + { + const struct hlsl_type *src_type = arg1->data_type; + + switch (src_type->base_type) + { + case HLSL_TYPE_FLOAT: + write_sm4_binary_op(buffer, VKD3D_SM4_OP_EQ, &expr->node, arg1, arg2); + break; + + case HLSL_TYPE_BOOL: + case HLSL_TYPE_INT: + case HLSL_TYPE_UINT: + write_sm4_binary_op(buffer, VKD3D_SM4_OP_IEQ, &expr->node, arg1, arg2); + break; + + default: + hlsl_fixme(ctx, &expr->node.loc, "SM4 equality between \"%s\" operands.", + debug_hlsl_type(ctx, src_type)); + break; + } + break; + } + + default: + hlsl_fixme(ctx, &expr->node.loc, "SM4 bool \"%s\" expression.", debug_hlsl_expr_op(expr->op)); + break; + } + break; + } + default: { struct vkd3d_string_buffer *string;

1 0

Giovanni Mascellani : vkd3d-shader/hlsl: Write SM4 greater-or-equal instructions.
by Alexandre Julliard Jan. 19, 2022

Jan. 19, 2022

Module: vkd3d Branch: master Commit: 9182e73e649c631417b7e1ebb04e405dedd89866 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=9182e73e649c631417b7e1e… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Wed Jan 19 12:52:05 2022 +0100 vkd3d-shader/hlsl: Write SM4 greater-or-equal instructions. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl_sm4.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index cbdd5fa..8fc4e73 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -1568,6 +1568,33 @@ static void write_sm4_expr(struct hlsl_ctx *ctx, break; } + case HLSL_OP2_GEQUAL: + { + const struct hlsl_type *src_type = arg1->data_type; + + switch (src_type->base_type) + { + case HLSL_TYPE_FLOAT: + write_sm4_binary_op(buffer, VKD3D_SM4_OP_GE, &expr->node, arg1, arg2); + break; + + case HLSL_TYPE_INT: + write_sm4_binary_op(buffer, VKD3D_SM4_OP_IGE, &expr->node, arg1, arg2); + break; + + case HLSL_TYPE_BOOL: + case HLSL_TYPE_UINT: + write_sm4_binary_op(buffer, VKD3D_SM4_OP_UGE, &expr->node, arg1, arg2); + break; + + default: + hlsl_fixme(ctx, &expr->node.loc, "SM4 greater-than-or-equal between \"%s\" operands.", + debug_hlsl_type(ctx, src_type)); + break; + } + break; + } + default: hlsl_fixme(ctx, &expr->node.loc, "SM4 bool \"%s\" expression.", debug_hlsl_expr_op(expr->op)); break;

1 0

Giovanni Mascellani : vkd3d-shader/hlsl: Write SM4 inequality instructions.
by Alexandre Julliard Jan. 19, 2022

Jan. 19, 2022

Module: vkd3d Branch: master Commit: 1db9dab156cff28975d6c9b071ecd4e8c3e7f0b7 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=1db9dab156cff28975d6c9b… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Wed Jan 19 12:52:03 2022 +0100 vkd3d-shader/hlsl: Write SM4 inequality instructions. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl_sm4.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index 90bb32e..53dca71 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -1517,6 +1517,30 @@ static void write_sm4_expr(struct hlsl_ctx *ctx, break; } + case HLSL_OP2_NEQUAL: + { + const struct hlsl_type *src_type = arg1->data_type; + + switch (src_type->base_type) + { + case HLSL_TYPE_FLOAT: + write_sm4_binary_op(buffer, VKD3D_SM4_OP_NE, &expr->node, arg1, arg2); + break; + + case HLSL_TYPE_BOOL: + case HLSL_TYPE_INT: + case HLSL_TYPE_UINT: + write_sm4_binary_op(buffer, VKD3D_SM4_OP_INE, &expr->node, arg1, arg2); + break; + + default: + hlsl_fixme(ctx, &expr->node.loc, "SM4 inequality between \"%s\" operands.", + debug_hlsl_type(ctx, src_type)); + break; + } + break; + } + default: hlsl_fixme(ctx, &expr->node.loc, "SM4 bool \"%s\" expression.", debug_hlsl_expr_op(expr->op)); break;

1 0

Zebediah Figura : vkd3d-shader/hlsl: Use list_empty() instead of comparing list_count() against zero.
by Alexandre Julliard Jan. 19, 2022

Jan. 19, 2022

Module: vkd3d Branch: master Commit: 833bfa88124114e7521a3bfd7d54934b63811b95 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=833bfa88124114e7521a3bf… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jan 19 12:51:59 2022 +0100 vkd3d-shader/hlsl: Use list_empty() instead of comparing list_count() against zero. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.y | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 636882c..5a17449 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -326,7 +326,7 @@ static bool append_conditional_break(struct hlsl_ctx *ctx, struct list *cond_lis struct hlsl_ir_if *iff; /* E.g. "for (i = 0; ; ++i)". */ - if (!list_count(cond_list)) + if (list_empty(cond_list)) return true; condition = node_from_list(cond_list);

1 0

Giovanni Mascellani : vkd3d-shader/hlsl: Remove HLSL_OP2_GREATER and HLSL_OP2_LEQUAL.
by Alexandre Julliard Jan. 19, 2022

Jan. 19, 2022

Module: vkd3d Branch: master Commit: 2d619f3d5293c5778b9884d7757bc39c97896ba0 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=2d619f3d5293c5778b9884d… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Wed Jan 19 12:52:06 2022 +0100 vkd3d-shader/hlsl: Remove HLSL_OP2_GREATER and HLSL_OP2_LEQUAL. They are replaced with HLSL_OP2_LESS and HLSL_OP2_GEQUAL after swapping the parameters. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 1 - libs/vkd3d-shader/hlsl.c | 2 -- libs/vkd3d-shader/hlsl.h | 2 -- libs/vkd3d-shader/hlsl.y | 4 ++-- 4 files changed, 2 insertions(+), 7 deletions(-) diff --git a/Makefile.am b/Makefile.am index 0c2fbf7..a3ec685 100644 --- a/Makefile.am +++ b/Makefile.am @@ -288,7 +288,6 @@ XFAIL_TESTS = \ tests/cast-to-half.shader_test \ tests/cast-to-int.shader_test \ tests/cast-to-uint.shader_test \ - tests/conditional.shader_test \ tests/hlsl-array-dimension.shader_test \ tests/hlsl-bool-cast.shader_test \ tests/hlsl-duplicate-modifiers.shader_test \ diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index d2ea4c3..8ae3130 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -1198,8 +1198,6 @@ const char *debug_hlsl_expr_op(enum hlsl_ir_expr_op op) [HLSL_OP2_DOT] = "dot", [HLSL_OP2_EQUAL] = "==", [HLSL_OP2_GEQUAL] = ">=", - [HLSL_OP2_GREATER] = ">", - [HLSL_OP2_LEQUAL] = "<=", [HLSL_OP2_LESS] = "<", [HLSL_OP2_LOGIC_AND] = "&&", [HLSL_OP2_LOGIC_OR] = "||", diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 57acf3a..6aec0b0 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -316,8 +316,6 @@ enum hlsl_ir_expr_op HLSL_OP2_DOT, HLSL_OP2_EQUAL, HLSL_OP2_GEQUAL, - HLSL_OP2_GREATER, - HLSL_OP2_LEQUAL, HLSL_OP2_LESS, HLSL_OP2_LOGIC_AND, HLSL_OP2_LOGIC_OR, diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 5a17449..cff56a7 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -3422,11 +3422,11 @@ relational_expr: } | relational_expr '>' shift_expr { - $$ = add_binary_comparison_expr_merge(ctx, $1, $3, HLSL_OP2_GREATER, @2); + $$ = add_binary_comparison_expr_merge(ctx, $3, $1, HLSL_OP2_LESS, @2); } | relational_expr OP_LE shift_expr { - $$ = add_binary_comparison_expr_merge(ctx, $1, $3, HLSL_OP2_LEQUAL, @2); + $$ = add_binary_comparison_expr_merge(ctx, $3, $1, HLSL_OP2_GEQUAL, @2); } | relational_expr OP_GE shift_expr {

1 0

Conor McCarthy : vkd3d: Use the resource's stored format in d3d12_command_list_CopyResource().
by Alexandre Julliard Jan. 19, 2022

Jan. 19, 2022

Module: vkd3d Branch: master Commit: 68b70585a7a14d08d3a50631daff6e2f31398c86 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=68b70585a7a14d08d3a5063… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Jan 18 15:07:57 2022 +1000 vkd3d: Use the resource's stored format in d3d12_command_list_CopyResource(). Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/command.c | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 9ea9d7f..f8e9918 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -3573,7 +3573,6 @@ static void STDMETHODCALLTYPE d3d12_command_list_CopyResource(ID3D12GraphicsComm { struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList2(iface); struct d3d12_resource *dst_resource, *src_resource; - const struct vkd3d_format *src_format, *dst_format; const struct vkd3d_vk_device_procs *vk_procs; VkBufferCopy vk_buffer_copy; VkImageCopy vk_image_copy; @@ -3605,19 +3604,6 @@ static void STDMETHODCALLTYPE d3d12_command_list_CopyResource(ID3D12GraphicsComm } else { - if (!(dst_format = vkd3d_format_from_d3d12_resource_desc(list->device, - &dst_resource->desc, DXGI_FORMAT_UNKNOWN))) - { - WARN("Invalid format %#x.\n", dst_resource->desc.Format); - return; - } - if (!(src_format = vkd3d_format_from_d3d12_resource_desc(list->device, - &src_resource->desc, DXGI_FORMAT_UNKNOWN))) - { - WARN("Invalid format %#x.\n", src_resource->desc.Format); - return; - } - layer_count = d3d12_resource_desc_get_layer_count(&dst_resource->desc); assert(d3d12_resource_is_texture(dst_resource)); @@ -3627,8 +3613,8 @@ static void STDMETHODCALLTYPE d3d12_command_list_CopyResource(ID3D12GraphicsComm for (i = 0; i < dst_resource->desc.MipLevels; ++i) { - vk_image_copy_from_d3d12(&vk_image_copy, i, i, - &src_resource->desc, &dst_resource->desc, src_format, dst_format, NULL, 0, 0, 0); + vk_image_copy_from_d3d12(&vk_image_copy, i, i, &src_resource->desc, &dst_resource->desc, + src_resource->format, dst_resource->format, NULL, 0, 0, 0); vk_image_copy.dstSubresource.layerCount = layer_count; vk_image_copy.srcSubresource.layerCount = layer_count; VK_CALL(vkCmdCopyImage(list->vk_command_buffer, src_resource->u.vk_image,

1 0