mirror of
https://github.com/reactos/reactos.git
synced 2024-07-12 07:35:10 +00:00
sync advpack to wine 1.1.4
svn path=/trunk/; revision=36227
This commit is contained in:
parent
d9d2e414c7
commit
6c1c3b0947
|
@ -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;
|
||||
|
|
|
@ -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))
|
||||
|
||||
|
|
Loading…
Reference in a new issue