msi 9: PackagePath must also include the package name
James Hawkins
truiken at gmail.com
Wed Jun 27 22:19:36 CDT 2007
Hi,
The correctness of this fix will be apparent in the next patch (if it
isn't already).
Changelog:
* PackagePath must also include the package name.
dlls/msi/action.c | 40 ++++++++++++++++++++++++----------------
1 files changed, 24 insertions(+), 16 deletions(-)
--
James Hawkins
-------------- next part --------------
diff --git a/dlls/msi/action.c b/dlls/msi/action.c
index b550e54..092c5c3 100644
--- a/dlls/msi/action.c
+++ b/dlls/msi/action.c
@@ -629,35 +629,43 @@ UINT MSI_InstallPackage( MSIPACKAGE *pac
if (szPackagePath)
{
- LPWSTR p, check, path;
-
- path = strdupW(szPackagePath);
- p = strrchrW(path,'\\');
+ LPWSTR p, check, dir;
+
+ dir = strdupW(szPackagePath);
+ p = strrchrW(dir, '\\');
if (p)
+ *(++p) = 0;
+ else
{
- p++;
- *p=0;
+ msi_free(dir);
+ dir = msi_alloc(MAX_PATH*sizeof(WCHAR));
+ GetCurrentDirectoryW(MAX_PATH, dir);
+ lstrcatW(dir, cszbs);
+ p = (LPWSTR)szPackagePath;
}
- else
+
+ msi_free( package->PackagePath );
+ package->PackagePath = msi_alloc((lstrlenW(dir) + lstrlenW(p) + 2) * sizeof(WCHAR));
+ if (!package->PackagePath)
{
- msi_free(path);
- path = msi_alloc(MAX_PATH*sizeof(WCHAR));
- GetCurrentDirectoryW(MAX_PATH,path);
- strcatW(path,cszbs);
+ msi_free(dir);
+ return ERROR_OUTOFMEMORY;
}
+ lstrcpyW(package->PackagePath, dir);
+ lstrcatW(package->PackagePath, cszbs);
+ lstrcatW(package->PackagePath, p);
+
check = msi_dup_property( package, cszSourceDir );
if (!check)
- MSI_SetPropertyW(package, cszSourceDir, path);
+ MSI_SetPropertyW(package, cszSourceDir, dir);
msi_free(check);
check = msi_dup_property( package, cszSOURCEDIR );
if (!check)
- MSI_SetPropertyW(package, cszSOURCEDIR, path);
-
- msi_free( package->PackagePath );
- package->PackagePath = path;
+ MSI_SetPropertyW(package, cszSOURCEDIR, dir);
+ msi_free(dir);
msi_free(check);
}
--
1.4.1
More information about the wine-patches
mailing list