SetupDiGetDeviceInstanceId returns size in characters not in bytes

svn path=/trunk/; revision=30606

reactos/dll/win32/newdev/newdev.c

@@ -150,7 +150,7 @@ UpdateDriverForPlugAndPlayDevicesW(
 			TRACE("SetupDiGetDeviceInstanceIdW() failed with error 0x%x\n", GetLastError());
 			goto cleanup;
 		}
-		else if ((Buffer = HeapAlloc(GetProcessHeap(), 0, BufferSize)) == NULL)
+		else if ((Buffer = HeapAlloc(GetProcessHeap(), 0, BufferSize * sizeof(WCHAR))) == NULL)
 		{
 			TRACE("HeapAlloc() failed\n", GetLastError());
 			SetLastError(ERROR_NOT_ENOUGH_MEMORY);

reactos/dll/win32/newdev/wizard.c

@@ -236,7 +236,7 @@ PopulateCustomPathCombo(
 {
 	HKEY hKey = NULL;
 	DWORD dwRegType;
-	DWORD dwPathLength;
+	DWORD dwPathLength = 0;
 	LPWSTR Buffer = NULL;
 	LPCWSTR Path;
 	LONG rc;