ole32: Fix the test for arbitrary property ids.
This commit is contained in:
parent
c75a4fd50a
commit
796aca38f0
|
@ -315,13 +315,18 @@ static void testProps(void)
|
||||||
|
|
||||||
spec.ulKind = PRSPEC_PROPID;
|
spec.ulKind = PRSPEC_PROPID;
|
||||||
U(spec).propid = PID_FIRST_USABLE;
|
U(spec).propid = PID_FIRST_USABLE;
|
||||||
|
var.vt = VT_I4;
|
||||||
U(var).lVal = 1;
|
U(var).lVal = 1;
|
||||||
hr = IPropertyStorage_WriteMultiple(propertyStorage, 1, &spec, &var, 0);
|
hr = IPropertyStorage_WriteMultiple(propertyStorage, 1, &spec, &var, 0);
|
||||||
ok(hr == S_OK, "WriteMultiple failed: 0x%08x\n", hr);
|
ok(hr == S_OK, "WriteMultiple failed: 0x%08x\n", hr);
|
||||||
|
|
||||||
|
hr = IPropertyStorage_Commit(propertyStorage, STGC_DEFAULT);
|
||||||
|
ok(hr == S_OK, "Commit failed: 0x%08x\n", hr);
|
||||||
|
|
||||||
IPropertyStorage_Release(propertyStorage);
|
IPropertyStorage_Release(propertyStorage);
|
||||||
IPropertySetStorage_Release(propSetStorage);
|
IPropertySetStorage_Release(propSetStorage);
|
||||||
IStorage_Release(storage);
|
IStorage_Release(storage);
|
||||||
|
propertyStorage = NULL;
|
||||||
|
|
||||||
/* now open it again */
|
/* now open it again */
|
||||||
hr = StgOpenStorage(filename, NULL, STGM_READWRITE | STGM_SHARE_EXCLUSIVE,
|
hr = StgOpenStorage(filename, NULL, STGM_READWRITE | STGM_SHARE_EXCLUSIVE,
|
||||||
|
@ -333,13 +338,16 @@ static void testProps(void)
|
||||||
|
|
||||||
hr = IPropertySetStorage_Open(propSetStorage, &anyOldGuid,
|
hr = IPropertySetStorage_Open(propSetStorage, &anyOldGuid,
|
||||||
STGM_READWRITE | STGM_SHARE_EXCLUSIVE, &propertyStorage);
|
STGM_READWRITE | STGM_SHARE_EXCLUSIVE, &propertyStorage);
|
||||||
todo_wine
|
|
||||||
ok(hr == S_OK, "IPropertySetStorage_Open failed: 0x%08x\n", hr);
|
ok(hr == S_OK, "IPropertySetStorage_Open failed: 0x%08x\n", hr);
|
||||||
|
|
||||||
spec.ulKind = PRSPEC_PROPID;
|
spec.ulKind = PRSPEC_PROPID;
|
||||||
U(spec).propid = PID_FIRST_USABLE;
|
U(spec).propid = PID_FIRST_USABLE;
|
||||||
hr = IPropertyStorage_ReadMultiple(propertyStorage, 1, &spec, &var);
|
hr = IPropertyStorage_ReadMultiple(propertyStorage, 1, &spec, &var);
|
||||||
ok(hr == S_FALSE, "ReadMultiple failed: 0x%08x\n", hr);
|
ok(hr == S_OK, "ReadMultiple failed: 0x%08x\n", hr);
|
||||||
|
|
||||||
|
ok(var.vt == VT_I4 && U(var).lVal == 1,
|
||||||
|
"Didn't get expected type or value for property (got type %d, value %d)\n",
|
||||||
|
var.vt, U(var).lVal);
|
||||||
|
|
||||||
IPropertyStorage_Release(propertyStorage);
|
IPropertyStorage_Release(propertyStorage);
|
||||||
IPropertySetStorage_Release(propSetStorage);
|
IPropertySetStorage_Release(propSetStorage);
|
||||||
|
|
Loading…
Reference in New Issue