Changeset 7508 for trunk/src/oleaut32

Timestamp:

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

Author:

sandervl

Message:

removed TRACE/WARN macro redefinition

Location:

trunk/src/oleaut32

Files:

• olepicture.c (modified) (5 diffs)
• typelib.c (modified) (10 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;

trunk/src/oleaut32/typelib.c

@@ -68 +68 @@
 #ifdef __WIN32OS2__
 #include <neexe.h>
-#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("OLEAUT32: %s", __FUNCTION__); WriteLog
-#define FIXME WriteLog("OLEAUT32: 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
 
@@ -2374 +2356 @@
 
         name += SLTG_ReadStringA(name, &refname);
-        if(sscanf(refname, "*\\R%x*#%x", &lib_offs, &type_num) != 2)
-        {
-          FIXME("Can't sscanf ref\n");
-        }
+        if(sscanf(refname, "*\\R%x*#%x", &lib_offs, &type_num) != 2)
+            FIXME("Can't sscanf ref\n");
         if(lib_offs != 0xffff) {
             TLBImpLib **import = &pTI->pTypeLib->pImpLibs;
@@ -2403 +2383 @@
                 }
                 len = strlen(fname);
-                if(fname[len-1] != '#')
-                {
-                  FIXME("fname = %s\n", fname);
-                }
+                if(fname[len-1] != '#')
+                    FIXME("fname = %s\n", fname);
                 fname[len-1] = '\0';
                 (*import)->name = TLB_MultiByteToBSTR(fname);
@@ -2421 +2399 @@
     }
     if((BYTE)*name != SLTG_REF_MAGIC)
-    {
       FIXME("End of ref block magic = %x\n", *name);
-    }
     dump_TLBRefType(pTI->reflist);
 }
@@ -2450 +2426 @@
         if(info->next == 0xffff)
             break;
-        if(OneOnly)
-        {
-          FIXME("Interface inheriting more than one interface\n");
-        }
+        if(OneOnly)
+            FIXME("Interface inheriting more than one interface\n");
         info = (SLTG_ImplInfo*)(pBlk + info->next);
     }
@@ -2907 +2881 @@
       
       if((pTIHeader->typeflags1 & 7) != 2)
-      {
-        FIXME("typeflags1 = %02x\n", pTIHeader->typeflags1);
-      }
+        FIXME("typeflags1 = %02x\n", pTIHeader->typeflags1);
       if(pTIHeader->typeflags3 != 2)
-      {
-        FIXME("typeflags3 = %02x\n", pTIHeader->typeflags3);
-      }
+        FIXME("typeflags3 = %02x\n", pTIHeader->typeflags3);
+
       TRACE("TypeInfo %s of kind %s guid %s typeflags %04x\n",
             debugstr_w((*ppTypeInfoImpl)->Name),
@@ -3911 +3882 @@
         WARN("Could not search inherited interface!\n");
     } else
-    {
-      WARN("no names found\n");
-    }
+        WARN("no names found\n");
     return DISP_E_UNKNOWNNAME;
 }
@@ -4045 +4014 @@
                 }
             }
-            if (pFDesc->funcdesc.cParamsOpt)
-            {
+            if (pFDesc->funcdesc.cParamsOpt)
                 FIXME("Does not support optional parameters (%d)\n",
                         pFDesc->funcdesc.cParamsOpt
-                     );
-            }
+                );
 
             res = _invoke((*(DWORD***)pIUnk)[pFDesc->funcdesc.oVft/4],
@@ -4101 +4068 @@
                pVarResult,pExcepInfo,pArgErr
            );
-           if (hr)
-           {
-            FIXME("IDispatch::Invoke failed with %08lx. (Could be not a real error?)\n",hr);
-           }
+           if (hr)
+               FIXME("IDispatch::Invoke failed with %08lx. (Could be not a real error?)\n",hr);
            IDispatch_Release(disp);
            return hr;
@@ -4242 +4207 @@
                 break;
         }
-        if(!pRefType)
-        {
-          FIXME("Can't find pRefType for ref %lx\n", hRefType);
-        }
+        if(!pRefType)
+          FIXME("Can't find pRefType for ref %lx\n", hRefType);
         if(pRefType && hRefType != -1) {
             ITypeLib *pTLib;