Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cgutman] 36803: - Disable the locking debug prints
by cgutman＠svn.reactos.org 18 Oct '08

18 Oct '08

Author: cgutman Date: Fri Oct 17 22:47:13 2008 New Revision: 36803 URL: http://svn.reactos.org/svn/reactos?rev=36803&view=rev Log: - Disable the locking debug prints Modified: branches/aicom-network-fixes/drivers/network/tcpip/tcpip/lock.c Modified: branches/aicom-network-fixes/drivers/network/tcpip/tcpip/lock.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/tcpip/tcpip/lock.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/tcpip/tcpip/lock.c [iso-8859-1] Fri Oct 17 22:47:13 2008 @@ -50,13 +50,12 @@ UINT TcpipRecursiveMutexEnter( PRECURSIVE_MUTEX RecMutex, BOOL ToWrite ) { UINT Ret; - TI_DbgPrint(DEBUG_LOCK,("Locking\n")); + //TI_DbgPrint(DEBUG_LOCK,("Locking\n")); Ret = RecursiveMutexEnter( RecMutex, ToWrite ); - TI_DbgPrint(DEBUG_LOCK,("Locked\n")); return Ret; } VOID TcpipRecursiveMutexLeave( PRECURSIVE_MUTEX RecMutex ) { - TI_DbgPrint(DEBUG_LOCK,("Unlocking\n")); + //TI_DbgPrint(DEBUG_LOCK,("Unlocking\n")); RecursiveMutexLeave( RecMutex ); }

1 0

[cgutman] 36802: - Remove some empty folders
by cgutman＠svn.reactos.org 18 Oct '08

18 Oct '08

Author: cgutman Date: Fri Oct 17 22:28:34 2008 New Revision: 36802 URL: http://svn.reactos.org/svn/reactos?rev=36802&view=rev Log: - Remove some empty folders Removed: branches/aicom-network-fixes/drivers/network/tcpip/transport/

1 0

[mkupfer] 36801: draw disk usage bar from "used" to "free" (left to right)
by mkupfer＠svn.reactos.org 17 Oct '08

17 Oct '08

Author: mkupfer Date: Fri Oct 17 16:54:03 2008 New Revision: 36801 URL: http://svn.reactos.org/svn/reactos?rev=36801&view=rev Log: draw disk usage bar from "used" to "free" (left to right) Modified: trunk/reactos/dll/win32/shell32/drive.c Modified: trunk/reactos/dll/win32/shell32/drive.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/drive.c?… ============================================================================== --- trunk/reactos/dll/win32/shell32/drive.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/drive.c [iso-8859-1] Fri Oct 17 16:54:03 2008 @@ -350,11 +350,11 @@ horzsize = rect.right - rect.left; Result.QuadPart = (Result.QuadPart * horzsize) / 100; - rect.right = rect.left + Result.QuadPart; - FillRect(drawItem->hDC, &rect, hMagBrush); + rect.right = drawItem->rcItem.right - Result.QuadPart; + FillRect(drawItem->hDC, &rect, hBlueBrush); rect.left = rect.right; rect.right = drawItem->rcItem.right; - FillRect(drawItem->hDC, &rect, hBlueBrush); + FillRect(drawItem->hDC, &rect, hMagBrush); DeleteObject(hBlueBrush); DeleteObject(hMagBrush); }

1 0

[tkreuzer] 36800: Win32 structure cleanup (WIP): - Use CLIENTINFO.ulClientDelta instead of W32THREADINFO.DesktopHeapDelta - Remove DesktopHeapDelta from W32THREADINFO- Add PtiList to DESKTOP - Add pClientInfo to THREADINFO
by tkreuzer＠svn.reactos.org 17 Oct '08

17 Oct '08

