Re: [ros-dev] [ros-diffs] [tfaber] 57485: [SHELL32] - Fix what might finally be the last missing this- instances left over from the C++ conversion (used a regex this time)
Shouldn't member variables rather be prefixed with m_? Am 05.10.2012 01:46, schrieb tfa...@svn.reactos.org: Author: tfaber Date: Thu Oct 4 23:46:59 2012 New Revision: 57485 URL: http://svn.reactos.org/svn/reactos?rev=57485view=rev Log: [SHELL32] - Fix what might finally be the last missing this- instances left over from the C++ conversion (used a regex this time) Modified: trunk/reactos/dll/win32/shell32/folders/cpanel.cpp trunk/reactos/dll/win32/shell32/folders/mycomp.cpp trunk/reactos/dll/win32/shell32/shlview.cpp Modified: trunk/reactos/dll/win32/shell32/folders/cpanel.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/cpanel.cpp?rev=57485r1=57484r2=57485view=diff == --- trunk/reactos/dll/win32/shell32/folders/cpanel.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/cpanel.cpp [iso-8859-1] Thu Oct 4 23:46:59 2012 @@ -540,7 +540,7 @@ // pObj = (IContextMenu *)this; this-apidl = apidl; -cidl = cidl; +this-cidl = cidl; pObj-AddRef(); hr = S_OK; } else if (IsEqualIID(riid, IID_IDataObject) (cidl = 1)) { Modified: trunk/reactos/dll/win32/shell32/folders/mycomp.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/mycomp.cpp?rev=57485r1=57484r2=57485view=diff == --- trunk/reactos/dll/win32/shell32/folders/mycomp.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/mycomp.cpp [iso-8859-1] Thu Oct 4 23:46:59 2012 @@ -728,7 +728,7 @@ wcscpy(sName, lpName); SHFree(sName); -sName = sName; +this-sName = sName; TRACE(result %s\n, debugstr_w(sName)); return S_OK; } Modified: trunk/reactos/dll/win32/shell32/shlview.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shlview.cpp?rev=57485r1=57484r2=57485view=diff == --- trunk/reactos/dll/win32/shell32/shlview.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shlview.cpp [iso-8859-1] Thu Oct 4 23:46:59 2012 @@ -2828,7 +2828,7 @@ FIXME(partial stub: %p %08x %08x %p\n, this, aspects, advf, pAdvSink); /* FIXME: we set the AdviseSink, but never use it to send any advice */ -pAdvSink = pAdvSink; +this-pAdvSink = pAdvSink; dwAspects = aspects; dwAdvf = advf; ___ Ros-dev mailing list Ros-dev@reactos.org http://www.reactos.org/mailman/listinfo/ros-dev
Re: [ros-dev] [ros-diffs] [tfaber] 57485: [SHELL32] - Fix what might finally be the last missing this- instances left over from the C++ conversion (used a regex this time)
Yeah, that would certainly be a more sensible convention. I wasn't planning on refactoring all of shell32 any time soon though. :| We accept patches™ ;) On 2012-10-05 10:30, Timo Kreuzer wrote: Shouldn't member variables rather be prefixed with m_? Am 05.10.2012 01:46, schrieb tfa...@svn.reactos.org: Author: tfaber Date: Thu Oct 4 23:46:59 2012 New Revision: 57485 URL: http://svn.reactos.org/svn/reactos?rev=57485view=rev Log: [SHELL32] - Fix what might finally be the last missing this- instances left over from the C++ conversion (used a regex this time) Modified: trunk/reactos/dll/win32/shell32/folders/cpanel.cpp trunk/reactos/dll/win32/shell32/folders/mycomp.cpp trunk/reactos/dll/win32/shell32/shlview.cpp Modified: trunk/reactos/dll/win32/shell32/folders/cpanel.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/cpanel.cpp?rev=57485r1=57484r2=57485view=diff == --- trunk/reactos/dll/win32/shell32/folders/cpanel.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/cpanel.cpp [iso-8859-1] Thu Oct 4 23:46:59 2012 @@ -540,7 +540,7 @@ // pObj = (IContextMenu *)this; this-apidl = apidl; -cidl = cidl; +this-cidl = cidl; pObj-AddRef(); hr = S_OK; } else if (IsEqualIID(riid, IID_IDataObject) (cidl = 1)) { Modified: trunk/reactos/dll/win32/shell32/folders/mycomp.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/mycomp.cpp?rev=57485r1=57484r2=57485view=diff == --- trunk/reactos/dll/win32/shell32/folders/mycomp.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/mycomp.cpp [iso-8859-1] Thu Oct 4 23:46:59 2012 @@ -728,7 +728,7 @@ wcscpy(sName, lpName); SHFree(sName); -sName = sName; +this-sName = sName; TRACE(result %s\n, debugstr_w(sName)); return S_OK; } Modified: trunk/reactos/dll/win32/shell32/shlview.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shlview.cpp?rev=57485r1=57484r2=57485view=diff == --- trunk/reactos/dll/win32/shell32/shlview.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shlview.cpp [iso-8859-1] Thu Oct 4 23:46:59 2012 @@ -2828,7 +2828,7 @@ FIXME(partial stub: %p %08x %08x %p\n, this, aspects, advf, pAdvSink); /* FIXME: we set the AdviseSink, but never use it to send any advice */ -pAdvSink = pAdvSink; +this-pAdvSink = pAdvSink; dwAspects = aspects; dwAdvf = advf; ___ Ros-dev mailing list Ros-dev@reactos.org http://www.reactos.org/mailman/listinfo/ros-dev
Re: [ros-dev] [ros-diffs] [tfaber] 57485: [SHELL32] - Fix what might finally be the last missing this- instances left over from the C++ conversion (used a regex this time)
Isn't there somewhere some compiler warning for such ambiguation? Le Fri, 05 Oct 2012 10:41:47 +0200, Thomas Faber thfa...@gmx.de a écrit : Yeah, that would certainly be a more sensible convention. I wasn't planning on refactoring all of shell32 any time soon though. :| We accept patches™ ;) On 2012-10-05 10:30, Timo Kreuzer wrote: Shouldn't member variables rather be prefixed with m_? Am 05.10.2012 01:46, schrieb tfa...@svn.reactos.org: Author: tfaber Date: Thu Oct 4 23:46:59 2012 New Revision: 57485 URL: http://svn.reactos.org/svn/reactos?rev=57485view=rev Log: [SHELL32] - Fix what might finally be the last missing this- instances left over from the C++ conversion (used a regex this time) Modified: trunk/reactos/dll/win32/shell32/folders/cpanel.cpp trunk/reactos/dll/win32/shell32/folders/mycomp.cpp trunk/reactos/dll/win32/shell32/shlview.cpp Modified: trunk/reactos/dll/win32/shell32/folders/cpanel.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/cpanel.cpp?rev=57485r1=57484r2=57485view=diff == --- trunk/reactos/dll/win32/shell32/folders/cpanel.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/cpanel.cpp [iso-8859-1] Thu Oct 4 23:46:59 2012 @@ -540,7 +540,7 @@ // pObj = (IContextMenu *)this; this-apidl = apidl; -cidl = cidl; +this-cidl = cidl; pObj-AddRef(); hr = S_OK; } else if (IsEqualIID(riid, IID_IDataObject) (cidl = 1)) { Modified: trunk/reactos/dll/win32/shell32/folders/mycomp.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/mycomp.cpp?rev=57485r1=57484r2=57485view=diff == --- trunk/reactos/dll/win32/shell32/folders/mycomp.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/mycomp.cpp [iso-8859-1] Thu Oct 4 23:46:59 2012 @@ -728,7 +728,7 @@ wcscpy(sName, lpName); SHFree(sName); -sName = sName; +this-sName = sName; TRACE(result %s\n, debugstr_w(sName)); return S_OK; } Modified: trunk/reactos/dll/win32/shell32/shlview.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shlview.cpp?rev=57485r1=57484r2=57485view=diff == --- trunk/reactos/dll/win32/shell32/shlview.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shlview.cpp [iso-8859-1] Thu Oct 4 23:46:59 2012 @@ -2828,7 +2828,7 @@ FIXME(partial stub: %p %08x %08x %p\n, this, aspects, advf, pAdvSink); /* FIXME: we set the AdviseSink, but never use it to send any advice */ -pAdvSink = pAdvSink; +this-pAdvSink = pAdvSink; dwAspects = aspects; dwAdvf = advf; ___ Ros-dev mailing list Ros-dev@reactos.org http://www.reactos.org/mailman/listinfo/ros-dev ___ Ros-dev mailing list Ros-dev@reactos.org http://www.reactos.org/mailman/listinfo/ros-dev
Re: [ros-dev] [ros-diffs] [tfaber] 57485: [SHELL32] - Fix what might finally be the last missing this- instances left over from the C++ conversion (used a regex this time)
Isn't there somewhere some compiler warning for such ambiguation? Clang has an option -Wself-assign which should warn about it. ___ Ros-dev mailing list Ros-dev@reactos.org http://www.reactos.org/mailman/listinfo/ros-dev