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

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 983cff23faf44f6e6f32a42e49e451e54773b75f
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=983cff23faf44f6e6f32a42e49...

Author: Paul Vriens 
Date:   Fri Feb 12 15:20:10 2010 +0100

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

---

dlls/msi/tests/install.c |   18 ++++--------------
 1 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c
index de826c3..c58e0af 100644
--- a/dlls/msi/tests/install.c
+++ b/dlls/msi/tests/install.c
@@ -7970,18 +7970,8 @@ static void test_self_registration(void)

static void test_register_font(void)
 {
-    static const WCHAR regfont1[] =
-        {'S','o','f','t','w','a','r','e','\',
-         '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};
+    static const char regfont1[] = "Software\Microsoft\Windows NT\CurrentVersion\Fonts";
+    static const char regfont2[] = "Software\Microsoft\Windows\CurrentVersion\Fonts";
     LONG ret;
     HKEY key;
     UINT r;
@@ -7995,9 +7985,9 @@ static void test_register_font(void)
     r = MsiInstallProductA(msifile, NULL);
     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)
-        ret = RegCreateKeyW(HKEY_LOCAL_MACHINE, regfont2, &key);
+        RegOpenKeyA(HKEY_LOCAL_MACHINE, regfont2, &key);

ret = RegQueryValueExA(key, "msi test font", NULL, NULL, NULL, NULL);
     ok(ret != ERROR_FILE_NOT_FOUND, "unexpected result %d\n", ret);