Hans Leidekker : winscard: Use string conversion helpers in SCardAddReaderToGroupA().

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 40c013206aaaac64985d8c74bedaa0af69fb335d
URL:    https://gitlab.winehq.org/wine/wine/-/commit/40c013206aaaac64985d8c74bedaa0a...

Author: Hans Leidekker 
Date:   Thu Feb 16 13:32:45 2023 +0100

winscard: Use string conversion helpers in SCardAddReaderToGroupA().

---

dlls/winscard/winscard.c | 31 ++++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/dlls/winscard/winscard.c b/dlls/winscard/winscard.c
index f4d924be549..b2dd7d5f8e9 100644
--- a/dlls/winscard/winscard.c
+++ b/dlls/winscard/winscard.c
@@ -115,27 +115,28 @@ HANDLE WINAPI SCardAccessStartedEvent(void)
     return g_startedEvent;
 }

-LONG WINAPI SCardAddReaderToGroupA(SCARDCONTEXT context, LPCSTR reader, LPCSTR group)
+LONG WINAPI SCardAddReaderToGroupA( SCARDCONTEXT context, const char *reader, const char *group )
 {
-    LONG retval;
-    UNICODE_STRING readerW, groupW;
-
-    if(reader) RtlCreateUnicodeStringFromAsciiz(&readerW,reader);
-    else readerW.Buffer = NULL;
-    if(group) RtlCreateUnicodeStringFromAsciiz(&groupW,group);
-    else groupW.Buffer = NULL;
-
-    retval = SCardAddReaderToGroupW(context, readerW.Buffer, groupW.Buffer);
+    WCHAR *readerW = NULL, *groupW = NULL;
+    LONG ret;

-    RtlFreeUnicodeString(&readerW);
-    RtlFreeUnicodeString(&groupW);
+    TRACE( "%Ix, %s, %s\n", context, debugstr_a(reader), debugstr_a(group) );

-    return retval;
+    if (reader && !(readerW = ansi_to_utf16( reader ))) return SCARD_E_NO_MEMORY;
+    if (group && !(groupW = ansi_to_utf16( group )))
+    {
+        free( readerW );
+        return SCARD_E_NO_MEMORY;
+    }
+    ret = SCardAddReaderToGroupW( context, readerW, groupW );
+    free( readerW );
+    free( groupW );
+    return ret;
 }

-LONG WINAPI SCardAddReaderToGroupW(SCARDCONTEXT context, LPCWSTR reader, LPCWSTR group)
+LONG WINAPI SCardAddReaderToGroupW( SCARDCONTEXT context, const WCHAR *reader, const WCHAR *group )
 {
-    FIXME("%x %s %s\n", (unsigned int) context, debugstr_w(reader), debugstr_w(group));
+    FIXME( "%Ix, %s, %s\n", context, debugstr_w(reader), debugstr_w(group) );
     return SCARD_S_SUCCESS;
 }