X-Git-Url: https://git.reactos.org/?p=reactos.git;a=blobdiff_plain;f=reactos%2Fapps%2Futils%2Fnet%2Fipconfig%2Fipconfig.c;h=715bb2c9c5cc6342145f94873d9db0fb2ddc3120;hp=6025428dafec58e5ba7820b8c0585fa82035f9c8;hb=3edc7dd1e78324769fca8d842a908ee48bd9f9f0;hpb=700e92d770c4b58133e13defa417012d9e0543cd diff --git a/reactos/apps/utils/net/ipconfig/ipconfig.c b/reactos/apps/utils/net/ipconfig/ipconfig.c index 6025428dafe..715bb2c9c5c 100644 --- 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,10 +129,19 @@ INT ShowInfo(BOOL bAll) pAdapterInfo = (IP_ADAPTER_INFO *) malloc (adaptOutBufLen); } - if (! GetAdaptersInfo(pAdapterInfo, &adaptOutBufLen) == NO_ERROR) - _tprintf(_T("GetAdaptersInfo failed %lu\n"), GetLastError()); - if (! GetNetworkParams(pFixedInfo, &netOutBufLen) == NO_ERROR) - _tprintf(_T("GetNetworkParams failed %lu\n"), GetLastError()); + if ((ErrRet = GetAdaptersInfo(pAdapterInfo, &adaptOutBufLen)) != NO_ERROR) + { + _tprintf(_T("GetAdaptersInfo failed : ")); + DoFormatMessage(ErrRet); + return EXIT_FAILURE; + } + + if ((ErrRet = GetNetworkParams(pFixedInfo, &netOutBufLen)) != NO_ERROR) + { + _tprintf(_T("GetNetworkParams failed : ")); + DoFormatMessage(ErrRet); + return EXIT_FAILURE; + } pAdapter = pAdapterInfo; //HKEY hKey;