Gerald Pfeifer : msi: Fix return value for ITERATE_RemoveFiles ( in the error case).
Alexandre Julliard
julliard at winehq.org
Mon May 3 11:54:09 CDT 2010
Module: wine
Branch: master
Commit: effda58ad3ab16ca93246d164d4a4b1f7d305941
URL: http://source.winehq.org/git/wine.git/?a=commit;h=effda58ad3ab16ca93246d164d4a4b1f7d305941
Author: Gerald Pfeifer <gerald at pfeifer.com>
Date: Sat May 1 17:45:56 2010 +0200
msi: Fix return value for ITERATE_RemoveFiles (in the error case).
---
dlls/msi/files.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/dlls/msi/files.c b/dlls/msi/files.c
index 4445773..10dbb28 100644
--- a/dlls/msi/files.c
+++ b/dlls/msi/files.c
@@ -890,7 +890,7 @@ static UINT ITERATE_RemoveFiles(MSIRECORD *row, LPVOID param)
UINT install_mode;
LPWSTR dir = NULL, path = NULL;
DWORD size;
- UINT r;
+ UINT ret = ERROR_SUCCESS;
component = MSI_RecordGetString(row, 2);
filename = MSI_RecordGetString(row, 3);
@@ -920,7 +920,7 @@ static UINT ITERATE_RemoveFiles(MSIRECORD *row, LPVOID param)
path = msi_alloc(size * sizeof(WCHAR));
if (!path)
{
- r = ERROR_OUTOFMEMORY;
+ ret = ERROR_OUTOFMEMORY;
goto done;
}
@@ -948,7 +948,7 @@ done:
msi_free(path);
msi_free(dir);
- return ERROR_SUCCESS;
+ return ret;
}
UINT ACTION_RemoveFiles( MSIPACKAGE *package )
More information about the wine-cvs
mailing list