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

dxdiagn: Successfully copy to destination variants with an invalid type in IDxDiagContainer::GetProp. 

GetProp now simply unconditionally clears the destination variant if
VariantClear fails.
This commit is contained in:
Andrew Nguyen 2010-03-23 09:23:50 -05:00 committed by Alexandre Julliard
parent 0d88ba9e01
commit 5f1764c629
3 changed files with 44 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
dlls/dxdiagn/container.c
View File

@ -221,9 +221,12 @@ static HRESULT WINAPI IDxDiagContainerImpl_GetProp(PDXDIAGCONTAINER iface, LPCWS
p = This->properties; p = This->properties;
while (NULL != p) { while (NULL != p) {
if (0 == lstrcmpW(p->vName, pwszPropName)) { if (0 == lstrcmpW(p->vName, pwszPropName)) {
VariantCopy(pvarProp, &p->v); HRESULT hr = VariantClear(pvarProp);
return S_OK; if (hr == DISP_E_ARRAYISLOCKED || hr == DISP_E_BADVARTYPE)
VariantInit(pvarProp);
return VariantCopy(pvarProp, &p->v);
} }
p = p->next; p = p->next;
} }

2
dlls/dxdiagn/tests/Makefile.in
View File

@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
SRCDIR = @srcdir@ SRCDIR = @srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
TESTDLL = dxdiagn.dll TESTDLL = dxdiagn.dll
IMPORTS = ole32 kernel32 IMPORTS = oleaut32 ole32 kernel32
C_SRCS = \ C_SRCS = \
container.c \ container.c \

37
dlls/dxdiagn/tests/container.c
View File

@ -535,6 +535,8 @@ static void test_GetProp(void)
IDxDiagContainer *child = NULL; IDxDiagContainer *child = NULL;
DWORD count, index; DWORD count, index;
VARIANT var; VARIANT var;
SAFEARRAY *sa;
SAFEARRAYBOUND bound;
static const WCHAR emptyW[] = {0}; static const WCHAR emptyW[] = {0};
static const WCHAR testW[] = {'t','e','s','t',0}; static const WCHAR testW[] = {'t','e','s','t',0};
@ -612,6 +614,41 @@ static void test_GetProp(void)
ok(hr == E_INVALIDARG, "Expected IDxDiagContainer::GetProp to return E_INVALIDARG, got 0x%08x\n", hr); ok(hr == E_INVALIDARG, "Expected IDxDiagContainer::GetProp to return E_INVALIDARG, got 0x%08x\n", hr);
ok(V_VT(&var) == 0xdead, "Expected the variant to be untouched, got %u\n", V_VT(&var)); ok(V_VT(&var) == 0xdead, "Expected the variant to be untouched, got %u\n", V_VT(&var));
VariantInit(&var);
hr = IDxDiagContainer_GetProp(child, property, &var);
ok(hr == S_OK, "Expected IDxDiagContainer::GetProp to return S_OK, got 0x%08x\n", hr);
ok(V_VT(&var) != VT_EMPTY, "Expected the variant to be modified, got %d\n", V_VT(&var));
/* Since the documentation for IDxDiagContainer::GetProp claims that the
* function reports return values from VariantCopy, try to exercise failure
* paths in handling the destination variant. */
/* Try an invalid variant type. */
V_VT(&var) = 0xdead;
hr = IDxDiagContainer_GetProp(child, property, &var);
ok(hr == S_OK, "Expected IDxDiagContainer::GetProp to return S_OK, got 0x%08x\n", hr);
ok(V_VT(&var) != 0xdead, "Expected the variant to be modified, got %d\n", V_VT(&var));
/* Try passing a variant with a locked SAFEARRAY. */
bound.cElements = 1;
bound.lLbound = 0;
sa = SafeArrayCreate(VT_UI1, 1, &bound);
ok(sa != NULL, "Expected SafeArrayCreate to return a valid pointer\n");
V_VT(&var) = (VT_ARRAY | VT_UI1);
V_ARRAY(&var) = sa;
hr = SafeArrayLock(sa);
ok(hr == S_OK, "Expected SafeArrayLock to return S_OK, got 0x%08x\n", hr);
hr = IDxDiagContainer_GetProp(child, property, &var);
ok(hr == S_OK, "Expected IDxDiagContainer::GetProp to return S_OK, got 0x%08x\n", hr);
ok(V_VT(&var) != (VT_ARRAY | VT_UI1), "Expected the variant to be modified\n");
hr = SafeArrayUnlock(sa);
ok(hr == S_OK, "Expected SafeArrayUnlock to return S_OK, got 0x%08x\n", hr);
hr = SafeArrayDestroy(sa);
ok(hr == S_OK, "Expected SafeArrayDestroy to return S_OK, got 0x%08x\n", hr);
IDxDiagContainer_Release(child); IDxDiagContainer_Release(child);
cleanup: cleanup: