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

regedit/tests: Remove elevated user checks from the Windows 3.1 test sequences. 

The tests only run if regedit.exe is started with elevated privileges.
This is determined when the test suite is invoked.

Signed-off-by: Hugh McMaster <hugh.mcmaster@outlook.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Hugh McMaster 2021-02-25 18:26:15 +11:00 committed by Alexandre Julliard
parent bedd54c968
commit d1fbb6b999
1 changed files with 8 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
programs/regedit/tests/regedit.c
View File

@ -1119,17 +1119,9 @@ static void test_basic_import_31(void)
{
HKEY hkey;
DWORD dispos;
LONG lr;
/* Check if regedit.exe is running with elevated privileges */
lr = RegCreateKeyExA(HKEY_CLASSES_ROOT, KEY_BASE, 0, NULL, REG_OPTION_NON_VOLATILE,
KEY_READ|KEY_SET_VALUE, NULL, &hkey, &dispos);
if (lr == ERROR_ACCESS_DENIED)
{
win_skip("regedit.exe is not running with elevated privileges; "
"skipping Windows 3.1 import tests\n");
return;
}
RegCreateKeyExA(HKEY_CLASSES_ROOT, KEY_BASE, 0, NULL, REG_OPTION_NON_VOLATILE,
KEY_READ|KEY_SET_VALUE, NULL, &hkey, &dispos);
if (dispos == REG_OPENED_EXISTING_KEY)
delete_value(hkey, NULL);
@ -2226,17 +2218,13 @@ static void test_invalid_import_unicode(void)
static void test_invalid_import_31(void)
{
HKEY hkey;
LONG lr;
DWORD dispos;
/* Check if regedit.exe is running with elevated privileges */
lr = RegCreateKeyExA(HKEY_CLASSES_ROOT, KEY_BASE, 0, NULL, REG_OPTION_NON_VOLATILE,
KEY_READ, NULL, &hkey, NULL);
if (lr == ERROR_ACCESS_DENIED)
{
win_skip("regedit.exe is not running with elevated privileges; "
"skipping Windows 3.1 invalid import tests\n");
return;
}
RegCreateKeyExA(HKEY_CLASSES_ROOT, KEY_BASE, 0, NULL, REG_OPTION_NON_VOLATILE,
KEY_READ|KEY_SET_VALUE, NULL, &hkey, &dispos);
if (dispos == REG_OPENED_EXISTING_KEY)
delete_value(hkey, NULL);
/* Test character validity at the start of the line */
exec_import_str("REGEDIT\r\n"