[SHELL32]

- Fix what might finally be the last missing "this->" instances left over from the C++ conversion (used a regex this time)

svn path=/trunk/; revision=57485

diff --git a/reactos/dll/win32/shell32/folders/cpanel.cpp b/reactos/dll/win32/shell32/folders/cpanel.cpp
index 367c5ac..12c9815 100644 (file)
--- a/reactos/dll/win32/shell32/folders/cpanel.cpp
+++ b/reactos/dll/win32/shell32/folders/cpanel.cpp
@@ -540,7 +540,7 @@ HRESULT WINAPI CControlPanelFolder::GetUIObjectOf(HWND hwndOwner,
             //
             pObj = (IContextMenu *)this;
             this->apidl = apidl;
             //
             pObj = (IContextMenu *)this;
             this->apidl = apidl;

-            cidl = cidl;
+            this->cidl = cidl;

             pObj->AddRef();
             hr = S_OK;
         } else if (IsEqualIID(riid, IID_IDataObject) && (cidl >= 1)) {
             pObj->AddRef();
             hr = S_OK;
         } else if (IsEqualIID(riid, IID_IDataObject) && (cidl >= 1)) {

diff --git a/reactos/dll/win32/shell32/folders/mycomp.cpp b/reactos/dll/win32/shell32/folders/mycomp.cpp
index 0dbd047..46fc206 100644 (file)
--- a/reactos/dll/win32/shell32/folders/mycomp.cpp
+++ b/reactos/dll/win32/shell32/folders/mycomp.cpp
@@ -728,7 +728,7 @@ HRESULT WINAPI CDrivesFolder::SetNameOf(HWND hwndOwner, LPCITEMIDLIST pidl,
 
     wcscpy(sName, lpName);
     SHFree(sName);
 
     wcscpy(sName, lpName);
     SHFree(sName);

-    sName = sName;
+    this->sName = sName;

     TRACE("result %s\n", debugstr_w(sName));
     return S_OK;
 }
     TRACE("result %s\n", debugstr_w(sName));
     return S_OK;
 }

diff --git a/reactos/dll/win32/shell32/shlview.cpp b/reactos/dll/win32/shell32/shlview.cpp
index 7f0aec4..707f2b8 100644 (file)
--- a/reactos/dll/win32/shell32/shlview.cpp
+++ b/reactos/dll/win32/shell32/shlview.cpp
@@ -2828,7 +2828,7 @@ HRESULT WINAPI CDefView::SetAdvise(DWORD aspects, DWORD advf, IAdviseSink *pAdvS
     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 */
     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;
 
     dwAspects = aspects;
     dwAdvf = advf;