February 2023 - Wine-Commits

Hans Leidekker : winscard: Implement SCardConnectA/W().
by Alexandre Julliard Feb. 22, 2023

Feb. 22, 2023

Module: wine Branch: master Commit: fd3ce00a220927863def999fd1ab2039d4b964cb URL: https://gitlab.winehq.org/wine/wine/-/commit/fd3ce00a220927863def999fd1ab20… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Feb 16 12:26:52 2023 +0100 winscard: Implement SCardConnectA/W(). --- dlls/winscard/unixlib.c | 9 +++++ dlls/winscard/unixlib.h | 11 ++++++ dlls/winscard/winscard.c | 85 +++++++++++++++++++++++++++++++++++++++++++++ dlls/winscard/winscard.spec | 4 +-- 4 files changed, 107 insertions(+), 2 deletions(-) diff --git a/dlls/winscard/unixlib.c b/dlls/winscard/unixlib.c index aa223382514..df852548805 100644 --- a/dlls/winscard/unixlib.c +++ b/dlls/winscard/unixlib.c @@ -38,6 +38,7 @@ LONG SCardGetStatusChange( UINT64, UINT64, struct reader_state *, UINT64 ); LONG SCardCancel( UINT64 ); LONG SCardListReaders( UINT64, const char *, char *, UINT64 * ); LONG SCardListReaderGroups( UINT64, char *, UINT64 * ); +LONG SCardConnect( UINT64, const char *, UINT64, UINT64, UINT64 *, UINT64 * ); static NTSTATUS scard_establish_context( void *args ) { @@ -81,6 +82,13 @@ static NTSTATUS scard_list_reader_groups( void *args ) return SCardListReaderGroups( params->handle, params->groups, params->groups_len ); } +static NTSTATUS scard_connect( void *args ) +{ + struct scard_connect_params *params = args; + return SCardConnect( params->context_handle, params->reader, params->share_mode, params->preferred_protocols, + params->connect_handle, params->protocol ); +} + const unixlib_entry_t __wine_unix_call_funcs[] = { scard_establish_context, @@ -90,4 +98,5 @@ const unixlib_entry_t __wine_unix_call_funcs[] = scard_cancel, scard_list_readers, scard_list_reader_groups, + scard_connect, }; diff --git a/dlls/winscard/unixlib.h b/dlls/winscard/unixlib.h index 05514d3f68b..d750c23f07b 100644 --- a/dlls/winscard/unixlib.h +++ b/dlls/winscard/unixlib.h @@ -74,6 +74,16 @@ struct scard_list_reader_groups_params UINT64 *groups_len; }; +struct scard_connect_params +{ + UINT64 context_handle; + const char *reader; + UINT64 share_mode; + UINT64 preferred_protocols; + UINT64 *connect_handle; + UINT64 *protocol; +}; + enum winscard_funcs { unix_scard_establish_context, @@ -83,4 +93,5 @@ enum winscard_funcs unix_scard_cancel, unix_scard_list_readers, unix_scard_list_reader_groups, + unix_scard_connect, }; diff --git a/dlls/winscard/winscard.c b/dlls/winscard/winscard.c index 92c621baed0..aff6012cb83 100644 --- a/dlls/winscard/winscard.c +++ b/dlls/winscard/winscard.c @@ -140,6 +140,7 @@ LONG WINAPI SCardAddReaderToGroupW(SCARDCONTEXT context, LPCWSTR reader, LPCWSTR } #define CONTEXT_MAGIC (('C' << 24) | ('T' << 16) | ('X' << 8) | '0') +#define CONNECT_MAGIC (('C' << 24) | ('O' << 16) | ('N' << 8) | '0') struct handle { DWORD magic; @@ -551,6 +552,90 @@ LONG WINAPI SCardGetStatusChangeW( SCARDCONTEXT context, DWORD timeout, SCARD_RE return ret; } +LONG WINAPI SCardConnectA( SCARDCONTEXT context, const char *reader, DWORD share_mode, DWORD preferred_protocols, + SCARDHANDLE *connect, DWORD *protocol ) +{ + struct handle *context_handle = (struct handle *)context, *connect_handle; + struct scard_connect_params params; + char *reader_utf8; + UINT64 protocol64; + LONG ret; + + TRACE( "%Ix, %s, %#lx, %#lx, %p, %p\n", context, debugstr_a(reader), share_mode, preferred_protocols, connect, + protocol ); + + if (!context_handle || context_handle->magic != CONTEXT_MAGIC) return ERROR_INVALID_HANDLE; + if (!connect) return SCARD_E_INVALID_PARAMETER; + + if (!(connect_handle = malloc( sizeof(*connect_handle) ))) return SCARD_E_NO_MEMORY; + connect_handle->magic = CONNECT_MAGIC; + + if (!(reader_utf8 = ansi_to_utf8( reader ))) + { + free( connect_handle ); + return SCARD_E_NO_MEMORY; + } + + params.context_handle = context_handle->unix_handle; + params.reader = reader_utf8; + params.share_mode = share_mode; + params.preferred_protocols = preferred_protocols; + params.connect_handle = &connect_handle->unix_handle; + params.protocol = &protocol64; + if ((ret = UNIX_CALL( scard_connect, &params ))) free( connect_handle ); + else + { + *connect = (SCARDHANDLE)connect_handle; + if (protocol) *protocol = protocol64; + } + + free( reader_utf8 ); + TRACE( "returning %#lx\n", ret ); + return ret; +} + +LONG WINAPI SCardConnectW( SCARDCONTEXT context, const WCHAR *reader, DWORD share_mode, DWORD preferred_protocols, + SCARDHANDLE *connect, DWORD *protocol ) +{ + struct handle *context_handle = (struct handle *)context, *connect_handle; + struct scard_connect_params params; + char *reader_utf8; + UINT64 protocol64; + LONG ret; + + TRACE( "%Ix, %s, %#lx, %#lx, %p, %p\n", context, debugstr_w(reader), share_mode, preferred_protocols, connect, + protocol ); + + if (!context_handle || context_handle->magic != CONTEXT_MAGIC) return ERROR_INVALID_HANDLE; + if (!connect) return SCARD_E_INVALID_PARAMETER; + + if (!(connect_handle = malloc( sizeof(*connect_handle) ))) return SCARD_E_NO_MEMORY; + connect_handle->magic = CONNECT_MAGIC; + + if (!(reader_utf8 = utf16_to_utf8( reader ))) + { + free( connect_handle ); + return SCARD_E_NO_MEMORY; + } + + params.context_handle = context_handle->unix_handle; + params.reader = reader_utf8; + params.share_mode = share_mode; + params.preferred_protocols = preferred_protocols; + params.connect_handle = &connect_handle->unix_handle; + params.protocol = &protocol64; + if ((ret = UNIX_CALL( scard_connect, &params ))) free( connect_handle ); + else + { + *connect = (SCARDHANDLE)connect_handle; + if (protocol) *protocol = protocol64; + } + + free( reader_utf8 ); + 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 6eb70ffa325..40db017a7d1 100644 --- a/dlls/winscard/winscard.spec +++ b/dlls/winscard/winscard.spec @@ -7,8 +7,8 @@ @ stdcall SCardAddReaderToGroupW(long wstr wstr) @ stub SCardBeginTransaction @ stdcall SCardCancel(long) -@ stub SCardConnectA -@ stub SCardConnectW +@ stdcall SCardConnectA(long str long long ptr ptr) +@ stdcall SCardConnectW(long wstr long long ptr ptr) @ stub SCardControl @ stub SCardDisconnect @ stub SCardEndTransaction

