Changeset 7508 for trunk/src/ole32


Ignore:
Timestamp:
Nov 30, 2001, 8:02:33 PM (24 years ago)
Author:
sandervl
Message:

removed TRACE/WARN macro redefinition

Location:
trunk/src/ole32
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/ole32/antimoniker.c

    r7502 r7508  
    1515#include "debugtools.h"
    1616
    17 #ifdef __WIN32OS2__
    18 #undef FIXME
    19 #undef TRACE
    20 #ifdef DEBUG
    21 // PH 2001-11-30
    22 // this macro definition causes the control leave the scope of a
    23 // non-curly-braced preceeding if statement. Therefore,
    24 //   if (p!=NULL)
    25 //      TRACE("p->a=%d", p->a)
    26 // crashes.
    27 //
    28 // !!! ENSURE TRACES AND FIXMES WITH PRECEEDING IF STATEMENT
    29 // !!! ARE PUT INTO CURLY BRACES
    30 #define TRACE WriteLog("OLE32: %s", __FUNCTION__); WriteLog
    31 #define FIXME WriteLog("FIXME OLE32: %s", __FUNCTION__); WriteLog
    32 #else
    33 #define TRACE 1 ? (void)0 : (void)((int (*)(char *, ...)) NULL)
    34 #define FIXME 1 ? (void)0 : (void)((int (*)(char *, ...)) NULL)
    35 #endif
    36 #endif
    3717
    3818DEFAULT_DEBUG_CHANNEL(ole);

  • trunk/src/ole32/bindctx.c

    r7502 r7508  
    1717#include "heap.h"
    1818
    19 #ifdef __WIN32OS2__
    20 #undef FIXME
    21 #undef TRACE
    22 #ifdef DEBUG
    23 // PH 2001-11-30
    24 // this macro definition causes the control leave the scope of a
    25 // non-curly-braced preceeding if statement. Therefore,
    26 //   if (p!=NULL)
    27 //      TRACE("p->a=%d", p->a)
    28 // crashes.
    29 //
    30 // !!! ENSURE TRACES AND FIXMES WITH PRECEEDING IF STATEMENT
    31 // !!! ARE PUT INTO CURLY BRACES
    32 #define TRACE WriteLog("OLE32: %s", __FUNCTION__); WriteLog
    33 #define FIXME WriteLog("FIXME OLE32: %s", __FUNCTION__); WriteLog
    34 #else
    35 #define TRACE 1 ? (void)0 : (void)((int (*)(char *, ...)) NULL)
    36 #define FIXME 1 ? (void)0 : (void)((int (*)(char *, ...)) NULL)
    37 #endif
    38 #endif
    3919
    4020DEFAULT_DEBUG_CHANNEL(ole);

  • trunk/src/ole32/compobj.c

    r7502 r7508  
    3737#ifdef __WIN32OS2__
    3838#include <heapstring.h>
    39 
    40 #undef FIXME
    41 #undef TRACE
    42 #ifdef DEBUG
    43 // PH 2001-11-30
    44 // this macro definition causes the control leave the scope of a
    45 // non-curly-braced preceeding if statement. Therefore,
    46 //   if (p!=NULL)
    47 //      TRACE("p->a=%d", p->a)
    48 // crashes.
    49 //
    50 // !!! ENSURE TRACES AND FIXMES WITH PRECEEDING IF STATEMENT
    51 // !!! ARE PUT INTO CURLY BRACES
    52 #define TRACE WriteLog("OLE32: %s", __FUNCTION__); WriteLog
    53 #define FIXME WriteLog("FIXME OLE32: %s", __FUNCTION__); WriteLog
    54 #else
    55 #define TRACE 1 ? (void)0 : (void)((int (*)(char *, ...)) NULL)
    56 #define FIXME 1 ? (void)0 : (void)((int (*)(char *, ...)) NULL)
    57 #endif
    5839#endif
    5940
    … …  
    446427  BYTE *p;
    447428  int   i;
    448  
    449  
    450 #ifdef __WIN32OS2__
    451   // Note: only setup the lookup table once!
    452   static BOOL fCLSIDTableInitialized = FALSE;
    453   static BYTE table[256];
    454 #else
    455429  BYTE table[256];
    456 #endif
    457430
    458431  if (!s)
    459432          s = "{00000000-0000-0000-0000-000000000000}";
    460433  else {  /* validate the CLSID string */
    461    
    462 #ifdef __WIN32OS2__
    463     // PH: all other characters are tested up to the 38th
    464     // and cannot be zero so this test should be sufficient.
    465     if (s[38] != 0)
    466 #else
    467     if (strlen(s) != 38)
    468 #endif
     434
     435      if (strlen(s) != 38)
    469436          return CO_E_CLASSSTRING;
    470437
    … …  
    484451
    485452  TRACE("%s -> %p\n", s, id);
    486  
    487  
    488 #ifdef __WIN32OS2__
    489   if (fCLSIDTableInitialized == FALSE)
    490   {
    491     fCLSIDTableInitialized = TRUE;
    492 #endif
    493    
    494     /* quick lookup table */
    495     memset(table, 0, 256);
    496  
    497     for (i = 0; i < 10; i++) {
    498       table['0' + i] = i;
    499     }
    500     for (i = 0; i < 6; i++) {
    501       table['A' + i] = i+10;
    502       table['a' + i] = i+10;
    503     }
    504    
    505 #ifdef __WIN32OS2__
    506   }
    507 #endif
     453
     454  /* quick lookup table */
     455  memset(table, 0, 256);
     456
     457  for (i = 0; i < 10; i++) {
     458    table['0' + i] = i;
     459  }
     460  for (i = 0; i < 6; i++) {
     461    table['A' + i] = i+10;
     462    table['a' + i] = i+10;
     463  }
    508464
    509465  /* in form {XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX} */
    … …  
    15021458
    15031459  if (pServerInfo!=NULL)
    1504   {
    15051460    FIXME("() non-NULL pServerInfo not supported!\n");
    1506   }
    15071461
    15081462  /*

  • trunk/src/ole32/oleobj.c

    r7502 r7508  
    1212#include "debugtools.h"
    1313#include "oleidl.h"
    14 
    15 #ifdef __WIN32OS2__
    16 #undef FIXME
    17 #undef TRACE
    18 #ifdef DEBUG
    19 // PH 2001-11-30
    20 // this macro definition causes the control leave the scope of a
    21 // non-curly-braced preceeding if statement. Therefore,
    22 //   if (p!=NULL)
    23 //      TRACE("p->a=%d", p->a)
    24 // crashes.
    25 //
    26 // !!! ENSURE TRACES AND FIXMES WITH PRECEEDING IF STATEMENT
    27 // !!! ARE PUT INTO CURLY BRACES
    28 #define TRACE WriteLog("OLE32: %s", __FUNCTION__); WriteLog
    29 #define FIXME WriteLog("FIXME OLE32: %s", __FUNCTION__); WriteLog
    30 #else
    31 #define TRACE 1 ? (void)0 : (void)((int (*)(char *, ...)) NULL)
    32 #define FIXME 1 ? (void)0 : (void)((int (*)(char *, ...)) NULL)
    33 #endif
    34 #endif
    3514
    3615DEFAULT_DEBUG_CHANNEL(ole);

  • trunk/src/ole32/stg_bigblockfile.c

    r7502 r7508  
    4444#include "debugtools.h"
    4545
    46 #ifdef __WIN32OS2__
    47 #undef FIXME
    48 #undef TRACE
    49 #ifdef DEBUG
    50 // PH 2001-11-30
    51 // this macro definition causes the control leave the scope of a
    52 // non-curly-braced preceeding if statement. Therefore,
    53 //   if (p!=NULL)
    54 //      TRACE("p->a=%d", p->a)
    55 // crashes.
    56 //
    57 // !!! ENSURE TRACES AND FIXMES WITH PRECEEDING IF STATEMENT
    58 // !!! ARE PUT INTO CURLY BRACES
    59 #define TRACE WriteLog("OLE32: %s", __FUNCTION__); WriteLog
    60 #define FIXME WriteLog("FIXME OLE32: %s", __FUNCTION__); WriteLog
    61 #else
    62 #define TRACE 1 ? (void)0 : (void)((int (*)(char *, ...)) NULL)
    63 #define FIXME 1 ? (void)0 : (void)((int (*)(char *, ...)) NULL)
    64 #endif
    65 #endif
    6646
    6747DEFAULT_DEBUG_CHANNEL(storage);

  • trunk/src/ole32/storage32.c

    r7502 r7508  
    3737#define FILE_BEGIN 0
    3838
    39 #ifdef __WIN32OS2__
    40 #undef FIXME
    41 #undef TRACE
    42 #ifdef DEBUG
    43 // PH 2001-11-30
    44 // this macro definition causes the control leave the scope of a
    45 // non-curly-braced preceeding if statement. Therefore,
    46 //   if (p!=NULL)
    47 //      TRACE("p->a=%d", p->a)
    48 // crashes.
    49 //
    50 // !!! ENSURE TRACES AND FIXMES WITH PRECEEDING IF STATEMENT
    51 // !!! ARE PUT INTO CURLY BRACES
    52 #define TRACE WriteLog("OLE32: %s", __FUNCTION__); WriteLog
    53 #define FIXME WriteLog("FIXME OLE32: %s", __FUNCTION__); WriteLog
    54 #else
    55 #define TRACE 1 ? (void)0 : (void)((int (*)(char *, ...)) NULL)
    56 #define FIXME 1 ? (void)0 : (void)((int (*)(char *, ...)) NULL)
    57 #endif
    58 #endif
    5939
    6040
    … …  
    13881368
    13891369  if ((ciidExclude != 0) || (rgiidExclude != NULL) || (snbExclude != NULL))
    1390   {
    13911370    FIXME("Exclude option not implemented\n");
    1392   }
    13931371
    13941372  TRACE("(%p, %ld, %p, %p, %p)\n",
    … …  
    53595337
    53605338  if (grfMode & STGM_TRANSACTED)
    5361   {
    53625339    FIXME("Transacted mode not implemented.\n");
    5363   }
    53645340
    53655341  /*
    … …  
    59675943  /* All other cases */
    59685944  if (stgm & ~ (STGM_CREATE|STGM_CONVERT))
    5969   {
    5970     FIXME("unhandled storage mode : 0x%08lx\n",stgm & ~ (STGM_CREATE|STGM_CONVERT));
    5971   }
     5945        FIXME("unhandled storage mode : 0x%08lx\n",stgm & ~ (STGM_CREATE|STGM_CONVERT));
    59725946  return CREATE_NEW;
    59735947}
Note: See TracChangeset for help on using the changeset viewer.