[spetreolle] 41409: Cleanup GetAdaptersAddresses. Add GetIfTable2 and GetIfEntry2 stubs based on janderwald patch

Author: spetreolle
Date: Sun Jun 14 18:10:32 2009
New Revision: 41409

URL: http://svn.reactos.org/svn/reactos?rev=41409&view=rev
Log:
Cleanup GetAdaptersAddresses.
Add GetIfTable2 and GetIfEntry2 stubs
based on janderwald patch

Modified:
    trunk/reactos/dll/win32/iphlpapi/iphlpapi.rbuild
    trunk/reactos/dll/win32/iphlpapi/iphlpapi.spec
    trunk/reactos/dll/win32/iphlpapi/iphlpapi_main.c
    trunk/reactos/dll/win32/iphlpapi/iphlpapi_private.h

Modified: trunk/reactos/dll/win32/iphlpapi/iphlpapi.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iphlpapi/iphlpapi...
==============================================================================
--- trunk/reactos/dll/win32/iphlpapi/iphlpapi.rbuild [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/iphlpapi/iphlpapi.rbuild [iso-8859-1] Sun Jun 14 18:10:32 2009
@@ -1,6 +1,6 @@
 <module name="iphlpapi" type="win32dll" baseaddress="${BASEADDRESS_IPHLPAPI}" installbase="system32" installname="iphlpapi.dll" allowwarnings="true" unicode="yes" crt="msvcrt">
    <importlibrary definition="iphlpapi.spec" />
-	<include base="iphlpapi">include</include>
+	<include base="iphlpapi">.</include>
    <include base="ReactOS">include/reactos/wine</include>
    <library>wine</library>
    <library>ntdll</library>

Modified: trunk/reactos/dll/win32/iphlpapi/iphlpapi.spec
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iphlpapi/iphlpapi...
==============================================================================
--- trunk/reactos/dll/win32/iphlpapi/iphlpapi.spec [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/iphlpapi/iphlpapi.spec [iso-8859-1] Sun Jun 14 18:10:32 2009
@@ -40,8 +40,10 @@
 @ stub GetIcmpStatsFromStack
 @ stub GetIcmpStatsFromStackEx
 @ stdcall GetIfEntry( ptr )
+@ stdcall GetIfEntry2( ptr )
 @ stub GetIfEntryFromStack
 @ stdcall GetIfTable( ptr ptr long )
+@ stdcall GetIfTable2(ptr)
 @ stub GetIfTableFromStack
 @ stub GetIgmpList
 @ stdcall GetInterfaceInfo( ptr ptr )

Modified: trunk/reactos/dll/win32/iphlpapi/iphlpapi_main.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iphlpapi/iphlpapi...
==============================================================================
--- trunk/reactos/dll/win32/iphlpapi/iphlpapi_main.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/iphlpapi/iphlpapi_main.c [iso-8859-1] Sun Jun 14 18:10:32 2009
@@ -2179,7 +2179,19 @@
 DWORD WINAPI GetAdaptersAddresses(ULONG Family,ULONG Flags,PVOID Reserved,PIP_ADAPTER_ADDRESSES pAdapterAddresses,PULONG pOutBufLen)
 {
     if (!pOutBufLen) return ERROR_INVALID_PARAMETER;
-
+    if (!pAdapterAddresses || *pOutBufLen == 0)
+      return ERROR_BUFFER_OVERFLOW;
+    if (Reserved) return ERROR_INVALID_PARAMETER;
+
+    FIXME(":stub\n");
+    return ERROR_NO_DATA;
+}
+
+/*
+ * @unimplemented
+ */
+BOOL WINAPI CancelIPChangeNotify(LPOVERLAPPED notifyOverlapped)
+{
     FIXME(":stub\n");
     return 0L;
 }
@@ -2187,7 +2199,7 @@
 /*
  * @unimplemented
  */
-BOOL WINAPI CancelIPChangeNotify(LPOVERLAPPED notifyOverlapped)
+DWORD WINAPI GetBestInterfaceEx(struct sockaddr *pDestAddr,PDWORD pdwBestIfIndex)
 {
     FIXME(":stub\n");
     return 0L;
@@ -2196,7 +2208,7 @@
 /*
  * @unimplemented
  */
-DWORD WINAPI GetBestInterfaceEx(struct sockaddr *pDestAddr,PDWORD pdwBestIfIndex)
+DWORD WINAPI NhpAllocateAndGetInterfaceInfoFromStack(IP_INTERFACE_NAME_INFO **ppTable,PDWORD pdwCount,BOOL bOrder,HANDLE hHeap,DWORD dwFlags)
 {
     FIXME(":stub\n");
     return 0L;
@@ -2205,19 +2217,39 @@
 /*
  * @unimplemented
  */
-DWORD WINAPI NhpAllocateAndGetInterfaceInfoFromStack(IP_INTERFACE_NAME_INFO **ppTable,PDWORD pdwCount,BOOL bOrder,HANDLE hHeap,DWORD dwFlags)
+DWORD WINAPI GetIcmpStatisticsEx(PMIB_ICMP_EX pStats,DWORD dwFamily)
 {
     FIXME(":stub\n");
     return 0L;
 }

-/*
- * @unimplemented
- */
-DWORD WINAPI GetIcmpStatisticsEx(PMIB_ICMP_EX pStats,DWORD dwFamily)
-{
-    FIXME(":stub\n");
-    return 0L;
-}
-
-
+/******************************************************************
+ *    GetIfTable2 (IPHLPAPI.@)
+ *
+ * PARAMS
+ *  pIfTable [In/Out]
+ */
+ 
+NETIOAPI_API WINAPI GetIfTable2(PMIB_IF_TABLE2 *pIfTable)
+{
+    UNIMPLEMENTED;
+    return ERROR_NOT_SUPPORTED;
+}
+
+/******************************************************************
+ *    GetIfEntry2 (IPHLPAPI.@)
+ *
+ * PARAMS
+ *  pIfRow [In/Out]
+ */
+NETIOAPI_API WINAPI GetIfEntry2(IN OUT PMIB_IF_ROW2 pIfRow)
+{
+  TRACE("pIfRow %p\n", pIfRow);
+  if (!pIfRow)
+    return ERROR_INVALID_PARAMETER;
+    
+  UNIMPLEMENTED;
+  return ERROR_NOT_SUPPORTED;
+}
+
+

Modified: trunk/reactos/dll/win32/iphlpapi/iphlpapi_private.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iphlpapi/iphlpapi...
==============================================================================
--- trunk/reactos/dll/win32/iphlpapi/iphlpapi_private.h [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/iphlpapi/iphlpapi_private.h [iso-8859-1] Sun Jun 14 18:10:32 2009
@@ -23,6 +23,7 @@
 #define _WIN32_WINNT 0x500
 #define WIN32_NO_STATUS
 #include <winsock2.h>
+#include <ws2tcpip.h>
 #include <windows.h>
 #define NTOS_MODE_USER
 #include <ndk/ntndk.h>
@@ -32,6 +33,7 @@
 #include "resinfo.h"
 #include "wine/debug.h"

+//#include "ntddndis.h"
 #include "ddk/tdiinfo.h"
 #include "tcpioctl.h"