Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
4295b90c
Commit
4295b90c
authored
Feb 16, 2023
by
Hans Leidekker
Committed by
Alexandre Julliard
Feb 22, 2023
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
winscard: Implement SCardCancel().
parent
3f325721
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
27 additions
and
4 deletions
+27
-4
unixlib.c
dlls/winscard/unixlib.c
+8
-0
unixlib.h
dlls/winscard/unixlib.h
+6
-0
winscard.c
dlls/winscard/winscard.c
+13
-4
No files found.
dlls/winscard/unixlib.c
View file @
4295b90c
...
...
@@ -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
,
};
dlls/winscard/unixlib.h
View file @
4295b90c
...
...
@@ -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
,
};
dlls/winscard/winscard.c
View file @
4295b90c
...
...
@@ -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
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment