mirror of
https://github.com/reactos/reactos.git
synced 2025-08-03 13:26:17 +00:00
[WINESYNC] msi/tests: Test deferral of WriteRegistryValues.
Signed-off-by: Zebediah Figura <z.figura12@gmail.com> Signed-off-by: Hans Leidekker <hans@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org> wine commit id ed2861c28cdfd2bb97abb7d376f9aa2d975ea97d by Zebediah Figura <z.figura12@gmail.com>
This commit is contained in:
parent
158d7545ab
commit
a2e86899fd
3 changed files with 44 additions and 0 deletions
|
@ -698,12 +698,25 @@ static const char wrv_install_exec_seq_dat[] =
|
||||||
"InstallInitialize\t\t1500\n"
|
"InstallInitialize\t\t1500\n"
|
||||||
"ProcessComponents\t\t1600\n"
|
"ProcessComponents\t\t1600\n"
|
||||||
"RemoveRegistryValues\t\t4900\n"
|
"RemoveRegistryValues\t\t4900\n"
|
||||||
|
"rrv_immediate\tREMOVE\t4901\n"
|
||||||
|
"rrv_deferred\tREMOVE\t4902\n"
|
||||||
"WriteRegistryValues\t\t5000\n"
|
"WriteRegistryValues\t\t5000\n"
|
||||||
|
"wrv_immediate\tNOT REMOVE\t5001\n"
|
||||||
|
"wrv_deferred\tNOT REMOVE\t5002\n"
|
||||||
"RegisterProduct\t\t6100\n"
|
"RegisterProduct\t\t6100\n"
|
||||||
"PublishFeatures\t\t6200\n"
|
"PublishFeatures\t\t6200\n"
|
||||||
"PublishProduct\t\t6300\n"
|
"PublishProduct\t\t6300\n"
|
||||||
"InstallFinalize\t\t6600\n";
|
"InstallFinalize\t\t6600\n";
|
||||||
|
|
||||||
|
static const char wrv_custom_action_dat[] =
|
||||||
|
"Action\tType\tSource\tTarget\n"
|
||||||
|
"s72\ti2\tS64\tS0\n"
|
||||||
|
"CustomAction\tAction\n"
|
||||||
|
"wrv_immediate\t1\tcustom.dll\twrv_absent\n"
|
||||||
|
"wrv_deferred\t1025\tcustom.dll\twrv_present\n"
|
||||||
|
"rrv_immediate\t1\tcustom.dll\twrv_present\n"
|
||||||
|
"rrv_deferred\t1025\tcustom.dll\twrv_absent\n";
|
||||||
|
|
||||||
static const char cf_directory_dat[] =
|
static const char cf_directory_dat[] =
|
||||||
"Directory\tDirectory_Parent\tDefaultDir\n"
|
"Directory\tDirectory_Parent\tDefaultDir\n"
|
||||||
"s72\tS72\tl255\n"
|
"s72\tS72\tl255\n"
|
||||||
|
@ -2028,6 +2041,7 @@ static const msi_table wrv_tables[] =
|
||||||
ADD_TABLE(wrv_feature),
|
ADD_TABLE(wrv_feature),
|
||||||
ADD_TABLE(wrv_feature_comp),
|
ADD_TABLE(wrv_feature_comp),
|
||||||
ADD_TABLE(wrv_install_exec_seq),
|
ADD_TABLE(wrv_install_exec_seq),
|
||||||
|
ADD_TABLE(wrv_custom_action),
|
||||||
ADD_TABLE(property),
|
ADD_TABLE(property),
|
||||||
ADD_TABLE(media),
|
ADD_TABLE(media),
|
||||||
ADD_TABLE(wrv_registry),
|
ADD_TABLE(wrv_registry),
|
||||||
|
|
|
@ -1922,3 +1922,31 @@ todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED))
|
||||||
|
|
||||||
return ERROR_SUCCESS;
|
return ERROR_SUCCESS;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
UINT WINAPI wrv_present(MSIHANDLE hinst)
|
||||||
|
{
|
||||||
|
HKEY key;
|
||||||
|
LONG res;
|
||||||
|
|
||||||
|
res = RegOpenKeyA(HKEY_CURRENT_USER, "msitest", &key);
|
||||||
|
ok(hinst, !res, "got %u\n", res);
|
||||||
|
todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED))
|
||||||
|
check_reg_str(hinst, key, "sz", "string");
|
||||||
|
RegCloseKey(key);
|
||||||
|
|
||||||
|
return ERROR_SUCCESS;
|
||||||
|
}
|
||||||
|
|
||||||
|
UINT WINAPI wrv_absent(MSIHANDLE hinst)
|
||||||
|
{
|
||||||
|
HKEY key;
|
||||||
|
LONG res;
|
||||||
|
|
||||||
|
res = RegOpenKeyA(HKEY_CURRENT_USER, "msitest", &key);
|
||||||
|
ok(hinst, !res, "got %u\n", res);
|
||||||
|
todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED))
|
||||||
|
check_reg_str(hinst, key, "sz", NULL);
|
||||||
|
RegCloseKey(key);
|
||||||
|
|
||||||
|
return ERROR_SUCCESS;
|
||||||
|
}
|
||||||
|
|
|
@ -53,3 +53,5 @@
|
||||||
@ stdcall sss_stopped(long)
|
@ stdcall sss_stopped(long)
|
||||||
@ stdcall tl_present(long)
|
@ stdcall tl_present(long)
|
||||||
@ stdcall tl_absent(long)
|
@ stdcall tl_absent(long)
|
||||||
|
@ stdcall wrv_present(long)
|
||||||
|
@ stdcall wrv_absent(long)
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue