vcl/win/app/saltimer.cxx | 1
vcl/win/dtrans/APNDataObject.cxx | 4
vcl/win/dtrans/DTransHelper.cxx | 3
vcl/win/dtrans/Fetc.cxx | 3
vcl/win/dtrans/FmtFilter.cxx | 22 ++---
vcl/win/dtrans/MtaOleClipb.cxx | 12 +-
vcl/win/dtrans/XTDataObject.cxx | 2
vcl/win/gdi/gdiimpl.cxx | 30 +++----
vcl/win/gdi/salbmp.cxx | 160 +++++++++++++++++++++------------------
vcl/win/gdi/salprn.cxx | 3
10 files changed, 132 insertions(+), 108 deletions(-)
New commits:
commit 8e4643d9653e18e5c1690289e72f589907550970
Author: Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Sat May 11 15:03:15 2024 +0100
Commit: Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Sat May 11 20:05:35 2024 +0200
WaE: C6011 Dereferencing NULL pointer warnings
Change-Id: I95441e62c33bdc5c22dad2fc25a072d9ce93e4d7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167514
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
diff --git a/vcl/win/gdi/gdiimpl.cxx b/vcl/win/gdi/gdiimpl.cxx
index ee85f7c341c2..2c4c9a38e121 100644
--- a/vcl/win/gdi/gdiimpl.cxx
+++ b/vcl/win/gdi/gdiimpl.cxx
@@ -545,20 +545,22 @@ void ImplDrawBitmap( HDC hDC, const SalTwoRect& rPosAry,
const WinSalBitmap& rSa
if( hDrawDIB )
{
- PBITMAPINFO pBI = static_cast<PBITMAPINFO>(GlobalLock(
hDrawDIB ));
- PBYTE pBits = reinterpret_cast<PBYTE>(pBI) +
pBI->bmiHeader.biSize +
- WinSalBitmap::ImplGetDIBColorCount(
hDrawDIB ) * sizeof( RGBQUAD );
- const int nOldStretchMode = SetStretchBltMode( hDC,
STRETCH_DELETESCANS );
-
- StretchDIBits( hDC,
- static_cast<int>(rPosAry.mnDestX),
static_cast<int>(rPosAry.mnDestY),
- static_cast<int>(rPosAry.mnDestWidth),
static_cast<int>(rPosAry.mnDestHeight),
- static_cast<int>(rPosAry.mnSrcX),
static_cast<int>(pBI->bmiHeader.biHeight - rPosAry.mnSrcHeight -
rPosAry.mnSrcY),
- static_cast<int>(rPosAry.mnSrcWidth),
static_cast<int>(rPosAry.mnSrcHeight),
- pBits, pBI, DIB_RGB_COLORS, nDrawMode );
-
- GlobalUnlock( hDrawDIB );
- SetStretchBltMode( hDC, nOldStretchMode );
+ if (PBITMAPINFO pBI = static_cast<PBITMAPINFO>(GlobalLock(
hDrawDIB )))
+ {
+ PBYTE pBits = reinterpret_cast<PBYTE>(pBI) +
pBI->bmiHeader.biSize +
+
WinSalBitmap::ImplGetDIBColorCount( hDrawDIB ) * sizeof( RGBQUAD );
+ const int nOldStretchMode = SetStretchBltMode( hDC,
STRETCH_DELETESCANS );
+
+ StretchDIBits( hDC,
+ static_cast<int>(rPosAry.mnDestX),
static_cast<int>(rPosAry.mnDestY),
+ static_cast<int>(rPosAry.mnDestWidth),
static_cast<int>(rPosAry.mnDestHeight),
+ static_cast<int>(rPosAry.mnSrcX),
static_cast<int>(pBI->bmiHeader.biHeight - rPosAry.mnSrcHeight -
rPosAry.mnSrcY),
+ static_cast<int>(rPosAry.mnSrcWidth),
static_cast<int>(rPosAry.mnSrcHeight),
+ pBits, pBI, DIB_RGB_COLORS, nDrawMode );
+
+ GlobalUnlock( hDrawDIB );
+ SetStretchBltMode( hDC, nOldStretchMode );
+ }
}
else if( hDrawDDB && !bPrintDDB )
{
diff --git a/vcl/win/gdi/salbmp.cxx b/vcl/win/gdi/salbmp.cxx
index c6bd5f3ae7a0..b4960d08c8b9 100644
--- a/vcl/win/gdi/salbmp.cxx
+++ b/vcl/win/gdi/salbmp.cxx
@@ -439,15 +439,18 @@ bool WinSalBitmap::Create( HANDLE hBitmap )
if( mhDIB )
{
- PBITMAPINFOHEADER pBIH = static_cast<PBITMAPINFOHEADER>(GlobalLock(
mhDIB ));
-
- maSize = Size( pBIH->biWidth, pBIH->biHeight );
- mnBitCount = pBIH->biBitCount;
+ if (PBITMAPINFOHEADER pBIH =
static_cast<PBITMAPINFOHEADER>(GlobalLock( mhDIB )))
+ {
+ maSize = Size( pBIH->biWidth, pBIH->biHeight );
+ mnBitCount = pBIH->biBitCount;
- if( mnBitCount )
- mnBitCount = ( mnBitCount <= 1 ) ? 1 : ( mnBitCount <= 4 ) ? 4 : (
mnBitCount <= 8 ) ? 8 : 24;
+ if( mnBitCount )
+ mnBitCount = ( mnBitCount <= 1 ) ? 1 : ( mnBitCount <= 4 ) ? 4
: ( mnBitCount <= 8 ) ? 8 : 24;
- GlobalUnlock( mhDIB );
+ GlobalUnlock( mhDIB );
+ }
+ else
+ bRet = false;
}
else if( mhDDB )
{
@@ -522,43 +525,45 @@ bool WinSalBitmap::Create( const SalBitmap& rSSalBitmap )
bool WinSalBitmap::Create( const SalBitmap& rSSalBmp, SalGraphics* pSGraphics )
{
- bool bRet = false;
-
const WinSalBitmap& rSalBmp = static_cast<const WinSalBitmap&>(rSSalBmp);
+ if(!rSalBmp.mhDIB)
+ return false;
+
+ PBITMAPINFO pBI = static_cast<PBITMAPINFO>(GlobalLock( rSalBmp.mhDIB ));
+ if (!pBI)
+ return false;
+
+ bool bRet = false;
WinSalGraphics* pGraphics = static_cast<WinSalGraphics*>(pSGraphics);
- if( rSalBmp.mhDIB )
- {
- PBITMAPINFO pBI = static_cast<PBITMAPINFO>(GlobalLock(
rSalBmp.mhDIB ));
- HDC hDC = pGraphics->getHDC();
- HBITMAP hNewDDB;
- BITMAP aDDBInfo;
- PBYTE pBits = reinterpret_cast<PBYTE>(pBI) +
pBI->bmiHeader.biSize +
- ImplGetDIBColorCount( rSalBmp.mhDIB ) * sizeof(
RGBQUAD );
+ HDC hDC = pGraphics->getHDC();
+ HBITMAP hNewDDB;
+ BITMAP aDDBInfo;
+ PBYTE pBits = reinterpret_cast<PBYTE>(pBI) +
pBI->bmiHeader.biSize +
+ ImplGetDIBColorCount( rSalBmp.mhDIB ) * sizeof(
RGBQUAD );
- if( pBI->bmiHeader.biBitCount == 1 )
- {
- hNewDDB = CreateBitmap( pBI->bmiHeader.biWidth,
pBI->bmiHeader.biHeight, 1, 1, nullptr );
+ if( pBI->bmiHeader.biBitCount == 1 )
+ {
+ hNewDDB = CreateBitmap( pBI->bmiHeader.biWidth,
pBI->bmiHeader.biHeight, 1, 1, nullptr );
- if( hNewDDB )
- SetDIBits( hDC, hNewDDB, 0, pBI->bmiHeader.biHeight, pBits,
pBI, DIB_RGB_COLORS );
- }
- else
- hNewDDB = CreateDIBitmap( hDC, &pBI->bmiHeader, CBM_INIT, pBits,
pBI, DIB_RGB_COLORS );
+ if( hNewDDB )
+ SetDIBits( hDC, hNewDDB, 0, pBI->bmiHeader.biHeight, pBits, pBI,
DIB_RGB_COLORS );
+ }
+ else
+ hNewDDB = CreateDIBitmap( hDC, &pBI->bmiHeader, CBM_INIT, pBits, pBI,
DIB_RGB_COLORS );
- GlobalUnlock( rSalBmp.mhDIB );
+ GlobalUnlock( rSalBmp.mhDIB );
- if( hNewDDB && GetObjectW( hNewDDB, sizeof( aDDBInfo ), &aDDBInfo ) )
- {
- mhDDB = hNewDDB;
- maSize = Size( aDDBInfo.bmWidth, aDDBInfo.bmHeight );
- mnBitCount = aDDBInfo.bmPlanes * aDDBInfo.bmBitsPixel;
+ if( hNewDDB && GetObjectW( hNewDDB, sizeof( aDDBInfo ), &aDDBInfo ) )
+ {
+ mhDDB = hNewDDB;
+ maSize = Size( aDDBInfo.bmWidth, aDDBInfo.bmHeight );
+ mnBitCount = aDDBInfo.bmPlanes * aDDBInfo.bmBitsPixel;
- bRet = true;
- }
- else if( hNewDDB )
- DeleteObject( hNewDDB );
+ bRet = true;
}
+ else if( hNewDDB )
+ DeleteObject( hNewDDB );
return bRet;
}
@@ -575,38 +580,40 @@ bool WinSalBitmap::Create(const SalBitmap& rSSalBmp,
vcl::PixelFormat eNewPixelF
if( mhDIB )
{
- PBITMAPINFO pBI = static_cast<PBITMAPINFO>(GlobalLock( mhDIB ));
- const int nLines = static_cast<int>(rSalBmp.maSize.Height());
- HDC hDC = GetDC( nullptr );
- PBYTE pBits = reinterpret_cast<PBYTE>(pBI) +
pBI->bmiHeader.biSize +
- ImplGetDIBColorCount( mhDIB ) * sizeof(
RGBQUAD );
- SalData* pSalData = GetSalData();
- HPALETTE hOldPal = nullptr;
-
- if ( pSalData->mhDitherPal )
+ if (PBITMAPINFO pBI = static_cast<PBITMAPINFO>(GlobalLock( mhDIB
)))
{
- hOldPal = SelectPalette( hDC, pSalData->mhDitherPal, TRUE );
- RealizePalette( hDC );
- }
+ const int nLines = static_cast<int>(rSalBmp.maSize.Height());
+ HDC hDC = GetDC( nullptr );
+ PBYTE pBits = reinterpret_cast<PBYTE>(pBI) +
pBI->bmiHeader.biSize +
+ ImplGetDIBColorCount( mhDIB ) * sizeof(
RGBQUAD );
+ SalData* pSalData = GetSalData();
+ HPALETTE hOldPal = nullptr;
+
+ if ( pSalData->mhDitherPal )
+ {
+ hOldPal = SelectPalette( hDC, pSalData->mhDitherPal, TRUE
);
+ RealizePalette( hDC );
+ }
- if( GetDIBits( hDC, rSalBmp.mhDDB, 0, nLines, pBits, pBI,
DIB_RGB_COLORS ) == nLines )
- {
- GlobalUnlock( mhDIB );
- maSize = rSalBmp.maSize;
- mnBitCount = vcl::pixelFormatBitCount(eNewPixelFormat);
- bRet = true;
- }
- else
- {
- GlobalUnlock( mhDIB );
- GlobalFree( mhDIB );
- mhDIB = nullptr;
- }
+ if( GetDIBits( hDC, rSalBmp.mhDDB, 0, nLines, pBits, pBI,
DIB_RGB_COLORS ) == nLines )
+ {
+ GlobalUnlock( mhDIB );
+ maSize = rSalBmp.maSize;
+ mnBitCount = vcl::pixelFormatBitCount(eNewPixelFormat);
+ bRet = true;
+ }
+ else
+ {
+ GlobalUnlock( mhDIB );
+ GlobalFree( mhDIB );
+ mhDIB = nullptr;
+ }
- if( hOldPal )
- SelectPalette( hDC, hOldPal, TRUE );
+ if( hOldPal )
+ SelectPalette( hDC, hOldPal, TRUE );
- ReleaseDC( nullptr, hDC );
+ ReleaseDC( nullptr, hDC );
+ }
}
}
@@ -634,11 +641,13 @@ bool WinSalBitmap::Create( const css::uno::Reference<
css::rendering::XBitmapCan
sal_uInt16 WinSalBitmap::ImplGetDIBColorCount( HGLOBAL hDIB )
{
+ if (!hDIB)
+ return 0;
+
sal_uInt16 nColors = 0;
- if( hDIB )
+ if (PBITMAPINFO pBI = static_cast<PBITMAPINFO>(GlobalLock( hDIB )))
{
- PBITMAPINFO pBI = static_cast<PBITMAPINFO>(GlobalLock( hDIB ));
if ( pBI->bmiHeader.biSize != sizeof( BITMAPCOREHEADER ) )
{
@@ -690,6 +699,9 @@ HGLOBAL WinSalBitmap::ImplCreateDIB(const Size& rSize,
vcl::PixelFormat ePixelFo
return hDIB;
PBITMAPINFO pBI = static_cast<PBITMAPINFO>( GlobalLock( hDIB ) );
+ if (!pBI)
+ return hDIB;
+
PBITMAPINFOHEADER pBIH = reinterpret_cast<PBITMAPINFOHEADER>( pBI );
pBIH->biSize = sizeof( BITMAPINFOHEADER );
@@ -763,11 +775,13 @@ HANDLE WinSalBitmap::ImplCopyDIBOrDDB( HANDLE hHdl, bool
bDIB )
BitmapBuffer* WinSalBitmap::AcquireBuffer( BitmapAccessMode /*nMode*/ )
{
+ if (!mhDIB)
+ return nullptr;
+
std::unique_ptr<BitmapBuffer> pBuffer;
- if( mhDIB )
+ if (PBITMAPINFO pBI = static_cast<PBITMAPINFO>(GlobalLock( mhDIB )))
{
- PBITMAPINFO pBI = static_cast<PBITMAPINFO>(GlobalLock( mhDIB
));
PBITMAPINFOHEADER pBIH = &pBI->bmiHeader;
if( pBIH->biPlanes == 1 )
@@ -857,11 +871,13 @@ void WinSalBitmap::ReleaseBuffer( BitmapBuffer* pBuffer,
BitmapAccessMode nMode
{
if( nMode == BitmapAccessMode::Write && !!pBuffer->maPalette )
{
- PBITMAPINFO pBI = static_cast<PBITMAPINFO>(GlobalLock(
mhDIB ));
- const sal_uInt16 nCount =
pBuffer->maPalette.GetEntryCount();
- const sal_uInt16 nDIBColorCount = ImplGetDIBColorCount(
mhDIB );
- memcpy( pBI->bmiColors,
pBuffer->maPalette.ImplGetColorBuffer(), std::min( nDIBColorCount, nCount ) *
sizeof( RGBQUAD ) );
- GlobalUnlock( mhDIB );
+ if (PBITMAPINFO pBI = static_cast<PBITMAPINFO>(GlobalLock(
mhDIB )))
+ {
+ const sal_uInt16 nCount =
pBuffer->maPalette.GetEntryCount();
+ const sal_uInt16 nDIBColorCount = ImplGetDIBColorCount(
mhDIB );
+ memcpy( pBI->bmiColors,
pBuffer->maPalette.ImplGetColorBuffer(), std::min( nDIBColorCount, nCount ) *
sizeof( RGBQUAD ) );
+ GlobalUnlock( mhDIB );
+ }
}
GlobalUnlock( mhDIB );
diff --git a/vcl/win/gdi/salprn.cxx b/vcl/win/gdi/salprn.cxx
index 0ff4a51bbc3e..80ea56f2e9f8 100644
--- a/vcl/win/gdi/salprn.cxx
+++ b/vcl/win/gdi/salprn.cxx
@@ -190,6 +190,7 @@ void WinSalInstance::GetPrinterQueueState(
SalPrinterQueueInfo* pInfo )
if( nBytes )
{
PRINTER_INFO_2W* pWinInfo2 =
static_cast<PRINTER_INFO_2W*>(std::malloc(nBytes));
+ assert(pWinInfo2 && "Don't handle OOM conditions");
if( GetPrinterW( hPrinter, 2, reinterpret_cast<LPBYTE>(pWinInfo2),
nBytes, &nBytes ) )
{
if( pWinInfo2->pDriverName )
@@ -305,7 +306,7 @@ static bool ImplTestSalJobSetup( WinSalInfoPrinter const *
pPrinter,
}
SalDriverData const * pSetupDriverData =
reinterpret_cast<SalDriverData const *>(pSetupData->GetDriverData());
if ( (pSetupData->GetSystem() == JOBSETUP_SYSTEM_WINDOWS) &&
- (pPrinter->maDriverName == pSetupData->GetDriver()) &&
+ (pPrinter && pPrinter->maDriverName == pSetupData->GetDriver()) &&
(pSetupData->GetDriverDataLen() > sizeof( SalDriverData )) &&
static_cast<tools::Long>(pSetupData->GetDriverDataLen() -
pSetupDriverData->mnDriverOffset) == nSysJobSize &&
pSetupDriverData->mnSysSignature == SAL_DRIVERDATA_SYSSIGN )
commit b901f746a2c2c7979cb2a06f3a165ff0dd41a36b
Author: Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Sat May 11 13:45:25 2024 +0100
Commit: Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Sat May 11 20:05:28 2024 +0200
WaE: C6011 Dereferencing NULL pointer warnings
Change-Id: Ic703c92165ba7f0a43d25bb2899b6455e2e2f312
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167513
Tested-by: Caolán McNamara <caolan.mcnam...@collabora.com>
Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
diff --git a/vcl/win/app/saltimer.cxx b/vcl/win/app/saltimer.cxx
index 74f4cc133f53..834b183476e5 100644
--- a/vcl/win/app/saltimer.cxx
+++ b/vcl/win/app/saltimer.cxx
@@ -45,6 +45,7 @@ void WinSalTimer::ImplStop()
if ( m_bSetTimerRunning )
{
m_bSetTimerRunning = false;
+ assert(pInst);
KillTimer( pInst->mhComWnd, m_aWmTimerId );
}
m_bDirectTimeout = false;
diff --git a/vcl/win/dtrans/APNDataObject.cxx b/vcl/win/dtrans/APNDataObject.cxx
index 2492647f26c5..e13561a87bc3 100644
--- a/vcl/win/dtrans/APNDataObject.cxx
+++ b/vcl/win/dtrans/APNDataObject.cxx
@@ -19,8 +19,8 @@
#include "APNDataObject.hxx"
#include <osl/diagnose.h>
-
#include <systools/win32/comtools.hxx>
+#include <assert.h>
#define FREE_HGLOB_ON_RELEASE TRUE
#define KEEP_HGLOB_ON_RELEASE FALSE
@@ -296,7 +296,7 @@ STDMETHODIMP CAPNDataObject::EnumDAdvise( IEnumSTATDATA **
ppenumAdvise )
HRESULT CAPNDataObject::MarshalIDataObjectIntoCurrentApartment( IDataObject**
ppIDataObj )
{
- OSL_ASSERT(nullptr != ppIDataObj);
+ assert(nullptr && ppIDataObj);
*ppIDataObj = nullptr;
HRESULT hr = E_FAIL;
diff --git a/vcl/win/dtrans/DTransHelper.cxx b/vcl/win/dtrans/DTransHelper.cxx
index 66d18f9fb528..176f9e205bcc 100644
--- a/vcl/win/dtrans/DTransHelper.cxx
+++ b/vcl/win/dtrans/DTransHelper.cxx
@@ -20,6 +20,7 @@
#include <rtl/ustring.h>
#include <osl/diagnose.h>
#include "DTransHelper.hxx"
+#include <assert.h>
// implementation
@@ -99,7 +100,7 @@ HGLOBAL CStgTransferHelper::getHGlobal( ) const
void CStgTransferHelper::getIStream( LPSTREAM* ppStream )
{
- OSL_ASSERT( ppStream );
+ assert(ppStream);
*ppStream = m_lpStream;
if ( *ppStream )
static_cast< LPUNKNOWN >( *ppStream )->AddRef( );
diff --git a/vcl/win/dtrans/Fetc.cxx b/vcl/win/dtrans/Fetc.cxx
index 9bcb2f609ff6..7f6c87bf783c 100644
--- a/vcl/win/dtrans/Fetc.cxx
+++ b/vcl/win/dtrans/Fetc.cxx
@@ -20,6 +20,7 @@
#include <osl/diagnose.h>
#include "Fetc.hxx"
#include "ImplHelper.hxx"
+#include <assert.h>
CFormatEtc::CFormatEtc( )
{
@@ -106,7 +107,7 @@ DWORD CFormatEtc::getTymed( ) const
void CFormatEtc::getTargetDevice( DVTARGETDEVICE** lpDvTargetDevice ) const
{
- OSL_ASSERT( lpDvTargetDevice );
+ assert(lpDvTargetDevice);
OSL_ASSERT( !IsBadWritePtr( lpDvTargetDevice, sizeof( DVTARGETDEVICE ) ) );
*lpDvTargetDevice = nullptr;
diff --git a/vcl/win/dtrans/FmtFilter.cxx b/vcl/win/dtrans/FmtFilter.cxx
index 6cd625fe6b91..614c8d27f375 100644
--- a/vcl/win/dtrans/FmtFilter.cxx
+++ b/vcl/win/dtrans/FmtFilter.cxx
@@ -149,20 +149,22 @@ Sequence< sal_Int8 > WinENHMFPictToOOMFPict( HENHMETAFILE
hEnhMetaFile )
HMETAFILEPICT OOMFPictToWinMFPict( Sequence< sal_Int8 > const &
aOOMetaFilePict )
{
- HMETAFILEPICT hPict = nullptr;
HMETAFILE hMtf = SetMetaFileBitsEx( aOOMetaFilePict.getLength(),
reinterpret_cast<unsigned char const *>(aOOMetaFilePict.getConstArray()) );
- if( hMtf )
- {
- METAFILEPICT* pPict = static_cast<METAFILEPICT*>(GlobalLock( hPict =
GlobalAlloc( GHND, sizeof( METAFILEPICT ) ) ));
+ if (!hMtf)
+ return nullptr;
- pPict->mm = 8;
- pPict->xExt = 0;
- pPict->yExt = 0;
- pPict->hMF = hMtf;
+ HMETAFILEPICT hPict = nullptr;
+ METAFILEPICT* pPict = static_cast<METAFILEPICT*>(GlobalLock( hPict =
GlobalAlloc( GHND, sizeof( METAFILEPICT ) ) ));
+ if (!pPict)
+ return nullptr;
- GlobalUnlock( hPict );
- }
+ pPict->mm = 8;
+ pPict->xExt = 0;
+ pPict->yExt = 0;
+ pPict->hMF = hMtf;
+
+ GlobalUnlock( hPict );
return hPict;
}
diff --git a/vcl/win/dtrans/MtaOleClipb.cxx b/vcl/win/dtrans/MtaOleClipb.cxx
index a62f4a1c0c72..4cbaf4cdfc43 100644
--- a/vcl/win/dtrans/MtaOleClipb.cxx
+++ b/vcl/win/dtrans/MtaOleClipb.cxx
@@ -147,7 +147,7 @@ CMtaOleClipboard*
CMtaOleClipboard::s_theMtaOleClipboardInst = nullptr;
static HRESULT MarshalIDataObjectInStream( IDataObject* pIDataObject,
LPSTREAM* ppStream )
{
OSL_ASSERT( nullptr != pIDataObject );
- OSL_ASSERT( nullptr != ppStream );
+ assert(nullptr != ppStream);
*ppStream = nullptr;
return CoMarshalInterThreadInterfaceInStream(
@@ -163,7 +163,7 @@ static HRESULT MarshalIDataObjectInStream( IDataObject*
pIDataObject, LPSTREAM*
static HRESULT UnmarshalIDataObjectAndReleaseStream( LPSTREAM lpStream,
IDataObject** ppIDataObject )
{
OSL_ASSERT( nullptr != lpStream );
- OSL_ASSERT( nullptr != ppIDataObject );
+ assert(nullptr != ppIDataObject);
*ppIDataObject = nullptr;
return CoGetInterfaceAndReleaseStream(
@@ -335,7 +335,7 @@ HRESULT CMtaOleClipboard::flushClipboard( )
HRESULT CMtaOleClipboard::getClipboard( IDataObject** ppIDataObject )
{
- OSL_PRECOND( nullptr != ppIDataObject, "invalid parameter" );
+ assert(ppIDataObject && "invalid parameter");
OSL_PRECOND( GetCurrentThreadId( ) != m_uOleThreadId, "getClipboard from
within clipboard sta thread called" );
if ( !WaitForThreadReady( ) )
@@ -555,7 +555,7 @@ LRESULT CALLBACK CMtaOleClipboard::mtaOleReqWndProc( HWND
hWnd, UINT uMsg, WPARA
case MSG_GETCLIPBOARD:
{
MsgCtx* aMsgCtx = reinterpret_cast< MsgCtx* >( lParam );
- OSL_ASSERT( aMsgCtx );
+ assert(aMsgCtx);
aMsgCtx->hr = CMtaOleClipboard::onGetClipboard( reinterpret_cast<
LPSTREAM* >(wParam) );
aMsgCtx->aCondition.set( );
@@ -565,7 +565,7 @@ LRESULT CALLBACK CMtaOleClipboard::mtaOleReqWndProc( HWND
hWnd, UINT uMsg, WPARA
case MSG_FLUSHCLIPBOARD:
{
MsgCtx* aMsgCtx = reinterpret_cast< MsgCtx* >( lParam );
- OSL_ASSERT( aMsgCtx );
+ assert(aMsgCtx);
aMsgCtx->hr = CMtaOleClipboard::onFlushClipboard( );
aMsgCtx->aCondition.set( );
@@ -575,7 +575,7 @@ LRESULT CALLBACK CMtaOleClipboard::mtaOleReqWndProc( HWND
hWnd, UINT uMsg, WPARA
case MSG_REGCLIPVIEWER:
{
MsgCtx* pMsgCtx = reinterpret_cast<MsgCtx*>(lParam);
- SAL_WARN_IF(!pMsgCtx, "vcl.win.dtrans", "pMsgCtx is nullptr");
+ assert(pMsgCtx && "pMsgCtx is nullptr");
pImpl->onRegisterClipViewer(
reinterpret_cast<CMtaOleClipboard::LPFNC_CLIPVIEWER_CALLBACK_t>(wParam));
diff --git a/vcl/win/dtrans/XTDataObject.cxx b/vcl/win/dtrans/XTDataObject.cxx
index b3f5ccb30344..1997ec8386a6 100644
--- a/vcl/win/dtrans/XTDataObject.cxx
+++ b/vcl/win/dtrans/XTDataObject.cxx
@@ -108,7 +108,7 @@ public:
void validateFormatEtc( LPFORMATETC lpFormatEtc )
{
- OSL_ASSERT( lpFormatEtc );
+ assert(lpFormatEtc);
if ( lpFormatEtc->lindex != -1 )
throw CInvalidFormatEtcException( DV_E_LINDEX );
