From 0fdacaa71ea31f51f48a0d1cdf2df3a39e8e57ee Mon Sep 17 00:00:00 2001
From: Christoph von Wittich <christoph_vw@reactos.org>
Date: Tue, 20 Nov 2007 20:44:24 +0000
Subject: [PATCH] SetupDiGetDeviceInstanceId returns size in characters not in
 bytes

svn path=/trunk/; revision=30606
---
 reactos/dll/win32/newdev/newdev.c | 2 +-
 reactos/dll/win32/newdev/wizard.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/reactos/dll/win32/newdev/newdev.c b/reactos/dll/win32/newdev/newdev.c
index 73384f64ea9..9b157fdbad5 100644
--- a/reactos/dll/win32/newdev/newdev.c
+++ b/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);
diff --git a/reactos/dll/win32/newdev/wizard.c b/reactos/dll/win32/newdev/wizard.c
index c34c1c2b1c9..90a049aa073 100644
--- a/reactos/dll/win32/newdev/wizard.c
+++ b/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;