Add more debug info and better error control, from Elrond.

A few minor changes by me.

svn path=/trunk/; revision=19676

diff --git a/reactos/lib/iphlpapi/ifenum_reactos.c b/reactos/lib/iphlpapi/ifenum_reactos.c
index 91dd58a..9274d40 100644 (file)
--- a/reactos/lib/iphlpapi/ifenum_reactos.c
+++ b/reactos/lib/iphlpapi/ifenum_reactos.c
@@ -40,7 +40,7 @@
 #include "ifenum.h"
 #include <assert.h>
 
-#define NDEBUG
+#define DEBUG
 #include "debug.h"
 
 /* Globals */
@@ -95,7 +95,9 @@ NTSTATUS openTcpFile(PHANDLE tcpFile) {
     /* String does not need to be freed: it points to the constant
      * string we provided */
 
-    TRACE("returning %08x\n", (int)status);
+    if (!NT_SUCCESS(status)) {
+        DPRINT1("openTcpFile for <%wZ> failed: 0x%lx\n", &fileName, status);
+    }
 
     return status;
 }
@@ -356,9 +358,13 @@ static NTSTATUS getInterfaceInfoSet( HANDLE tcpFile,
     BOOL interfaceInfoComplete;
     int curInterf = 0, i;
 
-    if( NT_SUCCESS(status) )
-        infoSetInt = HeapAlloc( GetProcessHeap(), 0, 
-                                sizeof(IFInfo) * numEntities );
+    if (!NT_SUCCESS(status)) {
+        DPRINT1("getInterfaceInfoSet: tdiGetEntityIDSet() failed: 0x%lx\n", status);
+        return status;
+    }
+
+    infoSetInt = HeapAlloc( GetProcessHeap(), 0, 
+                            sizeof(IFInfo) * numEntities );
     
     if( infoSetInt ) {
         for( i = 0; i < numEntities; i++ ) {
@@ -643,6 +649,11 @@ NTSTATUS getIPAddrEntryForIf(HANDLE tcpFile,
         name ? 
         getInterfaceInfoByName( tcpFile, name, ifInfo ) :
         getInterfaceInfoByIndex( tcpFile, index, ifInfo );
+
+    if (!NT_SUCCESS(status)) {
+        DPRINT1("getIPAddrEntryForIf returning %lx\n", status);
+    }
+
     return status;
 }
 
@@ -848,10 +859,14 @@ NTSTATUS addIPAddress( IPAddr Address, IPMask Mask, DWORD IfIndex,
       *NteInstance = Data.NewAddress;
   }
 
+  if (!NT_SUCCESS(status)) {
+      DPRINT1("addIPAddress for if %d returning 0x%lx\n", IfIndex, status);
+  }
+
   switch( status ) {
-  case STATUS_SUCCESS: return ERROR_SUCCESS;
-  case STATUS_DEVICE_DOES_NOT_EXIST: return ERROR_DEV_NOT_EXIST;
-  default: return status;
+      case STATUS_SUCCESS: return ERROR_SUCCESS;
+      case STATUS_DEVICE_DOES_NOT_EXIST: return ERROR_DEV_NOT_EXIST;
+      default: return status;
   }
 }
 
@@ -878,6 +893,13 @@ NTSTATUS deleteIpAddress( ULONG NteContext )
 
   closeTcpFile( tcpFile );
 
-  if( NT_SUCCESS(status) ) return ERROR_SUCCESS;
-  else return ERROR_GEN_FAILURE;
+  if (!NT_SUCCESS(status)) {
+      DPRINT1("deleteIpAddress(%lu) returning 0x%lx\n", NteContext, status);
+  }
+
+
+  if( NT_SUCCESS(status) ) 
+         return ERROR_SUCCESS;
+  else 
+         return ERROR_GEN_FAILURE;
 }

diff --git a/reactos/lib/iphlpapi/iphlpapi_main.c b/reactos/lib/iphlpapi/iphlpapi_main.c
index c0a2bfe..d5c0911 100644 (file)
--- a/reactos/lib/iphlpapi/iphlpapi_main.c
+++ b/reactos/lib/iphlpapi/iphlpapi_main.c
@@ -37,7 +37,7 @@
 # include <resolv.h>
 #endif
 
-
+#define DEBUG
 #include "windef.h"
 #include "winbase.h"
 #include "winreg.h"
@@ -84,7 +84,7 @@ BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
  */
 DWORD WINAPI AddIPAddress(IPAddr Address, IPMask Netmask, DWORD IfIndex, PULONG NteContext, PULONG NteInstance)
 {
-    return addIPAddress( Address, Netmask, IfIndex, NteContext, NteInstance );
+    return RtlNtStatusToDosError(addIPAddress(Address, Netmask, IfIndex, NteContext, NteInstance));
 }
 
 
@@ -402,7 +402,7 @@ DWORD WINAPI CreateProxyArpEntry(DWORD dwAddress, DWORD dwMask, DWORD dwIfIndex)
 DWORD WINAPI DeleteIPAddress(ULONG NTEContext)
 {
   TRACE("NTEContext %ld\n", NTEContext);
-  return deleteIpAddress( NTEContext );
+  return RtlNtStatusToDosError(deleteIpAddress(NTEContext));
 }
 
 
@@ -613,7 +613,7 @@ DWORD WINAPI GetAdaptersInfo(PIP_ADAPTER_INFO pAdapterInfo, PULONG pOutBufLen)
                 winsEnabled = TRUE;
               RegCloseKey(hKey);
             }
-
+                       TRACE("num of index is %lu\n", table->numIndexes);
             for (ndx = 0; ndx < table->numIndexes; ndx++) {
               PIP_ADAPTER_INFO ptr = &pAdapterInfo[ndx];
               DWORD addrLen = sizeof(ptr->Address), type;