msi: Update the UI in the MoveFiles action.
This commit is contained in:
parent
aba6afc85e
commit
a358c7f6d4
|
@ -112,8 +112,6 @@ static const WCHAR szIsolateComponents[] =
|
||||||
{'I','s','o','l','a','t','e','C','o','m','p','o','n','e','n','t','s',0};
|
{'I','s','o','l','a','t','e','C','o','m','p','o','n','e','n','t','s',0};
|
||||||
static const WCHAR szMigrateFeatureStates[] =
|
static const WCHAR szMigrateFeatureStates[] =
|
||||||
{'M','i','g','r','a','t','e','F','e','a','t','u','r','e','S','t','a','t','e','s',0};
|
{'M','i','g','r','a','t','e','F','e','a','t','u','r','e','S','t','a','t','e','s',0};
|
||||||
static const WCHAR szMoveFiles[] =
|
|
||||||
{'M','o','v','e','F','i','l','e','s',0};
|
|
||||||
static const WCHAR szMsiPublishAssemblies[] =
|
static const WCHAR szMsiPublishAssemblies[] =
|
||||||
{'M','s','i','P','u','b','l','i','s','h','A','s','s','e','m','b','l','i','e','s',0};
|
{'M','s','i','P','u','b','l','i','s','h','A','s','s','e','m','b','l','i','e','s',0};
|
||||||
static const WCHAR szMsiUnpublishAssemblies[] =
|
static const WCHAR szMsiUnpublishAssemblies[] =
|
||||||
|
|
|
@ -531,11 +531,10 @@ done:
|
||||||
static UINT ITERATE_MoveFiles( MSIRECORD *rec, LPVOID param )
|
static UINT ITERATE_MoveFiles( MSIRECORD *rec, LPVOID param )
|
||||||
{
|
{
|
||||||
MSIPACKAGE *package = param;
|
MSIPACKAGE *package = param;
|
||||||
|
MSIRECORD *uirow;
|
||||||
MSICOMPONENT *comp;
|
MSICOMPONENT *comp;
|
||||||
LPCWSTR sourcename, component;
|
LPCWSTR sourcename, component;
|
||||||
LPWSTR destname = NULL;
|
LPWSTR sourcedir, destname = NULL, destdir = NULL, source = NULL, dest = NULL;
|
||||||
LPWSTR sourcedir = NULL, destdir = NULL;
|
|
||||||
LPWSTR source = NULL, dest = NULL;
|
|
||||||
int options;
|
int options;
|
||||||
DWORD size;
|
DWORD size;
|
||||||
BOOL ret, wildcards;
|
BOOL ret, wildcards;
|
||||||
|
@ -626,7 +625,7 @@ static UINT ITERATE_MoveFiles( MSIRECORD *rec, LPVOID param )
|
||||||
if (!ret)
|
if (!ret)
|
||||||
{
|
{
|
||||||
WARN("CreateDirectory failed: %d\n", GetLastError());
|
WARN("CreateDirectory failed: %d\n", GetLastError());
|
||||||
return ERROR_SUCCESS;
|
goto done;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -636,6 +635,13 @@ static UINT ITERATE_MoveFiles( MSIRECORD *rec, LPVOID param )
|
||||||
move_files_wildcard(source, dest, options);
|
move_files_wildcard(source, dest, options);
|
||||||
|
|
||||||
done:
|
done:
|
||||||
|
uirow = MSI_CreateRecord( 9 );
|
||||||
|
MSI_RecordSetStringW( uirow, 1, MSI_RecordGetString(rec, 1) );
|
||||||
|
MSI_RecordSetInteger( uirow, 6, 1 ); /* FIXME */
|
||||||
|
MSI_RecordSetStringW( uirow, 9, destdir );
|
||||||
|
ui_actiondata( package, szMoveFiles, uirow );
|
||||||
|
msiobj_release( &uirow->hdr );
|
||||||
|
|
||||||
msi_free(sourcedir);
|
msi_free(sourcedir);
|
||||||
msi_free(destdir);
|
msi_free(destdir);
|
||||||
msi_free(destname);
|
msi_free(destname);
|
||||||
|
|
|
@ -1083,6 +1083,7 @@ static const WCHAR szHLM[] = {'H','K','E','Y','_','L','O','C','A','L','_','M','A
|
||||||
static const WCHAR szHU[] = {'H','K','E','Y','_','U','S','E','R','S','\\',0};
|
static const WCHAR szHU[] = {'H','K','E','Y','_','U','S','E','R','S','\\',0};
|
||||||
static const WCHAR szWindowsFolder[] = {'W','i','n','d','o','w','s','F','o','l','d','e','r',0};
|
static const WCHAR szWindowsFolder[] = {'W','i','n','d','o','w','s','F','o','l','d','e','r',0};
|
||||||
static const WCHAR szAppSearch[] = {'A','p','p','S','e','a','r','c','h',0};
|
static const WCHAR szAppSearch[] = {'A','p','p','S','e','a','r','c','h',0};
|
||||||
|
static const WCHAR szMoveFiles[] = {'M','o','v','e','F','i','l','e','s',0};
|
||||||
|
|
||||||
/* memory allocation macro functions */
|
/* memory allocation macro functions */
|
||||||
static void *msi_alloc( size_t len ) __WINE_ALLOC_SIZE(1);
|
static void *msi_alloc( size_t len ) __WINE_ALLOC_SIZE(1);
|
||||||
|
|
Loading…
Reference in New Issue