[Wine-patches] [eter-2.1] Revert "ole32: Do not fail to load data in unknown format. (eterbug #10868)."

Dmitry Timoshkov dtimoshkov на etersoft.ru
Чт Ноя 5 09:50:07 MSK 2015


This reverts commit 76f01029ae602cf0f287ed71a07c8e28f409fa2d.

A proper fix has been applied.
---
 dlls/ole32/datacache.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c
index 783c91b..758e04e 100644
--- a/dlls/ole32/datacache.c
+++ b/dlls/ole32/datacache.c
@@ -1290,7 +1290,6 @@ static HRESULT parse_pres_streams( DataCache *This, IStorage *stg )
 }
 
 static const FORMATETC static_dib_fmt = { CF_DIB, NULL, DVASPECT_CONTENT, -1, TYMED_HGLOBAL };
-static const FORMATETC static_unknown_fmt = { 0, NULL, 0, -1, TYMED_NULL };
 
 static HRESULT parse_contents_stream( DataCache *This, IStorage *stg, IStream *stm )
 {
@@ -1303,8 +1302,8 @@ static HRESULT parse_contents_stream( DataCache *This, IStorage *stg, IStream *s
 
     if (IsEqualCLSID( &stat.clsid, &CLSID_Picture_Dib ))
         fmt = &static_dib_fmt;
-    else /* eterbug #10868: do not fail to load data in unknown format */
-        fmt = &static_unknown_fmt;
+    else
+        return E_FAIL;
 
     return add_cache_entry( This, fmt, stm, contents_stream );
 }
-- 
2.6.2



Подробная информация о списке рассылки Wine-patches