Hans Leidekker : msi: Fix a test failure on Windows 8 and conform to the more recent behavior.
Alexandre Julliard
julliard at winehq.org
Wed Dec 19 14:01:09 CST 2012
Module: wine
Branch: master
Commit: 61db36556a2d9d8fd27aa1e9a21b86bac911e049
URL: http://source.winehq.org/git/wine.git/?a=commit;h=61db36556a2d9d8fd27aa1e9a21b86bac911e049
Author: Hans Leidekker <hans at codeweavers.com>
Date: Wed Dec 19 12:00:42 2012 +0100
msi: Fix a test failure on Windows 8 and conform to the more recent behavior.
---
dlls/msi/automation.c | 2 +-
dlls/msi/tests/automation.c | 4 +++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/dlls/msi/automation.c b/dlls/msi/automation.c
index 8164463..0b12e29 100644
--- a/dlls/msi/automation.c
+++ b/dlls/msi/automation.c
@@ -1616,7 +1616,7 @@ static HRESULT session_invoke(
static void variant_from_registry_value(VARIANT *pVarResult, DWORD dwType, LPBYTE lpData, DWORD dwSize)
{
static const WCHAR szREG_BINARY[] = { '(','R','E','G','_','B','I','N','A','R','Y',')',0 };
- static const WCHAR szREG_[] = { '(','R','E','G','_',']',0 };
+ static const WCHAR szREG_[] = { '(','R','E','G','_','?','?',')',0 };
WCHAR *szString = (WCHAR *)lpData;
LPWSTR szNewString = NULL;
DWORD dwNewSize = 0;
diff --git a/dlls/msi/tests/automation.c b/dlls/msi/tests/automation.c
index bc0a632..c1c1d4a 100644
--- a/dlls/msi/tests/automation.c
+++ b/dlls/msi/tests/automation.c
@@ -2006,6 +2006,7 @@ static void test_Installer_RegistryValue(void)
static const WCHAR szFiveHi[] = { 'F','i','v','e','\n','H','i',0 };
static const WCHAR szSix[] = { 'S','i','x',0 };
static const WCHAR szREG_[] = { '(','R','E','G','_',']',0 };
+ static const WCHAR szREG_2[] = { '(','R','E','G','_','?','?',')',0 };
static const WCHAR szSeven[] = { 'S','e','v','e','n',0 };
static const WCHAR szEight[] = { 'E','i','g','h','t',0 };
static const WCHAR szBlank[] = { 0 };
@@ -2117,7 +2118,8 @@ static void test_Installer_RegistryValue(void)
memset(szString, 0, sizeof(szString));
hr = Installer_RegistryValueW(curr_user, szKey, szSix, szString);
ok(hr == S_OK, "Installer_RegistryValueW failed, hresult 0x%08x\n", hr);
- ok_w2("Registry value \"%s\" does not match expected \"%s\"\n", szString, szREG_);
+ ok(!lstrcmpW(szString, szREG_2) || broken(!lstrcmpW(szString, szREG_)),
+ "Registry value does not match\n");
VariantInit(&vararg);
V_VT(&vararg) = VT_BSTR;
More information about the wine-cvs
mailing list