[sserapion] 44045: Fix ws2_32 64bit build (2 of 2)

Author: sserapion
Date: Mon Nov  9 09:57:37 2009
New Revision: 44045

URL: http://svn.reactos.org/svn/reactos?rev=44045&view=rev
Log:
Fix ws2_32 64bit build (2 of 2)

Modified:
    branches/ros-amd64-bringup/reactos/dll/win32/ws2_32/include/upcall.h
    branches/ros-amd64-bringup/reactos/dll/win32/ws2_32/misc/async.c
    branches/ros-amd64-bringup/reactos/dll/win32/ws2_32/misc/upcall.c
    branches/ros-amd64-bringup/reactos/dll/win32/ws2_32/ws2_32.rbuild

Modified: branches/ros-amd64-bringup/reactos/dll/win32/ws2_32/include/upcall.h
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w…
==============================================================================
--- branches/ros-amd64-bringup/reactos/dll/win32/ws2_32/include/upcall.h [iso-8859-1]
(original)
+++ branches/ros-amd64-bringup/reactos/dll/win32/ws2_32/include/upcall.h [iso-8859-1] Mon
Nov  9 09:57:37 2009
@@ -34,7 +34,7 @@
 WSPAPI
 WPUCreateSocketHandle(
     IN  DWORD dwCatalogEntryId,
-    IN  DWORD dwContext,
+    IN  DWORD_PTR dwContext,
     OUT LPINT lpErrno);
 
 int
@@ -69,14 +69,14 @@
 WPUQueryBlockingCallback(
     IN  DWORD dwCatalogEntryId,
     OUT LPBLOCKINGCALLBACK FAR* lplpfnCallback,
-    OUT LPDWORD lpdwContext,
+    OUT PDWORD_PTR lpdwContext,
     OUT LPINT lpErrno);
 
 INT
 WSPAPI
 WPUQuerySocketHandleContext(
     IN  SOCKET s,
-    OUT LPDWORD lpContext,
+    OUT PDWORD_PTR lpContext,
     OUT LPINT lpErrno);
 
 INT
@@ -84,7 +84,7 @@
 WPUQueueApc(
     IN  LPWSATHREADID lpThreadId,
     IN  LPWSAUSERAPC lpfnUserApc,
-    IN  DWORD dwContext,
+    IN  DWORD_PTR dwContext,
     OUT LPINT lpErrno);
 
 BOOL

Modified: branches/ros-amd64-bringup/reactos/dll/win32/ws2_32/misc/async.c
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w…
==============================================================================
--- branches/ros-amd64-bringup/reactos/dll/win32/ws2_32/misc/async.c [iso-8859-1]
(original)
+++ branches/ros-amd64-bringup/reactos/dll/win32/ws2_32/misc/async.c [iso-8859-1] Mon Nov 
9 09:57:37 2009
@@ -110,8 +110,6 @@
 # include <resolv.h>
 #endif
 #endif
-
-#define CALLBACK __stdcall
 
 #include "wine/winbase16.h"
 #include "windef.h"

Modified: branches/ros-amd64-bringup/reactos/dll/win32/ws2_32/misc/upcall.c
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w…
==============================================================================
--- branches/ros-amd64-bringup/reactos/dll/win32/ws2_32/misc/upcall.c [iso-8859-1]
(original)
+++ branches/ros-amd64-bringup/reactos/dll/win32/ws2_32/misc/upcall.c [iso-8859-1] Mon Nov
 9 09:57:37 2009
@@ -72,7 +72,7 @@
 SOCKET
 WSPAPI
 WPUCreateSocketHandle(IN  DWORD dwCatalogEntryId,
-                      IN  DWORD dwContext,
+                      IN  DWORD_PTR dwContext,
                       OUT LPINT lpErrno)
 {
     UNIMPLEMENTED
@@ -167,7 +167,7 @@
 WSPAPI
 WPUQueryBlockingCallback(IN  DWORD dwCatalogEntryId,
                          OUT LPBLOCKINGCALLBACK FAR* lplpfnCallback,
-                         OUT LPDWORD lpdwContext,
+                         OUT PDWORD_PTR lpdwContext,
                          OUT LPINT lpErrno)
 {
     UNIMPLEMENTED
@@ -182,7 +182,7 @@
 INT
 WSPAPI
 WPUQuerySocketHandleContext(IN  SOCKET s,
-                            OUT LPDWORD lpContext,
+                            OUT PDWORD_PTR lpContext,
                             OUT LPINT lpErrno)
 {
     UNIMPLEMENTED
@@ -198,7 +198,7 @@
 WSPAPI
 WPUQueueApc(IN  LPWSATHREADID lpThreadId,
             IN  LPWSAUSERAPC lpfnUserApc,
-            IN  DWORD dwContext,
+            IN  DWORD_PTR dwContext,
             OUT LPINT lpErrno)
 {
     UNIMPLEMENTED

Modified: branches/ros-amd64-bringup/reactos/dll/win32/ws2_32/ws2_32.rbuild
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w…
==============================================================================
--- branches/ros-amd64-bringup/reactos/dll/win32/ws2_32/ws2_32.rbuild [iso-8859-1]
(original)
+++ branches/ros-amd64-bringup/reactos/dll/win32/ws2_32/ws2_32.rbuild [iso-8859-1] Mon Nov
 9 09:57:37 2009
@@ -1,4 +1,4 @@
-<module name="ws2_32" type="win32dll"
baseaddress="${BASEADDRESS_WS2_32}" installbase="system32"
installname="ws2_32.dll" unicode="yes">
+<module name="ws2_32" type="win32dll"
baseaddress="${BASEADDRESS_WS2_32}" installbase="system32"
installname="ws2_32.dll" unicode="yes"
allowwarnings="true">
 	<importlibrary definition="ws2_32.spec" />
 	<include base="ws2_32">include</include>
 	<include base="ReactOS">include/reactos/wine</include>