ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix situations where TARGETDIR is set to a non \ terminated 

path. Fixes a few installers.
This commit is contained in:
Aric Stewart 2005-06-21 20:21:30 +00:00 committed by Alexandre Julliard
parent 92ef78ee04
commit e89f849612
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
dlls/msi/helpers.c
View File

@ -270,13 +270,20 @@ LPWSTR resolve_folder(MSIPACKAGE *package, LPCWSTR name, BOOL source,
{ {
if (!source) if (!source)
{ {
path = load_dynamic_property(package,cszTargetDir,NULL); LPWSTR check_path;
if (!path) check_path = load_dynamic_property(package,cszTargetDir,NULL);
if (!check_path)
{ {
path = load_dynamic_property(package,cszRootDrive,NULL); check_path = load_dynamic_property(package,cszRootDrive,NULL);
if (set_prop) if (set_prop)
MSI_SetPropertyW(package,cszTargetDir,path); MSI_SetPropertyW(package,cszTargetDir,check_path);
} }
/* correct misbuilt target dir */
path = build_directory_name(2, check_path, NULL);
if (strcmpiW(path,check_path)!=0)
MSI_SetPropertyW(package,cszTargetDir,path);
if (folder) if (folder)
{ {
for (i = 0; i < package->loaded_folders; i++) for (i = 0; i < package->loaded_folders; i++)