From c522666b4e77a35b7e0ffdaddf0258a015b34d40 Mon Sep 17 00:00:00 2001 From: Royce Mitchell III Date: Thu, 24 Jul 2003 01:08:12 +0000 Subject: [PATCH] In C:\cvs\reactos live: cvs -q -z9 commit -m "renamed MyGetAdaptersInfo to GetAdaptersInfo so that iphlpapi will compile. Also fixed some ANSI/UNICODE-related bugs ( eliminating the warnings )." lib/iphlpapi/iphlpapi.c lib/iphlpapi/makefile CVSROOT=:ext:royce@osexperts.com:/CVS/ReactOS svn path=/trunk/; revision=5235 --- reactos/lib/iphlpapi/iphlpapi.c | 16 +++++++++------- reactos/lib/iphlpapi/makefile | 2 +- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/reactos/lib/iphlpapi/iphlpapi.c b/reactos/lib/iphlpapi/iphlpapi.c index 21d8a73bef4..5e8893bd5f2 100644 --- a/reactos/lib/iphlpapi/iphlpapi.c +++ b/reactos/lib/iphlpapi/iphlpapi.c @@ -115,7 +115,9 @@ GetAdapterIndex(LPWSTR AdapterName, PULONG IfIndex) /* * @unimplemented */ -DWORD WINAPI MyGetAdaptersInfo(PIP_ADAPTER_INFO pAdapterInfo, PULONG pOutBufLen) +DWORD +WINAPI +GetAdaptersInfo(PIP_ADAPTER_INFO pAdapterInfo, PULONG pOutBufLen) { LONG lErr; DWORD dwSize; @@ -218,17 +220,17 @@ DWORD WINAPI MyGetAdaptersInfo(PIP_ADAPTER_INFO pAdapterInfo, PULONG pOutBufLen) // TODO UINT DhcpEnabled // TODO PIP_ADDR_STRING CurrentIpAddress // IP_ADDR_STRING IpAddressList - dwSize = 16; lErr = RegQueryValueEx(hIpConfig, "IPAddress", NULL, NULL, (BYTE*) &pCurrentAdapter->IpAddressList.IpAddress, &dwSize); - dwSize = 16; lErr = RegQueryValueEx(hIpConfig, "SubnetMask", NULL, NULL, (BYTE*) &pCurrentAdapter->IpAddressList.IpMask, &dwSize); + dwSize = 16; lErr = RegQueryValueEx(hIpConfig, _T("IPAddress"), NULL, NULL, (BYTE*) &pCurrentAdapter->IpAddressList.IpAddress, &dwSize); + dwSize = 16; lErr = RegQueryValueEx(hIpConfig, _T("SubnetMask"), NULL, NULL, (BYTE*) &pCurrentAdapter->IpAddressList.IpMask, &dwSize); if(strstr(pCurrentAdapter->IpAddressList.IpAddress.String, "0.0.0.0") != NULL) { - dwSize = 16; lErr = RegQueryValueEx(hIpConfig, "DhcpIPAddress", NULL, NULL, (BYTE*) &pCurrentAdapter->IpAddressList.IpAddress, &dwSize); - dwSize = 16; lErr = RegQueryValueEx(hIpConfig, "DhcpSubnetMask", NULL, NULL, (BYTE*) &pCurrentAdapter->IpAddressList.IpMask, &dwSize); + dwSize = 16; lErr = RegQueryValueEx(hIpConfig, _T("DhcpIPAddress"), NULL, NULL, (BYTE*) &pCurrentAdapter->IpAddressList.IpAddress, &dwSize); + dwSize = 16; lErr = RegQueryValueEx(hIpConfig, _T("DhcpSubnetMask"), NULL, NULL, (BYTE*) &pCurrentAdapter->IpAddressList.IpMask, &dwSize); } // TODO IP_ADDR_STRING GatewayList // IP_ADDR_STRING DhcpServer - dwSize = 16; lErr = RegQueryValueEx(hIpConfig, "DhcpServer", NULL, NULL, (BYTE*) &pCurrentAdapter->DhcpServer.IpAddress, &dwSize); - dwSize = 16; lErr = RegQueryValueEx(hIpConfig, "DhcpSubnetMask", NULL, NULL, (BYTE*) &pCurrentAdapter->DhcpServer.IpMask, &dwSize); + dwSize = 16; lErr = RegQueryValueEx(hIpConfig, _T("DhcpServer"), NULL, NULL, (BYTE*) &pCurrentAdapter->DhcpServer.IpAddress, &dwSize); + dwSize = 16; lErr = RegQueryValueEx(hIpConfig, _T("DhcpSubnetMask"), NULL, NULL, (BYTE*) &pCurrentAdapter->DhcpServer.IpMask, &dwSize); // TODO BOOL HaveWins // TODO IP_ADDR_STRING PrimaryWinsServer // TODO IP_ADDR_STRING SecondaryWinsServer diff --git a/reactos/lib/iphlpapi/makefile b/reactos/lib/iphlpapi/makefile index a30d9a62cf0..e8e10aa50af 100644 --- a/reactos/lib/iphlpapi/makefile +++ b/reactos/lib/iphlpapi/makefile @@ -8,7 +8,7 @@ TARGET_NAME = iphlpapi TARGET_BASE = 0x777c0000 -TARGET_CFLAGS = -DUNICODE +TARGET_CFLAGS = -DUNICODE -D_UNICODE TARGET_SDKLIBS = ntdll.a kernel32.a