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

msi: Fix a test failure on Windows 8 and conform to the more recent behavior.

This commit is contained in:
Hans Leidekker 2012-12-19 12:00:42 +01:00 committed by Alexandre Julliard
parent 7771552f24
commit 61db36556a
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/msi/automation.c
View File

@ -1616,7 +1616,7 @@ static HRESULT session_invoke(
static void variant_from_registry_value(VARIANT *pVarResult, DWORD dwType, LPBYTE lpData, DWORD dwSize) 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_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; WCHAR *szString = (WCHAR *)lpData;
LPWSTR szNewString = NULL; LPWSTR szNewString = NULL;
DWORD dwNewSize = 0; DWORD dwNewSize = 0;

4
dlls/msi/tests/automation.c
View File

@ -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 szFiveHi[] = { 'F','i','v','e','\n','H','i',0 };
static const WCHAR szSix[] = { 'S','i','x',0 }; static const WCHAR szSix[] = { 'S','i','x',0 };
static const WCHAR szREG_[] = { '(','R','E','G','_',']',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 szSeven[] = { 'S','e','v','e','n',0 };
static const WCHAR szEight[] = { 'E','i','g','h','t',0 }; static const WCHAR szEight[] = { 'E','i','g','h','t',0 };
static const WCHAR szBlank[] = { 0 }; static const WCHAR szBlank[] = { 0 };
@ -2117,7 +2118,8 @@ static void test_Installer_RegistryValue(void)
memset(szString, 0, sizeof(szString)); memset(szString, 0, sizeof(szString));
hr = Installer_RegistryValueW(curr_user, szKey, szSix, szString); hr = Installer_RegistryValueW(curr_user, szKey, szSix, szString);
ok(hr == S_OK, "Installer_RegistryValueW failed, hresult 0x%08x\n", hr); 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); VariantInit(&vararg);
V_VT(&vararg) = VT_BSTR; V_VT(&vararg) = VT_BSTR;