3 Nov
2013
3 Nov
'13
12:03 p.m.
Author: tfaber
Date: Sun Nov 3 12:03:54 2013
New Revision: 60844
URL: http://svn.reactos.org/svn/reactos?rev=60844&view=rev
Log:
[SHELL32]
- Use correct constants for return values. Patch by Ivan Rodionov.
CORE-7543 #resolve
Modified:
trunk/reactos/dll/win32/shell32/folders/printers.cpp
trunk/reactos/dll/win32/shell32/pidl.cpp
trunk/reactos/dll/win32/shell32/shell32_main.cpp
trunk/reactos/dll/win32/shell32/shelllink.cpp
trunk/reactos/dll/win32/shell32/shellole.cpp
trunk/reactos/dll/win32/shell32/shellord.cpp
trunk/reactos/dll/win32/shell32/shellpath.cpp
trunk/reactos/dll/win32/shell32/shlfsbind.cpp
trunk/reactos/dll/win32/shell32/shlview.cpp
Modified: trunk/reactos/dll/win32/shell32/folders/printers.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/…
==============================================================================
--- trunk/reactos/dll/win32/shell32/folders/printers.cpp [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/folders/printers.cpp [iso-8859-1] Sun Nov 3 12:03:54
2013
@@ -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;
}
/**************************************************************************
Modified: trunk/reactos/dll/win32/shell32/pidl.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/pidl.cpp…
==============================================================================
--- trunk/reactos/dll/win32/shell32/pidl.cpp [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/pidl.cpp [iso-8859-1] Sun Nov 3 12:03:54 2013
@@ -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:
Modified: trunk/reactos/dll/win32/shell32/shell32_main.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_…
==============================================================================
--- trunk/reactos/dll/win32/shell32/shell32_main.cpp [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/shell32_main.cpp [iso-8859-1] Sun Nov 3 12:03:54
2013
@@ -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;
}
Modified: trunk/reactos/dll/win32/shell32/shelllink.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shelllin…
==============================================================================
--- trunk/reactos/dll/win32/shell32/shelllink.cpp [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/shelllink.cpp [iso-8859-1] Sun Nov 3 12:03:54 2013
@@ -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)
Modified: trunk/reactos/dll/win32/shell32/shellole.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shellole…
==============================================================================
--- trunk/reactos/dll/win32/shell32/shellole.cpp [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/shellole.cpp [iso-8859-1] Sun Nov 3 12:03:54 2013
@@ -422,7 +422,7 @@
if (FAILED(hResult))
return hResult;
*ppv = pcf;
- return NOERROR;
+ return S_OK;
}
/*************************************************************************
Modified: trunk/reactos/dll/win32/shell32/shellord.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shellord…
==============================================================================
--- trunk/reactos/dll/win32/shell32/shellord.cpp [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/shellord.cpp [iso-8859-1] Sun Nov 3 12:03:54 2013
@@ -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[] = {
@@ -1250,8 +1250,9 @@
*
*/
BOOL WINAPI FileIconInit(BOOL bFullInit)
-{ FIXME("(%s)\n", bFullInit ? "true" : "false");
- return 0;
+{
+ FIXME("(%s)\n", bFullInit ? "true" : "false");
+ return FALSE;
}
/*************************************************************************
Modified: trunk/reactos/dll/win32/shell32/shellpath.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shellpat…
==============================================================================
--- trunk/reactos/dll/win32/shell32/shellpath.cpp [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/shellpath.cpp [iso-8859-1] Sun Nov 3 12:03:54 2013
@@ -1811,7 +1811,7 @@
}
}
if(*ppidl)
- hr = NOERROR;
+ hr = S_OK;
TRACE("-- (new pidl %p)\n",*ppidl);
return hr;
Modified: trunk/reactos/dll/win32/shell32/shlfsbind.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shlfsbin…
==============================================================================
--- trunk/reactos/dll/win32/shell32/shlfsbind.cpp [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/shlfsbind.cpp [iso-8859-1] Sun Nov 3 12:03:54 2013
@@ -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;
}
Modified: trunk/reactos/dll/win32/shell32/shlview.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shlview.…
==============================================================================
--- trunk/reactos/dll/win32/shell32/shlview.cpp [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/shlview.cpp [iso-8859-1] Sun Nov 3 12:03:54 2013
@@ -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)