[ros-diffs] [sserapion] 44783: - Fix LPBLOCKINGCALLBACK - Don't use size_t for string sizes. - Fixes warnings.

Author: sserapion
Date: Mon Dec 28 02:07:10 2009
New Revision: 44783

URL: http://svn.reactos.org/svn/reactos?rev=44783&view=rev
Log:
- Fix LPBLOCKINGCALLBACK
- Don't use size_t for string sizes.
- Fixes warnings.

Modified:
    branches/ros-amd64-bringup/reactos/dll/win32/ws2_32_new/inc/ws2_32p.h
    branches/ros-amd64-bringup/reactos/dll/win32/ws2_32_new/src/qshelpr.c
    branches/ros-amd64-bringup/reactos/include/psdk/ws2spi.h

Modified: branches/ros-amd64-bringup/reactos/dll/win32/ws2_32_new/inc/ws2_32p.h
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/wi...
==============================================================================
--- branches/ros-amd64-bringup/reactos/dll/win32/ws2_32_new/inc/ws2_32p.h [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/dll/win32/ws2_32_new/inc/ws2_32p.h [iso-8859-1] Mon Dec 28 02:07:10 2009
@@ -299,13 +299,13 @@
 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

Modified: branches/ros-amd64-bringup/reactos/dll/win32/ws2_32_new/src/qshelpr.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/wi...
==============================================================================
--- branches/ros-amd64-bringup/reactos/dll/win32/ws2_32_new/src/qshelpr.c [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/dll/win32/ws2_32_new/src/qshelpr.c [iso-8859-1] Mon Dec 28 02:07:10 2009
@@ -807,11 +807,11 @@
 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 @@
 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;

Modified: branches/ros-amd64-bringup/reactos/include/psdk/ws2spi.h
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/includ...
==============================================================================
--- branches/ros-amd64-bringup/reactos/include/psdk/ws2spi.h [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/include/psdk/ws2spi.h [iso-8859-1] Mon Dec 28 02:07:10 2009
@@ -39,7 +39,7 @@
    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 */