1 0

Hans Leidekker : winscard: Implement SCardStatusA/W().
by Alexandre Julliard Feb. 22, 2023

Feb. 22, 2023

Module: wine Branch: master Commit: 836974d4d8f506391b76e0d4e10cb4b14bbe56e7 URL: https://gitlab.winehq.org/wine/wine/-/commit/836974d4d8f506391b76e0d4e10cb4… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Feb 16 12:36:13 2023 +0100 winscard: Implement SCardStatusA/W(). --- dlls/winscard/unixlib.c | 9 +++++ dlls/winscard/unixlib.h | 12 +++++++ dlls/winscard/winscard.c | 90 +++++++++++++++++++++++++++++++++++++++++++----- 3 files changed, 103 insertions(+), 8 deletions(-) diff --git a/dlls/winscard/unixlib.c b/dlls/winscard/unixlib.c index df852548805..4f975ef40f9 100644 --- a/dlls/winscard/unixlib.c +++ b/dlls/winscard/unixlib.c @@ -39,6 +39,7 @@ LONG SCardCancel( UINT64 ); LONG SCardListReaders( UINT64, const char *, char *, UINT64 * ); LONG SCardListReaderGroups( UINT64, char *, UINT64 * ); LONG SCardConnect( UINT64, const char *, UINT64, UINT64, UINT64 *, UINT64 * ); +LONG SCardStatus( UINT64, char *, UINT64 *, UINT64 *, UINT64 *, BYTE *, UINT64 * ); static NTSTATUS scard_establish_context( void *args ) { @@ -89,6 +90,13 @@ static NTSTATUS scard_connect( void *args ) params->connect_handle, params->protocol ); } +static NTSTATUS scard_status( void *args ) +{ + struct scard_status_params *params = args; + return SCardStatus( params->handle, params->names, params->names_len, params->state, params->protocol, + params->atr, params->atr_len ); +} + const unixlib_entry_t __wine_unix_call_funcs[] = { scard_establish_context, @@ -99,4 +107,5 @@ const unixlib_entry_t __wine_unix_call_funcs[] = scard_list_readers, scard_list_reader_groups, scard_connect, + scard_status, }; diff --git a/dlls/winscard/unixlib.h b/dlls/winscard/unixlib.h index d750c23f07b..dd069efab58 100644 --- a/dlls/winscard/unixlib.h +++ b/dlls/winscard/unixlib.h @@ -84,6 +84,17 @@ struct scard_connect_params UINT64 *protocol; }; +struct scard_status_params +{ + UINT64 handle; + char *names; + UINT64 *names_len; + UINT64 *state; + UINT64 *protocol; + BYTE *atr; + UINT64 *atr_len; +}; + enum winscard_funcs { unix_scard_establish_context, @@ -94,4 +105,5 @@ enum winscard_funcs unix_scard_list_readers, unix_scard_list_reader_groups, unix_scard_connect, + unix_scard_status, }; diff --git a/dlls/winscard/winscard.c b/dlls/winscard/winscard.c index aff6012cb83..6cded4387f6 100644 --- a/dlls/winscard/winscard.c +++ b/dlls/winscard/winscard.c @@ -231,11 +231,48 @@ static LONG copy_multiszA( const char *src, char *dst, DWORD *dst_len ) return SCARD_S_SUCCESS; } -LONG WINAPI SCardStatusA(SCARDHANDLE context, LPSTR szReaderName, LPDWORD pcchReaderLen, LPDWORD pdwState, LPDWORD pdwProtocol, LPBYTE pbAtr, LPDWORD pcbAtrLen) +LONG WINAPI SCardStatusA( SCARDHANDLE connect, char *names, DWORD *names_len, DWORD *state, DWORD *protocol, + BYTE *atr, DWORD *atr_len ) { - FIXME("(%Ix) stub\n", context); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return SCARD_F_INTERNAL_ERROR; + struct handle *handle = (struct handle *)connect; + struct scard_status_params params; + UINT64 state64, protocol64, atr_len64, names_len_utf8 = 0; + LONG ret; + + TRACE( "%Ix, %p, %p, %p, %p, %p, %p\n", connect, names, names_len, state, protocol, atr, atr_len ); + + if (!handle || handle->magic != CONNECT_MAGIC) return ERROR_INVALID_HANDLE; + if ((names_len && *names_len == SCARD_AUTOALLOCATE) || (atr_len && *atr_len == SCARD_AUTOALLOCATE)) + { + FIXME( "SCARD_AUTOALLOCATE not supported\n" ); + return SCARD_F_INTERNAL_ERROR; + } + + params.handle = handle->unix_handle; + params.names = NULL; + params.names_len = &names_len_utf8; + params.state = &state64; + params.protocol = &protocol64; + params.atr = NULL; + if (!atr_len) params.atr_len = NULL; + else + { + atr_len64 = *atr_len; + params.atr_len = &atr_len64; + } + if ((ret = UNIX_CALL( scard_status, &params ))) return ret; + + if (!(params.names = malloc( names_len_utf8 ))) return SCARD_E_NO_MEMORY; + if (!(ret = UNIX_CALL( scard_status, &params )) && !(ret = copy_multiszA( params.names, names, names_len ))) + { + if (state) *state = state64; + if (protocol) *protocol = protocol64; + if (atr_len) *atr_len = atr_len64; + } + + free( params.names ); + TRACE( "returning %#lx\n", ret ); + return ret; } static LONG copy_multiszW( const char *src, WCHAR *dst, DWORD *dst_len ) @@ -259,11 +296,48 @@ static LONG copy_multiszW( const char *src, WCHAR *dst, DWORD *dst_len ) return SCARD_S_SUCCESS; } -LONG WINAPI SCardStatusW(SCARDHANDLE context, LPWSTR szReaderName, LPDWORD pcchReaderLen, LPDWORD pdwState,LPDWORD pdwProtocol,LPBYTE pbAtr,LPDWORD pcbArtLen) +LONG WINAPI SCardStatusW( SCARDHANDLE connect, WCHAR *names, DWORD *names_len, DWORD *state, DWORD *protocol, + BYTE *atr, DWORD *atr_len ) { - FIXME("(%Ix) stub\n", context); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return SCARD_F_INTERNAL_ERROR; + struct handle *handle = (struct handle *)connect; + struct scard_status_params params; + UINT64 state64, protocol64, atr_len64, names_len_utf8 = 0; + LONG ret; + + TRACE( "%Ix, %p, %p, %p, %p, %p, %p\n", connect, names, names_len, state, protocol, atr, atr_len ); + + if (!handle || handle->magic != CONNECT_MAGIC) return ERROR_INVALID_HANDLE; + if ((names_len && *names_len == SCARD_AUTOALLOCATE) || (atr_len && *atr_len == SCARD_AUTOALLOCATE)) + { + FIXME( "SCARD_AUTOALLOCATE not supported\n" ); + return SCARD_F_INTERNAL_ERROR; + } + + params.handle = handle->unix_handle; + params.names = NULL; + params.names_len = &names_len_utf8; + params.state = &state64; + params.protocol = &protocol64; + params.atr = atr; + if (!atr_len) params.atr_len = NULL; + else + { + atr_len64 = *atr_len; + params.atr_len = &atr_len64; + } + if ((ret = UNIX_CALL( scard_status, &params ))) return ret; + + if (!(params.names = malloc( names_len_utf8 ))) return SCARD_E_NO_MEMORY; + if (!(ret = UNIX_CALL( scard_status, &params )) && !(ret = copy_multiszW( params.names, names, names_len ))) + { + if (state) *state = state64; + if (protocol) *protocol = protocol64; + if (atr_len) *atr_len = atr_len64; + } + + free( params.names ); + TRACE( "returning %#lx\n", ret ); + return ret; } void WINAPI SCardReleaseStartedEvent(void)

