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

msi: Don't use a temporary directory for local assemblies.

This commit is contained in:
Hans Leidekker 2010-11-12 16:18:08 +01:00 committed by Alexandre Julliard
parent 41bd5d4efa
commit 9d46ba417e
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/msi/action.c
View File

@ -2170,7 +2170,7 @@ static void set_target_path( MSIPACKAGE *package, MSIFILE *file )
TRACE("file %s is named %s\n", debugstr_w(file->File), debugstr_w(file->FileName));
msi_free( file->TargetPath );
if (assembly)
if (assembly && !assembly->application)
{
if (!assembly->tempdir) assembly->tempdir = get_temp_dir();
file->TargetPath = build_directory_name( 2, assembly->tempdir, file->FileName );

10
dlls/msi/files.c
View File

@ -186,9 +186,10 @@ static BOOL installfiles_cb(MSIPACKAGE *package, LPCWSTR file, DWORD action,
return FALSE;
msi_file_update_ui(package, f, szInstallFiles);
if (!f->Component->assembly)
if (!f->Component->assembly || f->Component->assembly->application)
{
msi_create_directory(package, f->Component->Directory);
}
*path = strdupW(f->TargetPath);
*attrs = f->Attributes;
}
@ -268,9 +269,10 @@ UINT ACTION_InstallFiles(MSIPACKAGE *package)
TRACE("copying %s to %s\n", debugstr_w(source), debugstr_w(file->TargetPath));
msi_file_update_ui(package, file, szInstallFiles);
if (!file->Component->assembly)
if (!file->Component->assembly || file->Component->assembly->application)
{
msi_create_directory(package, file->Component->Directory);
}
rc = copy_install_file(package, file, source);
if (rc != ERROR_SUCCESS)
{