Changeset 7511 for trunk/src

Timestamp:

Nov 30, 2001, 8:08:01 PM (24 years ago)

Author:

sandervl

Message:

removed TRACE/WARN macro redefinition

Location:

trunk/src/msvfw32

Files:

• drawdib.c (modified) (3 diffs)
• msvideo_main.c (modified) (1 diff)

trunk/src/msvfw32/drawdib.c

@@ -45 +45 @@
 #define GlobalFree16 GlobalFree
 
-#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("MSVFW32: %s", __FUNCTION__); WriteLog
-#define FIXME WriteLog("FIXME MSVFW32: %s", __FUNCTION__); WriteLog
-#else
-#define TRACE 1 ? (void)0 : (void)((int (*)(char *, ...)) NULL)
-#define FIXME 1 ? (void)0 : (void)((int (*)(char *, ...)) NULL)
-#endif
-
 #endif
 
@@ -185 +166 @@
                   lpbi->biClrImportant);
 
-        if (wFlags & ~(DDF_BUFFER))
-        {
+        if (wFlags & ~(DDF_BUFFER))
                 FIXME("wFlags == 0x%08x not handled\n", wFlags & ~(DDF_BUFFER));
-        }
-                                                   
+
         whdd = (WINE_HDD*)GlobalLock16(hdd);
         if (!whdd) return FALSE;
@@ -308 +287 @@
         if (wFlags & ~(DDF_SAME_HDC | DDF_SAME_DRAW | DDF_NOTKEYFRAME | 
                                    DDF_UPDATE | DDF_DONTDRAW))
-        {
-          FIXME("wFlags == 0x%08lx not handled\n",(DWORD)wFlags);
-        }
+                FIXME("wFlags == 0x%08lx not handled\n",(DWORD)wFlags);
 
         if (!lpBits) {

trunk/src/msvfw32/msvideo_main.c

@@ -37 +37 @@
 #define SEGPTR_FREE(a)  free(a)
 #define SEGPTR_GET(a)   a
-
-#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("MSVFW32: %s", __FUNCTION__); WriteLog
-#define FIXME WriteLog("FIXME MSVFW32: %s", __FUNCTION__); WriteLog
-#else
-#define TRACE 1 ? (void)0 : (void)((int (*)(char *, ...)) NULL)
-#define FIXME 1 ? (void)0 : (void)((int (*)(char *, ...)) NULL)
-#endif
 
 #endif