1 0

Hans Leidekker : winscard: Implement SCardRe/Disconnect().
by Alexandre Julliard Feb. 22, 2023

Feb. 22, 2023

Module: wine Branch: master Commit: ba2010a02a7b6ee9403b4e7f3a074dac6f06ffed URL: https://gitlab.winehq.org/wine/wine/-/commit/ba2010a02a7b6ee9403b4e7f3a074d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Feb 16 12:43:43 2023 +0100 winscard: Implement SCardRe/Disconnect(). --- dlls/winscard/unixlib.c | 17 +++++++++++++++++ dlls/winscard/unixlib.h | 17 +++++++++++++++++ dlls/winscard/winscard.c | 43 +++++++++++++++++++++++++++++++++++++++++++ dlls/winscard/winscard.spec | 4 ++-- 4 files changed, 79 insertions(+), 2 deletions(-) diff --git a/dlls/winscard/unixlib.c b/dlls/winscard/unixlib.c index 4f975ef40f9..c9afe13d796 100644 --- a/dlls/winscard/unixlib.c +++ b/dlls/winscard/unixlib.c @@ -40,6 +40,8 @@ LONG SCardListReaders( UINT64, const char *, char *, UINT64 * ); LONG SCardListReaderGroups( UINT64, char *, UINT64 * ); LONG SCardConnect( UINT64, const char *, UINT64, UINT64, UINT64 *, UINT64 * ); LONG SCardStatus( UINT64, char *, UINT64 *, UINT64 *, UINT64 *, BYTE *, UINT64 * ); +LONG SCardDisconnect( UINT64, UINT64 ); +LONG SCardReconnect( UINT64, UINT64, UINT64, UINT64, UINT64 * ); static NTSTATUS scard_establish_context( void *args ) { @@ -97,6 +99,19 @@ static NTSTATUS scard_status( void *args ) params->atr, params->atr_len ); } +static NTSTATUS scard_reconnect( void *args ) +{ + struct scard_reconnect_params *params = args; + return SCardReconnect( params->handle, params->share_mode, params->preferred_protocols, + params->initialization, params->protocol ); +} + +static NTSTATUS scard_disconnect( void *args ) +{ + struct scard_disconnect_params *params = args; + return SCardDisconnect( params->handle, params->disposition ); +} + const unixlib_entry_t __wine_unix_call_funcs[] = { scard_establish_context, @@ -108,4 +123,6 @@ const unixlib_entry_t __wine_unix_call_funcs[] = scard_list_reader_groups, scard_connect, scard_status, + scard_reconnect, + scard_disconnect, }; diff --git a/dlls/winscard/unixlib.h b/dlls/winscard/unixlib.h index dd069efab58..2c7007a1f12 100644 --- a/dlls/winscard/unixlib.h +++ b/dlls/winscard/unixlib.h @@ -95,6 +95,21 @@ struct scard_status_params UINT64 *atr_len; }; +struct scard_reconnect_params +{ + UINT64 handle; + UINT64 share_mode; + UINT64 preferred_protocols; + UINT64 initialization; + UINT64 *protocol; +}; + +struct scard_disconnect_params +{ + UINT64 handle; + UINT64 disposition; +}; + enum winscard_funcs { unix_scard_establish_context, @@ -106,4 +121,6 @@ enum winscard_funcs unix_scard_list_reader_groups, unix_scard_connect, unix_scard_status, + unix_scard_reconnect, + unix_scard_disconnect, }; diff --git a/dlls/winscard/winscard.c b/dlls/winscard/winscard.c index 6cded4387f6..d6bf81ecbc0 100644 --- a/dlls/winscard/winscard.c +++ b/dlls/winscard/winscard.c @@ -710,6 +710,49 @@ LONG WINAPI SCardConnectW( SCARDCONTEXT context, const WCHAR *reader, DWORD shar return ret; } +LONG WINAPI SCardReconnect( SCARDHANDLE connect, DWORD share_mode, DWORD preferred_protocols, DWORD initalization, + DWORD *protocol ) +{ + struct handle *handle = (struct handle *)connect; + struct scard_reconnect_params params; + UINT64 protocol64; + LONG ret; + + TRACE( "%Ix, %#lx, %#lx, %#lx, %p\n", connect, share_mode, preferred_protocols, initalization, protocol ); + + if (!handle || handle->magic != CONNECT_MAGIC) return ERROR_INVALID_HANDLE; + + params.handle = handle->unix_handle; + params.share_mode = share_mode; + params.preferred_protocols = preferred_protocols; + params.initialization = initalization; + params.protocol = &protocol64; + if (!(ret = UNIX_CALL( scard_reconnect, &params )) && protocol) *protocol = protocol64; + TRACE( "returning %#lx\n", ret ); + return ret; +} + +LONG WINAPI SCardDisconnect( SCARDHANDLE connect, DWORD disposition ) +{ + struct handle *handle = (struct handle *)connect; + struct scard_disconnect_params params; + LONG ret; + + TRACE( "%Ix, %#lx\n", connect, disposition ); + + if (!handle || handle->magic != CONNECT_MAGIC) return ERROR_INVALID_HANDLE; + + params.handle = handle->unix_handle; + params.disposition = disposition; + if (!(ret = UNIX_CALL( scard_disconnect, &params ))) + { + handle->magic = 0; + free( handle ); + } + 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 40db017a7d1..c9f903ed483 100644 --- a/dlls/winscard/winscard.spec +++ b/dlls/winscard/winscard.spec @@ -10,7 +10,7 @@ @ stdcall SCardConnectA(long str long long ptr ptr) @ stdcall SCardConnectW(long wstr long long ptr ptr) @ stub SCardControl -@ stub SCardDisconnect +@ stdcall SCardDisconnect(long long) @ stub SCardEndTransaction @ stdcall SCardEstablishContext(long ptr ptr ptr) @ stub SCardForgetCardTypeA @@ -46,7 +46,7 @@ @ stub SCardLocateCardsByATRA @ stub SCardLocateCardsByATRW @ stub SCardLocateCardsW -@ stub SCardReconnect +@ stdcall SCardReconnect(long long long long ptr) @ stdcall SCardReleaseContext(long) @ stdcall SCardReleaseStartedEvent() @ stub SCardRemoveReaderFromGroupA

1 0

Hans Leidekker : winscard: Implement SCardListReaderGroupsA/W().
by Alexandre Julliard Feb. 22, 2023

Feb. 22, 2023

