[ros-diffs] [cwittich] 38384: sync advpack with wine 1.1.11

[cwittich at svn.reactos.org]

Author: cwittich
Date: Sat Dec 27 07:04:52 2008
New Revision: 38384

URL: http://svn.reactos.org/svn/reactos?rev=38384&view=rev
Log:
sync advpack with wine 1.1.11

Modified:
    trunk/reactos/dll/win32/advpack/files.c
    trunk/reactos/dll/win32/advpack/install.c
    trunk/reactos/dll/win32/advpack/reg.c

Modified: trunk/reactos/dll/win32/advpack/files.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advpack/files.c?rev=38384&r1=38383&r2=38384&view=diff
==============================================================================
--- trunk/reactos/dll/win32/advpack/files.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/advpack/files.c [iso-8859-1] Sat Dec 27 07:04:52 2008
@@ -627,7 +627,7 @@
     struct FILELIST *pNode;
 
     session->Operation |= EXTRACT_FILLFILELIST;
-    if (pExtract(session, szCabName))
+    if (pExtract(session, szCabName) != S_OK)
     {
         session->Operation &= ~EXTRACT_FILLFILELIST;
         return -1;

Modified: trunk/reactos/dll/win32/advpack/install.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advpack/install.c?rev=38384&r1=38383&r2=38384&view=diff
==============================================================================
--- trunk/reactos/dll/win32/advpack/install.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/advpack/install.c [iso-8859-1] Sat Dec 27 07:04:52 2008
@@ -91,7 +91,7 @@
                                MAX_INF_STRING_LENGTH, &size))
             continue;
 
-        if (DelNodeW(directory, ADN_DEL_IF_EMPTY))
+        if (DelNodeW(directory, ADN_DEL_IF_EMPTY) != S_OK)
             hr = E_FAIL;
     }
 
@@ -161,7 +161,7 @@
         hm = LoadLibraryExW(buffer, NULL, LOAD_WITH_ALTERED_SEARCH_PATH);
         if (hm)
         {
-            if (do_ocx_reg(hm, TRUE))
+            if (do_ocx_reg(hm, TRUE) != S_OK)
                 hr = E_FAIL;
 
             FreeLibrary(hm);
@@ -196,7 +196,7 @@
                                MAX_INF_STRING_LENGTH, &size))
             continue;
 
-        if (launch_exe(buffer, info->working_dir, NULL))
+        if (launch_exe(buffer, info->working_dir, NULL) != S_OK)
             hr = E_FAIL;
     }
 

Modified: trunk/reactos/dll/win32/advpack/reg.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advpack/reg.c?rev=38384&r1=38383&r2=38384&view=diff
==============================================================================
--- trunk/reactos/dll/win32/advpack/reg.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/advpack/reg.c [iso-8859-1] Sat Dec 27 07:04:52 2008
@@ -230,7 +230,7 @@
     if(!create_tmp_ini_file(hm, tmp_ini_path))
         return E_FAIL;
 
-    if (write_predefined_strings(hm, tmp_ini_path))
+    if (write_predefined_strings(hm, tmp_ini_path) != S_OK)
         goto done;
 
     /* Write the additional string table */