ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

shell32: Use S_OK as successful return code name.

This commit is contained in:
Nikolay Sivov 2012-01-08 03:31:54 +03:00 committed by Alexandre Julliard
parent 1e86436628
commit a4dd8fb6a8
12 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/shell32/folders.c
View File

@ -381,7 +381,7 @@ static HRESULT WINAPI IExtractIconW_fnGetIconLocation(
} }
TRACE("-- %s %x\n", debugstr_w(szIconFile), *piIndex); TRACE("-- %s %x\n", debugstr_w(szIconFile), *piIndex);
return NOERROR; return S_OK;
} }
/************************************************************************** /**************************************************************************

4
dlls/shell32/pidl.c
View File

@ -1140,7 +1140,7 @@ HRESULT WINAPI SHGetDataFromIDListA(LPSHELLFOLDER psf, LPCITEMIDLIST pidl,
lstrcpynA(pfd->cAlternateFileName, shortname, sizeof(pfd->cAlternateFileName)); lstrcpynA(pfd->cAlternateFileName, shortname, sizeof(pfd->cAlternateFileName));
else else
pfd->cAlternateFileName[0] = '\0'; pfd->cAlternateFileName[0] = '\0';
return NOERROR; return S_OK;
case SHGDFIL_NETRESOURCE: case SHGDFIL_NETRESOURCE:
case SHGDFIL_DESCRIPTIONID: case SHGDFIL_DESCRIPTIONID:
@ -1199,7 +1199,7 @@ HRESULT WINAPI SHGetDataFromIDListW(LPSHELLFOLDER psf, LPCITEMIDLIST pidl,
pfd->cAlternateFileName[0] = '\0'; pfd->cAlternateFileName[0] = '\0';
else if (!MultiByteToWideChar(CP_ACP, 0, shortname, -1, pfd->cAlternateFileName, 14)) else if (!MultiByteToWideChar(CP_ACP, 0, shortname, -1, pfd->cAlternateFileName, 14))
pfd->cAlternateFileName[13] = 0; pfd->cAlternateFileName[13] = 0;
return NOERROR; return S_OK;
case SHGDFIL_NETRESOURCE: case SHGDFIL_NETRESOURCE:
case SHGDFIL_DESCRIPTIONID: case SHGDFIL_DESCRIPTIONID:

2
dlls/shell32/shell32_main.c
View File

@ -932,7 +932,7 @@ HRESULT WINAPI SHLoadInProc (REFCLSID rclsid)
{ {
IUnknown * pUnk = ptr; IUnknown * pUnk = ptr;
IUnknown_Release(pUnk); IUnknown_Release(pUnk);
return NOERROR; return S_OK;
} }
return DISP_E_MEMBERNOTFOUND; return DISP_E_MEMBERNOTFOUND;
} }

12
dlls/shell32/shelllink.c
View File

@ -509,11 +509,11 @@ static HRESULT WINAPI IPersistFile_fnSave(IPersistFile* iface, LPCOLESTR pszFile
return r; 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); IShellLinkImpl *This = impl_from_IPersistFile(iface);
FIXME("(%p)->(%s)\n",This,debugstr_w(pszFileName)); FIXME("(%p)->(%s): stub\n", This, debugstr_w(filename));
return NOERROR; return S_OK;
} }
static HRESULT WINAPI IPersistFile_fnGetCurFile(IPersistFile* iface, LPOLESTR *filename) 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->iShowCmd = iShowCmd;
This->bDirty = TRUE; This->bDirty = TRUE;
return NOERROR; return S_OK;
} }
static HRESULT WINAPI IShellLinkA_fnGetIconLocation(IShellLinkA *iface, LPSTR pszIconPath, 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 ) if( This->sArgs )
lstrcpynW( pszArgs, This->sArgs, cchMaxPath ); lstrcpynW( pszArgs, This->sArgs, cchMaxPath );
return NOERROR; return S_OK;
} }
static HRESULT WINAPI IShellLinkW_fnSetArguments(IShellLinkW * iface, LPCWSTR pszArgs) static HRESULT WINAPI IShellLinkW_fnSetArguments(IShellLinkW * iface, LPCWSTR pszArgs)

2
dlls/shell32/shellole.c
View File

@ -507,7 +507,7 @@ HRESULT WINAPI SHCreateDefClassObject(
if (! IsEqualCLSID(riid, &IID_IClassFactory) ) return E_NOINTERFACE; if (! IsEqualCLSID(riid, &IID_IClassFactory) ) return E_NOINTERFACE;
if (! (pcf = IDefClF_fnConstructor(lpfnCI, (PLONG)pcRefDll, riidInst))) return E_OUTOFMEMORY; if (! (pcf = IDefClF_fnConstructor(lpfnCI, (PLONG)pcRefDll, riidInst))) return E_OUTOFMEMORY;
*ppv = pcf; *ppv = pcf;
return NOERROR; return S_OK;
} }
/************************************************************************* /*************************************************************************

2
dlls/shell32/shellord.c
View File

@ -1162,7 +1162,7 @@ HRESULT WINAPI SHGetInstanceExplorer (IUnknown **lpUnknown)
return E_FAIL; return E_FAIL;
IUnknown_AddRef(SHELL32_IExplorerInterface); IUnknown_AddRef(SHELL32_IExplorerInterface);
return NOERROR; return S_OK;
} }
/************************************************************************* /*************************************************************************
* SHFreeUnusedLibraries [SHELL32.123] * SHFreeUnusedLibraries [SHELL32.123]

2
dlls/shell32/shellpath.c
View File

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

4
dlls/shell32/shlfsbind.c
View File

@ -166,7 +166,7 @@ static HRESULT WINAPI IFileSystemBindData_fnGetFindData(
return E_INVALIDARG; return E_INVALIDARG;
*pfd = This->findFile; *pfd = This->findFile;
return NOERROR; return S_OK;
} }
static HRESULT WINAPI IFileSystemBindData_fnSetFindData( static HRESULT WINAPI IFileSystemBindData_fnSetFindData(
@ -179,5 +179,5 @@ static HRESULT WINAPI IFileSystemBindData_fnSetFindData(
This->findFile = *pfd; This->findFile = *pfd;
else else
memset(&This->findFile, 0, sizeof(WIN32_FIND_DATAW)); memset(&This->findFile, 0, sizeof(WIN32_FIND_DATAW));
return NOERROR; return S_OK;
} }

2
dlls/shell32/shlmenu.c
View File

@ -184,7 +184,7 @@ static int FM_InitMenuPopup(HMENU hmenu, LPCITEMIDLIST pAlternatePidl)
LPITEMIDLIST pidlTemp = NULL; LPITEMIDLIST pidlTemp = NULL;
ULONG ulFetched; 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))) if (SUCCEEDED (IShellFolder_GetAttributesOf(lpsf, 1, (LPCITEMIDLIST*)&pidlTemp, &ulItemAttr)))
{ {

4
dlls/shell32/shlview.c
View File

@ -1998,7 +1998,7 @@ static HRESULT WINAPI IShellView_fnGetCurrentInfo(IShellView2 *iface, LPFOLDERSE
if (!lpfs) return E_INVALIDARG; if (!lpfs) return E_INVALIDARG;
*lpfs = This->FolderSettings; *lpfs = This->FolderSettings;
return NOERROR; return S_OK;
} }
static HRESULT WINAPI IShellView_fnAddPropertySheetPages(IShellView2 *iface, DWORD dwReserved, 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)) else if (!(grfKeyState & MK_LBUTTON) && !(grfKeyState & MK_RBUTTON))
return DRAGDROP_S_DROP; return DRAGDROP_S_DROP;
else else
return NOERROR; return S_OK;
} }
static HRESULT WINAPI ISVDropSource_GiveFeedback( static HRESULT WINAPI ISVDropSource_GiveFeedback(

4
dlls/shell32/shv_bg_cmenu.c
View File

@ -372,7 +372,7 @@ static HRESULT WINAPI ISVBgCm_fnInvokeCommand(
if (lpSV) if (lpSV)
IShellView_Release(lpSV); /* QueryActiveShellView does AddRef */ 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_VIEWDETAILSA) ||
!strcmp((LPSTR)idCommand, CMDSTR_NEWFOLDERA)) !strcmp((LPSTR)idCommand, CMDSTR_NEWFOLDERA))
{ {
return NOERROR; return S_OK;
} }
} }
} }

