@@ -188,19 +188,37 @@
   {
     return SCARD_S_SUCCESS;
   }
-  LONG WINAPI SCardGetStatusChangeA_ (SCARDCONTEXT, DWORD,
+  LONG WINAPI SCardGetStatusChangeA_ (SCARDCONTEXT, DWORD dwTimeout,
                      LPSCARD_READERSTATEA rgReaderStates,
                      DWORD)
   {
-    rgReaderStates->dwEventState = SCARD_STATE_PRESENT;
-    return SCARD_S_SUCCESS;
+    if (rgReaderStates->dwCurrentState == SCARD_STATE_UNAWARE)
+      {
+   rgReaderStates->dwEventState = SCARD_STATE_PRESENT;
+   return SCARD_S_SUCCESS;
+      }
+    else if (dwTimeout == INFINITE)
+      {
+   return SCARD_E_INVALID_PARAMETER;
+      }
+    Sleep (dwTimeout);
+    return SCARD_E_TIMEOUT;
   }
-  LONG WINAPI SCardGetStatusChangeW_ (SCARDCONTEXT, DWORD,
-                     LPSCARD_READERSTATEA rgReaderStates,
+  LONG WINAPI SCardGetStatusChangeW_ (SCARDCONTEXT, DWORD dwTimeout,
+                     LPSCARD_READERSTATEW rgReaderStates,
                      DWORD)
   {
-    rgReaderStates->dwEventState = SCARD_STATE_PRESENT;
-    return SCARD_S_SUCCESS;
+    if (rgReaderStates->dwCurrentState == SCARD_STATE_UNAWARE)
+      {
+   rgReaderStates->dwEventState = SCARD_STATE_PRESENT;
+   return SCARD_S_SUCCESS;
+      }
+    else if (dwTimeout == INFINITE)
+      {
+   return SCARD_E_INVALID_PARAMETER;
+      }
+    Sleep (dwTimeout);
+    return SCARD_E_TIMEOUT;
   }
   LONG WINAPI SCardReleaseContext_ (SCARDCONTEXT)
   {