[389-commits] coolkey/src/libckyapplet cky_card.c,1.2,1.2.4.1

[Jack Magne]

Author: jmagne

Update of /cvs/dirsec/coolkey/src/libckyapplet
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19303/src/libckyapplet

Modified Files:
      Tag: PKI_8_0_RTM_BRANCH
	cky_card.c 
Log Message:
Bugzilla #514341, get coolkey working on 64bit Windows.


Index: cky_card.c
===================================================================
RCS file: /cvs/dirsec/coolkey/src/libckyapplet/cky_card.c,v
retrieving revision 1.2
retrieving revision 1.2.4.1
diff -u -r1.2 -r1.2.4.1
--- cky_card.c	24 Jan 2009 00:08:01 -0000	1.2
+++ cky_card.c	2 Oct 2009 01:42:37 -0000	1.2.4.1
@@ -50,10 +50,10 @@
     SCARDCONTEXT hContext);
 
 typedef long (WINAPI * SCardBeginTransactionFn) (
-    long hCard);
+    SCARDHANDLE hCard);
 
 typedef long (WINAPI * SCardEndTransactionFn) (
-    long hCard,
+    SCARDHANDLE hCard,
     unsigned long dwDisposition);
 
 typedef long (WINAPI * SCardConnectFn) (
@@ -61,15 +61,15 @@
     const char *szReader,
     unsigned long dwShareMode,
     unsigned long dwPreferredProtocols,
-    long *phCard,
+    SCARDHANDLE *phCard,
     unsigned long *pdwActiveProtocol);
 
 typedef long (WINAPI * SCardDisconnectFn) (
-    long hCard,
+    SCARDHANDLE hCard,
     unsigned long dwDisposition);
 
 typedef long (WINAPI * SCardTransmitFn) (
-    long hCard,
+    SCARDHANDLE hCard,
     LPCSCARD_IO_REQUEST pioSendPci,
     const unsigned char *pbSendBuffer,
     unsigned long cbSendLength,
@@ -78,7 +78,7 @@
     unsigned long *pcbRecvLength);
 
 typedef long (WINAPI * SCardReconnectFn) (
-    long hCard,
+    SCARDHANDLE hCard,
     unsigned long dwShareMode,
     unsigned long dwPreferredProtocols,
     unsigned long dwInitialization,
@@ -91,7 +91,7 @@
     unsigned long *pcchReaders);
 
 typedef long (WINAPI * SCardStatusFn) (
-    long hCard,
+    SCARDHANDLE hCard,
     char *mszReaderNames,
     unsigned long *pcchReaderLen,
     unsigned long *pdwState,
@@ -100,7 +100,7 @@
     unsigned long *pcbAtrLen);
 
 typedef long (WINAPI * SCardGetAttribFn) (
-    long hCard,
+    SCARDHANDLE hCard,
     unsigned long dwAttId,
     char *pbAttr,
     unsigned long *pchAttrLen);