ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

msi: Remove system environment variables on uninstall. 

Signed-off-by: Hans Leidekker <hans@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Hans Leidekker 2019-04-17 15:14:01 +02:00 committed by Alexandre Julliard
parent 6c64d02117
commit 7f95ed7cd2
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/msi/action.c
View File

@ -7050,7 +7050,7 @@ static UINT env_parse_flags( LPCWSTR *name, LPCWSTR *value, DWORD *flags )
else if (*cptr == '!') else if (*cptr == '!')
*flags |= ENV_ACT_REMOVEMATCH; *flags |= ENV_ACT_REMOVEMATCH;
else if (*cptr == '*') else if (*cptr == '*')
*flags |= ENV_MOD_MACHINE; *flags |= ENV_MOD_MACHINE | ENV_ACT_REMOVE;
else else
break; break;

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

@ -247,7 +247,8 @@ static const char env_environment_dat[] =
"Var26\t+-MSITESTVAR20\t2[~]\tOne\n" "Var26\t+-MSITESTVAR20\t2[~]\tOne\n"
"Var27\t+-MSITESTVAR21\t[~];1\tOne\n" "Var27\t+-MSITESTVAR21\t[~];1\tOne\n"
"Var28\t-MSITESTVAR22\t1\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[] = static const char service_install_dat[] =
"ServiceInstall\tName\tDisplayName\tServiceType\tStartType\tErrorControl\t" "ServiceInstall\tName\tDisplayName\tServiceType\tStartType\tErrorControl\t"
@ -4843,7 +4844,7 @@ static void test_envvar(void)
{ {
char buffer[16]; char buffer[16];
UINT r, i; UINT r, i;
HKEY env; HKEY env, env2;
LONG res; LONG res;
if (is_process_limited()) if (is_process_limited())
@ -4857,6 +4858,10 @@ static void test_envvar(void)
res = RegCreateKeyExA(HKEY_CURRENT_USER, "Environment", 0, NULL, 0, KEY_ALL_ACCESS, NULL, &env, NULL); 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); 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); res = RegSetValueExA(env, "MSITESTVAR1", 0, REG_SZ, (const BYTE *)"0", 2);
ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
@ -4910,6 +4915,7 @@ static void test_envvar(void)
CHECK_REG_STR(env, "MSITESTVAR19", "1"); CHECK_REG_STR(env, "MSITESTVAR19", "1");
CHECK_REG_STR(env, "MSITESTVAR20", "1"); CHECK_REG_STR(env, "MSITESTVAR20", "1");
CHECK_REG_STR(env, "MSITESTVAR21", "1"); CHECK_REG_STR(env, "MSITESTVAR21", "1");
CHECK_REG_STR(env2, "MSITESTVAR100", "1");
res = RegSetValueExA(env, "MSITESTVAR22", 0, REG_SZ, (const BYTE *)"1", 2); res = RegSetValueExA(env, "MSITESTVAR22", 0, REG_SZ, (const BYTE *)"1", 2);
ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
@ -4937,11 +4943,15 @@ todo_wine {
ok(res == ERROR_FILE_NOT_FOUND, "[%d] got %u\n", i, res); 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: error:
RegDeleteValueA(env, "MSITESTVAR1"); RegDeleteValueA(env, "MSITESTVAR1");
RegDeleteValueA(env, "MSITESTVAR2"); RegDeleteValueA(env, "MSITESTVAR2");
RegDeleteValueA(env, "MSITESTVAR21"); RegDeleteValueA(env, "MSITESTVAR21");
RegCloseKey(env); RegCloseKey(env);
RegCloseKey(env2);
DeleteFileA(msifile); DeleteFileA(msifile);
} }