diff --git a/dlls/shell32/folders.c b/dlls/shell32/folders.c
index 379ffdec2e3..6f49a3df124 100644
--- a/dlls/shell32/folders.c
+++ b/dlls/shell32/folders.c
@@ -381,7 +381,7 @@ static HRESULT WINAPI IExtractIconW_fnGetIconLocation(
 	}
 
 	TRACE("-- %s %x\n", debugstr_w(szIconFile), *piIndex);
-	return NOERROR;
+	return S_OK;
 }
 
 /**************************************************************************
diff --git a/dlls/shell32/pidl.c b/dlls/shell32/pidl.c
index c394e5bd3a7..2130b49ff99 100644
--- a/dlls/shell32/pidl.c
+++ b/dlls/shell32/pidl.c
@@ -1140,7 +1140,7 @@ HRESULT WINAPI SHGetDataFromIDListA(LPSHELLFOLDER psf, LPCITEMIDLIST pidl,
             lstrcpynA(pfd->cAlternateFileName, shortname, sizeof(pfd->cAlternateFileName));
         else
             pfd->cAlternateFileName[0] = '\0';
-        return NOERROR;
+        return S_OK;
 
     case SHGDFIL_NETRESOURCE:
     case SHGDFIL_DESCRIPTIONID:
@@ -1199,7 +1199,7 @@ HRESULT WINAPI SHGetDataFromIDListW(LPSHELLFOLDER psf, LPCITEMIDLIST pidl,
             pfd->cAlternateFileName[0] = '\0';
         else if (!MultiByteToWideChar(CP_ACP, 0, shortname, -1, pfd->cAlternateFileName, 14))
             pfd->cAlternateFileName[13] = 0;
-        return NOERROR;
+        return S_OK;
 
     case SHGDFIL_NETRESOURCE:
     case SHGDFIL_DESCRIPTIONID:
diff --git a/dlls/shell32/shell32_main.c b/dlls/shell32/shell32_main.c
index 2561f8c5bd1..5370b992a59 100644
--- a/dlls/shell32/shell32_main.c
+++ b/dlls/shell32/shell32_main.c
@@ -932,7 +932,7 @@ HRESULT WINAPI SHLoadInProc (REFCLSID rclsid)
     {
         IUnknown * pUnk = ptr;
         IUnknown_Release(pUnk);
-        return NOERROR;
+        return S_OK;
     }
     return DISP_E_MEMBERNOTFOUND;
 }
diff --git a/dlls/shell32/shelllink.c b/dlls/shell32/shelllink.c
index 1fb3fbdc8c8..e325e2e46d4 100644
--- a/dlls/shell32/shelllink.c
+++ b/dlls/shell32/shelllink.c
@@ -509,11 +509,11 @@ static HRESULT WINAPI IPersistFile_fnSave(IPersistFile* iface, LPCOLESTR pszFile
     return r;
 }
 
-static HRESULT WINAPI IPersistFile_fnSaveCompleted(IPersistFile* iface, LPCOLESTR pszFileName)
+static HRESULT WINAPI IPersistFile_fnSaveCompleted(IPersistFile* iface, LPCOLESTR filename)
 {
-	IShellLinkImpl *This = impl_from_IPersistFile(iface);
-	FIXME("(%p)->(%s)\n",This,debugstr_w(pszFileName));
-	return NOERROR;
+    IShellLinkImpl *This = impl_from_IPersistFile(iface);
+    FIXME("(%p)->(%s): stub\n", This, debugstr_w(filename));
+    return S_OK;
 }
 
 static HRESULT WINAPI IPersistFile_fnGetCurFile(IPersistFile* iface, LPOLESTR *filename)
@@ -1597,7 +1597,7 @@ static HRESULT WINAPI IShellLinkA_fnSetShowCmd(IShellLinkA *iface, INT iShowCmd)
     This->iShowCmd = iShowCmd;
     This->bDirty = TRUE;
 
-    return NOERROR;
+    return S_OK;
 }
 
 static HRESULT WINAPI IShellLinkA_fnGetIconLocation(IShellLinkA *iface, LPSTR pszIconPath,
@@ -1866,7 +1866,7 @@ static HRESULT WINAPI IShellLinkW_fnGetArguments(IShellLinkW * iface, LPWSTR psz
     if( This->sArgs )
         lstrcpynW( pszArgs, This->sArgs, cchMaxPath );
 
-    return NOERROR;
+    return S_OK;
 }
 
 static HRESULT WINAPI IShellLinkW_fnSetArguments(IShellLinkW * iface, LPCWSTR pszArgs)
diff --git a/dlls/shell32/shellole.c b/dlls/shell32/shellole.c
index 49491a0fbc8..fbf917d5915 100644
--- a/dlls/shell32/shellole.c
+++ b/dlls/shell32/shellole.c
@@ -507,7 +507,7 @@ HRESULT WINAPI SHCreateDefClassObject(
 	if (! IsEqualCLSID(riid, &IID_IClassFactory) ) return E_NOINTERFACE;
 	if (! (pcf = IDefClF_fnConstructor(lpfnCI, (PLONG)pcRefDll, riidInst))) return E_OUTOFMEMORY;
 	*ppv = pcf;
-	return NOERROR;
+	return S_OK;
 }
 
 /*************************************************************************
diff --git a/dlls/shell32/shellord.c b/dlls/shell32/shellord.c
index 5b74c37c938..05105c50f15 100644
--- a/dlls/shell32/shellord.c
+++ b/dlls/shell32/shellord.c
@@ -1162,7 +1162,7 @@ HRESULT WINAPI SHGetInstanceExplorer (IUnknown **lpUnknown)
 	  return E_FAIL;
 
 	IUnknown_AddRef(SHELL32_IExplorerInterface);
-	return NOERROR;
+	return S_OK;
 }
 /*************************************************************************
  * SHFreeUnusedLibraries			[SHELL32.123]
diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c
index f3490c159a3..71d82c81e35 100644
--- a/dlls/shell32/shellpath.c
+++ b/dlls/shell32/shellpath.c
@@ -2961,7 +2961,7 @@ HRESULT WINAPI SHGetFolderLocation(
         }
     }
     if(*ppidl)
-        hr = NOERROR;
+        hr = S_OK;
 
     TRACE("-- (new pidl %p)\n",*ppidl);
     return hr;
diff --git a/dlls/shell32/shlfsbind.c b/dlls/shell32/shlfsbind.c
index ff1301329bc..5988290efa8 100644
--- a/dlls/shell32/shlfsbind.c
+++ b/dlls/shell32/shlfsbind.c
@@ -166,7 +166,7 @@ static HRESULT WINAPI IFileSystemBindData_fnGetFindData(
         return E_INVALIDARG;
 
     *pfd = This->findFile;
-    return NOERROR;
+    return S_OK;
 }
 
 static HRESULT WINAPI IFileSystemBindData_fnSetFindData(
@@ -179,5 +179,5 @@ static HRESULT WINAPI IFileSystemBindData_fnSetFindData(
         This->findFile = *pfd;
     else
         memset(&This->findFile, 0, sizeof(WIN32_FIND_DATAW));
-    return NOERROR;
+    return S_OK;
 }
diff --git a/dlls/shell32/shlmenu.c b/dlls/shell32/shlmenu.c
index 4006807fe54..476cbec8671 100644
--- a/dlls/shell32/shlmenu.c
+++ b/dlls/shell32/shlmenu.c
@@ -184,7 +184,7 @@ static int FM_InitMenuPopup(HMENU hmenu, LPCITEMIDLIST pAlternatePidl)
 	      LPITEMIDLIST pidlTemp = NULL;
 	      ULONG ulFetched;
 
-	      while ((!bAbortInit) && (NOERROR == IEnumIDList_Next(lpe,1,&pidlTemp,&ulFetched)))
+	      while ((!bAbortInit) && (S_OK == IEnumIDList_Next(lpe,1,&pidlTemp,&ulFetched)))
 	      {
 		if (SUCCEEDED (IShellFolder_GetAttributesOf(lpsf, 1, (LPCITEMIDLIST*)&pidlTemp, &ulItemAttr)))
 		{
diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c
index 787a1b74588..191dfb1eec9 100644
--- a/dlls/shell32/shlview.c
+++ b/dlls/shell32/shlview.c
@@ -1998,7 +1998,7 @@ static HRESULT WINAPI IShellView_fnGetCurrentInfo(IShellView2 *iface, LPFOLDERSE
 	if (!lpfs) return E_INVALIDARG;
 
 	*lpfs = This->FolderSettings;
-	return NOERROR;
+	return S_OK;
 }
 
 static HRESULT WINAPI IShellView_fnAddPropertySheetPages(IShellView2 *iface, DWORD dwReserved,
@@ -2559,7 +2559,7 @@ static HRESULT WINAPI ISVDropSource_QueryContinueDrag(
 	else if (!(grfKeyState & MK_LBUTTON) && !(grfKeyState & MK_RBUTTON))
 	  return DRAGDROP_S_DROP;
 	else
-	  return NOERROR;
+	  return S_OK;
 }
 
 static HRESULT WINAPI ISVDropSource_GiveFeedback(
diff --git a/dlls/shell32/shv_bg_cmenu.c b/dlls/shell32/shv_bg_cmenu.c
index b8f16b3a2d1..c2c6f080fa1 100644
--- a/dlls/shell32/shv_bg_cmenu.c
+++ b/dlls/shell32/shv_bg_cmenu.c
@@ -372,7 +372,7 @@ static HRESULT WINAPI ISVBgCm_fnInvokeCommand(
         if (lpSV)
 	  IShellView_Release(lpSV);	/* QueryActiveShellView does AddRef */
 
