Remove the temp note. Gé is on fire !

[reactos.git] / reactos / apps / utils / net / ipconfig / ipconfig.c

diff --git a/reactos/apps/utils/net/ipconfig/ipconfig.c b/reactos/apps/utils/net/ipconfig/ipconfig.c
index e440508..8c0c412 100644 (file)
--- a/reactos/apps/utils/net/ipconfig/ipconfig.c
+++ b/reactos/apps/utils/net/ipconfig/ipconfig.c
@@ -32,6 +32,7 @@
 #define _UNICODE
 
 
+
 LPCTSTR GetNodeTypeName(UINT NodeType)
 {
     switch (NodeType) {
@@ -104,6 +105,8 @@ INT ShowInfo(BOOL bAll)
     ULONG    netOutBufLen;
     PIP_ADDR_STRING pIPAddr = NULL;
 
+       DWORD ErrRet = 0;
+
     /* assign memory for call to GetNetworkParams */
     pFixedInfo = (FIXED_INFO *) GlobalAlloc( GPTR, sizeof( FIXED_INFO ) );
     netOutBufLen = sizeof(FIXED_INFO);
@@ -126,41 +129,42 @@ INT ShowInfo(BOOL bAll)
        pAdapterInfo = (IP_ADAPTER_INFO *) malloc (adaptOutBufLen);
     }
 
-    if (! GetAdaptersInfo(pAdapterInfo, &adaptOutBufLen) == NO_ERROR)
+    if ((ErrRet = GetAdaptersInfo(pAdapterInfo, &adaptOutBufLen)) != NO_ERROR)
        {
-               _tprintf(_T("GetAdaptersInfo failed %lu\n"), GetLastError());
+               _tprintf(_T("GetAdaptersInfo failed : "));
+               DoFormatMessage(ErrRet);
                return EXIT_FAILURE;
        }
 
-    if (! GetNetworkParams(pFixedInfo, &netOutBufLen) == NO_ERROR)
+    if ((ErrRet = GetNetworkParams(pFixedInfo, &netOutBufLen)) != NO_ERROR)
        {
-        _tprintf(_T("GetNetworkParams failed %lu\n"), GetLastError());
+               _tprintf(_T("GetNetworkParams failed : "));
+               DoFormatMessage(ErrRet);
                return EXIT_FAILURE;
        }
     
     pAdapter = pAdapterInfo;
-        //HKEY hKey;
-        //LPCTSTR lpSubKey = _T("SYSTEM\\ControlSet\\Control\\Network");
 
     _tprintf(_T("\nReactOS IP Configuration\n\n"));
 
+    if (bAll)
+    {
+        _tprintf(_T("\tHost Name . . . . . . . . . . . . : %s\n"), pFixedInfo->HostName);
+        _tprintf(_T("\tPrimary DNS Suffix. . . . . . . . : \n"));
+        _tprintf(_T("\tNode Type . . . . . . . . . . . . : %s\n"), GetNodeTypeName(pFixedInfo->NodeType));
+        if (pFixedInfo->EnableRouting)
+            _tprintf(_T("\tIP Routing Enabled. . . . . . . . : Yes\n"));
+        else
+            _tprintf(_T("\tIP Routing Enabled. . . . . . . . : No\n"));
+        if (pAdapter->HaveWins)
+            _tprintf(_T("\tWINS Proxy enabled. . . . . . . . : Yes\n"));
+        else
+            _tprintf(_T("\tWINS Proxy enabled. . . . . . . . : No\n"));
+        _tprintf(_T("\tDNS Suffix Search List. . . . . . : %s\n"), pFixedInfo->DomainName);
+    }
+
        while (pAdapter)
        {
-        if (bAll)
-        {
-            _tprintf(_T("\tHost Name . . . . . . . . . . . . : %s\n"), pFixedInfo->HostName);
-            _tprintf(_T("\tPrimary DNS Suffix. . . . . . . . : \n"));
-            _tprintf(_T("\tNode Type . . . . . . . . . . . . : %s\n"), GetNodeTypeName(pFixedInfo->NodeType));
-            if (pFixedInfo->EnableRouting)
-                _tprintf(_T("\tIP Routing Enabled. . . . . . . . : Yes\n"));
-            else
-                _tprintf(_T("\tIP Routing Enabled. . . . . . . . : No\n"));
-            if (pAdapter->HaveWins)
-                _tprintf(_T("\tWINS Proxy enabled. . . . . . . . : Yes\n"));
-            else
-                _tprintf(_T("\tWINS Proxy enabled. . . . . . . . : No\n"));
-            _tprintf(_T("\tDNS Suffix Search List. . . . . . : %s\n"), pFixedInfo->DomainName);
-        }
 
         _tprintf(_T("\n%s ...... : \n\n"), GetInterfaceTypeName(pAdapter->Type));
         
@@ -231,8 +235,9 @@ INT Release(TCHAR Index)
     if (Index == (TCHAR)NULL)
     {
         PIP_INTERFACE_INFO pInfo;
+        ULONG ulOutBufLen;
         pInfo = (IP_INTERFACE_INFO *) malloc(sizeof(IP_INTERFACE_INFO));
-        ULONG ulOutBufLen = 0;
+        ulOutBufLen = 0;
 
         /* Make an initial call to GetInterfaceInfo to get
          * the necessary size into the ulOutBufLen variable */
@@ -285,8 +290,9 @@ INT Renew(TCHAR Index)
     if (Index == (TCHAR)NULL)
     {
         PIP_INTERFACE_INFO pInfo;
+        ULONG ulOutBufLen;
         pInfo = (IP_INTERFACE_INFO *) malloc(sizeof(IP_INTERFACE_INFO));
-        ULONG ulOutBufLen = 0;
+        ulOutBufLen = 0;
 
         /* Make an initial call to GetInterfaceInfo to get
          * the necessary size into the ulOutBufLen variable */
@@ -330,9 +336,12 @@ VOID Info()
 {
      // Declare and initialize variables
     PIP_INTERFACE_INFO pInfo;
+    ULONG ulOutBufLen;
+    DWORD dwRetVal;
+
     pInfo = (IP_INTERFACE_INFO *) malloc( sizeof(IP_INTERFACE_INFO) );
-    ULONG ulOutBufLen = sizeof(IP_INTERFACE_INFO);
-    DWORD dwRetVal = 0;
+    ulOutBufLen = sizeof(IP_INTERFACE_INFO);
+    dwRetVal = 0;
 
 
     // Make an initial call to GetInterfaceInfo to get