Module: wine Branch: master Commit: abb7f7500235db362376634256490fbdd391cd00 URL: https://gitlab.winehq.org/wine/wine/-/commit/abb7f7500235db362376634256490f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Feb 16 12:13:48 2023 +0100 winscard: Implement SCardListReaderGroupsA/W(). --- dlls/winscard/unixlib.c | 8 ++++++ dlls/winscard/unixlib.h | 8 ++++++ dlls/winscard/winscard.c | 69 +++++++++++++++++++++++++++++++++++++++++++++ dlls/winscard/winscard.spec | 4 +-- 4 files changed, 87 insertions(+), 2 deletions(-) diff --git a/dlls/winscard/unixlib.c b/dlls/winscard/unixlib.c index 61f179b2eb9..aa223382514 100644 --- a/dlls/winscard/unixlib.c +++ b/dlls/winscard/unixlib.c @@ -37,6 +37,7 @@ LONG SCardIsValidContext( UINT64 ); LONG SCardGetStatusChange( UINT64, UINT64, struct reader_state *, UINT64 ); LONG SCardCancel( UINT64 ); LONG SCardListReaders( UINT64, const char *, char *, UINT64 * ); +LONG SCardListReaderGroups( UINT64, char *, UINT64 * ); static NTSTATUS scard_establish_context( void *args ) { @@ -74,6 +75,12 @@ static NTSTATUS scard_list_readers( void *args ) return SCardListReaders( params->handle, params->groups, params->readers, params->readers_len ); } +static NTSTATUS scard_list_reader_groups( void *args ) +{ + struct scard_list_reader_groups_params *params = args; + return SCardListReaderGroups( params->handle, params->groups, params->groups_len ); +} + const unixlib_entry_t __wine_unix_call_funcs[] = { scard_establish_context, @@ -82,4 +89,5 @@ const unixlib_entry_t __wine_unix_call_funcs[] = scard_get_status_change, scard_cancel, scard_list_readers, + scard_list_reader_groups, }; diff --git a/dlls/winscard/unixlib.h b/dlls/winscard/unixlib.h index 1be9fe7cf77..05514d3f68b 100644 --- a/dlls/winscard/unixlib.h +++ b/dlls/winscard/unixlib.h @@ -67,6 +67,13 @@ struct scard_list_readers_params UINT64 *readers_len; }; +struct scard_list_reader_groups_params +{ + UINT64 handle; + char *groups; + UINT64 *groups_len; +}; + enum winscard_funcs { unix_scard_establish_context, @@ -75,4 +82,5 @@ enum winscard_funcs unix_scard_get_status_change, unix_scard_cancel, unix_scard_list_readers, + unix_scard_list_reader_groups, }; diff --git a/dlls/winscard/winscard.c b/dlls/winscard/winscard.c index a242de9ccce..92c621baed0 100644 --- a/dlls/winscard/winscard.c +++ b/dlls/winscard/winscard.c @@ -369,6 +369,75 @@ LONG WINAPI SCardCancel( SCARDCONTEXT context ) return ret; } +LONG WINAPI SCardListReaderGroupsA( SCARDCONTEXT context, char *groups, DWORD *groups_len ) +{ + struct handle *handle = (struct handle *)context; + struct scard_list_reader_groups_params params; + UINT64 groups_len_utf8; + LONG ret; + + TRACE( "%Ix, %p, %p\n", context, groups, groups_len ); + + if (!handle || handle->magic != CONTEXT_MAGIC) return ERROR_INVALID_HANDLE; + if (!groups_len) return SCARD_E_INVALID_PARAMETER; + if (*groups_len == SCARD_AUTOALLOCATE) + { + FIXME( "SCARD_AUTOALLOCATE not supported\n" ); + return SCARD_F_INTERNAL_ERROR; + } + + params.handle = handle->unix_handle; + params.groups = NULL; + params.groups_len = &groups_len_utf8; + if ((ret = UNIX_CALL( scard_list_reader_groups, &params ))) goto done; + + params.handle = handle->unix_handle; + if (!(params.groups = malloc( groups_len_utf8 ))) return SCARD_E_NO_MEMORY; + if (!(ret = UNIX_CALL( scard_list_reader_groups, &params ))) + { + ret = copy_multiszA( params.groups, groups, groups_len ); + } + +done: + free( params.groups ); + TRACE( "returning %#lx\n", ret ); + return ret; +} + +LONG WINAPI SCardListReaderGroupsW( SCARDCONTEXT context, WCHAR *groups, DWORD *groups_len ) +{ + struct handle *handle = (struct handle *)context; + struct scard_list_reader_groups_params params; + UINT64 groups_len_utf8; + LONG ret; + + TRACE( "%Ix, %p, %p\n", context, groups, groups_len ); + + if (!handle || handle->magic != CONTEXT_MAGIC) return ERROR_INVALID_HANDLE; + if (!groups_len) return SCARD_E_INVALID_PARAMETER; + if (*groups_len == SCARD_AUTOALLOCATE) + { + FIXME( "SCARD_AUTOALLOCATE not supported\n" ); + return SCARD_F_INTERNAL_ERROR; + } + + params.handle = handle->unix_handle; + params.groups = NULL; + params.groups_len = &groups_len_utf8; + if ((ret = UNIX_CALL( scard_list_reader_groups, &params ))) goto done; + + if (!(params.groups = malloc( groups_len_utf8 ))) return SCARD_E_NO_MEMORY; + if (!(ret = UNIX_CALL( scard_list_reader_groups, &params ))) + { + ret = copy_multiszW( params.groups, groups, groups_len ); + } + +done: + TRACE( "returning %#lx\n", ret ); + free( params.groups ); + return ret; +} + static LONG map_states_inA( const SCARD_READERSTATEA *src, struct reader_state *dst, DWORD count ) { DWORD i; diff --git a/dlls/winscard/winscard.spec b/dlls/winscard/winscard.spec index ff320bae424..6eb70ffa325 100644 --- a/dlls/winscard/winscard.spec +++ b/dlls/winscard/winscard.spec @@ -38,8 +38,8 @@ @ stub SCardListCardsW @ stub SCardListInterfacesA @ stub SCardListInterfacesW -@ stub SCardListReaderGroupsA -@ stub SCardListReaderGroupsW +@ stdcall SCardListReaderGroupsA(long ptr ptr) +@ stdcall SCardListReaderGroupsW(long ptr ptr) @ stdcall SCardListReadersA(long str ptr ptr) @ stdcall SCardListReadersW(long wstr ptr ptr) @ stub SCardLocateCardsA

1 0

Hans Leidekker : include: Add missing smart card defines.
by Alexandre Julliard Feb. 22, 2023

Feb. 22, 2023

