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

msi: Copy the temporary package when storing the installer.

This commit is contained in:
James Hawkins 2008-01-05 13:50:59 -07:00 committed by Alexandre Julliard
parent e28cedf698
commit c37849ad82
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
dlls/msi/action.c
View File

@ -60,8 +60,6 @@ static UINT ACTION_PerformActionSequence(MSIPACKAGE *package, UINT seq, BOOL UI)
* consts and values used
*/
static const WCHAR c_colon[] = {'C',':','\\',0};
static const WCHAR szOriginalDatabase[] =
{'O','r','i','g','i','n','a','l','D','a','t','a','b','a','s','e',0};
static const WCHAR szCreateFolders[] =
{'C','r','e','a','t','e','F','o','l','d','e','r','s',0};
@ -616,6 +614,9 @@ static UINT msi_set_sourcedir_props(MSIPACKAGE *package, BOOL replace)
LPWSTR source, check;
DWORD len;
static const WCHAR szOriginalDatabase[] =
{'O','r','i','g','i','n','a','l','D','a','t','a','b','a','s','e',0};
db = msi_dup_property( package, szOriginalDatabase );
if (!db)
return ERROR_OUTOFMEMORY;
@ -3887,7 +3888,6 @@ static UINT msi_get_local_package_name( LPWSTR path )
static UINT msi_make_package_local( MSIPACKAGE *package, HKEY hkey )
{
WCHAR packagefile[MAX_PATH];
LPWSTR msiFilePath;
HKEY props;
UINT r;
@ -3897,17 +3897,14 @@ static UINT msi_make_package_local( MSIPACKAGE *package, HKEY hkey )
TRACE("Copying to local package %s\n",debugstr_w(packagefile));
msiFilePath = msi_dup_property( package, szOriginalDatabase );
r = CopyFileW( msiFilePath, packagefile, FALSE);
r = CopyFileW( package->db->path, packagefile, FALSE);
if (!r)
{
ERR("Unable to copy package (%s -> %s) (error %d)\n",
debugstr_w(msiFilePath), debugstr_w(packagefile), GetLastError());
msi_free( msiFilePath );
debugstr_w(package->db->path), debugstr_w(packagefile), GetLastError());
return ERROR_FUNCTION_FAILED;
}
msi_free( msiFilePath );
msi_reg_set_val_str( hkey, INSTALLPROPERTY_LOCALPACKAGEW, packagefile );