Author: tkreuzer Date: Fri Oct 17 16:07:24 2008 New Revision: 36800 URL: http://svn.reactos.org/svn/reactos?rev=36800&view=rev Log: Win32 structure cleanup (WIP): - Use CLIENTINFO.ulClientDelta instead of W32THREADINFO.DesktopHeapDelta - Remove DesktopHeapDelta from W32THREADINFO- Add PtiList to DESKTOP - Add pClientInfo to THREADINFO Modified: trunk/reactos/dll/win32/user32/include/user32.h trunk/reactos/include/reactos/win32k/ntuser.h trunk/reactos/subsystems/win32/win32k/include/desktop.h trunk/reactos/subsystems/win32/win32k/include/win32.h trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c trunk/reactos/subsystems/win32/win32k/ntuser/misc.c Modified: trunk/reactos/dll/win32/user32/include/user32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/include/u… ============================================================================== --- trunk/reactos/dll/win32/user32/include/user32.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/include/user32.h [iso-8859-1] Fri Oct 17 16:07:24 2008 @@ -65,12 +65,14 @@ DesktopPtrToUser(PVOID Ptr) { PW32THREADINFO ti = GetW32ThreadInfo(); + PCLIENTINFO pci = GetWin32ClientInfo(); + ASSERT(Ptr != NULL); ASSERT(ti != NULL); if ((ULONG_PTR)Ptr >= (ULONG_PTR)ti->DesktopHeapBase && (ULONG_PTR)Ptr < (ULONG_PTR)ti->DesktopHeapBase + ti->DesktopHeapLimit) { - return (PVOID)((ULONG_PTR)Ptr - ti->DesktopHeapDelta); + return (PVOID)((ULONG_PTR)Ptr - pci->ulClientDelta); } else { Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] Fri Oct 17 16:07:24 2008 @@ -312,7 +312,6 @@ PDESKTOPINFO Desktop; PVOID DesktopHeapBase; ULONG_PTR DesktopHeapLimit; - ULONG_PTR DesktopHeapDelta; /* A mask of what hooks are currently active */ ULONG Hooks; CLIENTTHREADINFO ClientThreadInfo; Modified: trunk/reactos/subsystems/win32/win32k/include/desktop.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/desktop.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/desktop.h [iso-8859-1] Fri Oct 17 16:07:24 2008 @@ -9,6 +9,8 @@ CSHORT Type; CSHORT Size; LIST_ENTRY ListEntry; + + LIST_ENTRY PtiList; /* Pointer to the associated window station. */ struct _WINSTATION_OBJECT *WindowStation; @@ -203,7 +205,9 @@ ULONG_PTR Delta = 0; pti = PsGetCurrentThreadWin32Thread(); - ASSERT(pti->Desktop != NULL); + if (!pti->Desktop) + return 0; + hDesktopHeap = pti->Desktop->hDesktopHeap; Mapping = PsGetCurrentProcessWin32Process()->HeapMappings.Next; Modified: trunk/reactos/subsystems/win32/win32k/include/win32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/win32.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/win32.h [iso-8859-1] Fri Oct 17 16:07:24 2008 @@ -28,6 +28,7 @@ { W32THREAD W32Thread; PDESKTOPINFO pDeskInfo; + PCLIENTINFO pClientInfo; LIST_ENTRY PtiLink; struct _USER_MESSAGE_QUEUE* MessageQueue; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c [iso-8859-1] Fri Oct 17 16:07:24 2008 @@ -1768,9 +1768,9 @@ ti->Desktop = NULL; ti->DesktopHeapBase = NULL; ti->DesktopHeapLimit = 0; - ti->DesktopHeapDelta = 0; } } + GetWin32ClientInfo()->ulClientDelta = 0; return Status; } @@ -1846,9 +1846,9 @@ ti->Desktop = DesktopObject->DesktopInfo; ti->DesktopHeapBase = DesktopObject->hDesktopHeap; ti->DesktopHeapLimit = ViewSize; - ti->DesktopHeapDelta = DesktopHeapGetUserDelta(); } } + GetWin32ClientInfo()->ulClientDelta = DesktopHeapGetUserDelta(); return STATUS_SUCCESS; } @@ -1895,8 +1895,13 @@ if (ti != NULL) { ti->Desktop = NULL; - ti->DesktopHeapDelta = 0; } + } + + /* Hack for system threads */ + if (NtCurrentTeb()) + { + GetWin32ClientInfo()->ulClientDelta = DesktopHeapGetUserDelta(); } if (OldDesktop != NULL && Modified: trunk/reactos/subsystems/win32/win32k/ntuser/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/misc.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/misc.c [iso-8859-1] Fri Oct 17 16:07:24 2008 @@ -464,14 +464,12 @@ ti->Desktop = W32Thread->Desktop->DesktopInfo; ti->DesktopHeapBase = W32Thread->Desktop->DesktopInfo->hKernelHeap; ti->DesktopHeapLimit = W32Thread->Desktop->DesktopInfo->HeapLimit; - ti->DesktopHeapDelta = DesktopHeapGetUserDelta(); } else { ti->Desktop = NULL; ti->DesktopHeapBase = NULL; ti->DesktopHeapLimit = 0; - ti->DesktopHeapDelta = 0; } W32Thread->ThreadInfo = ti;

