[ros-diffs] [ekohl] 61273: [NETCFGX] Formatting. No code changes!

Author: ekohl
Date: Sat Dec 14 20:27:45 2013
New Revision: 61273

URL: http://svn.reactos.org/svn/reactos?rev=61273&view=rev
Log:
[NETCFGX]
Formatting. No code changes!

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

Modified: trunk/reactos/dll/win32/netcfgx/netcfgx.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/netcfgx.…
==============================================================================
--- trunk/reactos/dll/win32/netcfgx/netcfgx.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/netcfgx/netcfgx.c	[iso-8859-1] Sat Dec 14 20:27:45 2013
@@ -100,30 +100,29 @@
 
 STDAPI
 DllGetClassObject(
-  REFCLSID rclsid,
-  REFIID riid,
-  LPVOID* ppv 
-)
+    REFCLSID rclsid,
+    REFIID riid,
+    LPVOID* ppv)
 {
     UINT i;
-    HRESULT	hres = E_OUTOFMEMORY;
-    IClassFactory * pcf = NULL;	
+    HRESULT hres = E_OUTOFMEMORY;
+    IClassFactory * pcf = NULL;
 
     if (!ppv)
         return E_INVALIDARG;
 
     *ppv = NULL;
 
-    for (i = 0; InterfaceTable[i].riid; i++) 
-    {
-        if (IsEqualIID(InterfaceTable[i].riid, rclsid)) 
+    for (i = 0; InterfaceTable[i].riid; i++)
+    {
+        if (IsEqualIID(InterfaceTable[i].riid, rclsid))
         {
             pcf = IClassFactory_fnConstructor(InterfaceTable[i].lpfnCI, NULL, NULL);
             break;
         }
     }
 
-    if (!pcf) 
+    if (!pcf)
     {
         return CLASS_E_CLASSNOTAVAILABLE;
     }
@@ -139,623 +138,660 @@
  * If the value doesn't exist, create it.
  * Returns ERROR_SUCCESS if success. Othewise, returns an error code
  */
-static LONG
+static
+LONG
 AppendStringToMultiSZ(
-	IN HKEY hKey,
-	IN PCWSTR ValueName,
-	IN PCWSTR ValueToAppend)
-{
-	PWSTR Buffer = NULL;
-	DWORD dwRegType;
-	DWORD dwRequired, dwLength;
-	DWORD dwTmp;
-	LONG rc;
-
-	rc = RegQueryValueExW(
-		hKey,
-		ValueName,
-		NULL,
-		&dwRegType,
-		NULL,
-		&dwRequired);
-	if (rc != ERROR_FILE_NOT_FOUND)
-	{
-		if (rc != ERROR_SUCCESS)
-			goto cleanup;
-		if (dwRegType != REG_MULTI_SZ)
-		{
-			rc = ERROR_GEN_FAILURE;
-			goto cleanup;
-		}
-
-		dwTmp = dwLength = dwRequired + wcslen(ValueToAppend) * sizeof(WCHAR) +
sizeof(UNICODE_NULL);
-		Buffer = HeapAlloc(GetProcessHeap(), 0, dwLength);
-		if (!Buffer)
-		{
-			rc = ERROR_NOT_ENOUGH_MEMORY;
-			goto cleanup;
-		}
-		rc = RegQueryValueExW(
-			hKey,
-			ValueName,
-			NULL,
-			NULL,
-			(BYTE*)Buffer,
-			&dwTmp);
-		if (rc != ERROR_SUCCESS)
-			goto cleanup;
-	}
-	else
-	{
-		dwRequired = sizeof(WCHAR);
-		dwLength = wcslen(ValueToAppend) * sizeof(WCHAR) + 2 * sizeof(UNICODE_NULL);
-		Buffer = HeapAlloc(GetProcessHeap(), 0, dwLength);
-		if (!Buffer)
-		{
-			rc = ERROR_NOT_ENOUGH_MEMORY;
-			goto cleanup;
-		}
-	}
-
-	/* Append the value */
-	wcscpy(&Buffer[dwRequired / sizeof(WCHAR) - 1], ValueToAppend);
-	/* Terminate the REG_MULTI_SZ string */
-	Buffer[dwLength / sizeof(WCHAR) - 1] = UNICODE_NULL;
-
-	rc = RegSetValueExW(
-		hKey,
-		ValueName,
-		0,
-		REG_MULTI_SZ,
-		(const BYTE*)Buffer,
-		dwLength);
+    IN HKEY hKey,
+    IN PCWSTR ValueName,
+    IN PCWSTR ValueToAppend)
+{
+    PWSTR Buffer = NULL;
+    DWORD dwRegType;
+    DWORD dwRequired, dwLength;
+    DWORD dwTmp;
+    LONG rc;
+
+    rc = RegQueryValueExW(hKey,
+                          ValueName,
+                          NULL,
+                          &dwRegType,
+                          NULL,
+                          &dwRequired);
+    if (rc != ERROR_FILE_NOT_FOUND)
+    {
+        if (rc != ERROR_SUCCESS)
+            goto cleanup;
+        if (dwRegType != REG_MULTI_SZ)
+        {
+            rc = ERROR_GEN_FAILURE;
+            goto cleanup;
+        }
+
+        dwTmp = dwLength = dwRequired + wcslen(ValueToAppend) * sizeof(WCHAR) +
sizeof(UNICODE_NULL);
+        Buffer = HeapAlloc(GetProcessHeap(), 0, dwLength);
+        if (!Buffer)
+        {
+            rc = ERROR_NOT_ENOUGH_MEMORY;
+            goto cleanup;
+        }
+
+        rc = RegQueryValueExW(hKey,
+                              ValueName,
+                              NULL,
+                              NULL,
+                              (BYTE*)Buffer,
+                              &dwTmp);
+        if (rc != ERROR_SUCCESS)
+            goto cleanup;
+    }
+    else
+    {
+        dwRequired = sizeof(WCHAR);
+        dwLength = wcslen(ValueToAppend) * sizeof(WCHAR) + 2 * sizeof(UNICODE_NULL);
+        Buffer = HeapAlloc(GetProcessHeap(), 0, dwLength);
+        if (!Buffer)
+        {
+            rc = ERROR_NOT_ENOUGH_MEMORY;
+            goto cleanup;
+        }
+    }
+
+    /* Append the value */
+    wcscpy(&Buffer[dwRequired / sizeof(WCHAR) - 1], ValueToAppend);
+    /* Terminate the REG_MULTI_SZ string */
+    Buffer[dwLength / sizeof(WCHAR) - 1] = UNICODE_NULL;
+
+    rc = RegSetValueExW(hKey,
+                        ValueName,
+                        0,
+                        REG_MULTI_SZ,
+                        (const BYTE*)Buffer,
+                        dwLength);
 
 cleanup:
-	HeapFree(GetProcessHeap(), 0, Buffer);
-	return rc;
+    HeapFree(GetProcessHeap(), 0, Buffer);
+    return rc;
 }
 
 /* Install a section of a .inf file
  * Returns TRUE if success, FALSE if failure. Error code can
  * be retrieved with GetLastError()
  */
-static BOOL
+static
+BOOL
 InstallInfSection(
-	IN HWND hWnd,
-	IN LPCWSTR InfFile,
-	IN LPCWSTR InfSection OPTIONAL,
-	IN LPCWSTR InfService OPTIONAL)
-{
-	WCHAR Buffer[MAX_PATH];
-	HINF hInf = INVALID_HANDLE_VALUE;
-	UINT BufferSize;
-	PVOID Context = NULL;
-	BOOL ret = FALSE;
-
-	/* Get Windows directory */
-	BufferSize = MAX_PATH - 5 - wcslen(InfFile);
-	if (GetWindowsDirectoryW(Buffer, BufferSize) > BufferSize)
-	{
-		/* Function failed */
-		SetLastError(ERROR_GEN_FAILURE);
-		goto cleanup;
-	}
-	/* We have enough space to add some information in the buffer */
-	if (Buffer[wcslen(Buffer) - 1] != '\\')
-		wcscat(Buffer, L"\\");
-	wcscat(Buffer, L"Inf\\");
-	wcscat(Buffer, InfFile);
-
-	/* Install specified section */
-	hInf = SetupOpenInfFileW(Buffer, NULL, INF_STYLE_WIN4, NULL);
-	if (hInf == INVALID_HANDLE_VALUE)
-		goto cleanup;
-
-	Context = SetupInitDefaultQueueCallback(hWnd);
-	if (Context == NULL)
-		goto cleanup;
-
-	ret = TRUE;
-	if (ret && InfSection)
-	{
-		ret = SetupInstallFromInfSectionW(
-			hWnd, hInf,
-			InfSection, SPINST_ALL,
-			NULL, NULL, SP_COPY_NEWER,
-			SetupDefaultQueueCallbackW, Context,
-			NULL, NULL);
-	}
-	if (ret && InfService)
-	{
-		ret = SetupInstallServicesFromInfSectionW(
-			hInf, InfService, 0);
-	}
+    IN HWND hWnd,
+    IN LPCWSTR InfFile,
+    IN LPCWSTR InfSection OPTIONAL,
+    IN LPCWSTR InfService OPTIONAL)
+{
+    WCHAR Buffer[MAX_PATH];
+    HINF hInf = INVALID_HANDLE_VALUE;
+    UINT BufferSize;
+    PVOID Context = NULL;
+    BOOL ret = FALSE;
+
+    /* Get Windows directory */
+    BufferSize = MAX_PATH - 5 - wcslen(InfFile);
+    if (GetWindowsDirectoryW(Buffer, BufferSize) > BufferSize)
+    {
+        /* Function failed */
+        SetLastError(ERROR_GEN_FAILURE);
+        goto cleanup;
+    }
+    /* We have enough space to add some information in the buffer */
+    if (Buffer[wcslen(Buffer) - 1] != '\\')
+        wcscat(Buffer, L"\\");
+    wcscat(Buffer, L"Inf\\");
+    wcscat(Buffer, InfFile);
+
+    /* Install specified section */
+    hInf = SetupOpenInfFileW(Buffer, NULL, INF_STYLE_WIN4, NULL);
+    if (hInf == INVALID_HANDLE_VALUE)
+        goto cleanup;
+
+    Context = SetupInitDefaultQueueCallback(hWnd);
+    if (Context == NULL)
+        goto cleanup;
+
+    ret = TRUE;
+    if (ret && InfSection)
+    {
+        ret = SetupInstallFromInfSectionW(
+            hWnd, hInf,
+            InfSection, SPINST_ALL,
+            NULL, NULL, SP_COPY_NEWER,
+            SetupDefaultQueueCallbackW, Context,
+            NULL, NULL);
+    }
+    if (ret && InfService)
+    {
+        ret = SetupInstallServicesFromInfSectionW(
+            hInf, InfService, 0);
+    }
 
 cleanup:
-	if (Context)
-		SetupTermDefaultQueueCallback(Context);
-	if (hInf != INVALID_HANDLE_VALUE)
-		SetupCloseInfFile(hInf);
-	return ret;
+    if (Context)
+        SetupTermDefaultQueueCallback(Context);
+    if (hInf != INVALID_HANDLE_VALUE)
+        SetupCloseInfFile(hInf);
+    return ret;
 }
 
 /* Add default services for network cards */
-static DWORD
+static
+DWORD
 InstallAdditionalServices(
-	IN HWND hWnd)
-{
-	BOOL ret;
-	UNICODE_STRING TcpipServicePath =
RTL_CONSTANT_STRING(L"\\Registry\\Machine\\System\\CurrentControlSet\\Services\\Tcpip");
-
-	/* Install TCP/IP protocol */
-	ret = InstallInfSection(
-		hWnd,
-		L"nettcpip.inf",
-		L"MS_TCPIP.PrimaryInstall",
-		L"MS_TCPIP.PrimaryInstall.Services");
-	if (!ret && GetLastError() != ERROR_FILE_NOT_FOUND)
-	{
-		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...) */
-
-	return ERROR_SUCCESS;
-}
-
-static DWORD
+    IN HWND hWnd)
+{
+    BOOL ret;
+    UNICODE_STRING TcpipServicePath =
RTL_CONSTANT_STRING(L"\\Registry\\Machine\\System\\CurrentControlSet\\Services\\Tcpip");
+
+    /* Install TCP/IP protocol */
+    ret = InstallInfSection(hWnd,
+                            L"nettcpip.inf",
+                            L"MS_TCPIP.PrimaryInstall",
+                            L"MS_TCPIP.PrimaryInstall.Services");
+    if (!ret && GetLastError() != ERROR_FILE_NOT_FOUND)
+    {
+        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...) */
+
+    return ERROR_SUCCESS;
+}
+
+static
+DWORD
 InstallNetDevice(
-	IN HDEVINFO DeviceInfoSet,
-	IN PSP_DEVINFO_DATA DeviceInfoData,
-	LPCWSTR UuidString,
-	DWORD Characteristics,
-	LPCWSTR BusType)
-{
-	LPWSTR InstanceId = NULL;
-	LPWSTR DeviceName = NULL;
-	LPWSTR ExportName = NULL;
-	LONG rc;
-	HKEY hKey = NULL;
-	HKEY hNetworkKey = NULL;
-	HKEY hLinkageKey = NULL;
-	HKEY hConnectionKey = NULL;
-	DWORD dwShowIcon, dwLength, dwValue;
-	WCHAR szBuffer[300];
-
-	/* Get Instance ID */
-	if (SetupDiGetDeviceInstanceIdW(DeviceInfoSet, DeviceInfoData, NULL, 0, &dwLength))
-	{
-		DPRINT("SetupDiGetDeviceInstanceIdW() returned TRUE. FALSE expected\n");
-		rc = ERROR_GEN_FAILURE;
-		goto cleanup;
-	}
-	InstanceId = HeapAlloc(GetProcessHeap(), 0, dwLength * sizeof(WCHAR));
-	if (!InstanceId)
-	{
-		DPRINT("HeapAlloc() failed\n");
-		rc = ERROR_NOT_ENOUGH_MEMORY;
-		goto cleanup;
-	}
-	if (!SetupDiGetDeviceInstanceIdW(DeviceInfoSet, DeviceInfoData, InstanceId, dwLength,
NULL))
-	{
-		rc = GetLastError();
-		DPRINT("SetupDiGetDeviceInstanceIdW() failed with error 0x%lx\n", rc);
-		goto cleanup;
-	}
-
-	/* Create device name */
-	DeviceName = HeapAlloc(GetProcessHeap(), 0, (wcslen(L"\\Device\\") +
wcslen(UuidString)) * sizeof(WCHAR) + sizeof(UNICODE_NULL));
-	if (!DeviceName)
-	{
-		DPRINT("HeapAlloc() failed\n");
-		rc = ERROR_NOT_ENOUGH_MEMORY;
-		goto cleanup;
-	}
-	wcscpy(DeviceName, L"\\Device\\");
-	wcscat(DeviceName, UuidString);
-
-	/* Create export name */
-	ExportName = HeapAlloc(GetProcessHeap(), 0, (wcslen(L"\\Device\\Tcpip_") +
wcslen(UuidString)) * sizeof(WCHAR) + sizeof(UNICODE_NULL));
-	if (!ExportName)
-	{
-		DPRINT("HeapAlloc() failed\n");
-		rc = ERROR_NOT_ENOUGH_MEMORY;
-		goto cleanup;
-	}
-	wcscpy(ExportName, L"\\Device\\Tcpip_");
-	wcscat(ExportName, UuidString);
-
-	/* Write Tcpip parameters in new service Key */
-	rc = RegCreateKeyExW(HKEY_LOCAL_MACHINE,
L"SYSTEM\\CurrentControlSet\\Services", 0, NULL, REG_OPTION_NON_VOLATILE, 0,
NULL, &hKey, NULL);
-	if (rc != ERROR_SUCCESS)
-	{
-		DPRINT("RegCreateKeyExW() failed with error 0x%lx\n", rc);
-		goto cleanup;
-	}
-	rc = RegCreateKeyExW(hKey, UuidString, 0, NULL, REG_OPTION_NON_VOLATILE, 0, NULL,
&hNetworkKey, NULL);
-	if (rc != ERROR_SUCCESS)
-	{
-		DPRINT("RegCreateKeyExW() failed with error 0x%lx\n", rc);
-		goto cleanup;
-	}
-	RegCloseKey(hKey);
-	hKey = NULL;
-	rc = RegCreateKeyExW(hNetworkKey, L"Parameters\\Tcpip", 0, NULL,
REG_OPTION_NON_VOLATILE, KEY_SET_VALUE, NULL, &hKey, NULL);
-	if (rc != ERROR_SUCCESS)
-	{
-		DPRINT("RegCreateKeyExW() failed with error 0x%lx\n", rc);
-		goto cleanup;
-	}
-	RegCloseKey(hNetworkKey);
-	hNetworkKey = NULL;
-	rc = RegSetValueExW(hKey, L"DefaultGateway", 0, REG_SZ, (const
BYTE*)L"0.0.0.0", (wcslen(L"0.0.0.0") + 1) * sizeof(WCHAR));
-	if (rc != ERROR_SUCCESS)
-	{
-		DPRINT("RegSetValueExW() failed with error 0x%lx\n", rc);
-		goto cleanup;
-	}
-	rc = RegSetValueExW(hKey, L"IPAddress", 0, REG_SZ, (const
BYTE*)L"0.0.0.0", (wcslen(L"0.0.0.0") + 1) * sizeof(WCHAR));
-	if (rc != ERROR_SUCCESS)
-	{
-		DPRINT("RegSetValueExW() failed with error 0x%lx\n", rc);
-		goto cleanup;
-	}
-	rc = RegSetValueExW(hKey, L"SubnetMask", 0, REG_SZ, (const
BYTE*)L"0.0.0.0", (wcslen(L"0.0.0.0") + 1) * sizeof(WCHAR));
-	if (rc != ERROR_SUCCESS)
-	{
-		DPRINT("RegSetValueExW() failed with error 0x%lx\n", rc);
-		goto cleanup;
-	}
-        dwValue = 1;
-	rc = RegSetValueExW(hKey, L"EnableDHCP", 0, REG_DWORD, (const
BYTE*)&dwValue, sizeof(DWORD));
-	if (rc != ERROR_SUCCESS)
-	{
-		DPRINT("RegSetValueExW() failed with error 0x%lx\n", rc);
-		goto cleanup;
-	}
-	RegCloseKey(hKey);
-	hKey = NULL;
-
-	/* Write 'Linkage' key in hardware key */
+    IN HDEVINFO DeviceInfoSet,
+    IN PSP_DEVINFO_DATA DeviceInfoData,
+    LPCWSTR UuidString,
+    DWORD Characteristics,
+    LPCWSTR BusType)
+{
+    LPWSTR InstanceId = NULL;
+    LPWSTR DeviceName = NULL;
+    LPWSTR ExportName = NULL;
+    LONG rc;
+    HKEY hKey = NULL;
+    HKEY hNetworkKey = NULL;
+    HKEY hLinkageKey = NULL;
+    HKEY hConnectionKey = NULL;
+    DWORD dwShowIcon, dwLength, dwValue;
+    WCHAR szBuffer[300];
+
+    /* Get Instance ID */
+    if (SetupDiGetDeviceInstanceIdW(DeviceInfoSet, DeviceInfoData, NULL, 0,
&dwLength))
+    {
+        DPRINT("SetupDiGetDeviceInstanceIdW() returned TRUE. FALSE
expected\n");
+        rc = ERROR_GEN_FAILURE;
+        goto cleanup;
+    }
+
+    InstanceId = HeapAlloc(GetProcessHeap(), 0, dwLength * sizeof(WCHAR));
+    if (!InstanceId)
+    {
+        DPRINT("HeapAlloc() failed\n");
+        rc = ERROR_NOT_ENOUGH_MEMORY;
+        goto cleanup;
+    }
+
+    if (!SetupDiGetDeviceInstanceIdW(DeviceInfoSet, DeviceInfoData, InstanceId, dwLength,
NULL))
+    {
+        rc = GetLastError();
+        DPRINT("SetupDiGetDeviceInstanceIdW() failed with error 0x%lx\n", rc);
+        goto cleanup;
+    }
+
+    /* Create device name */
+    DeviceName = HeapAlloc(GetProcessHeap(), 0, (wcslen(L"\\Device\\") +
wcslen(UuidString)) * sizeof(WCHAR) + sizeof(UNICODE_NULL));
+    if (!DeviceName)
+    {
+        DPRINT("HeapAlloc() failed\n");
+        rc = ERROR_NOT_ENOUGH_MEMORY;
+        goto cleanup;
+    }
+    wcscpy(DeviceName, L"\\Device\\");
+    wcscat(DeviceName, UuidString);
+
+    /* Create export name */
+    ExportName = HeapAlloc(GetProcessHeap(), 0, (wcslen(L"\\Device\\Tcpip_") +
wcslen(UuidString)) * sizeof(WCHAR) + sizeof(UNICODE_NULL));
+    if (!ExportName)
+    {
+        DPRINT("HeapAlloc() failed\n");
+        rc = ERROR_NOT_ENOUGH_MEMORY;
+        goto cleanup;
+    }
+    wcscpy(ExportName, L"\\Device\\Tcpip_");
+    wcscat(ExportName, UuidString);
+
+    /* Write Tcpip parameters in new service Key */
+    rc = RegCreateKeyExW(HKEY_LOCAL_MACHINE,
L"SYSTEM\\CurrentControlSet\\Services", 0, NULL, REG_OPTION_NON_VOLATILE, 0,
NULL, &hKey, NULL);
+    if (rc != ERROR_SUCCESS)
+    {
+        DPRINT("RegCreateKeyExW() failed with error 0x%lx\n", rc);
+        goto cleanup;
+    }
+
+    rc = RegCreateKeyExW(hKey, UuidString, 0, NULL, REG_OPTION_NON_VOLATILE, 0, NULL,
&hNetworkKey, NULL);
+    if (rc != ERROR_SUCCESS)
+    {
+        DPRINT("RegCreateKeyExW() failed with error 0x%lx\n", rc);
+        goto cleanup;
+    }
+    RegCloseKey(hKey);
+    hKey = NULL;
+
+    rc = RegCreateKeyExW(hNetworkKey, L"Parameters\\Tcpip", 0, NULL,
REG_OPTION_NON_VOLATILE, KEY_SET_VALUE, NULL, &hKey, NULL);
+    if (rc != ERROR_SUCCESS)
+    {
+        DPRINT("RegCreateKeyExW() failed with error 0x%lx\n", rc);
+        goto cleanup;
+    }
+    RegCloseKey(hNetworkKey);
+    hNetworkKey = NULL;
+
+    rc = RegSetValueExW(hKey, L"DefaultGateway", 0, REG_SZ, (const
BYTE*)L"0.0.0.0", (wcslen(L"0.0.0.0") + 1) * sizeof(WCHAR));
+    if (rc != ERROR_SUCCESS)
+    {
+        DPRINT("RegSetValueExW() failed with error 0x%lx\n", rc);
+        goto cleanup;
+    }
+
+    rc = RegSetValueExW(hKey, L"IPAddress", 0, REG_SZ, (const
BYTE*)L"0.0.0.0", (wcslen(L"0.0.0.0") + 1) * sizeof(WCHAR));
+    if (rc != ERROR_SUCCESS)
+    {
+        DPRINT("RegSetValueExW() failed with error 0x%lx\n", rc);
+        goto cleanup;
+    }
+
+    rc = RegSetValueExW(hKey, L"SubnetMask", 0, REG_SZ, (const
BYTE*)L"0.0.0.0", (wcslen(L"0.0.0.0") + 1) * sizeof(WCHAR));
+    if (rc != ERROR_SUCCESS)
+    {
+        DPRINT("RegSetValueExW() failed with error 0x%lx\n", rc);
+        goto cleanup;
+    }
+
+    dwValue = 1;
+    rc = RegSetValueExW(hKey, L"EnableDHCP", 0, REG_DWORD, (const
BYTE*)&dwValue, sizeof(DWORD));
+    if (rc != ERROR_SUCCESS)
+    {
+        DPRINT("RegSetValueExW() failed with error 0x%lx\n", rc);
+        goto cleanup;
+    }
+    RegCloseKey(hKey);
+    hKey = NULL;
+
+    /* Write 'Linkage' key in hardware key */
 #if _WIN32_WINNT >= 0x502
-	hKey = SetupDiOpenDevRegKey(DeviceInfoSet, DeviceInfoData, DICS_FLAG_GLOBAL, 0,
DIREG_DRV, KEY_READ | KEY_WRITE);
+    hKey = SetupDiOpenDevRegKey(DeviceInfoSet, DeviceInfoData, DICS_FLAG_GLOBAL, 0,
DIREG_DRV, KEY_READ | KEY_WRITE);
 #else
-	hKey = SetupDiOpenDevRegKey(DeviceInfoSet, DeviceInfoData, DICS_FLAG_GLOBAL, 0,
DIREG_DRV, KEY_ALL_ACCESS);
+    hKey = SetupDiOpenDevRegKey(DeviceInfoSet, DeviceInfoData, DICS_FLAG_GLOBAL, 0,
DIREG_DRV, KEY_ALL_ACCESS);
 #endif
-	if (hKey == INVALID_HANDLE_VALUE && GetLastError() == ERROR_FILE_NOT_FOUND)
-		hKey = SetupDiCreateDevRegKeyW(DeviceInfoSet, DeviceInfoData, DICS_FLAG_GLOBAL, 0,
DIREG_DRV, NULL, NULL);
-	if (hKey == INVALID_HANDLE_VALUE)
-	{
-		hKey = NULL;
-		rc = GetLastError();
-		DPRINT("SetupDiCreateDevRegKeyW() failed with error 0x%lx\n", rc);
-		goto cleanup;
-	}
-	rc = RegSetValueExW(hKey, L"NetCfgInstanceId", 0, REG_SZ, (const
BYTE*)UuidString, (wcslen(UuidString) + 1) * sizeof(WCHAR));
-	if (rc != ERROR_SUCCESS)
-	{
-		DPRINT("RegSetValueExW() failed with error 0x%lx\n", rc);
-		goto cleanup;
-	}
-	rc = RegSetValueExW(hKey, L"Characteristics", 0, REG_DWORD, (const
BYTE*)&Characteristics, sizeof(DWORD));
-	if (rc != ERROR_SUCCESS)
-	{
-		DPRINT("RegSetValueExW() failed with error 0x%lx\n", rc);
-		goto cleanup;
-	}
-	if (BusType)
-		rc = RegSetValueExW(hKey, L"BusType", 0, REG_SZ, (const BYTE*)BusType,
(wcslen(BusType) + 1) * sizeof(WCHAR));
-		if (rc != ERROR_SUCCESS)
-		{
-			DPRINT("RegSetValueExW() failed with error 0x%lx\n", rc);
-			goto cleanup;
-		}
-	rc = RegCreateKeyExW(hKey, L"Linkage", 0, NULL, REG_OPTION_NON_VOLATILE,
KEY_SET_VALUE, NULL, &hLinkageKey, NULL);
-	if (rc != ERROR_SUCCESS)
-	{
-		DPRINT("RegCreateKeyExW() failed with error 0x%lx\n", rc);
-		goto cleanup;
-	}
-	rc = RegSetValueExW(hLinkageKey, L"Export", 0, REG_SZ, (const
BYTE*)DeviceName, (wcslen(DeviceName) + 1) * sizeof(WCHAR));
-	if (rc != ERROR_SUCCESS)
-	{
-		DPRINT("RegSetValueExW() failed with error 0x%lx\n", rc);
-		goto cleanup;
-	}
-	rc = RegSetValueExW(hLinkageKey, L"RootDevice", 0, REG_SZ, (const
BYTE*)UuidString, (wcslen(UuidString) + 1) * sizeof(WCHAR));
-	if (rc != ERROR_SUCCESS)
-	{
-		DPRINT("RegSetValueExW() failed with error 0x%lx\n", rc);
-		goto cleanup;
-	}
-	rc = RegSetValueExW(hLinkageKey, L"UpperBind", 0, REG_SZ, (const
BYTE*)L"Tcpip", (wcslen(L"Tcpip") + 1) * sizeof(WCHAR));
-	if (rc != ERROR_SUCCESS)
-	{
-		DPRINT("RegSetValueExW() failed with error 0x%lx\n", rc);
-		goto cleanup;
-	}
-	RegCloseKey(hKey);
-	hKey = NULL;
-
-	/* Write connection information in network subkey */
-	rc = RegCreateKeyExW(HKEY_LOCAL_MACHINE,
L"SYSTEM\\CurrentControlSet\\Control\\Network\\{4D36E972-E325-11CE-BFC1-08002BE10318}",
0, NULL, REG_OPTION_NON_VOLATILE, 0, NULL, &hNetworkKey, NULL);
-	if (rc != ERROR_SUCCESS)
-	{
-		DPRINT("RegCreateKeyExW() failed with error 0x%lx\n", rc);
-		goto cleanup;
-	}
-	rc = RegCreateKeyExW(hNetworkKey, UuidString, 0, NULL, REG_OPTION_NON_VOLATILE,
KEY_CREATE_SUB_KEY, NULL, &hKey, NULL);
-	if (rc != ERROR_SUCCESS)
-	{
-		DPRINT("RegCreateKeyExW() failed with error 0x%lx\n", rc);
-		goto cleanup;
-	}
-	rc = RegCreateKeyExW(hKey, L"Connection", 0, NULL, REG_OPTION_NON_VOLATILE,
KEY_SET_VALUE, NULL, &hConnectionKey, NULL);
-	RegCloseKey(hKey);
-	hKey = NULL;
-	if (rc != ERROR_SUCCESS)
-	{
-		DPRINT("RegCreateKeyExW() failed with error 0x%lx\n", rc);
-		goto cleanup;
-	}
-	if (!LoadStringW(netcfgx_hInstance, IDS_NET_CONNECT, szBuffer,
sizeof(szBuffer)/sizeof(WCHAR)))
-	{
-		wcscpy(szBuffer,L"Network connection");
-	}
-	rc = RegSetValueExW(hConnectionKey, L"Name", 0, REG_SZ, (const BYTE*)szBuffer,
(wcslen(szBuffer) + 1) * sizeof(WCHAR));
-	if (rc != ERROR_SUCCESS)
-	{
-		DPRINT("RegSetValueExW() failed with error 0x%lx\n", rc);
-		goto cleanup;
-	}
-	rc = RegSetValueExW(hConnectionKey, L"PnpInstanceId", 0, REG_SZ, (const
BYTE*)InstanceId, (wcslen(InstanceId) + 1) * sizeof(WCHAR));
-	if (rc != ERROR_SUCCESS)
-	{
-		DPRINT("RegSetValueExW() failed with error 0x%lx\n", rc);
-		goto cleanup;
-	}
-	dwShowIcon = 1;
-	rc = RegSetValueExW(hConnectionKey, L"ShowIcon", 0, REG_DWORD, (const
BYTE*)&dwShowIcon, sizeof(dwShowIcon));
-	if (rc != ERROR_SUCCESS)
-	{
-		DPRINT("RegSetValueExW() failed with error 0x%lx\n", rc);
-		goto cleanup;
-	}
-
-	/* Write linkage information in Tcpip service */
-	rc = RegCreateKeyExW(HKEY_LOCAL_MACHINE,
L"SYSTEM\\CurrentControlSet\\Services\\Tcpip\\Linkage", 0, NULL,
REG_OPTION_NON_VOLATILE, KEY_QUERY_VALUE | KEY_SET_VALUE, NULL, &hKey, NULL);
-	if (rc != ERROR_SUCCESS)
-	{
-		DPRINT("RegCreateKeyExW() failed with error 0x%lx\n", rc);
-		goto cleanup;
-	}
-	rc = AppendStringToMultiSZ(hKey, L"Bind", DeviceName);
-	if (rc != ERROR_SUCCESS)
-	{
-		DPRINT("AppendStringToMultiSZ() failed with error 0x%lx\n", rc);
-		goto cleanup;
-	}
-	rc = AppendStringToMultiSZ(hKey, L"Export", ExportName);
-	if (rc != ERROR_SUCCESS)
-	{
-		DPRINT("AppendStringToMultiSZ() failed with error 0x%lx\n", rc);
-		goto cleanup;
-	}
-	rc = AppendStringToMultiSZ(hKey, L"Route", UuidString);
-	if (rc != ERROR_SUCCESS)
-	{
-		DPRINT("AppendStringToMultiSZ() failed with error 0x%lx\n", rc);
-		goto cleanup;
-	}
-
-	/* Install additionnal services */
-	rc = InstallAdditionalServices(NULL);
-	if (rc != ERROR_SUCCESS)
-	{
-		DPRINT("InstallAdditionalServices() failed with error 0x%lx\n", rc);
-		goto cleanup;
-	}
-
-	rc = ERROR_SUCCESS;
+    if (hKey == INVALID_HANDLE_VALUE && GetLastError() == ERROR_FILE_NOT_FOUND)
+        hKey = SetupDiCreateDevRegKeyW(DeviceInfoSet, DeviceInfoData, DICS_FLAG_GLOBAL,
0, DIREG_DRV, NULL, NULL);
+    if (hKey == INVALID_HANDLE_VALUE)
+    {
+        hKey = NULL;
+        rc = GetLastError();
+        DPRINT("SetupDiCreateDevRegKeyW() failed with error 0x%lx\n", rc);
+        goto cleanup;
+    }
+
+    rc = RegSetValueExW(hKey, L"NetCfgInstanceId", 0, REG_SZ, (const
BYTE*)UuidString, (wcslen(UuidString) + 1) * sizeof(WCHAR));
+    if (rc != ERROR_SUCCESS)
+    {
+        DPRINT("RegSetValueExW() failed with error 0x%lx\n", rc);
+        goto cleanup;
+    }
+
+    rc = RegSetValueExW(hKey, L"Characteristics", 0, REG_DWORD, (const
BYTE*)&Characteristics, sizeof(DWORD));
+    if (rc != ERROR_SUCCESS)
+    {
+        DPRINT("RegSetValueExW() failed with error 0x%lx\n", rc);
+        goto cleanup;
+    }
+
+    if (BusType)
+    {
+        rc = RegSetValueExW(hKey, L"BusType", 0, REG_SZ, (const BYTE*)BusType,
(wcslen(BusType) + 1) * sizeof(WCHAR));
+        if (rc != ERROR_SUCCESS)
+        {
+            DPRINT("RegSetValueExW() failed with error 0x%lx\n", rc);
+            goto cleanup;
+        }
+    }
+
+    rc = RegCreateKeyExW(hKey, L"Linkage", 0, NULL, REG_OPTION_NON_VOLATILE,
KEY_SET_VALUE, NULL, &hLinkageKey, NULL);
+    if (rc != ERROR_SUCCESS)
+    {
+        DPRINT("RegCreateKeyExW() failed with error 0x%lx\n", rc);
+        goto cleanup;
+    }
+
+    rc = RegSetValueExW(hLinkageKey, L"Export", 0, REG_SZ, (const
BYTE*)DeviceName, (wcslen(DeviceName) + 1) * sizeof(WCHAR));
+    if (rc != ERROR_SUCCESS)
+    {
+        DPRINT("RegSetValueExW() failed with error 0x%lx\n", rc);
+        goto cleanup;
+    }
+
+    rc = RegSetValueExW(hLinkageKey, L"RootDevice", 0, REG_SZ, (const
BYTE*)UuidString, (wcslen(UuidString) + 1) * sizeof(WCHAR));
+    if (rc != ERROR_SUCCESS)
+    {
+        DPRINT("RegSetValueExW() failed with error 0x%lx\n", rc);
+        goto cleanup;
+    }
+
+    rc = RegSetValueExW(hLinkageKey, L"UpperBind", 0, REG_SZ, (const
BYTE*)L"Tcpip", (wcslen(L"Tcpip") + 1) * sizeof(WCHAR));
+    if (rc != ERROR_SUCCESS)
+    {
+        DPRINT("RegSetValueExW() failed with error 0x%lx\n", rc);
+        goto cleanup;
+    }
+    RegCloseKey(hKey);
+    hKey = NULL;
+
+    /* Write connection information in network subkey */
+    rc = RegCreateKeyExW(HKEY_LOCAL_MACHINE,
L"SYSTEM\\CurrentControlSet\\Control\\Network\\{4D36E972-E325-11CE-BFC1-08002BE10318}",
0, NULL, REG_OPTION_NON_VOLATILE, 0, NULL, &hNetworkKey, NULL);
+    if (rc != ERROR_SUCCESS)
+    {
+        DPRINT("RegCreateKeyExW() failed with error 0x%lx\n", rc);
+        goto cleanup;
+    }
+
+    rc = RegCreateKeyExW(hNetworkKey, UuidString, 0, NULL, REG_OPTION_NON_VOLATILE,
KEY_CREATE_SUB_KEY, NULL, &hKey, NULL);
+    if (rc != ERROR_SUCCESS)
+    {
+        DPRINT("RegCreateKeyExW() failed with error 0x%lx\n", rc);
+        goto cleanup;
+    }
+
+    rc = RegCreateKeyExW(hKey, L"Connection", 0, NULL, REG_OPTION_NON_VOLATILE,
KEY_SET_VALUE, NULL, &hConnectionKey, NULL);
+    RegCloseKey(hKey);
+    hKey = NULL;
+    if (rc != ERROR_SUCCESS)
+    {
+        DPRINT("RegCreateKeyExW() failed with error 0x%lx\n", rc);
+        goto cleanup;
+    }
+
+    if (!LoadStringW(netcfgx_hInstance, IDS_NET_CONNECT, szBuffer,
sizeof(szBuffer)/sizeof(WCHAR)))
+    {
+        wcscpy(szBuffer,L"Network connection");
+    }
+
+    rc = RegSetValueExW(hConnectionKey, L"Name", 0, REG_SZ, (const
BYTE*)szBuffer, (wcslen(szBuffer) + 1) * sizeof(WCHAR));
+    if (rc != ERROR_SUCCESS)
+    {
+        DPRINT("RegSetValueExW() failed with error 0x%lx\n", rc);
+        goto cleanup;
+    }
+
+    rc = RegSetValueExW(hConnectionKey, L"PnpInstanceId", 0, REG_SZ, (const
BYTE*)InstanceId, (wcslen(InstanceId) + 1) * sizeof(WCHAR));
+    if (rc != ERROR_SUCCESS)
+    {
+        DPRINT("RegSetValueExW() failed with error 0x%lx\n", rc);
+        goto cleanup;
+    }
+
+    dwShowIcon = 1;
+    rc = RegSetValueExW(hConnectionKey, L"ShowIcon", 0, REG_DWORD, (const
BYTE*)&dwShowIcon, sizeof(dwShowIcon));
+    if (rc != ERROR_SUCCESS)
+    {
+        DPRINT("RegSetValueExW() failed with error 0x%lx\n", rc);
+        goto cleanup;
+    }
+
+    /* Write linkage information in Tcpip service */
+    rc = RegCreateKeyExW(HKEY_LOCAL_MACHINE,
L"SYSTEM\\CurrentControlSet\\Services\\Tcpip\\Linkage", 0, NULL,
REG_OPTION_NON_VOLATILE, KEY_QUERY_VALUE | KEY_SET_VALUE, NULL, &hKey, NULL);
+    if (rc != ERROR_SUCCESS)
+    {
+        DPRINT("RegCreateKeyExW() failed with error 0x%lx\n", rc);
+        goto cleanup;
+    }
+    rc = AppendStringToMultiSZ(hKey, L"Bind", DeviceName);
+    if (rc != ERROR_SUCCESS)
+    {
+        DPRINT("AppendStringToMultiSZ() failed with error 0x%lx\n", rc);
+        goto cleanup;
+    }
+    rc = AppendStringToMultiSZ(hKey, L"Export", ExportName);
+    if (rc != ERROR_SUCCESS)
+    {
+        DPRINT("AppendStringToMultiSZ() failed with error 0x%lx\n", rc);
+        goto cleanup;
+    }
+    rc = AppendStringToMultiSZ(hKey, L"Route", UuidString);
+    if (rc != ERROR_SUCCESS)
+    {
+        DPRINT("AppendStringToMultiSZ() failed with error 0x%lx\n", rc);
+        goto cleanup;
+    }
+
+    /* Install additionnal services */
+    rc = InstallAdditionalServices(NULL);
+    if (rc != ERROR_SUCCESS)
+    {
+        DPRINT("InstallAdditionalServices() failed with error 0x%lx\n", rc);
+        goto cleanup;
+    }
+
+    rc = ERROR_SUCCESS;
 
 cleanup:
-	HeapFree(GetProcessHeap(), 0, InstanceId);
-	HeapFree(GetProcessHeap(), 0, DeviceName);
-	HeapFree(GetProcessHeap(), 0, ExportName);
-	if (hKey != NULL)
-		RegCloseKey(hKey);
-	if (hNetworkKey != NULL)
-		RegCloseKey(hNetworkKey);
-	if (hLinkageKey != NULL)
-		RegCloseKey(hLinkageKey);
-	if (hConnectionKey != NULL)
-		RegCloseKey(hConnectionKey);
-	return rc;
-}
-
-static DWORD
+    HeapFree(GetProcessHeap(), 0, InstanceId);
+    HeapFree(GetProcessHeap(), 0, DeviceName);
+    HeapFree(GetProcessHeap(), 0, ExportName);
+    if (hKey != NULL)
+        RegCloseKey(hKey);
+    if (hNetworkKey != NULL)
+        RegCloseKey(hNetworkKey);
+    if (hLinkageKey != NULL)
+        RegCloseKey(hLinkageKey);
+    if (hConnectionKey != NULL)
+        RegCloseKey(hConnectionKey);
+    return rc;
+}
+
+static
+DWORD
 InstallNetClient(VOID)
 {
-	DPRINT1("Installation of network clients is not yet supported\n");
-	return ERROR_GEN_FAILURE;
-}
-
-static DWORD
+    DPRINT1("Installation of network clients is not yet supported\n");
+    return ERROR_GEN_FAILURE;
+}
+
+static
+DWORD
 InstallNetService(VOID)
 {
-	DPRINT1("Installation of network services is not yet supported\n");
-	return ERROR_GEN_FAILURE;
-}
-
-static DWORD
+    DPRINT1("Installation of network services is not yet supported\n");
+    return ERROR_GEN_FAILURE;
+}
+
+static
+DWORD
 InstallNetTransport(VOID)
 {
-	DPRINT1("Installation of network protocols is not yet supported\n");
-	return ERROR_GEN_FAILURE;
-}
-
-DWORD WINAPI
+    DPRINT1("Installation of network protocols is not yet supported\n");
+    return ERROR_GEN_FAILURE;
+}
+
+DWORD
+WINAPI
 NetClassInstaller(
-	IN DI_FUNCTION InstallFunction,
-	IN HDEVINFO DeviceInfoSet,
-	IN PSP_DEVINFO_DATA DeviceInfoData OPTIONAL)
-{
-	SP_DRVINFO_DATA_W DriverInfoData;
-	SP_DRVINFO_DETAIL_DATA_W DriverInfoDetail;
-	WCHAR SectionName[LINE_LEN];
-	HINF hInf = INVALID_HANDLE_VALUE;
-	INFCONTEXT InfContext;
-	UINT ErrorLine;
-	INT CharacteristicsInt;
-	DWORD Characteristics;
-	LPWSTR BusType = NULL;
-	RPC_STATUS RpcStatus;
-	UUID Uuid;
-	LPWSTR UuidRpcString = NULL;
-	LPWSTR UuidString = NULL;
-	LONG rc;
-	DWORD dwLength;
-
-	if (InstallFunction != DIF_INSTALLDEVICE)
-		return ERROR_DI_DO_DEFAULT;
-
-	DPRINT("%lu %p %p\n", InstallFunction, DeviceInfoSet, DeviceInfoData);
-
-	/* Get driver info details */
-	DriverInfoData.cbSize = sizeof(SP_DRVINFO_DATA_W);
-	if (!SetupDiGetSelectedDriverW(DeviceInfoSet, DeviceInfoData, &DriverInfoData))
-	{
-		rc = GetLastError();
-		DPRINT("SetupDiGetSelectedDriverW() failed with error 0x%lx\n", rc);
-		goto cleanup;
-	}
-	DriverInfoDetail.cbSize = sizeof(SP_DRVINFO_DETAIL_DATA_W);
-	if (!SetupDiGetDriverInfoDetailW(DeviceInfoSet, DeviceInfoData, &DriverInfoData,
&DriverInfoDetail, sizeof(DriverInfoDetail), NULL)
-	 && GetLastError() != ERROR_INSUFFICIENT_BUFFER)
-	{
-		rc = GetLastError();
-		DPRINT("SetupDiGetDriverInfoDetailW() failed with error 0x%lx\n", rc);
-		goto cleanup;
-	}
-	hInf = SetupOpenInfFileW(DriverInfoDetail.InfFileName, NULL, INF_STYLE_WIN4,
&ErrorLine);
-	if (hInf == INVALID_HANDLE_VALUE)
-	{
-		rc = GetLastError();
-		DPRINT("SetupOpenInfFileW() failed with error 0x%lx\n", rc);
-		goto cleanup;
-	}
-	if (!SetupDiGetActualSectionToInstallW(hInf, DriverInfoDetail.SectionName, SectionName,
LINE_LEN, NULL, NULL))
-	{
-		rc = GetLastError();
-		DPRINT("SetupDiGetActualSectionToInstallW() failed with error 0x%lx\n", rc);
-		goto cleanup;
-	}
-
-	/* Get Characteristics and BusType (optional) from .inf file */
-	if (!SetupFindFirstLineW(hInf, SectionName, L"Characteristics",
&InfContext))
-	{
-		rc = GetLastError();
-		DPRINT("Unable to find key %S in section %S of file %S (error 0x%lx)\n",
-			L"Characteristics", SectionName, DriverInfoDetail.InfFileName, rc);
-		goto cleanup;
-	}
-	if (!SetupGetIntField(&InfContext, 1, &CharacteristicsInt))
-	{
-		rc = GetLastError();
-		DPRINT("SetupGetIntField() failed with error 0x%lx\n", rc);
-		goto cleanup;
-	}
-	Characteristics = (DWORD)CharacteristicsInt;
-	if (IsEqualIID(&DeviceInfoData->ClassGuid, &GUID_DEVCLASS_NET))
-	{
-		if (SetupFindFirstLineW(hInf, SectionName, L"BusType", &InfContext))
-		{
-			if (!SetupGetStringFieldW(&InfContext, 1, NULL, 0, &dwLength))
-			{
-				rc = GetLastError();
-				DPRINT("SetupGetStringFieldW() failed with error 0x%lx\n", rc);
-				goto cleanup;
-			}
-			BusType = HeapAlloc(GetProcessHeap(), 0, dwLength * sizeof(WCHAR));
-			if (!BusType)
-			{
-				DPRINT("HeapAlloc() failed\n");
-				rc = ERROR_NOT_ENOUGH_MEMORY;
-				goto cleanup;
-			}
-			if (!SetupGetStringFieldW(&InfContext, 1, BusType, dwLength, NULL))
-			{
-				rc = GetLastError();
-				DPRINT("SetupGetStringFieldW() failed with error 0x%lx\n", rc);
-				goto cleanup;
-			}
-		}
-	}
-
-	/* Create a new UUID */
-	RpcStatus = UuidCreate(&Uuid);
-	if (RpcStatus != RPC_S_OK && RpcStatus != RPC_S_UUID_LOCAL_ONLY)
-	{
-		DPRINT("UuidCreate() failed with RPC status 0x%lx\n", RpcStatus);
-		rc = ERROR_GEN_FAILURE;
-		goto cleanup;
-	}
-	RpcStatus = UuidToStringW(&Uuid, &UuidRpcString);
-	if (RpcStatus != RPC_S_OK)
-	{
-		DPRINT("UuidToStringW() failed with RPC status 0x%lx\n", RpcStatus);
-		rc = ERROR_GEN_FAILURE;
-		goto cleanup;
-	}
-
-	/* Add curly braces around Uuid */
-	UuidString = HeapAlloc(GetProcessHeap(), 0, (2 + wcslen(UuidRpcString)) * sizeof(WCHAR)
+ sizeof(UNICODE_NULL));
-	if (!UuidString)
-	{
-		DPRINT("HeapAlloc() failed\n");
-		rc = ERROR_NOT_ENOUGH_MEMORY;
-		goto cleanup;
-	}
-	wcscpy(UuidString, L"{");
-	wcscat(UuidString, UuidRpcString);
-	wcscat(UuidString, L"}");
-
-	if (IsEqualIID(&DeviceInfoData->ClassGuid, &GUID_DEVCLASS_NET))
-		rc = InstallNetDevice(DeviceInfoSet, DeviceInfoData, UuidString, Characteristics,
BusType);
-	else if (IsEqualIID(&DeviceInfoData->ClassGuid, &GUID_DEVCLASS_NETCLIENT))
-		rc = InstallNetClient();
-	else if (IsEqualIID(&DeviceInfoData->ClassGuid, &GUID_DEVCLASS_NETSERVICE))
-		rc = InstallNetService();
-	else if (IsEqualIID(&DeviceInfoData->ClassGuid, &GUID_DEVCLASS_NETTRANS))
-		rc = InstallNetTransport();
-	else
-	{
-		DPRINT("Invalid class guid\n");
-		rc = ERROR_GEN_FAILURE;
-	}
+    IN DI_FUNCTION InstallFunction,
+    IN HDEVINFO DeviceInfoSet,
+    IN PSP_DEVINFO_DATA DeviceInfoData OPTIONAL)
+{
+    SP_DRVINFO_DATA_W DriverInfoData;
+    SP_DRVINFO_DETAIL_DATA_W DriverInfoDetail;
+    WCHAR SectionName[LINE_LEN];
+    HINF hInf = INVALID_HANDLE_VALUE;
+    INFCONTEXT InfContext;
+    UINT ErrorLine;
+    INT CharacteristicsInt;
+    DWORD Characteristics;
+    LPWSTR BusType = NULL;
+    RPC_STATUS RpcStatus;
+    UUID Uuid;
+    LPWSTR UuidRpcString = NULL;
+    LPWSTR UuidString = NULL;
+    LONG rc;
+    DWORD dwLength;
+
+    if (InstallFunction != DIF_INSTALLDEVICE)
+        return ERROR_DI_DO_DEFAULT;
+
+    DPRINT("%lu %p %p\n", InstallFunction, DeviceInfoSet, DeviceInfoData);
+
+    /* Get driver info details */
+    DriverInfoData.cbSize = sizeof(SP_DRVINFO_DATA_W);
+    if (!SetupDiGetSelectedDriverW(DeviceInfoSet, DeviceInfoData, &DriverInfoData))
+    {
+        rc = GetLastError();
+        DPRINT("SetupDiGetSelectedDriverW() failed with error 0x%lx\n", rc);
+        goto cleanup;
+    }
+
+    DriverInfoDetail.cbSize = sizeof(SP_DRVINFO_DETAIL_DATA_W);
+    if (!SetupDiGetDriverInfoDetailW(DeviceInfoSet, DeviceInfoData, &DriverInfoData,
&DriverInfoDetail, sizeof(DriverInfoDetail), NULL)
+     && GetLastError() != ERROR_INSUFFICIENT_BUFFER)
+    {
+        rc = GetLastError();
+        DPRINT("SetupDiGetDriverInfoDetailW() failed with error 0x%lx\n", rc);
+        goto cleanup;
+    }
+
+    hInf = SetupOpenInfFileW(DriverInfoDetail.InfFileName, NULL, INF_STYLE_WIN4,
&ErrorLine);
+    if (hInf == INVALID_HANDLE_VALUE)
+    {
+        rc = GetLastError();
+        DPRINT("SetupOpenInfFileW() failed with error 0x%lx\n", rc);
+        goto cleanup;
+    }
+
+    if (!SetupDiGetActualSectionToInstallW(hInf, DriverInfoDetail.SectionName,
SectionName, LINE_LEN, NULL, NULL))
+    {
+        rc = GetLastError();
+        DPRINT("SetupDiGetActualSectionToInstallW() failed with error 0x%lx\n",
rc);
+        goto cleanup;
+    }
+
+    /* Get Characteristics and BusType (optional) from .inf file */
+    if (!SetupFindFirstLineW(hInf, SectionName, L"Characteristics",
&InfContext))
+    {
+        rc = GetLastError();
+        DPRINT("Unable to find key %S in section %S of file %S (error
0x%lx)\n",
+            L"Characteristics", SectionName, DriverInfoDetail.InfFileName,
rc);
+        goto cleanup;
+    }
+
+    if (!SetupGetIntField(&InfContext, 1, &CharacteristicsInt))
+    {
+        rc = GetLastError();
+        DPRINT("SetupGetIntField() failed with error 0x%lx\n", rc);
+        goto cleanup;
+    }
+
+    Characteristics = (DWORD)CharacteristicsInt;
+    if (IsEqualIID(&DeviceInfoData->ClassGuid, &GUID_DEVCLASS_NET))
+    {
+        if (SetupFindFirstLineW(hInf, SectionName, L"BusType",
&InfContext))
+        {
+            if (!SetupGetStringFieldW(&InfContext, 1, NULL, 0, &dwLength))
+            {
+                rc = GetLastError();
+                DPRINT("SetupGetStringFieldW() failed with error 0x%lx\n",
rc);
+                goto cleanup;
+            }
+
+            BusType = HeapAlloc(GetProcessHeap(), 0, dwLength * sizeof(WCHAR));
+            if (!BusType)
+            {
+                DPRINT("HeapAlloc() failed\n");
+                rc = ERROR_NOT_ENOUGH_MEMORY;
+                goto cleanup;
+            }
+
+            if (!SetupGetStringFieldW(&InfContext, 1, BusType, dwLength, NULL))
+            {
+                rc = GetLastError();
+                DPRINT("SetupGetStringFieldW() failed with error 0x%lx\n",
rc);
+                goto cleanup;
+            }
+        }
+    }
+
+    /* Create a new UUID */
+    RpcStatus = UuidCreate(&Uuid);
+    if (RpcStatus != RPC_S_OK && RpcStatus != RPC_S_UUID_LOCAL_ONLY)
+    {
+        DPRINT("UuidCreate() failed with RPC status 0x%lx\n", RpcStatus);
+        rc = ERROR_GEN_FAILURE;
+        goto cleanup;
+    }
+
+    RpcStatus = UuidToStringW(&Uuid, &UuidRpcString);
+    if (RpcStatus != RPC_S_OK)
+    {
+        DPRINT("UuidToStringW() failed with RPC status 0x%lx\n", RpcStatus);
+        rc = ERROR_GEN_FAILURE;
+        goto cleanup;
+    }
+
+    /* Add curly braces around Uuid */
+    UuidString = HeapAlloc(GetProcessHeap(), 0, (2 + wcslen(UuidRpcString)) *
sizeof(WCHAR) + sizeof(UNICODE_NULL));
+    if (!UuidString)
+    {
+        DPRINT("HeapAlloc() failed\n");
+        rc = ERROR_NOT_ENOUGH_MEMORY;
+        goto cleanup;
+    }
+
+    wcscpy(UuidString, L"{");
+    wcscat(UuidString, UuidRpcString);
+    wcscat(UuidString, L"}");
+
+    if (IsEqualIID(&DeviceInfoData->ClassGuid, &GUID_DEVCLASS_NET))
+        rc = InstallNetDevice(DeviceInfoSet, DeviceInfoData, UuidString, Characteristics,
BusType);
+    else if (IsEqualIID(&DeviceInfoData->ClassGuid,
&GUID_DEVCLASS_NETCLIENT))
+        rc = InstallNetClient();
+    else if (IsEqualIID(&DeviceInfoData->ClassGuid,
&GUID_DEVCLASS_NETSERVICE))
+        rc = InstallNetService();
+    else if (IsEqualIID(&DeviceInfoData->ClassGuid, &GUID_DEVCLASS_NETTRANS))
+        rc = InstallNetTransport();
+    else
+    {
+        DPRINT("Invalid class guid\n");
+        rc = ERROR_GEN_FAILURE;
+    }
 
 cleanup:
-	if (hInf != INVALID_HANDLE_VALUE)
-		SetupCloseInfFile(hInf);
-	if (UuidRpcString != NULL)
-		RpcStringFreeW(&UuidRpcString);
-	HeapFree(GetProcessHeap(), 0, BusType);
-	HeapFree(GetProcessHeap(), 0, UuidString);
-
-	if (rc == ERROR_SUCCESS)
-		rc = ERROR_DI_DO_DEFAULT;
-	DPRINT("Returning 0x%lx\n", rc);
-	return rc;
-}
+    if (hInf != INVALID_HANDLE_VALUE)
+        SetupCloseInfFile(hInf);
+    if (UuidRpcString != NULL)
+        RpcStringFreeW(&UuidRpcString);
+    HeapFree(GetProcessHeap(), 0, BusType);
+    HeapFree(GetProcessHeap(), 0, UuidString);
+
+    if (rc == ERROR_SUCCESS)
+        rc = ERROR_DI_DO_DEFAULT;
+    DPRINT("Returning 0x%lx\n", rc);
+    return rc;
+}