[ros-diffs] [reactos] 230/360: [WINESYNC] msi: Remove system environment variables on uninstall.

[winesync]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6537d52d548f42ce9e94a4...

commit 6537d52d548f42ce9e94a42042686716ed8079ef
Author:     winesync [e-mail]
AuthorDate: Sun Mar 13 01:23:59 2022 +0100
Commit:     Mark Jansen [e-mail]
CommitDate: Sun Mar 20 19:28:19 2022 +0100

[WINESYNC] msi: Remove system environment variables on uninstall.

Signed-off-by: Hans Leidekker [e-mail]
    Signed-off-by: Alexandre Julliard [e-mail]

wine commit id 7f95ed7cd2d440420c0c3d1a938af8b48960f352 by Hans Leidekker [e-mail]
---
 dll/win32/msi/action.c                  |  2 +-
 modules/rostests/winetests/msi/action.c | 14 ++++++++++++--
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/dll/win32/msi/action.c b/dll/win32/msi/action.c
index ce39c16f483..07f3778d1ce 100644
--- a/dll/win32/msi/action.c
+++ b/dll/win32/msi/action.c
@@ -7064,7 +7064,7 @@ static UINT env_parse_flags( LPCWSTR *name, LPCWSTR *value, DWORD *flags )
         else if (*cptr == '!')
             *flags |= ENV_ACT_REMOVEMATCH;
         else if (*cptr == '*')
-            *flags |= ENV_MOD_MACHINE;
+            *flags |= ENV_MOD_MACHINE | ENV_ACT_REMOVE;
         else
             break;

diff --git a/modules/rostests/winetests/msi/action.c b/modules/rostests/winetests/msi/action.c
index 6a34adf7ac5..97b52af52a8 100644
--- a/modules/rostests/winetests/msi/action.c
+++ b/modules/rostests/winetests/msi/action.c
@@ -250,7 +250,8 @@ static const char env_environment_dat[] =
     "Var26\t+-MSITESTVAR20\t2[~]\tOne\n"
     "Var27\t+-MSITESTVAR21\t[~];1\tOne\n"
     "Var28\t-MSITESTVAR22\t1\tOne\n"
-    "Var29\t-MSITESTVAR23\t2\tOne\n";
+    "Var29\t-MSITESTVAR23\t2\tOne\n"
+    "Var30\t*MSITESTVAR100\t1\tOne\n";

static const char service_install_dat[] =
     "ServiceInstall\tName\tDisplayName\tServiceType\tStartType\tErrorControl\t"
@@ -4846,7 +4847,7 @@ static void test_envvar(void)
 {
     char buffer[16];
     UINT r, i;
-    HKEY env;
+    HKEY env, env2;
     LONG res;

if (is_process_limited())
@@ -4860,6 +4861,10 @@ static void test_envvar(void)
     res = RegCreateKeyExA(HKEY_CURRENT_USER, "Environment", 0, NULL, 0, KEY_ALL_ACCESS, NULL, &env, NULL);
     ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);

+    res = RegCreateKeyExA(HKEY_LOCAL_MACHINE, "System\CurrentControlSet\Control\Session Manager\Environment",
+                          0, NULL, 0, KEY_ALL_ACCESS, NULL, &env2, NULL);
+    ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
+
     res = RegSetValueExA(env, "MSITESTVAR1", 0, REG_SZ, (const BYTE *)"0", 2);
     ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);

@@ -4913,6 +4918,7 @@ static void test_envvar(void)
     CHECK_REG_STR(env, "MSITESTVAR19", "1");
     CHECK_REG_STR(env, "MSITESTVAR20", "1");
     CHECK_REG_STR(env, "MSITESTVAR21", "1");
+    CHECK_REG_STR(env2, "MSITESTVAR100", "1");

res = RegSetValueExA(env, "MSITESTVAR22", 0, REG_SZ, (const BYTE *)"1", 2);
     ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
@@ -4940,11 +4946,15 @@ todo_wine {
         ok(res == ERROR_FILE_NOT_FOUND, "[%d] got %u\n", i, res);
     }

+    res = RegDeleteValueA(env2, "MSITESTVAR100");
+    ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res);
+
 error:
     RegDeleteValueA(env, "MSITESTVAR1");
     RegDeleteValueA(env, "MSITESTVAR2");
     RegDeleteValueA(env, "MSITESTVAR21");
     RegCloseKey(env);
+    RegCloseKey(env2);

DeleteFileA(msifile);
 }