1 0

[janderwald] 36799: * Store more settings in registry
by janderwald＠svn.reactos.org 17 Oct '08

17 Oct '08

Author: janderwald Date: Fri Oct 17 15:01:58 2008 New Revision: 36799 URL: http://svn.reactos.org/svn/reactos?rev=36799&view=rev Log: * Store more settings in registry Modified: trunk/reactos/base/services/dhcp/dhclient.c Modified: trunk/reactos/base/services/dhcp/dhclient.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/dhcp/dhclien… ============================================================================== --- trunk/reactos/base/services/dhcp/dhclient.c [iso-8859-1] (original) +++ trunk/reactos/base/services/dhcp/dhclient.c [iso-8859-1] Fri Oct 17 15:01:58 2008 @@ -489,7 +489,16 @@ } void setup_adapter( PDHCP_ADAPTER Adapter, struct client_lease *new_lease ) { + CHAR Buffer[200] = "SYSTEM\\CurrentControlSet\\Services\\Tcpip\\Parameters\\Interfaces\\"; struct iaddr netmask; + HKEY hkey; + int i; + DWORD dwEnableDHCP; + + strcat(Buffer, Adapter->DhclientInfo.name); + if (RegOpenKeyExA(HKEY_LOCAL_MACHINE, Buffer, 0, KEY_WRITE, &hkey) != ERROR_SUCCESS) + hkey = NULL; + if( Adapter->NteContext ) DeleteIPAddress( Adapter->NteContext ); @@ -501,13 +510,27 @@ memcpy( netmask.iabuf, new_lease->options[DHO_SUBNET_MASK].data, new_lease->options[DHO_SUBNET_MASK].len ); - Status = AddIPAddress ( *((ULONG*)new_lease->address.iabuf), *((ULONG*)netmask.iabuf), Adapter->IfMib.dwIndex, &Adapter->NteContext, &Adapter->NteInstance ); + if (hkey) { + RegSetValueExA(hkey, "DhcpIPAddress", 0, REG_SZ, (LPBYTE)new_lease->address.iabuf, strlen(new_lease->address.iabuf)+1); + Buffer[0] = '\0'; + for(i = 0; i < new_lease->options[DHO_SUBNET_MASK].len; i++) + { + sprintf(&Buffer[strlen(Buffer)], "%u", new_lease->options[DHO_SUBNET_MASK].data[i]); + if (i + 1 < new_lease->options[DHO_SUBNET_MASK].len) + strcat(Buffer, "."); + } + RegSetValueExA(hkey, "DhcpSubnetMask", 0, REG_SZ, (LPBYTE)Buffer, strlen(Buffer)+1); + RegSetValueExA(hkey, "IPAddress", 0, REG_SZ, (LPBYTE)"0.0.0.0", 8); + RegSetValueExA(hkey, "SubnetMask", 0, REG_SZ, (LPBYTE)"0.0.0.0", 8); + dwEnableDHCP = 1; + RegSetValueExA(hkey, "EnableDHCP", 0, REG_DWORD, (LPBYTE)&dwEnableDHCP, sizeof(DWORD)); + } if( !NT_SUCCESS(Status) ) warning("AddIPAddress: %lx\n", Status); @@ -536,7 +559,22 @@ warning("CreateIpForwardEntry: %lx\n", Status); else old_default_route = RouterMib.dwForwardNextHop; + + if (hkey) { + Buffer[0] = '\0'; + for(i = 0; i < new_lease->options[DHO_ROUTERS].len; i++) + { + sprintf(&Buffer[strlen(Buffer)], "%u", new_lease->options[DHO_ROUTERS].data[i]); + if (i + 1 < new_lease->options[DHO_ROUTERS].len) + strcat(Buffer, "."); + } + RegSetValueExA(hkey, "DhcpDefaultGateway", 0, REG_SZ, (LPBYTE)Buffer, strlen(Buffer)+1); + RegSetValueExA(hkey, "DefaultGateway", 0, REG_SZ, (LPBYTE)"0.0.0.0", 8); + } } + + if (hkey) + RegCloseKey(hkey); }

