From 6c1c3b09474aeddf5c4233e4a454516ba742c242 Mon Sep 17 00:00:00 2001 From: Christoph von Wittich Date: Sun, 14 Sep 2008 10:14:21 +0000 Subject: [PATCH] sync advpack to wine 1.1.4 svn path=/trunk/; revision=36227 --- reactos/dll/win32/advpack/files.c | 2 +- reactos/dll/win32/advpack/install.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/reactos/dll/win32/advpack/files.c b/reactos/dll/win32/advpack/files.c index 5e9ce30fee2..3aabc082c16 100644 --- a/reactos/dll/win32/advpack/files.c +++ b/reactos/dll/win32/advpack/files.c @@ -709,7 +709,7 @@ HRESULT WINAPI ExtractFilesA(LPCSTR CabName, LPCSTR ExpandDir, DWORD Flags, if (FileList) { szConvertedList = convert_file_list(FileList, &dwFileCount); - if (!szConvertedList || dwFileCount == -1) + if (!szConvertedList) { res = E_FAIL; goto done; diff --git a/reactos/dll/win32/advpack/install.c b/reactos/dll/win32/advpack/install.c index c5a5df00cda..0ec5ceb4add 100644 --- a/reactos/dll/win32/advpack/install.c +++ b/reactos/dll/win32/advpack/install.c @@ -39,7 +39,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(advpack); #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))