Changeset 3472 for trunk/src/wsock32/asyncapi.cpp

Timestamp:

May 2, 2000, 3:09:44 PM (25 years ago)

Author:

bird

Message:

Dirty fix to make this compile - QueryPerformanceCounter int odinwrap.h problem.

File:

• trunk/src/wsock32/asyncapi.cpp (modified) (22 diffs)

trunk/src/wsock32/asyncapi.cpp

@@ -1 @@
-/* $Id: asyncapi.cpp,v 1.6 2000-04-23 15:55:52 sandervl Exp $ */
+/* $Id: asyncapi.cpp,v 1.7 2000-05-02 13:09:43 bird Exp $ */
 
 /*
@@ -31 +31 @@
 #include "dbglocal.h"
 
+//kso: dirty fix to make this compile! not permanent!
+BOOL WINAPI QueryPerformanceCounter(LARGE_INTEGER *p);
+#define LowPart u.LowPart
+
+
 ODINDEBUGCHANNEL(WSOCK32-ASYNC)
 
@@ -42 +47 @@
  int              size = 0;
  int              fail = NO_ERROR;
- 
+
    if(!pThreadParm->fCancelled)
    {
@@ -59 +64 @@
                 }
                 else {
-                        ret = gethostbyaddr(pThreadParm->u.gethostbyaddr.addr, 
+                        ret = gethostbyaddr(pThreadParm->u.gethostbyaddr.addr,
                                             pThreadParm->u.gethostbyaddr.len,
                                             pThreadParm->u.gethostbyaddr.type);
@@ -152 +157 @@
    if(!pThreadParm->fCancelled) {
         dprintf(("WSAsyncThreadProc %x %x %x %x", pThreadParm->hwnd, pThreadParm->msg, pThreadParm->hAsyncTaskHandle, lParam));
-        PostMessageA(pThreadParm->hwnd, pThreadParm->msg, 
+        PostMessageA(pThreadParm->hwnd, pThreadParm->msg,
                      (WPARAM)pThreadParm->hAsyncTaskHandle, lParam);
    }
    pThreadParm->fActive = FALSE;
-   RemoveFromQueue(pThreadParm); 
-}
-//******************************************************************************
-//******************************************************************************
-LHANDLE WSAAsyncRequest(AsyncRequestType requesttype, HWND hwnd, int msg, char *buf, 
+   RemoveFromQueue(pThreadParm);
+}
+//******************************************************************************
+//******************************************************************************
+LHANDLE WSAAsyncRequest(AsyncRequestType requesttype, HWND hwnd, int msg, char *buf,
                         int buflen, PVOID param1, PVOID param2, PVOID param3,
                         PVOID param4)
@@ -303 +308 @@
    }
    return 0;
-}                      
+}
 //******************************************************************************
 //******************************************************************************
@@ -315 +320 @@
    dprintf(("WSAAsyncGetHostByName %s", name));
 
-   return WSAAsyncRequest(ASYNC_GETHOSTBYNAME, hWnd, wMsg, buf, buflen, 
+   return WSAAsyncRequest(ASYNC_GETHOSTBYNAME, hWnd, wMsg, buf, buflen,
                           (PVOID)name, 0, 0, 0);
 }
@@ -331 +336 @@
    dprintf(("WSAAsyncGetHostByAddr %s", addr));
 
-   return WSAAsyncRequest(ASYNC_GETHOSTBYADDR, hWnd, wMsg, buf, buflen, 
+   return WSAAsyncRequest(ASYNC_GETHOSTBYADDR, hWnd, wMsg, buf, buflen,
                           (PVOID)addr, (PVOID)len, (PVOID)type, 0);
 }
@@ -345 +350 @@
    dprintf(("WSAAsyncGetProtoByName %s", name));
 
-   return WSAAsyncRequest(ASYNC_GETPROTOBYNAME, hWnd, wMsg, buf, buflen, 
+   return WSAAsyncRequest(ASYNC_GETPROTOBYNAME, hWnd, wMsg, buf, buflen,
                           (PVOID)name, 0, 0, 0);
 }
@@ -359 +364 @@
    dprintf(("WSAAsyncGetProtoByNumber %d", number));
 
-   return WSAAsyncRequest(ASYNC_GETPROTOBYNUMBER, hWnd, wMsg, buf, buflen, 
+   return WSAAsyncRequest(ASYNC_GETPROTOBYNUMBER, hWnd, wMsg, buf, buflen,
                           (PVOID)number, 0, 0, 0);
 }
@@ -374 +379 @@
    dprintf(("WSAAsyncGetServByName %s", name));
 
-   return WSAAsyncRequest(ASYNC_GETSERVBYNAME, hWnd, wMsg, buf, buflen, 
+   return WSAAsyncRequest(ASYNC_GETSERVBYNAME, hWnd, wMsg, buf, buflen,
                           (PVOID)name, (PVOID)proto, 0, 0);
 }
@@ -389 +394 @@
    dprintf(("WSAAsyncGetServByPort %d %s", port, proto));
 
-   return WSAAsyncRequest(ASYNC_GETSERVBYPORT, hWnd, wMsg, buf, buflen, 
+   return WSAAsyncRequest(ASYNC_GETSERVBYPORT, hWnd, wMsg, buf, buflen,
                           (PVOID)port, (PVOID)proto, 0, 0);
 }
@@ -401 +406 @@
 
    dprintf(("AsyncNotifyEvent %x %x %x %x", pThreadParm->u.asyncselect.s, pThreadParm->hwnd, pThreadParm->msg, event));
-   PostMessageA(pThreadParm->hwnd, pThreadParm->msg, (WPARAM)pThreadParm->u.asyncselect.s, 
+   PostMessageA(pThreadParm->hwnd, pThreadParm->msg, (WPARAM)pThreadParm->u.asyncselect.s,
                (LPARAM)event);
 }
@@ -416 +421 @@
  int              noread, nowrite, noexcept, state, sockoptlen, sockoptval;
  int              tmp, i, lEventsPending, ret, bytesread;
-  
+
    while(TRUE)
    {
@@ -464 +469 @@
                         selecterr += SOCBASEERR;
                 }
-                switch(selecterr) 
+                switch(selecterr)
                 {
                 case SOCEINTR:
@@ -481 +486 @@
                         //but can still send
                         pThreadParm->u.asyncselect.lEventsPending &= ~(FD_READ | FD_ACCEPT);
-                        goto asyncloopstart; 
+                        goto asyncloopstart;
 
                 case SOCEINVAL:
@@ -513 +518 @@
                                         AsyncNotifyEvent(pThreadParm, FD_CONNECT, WSAECONNREFUSED);
                                 }
-                        }  
+                        }
                 }
                 else
@@ -524 +529 @@
         {
                 state = ioctl(s, FIONREAD, (CHAR *) &bytesread, sizeof(bytesread));
-                if(state == SOCKET_ERROR) 
+                if(state == SOCKET_ERROR)
                 {
-                        if(lEventsPending & FD_CLOSE) 
+                        if(lEventsPending & FD_CLOSE)
                         {
                                 dprintf(("FD_CLOSE; ioctl; socket error"));
@@ -540 +545 @@
                         }
                 }
-                if(lEventsPending & FD_ACCEPT) 
+                if(lEventsPending & FD_ACCEPT)
                 {
                         sockoptlen = sizeof(sockoptlen);
@@ -560 +565 @@
 //SvL: This generates FD_CLOSE messages when the connection is just fine
 //     (recv executed in another thread when select returns)
-                else 
+                else
                 if((lEventsPending & FD_CLOSE) && (state == 0 && bytesread == 0)) {
                         dprintf(("FD_CLOSE; state == 0 && bytesread == 0"));
@@ -573 +578 @@
                 }
         }
-        if((pThreadParm->u.asyncselect.lEventsPending & (FD_ACCEPT|FD_CLOSE|FD_CONNECT)) == 
+        if((pThreadParm->u.asyncselect.lEventsPending & (FD_ACCEPT|FD_CLOSE|FD_CONNECT)) ==
             (lEventsPending & (FD_ACCEPT|FD_CLOSE|FD_CONNECT))) {
                 DosSleep(10);
@@ -580 +585 @@
    //remove it first, then delete semaphore object
    pThreadParm->fActive = FALSE;
-   RemoveFromQueue(pThreadParm); 
+   RemoveFromQueue(pThreadParm);
    delete pThreadParm->u.asyncselect.asyncSem;
    pThreadParm->u.asyncselect.asyncSem = 0;