Module: wine Branch: master Commit: 210596600c60f29137d8cebda74891c3cd7dd03b URL: https://gitlab.winehq.org/wine/wine/-/commit/210596600c60f29137d8cebda74891… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Feb 16 09:28:02 2023 +0100 include: Add missing smart card defines. --- include/winscard.h | 9 +++++++++ include/winsmcrd.h | 26 ++++++++++++++++++++++++++ 2 files changed, 35 insertions(+) diff --git a/include/winscard.h b/include/winscard.h index 5aee1b3e548..0ce473b6bf1 100644 --- a/include/winscard.h +++ b/include/winscard.h @@ -85,6 +85,15 @@ DECL_WINELIB_TYPE_AW(LPSCARD_READERSTATE) #define SCARD_STATE_MUTE 0x00000200 #define SCARD_STATE_UNPOWERED 0x00000400 +#define SCARD_SHARE_EXCLUSIVE 1 +#define SCARD_SHARE_SHARED 2 +#define SCARD_SHARE_DIRECT 3 + +#define SCARD_LEAVE_CARD 0 +#define SCARD_RESET_CARD 1 +#define SCARD_UNPOWER_CARD 2 +#define SCARD_EJECT_CARD 3 + #ifdef __cplusplus extern "C" { #endif diff --git a/include/winsmcrd.h b/include/winsmcrd.h index 60fdd3e492c..15c427c48da 100644 --- a/include/winsmcrd.h +++ b/include/winsmcrd.h @@ -27,6 +27,32 @@ #define SCARD_PROTOCOL_DEFAULT 0x80000000 #define SCARD_PROTOCOL_Tx (SCARD_PROTOCOL_T0 | SCARD_PROTOCOL_T1) +#define SCARD_UNKNOWN 0 +#define SCARD_ABSENT 1 +#define SCARD_PRESENT 2 +#define SCARD_SWALLOWED 3 +#define SCARD_POWERED 4 +#define SCARD_NEGOTIABLE 5 +#define SCARD_SPECIFIC 6 + +#define SCARD_ATTR_VALUE(class, tag) ((((ULONG)(class)) << 16) | ((ULONG)(tag))) + +#define SCARD_CLASS_VENDOR_INFO 1 +#define SCARD_CLASS_COMMUNICATIONS 2 +#define SCARD_CLASS_PROTOCOL 3 +#define SCARD_CLASS_POWER_MGMT 4 +#define SCARD_CLASS_SECURITY 5 +#define SCARD_CLASS_MECHANICAL 6 +#define SCARD_CLASS_VENDOR_DEFINED 7 +#define SCARD_CLASS_IFD_PROTOCOL 8 +#define SCARD_CLASS_ICC_STATE 9 +#define SCARD_CLASS_PERF 0x7ffe +#define SCARD_CLASS_SYSTEM 0x7fff + +#define SCARD_ATTR_VENDOR_NAME SCARD_ATTR_VALUE(SCARD_CLASS_VENDOR_INFO, 0x0100) + +#define SCARD_CTL_CODE(code) CTL_CODE(FILE_DEVICE_SMARTCARD, (code), METHOD_BUFFERED, FILE_ANY_ACCESS) + typedef struct _SCARD_IO_REQUEST { DWORD dwProtocol;

1 0

Hans Leidekker : winscard: Implement SCardGetStatusChangeA/W().
by Alexandre Julliard Feb. 22, 2023

Feb. 22, 2023

Module: wine Branch: master Commit: 3f325721c3b1d72dca475dc1fa2ad4063f663f69 URL: https://gitlab.winehq.org/wine/wine/-/commit/3f325721c3b1d72dca475dc1fa2ad4… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Feb 16 10:50:32 2023 +0100 winscard: Implement SCardGetStatusChangeA/W(). --- dlls/winscard/unixlib.c | 8 +++ dlls/winscard/unixlib.h | 20 ++++++ dlls/winscard/winscard.c | 147 ++++++++++++++++++++++++++++++++++++++++++++ dlls/winscard/winscard.spec | 4 +- 4 files changed, 177 insertions(+), 2 deletions(-) diff --git a/dlls/winscard/unixlib.c b/dlls/winscard/unixlib.c index 032b148af8f..98de78a6d2b 100644 --- a/dlls/winscard/unixlib.c +++ b/dlls/winscard/unixlib.c @@ -34,6 +34,7 @@ LONG SCardEstablishContext( UINT64, const void *, const void *, UINT64 * ); LONG SCardReleaseContext( UINT64 ); LONG SCardIsValidContext( UINT64 ); +LONG SCardGetStatusChange( UINT64, UINT64, struct reader_state *, UINT64 ); static NTSTATUS scard_establish_context( void *args ) { @@ -53,9 +54,16 @@ static NTSTATUS scard_is_valid_context( void *args ) return SCardIsValidContext( params->handle ); } +static NTSTATUS scard_get_status_change( void *args ) +{ + struct scard_get_status_change_params *params = args; + return SCardGetStatusChange( params->handle, params->timeout, params->states, params->count ); +} + const unixlib_entry_t __wine_unix_call_funcs[] = { scard_establish_context, scard_release_context, scard_is_valid_context, + scard_get_status_change, }; diff --git a/dlls/winscard/unixlib.h b/dlls/winscard/unixlib.h index b8ba940f5b2..0607596bf2c 100644 --- a/dlls/winscard/unixlib.h +++ b/dlls/winscard/unixlib.h @@ -35,9 +35,29 @@ struct scard_is_valid_context_params UINT64 handle; }; +#define MAX_ATR_SIZE 33 +struct reader_state +{ + UINT64 reader; + UINT64 userdata; + UINT64 current_state; + UINT64 event_state; + UINT64 atr_size; + unsigned char atr[MAX_ATR_SIZE]; +}; + +struct scard_get_status_change_params +{ + UINT64 handle; + UINT64 timeout; + struct reader_state *states; + UINT64 count; +}; + enum winscard_funcs { unix_scard_establish_context, unix_scard_release_context, unix_scard_is_valid_context, + unix_scard_get_status_change, }; diff --git a/dlls/winscard/winscard.c b/dlls/winscard/winscard.c index 4f4cbcfed2f..3fefff5f755 100644 --- a/dlls/winscard/winscard.c +++ b/dlls/winscard/winscard.c @@ -37,6 +37,40 @@ const SCARD_IO_REQUEST g_rgSCardT0Pci = { SCARD_PROTOCOL_T0, 8 }; const SCARD_IO_REQUEST g_rgSCardT1Pci = { SCARD_PROTOCOL_T1, 8 }; const SCARD_IO_REQUEST g_rgSCardRawPci = { SCARD_PROTOCOL_RAW, 8 }; +static inline char *utf16_to_utf8( const WCHAR *src ) +{ + char *dst = NULL; + if (src) + { + int len = WideCharToMultiByte( CP_UTF8, 0, src, -1, NULL, 0, NULL, NULL ); + if ((dst = malloc( len ))) WideCharToMultiByte( CP_UTF8, 0, src, -1, dst, len, NULL, NULL ); + } + return dst; +} + +static inline WCHAR *ansi_to_utf16( const char *src ) +{ + WCHAR *dst = NULL; + if (src) + { + int len = MultiByteToWideChar( CP_ACP, 0, src, -1, NULL, 0 ); + if ((dst = malloc( len * sizeof(WCHAR) ))) MultiByteToWideChar( CP_ACP, 0, src, -1, dst, len ); + } + return dst; +} + +static inline char *ansi_to_utf8( const char *src ) +{ + char *dst = NULL; + if (src) + { + WCHAR *tmp; + if ((tmp = ansi_to_utf16( src ))) dst = utf16_to_utf8( tmp ); + free( tmp ); + } + return dst; +} + HANDLE WINAPI SCardAccessStartedEvent(void) { return g_startedEvent; @@ -174,6 +208,119 @@ LONG WINAPI SCardCancel(SCARDCONTEXT context) return SCARD_F_INTERNAL_ERROR; } +static LONG map_states_inA( const SCARD_READERSTATEA *src, struct reader_state *dst, DWORD count ) +{ + DWORD i; + for (i = 0; i < count; i++) + { + if (src[i].szReader && !(dst[i].reader = (UINT64)(ULONG_PTR)ansi_to_utf8( src[i].szReader ))) + return SCARD_E_NO_MEMORY; + dst[i].current_state = src[i].dwCurrentState; + dst[i].event_state = src[i].dwEventState; + dst[i].atr_size = src[i].cbAtr; + memcpy( dst[i].atr, src[i].rgbAtr, src[i].cbAtr ); + } + return SCARD_S_SUCCESS; +} + +static void map_states_out( const struct reader_state *src, SCARD_READERSTATEA *dst, DWORD count ) +{ + DWORD i; + for (i = 0; i < count; i++) + { + dst[i].dwCurrentState = src[i].current_state; + dst[i].dwEventState = src[i].event_state; + dst[i].cbAtr = src[i].atr_size; + memcpy( dst[i].rgbAtr, src[i].atr, src[i].atr_size ); + } +} + +static void free_states( struct reader_state *states, DWORD count ) +{ + DWORD i; + for (i = 0; i < count; i++) free( (void *)(ULONG_PTR)states[i].reader ); + free( states ); +} + +LONG WINAPI SCardGetStatusChangeA( SCARDCONTEXT context, DWORD timeout, SCARD_READERSTATEA *states, DWORD count ) +{ + struct handle *handle = (struct handle *)context; + struct scard_get_status_change_params params; + struct reader_state *states_utf8 = NULL; + LONG ret; + + TRACE( "%Ix, %lu, %p, %lu\n", context, timeout, states, count ); + + if (!handle || handle->magic != CONTEXT_MAGIC) return ERROR_INVALID_HANDLE; + + if (!(states_utf8 = calloc( count, sizeof(*states_utf8) ))) return SCARD_E_NO_MEMORY; + if ((ret = map_states_inA( states, states_utf8, count ))) + { + free_states( states_utf8, count ); + return ret; + } + + params.handle = handle->unix_handle; + params.timeout = timeout; + params.states = states_utf8; + params.count = count; + if (!(ret = UNIX_CALL( scard_get_status_change, &params )) && states) + { + map_states_out( states_utf8, states, count ); + } + + free_states( states_utf8, count ); + TRACE( "returning %#lx\n", ret ); + return ret; +} + +static LONG map_states_inW( SCARD_READERSTATEW *src, struct reader_state *dst, DWORD count ) +{ + DWORD i; + for (i = 0; i < count; i++) + { + if (src[i].szReader && !(dst[i].reader = (UINT64)(ULONG_PTR)utf16_to_utf8( src[i].szReader ))) + return SCARD_E_NO_MEMORY; + dst[i].current_state = src[i].dwCurrentState; + dst[i].event_state = src[i].dwEventState; + dst[i].atr_size = src[i].cbAtr; + memcpy( dst[i].atr, src[i].rgbAtr, src[i].cbAtr ); + } + return SCARD_S_SUCCESS; +} + +LONG WINAPI SCardGetStatusChangeW( SCARDCONTEXT context, DWORD timeout, SCARD_READERSTATEW *states, DWORD count ) +{ + struct handle *handle = (struct handle *)context; + struct scard_get_status_change_params params; + struct reader_state *states_utf8; + LONG ret; + + TRACE( "%Ix, %lu, %p, %lu\n", context, timeout, states, count ); + + if (!handle || handle->magic != CONTEXT_MAGIC) return ERROR_INVALID_HANDLE; + + if (!(states_utf8 = calloc( count, sizeof(*states_utf8) ))) return SCARD_E_NO_MEMORY; + if ((ret = map_states_inW( states, states_utf8, count ))) + { + free_states( states_utf8, count ); + return ret; + } + + params.handle = handle->unix_handle; + params.timeout = timeout; + params.states = states_utf8; + params.count = count; + if (!(ret = UNIX_CALL( scard_get_status_change, &params ))) + { + map_states_out( states_utf8, (SCARD_READERSTATEA *)states, count ); + } + + free_states( states_utf8, count ); + 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 037d3bef903..ff320bae424 100644 --- a/dlls/winscard/winscard.spec +++ b/dlls/winscard/winscard.spec @@ -25,8 +25,8 @@ @ stub SCardGetCardTypeProviderNameW @ stub SCardGetProviderIdA @ stub SCardGetProviderIdW -@ stub SCardGetStatusChangeA -@ stub SCardGetStatusChangeW +@ stdcall SCardGetStatusChangeA(long long ptr long) +@ stdcall SCardGetStatusChangeW(long long ptr long) @ stub SCardIntroduceCardTypeA @ stub SCardIntroduceCardTypeW @ stub SCardIntroduceReaderA

