- Fix LPBLOCKINGCALLBACK

- Don't use size_t for string sizes.
- Fixes warnings.

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

diff --git a/reactos/dll/win32/ws2_32_new/inc/ws2_32p.h b/reactos/dll/win32/ws2_32_new/inc/ws2_32p.h
index 3998349..09f8981 100644 (file)
--- a/reactos/dll/win32/ws2_32_new/inc/ws2_32p.h
+++ b/reactos/dll/win32/ws2_32_new/inc/ws2_32p.h
@@ -299,13 +299,13 @@ MapUnicodeProtocolInfoToAnsi(IN LPWSAPROTOCOL_INFOW UnicodeInfo,
 INT
 WSAAPI
 MapAnsiQuerySetToUnicode(IN LPWSAQUERYSETA AnsiSet,
-                         IN OUT PSIZE_T SetSize,
+                         IN OUT PDWORD SetSize,
                          OUT LPWSAQUERYSETW UnicodeSet);
 
 INT
 WSAAPI
 MapUnicodeQuerySetToAnsi(OUT LPWSAQUERYSETW UnicodeSet,
-                         IN OUT PSIZE_T SetSize,
+                         IN OUT PDWORD SetSize,
                          IN LPWSAQUERYSETA AnsiSet);
 
 INT

diff --git a/reactos/dll/win32/ws2_32_new/src/qshelpr.c b/reactos/dll/win32/ws2_32_new/src/qshelpr.c
index 6607274..1d40f77 100644 (file)
--- a/reactos/dll/win32/ws2_32_new/src/qshelpr.c
+++ b/reactos/dll/win32/ws2_32_new/src/qshelpr.c
@@ -807,11 +807,11 @@ WSABuildQuerySetBufferW(IN LPWSAQUERYSETW UnicodeSet,
 INT
 WSAAPI
 MapAnsiQuerySetToUnicode(IN LPWSAQUERYSETA AnsiSet,
-                         IN OUT PSIZE_T SetSize,
+                         IN OUT PDWORD SetSize,
                          OUT LPWSAQUERYSETW UnicodeSet)
 {
     INT ErrorCode = ERROR_SUCCESS;
-    SIZE_T AnsiSize, UnicodeSize;
+    DWORD AnsiSize, UnicodeSize;
     LPWSAQUERYSETA AnsiCopy = NULL;
     LPWSAQUERYSETW UnicodeCopy;
     LPWSTR ServiceCopy = NULL, CommentCopy = NULL;
@@ -928,11 +928,11 @@ error:
 INT
 WSAAPI
 MapUnicodeQuerySetToAnsi(OUT LPWSAQUERYSETW UnicodeSet,
-                         IN OUT PSIZE_T SetSize,
+                         IN OUT PDWORD SetSize,
                          IN LPWSAQUERYSETA AnsiSet)
 {
     INT ErrorCode = ERROR_SUCCESS;
-    SIZE_T UnicodeSize, AnsiSize;
+    DWORD UnicodeSize, AnsiSize;
     LPWSAQUERYSETW UnicodeCopy = NULL;
     LPWSAQUERYSETA AnsiCopy;
     LPSTR ServiceCopy = NULL, CommentCopy = NULL;

diff --git a/reactos/include/psdk/ws2spi.h b/reactos/include/psdk/ws2spi.h
index c34e0b8..78eed98 100644 (file)
--- a/reactos/include/psdk/ws2spi.h
+++ b/reactos/include/psdk/ws2spi.h
@@ -39,7 +39,7 @@ typedef struct _WSATHREADID {
        DWORD Reserved;
 } WSATHREADID, FAR *LPWSATHREADID;
 
-typedef BOOL (CALLBACK FAR *LPBLOCKINGCALLBACK)(DWORD);
+typedef BOOL (CALLBACK FAR *LPBLOCKINGCALLBACK)(DWORD_PTR);
 typedef VOID (CALLBACK FAR *LPWSAUSERAPC)(DWORD);
 
 /* Prototypes for service provider procedure table */