- Fix LPBLOCKINGCALLBACK

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

svn path=/branches/ros-amd64-bringup/; revision=44783
This commit is contained in:
Samuel Serapion 2009-12-28 01:07:10 +00:00
parent c5a84e9af7
commit 214120100d
3 changed files with 7 additions and 7 deletions

View file

@ -299,13 +299,13 @@ MapUnicodeProtocolInfoToAnsi(IN LPWSAPROTOCOL_INFOW UnicodeInfo,
INT INT
WSAAPI WSAAPI
MapAnsiQuerySetToUnicode(IN LPWSAQUERYSETA AnsiSet, MapAnsiQuerySetToUnicode(IN LPWSAQUERYSETA AnsiSet,
IN OUT PSIZE_T SetSize, IN OUT PDWORD SetSize,
OUT LPWSAQUERYSETW UnicodeSet); OUT LPWSAQUERYSETW UnicodeSet);
INT INT
WSAAPI WSAAPI
MapUnicodeQuerySetToAnsi(OUT LPWSAQUERYSETW UnicodeSet, MapUnicodeQuerySetToAnsi(OUT LPWSAQUERYSETW UnicodeSet,
IN OUT PSIZE_T SetSize, IN OUT PDWORD SetSize,
IN LPWSAQUERYSETA AnsiSet); IN LPWSAQUERYSETA AnsiSet);
INT INT

View file

@ -807,11 +807,11 @@ WSABuildQuerySetBufferW(IN LPWSAQUERYSETW UnicodeSet,
INT INT
WSAAPI WSAAPI
MapAnsiQuerySetToUnicode(IN LPWSAQUERYSETA AnsiSet, MapAnsiQuerySetToUnicode(IN LPWSAQUERYSETA AnsiSet,
IN OUT PSIZE_T SetSize, IN OUT PDWORD SetSize,
OUT LPWSAQUERYSETW UnicodeSet) OUT LPWSAQUERYSETW UnicodeSet)
{ {
INT ErrorCode = ERROR_SUCCESS; INT ErrorCode = ERROR_SUCCESS;
SIZE_T AnsiSize, UnicodeSize; DWORD AnsiSize, UnicodeSize;
LPWSAQUERYSETA AnsiCopy = NULL; LPWSAQUERYSETA AnsiCopy = NULL;
LPWSAQUERYSETW UnicodeCopy; LPWSAQUERYSETW UnicodeCopy;
LPWSTR ServiceCopy = NULL, CommentCopy = NULL; LPWSTR ServiceCopy = NULL, CommentCopy = NULL;
@ -928,11 +928,11 @@ error:
INT INT
WSAAPI WSAAPI
MapUnicodeQuerySetToAnsi(OUT LPWSAQUERYSETW UnicodeSet, MapUnicodeQuerySetToAnsi(OUT LPWSAQUERYSETW UnicodeSet,
IN OUT PSIZE_T SetSize, IN OUT PDWORD SetSize,
IN LPWSAQUERYSETA AnsiSet) IN LPWSAQUERYSETA AnsiSet)
{ {
INT ErrorCode = ERROR_SUCCESS; INT ErrorCode = ERROR_SUCCESS;
SIZE_T UnicodeSize, AnsiSize; DWORD UnicodeSize, AnsiSize;
LPWSAQUERYSETW UnicodeCopy = NULL; LPWSAQUERYSETW UnicodeCopy = NULL;
LPWSAQUERYSETA AnsiCopy; LPWSAQUERYSETA AnsiCopy;
LPSTR ServiceCopy = NULL, CommentCopy = NULL; LPSTR ServiceCopy = NULL, CommentCopy = NULL;

View file

@ -39,7 +39,7 @@ typedef struct _WSATHREADID {
DWORD Reserved; DWORD Reserved;
} WSATHREADID, FAR *LPWSATHREADID; } WSATHREADID, FAR *LPWSATHREADID;
typedef BOOL (CALLBACK FAR *LPBLOCKINGCALLBACK)(DWORD); typedef BOOL (CALLBACK FAR *LPBLOCKINGCALLBACK)(DWORD_PTR);
typedef VOID (CALLBACK FAR *LPWSAUSERAPC)(DWORD); typedef VOID (CALLBACK FAR *LPWSAUSERAPC)(DWORD);
/* Prototypes for service provider procedure table */ /* Prototypes for service provider procedure table */