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

gdi32: Make DC creation fail if we cannot allocate the visible region.

This commit is contained in:
Alexandre Julliard 2007-02-26 19:01:30 +01:00
parent 489db09da8
commit 2d4735ae67
1 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
dlls/gdi32/dc.c
View File

@ -626,14 +626,11 @@ HDC WINAPI CreateDCW( LPCWSTR driver, LPCWSTR device, LPCWSTR output,
ERR( "no driver found for %s\n", debugstr_w(buf) ); ERR( "no driver found for %s\n", debugstr_w(buf) );
return 0; return 0;
} }
if (!(dc = DC_AllocDC( funcs, DC_MAGIC ))) if (!(dc = DC_AllocDC( funcs, DC_MAGIC ))) goto error;
{
DRIVER_release_driver( funcs );
return 0;
}
hdc = dc->hSelf; hdc = dc->hSelf;
dc->hBitmap = GetStockObject( DEFAULT_BITMAP ); dc->hBitmap = GetStockObject( DEFAULT_BITMAP );
if (!(dc->hVisRgn = CreateRectRgn( 0, 0, 1, 1 ))) goto error;
TRACE("(driver=%s, device=%s, output=%s): returning %p\n", TRACE("(driver=%s, device=%s, output=%s): returning %p\n",
debugstr_w(driver), debugstr_w(device), debugstr_w(output), dc->hSelf ); debugstr_w(driver), debugstr_w(device), debugstr_w(output), dc->hSelf );
@ -642,17 +639,21 @@ HDC WINAPI CreateDCW( LPCWSTR driver, LPCWSTR device, LPCWSTR output,
!dc->funcs->pCreateDC( hdc, &dc->physDev, buf, device, output, initData )) !dc->funcs->pCreateDC( hdc, &dc->physDev, buf, device, output, initData ))
{ {
WARN("creation aborted by device\n" ); WARN("creation aborted by device\n" );
GDI_FreeObject( dc->hSelf, dc ); goto error;
DRIVER_release_driver( funcs );
return 0;
} }
dc->hVisRgn = CreateRectRgn( 0, 0, GetDeviceCaps( hdc, DESKTOPHORZRES ), SetRectRgn( dc->hVisRgn, 0, 0,
GetDeviceCaps( hdc, DESKTOPVERTRES ) ); GetDeviceCaps( hdc, DESKTOPHORZRES ), GetDeviceCaps( hdc, DESKTOPVERTRES ) );
DC_InitDC( dc ); DC_InitDC( dc );
GDI_ReleaseObj( hdc ); GDI_ReleaseObj( hdc );
return hdc; return hdc;
error:
if (dc && dc->hVisRgn) DeleteObject( dc->hVisRgn );
if (dc) GDI_FreeObject( dc->hSelf, dc );
DRIVER_release_driver( funcs );
return 0;
} }
@ -741,15 +742,12 @@ HDC WINAPI CreateCompatibleDC( HDC hdc )
if (!funcs) return 0; if (!funcs) return 0;
if (!(dc = DC_AllocDC( funcs, MEMORY_DC_MAGIC ))) if (!(dc = DC_AllocDC( funcs, MEMORY_DC_MAGIC ))) goto error;
{
DRIVER_release_driver( funcs );
return 0;
}
TRACE("(%p): returning %p\n", hdc, dc->hSelf ); TRACE("(%p): returning %p\n", hdc, dc->hSelf );
dc->hBitmap = GetStockObject( DEFAULT_BITMAP ); dc->hBitmap = GetStockObject( DEFAULT_BITMAP );
if (!(dc->hVisRgn = CreateRectRgn( 0, 0, 1, 1 ))) goto error; /* default bitmap is 1x1 */
/* Copy the driver-specific physical device info into /* Copy the driver-specific physical device info into
* the new DC. The driver may use this read-only info * the new DC. The driver may use this read-only info
@ -760,16 +758,18 @@ HDC WINAPI CreateCompatibleDC( HDC hdc )
!dc->funcs->pCreateDC( dc->hSelf, &dc->physDev, NULL, NULL, NULL, NULL )) !dc->funcs->pCreateDC( dc->hSelf, &dc->physDev, NULL, NULL, NULL, NULL ))
{ {
WARN("creation aborted by device\n"); WARN("creation aborted by device\n");
GDI_FreeObject( dc->hSelf, dc ); goto error;
DRIVER_release_driver( funcs );
return 0;
} }
dc->hVisRgn = CreateRectRgn( 0, 0, 1, 1 ); /* default bitmap is 1x1 */
DC_InitDC( dc ); DC_InitDC( dc );
GDI_ReleaseObj( dc->hSelf ); GDI_ReleaseObj( dc->hSelf );
return dc->hSelf; return dc->hSelf;
error:
if (dc && dc->hVisRgn) DeleteObject( dc->hVisRgn );
if (dc) GDI_FreeObject( dc->hSelf, dc );
DRIVER_release_driver( funcs );
return 0;
} }