https://git.reactos.org/?p=reactos.git;a=commitdiff;h=79d5eedcb487e6fe5bfe9d...
commit 79d5eedcb487e6fe5bfe9d860e71cf81db84d4f2 Author: Amine Khaldi amine.khaldi@reactos.org AuthorDate: Sat Dec 7 13:08:06 2019 +0100 Commit: Amine Khaldi amine.khaldi@reactos.org CommitDate: Sat Dec 7 13:08:06 2019 +0100
[WINSCARD] Sync with Wine Staging 4.18. CORE-16441 --- dll/win32/winscard/precomp.h | 2 -- dll/win32/winscard/stubs.c | 11 ----------- dll/win32/winscard/winscard.c | 8 +++++++- media/doc/README.WINE | 2 +- 4 files changed, 8 insertions(+), 15 deletions(-)
diff --git a/dll/win32/winscard/precomp.h b/dll/win32/winscard/precomp.h index 6cce6bbc345..c5c29182276 100644 --- a/dll/win32/winscard/precomp.h +++ b/dll/win32/winscard/precomp.h @@ -2,8 +2,6 @@ #ifndef _WINSCARD_PCH_ #define _WINSCARD_PCH_
-#include <wine/config.h> - #include <stdarg.h>
#define WIN32_NO_STATUS diff --git a/dll/win32/winscard/stubs.c b/dll/win32/winscard/stubs.c index 3c502cf1f07..c12bcda50ec 100644 --- a/dll/win32/winscard/stubs.c +++ b/dll/win32/winscard/stubs.c @@ -23,17 +23,6 @@ SCardBeginTransaction(SCARDHANDLE hCard) return SCARD_F_UNKNOWN_ERROR; }
-/* - * @unimplemented - */ -LONG -WINAPI -SCardCancel(SCARDCONTEXT hContext) -{ - UNIMPLEMENTED; - return SCARD_F_UNKNOWN_ERROR; -} - /* * @unimplemented */ diff --git a/dll/win32/winscard/winscard.c b/dll/win32/winscard/winscard.c index a8a1735c2be..d524483ffc3 100644 --- a/dll/win32/winscard/winscard.c +++ b/dll/win32/winscard/winscard.c @@ -16,7 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#include "config.h" #include <stdarg.h> #include "windef.h" #include "winbase.h" @@ -141,3 +140,10 @@ LONG WINAPI SCardListReadersW(SCARDCONTEXT context, const WCHAR *groups, WCHAR * FIXME("(%lx, %s, %p, %p) stub\n", context, debugstr_w(groups), readers, buflen); return SCARD_E_NO_READERS_AVAILABLE; } + +LONG WINAPI SCardCancel(SCARDCONTEXT context) +{ + FIXME("(%lx) stub\n", context); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return SCARD_F_INTERNAL_ERROR; +} diff --git a/media/doc/README.WINE b/media/doc/README.WINE index e27bd33f0e5..7eeced4056e 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -206,7 +206,7 @@ dll/win32/wininet # Synced to WineStaging-4.18 dll/win32/winmm # Forked at Wine-20050628 dll/win32/winmm/midimap # Forked at Wine-20050628 dll/win32/winmm/wavemap # Forked at Wine-20050628 -dll/win32/winscard # Synced to WineStaging-3.3 +dll/win32/winscard # Synced to WineStaging-4.18 dll/win32/wintrust # Synced to WineStaging-3.9 dll/win32/wldap32 # Synced to WineStaging-3.3 dll/win32/wmi # Synced to WineStaging-2.9
-
Amine Khaldi