1 0

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

Feb. 22, 2023

Module: wine Branch: master Commit: 9d40ac4635989f76b16384f15f01220fdec4d51a URL: https://gitlab.winehq.org/wine/wine/-/commit/9d40ac4635989f76b16384f15f0122… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Feb 16 10:27:22 2023 +0100 winscard: Implement SCardIsValidContext(). --- dlls/winscard/unixlib.c | 8 ++++++++ dlls/winscard/unixlib.h | 6 ++++++ dlls/winscard/winscard.c | 17 +++++++++++++---- 3 files changed, 27 insertions(+), 4 deletions(-) diff --git a/dlls/winscard/unixlib.c b/dlls/winscard/unixlib.c index 76f2d5cd60b..032b148af8f 100644 --- a/dlls/winscard/unixlib.c +++ b/dlls/winscard/unixlib.c @@ -33,6 +33,7 @@ LONG SCardEstablishContext( UINT64, const void *, const void *, UINT64 * ); LONG SCardReleaseContext( UINT64 ); +LONG SCardIsValidContext( UINT64 ); static NTSTATUS scard_establish_context( void *args ) { @@ -46,8 +47,15 @@ static NTSTATUS scard_release_context( void *args ) return SCardReleaseContext( params->handle ); } +static NTSTATUS scard_is_valid_context( void *args ) +{ + struct scard_is_valid_context_params *params = args; + return SCardIsValidContext( params->handle ); +} + const unixlib_entry_t __wine_unix_call_funcs[] = { scard_establish_context, scard_release_context, + scard_is_valid_context, }; diff --git a/dlls/winscard/unixlib.h b/dlls/winscard/unixlib.h index 08b907f76fe..b8ba940f5b2 100644 --- a/dlls/winscard/unixlib.h +++ b/dlls/winscard/unixlib.h @@ -30,8 +30,14 @@ struct scard_release_context_params UINT64 handle; }; +struct scard_is_valid_context_params +{ + UINT64 handle; +}; + enum winscard_funcs { unix_scard_establish_context, unix_scard_release_context, + unix_scard_is_valid_context, }; diff --git a/dlls/winscard/winscard.c b/dlls/winscard/winscard.c index 0f7edb56c91..4f4cbcfed2f 100644 --- a/dlls/winscard/winscard.c +++ b/dlls/winscard/winscard.c @@ -94,11 +94,20 @@ LONG WINAPI SCardEstablishContext( DWORD scope, const void *reserved1, const voi return ret; } -LONG WINAPI SCardIsValidContext(SCARDCONTEXT context) +LONG WINAPI SCardIsValidContext( SCARDCONTEXT context ) { - FIXME("(%Ix) stub\n", context); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return SCARD_F_INTERNAL_ERROR; + struct handle *handle = (struct handle *)context; + struct scard_is_valid_context_params params; + LONG ret; + + TRACE( "%Ix\n", context ); + + if (!handle || handle->magic != CONTEXT_MAGIC) return ERROR_INVALID_HANDLE; + + params.handle = handle->unix_handle; + ret = UNIX_CALL( scard_is_valid_context, &params ); + TRACE( "returning %#lx\n", ret ); + return ret; } LONG WINAPI SCardListCardsA(SCARDCONTEXT hContext, LPCBYTE pbAtr, LPCGUID rgguidInterfaces, DWORD cguidInterfaceCount, LPSTR mszCards, LPDWORD pcchCards)

1 0

Hans Leidekker : winscard: Implement SCardEstablish/ReleaseContext() on top of libpcsclite.
by Alexandre Julliard Feb. 22, 2023

Feb. 22, 2023

