[ros-diffs] [cgutman] 48010: [MSAFD, PSDK] - Merge part of r45435

Author: cgutman
Date: Mon Jul 12 18:41:41 2010
New Revision: 48010

URL: http://svn.reactos.org/svn/reactos?rev=48010&view=rev
Log:
[MSAFD, PSDK]
- Merge part of r45435

Modified:
    trunk/reactos/dll/win32/msafd/include/helpers.h
    trunk/reactos/dll/win32/msafd/misc/helpers.c
    trunk/reactos/include/psdk/wsahelp.h

Modified: trunk/reactos/dll/win32/msafd/include/helpers.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/include/he…
==============================================================================
--- trunk/reactos/dll/win32/msafd/include/helpers.h [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msafd/include/helpers.h [iso-8859-1] Mon Jul 12 18:41:41 2010
@@ -26,7 +26,7 @@
 	PWSH_GET_SOCKET_INFORMATION		WSHGetSocketInformation;
 	PWSH_SET_SOCKET_INFORMATION		WSHSetSocketInformation;
 	PWSH_GET_SOCKADDR_TYPE			WSHGetSockaddrType;
-	PWSH_GET_WILDCARD_SOCKEADDR		WSHGetWildcardSockaddr;
+	PWSH_GET_WILDCARD_SOCKADDR		WSHGetWildcardSockaddr;
 	PWSH_GET_BROADCAST_SOCKADDR		WSHGetBroadcastSockaddr;
 	PWSH_ADDRESS_TO_STRING			WSHAddressToString;
 	PWSH_STRING_TO_ADDRESS			WSHStringToAddress;

Modified: trunk/reactos/dll/win32/msafd/misc/helpers.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/misc/helpe…
==============================================================================
--- trunk/reactos/dll/win32/msafd/misc/helpers.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msafd/misc/helpers.c [iso-8859-1] Mon Jul 12 18:41:41 2010
@@ -454,7 +454,7 @@
     HelperData->WSHGetSockaddrType = (PWSH_GET_SOCKADDR_TYPE)
 										GetProcAddress(HelperData->hInstance,
 										"WSHGetSockaddrType");
-    HelperData->WSHGetWildcardSockaddr = (PWSH_GET_WILDCARD_SOCKEADDR)
+    HelperData->WSHGetWildcardSockaddr = (PWSH_GET_WILDCARD_SOCKADDR)
 											GetProcAddress(HelperData->hInstance,
 											"WSHGetWildcardSockaddr");
     HelperData->WSHGetBroadcastSockaddr = (PWSH_GET_BROADCAST_SOCKADDR)

Modified: trunk/reactos/include/psdk/wsahelp.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wsahelp.h?rev…
==============================================================================
--- trunk/reactos/include/psdk/wsahelp.h [iso-8859-1] (original)
+++ trunk/reactos/include/psdk/wsahelp.h [iso-8859-1] Mon Jul 12 18:41:41 2010
@@ -70,7 +70,7 @@
 typedef INT (WINAPI *PWSH_GET_PROVIDER_GUID)(LPWSTR,LPGUID);
 typedef INT (WINAPI *PWSH_GET_SOCKADDR_TYPE)(PSOCKADDR,DWORD,PSOCKADDR_INFO);
 typedef INT (WINAPI
*PWSH_GET_SOCKET_INFORMATION)(PVOID,SOCKET,HANDLE,HANDLE,INT,INT,PCHAR,LPINT);
-typedef INT (WINAPI *PWSH_GET_WILDCARD_SOCKEADDR)(PVOID,PSOCKADDR,PINT);
+typedef INT (WINAPI *PWSH_GET_WILDCARD_SOCKADDR)(PVOID,PSOCKADDR,PINT);
 typedef DWORD (WINAPI *PWSH_GET_WINSOCK_MAPPING)(PWINSOCK_MAPPING,DWORD);
 typedef INT (WINAPI *PWSH_GET_WSAPROTOCOL_INFO)(LPWSTR,LPWSAPROTOCOL_INFOW*,LPDWORD);
 typedef INT (WINAPI *PWSH_IOCTL)(PVOID,SOCKET,HANDLE,HANDLE,DWORD,LPVOID,DWORD,