-	return NOERROR;
+	return S_OK;
 }
 
 /**************************************************************************
@@ -401,7 +401,7 @@ static HRESULT WINAPI ISVBgCm_fnGetCommandString(
 	        !strcmp((LPSTR)idCommand, CMDSTR_VIEWDETAILSA) ||
 	        !strcmp((LPSTR)idCommand, CMDSTR_NEWFOLDERA))
 	    {
-	      return NOERROR;
+	      return S_OK;
 	    }
 	  }
 	}
diff --git a/dlls/shell32/shv_item_cmenu.c b/dlls/shell32/shv_item_cmenu.c
index f1a96cfeb24..4c05460db6a 100644
--- a/dlls/shell32/shv_item_cmenu.c
+++ b/dlls/shell32/shv_item_cmenu.c
@@ -535,7 +535,7 @@ static HRESULT WINAPI ISvItemCm_fnInvokeCommand(
             return E_FAIL;
         }
     }
-    return NOERROR;
+    return S_OK;
 }
 
 /**************************************************************************
@@ -567,7 +567,7 @@ static HRESULT WINAPI ISvItemCm_fnGetCommandString(
 	    {
 	    case FCIDM_SHVIEW_RENAME:
 	        strcpy(lpszName, "rename");
-	        hr = NOERROR;
+	        hr = S_OK;
 	        break;
 	    }
 	    break;
@@ -579,14 +579,14 @@ static HRESULT WINAPI ISvItemCm_fnGetCommandString(
 	    {
 	    case FCIDM_SHVIEW_RENAME:
                 MultiByteToWideChar( CP_ACP, 0, "rename", -1, (LPWSTR)lpszName, uMaxNameLen );
-	        hr = NOERROR;
+	        hr = S_OK;
 	        break;
 	    }
 	    break;
 
 	  case GCS_VALIDATEA:
 	  case GCS_VALIDATEW:
-	    hr = NOERROR;
+	    hr = S_OK;
 	    break;
 	}
 	TRACE("-- (%p)->(name=%s)\n",This, lpszName);