1 0

[cgutman] 36798: - There is no reason to open the registry key if we aren't going to do anything with it
by cgutman＠svn.reactos.org 17 Oct '08

17 Oct '08

Author: cgutman Date: Fri Oct 17 14:09:44 2008 New Revision: 36798 URL: http://svn.reactos.org/svn/reactos?rev=36798&view=rev Log: - There is no reason to open the registry key if we aren't going to do anything with it Modified: branches/aicom-network-fixes/drivers/network/tcpip/datalink/lan.c Modified: branches/aicom-network-fixes/drivers/network/tcpip/datalink/lan.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/tcpip/datalink/lan.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/tcpip/datalink/lan.c [iso-8859-1] Fri Oct 17 14:09:44 2008 @@ -964,7 +964,6 @@ IP_ADDRESS DefaultMask = { 0 }; ULONG Lookahead = LOOKAHEAD_SIZE; NTSTATUS Status; - HANDLE RegHandle = 0; TI_DbgPrint(DEBUG_DATALINK, ("Called.\n")); @@ -1007,16 +1006,10 @@ GetName( RegistryPath, &IF->Name ); - Status = OpenRegistryKey( RegistryPath, &RegHandle ); - - if(NT_SUCCESS(Status)) { - Status = FindDeviceDescForAdapter( &IF->Name, &IF->Description ); - TI_DbgPrint(DEBUG_DATALINK,("Adapter Description: %wZ\n", - &IF->Description)); - } else { - IPDestroyInterface( IF ); - return FALSE; - } + Status = FindDeviceDescForAdapter( &IF->Name, &IF->Description ); + + TI_DbgPrint(DEBUG_DATALINK,("Adapter Description: %wZ\n", + &IF->Description)); DefaultMask.Type = IP_ADDRESS_V4;

1 0

[janderwald] 36797: * Fix retrieval of automatic DNS settings 2/2
by janderwald＠svn.reactos.org 17 Oct '08

17 Oct '08

