[cwittich] 36227: sync advpack to wine 1.1.4

Author: cwittich
Date: Sun Sep 14 05:14:21 2008
New Revision: 36227

URL: http://svn.reactos.org/svn/reactos?rev=36227&view=rev
Log:
sync advpack to wine 1.1.4

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

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 Sep 14 05:14:21 2008
@@ -709,7 +709,7 @@
     if (FileList)
     {
         szConvertedList = convert_file_list(FileList, &dwFileCount);
-        if (!szConvertedList || dwFileCount == -1)
+        if (!szConvertedList)
         {
             res = E_FAIL;
             goto done;

Modified: trunk/reactos/dll/win32/advpack/install.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advpack/install.c...
==============================================================================
--- trunk/reactos/dll/win32/advpack/install.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/advpack/install.c [iso-8859-1] Sun Sep 14 05:14:21 2008
@@ -39,7 +39,7 @@
 #define SPAPI_ERROR     0xE0000000L
 #define SPAPI_PREFIX    0x800F0000L
 #define SPAPI_MASK      0xFFFFL
-#define HRESULT_FROM_SPAPI(x)   ((x & SPAPI_MASK) | SPAPI_PREFIX)
+#define HRESULT_FROM_SPAPI(x)   ((HRESULT)((x & SPAPI_MASK) | SPAPI_PREFIX))

#define ADV_HRESULT(x)  ((x & SPAPI_ERROR) ? HRESULT_FROM_SPAPI(x) : HRESULT_FROM_WIN32(x))