Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-24 01:15:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

[SHELL32]

Browse source 
- Use correct constants for return values. Patch by Ivan Rodionov.
CORE-7543 #resolve

svn path=/trunk/; revision=60844
This commit is contained in:
Thomas Faber 2013-11-03 12:03:54 +00:00
parent 40ad1910ef
commit c919f3e29f
9 changed files with 21 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
reactos/dll/win32/shell32/folders/printers.cpp
View file

@ -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;
}
/**************************************************************************

4
reactos/dll/win32/shell32/pidl.cpp
View file

@ -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:

2
reactos/dll/win32/shell32/shell32_main.cpp
View file

@ -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;
}

8
reactos/dll/win32/shell32/shelllink.cpp
View file

@ -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)

2
reactos/dll/win32/shell32/shellole.cpp
View file

@ -422,7 +422,7 @@ HRESULT WINAPI SHCreateDefClassObject(
if (FAILED(hResult))
return hResult;
*ppv = pcf;
return NOERROR;
return S_OK;
}
/*************************************************************************

13
reactos/dll/win32/shell32/shellord.cpp
View file

@ -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;
}
/*************************************************************************

2
reactos/dll/win32/shell32/shellpath.cpp
View file

@ -1811,7 +1811,7 @@ HRESULT WINAPI SHGetFolderLocation(
}
}
if(*ppidl)
hr = NOERROR;
hr = S_OK;
TRACE("-- (new pidl %p)\n",*ppidl);
return hr;

4
reactos/dll/win32/shell32/shlfsbind.cpp
View file

@ -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;
}

4
reactos/dll/win32/shell32/shlview.cpp
View file

@ -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)