[ros-diffs] [reactos] 103/360: [WINESYNC] msi/tests: Test deferral of WriteRegistryValues.

[winesync]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a2e86899fd72869e25a1a…

commit a2e86899fd72869e25a1ae3c361dbdc1414d2c46
Author:     winesync <ros-dev(a)reactos.org>
AuthorDate: Sat Mar 12 16:34:04 2022 +0100
Commit:     Mark Jansen <mark.jansen(a)reactos.org>
CommitDate: Sun Mar 20 19:27:53 2022 +0100

    [WINESYNC] msi/tests: Test deferral of WriteRegistryValues.
    
    Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com>
    Signed-off-by: Hans Leidekker <hans(a)codeweavers.com>
    Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
    
    wine commit id ed2861c28cdfd2bb97abb7d376f9aa2d975ea97d by Zebediah Figura
<z.figura12(a)gmail.com>
---
 modules/rostests/winetests/msi/action.c    | 14 ++++++++++++++
 modules/rostests/winetests/msi/custom.c    | 28 ++++++++++++++++++++++++++++
 modules/rostests/winetests/msi/custom.spec |  2 ++
 3 files changed, 44 insertions(+)

diff --git a/modules/rostests/winetests/msi/action.c
b/modules/rostests/winetests/msi/action.c
index b7a7dde33ba..61a998663ba 100644
--- a/modules/rostests/winetests/msi/action.c
+++ b/modules/rostests/winetests/msi/action.c
@@ -698,12 +698,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"
@@ -2028,6 +2041,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),
diff --git a/modules/rostests/winetests/msi/custom.c
b/modules/rostests/winetests/msi/custom.c
index 3e742e381bc..4d45c9e448f 100644
--- a/modules/rostests/winetests/msi/custom.c
+++ b/modules/rostests/winetests/msi/custom.c
@@ -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;
+}
diff --git a/modules/rostests/winetests/msi/custom.spec
b/modules/rostests/winetests/msi/custom.spec
index bfd83928e44..b94f6cce703 100644
--- a/modules/rostests/winetests/msi/custom.spec
+++ b/modules/rostests/winetests/msi/custom.spec
@@ -53,3 +53,5 @@
 @ stdcall sss_stopped(long)
 @ stdcall tl_present(long)
 @ stdcall tl_absent(long)
+@ stdcall wrv_present(long)
+@ stdcall wrv_absent(long)