- Wine-Commits - list.winehq.org

Nikolay Sivov : vkd3d-shader/hlsl: Support case-insensitive lookup for builtin 'dword' type.
by Alexandre Julliard Feb. 23, 2023

Feb. 23, 2023

Module: vkd3d Branch: master Commit: 891217664a41b7f24bd535c821978d8fb8650c48 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/891217664a41b7f24bd535c821978… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Feb 19 01:44:20 2023 +0100 vkd3d-shader/hlsl: Support case-insensitive lookup for builtin 'dword' type. --- Makefile.am | 1 + libs/vkd3d-shader/hlsl.c | 39 +++++++++++++++++++++++++++++----- libs/vkd3d-shader/hlsl.h | 2 +- libs/vkd3d-shader/hlsl.l | 2 +- libs/vkd3d-shader/hlsl.y | 4 ++-- tests/hlsl-type-names.shader_test | 44 +++++++++++++++++++++++++++++++++++++++ 6 files changed, 83 insertions(+), 9 deletions(-) diff --git a/Makefile.am b/Makefile.am index ebda192d..29692432 100644 --- a/Makefile.am +++ b/Makefile.am @@ -115,6 +115,7 @@ vkd3d_shader_tests = \ tests/hlsl-struct-assignment.shader_test \ tests/hlsl-struct-semantics.shader_test \ tests/hlsl-transpose.shader_test \ + tests/hlsl-type-names.shader_test \ tests/hlsl-vector-indexing.shader_test \ tests/hlsl-vector-indexing-uniform.shader_test \ tests/lit.shader_test \ diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 42a1d52f..2ed63043 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -604,15 +604,44 @@ struct hlsl_type *hlsl_new_uav_type(struct hlsl_ctx *ctx, enum hlsl_sampler_dim return type; } -struct hlsl_type *hlsl_get_type(struct hlsl_scope *scope, const char *name, bool recursive) +static const char * get_case_insensitive_typename(const char *name) +{ + static const char *const names[] = + { + "dword", + }; + unsigned int i; + + for (i = 0; i < ARRAY_SIZE(names); ++i) + { + if (!ascii_strcasecmp(names[i], name)) + return names[i]; + } + + return NULL; +} + +struct hlsl_type *hlsl_get_type(struct hlsl_scope *scope, const char *name, bool recursive, bool case_insensitive) { struct rb_entry *entry = rb_get(&scope->types, name); if (entry) return RB_ENTRY_VALUE(entry, struct hlsl_type, scope_entry); - if (recursive && scope->upper) - return hlsl_get_type(scope->upper, name, recursive); + if (scope->upper) + { + if (recursive) + return hlsl_get_type(scope->upper, name, recursive, case_insensitive); + } + else + { + if (case_insensitive && (name = get_case_insensitive_typename(name))) + { + if ((entry = rb_get(&scope->types, name))) + return RB_ENTRY_VALUE(entry, struct hlsl_type, scope_entry); + } + } + return NULL; } @@ -807,7 +836,7 @@ struct hlsl_type *hlsl_type_clone(struct hlsl_ctx *ctx, struct hlsl_type *old, bool hlsl_scope_add_type(struct hlsl_scope *scope, struct hlsl_type *type) { - if (hlsl_get_type(scope, type->name, false)) + if (hlsl_get_type(scope, type->name, false, false)) return false; rb_put(&scope->types, type->name, &type->scope_entry); @@ -2808,7 +2837,7 @@ static void declare_predefined_types(struct hlsl_ctx *ctx) } effect_types[] = { - {"DWORD", HLSL_CLASS_SCALAR, HLSL_TYPE_INT, 1, 1}, + {"dword", HLSL_CLASS_SCALAR, HLSL_TYPE_INT, 1, 1}, {"FLOAT", HLSL_CLASS_SCALAR, HLSL_TYPE_FLOAT, 1, 1}, {"VECTOR", HLSL_CLASS_VECTOR, HLSL_TYPE_FLOAT, 4, 1}, {"MATRIX", HLSL_CLASS_MATRIX, HLSL_TYPE_FLOAT, 4, 4}, diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 6fa627ed..62049e8d 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -1005,7 +1005,7 @@ void hlsl_free_var(struct hlsl_ir_var *decl); struct hlsl_ir_function *hlsl_get_function(struct hlsl_ctx *ctx, const char *name); struct hlsl_ir_function_decl *hlsl_get_func_decl(struct hlsl_ctx *ctx, const char *name); -struct hlsl_type *hlsl_get_type(struct hlsl_scope *scope, const char *name, bool recursive); +struct hlsl_type *hlsl_get_type(struct hlsl_scope *scope, const char *name, bool recursive, bool case_insensitive); struct hlsl_ir_var *hlsl_get_var(struct hlsl_scope *scope, const char *name); struct hlsl_type *hlsl_get_element_type_from_path_index(struct hlsl_ctx *ctx, const struct hlsl_type *type, diff --git a/libs/vkd3d-shader/hlsl.l b/libs/vkd3d-shader/hlsl.l index 69ed9d9d..59f31fcd 100644 --- a/libs/vkd3d-shader/hlsl.l +++ b/libs/vkd3d-shader/hlsl.l @@ -181,7 +181,7 @@ row_major {return KW_ROW_MAJOR; } yylval->name = hlsl_strdup(ctx, yytext); if (hlsl_get_var(ctx->cur_scope, yytext) || hlsl_get_function(ctx, yytext)) return VAR_IDENTIFIER; - else if (hlsl_get_type(ctx->cur_scope, yytext, true)) + else if (hlsl_get_type(ctx->cur_scope, yytext, true, true)) return TYPE_IDENTIFIER; else return NEW_IDENTIFIER; diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 6c618912..4b26a179 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -4711,7 +4711,7 @@ type_no_void: } | TYPE_IDENTIFIER { - $$ = hlsl_get_type(ctx->cur_scope, $1, true); + $$ = hlsl_get_type(ctx->cur_scope, $1, true, true); if ($$->is_minimum_precision) { if (ctx->profile->major_version < 4) @@ -4728,7 +4728,7 @@ type_no_void: } | KW_STRUCT TYPE_IDENTIFIER { - $$ = hlsl_get_type(ctx->cur_scope, $2, true); + $$ = hlsl_get_type(ctx->cur_scope, $2, true, true); if ($$->type != HLSL_CLASS_STRUCT) hlsl_error(ctx, &@1, VKD3D_SHADER_ERROR_HLSL_REDEFINED, "\"%s\" redefined as a structure.", $2); vkd3d_free($2); diff --git a/tests/hlsl-type-names.shader_test b/tests/hlsl-type-names.shader_test new file mode 100644 index 00000000..f90ea587 --- /dev/null +++ b/tests/hlsl-type-names.shader_test @@ -0,0 +1,44 @@ +[pixel shader] +typedef float2 Dword; +typedef float3 dWord; + +float4 f() +{ + typedef Dword dword; + dword v1 = {1, 2}; + DWORD v4 = 4; + return float4(v1.x, v1.y, 3, v4); +} + +float4 f2() +{ + typedef dword dword; + dword v = 1; + return float4(v, v, v, v); +} + +float4 main() : SV_TARGET +{ + return f() + f2(); +} + +[test] +draw quad +probe all rgba (2.0, 3.0, 4.0, 5.0) + +% The "dword" alias is pre-defined as lowercase +[pixel shader fail] +typedef float2 dword; + +float4 main() : sv_target +{ + return float4(0, 0, 0, 0); +} + +[pixel shader fail] +struct DWORD s; + +float4 main() : sv_target +{ + return float4(0, 0, 0, 0); +}

1 0

Nikolay Sivov : vkd3d-shader/hlsl: Use unsigned type for the 'dword' alias.
by Alexandre Julliard Feb. 23, 2023

Feb. 23, 2023

Module: vkd3d Branch: master Commit: df2d6d35e21f8ca698741bd65f1900d7e9fc9571 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/df2d6d35e21f8ca698741bd65f190… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 21 12:55:08 2023 +0100 vkd3d-shader/hlsl: Use unsigned type for the 'dword' alias. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 2ed63043..c2c694ba 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -2837,7 +2837,7 @@ static void declare_predefined_types(struct hlsl_ctx *ctx) } effect_types[] = { - {"dword", HLSL_CLASS_SCALAR, HLSL_TYPE_INT, 1, 1}, + {"dword", HLSL_CLASS_SCALAR, HLSL_TYPE_UINT, 1, 1}, {"FLOAT", HLSL_CLASS_SCALAR, HLSL_TYPE_FLOAT, 1, 1}, {"VECTOR", HLSL_CLASS_VECTOR, HLSL_TYPE_FLOAT, 4, 1}, {"MATRIX", HLSL_CLASS_MATRIX, HLSL_TYPE_FLOAT, 4, 4},

1 0

Nikolay Sivov : vkd3d-shader/hlsl: Support case-insensitive lookup for builtin 'float' type.
by Alexandre Julliard Feb. 23, 2023

Feb. 23, 2023

Module: vkd3d Branch: master Commit: dd36215a00174a1db560021562bad84cd37e3071 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/dd36215a00174a1db560021562bad… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 21 23:59:04 2023 +0100 vkd3d-shader/hlsl: Support case-insensitive lookup for builtin 'float' type. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.c | 3 ++- tests/hlsl-type-names.shader_test | 19 ++++++++++++++++--- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index c2c694ba..d15abe50 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -609,6 +609,7 @@ static const char * get_case_insensitive_typename(const char *name) static const char *const names[] = { "dword", + "float", }; unsigned int i; @@ -2838,7 +2839,7 @@ static void declare_predefined_types(struct hlsl_ctx *ctx) effect_types[] = { {"dword", HLSL_CLASS_SCALAR, HLSL_TYPE_UINT, 1, 1}, - {"FLOAT", HLSL_CLASS_SCALAR, HLSL_TYPE_FLOAT, 1, 1}, + {"float", HLSL_CLASS_SCALAR, HLSL_TYPE_FLOAT, 1, 1}, {"VECTOR", HLSL_CLASS_VECTOR, HLSL_TYPE_FLOAT, 4, 1}, {"MATRIX", HLSL_CLASS_MATRIX, HLSL_TYPE_FLOAT, 4, 4}, {"STRING", HLSL_CLASS_OBJECT, HLSL_TYPE_STRING, 1, 1}, diff --git a/tests/hlsl-type-names.shader_test b/tests/hlsl-type-names.shader_test index f90ea587..e88f1cda 100644 --- a/tests/hlsl-type-names.shader_test +++ b/tests/hlsl-type-names.shader_test @@ -1,20 +1,25 @@ [pixel shader] typedef float2 Dword; typedef float3 dWord; +typedef float2 fLoat; float4 f() { typedef Dword dword; + typedef fLoat float; dword v1 = {1, 2}; + float v2 = {2, 3}; DWORD v4 = 4; - return float4(v1.x, v1.y, 3, v4); + return float4(v1.x, v2.x, v2.y, v4); } float4 f2() { typedef dword dword; - dword v = 1; - return float4(v, v, v, v); + typedef float float; + dword v1 = 1; + float v2 = 1; + return float4(v1, v2, v1, v1); } float4 main() : SV_TARGET @@ -42,3 +47,11 @@ float4 main() : sv_target { return float4(0, 0, 0, 0); } + +[pixel shader fail] +typedef float2 float; + +float4 main() : sv_target +{ + return float4(0, 0, 0, 0); +}

1 0

Francisco Casas : vkd3d-shader/hlsl: Don't map src swizzles for SM1 dp3 and dp4 ops.
by Alexandre Julliard Feb. 23, 2023

Feb. 23, 2023

Module: vkd3d Branch: fix_sm1_dp Commit: 5644c23fe053083c1e4a490e8e47b923f44048d6 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/5644c23fe053083c1e4a490e8e47b… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Thu Feb 23 10:52:29 2023 -0300 vkd3d-shader/hlsl: Don't map src swizzles for SM1 dp3 and dp4 ops. Without this patch, dp3 and dp4 map src swizzles to the dst writemask, which is not correct. Before b84f560bdf59c35e093e51bfdf9a166c196d3a9b, these ops worked despite this, because the dst register had, incorrectly, the full writemask. To solve this problem, write_sm1_binary_op_dot() is introduced, similarly to write_sm4_binary_op_dot(). --- libs/vkd3d-shader/hlsl_sm1.c | 29 +++++++++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_sm1.c b/libs/vkd3d-shader/hlsl_sm1.c index 07f9ceb7..4a62d804 100644 --- a/libs/vkd3d-shader/hlsl_sm1.c +++ b/libs/vkd3d-shader/hlsl_sm1.c @@ -525,6 +525,31 @@ static void write_sm1_binary_op(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buff write_sm1_instruction(ctx, buffer, &instr); } +static void write_sm1_binary_op_dot(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *buffer, + D3DSHADER_INSTRUCTION_OPCODE_TYPE opcode, const struct hlsl_reg *dst, + const struct hlsl_reg *src1, const struct hlsl_reg *src2) +{ + struct sm1_instruction instr = + { + .opcode = opcode, + + .dst.type = D3DSPR_TEMP, + .dst.writemask = dst->writemask, + .dst.reg = dst->id, + .has_dst = 1, + + .srcs[0].type = D3DSPR_TEMP, + .srcs[0].swizzle = hlsl_swizzle_from_writemask(src1->writemask), + .srcs[0].reg = src1->id, + .srcs[1].type = D3DSPR_TEMP, + .srcs[1].swizzle = hlsl_swizzle_from_writemask(src2->writemask), + .srcs[1].reg = src2->id, + .src_count = 2, + }; + + write_sm1_instruction(ctx, buffer, &instr); +} + static void write_sm1_unary_op(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *buffer, D3DSHADER_INSTRUCTION_OPCODE_TYPE opcode, const struct hlsl_reg *dst, const struct hlsl_reg *src, D3DSHADER_PARAM_SRCMOD_TYPE src_mod, D3DSHADER_PARAM_DSTMOD_TYPE dst_mod) @@ -738,11 +763,11 @@ static void write_sm1_expr(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *b switch (arg1->data_type->dimx) { case 4: - write_sm1_binary_op(ctx, buffer, D3DSIO_DP4, &instr->reg, &arg1->reg, &arg2->reg); + write_sm1_binary_op_dot(ctx, buffer, D3DSIO_DP4, &instr->reg, &arg1->reg, &arg2->reg); break; case 3: - write_sm1_binary_op(ctx, buffer, D3DSIO_DP3, &instr->reg, &arg1->reg, &arg2->reg); + write_sm1_binary_op_dot(ctx, buffer, D3DSIO_DP3, &instr->reg, &arg1->reg, &arg2->reg); break; default:

1 0

Hans Leidekker : winscard/tests: Initial tests.
by Alexandre Julliard Feb. 22, 2023

Feb. 22, 2023

Module: wine Branch: master Commit: 77fdfdb8ef09153bf0adbfa6226b6477b4dd0702 URL: https://gitlab.winehq.org/wine/wine/-/commit/77fdfdb8ef09153bf0adbfa6226b64… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Feb 16 13:44:26 2023 +0100 winscard/tests: Initial tests. --- configure | 1 + configure.ac | 1 + dlls/winscard/tests/Makefile.in | 5 + dlls/winscard/tests/winscard.c | 237 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 244 insertions(+)

1 0

Francois Gouget : vbscript/tests: Fix the testChrError() tests.
by Alexandre Julliard Feb. 22, 2023

Feb. 22, 2023

Module: wine Branch: master Commit: 15b176b4f4945d7abfb4adbddc7f140ba1765855 URL: https://gitlab.winehq.org/wine/wine/-/commit/15b176b4f4945d7abfb4adbddc7f14… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Feb 21 20:08:29 2023 +0100 vbscript/tests: Fix the testChrError() tests. Chr() depends on the thread's ANSI code page which in some cases is different from the Windows ANSI code page (e.g. hi-IN). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54003 --- dlls/vbscript/tests/run.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index 4158aa28197..294b635ea41 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -239,7 +239,7 @@ static void detect_locale(void) PRIMARYLANGID(GetUserDefaultUILanguage()) == LANG_ENGLISH && PRIMARYLANGID(GetUserDefaultLangID()) == LANG_ENGLISH); - GetCPInfoExA( CP_ACP, 0, &cpinfo ); + GetCPInfoExA( CP_THREAD_ACP, 0, &cpinfo ); MaxCharSize = cpinfo.MaxCharSize; GetLocaleInfoA(LOCALE_USER_DEFAULT, LOCALE_IFIRSTDAYOFWEEK | LOCALE_RETURN_NUMBER,

1 0

Hans Leidekker : winscard: Improve traces.
by Alexandre Julliard Feb. 22, 2023

Feb. 22, 2023

Module: wine Branch: master Commit: 21b4de5444435bda7b832c7cfb71c99290bd08fe URL: https://gitlab.winehq.org/wine/wine/-/commit/21b4de5444435bda7b832c7cfb71c9… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Feb 16 13:33:49 2023 +0100 winscard: Improve traces. --- dlls/winscard/winscard.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/winscard/winscard.c b/dlls/winscard/winscard.c index b2dd7d5f8e9..c7954faa400 100644 --- a/dlls/winscard/winscard.c +++ b/dlls/winscard/winscard.c @@ -112,6 +112,7 @@ static inline char *utf8_to_ansi( const char *src ) HANDLE WINAPI SCardAccessStartedEvent(void) { + FIXME( "stub\n" ); return g_startedEvent; } @@ -185,9 +186,10 @@ LONG WINAPI SCardIsValidContext( SCARDCONTEXT context ) return ret; } -LONG WINAPI SCardListCardsA(SCARDCONTEXT hContext, LPCBYTE pbAtr, LPCGUID rgguidInterfaces, DWORD cguidInterfaceCount, LPSTR mszCards, LPDWORD pcchCards) +LONG WINAPI SCardListCardsA( SCARDCONTEXT context, const BYTE *atr, const GUID *interfaces, DWORD interface_count, + char *cards, DWORD *cards_len ) { - FIXME(": stub\n"); + FIXME( "%Ix, %p, %p, %lu, %p, %p stub\n", context, atr, interfaces, interface_count, cards, cards_len ); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return SCARD_F_INTERNAL_ERROR; } @@ -343,7 +345,7 @@ LONG WINAPI SCardStatusW( SCARDHANDLE connect, WCHAR *names, DWORD *names_len, D void WINAPI SCardReleaseStartedEvent(void) { - FIXME("stub\n"); + FIXME( "stub\n" ); } LONG WINAPI SCardListReadersA( SCARDCONTEXT context, const char *groups, char *readers, DWORD *readers_len )

1 0

Hans Leidekker : winscard: Add wow64 thunks.
by Alexandre Julliard Feb. 22, 2023

Feb. 22, 2023

Module: wine Branch: master Commit: 190a31d1abf99661d17d839c90305ece0c3ee3f1 URL: https://gitlab.winehq.org/wine/wine/-/commit/190a31d1abf99661d17d839c90305e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Feb 16 13:36:55 2023 +0100 winscard: Add wow64 thunks. --- dlls/winscard/unixlib.c | 353 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 353 insertions(+) diff --git a/dlls/winscard/unixlib.c b/dlls/winscard/unixlib.c index 4fb17b8ad6f..cd55e6352a8 100644 --- a/dlls/winscard/unixlib.c +++ b/dlls/winscard/unixlib.c @@ -176,3 +176,356 @@ const unixlib_entry_t __wine_unix_call_funcs[] = scard_get_attrib, scard_set_attrib, }; + +#ifdef _WIN64 + +typedef ULONG PTR32; + +static NTSTATUS wow64_scard_establish_context( void *args ) +{ + struct + { + UINT64 scope; + PTR32 handle; + } const *params32 = args; + + struct scard_establish_context_params params = + { + params32->scope, + ULongToPtr(params32->handle) + }; + return scard_establish_context( &params ); +} + +static NTSTATUS wow64_scard_release_context( void *args ) +{ + struct + { + UINT64 handle; + } const *params32 = args; + + struct scard_release_context_params params = + { + params32->handle + }; + return scard_release_context( &params ); +} + +static NTSTATUS wow64_scard_is_valid_context( void *args ) +{ + struct + { + UINT64 handle; + } const *params32 = args; + + struct scard_is_valid_context_params params = + { + params32->handle + }; + return scard_is_valid_context( &params ); +} + +static NTSTATUS wow64_scard_get_status_change( void *args ) +{ + struct + { + UINT64 handle; + UINT64 timeout; + PTR32 states; + UINT64 count; + } const *params32 = args; + + struct scard_get_status_change_params params = + { + params32->handle, + params32->timeout, + ULongToPtr(params32->states), + params32->count, + }; + return scard_get_status_change( &params ); +} + +static NTSTATUS wow64_scard_cancel( void *args ) +{ + struct + { + UINT64 handle; + } const *params32 = args; + + struct scard_cancel_params params = + { + params32->handle + }; + return scard_cancel( &params ); +} + +static NTSTATUS wow64_scard_list_readers( void *args ) +{ + struct + { + UINT64 handle; + PTR32 groups; + PTR32 readers; + PTR32 readers_len; + } *params32 = args; + + struct scard_list_readers_params params = + { + params32->handle, + ULongToPtr(params32->groups), + ULongToPtr(params32->readers), + ULongToPtr(params32->readers_len) + }; + return scard_list_readers( &params ); +}; + +static NTSTATUS wow64_scard_list_reader_groups( void *args ) +{ + struct + { + UINT64 handle; + PTR32 groups; + PTR32 groups_len; + } *params32 = args; + + struct scard_list_reader_groups_params params = + { + params32->handle, + ULongToPtr(params32->groups), + ULongToPtr(params32->groups_len) + }; + return scard_list_reader_groups( &params ); +} + +static NTSTATUS wow64_scard_connect( void *args ) +{ + struct + { + UINT64 context_handle; + PTR32 reader; + UINT64 share_mode; + UINT64 preferred_protocols; + PTR32 connect_handle; + PTR32 protocol; + } *params32 = args; + + struct scard_connect_params params = + { + params32->context_handle, + ULongToPtr(params32->reader), + params32->share_mode, + params32->preferred_protocols, + ULongToPtr(params32->connect_handle), + ULongToPtr(params32->protocol) + }; + return scard_connect( &params ); +} + +static NTSTATUS wow64_scard_status( void *args ) +{ + struct + { + UINT64 handle; + PTR32 names; + PTR32 names_len; + PTR32 state; + PTR32 protocol; + PTR32 atr; + PTR32 atr_len; + } *params32 = args; + + struct scard_status_params params = + { + params32->handle, + ULongToPtr(params32->names), + ULongToPtr(params32->names_len), + ULongToPtr(params32->state), + ULongToPtr(params32->protocol), + ULongToPtr(params32->atr), + ULongToPtr(params32->atr_len) + }; + return scard_status( &params ); +}; + +static NTSTATUS wow64_scard_reconnect( void *args ) +{ + struct + { + UINT64 handle; + UINT64 share_mode; + UINT64 preferred_protocols; + UINT64 initialization; + PTR32 protocol; + } *params32 = args; + + struct scard_reconnect_params params = + { + params32->handle, + params32->share_mode, + params32->preferred_protocols, + params32->initialization, + ULongToPtr(params32->protocol) + }; + return scard_reconnect( &params ); +} + +static NTSTATUS wow64_scard_disconnect( void *args ) +{ + struct + { + UINT64 handle; + UINT64 disposition; + } *params32 = args; + + struct scard_disconnect_params params = + { + params32->handle, + params32->disposition + }; + return scard_disconnect( &params ); +} + +static NTSTATUS wow64_scard_begin_transaction( void *args ) +{ + struct + { + UINT64 handle; + } *params32 = args; + + struct scard_begin_transaction_params params = + { + params32->handle + }; + return scard_begin_transaction( &params ); +} + +static NTSTATUS wow64_scard_end_transaction( void *args ) +{ + struct + { + UINT64 handle; + UINT64 disposition; + } *params32 = args; + + struct scard_end_transaction_params params = + { + params32->handle, + params32->disposition + }; + return scard_end_transaction( &params ); +} + +static NTSTATUS wow64_scard_transmit( void *args ) +{ + struct + { + UINT64 handle; + PTR32 send; + PTR32 send_buf; + UINT64 send_buflen; + PTR32 recv; + PTR32 recv_buf; + PTR32 recv_buflen; + } *params32 = args; + + struct scard_transmit_params params = + { + params32->handle, + ULongToPtr(params32->send), + ULongToPtr(params32->send_buf), + params32->send_buflen, + ULongToPtr(params32->recv), + ULongToPtr(params32->recv_buf), + ULongToPtr(params32->recv_buflen) + }; + return scard_transmit( &params ); +}; + +static NTSTATUS wow64_scard_control( void *args ) +{ + struct + { + UINT64 handle; + UINT64 code; + PTR32 in_buf; + UINT64 in_buflen; + PTR32 out_buf; + UINT64 out_buflen; + PTR32 ret_len; + } *params32 = args; + + struct scard_control_params params = + { + params32->handle, + params32->code, + ULongToPtr(params32->in_buf), + params32->in_buflen, + ULongToPtr(params32->out_buf), + params32->out_buflen, + ULongToPtr(params32->ret_len) + }; + return scard_control( &params ); +}; + +static NTSTATUS wow64_scard_get_attrib( void *args ) +{ + struct + { + UINT64 handle; + UINT64 id; + PTR32 attr; + PTR32 attr_len; + } *params32 = args; + + struct scard_get_attrib_params params = + { + params32->handle, + params32->id, + ULongToPtr(params32->attr), + ULongToPtr(params32->attr_len) + }; + return scard_get_attrib( &params ); +} + +static NTSTATUS wow64_scard_set_attrib( void *args ) +{ + struct + { + UINT64 handle; + UINT64 id; + PTR32 attr; + UINT64 attr_len; + } *params32 = args; + + struct scard_set_attrib_params params = + { + params32->handle, + params32->id, + ULongToPtr(params32->attr), + params32->attr_len + }; + return scard_set_attrib( &params ); +} + +const unixlib_entry_t __wine_unix_call_wow64_funcs[] = +{ + wow64_scard_establish_context, + wow64_scard_release_context, + wow64_scard_is_valid_context, + wow64_scard_get_status_change, + wow64_scard_cancel, + wow64_scard_list_readers, + wow64_scard_list_reader_groups, + wow64_scard_connect, + wow64_scard_status, + wow64_scard_reconnect, + wow64_scard_disconnect, + wow64_scard_begin_transaction, + wow64_scard_end_transaction, + wow64_scard_transmit, + wow64_scard_control, + wow64_scard_get_attrib, + wow64_scard_set_attrib, +}; + +#endif /* _WIN64 */

1 0

Hans Leidekker : winscard: Implement SCardControl().
by Alexandre Julliard Feb. 22, 2023

Feb. 22, 2023

Module: wine Branch: master Commit: c53a2044e0bc0d8833b33351fb4b1f4a4175b4c7 URL: https://gitlab.winehq.org/wine/wine/-/commit/c53a2044e0bc0d8833b33351fb4b1f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Feb 16 13:07:41 2023 +0100 winscard: Implement SCardControl(). --- dlls/winscard/unixlib.c | 9 +++++++++ dlls/winscard/unixlib.h | 12 ++++++++++++ dlls/winscard/winscard.c | 25 +++++++++++++++++++++++++ dlls/winscard/winscard.spec | 2 +- 4 files changed, 47 insertions(+), 1 deletion(-) diff --git a/dlls/winscard/unixlib.c b/dlls/winscard/unixlib.c index 50f6e348e97..b9ca68e40b9 100644 --- a/dlls/winscard/unixlib.c +++ b/dlls/winscard/unixlib.c @@ -45,6 +45,7 @@ LONG SCardReconnect( UINT64, UINT64, UINT64, UINT64, UINT64 * ); LONG SCardBeginTransaction( UINT64 ); LONG SCardEndTransaction( UINT64, UINT64 ); LONG SCardTransmit( UINT64, const struct io_request *, const BYTE *, UINT64, struct io_request *, BYTE *, UINT64 * ); +LONG SCardControl( UINT64, UINT64, const void *, UINT64, void *, UINT64, UINT64 * ); static NTSTATUS scard_establish_context( void *args ) { @@ -134,6 +135,13 @@ static NTSTATUS scard_transmit( void *args ) params->recv_buf, params->recv_buflen ); } +static NTSTATUS scard_control( void *args ) +{ + struct scard_control_params *params = args; + return SCardControl( params->handle, params->code, params->in_buf, params->in_buflen, params->out_buf, + params->out_buflen, params->ret_len ); +} + const unixlib_entry_t __wine_unix_call_funcs[] = { scard_establish_context, @@ -150,4 +158,5 @@ const unixlib_entry_t __wine_unix_call_funcs[] = scard_begin_transaction, scard_end_transaction, scard_transmit, + scard_control, }; diff --git a/dlls/winscard/unixlib.h b/dlls/winscard/unixlib.h index 33b1d295509..cdc7efe1b05 100644 --- a/dlls/winscard/unixlib.h +++ b/dlls/winscard/unixlib.h @@ -138,6 +138,17 @@ struct scard_transmit_params UINT64 *recv_buflen; }; +struct scard_control_params +{ + UINT64 handle; + UINT64 code; + const void *in_buf; + UINT64 in_buflen; + void *out_buf; + UINT64 out_buflen; + UINT64 *ret_len; +}; + enum winscard_funcs { unix_scard_establish_context, @@ -154,4 +165,5 @@ enum winscard_funcs unix_scard_begin_transaction, unix_scard_end_transaction, unix_scard_transmit, + unix_scard_control, }; diff --git a/dlls/winscard/winscard.c b/dlls/winscard/winscard.c index 7ef0a3fc9ba..09b5734c802 100644 --- a/dlls/winscard/winscard.c +++ b/dlls/winscard/winscard.c @@ -822,6 +822,31 @@ LONG WINAPI SCardTransmit( SCARDHANDLE connect, const SCARD_IO_REQUEST *send, co return ret; } +LONG WINAPI SCardControl( SCARDHANDLE connect, DWORD code, const void *in_buf, DWORD in_buflen, void *out_buf, + DWORD out_buflen, DWORD *ret_len ) +{ + struct handle *handle = (struct handle *)connect; + struct scard_control_params params; + UINT64 ret_len64; + LONG ret; + + TRACE( "%Ix, %#lx, %p, %lu, %p, %lu, %p\n", connect, code, in_buf, in_buflen, out_buf, out_buflen, ret_len ); + + if (!handle || handle->magic != CONNECT_MAGIC) return ERROR_INVALID_HANDLE; + if (!ret_len) return SCARD_E_INVALID_PARAMETER; + + params.handle = handle->unix_handle; + params.code = code; + params.in_buf = in_buf; + params.in_buflen = in_buflen; + params.out_buf = out_buf; + params.out_buflen = out_buflen; + params.ret_len = &ret_len64; + if (!(ret = UNIX_CALL( scard_control, &params ))) *ret_len = ret_len64; + TRACE( "returning %#lx\n", ret ); + return ret; +} + BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, void *reserved ) { switch (reason) diff --git a/dlls/winscard/winscard.spec b/dlls/winscard/winscard.spec index 6de6c9036dd..bc9b0fd40da 100644 --- a/dlls/winscard/winscard.spec +++ b/dlls/winscard/winscard.spec @@ -9,7 +9,7 @@ @ stdcall SCardCancel(long) @ stdcall SCardConnectA(long str long long ptr ptr) @ stdcall SCardConnectW(long wstr long long ptr ptr) -@ stub SCardControl +@ stdcall SCardControl(long long ptr long ptr long ptr) @ stdcall SCardDisconnect(long long) @ stdcall SCardEndTransaction(long long) @ stdcall SCardEstablishContext(long ptr ptr ptr)

1 0

Hans Leidekker : winscard: Implement SCardTransmit().
by Alexandre Julliard Feb. 22, 2023

Feb. 22, 2023

Module: wine Branch: master Commit: 26c72e911e2b6fadf6d0e0d34cc331f294e57569 URL: https://gitlab.winehq.org/wine/wine/-/commit/26c72e911e2b6fadf6d0e0d34cc331… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Feb 16 13:03:01 2023 +0100 winscard: Implement SCardTransmit(). --- dlls/winscard/unixlib.c | 9 +++++++++ dlls/winscard/unixlib.h | 18 ++++++++++++++++++ dlls/winscard/winscard.c | 36 ++++++++++++++++++++++++++++++++++++ dlls/winscard/winscard.spec | 2 +- 4 files changed, 64 insertions(+), 1 deletion(-) diff --git a/dlls/winscard/unixlib.c b/dlls/winscard/unixlib.c index e1cdf673c92..50f6e348e97 100644 --- a/dlls/winscard/unixlib.c +++ b/dlls/winscard/unixlib.c @@ -44,6 +44,7 @@ LONG SCardDisconnect( UINT64, UINT64 ); LONG SCardReconnect( UINT64, UINT64, UINT64, UINT64, UINT64 * ); LONG SCardBeginTransaction( UINT64 ); LONG SCardEndTransaction( UINT64, UINT64 ); +LONG SCardTransmit( UINT64, const struct io_request *, const BYTE *, UINT64, struct io_request *, BYTE *, UINT64 * ); static NTSTATUS scard_establish_context( void *args ) { @@ -126,6 +127,13 @@ static NTSTATUS scard_end_transaction( void *args ) return SCardEndTransaction( params->handle, params->disposition ); } +static NTSTATUS scard_transmit( void *args ) +{ + struct scard_transmit_params *params = args; + return SCardTransmit( params->handle, params->send, params->send_buf, params->send_buflen, params->recv, + params->recv_buf, params->recv_buflen ); +} + const unixlib_entry_t __wine_unix_call_funcs[] = { scard_establish_context, @@ -141,4 +149,5 @@ const unixlib_entry_t __wine_unix_call_funcs[] = scard_disconnect, scard_begin_transaction, scard_end_transaction, + scard_transmit, }; diff --git a/dlls/winscard/unixlib.h b/dlls/winscard/unixlib.h index 6c7576220f9..33b1d295509 100644 --- a/dlls/winscard/unixlib.h +++ b/dlls/winscard/unixlib.h @@ -121,6 +121,23 @@ struct scard_end_transaction_params UINT64 disposition; }; +struct io_request +{ + UINT64 protocol; + UINT64 pci_len; +}; + +struct scard_transmit_params +{ + UINT64 handle; + const struct io_request *send; + const BYTE *send_buf; + UINT64 send_buflen; + struct io_request *recv; + BYTE *recv_buf; + UINT64 *recv_buflen; +}; + enum winscard_funcs { unix_scard_establish_context, @@ -136,4 +153,5 @@ enum winscard_funcs unix_scard_disconnect, unix_scard_begin_transaction, unix_scard_end_transaction, + unix_scard_transmit, }; diff --git a/dlls/winscard/winscard.c b/dlls/winscard/winscard.c index a5b9cc75af5..7ef0a3fc9ba 100644 --- a/dlls/winscard/winscard.c +++ b/dlls/winscard/winscard.c @@ -786,6 +786,42 @@ LONG WINAPI SCardEndTransaction( SCARDHANDLE connect, DWORD disposition ) return ret; } +LONG WINAPI SCardTransmit( SCARDHANDLE connect, const SCARD_IO_REQUEST *send, const BYTE *send_buf, + DWORD send_buflen, SCARD_IO_REQUEST *recv, BYTE *recv_buf, DWORD *recv_buflen ) +{ + struct handle *handle = (struct handle *)connect; + struct scard_transmit_params params; + struct io_request send64 = { send->dwProtocol, send->cbPciLength }, recv64; + UINT64 recv_buflen64; + LONG ret; + + TRACE( "%Ix, %p, %p, %lu, %p, %p, %p\n", connect, send, send_buf, send_buflen, recv, recv_buf, recv_buflen ); + + if (!handle || handle->magic != CONNECT_MAGIC) return ERROR_INVALID_HANDLE; + if (!recv_buflen) return SCARD_E_INVALID_PARAMETER; + + params.handle = handle->unix_handle; + params.send = &send64; + params.send_buf = send_buf; + params.send_buflen = send_buflen; + params.recv = &recv64; + params.recv_buf = recv_buf; + recv_buflen64 = *recv_buflen; + params.recv_buflen = &recv_buflen64; + if (!(ret = UNIX_CALL( scard_transmit, &params ))) + { + if (recv) + { + recv->dwProtocol = recv64.protocol; + recv->cbPciLength = recv64.pci_len; + } + *recv_buflen = recv_buflen64; + } + + TRACE( "returning %#lx\n", ret ); + return ret; +} + BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, void *reserved ) { switch (reason) diff --git a/dlls/winscard/winscard.spec b/dlls/winscard/winscard.spec index 828df2416c9..6de6c9036dd 100644 --- a/dlls/winscard/winscard.spec +++ b/dlls/winscard/winscard.spec @@ -57,7 +57,7 @@ @ stub SCardState @ stdcall SCardStatusA(long str ptr ptr ptr ptr ptr) @ stdcall SCardStatusW(long wstr ptr ptr ptr ptr ptr) -@ stub SCardTransmit +@ stdcall SCardTransmit(long ptr ptr long ptr ptr ptr) @ extern g_rgSCardRawPci @ extern g_rgSCardT0Pci @ extern g_rgSCardT1Pci

1 0