Commit 9460ae35 authored by James Hawkins's avatar James Hawkins Committed by Alexandre Julliard

msi: Copy the assembly file directly if it's not compressed.

parent 47f83635
...@@ -5659,15 +5659,30 @@ static UINT ITERATE_PublishAssembly( MSIRECORD *rec, LPVOID param ) ...@@ -5659,15 +5659,30 @@ static UINT ITERATE_PublishAssembly( MSIRECORD *rec, LPVOID param )
file = msi_find_file(package, comp->KeyPath); file = msi_find_file(package, comp->KeyPath);
GetTempPathW(MAX_PATH, path); GetTempPathW(MAX_PATH, path);
r = msi_extract_file(package, file, path);
if (r != ERROR_SUCCESS) if (file->IsCompressed)
{ {
ERR("Failed to extract temporary assembly\n"); r = msi_extract_file(package, file, path);
return r; if (r != ERROR_SUCCESS)
{
ERR("Failed to extract temporary assembly\n");
return r;
}
PathAddBackslashW(path);
lstrcatW(path, file->FileName);
} }
else
{
PathAddBackslashW(path);
lstrcatW(path, file->FileName);
PathAddBackslashW(path); if (!CopyFileW(file->SourcePath, path, FALSE))
lstrcatW(path, file->FileName); {
ERR("Failed to copy temporary assembly: %d\n", GetLastError());
return ERROR_FUNCTION_FAILED;
}
}
r = install_assembly(path); r = install_assembly(path);
if (r != ERROR_SUCCESS) if (r != 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