Index: dll/win32/shell32/folders/printers.cpp
===================================================================
--- dll/win32/shell32/folders/printers.cpp	(revision 60823)
+++ dll/win32/shell32/folders/printers.cpp	(working copy)
@@ -112,7 +112,7 @@
     *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;
 }
 
 /**************************************************************************
Index: dll/win32/shell32/pidl.cpp
===================================================================
--- dll/win32/shell32/pidl.cpp	(revision 60823)
+++ dll/win32/shell32/pidl.cpp	(working copy)
@@ -1102,7 +1102,7 @@
                 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 @@
                 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:
Index: dll/win32/shell32/shell32_main.cpp
===================================================================
--- dll/win32/shell32/shell32_main.cpp	(revision 60823)
+++ dll/win32/shell32/shell32_main.cpp	(working copy)
@@ -1013,7 +1013,7 @@
 
     CoCreateInstance(rclsid, NULL, CLSCTX_INPROC_SERVER, IID_IUnknown, (void **)&ptr);
     if (ptr)
-        return NOERROR;
+        return S_OK;
     return DISP_E_MEMBERNOTFOUND;
 }
 
Index: dll/win32/shell32/shelllink.cpp
===================================================================
--- dll/win32/shell32/shelllink.cpp	(revision 60823)
+++ dll/win32/shell32/shelllink.cpp	(working copy)
@@ -221,7 +221,7 @@
 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 @@
     /* copy last saved filename */
     wcscpy(*ppszFileName, sLinkPath);
 
-    return NOERROR;
+    return S_OK;
 }
 
 /************************************************************************
@@ -1087,7 +1087,7 @@
     this->iShowCmd = iShowCmd;
     bDirty = TRUE;
 
-    return NOERROR;
+    return S_OK;
 }
 
 static HRESULT SHELL_PidlGeticonLocationA(IShellFolder* psf, LPCITEMIDLIST pidl,
@@ -1340,7 +1340,7 @@
     if (sArgs)
         lstrcpynW(pszArgs, sArgs, cchMaxPath);
 
-    return NOERROR;
+    return S_OK;
 }
 
 HRESULT WINAPI CShellLink::SetArguments(LPCWSTR pszArgs)
Index: dll/win32/shell32/shellole.cpp
===================================================================
--- dll/win32/shell32/shellole.cpp	(revision 60823)
+++ dll/win32/shell32/shellole.cpp	(working copy)
@@ -422,7 +422,7 @@
     if (FAILED(hResult))
         return hResult;
     *ppv = pcf;
-    return NOERROR;
+    return S_OK;
 }
 
 /*************************************************************************
Index: dll/win32/shell32/shellord.cpp
===================================================================
--- dll/win32/shell32/shellord.cpp	(revision 60823)
+++ dll/win32/shell32/shellord.cpp	(working copy)
@@ -1070,7 +1070,7 @@
       return E_FAIL;
 
     SHELL32_IExplorerInterface->AddRef();
-    return NOERROR;
+    return S_OK;
 }
 /*************************************************************************
  * SHFreeUnusedLibraries            [SHELL32.123]
@@ -1097,7 +1097,7 @@
 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 @@
     LPPOINT lppt)
 {
     FIXME("%p %p stub\n",himlTrack, lppt);
-  return 0;
+  return FALSE;
 }
 /*************************************************************************
  * DAD_ShowDragImage                [SHELL32.137]
@@ -1157,7 +1157,7 @@
 BOOL WINAPI DAD_ShowDragImage(BOOL bShow)
 {
     FIXME("0x%08x stub\n",bShow);
-    return 0;
+    return FALSE;
 }
 
 static const WCHAR szwCabLocation[] = {
@@ -1251,7 +1251,7 @@
  */
 BOOL WINAPI FileIconInit(BOOL bFullInit)
 {    FIXME("(%s)\n", bFullInit ? "true" : "false");
-    return 0;
+    return FALSE;
 }
 
 /*************************************************************************
Index: dll/win32/shell32/shellpath.cpp
===================================================================
--- dll/win32/shell32/shellpath.cpp	(revision 60823)
+++ dll/win32/shell32/shellpath.cpp	(working copy)
@@ -1811,7 +1811,7 @@
         }
     }
     if(*ppidl)
-        hr = NOERROR;
+        hr = S_OK;
 
     TRACE("-- (new pidl %p)\n",*ppidl);
     return hr;
Index: dll/win32/shell32/shlfsbind.cpp
===================================================================
--- dll/win32/shell32/shlfsbind.cpp	(revision 60823)
+++ dll/win32/shell32/shlfsbind.cpp	(working copy)
@@ -149,7 +149,7 @@
         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 @@
         memcpy(&findFile, pfd, sizeof(WIN32_FIND_DATAW));
     else
         memset(&findFile, 0, sizeof(WIN32_FIND_DATAW));
-    return NOERROR;
+    return S_OK;
 }
Index: dll/win32/shell32/shlview.cpp
===================================================================
--- dll/win32/shell32/shlview.cpp	(revision 60823)
+++ dll/win32/shell32/shlview.cpp	(working copy)
@@ -2008,7 +2008,7 @@
         return E_INVALIDARG;
 
     *lpfs = FolderSettings;
-    return NOERROR;
+    return S_OK;
 }
 
 HRESULT WINAPI CDefView::AddPropertySheetPages(DWORD dwReserved, LPFNADDPROPSHEETPAGE lpfn, LPARAM lparam)
@@ -2499,7 +2499,7 @@
     else if (!(grfKeyState & MK_LBUTTON) && !(grfKeyState & MK_RBUTTON))
         return DRAGDROP_S_DROP;
     else
-        return NOERROR;
+        return S_OK;
 }
 
 HRESULT WINAPI CDefView::GiveFeedback(DWORD dwEffect)