Module: wine Branch: master Commit: df219f87587ab20487c6d820ed82d698530343b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df219f87587ab20487c6d820ed...
Author: Andrew Bogott andrew@CodeWeavers.com Date: Thu Nov 11 03:42:29 2010 -0600
ole32: Revert "ole32: Only read known format ids when attempting to read summary information.".
This reverts commit c94b2687d223100300b61628a77fe942e4f42121.
---
dlls/ole32/stg_prop.c | 7 ------- dlls/ole32/tests/stg_prop.c | 1 + 2 files changed, 1 insertions(+), 7 deletions(-)
diff --git a/dlls/ole32/stg_prop.c b/dlls/ole32/stg_prop.c index f887d10..b3362bc 100644 --- a/dlls/ole32/stg_prop.c +++ b/dlls/ole32/stg_prop.c @@ -1314,13 +1314,6 @@ static HRESULT PropertyStorage_ReadFromStream(PropertyStorage_impl *This) hr = PropertyStorage_ReadFmtIdOffsetFromStream(This->stm, &fmtOffset); if (FAILED(hr)) goto end; - if (!IsEqualGUID(&fmtOffset.fmtid, &FMTID_DocSummaryInformation) && - !IsEqualGUID(&fmtOffset.fmtid, &FMTID_SummaryInformation)) - { - WARN("not reading unknown fmtid %s\n", debugstr_guid(&fmtOffset.fmtid)); - hr = S_FALSE; - goto end; - } if (fmtOffset.dwOffset > stat.cbSize.u.LowPart) { WARN("invalid offset %d (stream length is %d)\n", fmtOffset.dwOffset, diff --git a/dlls/ole32/tests/stg_prop.c b/dlls/ole32/tests/stg_prop.c index dff3361..4e5fde7 100644 --- a/dlls/ole32/tests/stg_prop.c +++ b/dlls/ole32/tests/stg_prop.c @@ -333,6 +333,7 @@ static void testProps(void)
hr = IPropertySetStorage_Open(propSetStorage, &anyOldGuid, STGM_READWRITE | STGM_SHARE_EXCLUSIVE, &propertyStorage); + todo_wine ok(hr == S_OK, "IPropertySetStorage_Open failed: 0x%08x\n", hr);
spec.ulKind = PRSPEC_PROPID;