Re: [ros-dev] [ros-diffs] [tkreuzer] 47484: - add explicit braces to avoid ambiguous 'else' - fix deprecated conversion from string constant to 'char*'

[Gregor Schneider]

Unlikely it will get lost considering this header:

/*
 * ReactOS Explorer
 *
 * Copyright 2009 Andrew Hill <ash77 at domain reactos.org>

Best regards,

Gregor

2010/5/31 Ged Murphy [e-mail]
> This is Wine code, it'll get lost in the next sync
>
> On 31 May 2010 05:13, [e-mail] wrote:
> > Author: tkreuzer
> > Date: Mon May 31 06:13:40 2010
> > New Revision: 47484
> >
> > URL: http://svn.reactos.org/svn/reactos?rev=47484&view=rev
> > Log:
> > add explicit braces to avoid ambiguous 'else'
> > fix deprecated conversion from string constant to 'char*'
> >
> > Modified:
> >    trunk/reactos/dll/win32/browseui/internettoolbar.cpp
> >
> > Modified: trunk/reactos/dll/win32/browseui/internettoolbar.cpp
> > URL:
> > http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/internet...
> >
> > ==============================================================================
> > --- trunk/reactos/dll/win32/browseui/internettoolbar.cpp [iso-8859-1]
> > (original)
> > +++ trunk/reactos/dll/win32/browseui/internettoolbar.cpp [iso-8859-1] Mon
> > May 31 06:13:40 2010
> > @@ -414,10 +414,16 @@
> >                        {
> >                        SMINFO *infoPtr = (SMINFO *)lParam;
> >                        if ((infoPtr->dwMask & SMIM_FLAGS) != 0)
> >                   {
> >                          if (psmd->uId == FCIDM_MENU_FAVORITES)
> >                           {
> >                                  infoPtr->dwFlags |=
> >
> > SMIF_DROPCASCADE;
> >                           else{
> >                                   infoPtr->dwFlags |=
> >
> > SMIF_TRACKPOPUP;}
> >                           }
> >                           else
> >                           {
> >                                   infoPtr->dwFlags |=
> >
> > SMIF_TRACKPOPUP;
> >                           }
> >                   }
> >                  if ((infoPtr->dwMask & SMIM_ICON) != 0)
> >                          infoPtr->iIcon = -1;
> >                  }
> >
> > @@ -1213,7 +1219,7 @@
> >        CComPtr<IObjectWithSite>
> >  objectWithSite;
> >        CComPtr<IContextMenu>
> > contextMenu;
> >        CMINVOKECOMMANDINFO
> > commandInfo;
> >   char
> > *searchGUID = "{169A0691-8DF9-11d1-A1C4-00C04FD75D13}";
> >   const char
> >
> > *searchGUID = "{169A0691-8DF9-11d1-A1C4-00C04FD75D13}";
> >      HRESULT
> >   hResult;
> >  // TODO: Query shell if this command is enabled first
>
> Ros-dev mailing list
> [e-mail]
> http://www.reactos.org/mailman/listinfo/ros-dev