[ros-diffs] [cgutman] 48188: [NETCFGX] - Start the TCP/IP driver after we install a network adapter - This fixes the major bug that blocks Live CD networking but we still have some DHCP issues (DHCP starts and fails before the NIC and TCP/IP has been installed) and some other adapter detection issues that I need to look into but this is a good first step

[cgutman at svn.reactos.org]

Author: cgutman
Date: Thu Jul 22 18:29:35 2010
New Revision: 48188

URL: http://svn.reactos.org/svn/reactos?rev=48188&view=rev
Log:
[NETCFGX]
- Start the TCP/IP driver after we install a network adapter
- This fixes the major bug that blocks Live CD networking but we still have some DHCP issues (DHCP starts and fails before the NIC and TCP/IP has been installed) and some other adapter detection issues that I need to look into but this is a good first step

Modified:
    trunk/reactos/dll/win32/netcfgx/netcfgx.c
    trunk/reactos/dll/win32/netcfgx/precomp.h

Modified: trunk/reactos/dll/win32/netcfgx/netcfgx.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/netcfgx.c?rev=48188&r1=48187&r2=48188&view=diff
==============================================================================
--- trunk/reactos/dll/win32/netcfgx/netcfgx.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/netcfgx/netcfgx.c [iso-8859-1] Thu Jul 22 18:29:35 2010
@@ -290,6 +290,7 @@
 	IN HWND hWnd)
 {
 	BOOL ret;
+	UNICODE_STRING TcpipServicePath = RTL_CONSTANT_STRING(L"\\Registry\\Machine\\System\\CurrentControlSet\\Services\\Tcpip");
 
 	/* Install TCP/IP protocol */
 	ret = InstallInfSection(
@@ -302,6 +303,17 @@
 		DPRINT("InstallInfSection() failed with error 0x%lx\n", GetLastError());
 		return GetLastError();
 	}
+	else if (ret)
+	{
+		/* Start the TCP/IP driver */
+		ret = NtLoadDriver(&TcpipServicePath);
+		if (ret)
+		{
+			/* This isn't really fatal but we want to warn anyway */
+			DPRINT1("NtLoadDriver(TCPIP) failed with NTSTATUS 0x%lx\n", (NTSTATUS)ret);
+		}
+	}
+        
 
 	/* You can add here more clients (SMB...) and services (DHCP server...) */
 

Modified: trunk/reactos/dll/win32/netcfgx/precomp.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/precomp.h?rev=48188&r1=48187&r2=48188&view=diff
==============================================================================
--- trunk/reactos/dll/win32/netcfgx/precomp.h [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/netcfgx/precomp.h [iso-8859-1] Thu Jul 22 18:29:35 2010
@@ -5,7 +5,10 @@
 #define NONAMELESSUNION
 #define NONAMELESSSTRUCT
 
+#define WIN32_NO_STATUS
 #include <windows.h>
+#define NTOS_MODE_USER
+#include <ndk/ntndk.h>
 #include <netcfgx.h>
 #include <setupapi.h>
 #include <stdio.h>