Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-06-10 20:34:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

[USER32]

Browse source 
Fix a bug causing "Attempted to lock object, wrong reuse counter" messages when CMD was started in LiveCD. Once got desktop HDC was used in different threads. When thread, which created handle terminated, DC handle was removed and next calls to CreateIcon* API was using invalid hDC.

svn path=/trunk/; revision=51184
This commit is contained in:
Rafal Harabien 2011-03-28 20:52:27 +00:00
parent 4ef3dbc225
commit c5dad4998c
1 changed files with 3 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

12
reactos/dll/win32/user32/windows/cursoricon.c
View file

@ -458,16 +458,10 @@ static BOOL create_icon_bitmaps( const BITMAPINFO *bmi, int width, int height,
void *color_bits, *mask_bits;
BOOL ret = FALSE;
HDC hdc = 0;
static HDC hScreenDC = 0;
if (!(info = HeapAlloc( GetProcessHeap(), 0, max( size, FIELD_OFFSET( BITMAPINFO, bmiColors[2] )))))
return FALSE;
if(!hScreenDC)
{
hScreenDC = GetDC(0);
if(!hScreenDC) goto done;
}
if (!(hdc = CreateCompatibleDC(hScreenDC))) goto done;
if (!(hdc = CreateCompatibleDC(NULL))) goto done;
memcpy( info, bmi, size );
info->bmiHeader.biHeight /= 2;
@ -491,8 +485,8 @@ static BOOL create_icon_bitmaps( const BITMAPINFO *bmi, int width, int height,
else
{
if (!(*mask = CreateBitmap( width, height, 1, 1, NULL ))) goto done;
if (!(*color = CreateBitmap( width, height, GetDeviceCaps(hScreenDC, PLANES),
GetDeviceCaps(hScreenDC, BITSPIXEL), NULL )))
if (!(*color = CreateBitmap( width, height, GetDeviceCaps(hdc, PLANES),
GetDeviceCaps(hdc, BITSPIXEL), NULL )))
{
DeleteObject( *mask );
goto done;