← Back to branch summary

~ubuntu-branches/ubuntu/precise/xorg-server/precise-updates

« back to all changes in this revision

Viewing changes to render/render.c

  • Committer: Package Import Robot
  • Author(s): Christopher James Halse Rogers
  • Date: 2012-01-23 16:09:29 UTC
  • mfrom: (1.1.46) (0.11.34 sid)
  • Revision ID: package-import@ubuntu.com-20120123160929-k4xdb9b7xeesiukp
Tags: 2:1.11.3-0ubuntu8
https://launchpad.net/bugs/903973
* debian/patches/224_return_BadWindow_not_BadMatch.diff:
  - Fix the error values of a whole slew of window-related calls.
    Fixes some gnome-settings-daemon aborts in XLib (LP: #903973)

Show diffs side-by-side

added added

removed removed

Lines of Context:
render/render.c
239
239
}
240
240
 
241
241
#ifdef PANORAMIX
242
 
unsigned long   XRT_PICTURE;
 
242
RESTYPE XRT_PICTURE;
243
243
#endif
244
244
 
245
245
void
1705
1705
                         GetColor(twocolor[1], 0),
1706
1706
                         &pCursor, client, stuff->cid);
1707
1707
    if (rc != Success)
1708
 
        return rc;
1709
 
    if (!AddResource(stuff->cid, RT_CURSOR, (pointer)pCursor))
1710
 
        return BadAlloc;
 
1708
        goto bail;
 
1709
    if (!AddResource(stuff->cid, RT_CURSOR, (pointer)pCursor)) {
 
1710
        rc = BadAlloc;
 
1711
        goto bail;
 
1712
    }
1711
1713
 
1712
1714
    return Success;
 
1715
bail:
 
1716
    free(srcbits);
 
1717
    free(mskbits);
 
1718
    return rc;
1713
1719
}
1714
1720
 
1715
1721
static int
2689
2695
    if(!(newPict = (PanoramiXRes *) malloc(sizeof(PanoramiXRes))))
2690
2696
        return BadAlloc;
2691
2697
    newPict->type = XRT_PICTURE;
2692
 
    newPict->info[0].id = stuff->pid;
 
2698
    panoramix_setup_ids(newPict, client, stuff->pid);
2693
2699
    
2694
2700
    if (refDraw->type == XRT_WINDOW &&
2695
2701
        stuff->drawable == screenInfo.screens[0]->root->drawable.id)
2698
2704
    }
2699
2705
    else
2700
2706
        newPict->u.pict.root = FALSE;
2701
 
 
2702
 
    for(j = 1; j < PanoramiXNumScreens; j++)
2703
 
        newPict->info[j].id = FakeClientID(client->index);
2704
2707
    
2705
2708
    FOR_NSCREENS_BACKWARD(j) {
2706
2709
        stuff->pid = newPict->info[j].id;
3224
3227
        return BadAlloc;
3225
3228
 
3226
3229
    newPict->type = XRT_PICTURE;
3227
 
    newPict->info[0].id = stuff->pid;
 
3230
    panoramix_setup_ids(newPict, client, stuff->pid);
3228
3231
    newPict->u.pict.root = FALSE;
3229
 
 
3230
 
    for(j = 1; j < PanoramiXNumScreens; j++)
3231
 
        newPict->info[j].id = FakeClientID(client->index);
3232
3232
        
3233
3233
    FOR_NSCREENS_BACKWARD(j) {
3234
3234
        stuff->pid = newPict->info[j].id;
3257
3257
        return BadAlloc;
3258
3258
 
3259
3259
    newPict->type = XRT_PICTURE;
3260
 
    newPict->info[0].id = stuff->pid;
 
3260
    panoramix_setup_ids(newPict, client, stuff->pid);
3261
3261
    newPict->u.pict.root = FALSE;
3262
3262
 
3263
 
    for(j = 1; j < PanoramiXNumScreens; j++)
3264
 
        newPict->info[j].id = FakeClientID(client->index);
3265
 
 
3266
3263
    FOR_NSCREENS_BACKWARD(j) {
3267
3264
        stuff->pid = newPict->info[j].id;
3268
3265
        result = (*PanoramiXSaveRenderVector[X_RenderCreateLinearGradient]) (client);
3290
3287
        return BadAlloc;
3291
3288
 
3292
3289
    newPict->type = XRT_PICTURE;
3293
 
    newPict->info[0].id = stuff->pid;
 
3290
    panoramix_setup_ids(newPict, client, stuff->pid);
3294
3291
    newPict->u.pict.root = FALSE;
3295
3292
 
3296
 
    for(j = 1; j < PanoramiXNumScreens; j++)
3297
 
        newPict->info[j].id = FakeClientID(client->index);
3298
 
 
3299
3293
    FOR_NSCREENS_BACKWARD(j) {
3300
3294
        stuff->pid = newPict->info[j].id;
3301
3295
        result = (*PanoramiXSaveRenderVector[X_RenderCreateRadialGradient]) (client);
3323
3317
        return BadAlloc;
3324
3318
 
3325
3319
    newPict->type = XRT_PICTURE;
3326
 
    newPict->info[0].id = stuff->pid;
 
3320
    panoramix_setup_ids(newPict, client, stuff->pid);
3327
3321
    newPict->u.pict.root = FALSE;
3328
3322
 
3329
 
    for(j = 1; j < PanoramiXNumScreens; j++)
3330
 
        newPict->info[j].id = FakeClientID(client->index);
3331
 
 
3332
3323
    FOR_NSCREENS_BACKWARD(j) {
3333
3324
        stuff->pid = newPict->info[j].id;
3334
3325
        result = (*PanoramiXSaveRenderVector[X_RenderCreateConicalGradient]) (client);