diff --git a/reactos/dll/win32/shell32/folders/printers.cpp b/reactos/dll/win32/shell32/folders/printers.cpp
index cca99ffad28..a6092e27452 100644
--- a/reactos/dll/win32/shell32/folders/printers.cpp
+++ b/reactos/dll/win32/shell32/folders/printers.cpp
@@ -112,7 +112,7 @@ HRESULT WINAPI CPrintersExtractIconW::GetIconLocation(UINT uFlags,        /* GIL
     *piIndex = -IDI_SHELL_PRINTERS_FOLDER; /* FIXME: other icons for default, network, print to file */
 
     TRACE("-- %s %x\n", debugstr_w(szIconFile), *piIndex);
-    return NOERROR;
+    return S_OK;
 }
 
 /**************************************************************************
diff --git a/reactos/dll/win32/shell32/pidl.cpp b/reactos/dll/win32/shell32/pidl.cpp
index c9766a83c10..60a82b88a59 100644
--- a/reactos/dll/win32/shell32/pidl.cpp
+++ b/reactos/dll/win32/shell32/pidl.cpp
@@ -1102,7 +1102,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:
@@ -1161,7 +1161,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/reactos/dll/win32/shell32/shell32_main.cpp b/reactos/dll/win32/shell32/shell32_main.cpp
index 7515a678429..7e2c27c3fb6 100644
--- a/reactos/dll/win32/shell32/shell32_main.cpp
+++ b/reactos/dll/win32/shell32/shell32_main.cpp
@@ -1013,7 +1013,7 @@ EXTERN_C HRESULT WINAPI SHLoadInProc (REFCLSID rclsid)
 
     CoCreateInstance(rclsid, NULL, CLSCTX_INPROC_SERVER, IID_IUnknown, (void **)&ptr);
     if (ptr)
-        return NOERROR;
+        return S_OK;
     return DISP_E_MEMBERNOTFOUND;
 }
 
diff --git a/reactos/dll/win32/shell32/shelllink.cpp b/reactos/dll/win32/shell32/shelllink.cpp
index fe98bb37ba7..2a9156a3823 100644
--- a/reactos/dll/win32/shell32/shelllink.cpp
+++ b/reactos/dll/win32/shell32/shelllink.cpp
@@ -221,7 +221,7 @@ HRESULT WINAPI CShellLink::Save(LPCOLESTR pszFileName, BOOL fRemember)
 HRESULT WINAPI CShellLink::SaveCompleted(LPCOLESTR pszFileName)
 {
     FIXME("(%p)->(%s)\n", this, debugstr_w(pszFileName));
-    return NOERROR;
+    return S_OK;
 }
 
 HRESULT WINAPI CShellLink::GetCurFile(LPOLESTR *ppszFileName)
@@ -244,7 +244,7 @@ HRESULT WINAPI CShellLink::GetCurFile(LPOLESTR *ppszFileName)
     /* copy last saved filename */
     wcscpy(*ppszFileName, sLinkPath);
 
-    return NOERROR;
+    return S_OK;
 }
 
 /************************************************************************
@@ -1087,7 +1087,7 @@ HRESULT WINAPI CShellLink::SetShowCmd(INT iShowCmd)
     this->iShowCmd = iShowCmd;
     bDirty = TRUE;
 
-    return NOERROR;
+    return S_OK;
 }
 
 static HRESULT SHELL_PidlGeticonLocationA(IShellFolder* psf, LPCITEMIDLIST pidl,
@@ -1340,7 +1340,7 @@ HRESULT WINAPI CShellLink::GetArguments(LPWSTR pszArgs, INT cchMaxPath)
     if (sArgs)
         lstrcpynW(pszArgs, sArgs, cchMaxPath);
 
-    return NOERROR;
+    return S_OK;
 }
 
 HRESULT WINAPI CShellLink::SetArguments(LPCWSTR pszArgs)
diff --git a/reactos/dll/win32/shell32/shellole.cpp b/reactos/dll/win32/shell32/shellole.cpp
index e9c176b4fe3..286a2afd2a9 100644
--- a/reactos/dll/win32/shell32/shellole.cpp
+++ b/reactos/dll/win32/shell32/shellole.cpp
@@ -422,7 +422,7 @@ HRESULT WINAPI SHCreateDefClassObject(
     if (FAILED(hResult))
         return hResult;
     *ppv = pcf;
-    return NOERROR;
+    return S_OK;
 }
 
 /*************************************************************************
diff --git a/reactos/dll/win32/shell32/shellord.cpp b/reactos/dll/win32/shell32/shellord.cpp
index b83b6adc7eb..77491c2e1af 100644
--- a/reactos/dll/win32/shell32/shellord.cpp
+++ b/reactos/dll/win32/shell32/shellord.cpp
@@ -1070,7 +1070,7 @@ HRESULT WINAPI SHGetInstanceExplorer (IUnknown **lpUnknown)
       return E_FAIL;
 
     SHELL32_IExplorerInterface->AddRef();
-    return NOERROR;
+    return S_OK;
 }
 /*************************************************************************
  * SHFreeUnusedLibraries            [SHELL32.123]
@@ -1097,7 +1097,7 @@ void WINAPI SHFreeUnusedLibraries (void)
 BOOL WINAPI DAD_AutoScroll(HWND hwnd, AUTO_SCROLL_DATA *samples, const POINT * pt)
 {
     FIXME("hwnd = %p %p %p\n",hwnd,samples,pt);
-    return 0;
+    return FALSE;
 }
 /*************************************************************************
  * DAD_DragEnter                [SHELL32.130]
@@ -1146,7 +1146,7 @@ BOOL WINAPI DAD_SetDragImage(
     LPPOINT lppt)
 {
     FIXME("%p %p stub\n",himlTrack, lppt);
-  return 0;
+  return FALSE;
 }
 /*************************************************************************
  * DAD_ShowDragImage                [SHELL32.137]
@@ -1157,7 +1157,7 @@ BOOL WINAPI DAD_SetDragImage(
 BOOL WINAPI DAD_ShowDragImage(BOOL bShow)
 {
     FIXME("0x%08x stub\n",bShow);
-    return 0;
+    return FALSE;
 }
 
 static const WCHAR szwCabLocation[] = {
@@ -1250,8 +1250,9 @@ BOOL WINAPI WriteCabinetState(CABINETSTATE *cs)
  *
  */
 BOOL WINAPI FileIconInit(BOOL bFullInit)
