From 1e6fba5a39330fc035fd3c3e40a5720aa1117dd5 Mon Sep 17 00:00:00 2001
From: Casper Hornstrup <chorns@users.sourceforge.net>
Date: Mon, 10 Feb 2003 21:29:41 +0000
Subject: [PATCH] 2003-02-10  Casper S. Hornstrup 
 <chorns@users.sourceforge.net>

	* include/structs.h (OSVERSIONINFOEXA): Expand definition of
	OSVERSIONINFOA.
	(OSVERSIONINFOEXW): Expand definition of OSVERSIONINFOW.
	* lib/msafd/misc/helpers.c (LocateHelperDLL): Cast AddressFamily,
	SocketType, and Protocol to INT.
	* lib/ws2_32/misc/catalog.c (LocateProvider): Ditto.

svn path=/trunk/; revision=4135
---
 reactos/ChangeLog                 |  9 +++++++
 reactos/include/structs.h         | 44 +++++++++++++++----------------
 reactos/lib/msafd/misc/helpers.c  |  6 ++---
 reactos/lib/ws2_32/misc/catalog.c |  8 +++---
 4 files changed, 38 insertions(+), 29 deletions(-)

diff --git a/reactos/ChangeLog b/reactos/ChangeLog
index f3718f20683..ccae3aff160 100644
--- a/reactos/ChangeLog
+++ b/reactos/ChangeLog
@@ -1,3 +1,12 @@
+2003-02-10  Casper S. Hornstrup  <chorns@users.sourceforge.net>
+
+	* include/structs.h (OSVERSIONINFOEXA): Expand definition of
+	OSVERSIONINFOA.
+	(OSVERSIONINFOEXW): Expand definition of OSVERSIONINFOW.
+	* lib/msafd/misc/helpers.c (LocateHelperDLL): Cast AddressFamily,
+	SocketType, and Protocol to INT.
+	* lib/ws2_32/misc/catalog.c (LocateProvider): Ditto.
+
 2003-01-16  Casper S. Hornstrup  <chorns@users.sourceforge.net>
 
 	* ntoskrnl/dbg/profile.c (KdbProfilerThreadMain): Make STDCALL.
diff --git a/reactos/include/structs.h b/reactos/include/structs.h
index 22f7af1ea49..d7c5de3a3cd 100644
--- a/reactos/include/structs.h
+++ b/reactos/include/structs.h
@@ -2923,33 +2923,33 @@ typedef OSVERSIONINFOW OSVERSIONINFO;
 #endif
 
 typedef struct _OSVERSIONINFOEXA
-#ifdef __cplusplus
-: public OSVERSIONINFOA
 {
-#else
-{
- OSVERSIONINFOA;
-#endif
- WORD wServicePackMajor;
- WORD wServicePackMinor;
- WORD wSuiteMask;
- BYTE wProductType;
- BYTE wReserved;
+  DWORD dwOSVersionInfoSize;
+  DWORD dwMajorVersion;
+  DWORD dwMinorVersion;
+  DWORD dwBuildNumber;
+  DWORD dwPlatformId;
+  CHAR szCSDVersion[ 128 ];
+  WORD wServicePackMajor;
+  WORD wServicePackMinor;
+  WORD wSuiteMask;
+  BYTE wProductType;
+  BYTE wReserved;
 } OSVERSIONINFOEXA, *POSVERSIONINFOEXA, *LPOSVERSIONINFOEXA;
 
 typedef struct _OSVERSIONINFOEXW
-#ifdef __cplusplus
-: public OSVERSIONINFOW
 {
-#else
-{
- OSVERSIONINFOW;
-#endif
- WORD wServicePackMajor;
- WORD wServicePackMinor;
- WORD wSuiteMask;
- BYTE wProductType;
- BYTE wReserved;
+  DWORD dwOSVersionInfoSize;
+  DWORD dwMajorVersion;
+  DWORD dwMinorVersion;
+  DWORD dwBuildNumber;
+  DWORD dwPlatformId;
+  WCHAR szCSDVersion[ 128 ];
+  WORD wServicePackMajor;
+  WORD wServicePackMinor;
+  WORD wSuiteMask;
+  BYTE wProductType;
+  BYTE wReserved;
 } OSVERSIONINFOEXW, *POSVERSIONINFOEXW, *LPOSVERSIONINFOEXW;
 
 #ifdef UNICODE
diff --git a/reactos/lib/msafd/misc/helpers.c b/reactos/lib/msafd/misc/helpers.c
index befbb7cc6d3..5d92e1613e9 100644
--- a/reactos/lib/msafd/misc/helpers.c
+++ b/reactos/lib/msafd/misc/helpers.c
@@ -80,9 +80,9 @@ PWSHELPER_DLL LocateHelperDLL(
                                       ListEntry);
 
         for (i = 0; i < HelperDLL->Mapping->Rows; i++) {
-            if ((lpProtocolInfo->iAddressFamily == HelperDLL->Mapping->Mapping[i].AddressFamily) &&
-                (lpProtocolInfo->iSocketType    == HelperDLL->Mapping->Mapping[i].SocketType) &&
-                ((lpProtocolInfo->iProtocol     == HelperDLL->Mapping->Mapping[i].Protocol) ||
+            if ((lpProtocolInfo->iAddressFamily == (INT) HelperDLL->Mapping->Mapping[i].AddressFamily) &&
+                (lpProtocolInfo->iSocketType    == (INT) HelperDLL->Mapping->Mapping[i].SocketType) &&
+                ((lpProtocolInfo->iProtocol     == (INT) HelperDLL->Mapping->Mapping[i].Protocol) ||
                 (lpProtocolInfo->iSocketType    == SOCK_RAW))) {
                 LeaveCriticalSection(&HelperDLLDatabaseLock);
                 AFD_DbgPrint(MAX_TRACE, ("Returning helper DLL at (0x%X).\n", HelperDLL));
diff --git a/reactos/lib/ws2_32/misc/catalog.c b/reactos/lib/ws2_32/misc/catalog.c
index d907b733991..ef077be124f 100644
--- a/reactos/lib/ws2_32/misc/catalog.c
+++ b/reactos/lib/ws2_32/misc/catalog.c
@@ -131,10 +131,10 @@ PCATALOG_ENTRY LocateProvider(
                                  ListEntry);
 
     for (i = 0; i < Provider->Mapping->Rows; i++) {
-      if ((lpProtocolInfo->iAddressFamily == Provider->Mapping->Mapping[i].AddressFamily) &&
-        (lpProtocolInfo->iSocketType    == Provider->Mapping->Mapping[i].SocketType) &&
-        ((lpProtocolInfo->iProtocol     == Provider->Mapping->Mapping[i].Protocol) ||
-        (lpProtocolInfo->iSocketType    == SOCK_RAW))) {
+      if ((lpProtocolInfo->iAddressFamily == (INT) Provider->Mapping->Mapping[i].AddressFamily) &&
+        (lpProtocolInfo->iSocketType      == (INT) Provider->Mapping->Mapping[i].SocketType) &&
+        ((lpProtocolInfo->iProtocol       == (INT) Provider->Mapping->Mapping[i].Protocol) ||
+        (lpProtocolInfo->iSocketType      == SOCK_RAW))) {
         //LeaveCriticalSection(&CatalogLock);
 				WS_DbgPrint(MID_TRACE, ("Returning provider at (0x%X).\n", Provider));
         return Provider;