Fix ws2_32 64bit build (2 of 2)

svn path=/branches/ros-amd64-bringup/; revision=44045

diff --git a/reactos/dll/win32/ws2_32/include/upcall.h b/reactos/dll/win32/ws2_32/include/upcall.h
index 16ec65a..25404f4 100644 (file)
--- a/reactos/dll/win32/ws2_32/include/upcall.h
+++ b/reactos/dll/win32/ws2_32/include/upcall.h
@@ -34,7 +34,7 @@ SOCKET
 WSPAPI
 WPUCreateSocketHandle(
     IN  DWORD dwCatalogEntryId,
-    IN  DWORD dwContext,
+    IN  DWORD_PTR dwContext,
     OUT LPINT lpErrno);
 
 int
@@ -69,14 +69,14 @@ WSPAPI
 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 @@ WSPAPI
 WPUQueueApc(
     IN  LPWSATHREADID lpThreadId,
     IN  LPWSAUSERAPC lpfnUserApc,
-    IN  DWORD dwContext,
+    IN  DWORD_PTR dwContext,
     OUT LPINT lpErrno);
 
 BOOL

diff --git a/reactos/dll/win32/ws2_32/misc/async.c b/reactos/dll/win32/ws2_32/misc/async.c
index 558960c..a130e7a 100644 (file)
--- a/reactos/dll/win32/ws2_32/misc/async.c
+++ b/reactos/dll/win32/ws2_32/misc/async.c
@@ -111,8 +111,6 @@ typedef struct protoent WS_protoent;
 #endif
 #endif
 
-#define CALLBACK __stdcall
-
 #include "wine/winbase16.h"
 #include "windef.h"
 #include "winbase.h"

diff --git a/reactos/dll/win32/ws2_32/misc/upcall.c b/reactos/dll/win32/ws2_32/misc/upcall.c
index 3ba3b41..ad0ce94 100644 (file)
--- a/reactos/dll/win32/ws2_32/misc/upcall.c
+++ b/reactos/dll/win32/ws2_32/misc/upcall.c
@@ -72,7 +72,7 @@ WPUCreateEvent(OUT LPINT lpErrno)
 SOCKET
 WSPAPI
 WPUCreateSocketHandle(IN  DWORD dwCatalogEntryId,
-                      IN  DWORD dwContext,
+                      IN  DWORD_PTR dwContext,
                       OUT LPINT lpErrno)
 {
     UNIMPLEMENTED
@@ -167,7 +167,7 @@ INT
 WSPAPI
 WPUQueryBlockingCallback(IN  DWORD dwCatalogEntryId,
                          OUT LPBLOCKINGCALLBACK FAR* lplpfnCallback,
-                         OUT LPDWORD lpdwContext,
+                         OUT PDWORD_PTR lpdwContext,
                          OUT LPINT lpErrno)
 {
     UNIMPLEMENTED
@@ -182,7 +182,7 @@ WPUQueryBlockingCallback(IN  DWORD dwCatalogEntryId,
 INT
 WSPAPI
 WPUQuerySocketHandleContext(IN  SOCKET s,
-                            OUT LPDWORD lpContext,
+                            OUT PDWORD_PTR lpContext,
                             OUT LPINT lpErrno)
 {
     UNIMPLEMENTED
@@ -198,7 +198,7 @@ INT
 WSPAPI
 WPUQueueApc(IN  LPWSATHREADID lpThreadId,
             IN  LPWSAUSERAPC lpfnUserApc,
-            IN  DWORD dwContext,
+            IN  DWORD_PTR dwContext,
             OUT LPINT lpErrno)
 {
     UNIMPLEMENTED

diff --git a/reactos/dll/win32/ws2_32/ws2_32.rbuild b/reactos/dll/win32/ws2_32/ws2_32.rbuild
index 849ed1c..c249ae9 100644 (file)
--- a/reactos/dll/win32/ws2_32/ws2_32.rbuild
+++ b/reactos/dll/win32/ws2_32/ws2_32.rbuild
@@ -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>