marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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>
oldstable
Zebediah Figura 2018-06-01 21:48:22 -05:00 committed by Alexandre Julliard
parent 3c2b229431
commit ed2861c28c
3 changed files with 44 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
dlls/msi/tests/action.c
View File

@ -695,12 +695,25 @@ static const char wrv_install_exec_seq_dat[] =
"InstallInitialize\t\t1500\n"
"ProcessComponents\t\t1600\n"
"RemoveRegistryValues\t\t4900\n"
"rrv_immediate\tREMOVE\t4901\n"
"rrv_deferred\tREMOVE\t4902\n"
"WriteRegistryValues\t\t5000\n"
"wrv_immediate\tNOT REMOVE\t5001\n"
"wrv_deferred\tNOT REMOVE\t5002\n"
"RegisterProduct\t\t6100\n"
"PublishFeatures\t\t6200\n"
"PublishProduct\t\t6300\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[] =
"Directory\tDirectory_Parent\tDefaultDir\n"
"s72\tS72\tl255\n"
@ -2025,6 +2038,7 @@ static const msi_table wrv_tables[] =
ADD_TABLE(wrv_feature),
ADD_TABLE(wrv_feature_comp),
ADD_TABLE(wrv_install_exec_seq),
ADD_TABLE(wrv_custom_action),
ADD_TABLE(property),
ADD_TABLE(media),
ADD_TABLE(wrv_registry),

28
dlls/msi/tests/custom.c
View File

@ -1922,3 +1922,31 @@ todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED))
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;
}

2
dlls/msi/tests/custom.spec
View File

@ -53,3 +53,5 @@
@ stdcall sss_stopped(long)
@ stdcall tl_present(long)
@ stdcall tl_absent(long)
@ stdcall wrv_present(long)
@ stdcall wrv_absent(long)