From 6d3c4cb3e855c3bee202a2a9be0217a3f058a2de Mon Sep 17 00:00:00 2001
From: The Wine Synchronizer <winesync@svn.reactos.org>
Date: Fri, 4 Apr 2008 12:02:39 +0000
Subject: [PATCH] Autosyncing with Wine HEAD

svn path=/trunk/; revision=32834
---
 reactos/dll/win32/advpack/advpack.rbuild | 10 +++++-----
 reactos/dll/win32/advpack/files.c        |  4 +---
 reactos/dll/win32/advpack/reg.c          |  2 +-
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/reactos/dll/win32/advpack/advpack.rbuild b/reactos/dll/win32/advpack/advpack.rbuild
index 89117d664c7..de904cbb218 100644
--- a/reactos/dll/win32/advpack/advpack.rbuild
+++ b/reactos/dll/win32/advpack/advpack.rbuild
@@ -8,6 +8,11 @@
 	<define name="__WINESRC__" />
 	<define name="WINVER">0x600</define>
 	<define name="_WIN32_WINNT">0x600</define>
+	<file>advpack.c</file>
+	<file>files.c</file>
+	<file>install.c</file>
+	<file>reg.c</file>
+	<file>advpack.spec</file>
 	<library>wine</library>
 	<library>ole32</library>
 	<library>setupapi</library>
@@ -15,10 +20,5 @@
 	<library>advapi32</library>
 	<library>kernel32</library>
 	<library>ntdll</library>
-	<file>advpack.c</file>
-	<file>files.c</file>
-	<file>install.c</file>
-	<file>reg.c</file>
-	<file>advpack.spec</file>
 </module>
 </group>
diff --git a/reactos/dll/win32/advpack/files.c b/reactos/dll/win32/advpack/files.c
index 7dc816f46bc..5003239ed2d 100644
--- a/reactos/dll/win32/advpack/files.c
+++ b/reactos/dll/win32/advpack/files.c
@@ -514,7 +514,7 @@ HRESULT WINAPI DelNodeRunDLL32W(HWND hWnd, HINSTANCE hInst, LPWSTR cmdline, INT
     return res;
 }
 
-/* The following defintions were copied from dlls/cabinet/cabinet.h */
+/* The following definitions were copied from dlls/cabinet/cabinet.h */
 
 /* SESSION Operation */
 #define EXTRACT_FILLFILELIST  0x00000001
@@ -564,9 +564,7 @@ static LPSTR convert_file_list(LPCSTR FileList, DWORD *dwNumFiles)
     dwLen = last - first + 3; /* room for double-null termination */
     szConvertedList = HeapAlloc(GetProcessHeap(), 0, dwLen);
     lstrcpynA(szConvertedList, first, dwLen - 1);
-
     szConvertedList[dwLen - 1] = '\0';
-    szConvertedList[dwLen] = '\0';
 
     /* empty list */
     if (!lstrlenA(szConvertedList))
diff --git a/reactos/dll/win32/advpack/reg.c b/reactos/dll/win32/advpack/reg.c
index 2b1418ad5d4..bcb6cb9d596 100644
--- a/reactos/dll/win32/advpack/reg.c
+++ b/reactos/dll/win32/advpack/reg.c
@@ -210,7 +210,7 @@ static HRESULT write_predefined_strings(HMODULE hm, LPCWSTR ini_path)
  * substitution table, and executes the INF.
  *
  * PARAMS
- *   hm         [I] Module that contains the REGINST resouce.
+ *   hm         [I] Module that contains the REGINST resource.
  *   pszSection [I] The INF section to execute.
  *   pstTable   [I] Table of string substitutions.
  *