-{    FIXME("(%s)\n", bFullInit ? "true" : "false");
-    return 0;
+{
+    FIXME("(%s)\n", bFullInit ? "true" : "false");
+    return FALSE;
 }
 
 /*************************************************************************
diff --git a/reactos/dll/win32/shell32/shellpath.cpp b/reactos/dll/win32/shell32/shellpath.cpp
index 74f70d05040..685d16926eb 100644
--- a/reactos/dll/win32/shell32/shellpath.cpp
+++ b/reactos/dll/win32/shell32/shellpath.cpp
@@ -1811,7 +1811,7 @@ HRESULT WINAPI SHGetFolderLocation(
         }
     }
     if(*ppidl)
-        hr = NOERROR;
+        hr = S_OK;
 
     TRACE("-- (new pidl %p)\n",*ppidl);
     return hr;
diff --git a/reactos/dll/win32/shell32/shlfsbind.cpp b/reactos/dll/win32/shell32/shlfsbind.cpp
index b3179a03045..842820e914f 100644
--- a/reactos/dll/win32/shell32/shlfsbind.cpp
+++ b/reactos/dll/win32/shell32/shlfsbind.cpp
@@ -149,7 +149,7 @@ HRESULT WINAPI IFileSystemBindDataImpl::GetFindData(WIN32_FIND_DATAW *pfd)
         return E_INVALIDARG;
 
     memcpy(pfd, &findFile, sizeof(WIN32_FIND_DATAW));
-    return NOERROR;
+    return S_OK;
 }
 
 HRESULT WINAPI IFileSystemBindDataImpl::SetFindData(const WIN32_FIND_DATAW *pfd)
@@ -160,5 +160,5 @@ HRESULT WINAPI IFileSystemBindDataImpl::SetFindData(const WIN32_FIND_DATAW *pfd)
         memcpy(&findFile, pfd, sizeof(WIN32_FIND_DATAW));
     else
         memset(&findFile, 0, sizeof(WIN32_FIND_DATAW));
-    return NOERROR;
+    return S_OK;
 }
diff --git a/reactos/dll/win32/shell32/shlview.cpp b/reactos/dll/win32/shell32/shlview.cpp
index aaad9e17013..07b5cddbb8e 100644
--- a/reactos/dll/win32/shell32/shlview.cpp
+++ b/reactos/dll/win32/shell32/shlview.cpp
@@ -2008,7 +2008,7 @@ HRESULT WINAPI CDefView::GetCurrentInfo(LPFOLDERSETTINGS lpfs)
         return E_INVALIDARG;
 
     *lpfs = FolderSettings;
-    return NOERROR;
+    return S_OK;
 }
 
 HRESULT WINAPI CDefView::AddPropertySheetPages(DWORD dwReserved, LPFNADDPROPSHEETPAGE lpfn, LPARAM lparam)
@@ -2499,7 +2499,7 @@ HRESULT WINAPI CDefView::QueryContinueDrag(BOOL fEscapePressed, DWORD grfKeyStat
     else if (!(grfKeyState & MK_LBUTTON) && !(grfKeyState & MK_RBUTTON))
         return DRAGDROP_S_DROP;
     else
-        return NOERROR;
+        return S_OK;
 }
 
 HRESULT WINAPI CDefView::GiveFeedback(DWORD dwEffect)