[Pcsclite-cvs-commit] r2061 - trunk/PCSC/src

[Ludovic Rousseau]

Author: rousseau
Date: 2006-05-25 21:42:21 +0000 (Thu, 25 May 2006)
New Revision: 2061

Modified:
   trunk/PCSC/src/winscard_clnt.c
   trunk/PCSC/src/winscard_msg.c
   trunk/PCSC/src/winscard_msg_srv.c
   trunk/PCSC/src/winscard_svc.c
Log:
use new SHMMessageReceive/SHMMessageSend API


Modified: trunk/PCSC/src/winscard_clnt.c
===================================================================
--- trunk/PCSC/src/winscard_clnt.c	2006-05-25 21:35:58 UTC (rev 2060)
+++ trunk/PCSC/src/winscard_clnt.c	2006-05-25 21:42:21 UTC (rev 2061)
@@ -403,14 +403,14 @@
 		veStr->major = PROTOCOL_VERSION_MAJOR;
 		veStr->minor = PROTOCOL_VERSION_MINOR;
 
-		if (-1 == SHMMessageSend(&msgStruct, dwClientID,
+		if (-1 == SHMMessageSend(&msgStruct, sizeof(msgStruct), dwClientID,
 			PCSCLITE_MCLIENT_ATTEMPTS))
 			return SCARD_E_NO_SERVICE;
 
 		/*
 		 * Read a message from the server
 		 */
-		if (-1 == SHMMessageReceive(&msgStruct, dwClientID,
+		if (-1 == SHMMessageReceive(&msgStruct, sizeof(msgStruct), dwClientID,
 			PCSCLITE_CLIENT_ATTEMPTS))
 		{
 			Log1(PCSC_LOG_CRITICAL, "Your pcscd is too old and does not support CMD_VERSION");

Modified: trunk/PCSC/src/winscard_msg.c
===================================================================
--- trunk/PCSC/src/winscard_msg.c	2006-05-25 21:35:58 UTC (rev 2060)
+++ trunk/PCSC/src/winscard_msg.c	2006-05-25 21:42:21 UTC (rev 2061)
@@ -55,7 +55,7 @@
  */
 INTERNAL int SHMClientRead(psharedSegmentMsg msgStruct, DWORD dwClientID, int blockamount)
 {
-	return SHMMessageReceive(msgStruct, dwClientID, blockamount);
+	return SHMMessageReceive(msgStruct, sizeof(*msgStruct), dwClientID, blockamount);
 }
 
 /**
@@ -397,7 +397,8 @@
 	msgStruct.date = time(NULL);
 	memcpy(msgStruct.data, data, size);
 
-	return SHMMessageSend(&msgStruct, dwClientID, blockAmount);
+	return SHMMessageSend(&msgStruct, sizeof(msgStruct), dwClientID,
+		blockAmount);
 }
 
 /**

Modified: trunk/PCSC/src/winscard_msg_srv.c
===================================================================
--- trunk/PCSC/src/winscard_msg_srv.c	2006-05-25 21:35:58 UTC (rev 2060)
+++ trunk/PCSC/src/winscard_msg_srv.c	2006-05-25 21:42:21 UTC (rev 2061)
@@ -253,7 +253,7 @@
 		/*
 		 * Return the current handle 
 		 */
-		rv = SHMMessageReceive(msgStruct, *pdwClientID,
+		rv = SHMMessageReceive(msgStruct, sizeof(*msgStruct), *pdwClientID,
 				       PCSCLITE_SERVER_ATTEMPTS);
 		
 		if (rv == -1)
@@ -276,7 +276,5 @@
 	}
 	
 	return -1;
-
 }
 
-

Modified: trunk/PCSC/src/winscard_svc.c
===================================================================
--- trunk/PCSC/src/winscard_svc.c	2006-05-25 21:35:58 UTC (rev 2060)
+++ trunk/PCSC/src/winscard_svc.c	2006-05-25 21:42:21 UTC (rev 2061)
@@ -152,8 +152,9 @@
 				 * Command must be found
 				 */
 				MSGFunctionDemarshall(&msgStruct, dwContextIndex);
-				rv = SHMMessageSend(&msgStruct, psContext[dwContextIndex].dwClientID,
-						    PCSCLITE_SERVER_ATTEMPTS);
+				rv = SHMMessageSend(&msgStruct, sizeof(msgStruct),
+					psContext[dwContextIndex].dwClientID,
+					PCSCLITE_SERVER_ATTEMPTS);
 			}
 			else
 				/* pcsc-lite client/server protocol version */
@@ -176,7 +177,7 @@
 					veStr->rv = SCARD_S_SUCCESS;
 
 					/* send back the response */
-					rv = SHMMessageSend(&msgStruct,
+					rv = SHMMessageSend(&msgStruct, sizeof(msgStruct),
 						psContext[dwContextIndex].dwClientID,
 					    PCSCLITE_SERVER_ATTEMPTS);
 				}