[ros-diffs] [akhaldi] 69783: [MSAFD] Remove fixed CatalogEntryId. By Peter Hater. CORE-10440

Author: akhaldi
Date: Mon Nov  2 17:32:00 2015
New Revision: 69783

URL: http://svn.reactos.org/svn/reactos?rev=69783&view=rev
Log:
[MSAFD] Remove fixed CatalogEntryId. By Peter Hater. CORE-10440

Modified:
    trunk/reactos/dll/win32/msafd/misc/dllmain.c

Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/misc/dllmai...
==============================================================================
--- trunk/reactos/dll/win32/msafd/misc/dllmain.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msafd/misc/dllmain.c	[iso-8859-1] Mon Nov  2 17:32:00 2015
@@ -19,6 +19,7 @@

HANDLE GlobalHeap;
 WSPUPCALLTABLE Upcalls;
+DWORD CatalogEntryId; /* CatalogEntryId for upcalls */
 LPWPUCOMPLETEOVERLAPPEDREQUEST lpWPUCompleteOverlappedRequest;
 PSOCKET_INFORMATION SocketListHead = NULL;
 CRITICAL_SECTION SocketListLock;
@@ -289,7 +290,7 @@
     CreateContext(Socket);

/* Notify Winsock */
-    Upcalls.lpWPUModifyIFSHandle(1, (SOCKET)Sock, lpErrno);
+    Upcalls.lpWPUModifyIFSHandle(CatalogEntryId, (SOCKET)Sock, lpErrno);

/* Return Socket Handle */
     TRACE("Success %x\n", Sock);
@@ -2403,10 +2404,11 @@
         lpProcTable->lpWSPStringToAddress = WSPStringToAddress;
         lpWSPData->wVersion     = MAKEWORD(2, 2);
         lpWSPData->wHighVersion = MAKEWORD(2, 2);
+        /* Save CatalogEntryId for all upcalls */
+        CatalogEntryId = lpProtocolInfo->dwCatalogEntryId;
     }

TRACE("Status (%d).\n", Status);
-
     return Status;
 }