oleaut32: Only dump the EMF if tracing fixmes for the ole channel.

Francois Gouget fgouget at free.fr
Mon Jan 5 13:12:07 CST 2009


---

It does not seem logical to systematically dump the header but only 
complain that the magic is unknown if FIXME_ON(ole) is true. It also 
seems a bit weird to dump binary stuff in a MESSAGE(). So I made the lot 
depend on FIXME_ON(ole).

But I could also drop that test and change the FIXME() to a MESSAGE() if 
that's preferred.

 dlls/oleaut32/olepicture.c |   17 ++++++++++-------
 1 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c
index 8fe2485..327197c 100644
--- a/dlls/oleaut32/olepicture.c
+++ b/dlls/oleaut32/olepicture.c
@@ -1927,14 +1927,17 @@ static HRESULT WINAPI OLEPictureImpl_Load(IPersistStream* iface,IStream*pStm) {
     hr = OLEPictureImpl_LoadEnhMetafile(This, xbuf, xread);
     if (hr == S_OK) break;
 
-    FIXME("Unknown magic %04x, %d read bytes:\n",magic,xread);
-    hr=E_FAIL;
-    for (i=0;i<xread+8;i++) {
-	if (i<8) MESSAGE("%02x\n",((unsigned char*)header)[i]);
-	else MESSAGE("%02x\n",xbuf[i-8]);
-        if (i % 10 == 9) MESSAGE("\n");
+    if (FIXME_ON(ole))
+    {
+        FIXME("Unknown magic %04x, %d read bytes:\n",magic,xread);
+        hr=E_FAIL;
+        for (i=0;i<xread+8;i++) {
+            if (i<8) DPRINTF("%02x ",((unsigned char*)header)[i]);
+            else DPRINTF("%02x ",xbuf[i-8]);
+            if (i % 10 == 9) DPRINTF("\n");
+        }
+        DPRINTF("\n");
     }
-    MESSAGE("\n");
     break;
   }
   }
-- 
1.5.6.5




More information about the wine-patches mailing list