Module: wine Branch: master Commit: 8490c43f38e306fef7b5fed3ffcb256efd73af58 URL: https://gitlab.winehq.org/wine/wine/-/commit/8490c43f38e306fef7b5fed3ffcb25… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Feb 16 09:56:12 2023 +0100 winscard: Implement SCardEstablish/ReleaseContext() on top of libpcsclite. --- configure | 74 +++++++++++++++++++++++++++++++-- configure.ac | 10 +++++ dlls/winscard/Makefile.in | 3 ++ dlls/winscard/unixlib.c | 53 ++++++++++++++++++++++++ dlls/winscard/unixlib.h | 37 +++++++++++++++++ dlls/winscard/winscard.c | 103 ++++++++++++++++++++++++++++++++-------------- 6 files changed, 244 insertions(+), 36 deletions(-)

1 0

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

Feb. 22, 2023

Module: wine Branch: master Commit: 4295b90ce15560823205e3f4e53e1d83ab4d8536 URL: https://gitlab.winehq.org/wine/wine/-/commit/4295b90ce15560823205e3f4e53e1d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Feb 16 11:47:45 2023 +0100 winscard: Implement SCardCancel(). --- dlls/winscard/unixlib.c | 8 ++++++++ dlls/winscard/unixlib.h | 6 ++++++ dlls/winscard/winscard.c | 17 +++++++++++++---- 3 files changed, 27 insertions(+), 4 deletions(-) diff --git a/dlls/winscard/unixlib.c b/dlls/winscard/unixlib.c index 98de78a6d2b..6aca020cd4e 100644 --- a/dlls/winscard/unixlib.c +++ b/dlls/winscard/unixlib.c @@ -35,6 +35,7 @@ LONG SCardEstablishContext( UINT64, const void *, const void *, UINT64 * ); LONG SCardReleaseContext( UINT64 ); LONG SCardIsValidContext( UINT64 ); LONG SCardGetStatusChange( UINT64, UINT64, struct reader_state *, UINT64 ); +LONG SCardCancel( UINT64 ); static NTSTATUS scard_establish_context( void *args ) { @@ -60,10 +61,17 @@ static NTSTATUS scard_get_status_change( void *args ) return SCardGetStatusChange( params->handle, params->timeout, params->states, params->count ); } +static NTSTATUS scard_cancel( void *args ) +{ + struct scard_cancel_params *params = args; + return SCardCancel( params->handle ); +} + const unixlib_entry_t __wine_unix_call_funcs[] = { scard_establish_context, scard_release_context, scard_is_valid_context, scard_get_status_change, + scard_cancel, }; diff --git a/dlls/winscard/unixlib.h b/dlls/winscard/unixlib.h index 0607596bf2c..c2151a7573e 100644 --- a/dlls/winscard/unixlib.h +++ b/dlls/winscard/unixlib.h @@ -54,10 +54,16 @@ struct scard_get_status_change_params UINT64 count; }; +struct scard_cancel_params +{ + UINT64 handle; +}; + enum winscard_funcs { unix_scard_establish_context, unix_scard_release_context, unix_scard_is_valid_context, unix_scard_get_status_change, + unix_scard_cancel, }; diff --git a/dlls/winscard/winscard.c b/dlls/winscard/winscard.c index 3fefff5f755..af822b8aef2 100644 --- a/dlls/winscard/winscard.c +++ b/dlls/winscard/winscard.c @@ -201,11 +201,20 @@ LONG WINAPI SCardListReadersW(SCARDCONTEXT context, const WCHAR *groups, WCHAR * return SCARD_E_NO_READERS_AVAILABLE; } -LONG WINAPI SCardCancel(SCARDCONTEXT context) +LONG WINAPI SCardCancel( SCARDCONTEXT context ) { - FIXME("(%Ix) stub\n", context); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return SCARD_F_INTERNAL_ERROR; + struct handle *handle = (struct handle *)context; + struct scard_cancel_params params; + LONG ret; + + TRACE( "%Ix\n", context ); + + if (!handle || handle->magic != CONTEXT_MAGIC) return ERROR_INVALID_HANDLE; + + params.handle = handle->unix_handle; + ret = UNIX_CALL( scard_cancel, &params ); + TRACE( "returning %#lx\n", ret ); + return ret; } static LONG map_states_inA( const SCARD_READERSTATEA *src, struct reader_state *dst, DWORD count )

1 0

Hans Leidekker : winscard: Implement SCardListReadersA/W().
by Alexandre Julliard Feb. 22, 2023

Feb. 22, 2023

