[Pcsclite-cvs-commit] r4332 - /trunk/PCSC/src/winscard.c

[rousseau at users.alioth.debian.org]

Author: rousseau
Date: Tue Jul 21 10:21:01 2009
New Revision: 4332

URL: http://svn.debian.org/wsvn/pcsclite/?sc=1&rev=4332
Log:
SCardConnect() and SCardReconnect(): set pdwActiveProtocol to
SCARD_PROTOCOL_UNDEFINED if SCARD_SHARE_DIRECT is used (conform to MSDN)

Modified:
    trunk/PCSC/src/winscard.c

Modified: trunk/PCSC/src/winscard.c
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/src/winscard.c?rev=4332&op=diff
==============================================================================
--- trunk/PCSC/src/winscard.c (original)
+++ trunk/PCSC/src/winscard.c Tue Jul 21 10:21:01 2009
@@ -434,6 +434,8 @@
 					return SCARD_E_PROTO_MISMATCH;
 			}
 		}
+		else
+			rContext->readerState->cardProtocol = SCARD_PROTOCOL_UNDEFINED;
 	}
 
 	*pdwActiveProtocol = rContext->readerState->cardProtocol;
@@ -762,6 +764,8 @@
 					return SCARD_E_PROTO_MISMATCH;
 			}
 		}
+		else
+			rContext->readerState->cardProtocol = SCARD_PROTOCOL_UNDEFINED;
 	}
 
 	*pdwActiveProtocol = rContext->readerState->cardProtocol;