Changeset 7508 for trunk/src


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

removed TRACE/WARN macro redefinition

Location:
trunk/src
Files:
16 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/comctl32/comctl32undoc.c

    r7502 r7508  
    3636
    3737DEFAULT_DEBUG_CHANNEL(commctrl);
    38 
    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 FIXME WriteLog("FIXME COMCTL32: %s", __FUNCTION__); WriteLog
    53 #else
    54 #define FIXME 1 ? (void)0 : (void)((int (*)(char *, ...)) NULL)
    55 #endif
    56 #endif
    5738
    5839extern HANDLE COMCTL32_hHeap; /* handle to the private heap */
    … …  
    13581339    for (i = 0; i < hdsa->nItemSize; i += 4) {
    13591340        p = *(DWORD**)((char *) pSrc + i);
    1360         if (IsBadStringPtrA ((char*)p, 256))
    1361         {
    1362           TRACE("-- %d=%p\n", i, (DWORD*)p);
    1363         }
    1364         else
    1365         {
    1366           TRACE("-- %d=%p [%s]\n", i, p, debugstr_a((char*)p));
    1367         }
     1341        if (IsBadStringPtrA ((char*)p, 256))
     1342            TRACE("-- %d=%p\n", i, (DWORD*)p);
     1343        else
     1344            TRACE("-- %d=%p [%s]\n", i, p, debugstr_a((char*)p));
    13681345    }
    13691346   

  • trunk/src/comctl32/imagelist.c

    r7502 r7508  
    3535DEFAULT_DEBUG_CHANNEL(imagelist);
    3636
    37 
    38 #ifdef __WIN32OS2__
    39 #undef FIXME
    40 #undef TRACE
    41 #ifdef DEBUG
    42 // PH 2001-11-30
    43 // this macro definition causes the control leave the scope of a
    44 // non-curly-braced preceeding if statement. Therefore,
    45 //   if (p!=NULL)
    46 //      TRACE("p->a=%d", p->a)
    47 // crashes.
    48 //
    49 // !!! ENSURE TRACES AND FIXMES WITH PRECEEDING IF STATEMENT
    50 // !!! ARE PUT INTO CURLY BRACES
    51 #define TRACE WriteLog("COMCTL32: %s", __FUNCTION__); WriteLog
    52 #define FIXME WriteLog("FIXME COMCTL32: %s", __FUNCTION__); WriteLog
    53 #else
    54 #define TRACE 1 ? (void)0 : (void)((int (*)(char *, ...)) NULL)
    55 #define FIXME 1 ? (void)0 : (void)((int (*)(char *, ...)) NULL)
    56 #endif
    57 #endif
    5837
    5938#define _MAX(a,b) (((a)>(b))?(a):(b))

  • 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}

  • trunk/src/oleaut32/olepicture.c

    r7501 r7508  
    5656#endif
    5757
    58 #ifdef __WIN32OS2__
    59 #undef FIXME
    60 #undef TRACE
    61 #ifdef DEBUG
    62 // PH 2001-11-30
    63 // this macro definition causes the control leave the scope of a
    64 // non-curly-braced preceeding if statement. Therefore,
    65 //   if (p!=NULL)
    66 //      TRACE("p->a=%d", p->a)
    67 // crashes.
    68 //
    69 // !!! ENSURE TRACES AND FIXMES WITH PRECEEDING IF STATEMENT
    70 // !!! ARE PUT INTO CURLY BRACES
    71 #define TRACE WriteLog("%s", __FUNCTION__); WriteLog
    72 #define FIXME WriteLog("FIXME %s", __FUNCTION__); WriteLog
    73 #else
    74 #define TRACE 1 ? (void)0 : (void)((int (*)(char *, ...)) NULL)
    75 #define FIXME 1 ? (void)0 : (void)((int (*)(char *, ...)) NULL)
    76 #endif
    77 #endif
    78 
    7958DEFAULT_DEBUG_CHANNEL(ole);
    8059
    … …  
    174153
    175154  if (pictDesc)
    176   {
    177     // PH 2001-11-29 TRACE must be in curly braces otherwise
    178     // the scope of the if statement is left and we'll crash
    179     // on picDesc == NULL
    180155    TRACE("(%p) type = %d\n", pictDesc, pictDesc->picType);
    181   }
    182156
    183157  /*
    … …  
    507481        This, hdc, x, y, cx, cy, xSrc, ySrc, cxSrc, cySrc, prcWBounds);
    508482  if(prcWBounds)
    509   {
    510483    TRACE("prcWBounds (%d,%d) - (%d,%d)\n", prcWBounds->left, prcWBounds->top,
    511           prcWBounds->right, prcWBounds->bottom);
    512   }
     484          prcWBounds->right, prcWBounds->bottom);
    513485
    514486  /*
    … …  
    851823  }
    852824  if (xread != header[1])
    853   {
    854825    FIXME("Could only read %ld of %ld bytes?\n",xread,header[1]);
    855   }
    856826
    857827  magic = xbuf[0] + (xbuf[1]<<8);
    … …  
    12851255  hr = IPicture_QueryInterface(newpic,riid,ppvObj);
    12861256  if (hr)
    1287   {
    1288     FIXME("Failed to get interface %s from IPicture.\n",debugstr_guid(riid));
    1289   }
     1257      FIXME("Failed to get interface %s from IPicture.\n",debugstr_guid(riid));
    12901258  IPicture_Release(newpic);
    12911259  return hr;

  • trunk/src/oleaut32/typelib.c

    r7502 r7508  
    6868#ifdef __WIN32OS2__
    6969#include <neexe.h>
    70 #undef FIXME
    71 #undef TRACE
    72 #ifdef DEBUG
    73 // PH 2001-11-30
    74 // this macro definition causes the control leave the scope of a
    75 // non-curly-braced preceeding if statement. Therefore,
    76 //   if (p!=NULL)
    77 //      TRACE("p->a=%d", p->a)
    78 // crashes.
    79 //
    80 // !!! ENSURE TRACES AND FIXMES WITH PRECEEDING IF STATEMENT
    81 // !!! ARE PUT INTO CURLY BRACES
    82 #define TRACE WriteLog("OLEAUT32: %s", __FUNCTION__); WriteLog
    83 #define FIXME WriteLog("OLEAUT32: FIXME %s", __FUNCTION__); WriteLog
    84 #else
    85 #define TRACE 1 ? (void)0 : (void)((int (*)(char *, ...)) NULL)
    86 #define FIXME 1 ? (void)0 : (void)((int (*)(char *, ...)) NULL)
    87 #endif
    8870#endif
    8971
    … …  
    23742356
    23752357        name += SLTG_ReadStringA(name, &refname);
    2376         if(sscanf(refname, "*\\R%x*#%x", &lib_offs, &type_num) != 2)
    2377         {
    2378           FIXME("Can't sscanf ref\n");
    2379         }
     2358        if(sscanf(refname, "*\\R%x*#%x", &lib_offs, &type_num) != 2)
     2359            FIXME("Can't sscanf ref\n");
    23802360        if(lib_offs != 0xffff) {
    23812361            TLBImpLib **import = &pTI->pTypeLib->pImpLibs;
    … …  
    24032383                }
    24042384                len = strlen(fname);
    2405                 if(fname[len-1] != '#')
    2406                 {
    2407                   FIXME("fname = %s\n", fname);
    2408                 }
     2385                if(fname[len-1] != '#')
     2386                    FIXME("fname = %s\n", fname);
    24092387                fname[len-1] = '\0';
    24102388                (*import)->name = TLB_MultiByteToBSTR(fname);
    … …  
    24212399    }
    24222400    if((BYTE)*name != SLTG_REF_MAGIC)
    2423     {
    24242401      FIXME("End of ref block magic = %x\n", *name);
    2425     }
    24262402    dump_TLBRefType(pTI->reflist);
    24272403}
    … …  
    24502426        if(info->next == 0xffff)
    24512427            break;
    2452         if(OneOnly)
    2453         {
    2454           FIXME("Interface inheriting more than one interface\n");
    2455         }
     2428        if(OneOnly)
     2429            FIXME("Interface inheriting more than one interface\n");
    24562430        info = (SLTG_ImplInfo*)(pBlk + info->next);
    24572431    }
    … …  
    29072881     
    29082882      if((pTIHeader->typeflags1 & 7) != 2)
    2909       {
    2910         FIXME("typeflags1 = %02x\n", pTIHeader->typeflags1);
    2911       }
     2883        FIXME("typeflags1 = %02x\n", pTIHeader->typeflags1);
    29122884      if(pTIHeader->typeflags3 != 2)
    2913       {
    2914         FIXME("typeflags3 = %02x\n", pTIHeader->typeflags3);
    2915       }
     2885        FIXME("typeflags3 = %02x\n", pTIHeader->typeflags3);
     2886
    29162887      TRACE("TypeInfo %s of kind %s guid %s typeflags %04x\n",
    29172888            debugstr_w((*ppTypeInfoImpl)->Name),
    … …  
    39113882        WARN("Could not search inherited interface!\n");
    39123883    } else
    3913     {
    3914       WARN("no names found\n");
    3915     }
     3884        WARN("no names found\n");
    39163885    return DISP_E_UNKNOWNNAME;
    39173886}
    … …  
    40454014                }
    40464015            }
    4047             if (pFDesc->funcdesc.cParamsOpt)
    4048             {
     4016            if (pFDesc->funcdesc.cParamsOpt)
    40494017                FIXME("Does not support optional parameters (%d)\n",
    40504018                        pFDesc->funcdesc.cParamsOpt
    4051                      );
    4052             }
     4019                );
    40534020
    40544021            res = _invoke((*(DWORD***)pIUnk)[pFDesc->funcdesc.oVft/4],
    … …  
    41014068               pVarResult,pExcepInfo,pArgErr
    41024069           );
    4103            if (hr)
    4104            {
    4105             FIXME("IDispatch::Invoke failed with %08lx. (Could be not a real error?)\n",hr);
    4106            }
     4070           if (hr)
     4071               FIXME("IDispatch::Invoke failed with %08lx. (Could be not a real error?)\n",hr);
    41074072           IDispatch_Release(disp);
    41084073           return hr;
    … …  
    42424207                break;
    42434208        }
    4244         if(!pRefType)
    4245         {
    4246           FIXME("Can't find pRefType for ref %lx\n", hRefType);
    4247         }
     4209        if(!pRefType)
     4210          FIXME("Can't find pRefType for ref %lx\n", hRefType);
    42484211        if(pRefType && hRefType != -1) {
    42494212            ITypeLib *pTLib;

  • trunk/src/shell32/shelllink.c

    r7502 r7508  
    3030#include <winuser32.h>
    3131#include <winres.h>
    32 
    33 #undef WARN
    34 #undef TRACE
    35 #ifdef DEBUG
    36 // PH 2001-11-30
    37 // this macro definition causes the control leave the scope of a
    38 // non-curly-braced preceeding if statement. Therefore,
    39 //   if (p!=NULL)
    40 //      TRACE("p->a=%d", p->a)
    41 // crashes.
    42 //
    43 // !!! ENSURE TRACES AND FIXMES WITH PRECEEDING IF STATEMENT
    44 // !!! ARE PUT INTO CURLY BRACES
    45 #define TRACE WriteLog("SHELL32: %s", __FUNCTION__); WriteLog
    46 #define WARN WriteLog("WARNING: SHELL32: %s", __FUNCTION__); WriteLog
    47 #else
    48 #define TRACE 1 ? (void)0 : (void)((int (*)(char *, ...)) NULL)
    49 #define WARN 1 ? (void)0 : (void)((int (*)(char *, ...)) NULL)
    50 #endif
    51 
    5232#else
    5333#include "bitmaps/wine.xpm"

  • trunk/src/shlwapi/ordinal.c

    r7502 r7508  
    3232extern HMODULE SHLWAPI_hmpr = 0;
    3333extern HMODULE SHLWAPI_hmlang = 0;
    34 #undef FIXME
    35 #ifdef DEBUG
    36 // PH 2001-11-30
    37 // this macro definition causes the control leave the scope of a
    38 // non-curly-braced preceeding if statement. Therefore,
    39 //   if (p!=NULL)
    40 //      TRACE("p->a=%d", p->a)
    41 // crashes.
    42 //
    43 // !!! ENSURE TRACES AND FIXMES WITH PRECEEDING IF STATEMENT
    44 // !!! ARE PUT INTO CURLY BRACES
    45 #define FIXME WriteLog("FIXME %s", __FUNCTION__); WriteLog
    46 #else
    47 #define FIXME 1 ? (void)0 : (void)((int (*)(char *, ...)) NULL)
    48 #endif
    4934#else
    5035extern HINSTANCE shlwapi_hInstance;

  • trunk/src/shlwapi/path.c

    r7502 r7508  
    2828#include "debugtools.h"
    2929
    30 
    31 #ifdef __WIN32OS2__
    32 #undef FIXME
    33 #ifdef DEBUG
    34 // PH 2001-11-30
    35 // this macro definition causes the control leave the scope of a
    36 // non-curly-braced preceeding if statement. Therefore,
    37 //   if (p!=NULL)
    38 //      TRACE("p->a=%d", p->a)
    39 // crashes.
    40 //
    41 // !!! ENSURE TRACES AND FIXMES WITH PRECEEDING IF STATEMENT
    42 // !!! ARE PUT INTO CURLY BRACES
    43 #define FIXME WriteLog("FIXME %s", __FUNCTION__); WriteLog
    44 #else
    45 #define FIXME 1 ? (void)0 : (void)((int (*)(char *, ...)) NULL)
    46 #endif
    47 #endif
    4830
    4931DEFAULT_DEBUG_CHANNEL(shell);

  • trunk/src/shlwapi/reg.c

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

  • trunk/src/shlwapi/string.c

    r7502 r7508  
    2828#include "wine/unicode.h"
    2929#include "debugtools.h"
    30 
    31 #ifdef __WIN32OS2__
    32 #undef FIXME
    33 #ifdef DEBUG
    34 // PH 2001-11-30
    35 // this macro definition causes the control leave the scope of a
    36 // non-curly-braced preceeding if statement. Therefore,
    37 //   if (p!=NULL)
    38 //      TRACE("p->a=%d", p->a)
    39 // crashes.
    40 //
    41 // !!! ENSURE TRACES AND FIXMES WITH PRECEEDING IF STATEMENT
    42 // !!! ARE PUT INTO CURLY BRACES
    43 #define FIXME WriteLog("FIXME %s", __FUNCTION__); WriteLog
    44 #else
    45 #define FIXME 1 ? (void)0 : (void)((int (*)(char *, ...)) NULL)
    46 #endif
    47 #endif
    4830
    4931DEFAULT_DEBUG_CHANNEL(shell);

  • trunk/src/shlwapi/url.c

    r7502 r7508  
    1111#include "shlwapi.h"
    1212#include "debugtools.h"
    13 
    14 #ifdef __WIN32OS2__
    15 #undef FIXME
    16 #ifdef DEBUG
    17 // PH 2001-11-30
    18 // this macro definition causes the control leave the scope of a
    19 // non-curly-braced preceeding if statement. Therefore,
    20 //   if (p!=NULL)
    21 //      TRACE("p->a=%d", p->a)
    22 // crashes.
    23 //
    24 // !!! ENSURE TRACES AND FIXMES WITH PRECEEDING IF STATEMENT
    25 // !!! ARE PUT INTO CURLY BRACES
    26 #define FIXME WriteLog("FIXME %s", __FUNCTION__); WriteLog
    27 #else
    28 #define FIXME 1 ? (void)0 : (void)((int (*)(char *, ...)) NULL)
    29 #endif
    30 #endif
    3113
    3214DEFAULT_DEBUG_CHANNEL(shell);
    … …  
    197179
    198180    if(dwFlags & ~URL_ESCAPE_SPACES_ONLY)
    199     {
    200       FIXME("Unimplemented flags: %08lx\n", dwFlags);
    201     }
     181        FIXME("Unimplemented flags: %08lx\n", dwFlags);
    202182
    203183    for(src = pszUrl; *src; src++) {
Note: See TracChangeset for help on using the changeset viewer.