Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use GlobalPtrLock (modified to allow not initializing it if the ptr is NULL) in wxGetPrinterDC() to avoid /Wp64 warnings and also make code safer

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52164 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2008-02-28 00:41:38 +00:00
parent 18caa1e963
commit 2d2b68baa3
2 changed files with 32 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
include/wx/msw/private.h
View File

@@ -630,16 +630,33 @@ private:
class GlobalPtrLock class GlobalPtrLock
{ {
public: public:
GlobalPtrLock(HGLOBAL hGlobal) : m_hGlobal(hGlobal) // default ctor, use Init() later -- should only be used if the HGLOBAL can
// be NULL (in which case Init() shouldn't be called)
GlobalPtrLock()
{ {
m_ptr = GlobalLock(hGlobal); m_hGlobal = NULL;
m_ptr = NULL;
}
// initialize the object, may be only called if we were created using the
// default ctor; HGLOBAL must not be NULL
void Init(HGLOBAL hGlobal)
{
m_hGlobal = hGlobal;
m_ptr = ::GlobalLock(hGlobal);
if ( !m_ptr ) if ( !m_ptr )
wxLogLastError(_T("GlobalLock")); wxLogLastError(_T("GlobalLock"));
} }
// initialize the object, HGLOBAL must not be NULL
GlobalPtrLock(HGLOBAL hGlobal)
{
Init(hGlobal);
}
~GlobalPtrLock() ~GlobalPtrLock()
{ {
if ( !GlobalUnlock(m_hGlobal) ) if ( m_hGlobal && !::GlobalUnlock(m_hGlobal) )
{ {
#ifdef __WXDEBUG__ #ifdef __WXDEBUG__
// this might happen simply because the block became unlocked // this might happen simply because the block became unlocked
@@ -652,6 +669,7 @@ public:
} }
} }
void *Get() const { return m_ptr; }
operator void *() const { return m_ptr; } operator void *() const { return m_ptr; }
private: private:

18
src/msw/dcprint.cpp
View File

@@ -327,17 +327,21 @@ WXHDC WXDLLEXPORT wxGetPrinterDC(const wxPrintData& printDataConst)
} }
HGLOBAL hDevMode = (HGLOBAL)(DWORD) data->GetDevMode(); GlobalPtrLock lockDevMode;
const HGLOBAL devMode = data->GetDevMode();
if ( devMode )
lockDevMode.Init(devMode);
DEVMODE *lpDevMode = hDevMode ? (DEVMODE *)::GlobalLock(hDevMode) : NULL; HDC hDC = ::CreateDC
(
HDC hDC = ::CreateDC(NULL, deviceName.wx_str(), NULL, lpDevMode); NULL, // no driver name as we use device name
deviceName.wx_str(),
NULL, // unused
wx_static_cast(DEVMODE *, lockDevMode.Get())
);
if ( !hDC ) if ( !hDC )
wxLogLastError(_T("CreateDC(printer)")); wxLogLastError(_T("CreateDC(printer)"));
if ( lpDevMode )
::GlobalUnlock(hDevMode);
return (WXHDC) hDC; return (WXHDC) hDC;
#endif // PostScript/Windows printing #endif // PostScript/Windows printing
} }