[fireball] 34324: Autosyncing with Wine HEAD

Author: fireball
Date: Sun Jul  6 06:47:38 2008
New Revision: 34324

URL: http://svn.reactos.org/svn/reactos?rev=34324&view=rev
Log:
Autosyncing with Wine HEAD

Modified:
    trunk/reactos/dll/win32/advpack/advpack.c
    trunk/reactos/dll/win32/advpack/files.c
    trunk/reactos/dll/win32/atl/atl.rbuild
    trunk/reactos/dll/win32/atl/registrar.c

Modified: trunk/reactos/dll/win32/advpack/advpack.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advpack/advpack.c...
==============================================================================
--- trunk/reactos/dll/win32/advpack/advpack.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/advpack/advpack.c [iso-8859-1] Sun Jul  6 06:47:38 2008
@@ -68,9 +68,9 @@
 static void get_dest_dir(HINF hInf, PCWSTR pszSection, PWSTR pszBuffer, DWORD dwSize)
 {
     INFCONTEXT context;
-    WCHAR key[MAX_PATH], value[MAX_PATH];
-    WCHAR prefix[PREFIX_LEN];
-    HKEY root, subkey;
+    WCHAR key[MAX_PATH + 2], value[MAX_PATH + 2];
+    WCHAR prefix[PREFIX_LEN + 2];
+    HKEY root, subkey = 0;
     DWORD size;

static const WCHAR hklm[] = {'H','K','L','M',0};
@@ -78,11 +78,11 @@

/* load the destination parameters */
     SetupFindFirstLineW(hInf, pszSection, NULL, &context);
-    SetupGetStringFieldW(&context, 1, prefix, PREFIX_LEN, &size);
+    SetupGetStringFieldW(&context, 1, prefix, PREFIX_LEN + 2, &size);
     strip_quotes(prefix, &size);
-    SetupGetStringFieldW(&context, 2, key, MAX_PATH, &size);
+    SetupGetStringFieldW(&context, 2, key, MAX_PATH + 2, &size);
     strip_quotes(key, &size);
-    SetupGetStringFieldW(&context, 3, value, MAX_PATH, &size);
+    SetupGetStringFieldW(&context, 3, value, MAX_PATH + 2, &size);
     strip_quotes(value, &size);

if (!lstrcmpW(prefix, hklm))
@@ -102,7 +102,7 @@
         strip_quotes(pszBuffer, &size);
     }

-    RegCloseKey(subkey);
+    if (subkey) RegCloseKey(subkey);
 }

/* loads the LDIDs specified in the install section of an INF */

Modified: trunk/reactos/dll/win32/advpack/files.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advpack/files.c?r...
==============================================================================
--- trunk/reactos/dll/win32/advpack/files.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/advpack/files.c [iso-8859-1] Sun Jul  6 06:47:38 2008
@@ -996,8 +996,8 @@
     BOOL bFileCopied = FALSE;
     UINT uValueLen;

-    static WCHAR backslash[] = {'\',0};
-    static WCHAR translation[] = {
+    static const WCHAR backslash[] = {'\',0};
+    static const WCHAR translation[] = {
         '\','V','a','r','F','i','l','e','I','n','f','o',
         '\','T','r','a','n','s','l','a','t','i','o','n',0
     };

Modified: trunk/reactos/dll/win32/atl/atl.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/atl/atl.rbuild?re...
==============================================================================
--- trunk/reactos/dll/win32/atl/atl.rbuild [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/atl/atl.rbuild [iso-8859-1] Sun Jul  6 06:47:38 2008
@@ -13,17 +13,20 @@
    <file>atl_main.c</file>
    <file>registrar.c</file>
    <file>rsrc.rc</file>
-	<file>atliface.idl</file>
    <include base="atl" root="intermediate">.</include>
    <file>atl.spec</file>
    <library>wine</library>
+	<library>uuid</library>
    <library>ole32</library>
    <library>oleaut32</library>
    <library>user32</library>
    <library>gdi32</library>
    <library>advapi32</library>
    <library>kernel32</library>
-	<library>uuid</library>
    <library>ntdll</library>
+	<dependency>atl_atliface_header</dependency>
+</module>
+<module name="atl_atliface_header" type="idlheader" allowwarnings="true">
+	<file>atliface.idl</file>
 </module>
 </group>

Modified: trunk/reactos/dll/win32/atl/registrar.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/atl/registrar.c?r...
==============================================================================
--- trunk/reactos/dll/win32/atl/registrar.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/atl/registrar.c [iso-8859-1] Sun Jul  6 06:47:38 2008
@@ -454,8 +454,6 @@
                 WARN("could not load resource\n");
                 hres = HRESULT_FROM_WIN32(GetLastError());
             }
-            // Sent to wine-patches http://www.winehq.org/pipermail/wine-patches/2008-May/054603.html
-            //HeapFree(GetProcessHeap(), 0, regstra);
         }else {
             WARN("Could not find source\n");
             hres = HRESULT_FROM_WIN32(GetLastError());