Display more meaningful failure messages

[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 ef82c22..715bb2c 100644 (file)
--- a/reactos/apps/utils/net/ipconfig/ipconfig.c
+++ b/reactos/apps/utils/net/ipconfig/ipconfig.c
@@ -32,7 +32,8 @@
 #define _UNICODE
 
 
-PTCHAR GetNodeTypeName(UINT NodeType)
+
+LPCTSTR GetNodeTypeName(UINT NodeType)
 {
     switch (NodeType) {
         case 1: return _T("Broadcast");
@@ -43,7 +44,7 @@ PTCHAR GetNodeTypeName(UINT NodeType)
     }
 }
 
-PTCHAR GetInterfaceTypeName(UINT InterfaceType)
+LPCTSTR GetInterfaceTypeName(UINT InterfaceType)
 {
     switch (InterfaceType) {
         case MIB_IF_TYPE_OTHER:     return _T("Other Type Of Adapter");
@@ -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,15 +129,17 @@ 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;
        }