From e5a0755bc2f8129cb854367740a02c859555c033 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Fri, 20 Jul 2012 15:55:05 +0200 Subject: new does not return null Change-Id: Iea00f7c6435c6ae3ccbb2f97ab4407df8b86c54b --- dtrans/source/win32/dtobj/XTDataObject.cxx | 10 +++--- embedserv/source/inprocserv/dllentry.cxx | 6 ---- .../source/win32/shlxthandler/ooofilt/ooofilt.cxx | 36 ++++++++-------------- .../win32/shlxthandler/prophdl/propertyhdl.cxx | 3 -- shell/source/win32/shlxthandler/shlxthdl.cxx | 3 -- tools/source/fsys/wntmsc.cxx | 5 +-- xmerge/source/activesync/XMergeFactory.cpp | 6 ---- xmerge/source/activesync/XMergeSync.cpp | 6 ---- 8 files changed, 18 insertions(+), 57 deletions(-) diff --git a/dtrans/source/win32/dtobj/XTDataObject.cxx b/dtrans/source/win32/dtobj/XTDataObject.cxx index ec3d20189685..a28f86635c99 100644 --- a/dtrans/source/win32/dtobj/XTDataObject.cxx +++ b/dtrans/source/win32/dtobj/XTDataObject.cxx @@ -496,10 +496,9 @@ STDMETHODIMP CXTDataObject::EnumFormatEtc( if ( DATADIR_GET == dwDirection ) { *ppenumFormatetc = new CEnumFormatEtc( this, m_FormatEtcContainer ); - if ( NULL != *ppenumFormatetc ) - static_cast< LPUNKNOWN >( *ppenumFormatetc )->AddRef( ); + static_cast< LPUNKNOWN >( *ppenumFormatetc )->AddRef( ); - hr = ( NULL != *ppenumFormatetc ) ? S_OK : E_OUTOFMEMORY; + hr = S_OK; } else hr = E_INVALIDARG; @@ -832,10 +831,9 @@ STDMETHODIMP CEnumFormatEtc::Clone( IEnumFORMATETC** ppenum ) return E_INVALIDARG; *ppenum = new CEnumFormatEtc( m_lpUnkOuter, m_FormatEtcContainer ); - if ( NULL != *ppenum ) - static_cast< LPUNKNOWN >( *ppenum )->AddRef( ); + static_cast< LPUNKNOWN >( *ppenum )->AddRef( ); - return ( NULL != *ppenum ) ? S_OK : E_OUTOFMEMORY; + return S_OK; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/embedserv/source/inprocserv/dllentry.cxx b/embedserv/source/inprocserv/dllentry.cxx index 6a43fce5396f..6daf9bf8026b 100644 --- a/embedserv/source/inprocserv/dllentry.cxx +++ b/embedserv/source/inprocserv/dllentry.cxx @@ -186,9 +186,6 @@ extern "C" STDAPI INPROC_DLLPUBLIC DllGetClassObject( REFCLSID rclsid, REFIID ri return E_NOINTERFACE; *ppv = new inprocserv::InprocEmbedProvider_Impl( rclsid ); - if ( *ppv == NULL ) - return E_OUTOFMEMORY; - ((LPUNKNOWN)*ppv)->AddRef(); return S_OK; } @@ -316,9 +313,6 @@ STDMETHODIMP InprocEmbedProvider_Impl::CreateInstance(IUnknown FAR* punkOuter, return CLASS_E_NOAGGREGATION; InprocEmbedDocument_Impl* pEmbedDocument = new InprocEmbedDocument_Impl( m_guid ); - if ( !pEmbedDocument ) - return E_OUTOFMEMORY; - pEmbedDocument->AddRef(); HRESULT hr = pEmbedDocument->Init(); if ( SUCCEEDED( hr ) ) diff --git a/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx b/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx index 9f37b3b62c0d..83df85f3981c 100644 --- a/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx +++ b/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx @@ -817,21 +817,16 @@ SCODE STDMETHODCALLTYPE COooFilterCF::CreateInstance( if ( 0 != pUnkOuter ) return CLASS_E_NOAGGREGATION; pIUnk = new COooFilter(); - if ( 0 != pIUnk ) + if ( SUCCEEDED( pIUnk->QueryInterface( riid , ppvObject ) ) ) { - if ( SUCCEEDED( pIUnk->QueryInterface( riid , ppvObject ) ) ) - { - // Release extra refcount from QueryInterface - pIUnk->Release(); - } - else - { - delete pIUnk; - return E_UNEXPECTED; - } + // Release extra refcount from QueryInterface + pIUnk->Release(); } else - return E_OUTOFMEMORY; + { + delete pIUnk; + return E_UNEXPECTED; + } return S_OK; } @@ -919,19 +914,14 @@ extern "C" SCODE STDMETHODCALLTYPE DllGetClassObject( } else return CLASS_E_CLASSNOTAVAILABLE; - if ( 0 != pResult ) + if( SUCCEEDED( pResult->QueryInterface( iid, ppvObj ) ) ) + // Release extra refcount from QueryInterface + pResult->Release(); + else { - if( SUCCEEDED( pResult->QueryInterface( iid, ppvObj ) ) ) - // Release extra refcount from QueryInterface - pResult->Release(); - else - { - delete pImpl; - return E_UNEXPECTED; - } + delete pImpl; + return E_UNEXPECTED; } - else - return E_OUTOFMEMORY; return S_OK; } //F------------------------------------------------------------------------- diff --git a/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx b/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx index 21a25132a773..009786794ee8 100644 --- a/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx +++ b/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx @@ -432,9 +432,6 @@ extern "C" STDAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void** ppv) return E_NOINTERFACE; IUnknown* pUnk = new CClassFactory( rclsid ); - if ( 0 == pUnk ) - return E_OUTOFMEMORY; - *ppv = pUnk; return S_OK; } diff --git a/shell/source/win32/shlxthandler/shlxthdl.cxx b/shell/source/win32/shlxthandler/shlxthdl.cxx index 21257c717c5c..b4e1d2197b31 100644 --- a/shell/source/win32/shlxthandler/shlxthdl.cxx +++ b/shell/source/win32/shlxthandler/shlxthdl.cxx @@ -402,9 +402,6 @@ extern "C" STDAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void** ppv) OutputDebugStringFormat( "DllGetClassObject: Create CLSID_THUMBVIEWER_HANDLER\n" ); IUnknown* pUnk = new CClassFactory(rclsid); - if (0 == pUnk) - return E_OUTOFMEMORY; - *ppv = pUnk; return S_OK; } diff --git a/tools/source/fsys/wntmsc.cxx b/tools/source/fsys/wntmsc.cxx index 80934116f50c..28593b7ec734 100644 --- a/tools/source/fsys/wntmsc.cxx +++ b/tools/source/fsys/wntmsc.cxx @@ -510,10 +510,7 @@ HRESULT SHResolvePath( HWND hwndOwner, LPCTSTR pszPath, LPITEMIDLIST *ppidl ) // First make a copy of the path pszPathCopy = new TCHAR[lstrlen(pszPath) + 1]; - if ( pszPathCopy ) - lstrcpy( pszPathCopy, pszPath ); - else - return E_OUTOFMEMORY; + lstrcpy( pszPathCopy, pszPath ); // Determine the first token diff --git a/xmerge/source/activesync/XMergeFactory.cpp b/xmerge/source/activesync/XMergeFactory.cpp index a2cb631a3cf1..486d128fc3a3 100644 --- a/xmerge/source/activesync/XMergeFactory.cpp +++ b/xmerge/source/activesync/XMergeFactory.cpp @@ -84,12 +84,6 @@ STDMETHODIMP CXMergeFactory::CreateInstance(IUnknown *pUnkOuter, REFIID iid, voi if (iid == IID_ICeFileFilter) { CXMergeFilter *pFilter = new CXMergeFilter(); - if(pFilter == NULL) - { - *ppvObject = NULL; - return E_OUTOFMEMORY; - } - HRESULT hr = pFilter->QueryInterface(iid, ppvObject); pFilter->Release(); diff --git a/xmerge/source/activesync/XMergeSync.cpp b/xmerge/source/activesync/XMergeSync.cpp index f4f39461d0de..8c8178c8e613 100644 --- a/xmerge/source/activesync/XMergeSync.cpp +++ b/xmerge/source/activesync/XMergeSync.cpp @@ -56,12 +56,6 @@ STDAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) { // Create the factory object CXMergeFactory *pFactory = new CXMergeFactory(); - if (pFactory == NULL) - { - *ppv = NULL; - return E_OUTOFMEMORY; - } - HRESULT hr = pFactory->QueryInterface(riid, ppv); pFactory->Release(); -- cgit