8
dlls/shell32/shv_item_cmenu.c
View File

@ -535,7 +535,7 @@ static HRESULT WINAPI ISvItemCm_fnInvokeCommand(
return E_FAIL; return E_FAIL;
} }
} }
return NOERROR; return S_OK;
} }
/************************************************************************** /**************************************************************************
@ -567,7 +567,7 @@ static HRESULT WINAPI ISvItemCm_fnGetCommandString(
{ {
case FCIDM_SHVIEW_RENAME: case FCIDM_SHVIEW_RENAME:
strcpy(lpszName, "rename"); strcpy(lpszName, "rename");
hr = NOERROR; hr = S_OK;
break; break;
} }
break; break;
@ -579,14 +579,14 @@ static HRESULT WINAPI ISvItemCm_fnGetCommandString(
{ {
case FCIDM_SHVIEW_RENAME: case FCIDM_SHVIEW_RENAME:
MultiByteToWideChar( CP_ACP, 0, "rename", -1, (LPWSTR)lpszName, uMaxNameLen ); MultiByteToWideChar( CP_ACP, 0, "rename", -1, (LPWSTR)lpszName, uMaxNameLen );
hr = NOERROR; hr = S_OK;
break; break;
} }
break; break;
case GCS_VALIDATEA: case GCS_VALIDATEA:
case GCS_VALIDATEW: case GCS_VALIDATEW:
hr = NOERROR; hr = S_OK;
break; break;
} }
TRACE("-- (%p)->(name=%s)\n",This, lpszName); TRACE("-- (%p)->(name=%s)\n",This, lpszName);