Changeset 7977 for trunk/src

Timestamp:

Feb 20, 2002, 4:07:14 PM (24 years ago)

Author:

sandervl

Message:

accept bugfix for changing async request

Location:

trunk/src/wsock32

Files:

• asyncapi.cpp (modified) (2 diffs)
• asyncthread.cpp (modified) (5 diffs)
• asyncthread.h (modified) (3 diffs)
• wsock32.cpp (modified) (6 diffs)
• wsock32.h (modified) (2 diffs)

trunk/src/wsock32/asyncapi.cpp

@@ -1 @@
-/* $Id: asyncapi.cpp,v 1.18 2001-10-21 13:43:51 sandervl Exp $ */
+/* $Id: asyncapi.cpp,v 1.19 2002-02-20 15:07:13 sandervl Exp $ */
 
 /*
@@ -675 +675 @@
 //******************************************************************************
 //******************************************************************************
-int WSAAsyncSelectWorker(SOCKET s, int mode, int notifyHandle, int notifyData, long lEventMask)
+int WSAAsyncSelectWorker(SOCKET s, int mode, DWORD notifyHandle, DWORD notifyData, DWORD lEventMask)
 {
   PASYNCTHREADPARM pThreadParm;

trunk/src/wsock32/asyncthread.cpp

@@ -1 @@
-/* $Id: asyncthread.cpp,v 1.13 2001-10-21 13:43:51 sandervl Exp $ */
+/* $Id: asyncthread.cpp,v 1.14 2002-02-20 15:07:13 sandervl Exp $ */
 
 /*
@@ -33 +33 @@
 {
  PASYNCTHREADPARM pThreadParm = (PASYNCTHREADPARM)arg;
+#ifdef DEBUG
+ ULONG ulSocket    = pThreadParm->u.asyncselect.s;
+ ULONG hTaskHandle = pThreadParm->hAsyncTaskHandle;
+#endif
 
   pThreadParm->asyncProc((PVOID)arg);
@@ -40 +44 @@
 ////    WSASetBlocking(FALSE, pThreadParm->hThread);
 
-  dprintf(("AsyncThread %x socket %x exit", pThreadParm->hAsyncTaskHandle, pThreadParm->u.asyncselect.s));
+  dprintf(("AsyncThread %x socket %x exit", hTaskHandle, ulSocket));
   free((PVOID)pThreadParm);
 }
@@ -281 +285 @@
 //******************************************************************************
 //******************************************************************************
-BOOL QueryAsyncEvent(SOCKET s, HWND *pHwnd, int *pMsg, ULONG *plEvent)
+BOOL QueryAsyncEvent(SOCKET s, int *pMode, ULONG *pNofityHandle, ULONG *pNofityData, 
+                     ULONG *plEvent)
 {
  PASYNCTHREADPARM pThreadInfo;
@@ -288 +293 @@
    pThreadInfo = FindAsyncEvent(s);
    if(pThreadInfo) {
-        *pHwnd   = (HWND)pThreadInfo->notifyHandle;
-        *pMsg    = pThreadInfo->notifyData;
-        *plEvent = pThreadInfo->u.asyncselect.lEvents;
+        *pMode         = pThreadInfo->u.asyncselect.mode;
+        *pNofityHandle = pThreadInfo->notifyHandle;
+        *pNofityData   = pThreadInfo->notifyData;
+        *plEvent       = pThreadInfo->u.asyncselect.lEvents;
    }
    asyncThreadMutex.leave();

trunk/src/wsock32/asyncthread.h

@@ -1 @@
-/* $Id: asyncthread.h,v 1.10 2001-10-19 18:34:47 achimha Exp $ */
+/* $Id: asyncthread.h,v 1.11 2002-02-20 15:07:14 sandervl Exp $ */
 
 /*
@@ -40 +40 @@
         ASYNCTHREADPROC asyncProc;
         VMutex         *parmmutex;
-        int             notifyHandle;
-        int             notifyData;
+        DWORD           notifyHandle;
+        DWORD           notifyData;
         LPSTR           buf;
         DWORD           buflen;
@@ -89 +89 @@
 
 void  EnableAsyncEvent(SOCKET s, ULONG flags);
-BOOL  QueryAsyncEvent(SOCKET s, HWND *pHwnd, int *pMsg, ULONG *plEvent);
+BOOL  QueryAsyncEvent(SOCKET s, int *pMode, ULONG *pNofityHandle, ULONG *pNofityData, ULONG *plEvent);
 BOOL  FindAndSetAsyncEvent(SOCKET s, int mode, int notifyHandle, int notifyData, ULONG lEventMask);
 

trunk/src/wsock32/wsock32.cpp

@@ -1 @@
-/* $Id: wsock32.cpp,v 1.46 2002-02-06 10:33:56 sandervl Exp $ */
+/* $Id: wsock32.cpp,v 1.47 2002-02-20 15:07:14 sandervl Exp $ */
 
 /*
@@ -376 +376 @@
    //to blocking mode
    if (cmd == FIONBIO) {
-        HWND  hwnd;
-        int   msg;
+        ULONG ulNotifyHandle, ulNotifyData;
+        int   mode;
         ULONG lEvent;
 
-        if(QueryAsyncEvent(s, &hwnd, &msg, &lEvent) == TRUE) {
+        if(QueryAsyncEvent(s, &mode, &ulNotifyHandle, &ulNotifyData, &lEvent) == TRUE) 
+        {
                 if(*argp != 0) {
                         //nothing to do; already non-blocking
@@ -521 +522 @@
                                 int *,            addrlen)
 {
- int   ret, msg;
- HWND  hwnd;
- ULONG lEvent;
+ int   ret, mode;
+ ULONG lEvent, notifyData, notifyHandle;
 
    if(!fWSAInitialized) {
@@ -549 +549 @@
         //if this socket has an active async. select pending, then call WSAAsyncSelect
         //with the same parameters for the new socket (see docs)
-        if(QueryAsyncEvent(s, &hwnd, &msg, &lEvent) == TRUE) {
-                if(WSAAsyncSelect(ret, hwnd, msg, lEvent) == SOCKET_ERROR) {
+        if(QueryAsyncEvent(s, &mode, &notifyHandle, &notifyData, &lEvent) == TRUE) {
+                if(WSAAsyncSelectWorker(s, mode, notifyHandle, notifyData, lEvent) == SOCKET_ERROR) {
                         ret = SOCKET_ERROR;
                 }
@@ -948 +948 @@
   struct ws_linger *yy;
   struct linger     xx;
-  int               ret;
+  int               ret, val;
   ULONG             size;
   char             *safeoptval;
@@ -1159 +1159 @@
                    return SOCKET_ERROR;
                }
-               dprintf(("IPPROTO_IP, IP_HDRINCL 0x%x", *optval));
-               ret = setsockopt(s, IPPROTO_IP, IP_HDRINCL_OS2, (char *)optval, optlen);
+               val = *optval;
+               dprintf(("IPPROTO_IP, IP_HDRINCL 0x%x", val));
+               ret = setsockopt(s, IPPROTO_IP, IP_HDRINCL_OS2, (char *)&val, optlen);
                break;
 

trunk/src/wsock32/wsock32.h

@@ -1 @@
-/* $Id: wsock32.h,v 1.20 2001-11-16 16:55:20 sandervl Exp $ */
+/* $Id: wsock32.h,v 1.21 2002-02-20 15:07:14 sandervl Exp $ */
 
 /* WSOCK32.H--definitions & conversions for Odin's wsock32.dll.
@@ -248 +248 @@
 #define WSA_SELECT_HEVENT 2
 // async select worker routine
-int WSAAsyncSelectWorker(SOCKET s, int mode, int notifyHandle, int notifyData, long lEventMask);
+int WSAAsyncSelectWorker(SOCKET s, int mode, DWORD notifyHandle, DWORD notifyData, DWORD lEventMask);
 
 typedef struct _WSANETWORKEVENTS