Commit 9d46ba41 authored by Hans Leidekker's avatar Hans Leidekker Committed by Alexandre Julliard

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

parent 41bd5d4e
...@@ -2170,7 +2170,7 @@ static void set_target_path( MSIPACKAGE *package, MSIFILE *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)); TRACE("file %s is named %s\n", debugstr_w(file->File), debugstr_w(file->FileName));
msi_free( file->TargetPath ); msi_free( file->TargetPath );
if (assembly) if (assembly && !assembly->application)
{ {
if (!assembly->tempdir) assembly->tempdir = get_temp_dir(); if (!assembly->tempdir) assembly->tempdir = get_temp_dir();
file->TargetPath = build_directory_name( 2, assembly->tempdir, file->FileName ); file->TargetPath = build_directory_name( 2, assembly->tempdir, file->FileName );
......
...@@ -186,9 +186,10 @@ static BOOL installfiles_cb(MSIPACKAGE *package, LPCWSTR file, DWORD action, ...@@ -186,9 +186,10 @@ static BOOL installfiles_cb(MSIPACKAGE *package, LPCWSTR file, DWORD action,
return FALSE; return FALSE;
msi_file_update_ui(package, f, szInstallFiles); 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); msi_create_directory(package, f->Component->Directory);
}
*path = strdupW(f->TargetPath); *path = strdupW(f->TargetPath);
*attrs = f->Attributes; *attrs = f->Attributes;
} }
...@@ -268,9 +269,10 @@ UINT ACTION_InstallFiles(MSIPACKAGE *package) ...@@ -268,9 +269,10 @@ UINT ACTION_InstallFiles(MSIPACKAGE *package)
TRACE("copying %s to %s\n", debugstr_w(source), debugstr_w(file->TargetPath)); TRACE("copying %s to %s\n", debugstr_w(source), debugstr_w(file->TargetPath));
msi_file_update_ui(package, file, szInstallFiles); 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); msi_create_directory(package, file->Component->Directory);
}
rc = copy_install_file(package, file, source); rc = copy_install_file(package, file, source);
if (rc != ERROR_SUCCESS) if (rc != ERROR_SUCCESS)
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment