Changeset 3205 for trunk/src/wsock32/new/wsa.cpp

Timestamp:

Mar 23, 2000, 8:21:56 PM (25 years ago)

Author:

sandervl

Message:

wsock32\new update

File:

• trunk/src/wsock32/new/wsa.cpp (modified) (6 diffs)

trunk/src/wsock32/new/wsa.cpp

@@ -1 @@
-/* $Id: wsa.cpp,v 1.1 2000-03-22 20:01:07 sandervl Exp $ */
+/* $Id: wsa.cpp,v 1.2 2000-03-23 19:21:54 sandervl Exp $ */
 
 /*
@@ -32 +32 @@
 ODINDEBUGCHANNEL(WSOCK32-WSA)
 
+#ifndef winsockcleanupsockets
+// Exported by SO32DLL.  Used to close all open sockets.
+void _System winsockcleanupsockets(void);
+#endif
+
 static void WSASetBlocking(BOOL fBlock);
 
@@ -53 +58 @@
     if (!lpWSAData) return WSAEINVAL;
 
-    pwsi = WINSOCK_GetIData();
-    if( pwsi == NULL )
+    if(fWSAInitialized == FALSE) 
     {
         WINSOCK_CreateIData();
         pwsi = WINSOCK_GetIData();
-        if (!pwsi) return WSASYSNOTREADY;
-    }
+
+        sock_init();
+    }
+    else pwsi = WINSOCK_GetIData();
+
+    if (!pwsi) return WSASYSNOTREADY;
+
     pwsi->num_startup++;
     fWSAInitialized = TRUE;
@@ -75 +84 @@
     if( pwsi ) {
         if( --pwsi->num_startup > 0 ) return 0;
+
+        winsockcleanupsockets();
 
         fWSAInitialized = FALSE;
@@ -103 +114 @@
 //TODO: Implement this
 //******************************************************************************
-ODINFUNCTION0(int,WSACancelBlockingCall)
-{
-  LPWSINFO pwsi = WINSOCK_GetIData();
-
-  if( pwsi ) return 0;
-  return SOCKET_ERROR;
-}
-//******************************************************************************
-//******************************************************************************
 ODINFUNCTION0(int,WSAUnhookBlockingHook)
 {
@@ -126 +128 @@
 //******************************************************************************
 //******************************************************************************
-ODINFUNCTION0(BOOL,WSAIsBlocking)
+BOOL WIN32API WSAIsBlocking()
 {
     LPWSINFO pwsi = WINSOCK_GetIData();