Changeset 7508 for trunk/src/oleaut32/olepicture.c

Timestamp:

Nov 30, 2001, 8:02:33 PM (24 years ago)

Author:

sandervl

Message:

removed TRACE/WARN macro redefinition

File:

• trunk/src/oleaut32/olepicture.c (modified) (5 diffs)

trunk/src/oleaut32/olepicture.c

@@ -56 +56 @@
 #endif
 
-#ifdef __WIN32OS2__
-#undef FIXME
-#undef TRACE
-#ifdef DEBUG
-// PH 2001-11-30
-// this macro definition causes the control leave the scope of a
-// non-curly-braced preceeding if statement. Therefore,
-//   if (p!=NULL) 
-//      TRACE("p->a=%d", p->a)
-// crashes.
-//
-// !!! ENSURE TRACES AND FIXMES WITH PRECEEDING IF STATEMENT 
-// !!! ARE PUT INTO CURLY BRACES
-#define TRACE WriteLog("%s", __FUNCTION__); WriteLog
-#define FIXME WriteLog("FIXME %s", __FUNCTION__); WriteLog
-#else
-#define TRACE 1 ? (void)0 : (void)((int (*)(char *, ...)) NULL)
-#define FIXME 1 ? (void)0 : (void)((int (*)(char *, ...)) NULL)
-#endif
-#endif
-
 DEFAULT_DEBUG_CHANNEL(ole);
 
@@ -174 +153 @@
 
   if (pictDesc)
-  {
-    // PH 2001-11-29 TRACE must be in curly braces otherwise
-    // the scope of the if statement is left and we'll crash
-    // on picDesc == NULL
     TRACE("(%p) type = %d\n", pictDesc, pictDesc->picType);
-  }
 
   /*
@@ -507 +481 @@
         This, hdc, x, y, cx, cy, xSrc, ySrc, cxSrc, cySrc, prcWBounds);
   if(prcWBounds)
-  {
     TRACE("prcWBounds (%d,%d) - (%d,%d)\n", prcWBounds->left, prcWBounds->top,
-          prcWBounds->right, prcWBounds->bottom);
-  }
+          prcWBounds->right, prcWBounds->bottom);
 
   /*
@@ -851 +823 @@
   }
   if (xread != header[1])
-  {
     FIXME("Could only read %ld of %ld bytes?\n",xread,header[1]);
-  }
 
   magic = xbuf[0] + (xbuf[1]<<8);
@@ -1285 +1255 @@
   hr = IPicture_QueryInterface(newpic,riid,ppvObj);
   if (hr)
-  {
-    FIXME("Failed to get interface %s from IPicture.\n",debugstr_guid(riid));
-  }
+      FIXME("Failed to get interface %s from IPicture.\n",debugstr_guid(riid));
   IPicture_Release(newpic);
   return hr;