gnustep/libs-back
0
0
Fork 0
mirror of https://github.com/gnustep/libs-back.git synced 2025-02-24 04:11:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Check for self=nil before processing in init

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/back/branches/gnustep_testplant_branch@36603 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Marcian Lytwyn 2013-05-09 01:32:02 +00:00
parent acf6d13308
commit 612a141f28
1 changed files with 76 additions and 73 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

149
Source/cairo/Win32CairoSurface.m
View file

@ -146,100 +146,103 @@
- (id) initWithDevice: (void *)device - (id) initWithDevice: (void *)device
{ {
// Save/set initial state... if (self)
gsDevice = device;
_surface = NULL;
WIN_INTERN *win = (WIN_INTERN *)GetWindowLong(GSWINDEVICE, GWL_USERDATA);
HDC hDC = GetDC(GSWINDEVICE);
if (hDC == NULL)
{ {
NSWarnMLog(@"Win32CairoSurface line: %d : no device context", __LINE__); // Save/set initial state...
gsDevice = device;
_surface = NULL;
// And deallocate ourselves... WIN_INTERN *win = (WIN_INTERN *)GetWindowLong(GSWINDEVICE, GWL_USERDATA);
DESTROY(self); HDC hDC = GetDC(GSWINDEVICE);
}
else
{
// Create the cairo surfaces...
// NSBackingStoreRetained works like Buffered since 10.5 (See apple docs)...
// NOTE: According to Apple docs NSBackingStoreBuffered should be the only one
// ever used anymore....others are NOT recommended...
if (win && (win->type == NSBackingStoreNonretained))
{
// This is the raw DC surface...
_surface = cairo_win32_surface_create(hDC);
// Check for error... if (hDC == NULL)
if (cairo_surface_status(_surface) != CAIRO_STATUS_SUCCESS) {
{ NSWarnMLog(@"Win32CairoSurface line: %d : no device context", __LINE__);
// Output the surface create error...
cairo_status_t status = cairo_surface_status(_surface); // And deallocate ourselves...
NSWarnMLog(@"surface create FAILED - status: %s\n", cairo_status_to_string(status)); DESTROY(self);
// Destroy the initial surface created...
cairo_surface_destroy(_surface);
// And deallocate ourselves...
DESTROY(self);
}
} }
else else
{ {
NSSize csize = [self size]; // Create the cairo surfaces...
// NSBackingStoreRetained works like Buffered since 10.5 (See apple docs)...
// This is the raw DC surface... // NOTE: According to Apple docs NSBackingStoreBuffered should be the only one
cairo_surface_t *window = cairo_win32_surface_create(hDC); // ever used anymore....others are NOT recommended...
if (win && (win->type == NSBackingStoreNonretained))
// Check for error...
if (cairo_surface_status(window) != CAIRO_STATUS_SUCCESS)
{ {
// Output the surface create error... // This is the raw DC surface...
cairo_status_t status = cairo_surface_status(window); _surface = cairo_win32_surface_create(hDC);
NSWarnMLog(@"surface create FAILED - status: %s\n", cairo_status_to_string(status));
// And deallocate ourselves...
DESTROY(self);
}
else
{
// and this is the in-memory DC surface...surface owns its DC...
// NOTE: For some reason we get an init sequence with zero width/height,
// which creates problems in the cairo layer. It tries to clear
// the 'similar' surface it's creating, and with a zero width/height
// it incorrectly thinks the clear failed...so we will init with
// a minimum size of 1 for width/height...
_surface = cairo_surface_create_similar(window, CAIRO_CONTENT_COLOR_ALPHA,
MAX(1, csize.width),
MAX(1, csize.height));
// Check for error... // Check for error...
if (cairo_surface_status(_surface) != CAIRO_STATUS_SUCCESS) if (cairo_surface_status(_surface) != CAIRO_STATUS_SUCCESS)
{ {
// Output the surface create error... // Output the surface create error...
cairo_status_t status = cairo_surface_status(_surface); cairo_status_t status = cairo_surface_status(_surface);
NSWarnMLog(@"surface create FAILED - status: %s\n", cairo_status_to_string(status)); NSWarnMLog(@"surface create FAILED - status: %s\n", cairo_status_to_string(status));
// Destroy the surface created... // Destroy the initial surface created...
cairo_surface_destroy(_surface); cairo_surface_destroy(_surface);
// And deallocate ourselves... // And deallocate ourselves...
DESTROY(self); DESTROY(self);
} }
} }
else
// Destroy the initial surface created... {
cairo_surface_destroy(window); NSSize csize = [self size];
// Release the device context... // This is the raw DC surface...
ReleaseDC(GSWINDEVICE, hDC); cairo_surface_t *window = cairo_win32_surface_create(hDC);
}
// Check for error...
if (cairo_surface_status(window) != CAIRO_STATUS_SUCCESS)
{
// Output the surface create error...
cairo_status_t status = cairo_surface_status(window);
NSWarnMLog(@"surface create FAILED - status: %s\n", cairo_status_to_string(status));
// And deallocate ourselves...
DESTROY(self);
}
else
{
// and this is the in-memory DC surface...surface owns its DC...
// NOTE: For some reason we get an init sequence with zero width/height,
// which creates problems in the cairo layer. It tries to clear
// the 'similar' surface it's creating, and with a zero width/height
// it incorrectly thinks the clear failed...so we will init with
// a minimum size of 1 for width/height...
_surface = cairo_surface_create_similar(window, CAIRO_CONTENT_COLOR_ALPHA,
MAX(1, csize.width),
MAX(1, csize.height));
if (self) // Check for error...
{ if (cairo_surface_status(_surface) != CAIRO_STATUS_SUCCESS)
// We need this for handleExposeEvent in WIN32Server... {
win->surface = (void*)self; // Output the surface create error...
cairo_status_t status = cairo_surface_status(_surface);
NSWarnMLog(@"surface create FAILED - status: %s\n", cairo_status_to_string(status));
// Destroy the surface created...
cairo_surface_destroy(_surface);
// And deallocate ourselves...
DESTROY(self);
}
}
// Destroy the initial surface created...
cairo_surface_destroy(window);
// Release the device context...
ReleaseDC(GSWINDEVICE, hDC);
}
if (self)
{
// We need this for handleExposeEvent in WIN32Server...
win->surface = (void*)self;
}
} }
} }
return self; return self;