Changeset 7502 for trunk/src


Ignore:
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
Files:
20 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/comctl32/comctl32undoc.c

    r6810 r7502  
    4141//#undef TRACE
    4242#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
    4352#define FIXME WriteLog("FIXME COMCTL32: %s", __FUNCTION__); WriteLog
    4453#else
    … …  
    13491358    for (i = 0; i < hdsa->nItemSize; i += 4) {
    13501359        p = *(DWORD**)((char *) pSrc + i);
    1351         if (IsBadStringPtrA ((char*)p, 256))
    1352             TRACE("-- %d=%p\n", i, (DWORD*)p);
    1353         else
    1354             TRACE("-- %d=%p [%s]\n", i, p, debugstr_a((char*)p));
     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        }
    13551368    }
    13561369   

  • trunk/src/comctl32/imagelist.c

    r6709 r7502  
    4040#undef TRACE
    4141#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
    4251#define TRACE WriteLog("COMCTL32: %s", __FUNCTION__); WriteLog
    4352#define FIXME WriteLog("FIXME COMCTL32: %s", __FUNCTION__); WriteLog

  • trunk/src/msvfw32/drawdib.c

    r6712 r7502  
    4848#undef TRACE
    4949#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
    5059#define TRACE WriteLog("MSVFW32: %s", __FUNCTION__); WriteLog
    5160#define FIXME WriteLog("FIXME MSVFW32: %s", __FUNCTION__); WriteLog
    … …  
    176185                  lpbi->biClrImportant);
    177186
    178         if (wFlags & ~(DDF_BUFFER))
     187        if (wFlags & ~(DDF_BUFFER))
     188        {
    179189                FIXME("wFlags == 0x%08x not handled\n", wFlags & ~(DDF_BUFFER));
    180 
     190        }
     191                                                   
    181192        whdd = (WINE_HDD*)GlobalLock16(hdd);
    182193        if (!whdd) return FALSE;
    … …  
    297308        if (wFlags & ~(DDF_SAME_HDC | DDF_SAME_DRAW | DDF_NOTKEYFRAME |
    298309                                   DDF_UPDATE | DDF_DONTDRAW))
    299                 FIXME("wFlags == 0x%08lx not handled\n",(DWORD)wFlags);
     310        {
     311          FIXME("wFlags == 0x%08lx not handled\n",(DWORD)wFlags);
     312        }
    300313
    301314        if (!lpBits) {

  • trunk/src/msvfw32/msvideo_main.c

    r6712 r7502  
    4141#undef TRACE
    4242#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
    4352#define TRACE WriteLog("MSVFW32: %s", __FUNCTION__); WriteLog
    4453#define FIXME WriteLog("FIXME MSVFW32: %s", __FUNCTION__); WriteLog

  • trunk/src/ole32/antimoniker.c

    r6711 r7502  
    1919#undef TRACE
    2020#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
    2130#define TRACE WriteLog("OLE32: %s", __FUNCTION__); WriteLog
    2231#define FIXME WriteLog("FIXME OLE32: %s", __FUNCTION__); WriteLog

  • trunk/src/ole32/bindctx.c

    r6711 r7502  
    2121#undef TRACE
    2222#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
    2332#define TRACE WriteLog("OLE32: %s", __FUNCTION__); WriteLog
    2433#define FIXME WriteLog("FIXME OLE32: %s", __FUNCTION__); WriteLog

  • trunk/src/ole32/compobj.c

    r7355 r7502  
    4141#undef TRACE
    4242#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
    4352#define TRACE WriteLog("OLE32: %s", __FUNCTION__); WriteLog
    4453#define FIXME WriteLog("FIXME OLE32: %s", __FUNCTION__); WriteLog
    … …  
    14931502
    14941503  if (pServerInfo!=NULL)
     1504  {
    14951505    FIXME("() non-NULL pServerInfo not supported!\n");
     1506  }
    14961507
    14971508  /*

  • trunk/src/ole32/compositemoniker.c

    r6711 r7502  
    2121#undef TRACE
    2222#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
    2332#define TRACE WriteLog("OLE32: %s", __FUNCTION__); WriteLog
    2433#define FIXME WriteLog("FIXME OLE32: %s", __FUNCTION__); WriteLog

  • trunk/src/ole32/oleobj.c

    r6711 r7502  
    1717#undef TRACE
    1818#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
    1928#define TRACE WriteLog("OLE32: %s", __FUNCTION__); WriteLog
    2029#define FIXME WriteLog("FIXME OLE32: %s", __FUNCTION__); WriteLog

  • trunk/src/ole32/stg_bigblockfile.c

    r6711 r7502  
    4848#undef TRACE
    4949#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
    5059#define TRACE WriteLog("OLE32: %s", __FUNCTION__); WriteLog
    5160#define FIXME WriteLog("FIXME OLE32: %s", __FUNCTION__); WriteLog

  • trunk/src/ole32/storage32.c

    r7343 r7502  
    4141#undef TRACE
    4242#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
    4352#define TRACE WriteLog("OLE32: %s", __FUNCTION__); WriteLog
    4453#define FIXME WriteLog("FIXME OLE32: %s", __FUNCTION__); WriteLog
    … …  
    13791388
    13801389  if ((ciidExclude != 0) || (rgiidExclude != NULL) || (snbExclude != NULL))
     1390  {
    13811391    FIXME("Exclude option not implemented\n");
     1392  }
    13821393
    13831394  TRACE("(%p, %ld, %p, %p, %p)\n",
    … …  
    53485359
    53495360  if (grfMode & STGM_TRANSACTED)
     5361  {
    53505362    FIXME("Transacted mode not implemented.\n");
     5363  }
    53515364
    53525365  /*
    … …  
    59545967  /* All other cases */
    59555968  if (stgm & ~ (STGM_CREATE|STGM_CONVERT))
    5956         FIXME("unhandled storage mode : 0x%08lx\n",stgm & ~ (STGM_CREATE|STGM_CONVERT));
     5969  {
     5970    FIXME("unhandled storage mode : 0x%08lx\n",stgm & ~ (STGM_CREATE|STGM_CONVERT));
     5971  }
    59575972  return CREATE_NEW;
    59585973}

  • trunk/src/oleaut32/typelib.c

    r7501 r7502  
    39113911        WARN("Could not search inherited interface!\n");
    39123912    } else
    3913         WARN("no names found\n");
     3913    {
     3914      WARN("no names found\n");
     3915    }
    39143916    return DISP_E_UNKNOWNNAME;
    39153917}

  • trunk/src/shell32/pidl.c

    r7359 r7502  
    797797              LPITEMIDLIST, pidl)
    798798{
     799#ifdef __WIN32OS2__
     800  return HEAP_free(pidl);
     801#else
    799802  if(!pidl)
    800803    return FALSE;
    801804  SHFree(pidl);
    802805  return TRUE;
     806#endif
    803807}
    804808/*************************************************************************

  • trunk/src/shell32/shelllink.c

    r7343 r7502  
    3434#undef TRACE
    3535#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
    3645#define TRACE WriteLog("SHELL32: %s", __FUNCTION__); WriteLog
    3746#define WARN WriteLog("WARNING: SHELL32: %s", __FUNCTION__); WriteLog

  • trunk/src/shell32/shellord.c

    r7103 r7502  
    2424#include "debugtools.h"
    2525#include "winnls.h"
     26
     27#ifdef __WIN32OS2__
     28#include "heapstring.h"
     29#else
    2630#include "heap.h"
     31#endif
    2732
    2833#include "shlwapi.h"
    … …  
    347352        TRACE("%p\n",x);
    348353#endif
    349         HeapFree(GetProcessHeap(), 0, x);
     354 
     355#if __WIN32OS2_
     356  HEAP_free(x);
     357#else
     358  HeapFree(GetProcessHeap(), 0, x);
     359#endif
    350360}
    351361
    … …  
    361371{
    362372        LPBYTE ret;
    363 
     373 
     374#ifdef __WIN32OS2__
     375#if MEM_DEBUG
     376        ret = (LPVOID) HEAP_malloc(len+6);
     377#else
     378        ret = (LPVOID) HEAP_malloc(len);
     379#endif
     380#else
    364381#if MEM_DEBUG
    365382        ret = (LPVOID) HeapAlloc(GetProcessHeap(),0,len+6);
    366383#else
    367384        ret = (LPVOID) HeapAlloc(GetProcessHeap(),0,len);
     385#endif
    368386#endif
    369387

  • trunk/src/shlwapi/ordinal.c

    r6712 r7502  
    3434#undef FIXME
    3535#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
    3645#define FIXME WriteLog("FIXME %s", __FUNCTION__); WriteLog
    3746#else

  • trunk/src/shlwapi/path.c

    r6712 r7502  
    3232#undef FIXME
    3333#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
    3443#define FIXME WriteLog("FIXME %s", __FUNCTION__); WriteLog
    3544#else

  • trunk/src/shlwapi/reg.c

    r6712 r7502  
    2020#undef FIXME
    2121#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
    2231#define FIXME WriteLog("FIXME %s", __FUNCTION__); WriteLog
    2332#else

  • trunk/src/shlwapi/string.c

    r6712 r7502  
    3232#undef FIXME
    3333#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
    3443#define FIXME WriteLog("FIXME %s", __FUNCTION__); WriteLog
    3544#else

  • trunk/src/shlwapi/url.c

    r6712 r7502  
    1515#undef FIXME
    1616#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
    1726#define FIXME WriteLog("FIXME %s", __FUNCTION__); WriteLog
    1827#else
    … …  
    188197
    189198    if(dwFlags & ~URL_ESCAPE_SPACES_ONLY)
    190         FIXME("Unimplemented flags: %08lx\n", dwFlags);
     199    {
     200      FIXME("Unimplemented flags: %08lx\n", dwFlags);
     201    }
    191202
    192203    for(src = pszUrl; *src; src++) {
Note: See TracChangeset for help on using the changeset viewer.