Author: janderwald Date: Fri Oct 17 14:04:00 2008 New Revision: 36797 URL: http://svn.reactos.org/svn/reactos?rev=36797&view=rev Log: * Fix retrieval of automatic DNS settings 2/2 Modified: trunk/reactos/base/services/dhcp/adapter.c trunk/reactos/base/services/dhcp/dhclient.c Modified: trunk/reactos/base/services/dhcp/adapter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/dhcp/adapter… ============================================================================== --- trunk/reactos/base/services/dhcp/adapter.c [iso-8859-1] (original) +++ trunk/reactos/base/services/dhcp/adapter.c [iso-8859-1] Fri Oct 17 14:04:00 2008 @@ -103,8 +103,7 @@ "SYSTEM\\CurrentControlSet\\Control\\Class\\" "{4D36E972-E325-11CE-BFC1-08002BE10318}"; PCHAR TargetKeyNameStart = - "SYSTEM\\CurrentControlSet\\Services\\"; - PCHAR TargetKeyNameEnd = "\\Parameters\\Tcpip"; + "SYSTEM\\CurrentControlSet\\Services\\Tcpip\\Parameters\\Interfaces\\"; PCHAR TargetKeyName = NULL; PCHAR *EnumKeysLinkage = GetSubkeyNames( EnumKeyName, "\\Linkage" ); PCHAR *EnumKeysTop = GetSubkeyNames( EnumKeyName, "" ); @@ -126,12 +125,11 @@ !strcmp( RootDevice, Adapter->DhclientInfo.name ) ) { TargetKeyName = (CHAR*) malloc( strlen( TargetKeyNameStart ) + - strlen( RootDevice ) + - strlen( TargetKeyNameEnd ) + 1 ); + strlen( RootDevice ) + 1); if( !TargetKeyName ) goto cleanup; - sprintf( TargetKeyName, "%s%s%s", - TargetKeyNameStart, RootDevice, TargetKeyNameEnd ); - Error = RegOpenKey( HKEY_LOCAL_MACHINE, TargetKeyName, &OutKey ); + sprintf( TargetKeyName, "%s%s", + TargetKeyNameStart, RootDevice ); + Error = RegCreateKeyExA( HKEY_LOCAL_MACHINE, TargetKeyName, 0, NULL, 0, KEY_READ, NULL, &OutKey, NULL ); break; } else { free( RootDevice ); RootDevice = 0; Modified: trunk/reactos/base/services/dhcp/dhclient.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/dhcp/dhclien… ============================================================================== --- trunk/reactos/base/services/dhcp/dhclient.c [iso-8859-1] (original) +++ trunk/reactos/base/services/dhcp/dhclient.c [iso-8859-1] Fri Oct 17 14:04:00 2008 @@ -450,8 +450,9 @@ bind_lease(ip); } -void set_name_servers( struct client_lease *new_lease ) { +void set_name_servers( PDHCP_ADAPTER Adapter, struct client_lease *new_lease ) { if( new_lease->options[DHO_DOMAIN_NAME_SERVERS].len ) { + CHAR Buffer[200] = "SYSTEM\\CurrentControlSet\\Services\\Tcpip\\Parameters\\Interfaces\\"; HKEY RegKey; struct iaddr nameserver; char *nsbuf; @@ -462,10 +463,11 @@ addrs = 1; nsbuf = malloc( addrs * sizeof(IP_ADDRESS_STRING) ); nsbuf[0] = 0; + strcat(Buffer, Adapter->DhclientInfo.name); if( nsbuf && !RegOpenKeyEx ( HKEY_LOCAL_MACHINE, - "SYSTEM\\CurrentControlSet\\Services\\Tcpip\\Parameters", + Buffer, 0, KEY_WRITE, &RegKey ) ) { for( i = 0; i < addrs; i++ ) { nameserver.len = sizeof(ULONG); @@ -567,7 +569,7 @@ if( Adapter ) setup_adapter( Adapter, new_lease ); else warning("Could not find adapter for info %p\n", ip); - set_name_servers( new_lease ); + set_name_servers( Adapter, new_lease ); reinitialize_interfaces(); }

1 0

[janderwald] 36796: * Fix retrieval of automatic DNS settings 1/2
by janderwald＠svn.reactos.org 17 Oct '08

17 Oct '08

