Changeset 7502 for trunk/src/ole32

Timestamp:

Nov 30, 2001, 6:49:22 PM (24 years ago)

Author:

phaller

Message:

Fixed out-of-scope FIXME,TRACE,WARN macros

Location:

trunk/src/ole32

Files:

• antimoniker.c (modified) (1 diff)
• bindctx.c (modified) (1 diff)
• compobj.c (modified) (2 diffs)
• compositemoniker.c (modified) (1 diff)
• oleobj.c (modified) (1 diff)
• stg_bigblockfile.c (modified) (1 diff)
• storage32.c (modified) (4 diffs)

trunk/src/ole32/antimoniker.c

@@ -19 +19 @@
 #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("OLE32: %s", __FUNCTION__); WriteLog
 #define FIXME WriteLog("FIXME OLE32: %s", __FUNCTION__); WriteLog

trunk/src/ole32/bindctx.c

@@ -21 +21 @@
 #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("OLE32: %s", __FUNCTION__); WriteLog
 #define FIXME WriteLog("FIXME OLE32: %s", __FUNCTION__); WriteLog

trunk/src/ole32/compobj.c

@@ -41 +41 @@
 #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("OLE32: %s", __FUNCTION__); WriteLog
 #define FIXME WriteLog("FIXME OLE32: %s", __FUNCTION__); WriteLog
@@ -1493 +1502 @@
 
   if (pServerInfo!=NULL)
+  {
     FIXME("() non-NULL pServerInfo not supported!\n");
+  }
 
   /*

trunk/src/ole32/compositemoniker.c

@@ -21 +21 @@
 #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("OLE32: %s", __FUNCTION__); WriteLog
 #define FIXME WriteLog("FIXME OLE32: %s", __FUNCTION__); WriteLog

trunk/src/ole32/oleobj.c

@@ -17 +17 @@
 #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("OLE32: %s", __FUNCTION__); WriteLog
 #define FIXME WriteLog("FIXME OLE32: %s", __FUNCTION__); WriteLog

trunk/src/ole32/stg_bigblockfile.c

@@ -48 +48 @@
 #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("OLE32: %s", __FUNCTION__); WriteLog
 #define FIXME WriteLog("FIXME OLE32: %s", __FUNCTION__); WriteLog

trunk/src/ole32/storage32.c

@@ -41 +41 @@
 #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("OLE32: %s", __FUNCTION__); WriteLog
 #define FIXME WriteLog("FIXME OLE32: %s", __FUNCTION__); WriteLog
@@ -1379 +1388 @@
 
   if ((ciidExclude != 0) || (rgiidExclude != NULL) || (snbExclude != NULL))
+  {
     FIXME("Exclude option not implemented\n");
+  }
 
   TRACE("(%p, %ld, %p, %p, %p)\n", 
@@ -5348 +5359 @@
 
   if (grfMode & STGM_TRANSACTED)
+  {
     FIXME("Transacted mode not implemented.\n");
+  }
 
   /*
@@ -5954 +5967 @@
   /* All other cases */
   if (stgm & ~ (STGM_CREATE|STGM_CONVERT))
-        FIXME("unhandled storage mode : 0x%08lx\n",stgm & ~ (STGM_CREATE|STGM_CONVERT));
+  {
+    FIXME("unhandled storage mode : 0x%08lx\n",stgm & ~ (STGM_CREATE|STGM_CONVERT));
+  }
   return CREATE_NEW;
 }