Module: wine Branch: master Commit: f7c66e642ea83d40fb6306e010ba57257b8d344c URL: https://gitlab.winehq.org/wine/wine/-/commit/f7c66e642ea83d40fb6306e010ba57… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Feb 16 12:01:43 2023 +0100 winscard: Implement SCardListReadersA/W(). --- dlls/winscard/unixlib.c | 8 +++ dlls/winscard/unixlib.h | 9 +++ dlls/winscard/winscard.c | 164 +++++++++++++++++++++++++++++++++++++++++++++-- 3 files changed, 175 insertions(+), 6 deletions(-) diff --git a/dlls/winscard/unixlib.c b/dlls/winscard/unixlib.c index 6aca020cd4e..61f179b2eb9 100644 --- a/dlls/winscard/unixlib.c +++ b/dlls/winscard/unixlib.c @@ -36,6 +36,7 @@ LONG SCardReleaseContext( UINT64 ); LONG SCardIsValidContext( UINT64 ); LONG SCardGetStatusChange( UINT64, UINT64, struct reader_state *, UINT64 ); LONG SCardCancel( UINT64 ); +LONG SCardListReaders( UINT64, const char *, char *, UINT64 * ); static NTSTATUS scard_establish_context( void *args ) { @@ -67,6 +68,12 @@ static NTSTATUS scard_cancel( void *args ) return SCardCancel( params->handle ); } +static NTSTATUS scard_list_readers( void *args ) +{ + struct scard_list_readers_params *params = args; + return SCardListReaders( params->handle, params->groups, params->readers, params->readers_len ); +} + const unixlib_entry_t __wine_unix_call_funcs[] = { scard_establish_context, @@ -74,4 +81,5 @@ const unixlib_entry_t __wine_unix_call_funcs[] = scard_is_valid_context, scard_get_status_change, scard_cancel, + scard_list_readers, }; diff --git a/dlls/winscard/unixlib.h b/dlls/winscard/unixlib.h index c2151a7573e..1be9fe7cf77 100644 --- a/dlls/winscard/unixlib.h +++ b/dlls/winscard/unixlib.h @@ -59,6 +59,14 @@ struct scard_cancel_params UINT64 handle; }; +struct scard_list_readers_params +{ + UINT64 handle; + const char *groups; + char *readers; + UINT64 *readers_len; +}; + enum winscard_funcs { unix_scard_establish_context, @@ -66,4 +74,5 @@ enum winscard_funcs unix_scard_is_valid_context, unix_scard_get_status_change, unix_scard_cancel, + unix_scard_list_readers, }; diff --git a/dlls/winscard/winscard.c b/dlls/winscard/winscard.c index af822b8aef2..a242de9ccce 100644 --- a/dlls/winscard/winscard.c +++ b/dlls/winscard/winscard.c @@ -71,6 +71,45 @@ static inline char *ansi_to_utf8( const char *src ) return dst; } +static inline WCHAR *utf8_to_utf16( const char *src ) +{ + WCHAR *dst = NULL; + if (src) + { + int len = MultiByteToWideChar( CP_UTF8, 0, src, -1, NULL, 0 ); + if ((dst = malloc( len * sizeof(WCHAR) ))) MultiByteToWideChar( CP_UTF8, 0, src, -1, dst, len ); + } + return dst; +} + +static inline char *utf16_to_ansi( const WCHAR *src ) +{ + char *dst = NULL; + if (src) + { + int len = WideCharToMultiByte( CP_ACP, WC_NO_BEST_FIT_CHARS, src, -1, NULL, 0, NULL, NULL ); + if (*src && !len) + { + FIXME( "can't convert %s to ANSI codepage\n", debugstr_w(src) ); + return NULL; + } + if ((dst = malloc( len ))) WideCharToMultiByte( CP_ACP, WC_NO_BEST_FIT_CHARS, src, -1, dst, len, NULL, NULL ); + } + return dst; +} + +static inline char *utf8_to_ansi( const char *src ) +{ + char *dst = NULL; + if (src) + { + WCHAR *tmp; + if ((tmp = utf8_to_utf16( src ))) dst = utf16_to_ansi( tmp ); + free( tmp ); + } + return dst; +} + HANDLE WINAPI SCardAccessStartedEvent(void) { return g_startedEvent; @@ -170,6 +209,27 @@ LONG WINAPI SCardReleaseContext( SCARDCONTEXT context ) return ret; } +static LONG copy_multiszA( const char *src, char *dst, DWORD *dst_len ) +{ + DWORD len, total_len = 0; + const char *ptr = src; + + while (*ptr) + { + char *str; + if (!(str = utf8_to_ansi( ptr ))) return SCARD_E_NO_MEMORY; + len = strlen( str ) + 1; + if (dst && dst_len && *dst_len > total_len + len) strcpy( dst + total_len, str ); + total_len += len; + ptr += strlen( ptr ) + 1; + free( str ); + } + + if (dst && dst_len && *dst_len > total_len + 1) dst[total_len] = 0; + if (dst_len) *dst_len = total_len + 1; + return SCARD_S_SUCCESS; +} + LONG WINAPI SCardStatusA(SCARDHANDLE context, LPSTR szReaderName, LPDWORD pcchReaderLen, LPDWORD pdwState, LPDWORD pdwProtocol, LPBYTE pbAtr, LPDWORD pcbAtrLen) { FIXME("(%Ix) stub\n", context); @@ -177,6 +237,27 @@ LONG WINAPI SCardStatusA(SCARDHANDLE context, LPSTR szReaderName, LPDWORD pcchRe return SCARD_F_INTERNAL_ERROR; } +static LONG copy_multiszW( const char *src, WCHAR *dst, DWORD *dst_len ) +{ + DWORD len, total_len = 0; + const char *ptr = src; + + while (*ptr) + { + WCHAR *str; + if (!(str = utf8_to_utf16( ptr ))) return SCARD_E_NO_MEMORY; + len = wcslen( str ) + 1; + if (dst && dst_len && *dst_len > total_len + len) wcscpy( dst + total_len, str ); + total_len += len; + ptr += strlen( ptr ) + 1; + free( str ); + } + + if (dst && dst_len && *dst_len > total_len + 1) dst[total_len] = 0; + if (dst_len) *dst_len = total_len + 1; + return SCARD_S_SUCCESS; +} + LONG WINAPI SCardStatusW(SCARDHANDLE context, LPWSTR szReaderName, LPDWORD pcchReaderLen, LPDWORD pdwState,LPDWORD pdwProtocol,LPBYTE pbAtr,LPDWORD pcbArtLen) { FIXME("(%Ix) stub\n", context); @@ -189,16 +270,87 @@ void WINAPI SCardReleaseStartedEvent(void) FIXME("stub\n"); } -LONG WINAPI SCardListReadersA(SCARDCONTEXT context, const CHAR *groups, CHAR *readers, DWORD *buflen) +LONG WINAPI SCardListReadersA( SCARDCONTEXT context, const char *groups, char *readers, DWORD *readers_len ) { - FIXME("(%Ix, %s, %p, %p) stub\n", context, debugstr_a(groups), readers, buflen); - return SCARD_E_NO_READERS_AVAILABLE; + struct handle *handle = (struct handle *)context; + struct scard_list_readers_params params; + UINT64 readers_len_utf8; + LONG ret; + + TRACE( "%Ix, %s, %p, %p\n", context, debugstr_a(groups), readers, readers_len ); + + if (!handle || handle->magic != CONTEXT_MAGIC) return ERROR_INVALID_HANDLE; + if (!readers_len) return SCARD_E_INVALID_PARAMETER; + if (*readers_len == SCARD_AUTOALLOCATE) + { + FIXME( "SCARD_AUTOALLOCATE not supported\n" ); + return SCARD_F_INTERNAL_ERROR; + } + + params.handle = handle->unix_handle; + if (!groups) params.groups = NULL; + else if (!(params.groups = ansi_to_utf8( groups ))) return SCARD_E_NO_MEMORY; + params.readers = NULL; + params.readers_len = &readers_len_utf8; + if ((ret = UNIX_CALL( scard_list_readers, &params ))) goto done; + + if (!(params.readers = malloc( readers_len_utf8 ))) + { + free( (void *)params.groups ); + return SCARD_E_NO_MEMORY; + } + if (!(ret = UNIX_CALL( scard_list_readers, &params ))) + { + ret = copy_multiszA( params.readers, readers, readers_len ); + } + +done: + free( (void *)params.groups ); + free( params.readers ); + TRACE( "returning %#lx\n", ret ); + return ret; } -LONG WINAPI SCardListReadersW(SCARDCONTEXT context, const WCHAR *groups, WCHAR *readers, DWORD *buflen) +LONG WINAPI SCardListReadersW( SCARDCONTEXT context, const WCHAR *groups, WCHAR *readers, DWORD *readers_len ) { - FIXME("(%Ix, %s, %p, %p) stub\n", context, debugstr_w(groups), readers, buflen); - return SCARD_E_NO_READERS_AVAILABLE; + struct handle *handle = (struct handle *)context; + struct scard_list_readers_params params; + UINT64 readers_len_utf8; + LONG ret; + + TRACE( "%Ix, %s, %p, %p\n", context, debugstr_w(groups), readers, readers_len ); + + if (!handle || handle->magic != CONTEXT_MAGIC) return ERROR_INVALID_HANDLE; + if (!readers_len) return SCARD_E_INVALID_PARAMETER; + if (*readers_len == SCARD_AUTOALLOCATE) + { + FIXME( "SCARD_AUTOALLOCATE not supported\n" ); + return SCARD_F_INTERNAL_ERROR; + } + + params.handle = handle->unix_handle; + if (!groups) params.groups = NULL; + else if (!(params.groups = utf16_to_utf8( groups ))) return SCARD_E_NO_MEMORY; + params.readers = NULL; + params.readers_len = &readers_len_utf8; + if ((ret = UNIX_CALL( scard_list_readers, &params ))) goto done; + + params.handle = handle->unix_handle; + if (!(params.readers = malloc( readers_len_utf8 ))) + { + free( (void *)params.groups ); + return SCARD_E_NO_MEMORY; + } + if (!(ret = UNIX_CALL( scard_list_readers, &params ))) + { + ret = copy_multiszW( params.readers, readers, readers_len ); + } + +done: + free( (void *)params.groups ); + free( params.readers ); + TRACE( "returning %#lx\n", ret ); + return ret; } LONG WINAPI SCardCancel( SCARDCONTEXT context )

1 0