Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
wine
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Gabriel Ivăncescu
wine
Commits
40c01320
Commit
40c01320
authored
2 years ago
by
Hans Leidekker
Committed by
Alexandre Julliard
2 years ago
Browse files
Options
Downloads
Patches
Plain Diff
winscard: Use string conversion helpers in SCardAddReaderToGroupA().
parent
906977f5
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
dlls/winscard/winscard.c
+16
-15
16 additions, 15 deletions
dlls/winscard/winscard.c
with
16 additions
and
15 deletions
dlls/winscard/winscard.c
+
16
−
15
View file @
40c01320
...
...
@@ -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
,
LPCWST
R
reader
,
LPCWST
R
group
)
LONG
WINAPI
SCardAddReaderToGroupW
(
SCARDCONTEXT
context
,
const
WCHA
R
*
reader
,
const
WCHA
R
*
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
;
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment