Changeset 7508 for trunk/src/ole32/compobj.c

Timestamp:

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

Author:

sandervl

Message:

removed TRACE/WARN macro redefinition

File:

• trunk/src/ole32/compobj.c (modified) (4 diffs)

trunk/src/ole32/compobj.c

@@ -37 +37 @@
 #ifdef __WIN32OS2__
 #include <heapstring.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("OLE32: %s", __FUNCTION__); WriteLog
-#define FIXME WriteLog("FIXME OLE32: %s", __FUNCTION__); WriteLog
-#else
-#define TRACE 1 ? (void)0 : (void)((int (*)(char *, ...)) NULL)
-#define FIXME 1 ? (void)0 : (void)((int (*)(char *, ...)) NULL)
-#endif
 #endif
 
@@ -446 +427 @@
   BYTE *p;
   int   i;
-  
-  
-#ifdef __WIN32OS2__
-  // Note: only setup the lookup table once!
-  static BOOL fCLSIDTableInitialized = FALSE;
-  static BYTE table[256];
-#else
   BYTE table[256];
-#endif
 
   if (!s)
           s = "{00000000-0000-0000-0000-000000000000}";
   else {  /* validate the CLSID string */
-    
-#ifdef __WIN32OS2__
-    // PH: all other characters are tested up to the 38th
-    // and cannot be zero so this test should be sufficient.
-    if (s[38] != 0)
-#else
-    if (strlen(s) != 38)
-#endif
+
+      if (strlen(s) != 38)
           return CO_E_CLASSSTRING;
 
@@ -484 +451 @@
 
   TRACE("%s -> %p\n", s, id);
-  
-  
-#ifdef __WIN32OS2__
-  if (fCLSIDTableInitialized == FALSE)
-  {
-    fCLSIDTableInitialized = TRUE;
-#endif
-    
-    /* quick lookup table */
-    memset(table, 0, 256);
-  
-    for (i = 0; i < 10; i++) {
-      table['0' + i] = i;
-    }
-    for (i = 0; i < 6; i++) {
-      table['A' + i] = i+10;
-      table['a' + i] = i+10;
-    }
-    
-#ifdef __WIN32OS2__
-  }
-#endif
+
+  /* quick lookup table */
+  memset(table, 0, 256);
+
+  for (i = 0; i < 10; i++) {
+    table['0' + i] = i;
+  }
+  for (i = 0; i < 6; i++) {
+    table['A' + i] = i+10;
+    table['a' + i] = i+10;
+  }
 
   /* in form {XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX} */
@@ -1502 +1458 @@
 
   if (pServerInfo!=NULL)
-  {
     FIXME("() non-NULL pServerInfo not supported!\n");
-  }
 
   /*