Author: janderwald Date: Fri Oct 17 14:03:11 2008 New Revision: 36796 URL: http://svn.reactos.org/svn/reactos?rev=36796&view=rev Log: * Fix retrieval of automatic DNS settings 1/2 Modified: trunk/reactos/dll/win32/iphlpapi/iphlpapi_main.c trunk/reactos/dll/win32/netcfgx/tcpipconf_notify.c Modified: trunk/reactos/dll/win32/iphlpapi/iphlpapi_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iphlpapi/iphlpap… ============================================================================== --- trunk/reactos/dll/win32/iphlpapi/iphlpapi_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/iphlpapi/iphlpapi_main.c [iso-8859-1] Fri Oct 17 14:03:11 2008 @@ -1542,7 +1542,7 @@ if(RegQueryValueExW(hkey, L"DHCPNameServer", NULL, NULL, NULL, &dwSize) == ERROR_SUCCESS) { - pPerAdapterInfo->AutoconfigEnabled = TRUE; + pPerAdapterInfo->AutoconfigActive = TRUE; } RegCloseKey(hkey); Modified: trunk/reactos/dll/win32/netcfgx/tcpipconf_notify.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/tcpipcon… ============================================================================== --- trunk/reactos/dll/win32/netcfgx/tcpipconf_notify.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netcfgx/tcpipconf_notify.c [iso-8859-1] Fri Oct 17 14:03:11 2008 @@ -2364,6 +2364,11 @@ } ZeroMemory(pNew, sizeof(IP_ADDR)); pNew->IpAddress = GetIpAddressFromStringA(pCurrent->IpAddress.String); + if (!pNew->IpAddress) + { + CoTaskMemFree(pNew); + return E_FAIL; + } if (Type == SUBMASK) {

1 0

[tkreuzer] 36795: Win32 structure cleanup (WIP): - Add pDeskInfo and PtiLink to THREADINFO
by tkreuzer＠svn.reactos.org 17 Oct '08

17 Oct '08

Author: tkreuzer Date: Fri Oct 17 13:22:06 2008 New Revision: 36795 URL: http://svn.reactos.org/svn/reactos?rev=36795&view=rev Log: Win32 structure cleanup (WIP): - Add pDeskInfo and PtiLink to THREADINFO Modified: trunk/reactos/subsystems/win32/win32k/include/win32.h Modified: trunk/reactos/subsystems/win32/win32k/include/win32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/win32.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/win32.h [iso-8859-1] Fri Oct 17 13:22:06 2008 @@ -27,6 +27,8 @@ typedef struct _THREADINFO { W32THREAD W32Thread; + PDESKTOPINFO pDeskInfo; + LIST_ENTRY PtiLink; struct _USER_MESSAGE_QUEUE* MessageQueue; LIST_ENTRY WindowListHead;

1 0

[janderwald] 36794: * Set AutoconfigEnabled if DNS is acquired by DHCP * Fix a handle leak
by janderwald＠svn.reactos.org 17 Oct '08

17 Oct '08

Author: janderwald Date: Fri Oct 17 13:20:00 2008 New Revision: 36794 URL: http://svn.reactos.org/svn/reactos?rev=36794&view=rev Log: * Set AutoconfigEnabled if DNS is acquired by DHCP * Fix a handle leak Modified: trunk/reactos/dll/win32/iphlpapi/iphlpapi_main.c Modified: trunk/reactos/dll/win32/iphlpapi/iphlpapi_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iphlpapi/iphlpap… ============================================================================== --- trunk/reactos/dll/win32/iphlpapi/iphlpapi_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/iphlpapi/iphlpapi_main.c [iso-8859-1] Fri Oct 17 13:20:00 2008 @@ -1504,6 +1504,7 @@ DWORD WINAPI GetPerAdapterInfo(ULONG IfIndex, PIP_PER_ADAPTER_INFO pPerAdapterInfo, PULONG pOutBufLen) { HKEY hkey; + DWORD dwSize = 0; const char *ifName; NAME_SERVER_LIST_CONTEXT Context; WCHAR keyname[200] = L"SYSTEM\\CurrentControlSet\\Services\\Tcpip\\Parameters\\Interfaces\\"; @@ -1535,9 +1536,16 @@ if (Context.uSizeRequired > Context.uSizeAvailable) { *pOutBufLen = Context.uSizeRequired; + RegCloseKey(hkey); return ERROR_BUFFER_OVERFLOW; } + if(RegQueryValueExW(hkey, L"DHCPNameServer", NULL, NULL, NULL, &dwSize) == ERROR_SUCCESS) + { + pPerAdapterInfo->AutoconfigEnabled = TRUE; + } + + RegCloseKey(hkey); return NOERROR; }

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs