[ros-diffs] [cgutman] 48602: [TCPIP] - Read the IP information from the interface key inside the Tcpip service key (confirmed on XP) - Fix a logic error in my code (no idea how I missed it) - Restores static I...

Author: cgutman
Date: Mon Aug 23 01:17:41 2010
New Revision: 48602

URL: http://svn.reactos.org/svn/reactos?rev=48602&view=rev
Log:
[TCPIP]
- Read the IP information from the interface key inside the Tcpip service key (confirmed on XP)
- Fix a logic error in my code (no idea how I missed it)
- Restores static IP functionality (still waiting on janderwald to fix netcfgx's DNS value writing)

Modified:
    trunk/reactos/drivers/network/tcpip/datalink/lan.c

Modified: trunk/reactos/drivers/network/tcpip/datalink/lan.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/datal...
==============================================================================
--- trunk/reactos/drivers/network/tcpip/datalink/lan.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/network/tcpip/datalink/lan.c [iso-8859-1] Mon Aug 23 01:17:41 2010
@@ -569,9 +569,7 @@
  *     SystemSpecific1: Pointer to a registry path with protocol-specific configuration information
  *     SystemSpecific2: Unused & must not be touched
  */
-{
-    /* XXX confirm that this is still true, or re-word the following comment */
-    /* we get to ignore BindContext because we will never pend an operation with NDIS */
+{    
     TI_DbgPrint(DEBUG_DATALINK, ("Called with registry path %wZ for %wZ\n", SystemSpecific1, DeviceName));
     *Status = LANRegisterAdapter(DeviceName, SystemSpecific1);
 }
@@ -952,10 +950,13 @@
     OBJECT_ATTRIBUTES ObjectAttributes;
     HANDLE ParameterHandle;
     PKEY_VALUE_PARTIAL_INFORMATION KeyValueInfo;
+    WCHAR Buffer[150];
     UNICODE_STRING IPAddress = RTL_CONSTANT_STRING(L"IPAddress");
     UNICODE_STRING Netmask = RTL_CONSTANT_STRING(L"SubnetMask");
     UNICODE_STRING Gateway = RTL_CONSTANT_STRING(L"DefaultGateway");
     UNICODE_STRING EnableDhcp = RTL_CONSTANT_STRING(L"EnableDHCP");
+    UNICODE_STRING Prefix = RTL_CONSTANT_STRING(L"\Registry\Machine\SYSTEM\CurrentControlSet\Services\Tcpip\Parameters\Interfaces\");
+    UNICODE_STRING TcpipRegistryPath;
     UNICODE_STRING RegistryDataU;
     ANSI_STRING RegistryDataA;

@@ -1009,9 +1010,19 @@

TI_DbgPrint(DEBUG_DATALINK,("Adapter Description: %wZ\n",
                 &IF->Description));
+    
+    TcpipRegistryPath.MaximumLength = sizeof(WCHAR) * 150;
+    TcpipRegistryPath.Length = 0;
+    TcpipRegistryPath.Buffer = Buffer;
+    
+    RtlAppendUnicodeStringToString(&TcpipRegistryPath,
+                                   &Prefix);
+    
+    RtlAppendUnicodeStringToString(&TcpipRegistryPath,
+                                   &IF->Name);

InitializeObjectAttributes(&ObjectAttributes,
-                               RegistryPath,
+                               &TcpipRegistryPath,
                                OBJ_CASE_INSENSITIVE,
                                0,
                                NULL);
@@ -1019,6 +1030,7 @@
     AddrInitIPv4(&DefaultMask, 0);

Status = ZwOpenKey(&ParameterHandle, KEY_READ, &ObjectAttributes);
+
     if (!NT_SUCCESS(Status))
     {
         IF->Unicast = DefaultMask;
@@ -1040,7 +1052,7 @@
                                  KeyValueInfo,
                                  sizeof(KEY_VALUE_PARTIAL_INFORMATION) + sizeof(ULONG),
                                  &Unused);
-        if (NT_SUCCESS(Status) && KeyValueInfo->DataLength == sizeof(ULONG) && (*(PULONG)KeyValueInfo->Data) != 0)
+        if (NT_SUCCESS(Status) && KeyValueInfo->DataLength == sizeof(ULONG) && (*(PULONG)KeyValueInfo->Data) == 0)
         {
             RegistryDataU.MaximumLength = 16 + sizeof(WCHAR);
             RegistryDataU.Buffer = (PWCHAR)KeyValueInfo->Data;