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

msi/tests: Fix a test failure on Win9x/WinMe.

This commit is contained in:
Paul Vriens 2010-02-12 15:20:10 +01:00 committed by Alexandre Julliard
parent 693dd47689
commit 983cff23fa
1 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
dlls/msi/tests/install.c
View File

@ -7970,18 +7970,8 @@ static void test_self_registration(void)
static void test_register_font(void) static void test_register_font(void)
{ {
static const WCHAR regfont1[] = static const char regfont1[] = "Software\\Microsoft\\Windows NT\\CurrentVersion\\Fonts";
{'S','o','f','t','w','a','r','e','\\', static const char regfont2[] = "Software\\Microsoft\\Windows\\CurrentVersion\\Fonts";
'M','i','c','r','o','s','o','f','t','\\',
'W','i','n','d','o','w','s',' ','N','T','\\',
'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\',
'F','o','n','t','s',0};
static const WCHAR regfont2[] =
{'S','o','f','t','w','a','r','e','\\',
'M','i','c','r','o','s','o','f','t','\\',
'W','i','n','d','o','w','s','\\',
'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\',
'F','o','n','t','s',0};
LONG ret; LONG ret;
HKEY key; HKEY key;
UINT r; UINT r;
@ -7995,9 +7985,9 @@ static void test_register_font(void)
r = MsiInstallProductA(msifile, NULL); r = MsiInstallProductA(msifile, NULL);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r);
ret = RegCreateKeyW(HKEY_LOCAL_MACHINE, regfont1, &key); ret = RegOpenKeyA(HKEY_LOCAL_MACHINE, regfont1, &key);
if (ret) if (ret)
ret = RegCreateKeyW(HKEY_LOCAL_MACHINE, regfont2, &key); RegOpenKeyA(HKEY_LOCAL_MACHINE, regfont2, &key);
ret = RegQueryValueExA(key, "msi test font", NULL, NULL, NULL, NULL); ret = RegQueryValueExA(key, "msi test font", NULL, NULL, NULL, NULL);
ok(ret != ERROR_FILE_NOT_FOUND, "unexpected result %d\n", ret); ok(ret != ERROR_FILE_NOT_FOUND, "unexpected result %d\n", ret);