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

user32: Fix invalid argument passed to ExtCreateRegion.

Browse Source
This commit is contained in:
Sebastian Lackner 2014-11-03 06:54:16 +01:00 committed by Alexandre Julliard
parent 7796661b4c
commit b43f13f892
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dlls/user32/painting.c
View File

@ -139,7 +139,7 @@ static void update_visible_region( struct dce *dce )
data->rdh.iType = RDH_RECTANGLES; data->rdh.iType = RDH_RECTANGLES;
data->rdh.nCount = reply_size / sizeof(RECT); data->rdh.nCount = reply_size / sizeof(RECT);
data->rdh.nRgnSize = reply_size; data->rdh.nRgnSize = reply_size;
vis_rgn = ExtCreateRegion( NULL, size, data ); vis_rgn = ExtCreateRegion( NULL, data->rdh.dwSize + data->rdh.nRgnSize, data );
top_win = wine_server_ptr_handle( reply->top_win ); top_win = wine_server_ptr_handle( reply->top_win );
win_rect.left = reply->win_rect.left; win_rect.left = reply->win_rect.left;
@ -557,7 +557,7 @@ static HRGN get_update_region( HWND hwnd, UINT *flags, HWND *child )
data->rdh.iType = RDH_RECTANGLES; data->rdh.iType = RDH_RECTANGLES;
data->rdh.nCount = reply_size / sizeof(RECT); data->rdh.nCount = reply_size / sizeof(RECT);
data->rdh.nRgnSize = reply_size; data->rdh.nRgnSize = reply_size;
hrgn = ExtCreateRegion( NULL, size, data ); hrgn = ExtCreateRegion( NULL, data->rdh.dwSize + data->rdh.nRgnSize, data );
if (child) *child = wine_server_ptr_handle( reply->child ); if (child) *child = wine_server_ptr_handle( reply->child );
*flags = reply->flags; *flags = reply->flags;
} }

6
dlls/user32/winpos.c
View File

@ -131,7 +131,7 @@ int WINAPI GetWindowRgn ( HWND hwnd, HRGN hrgn )
data->rdh.iType = RDH_RECTANGLES; data->rdh.iType = RDH_RECTANGLES;
data->rdh.nCount = reply_size / sizeof(RECT); data->rdh.nCount = reply_size / sizeof(RECT);
data->rdh.nRgnSize = reply_size; data->rdh.nRgnSize = reply_size;
win_rgn = ExtCreateRegion( NULL, size, data ); win_rgn = ExtCreateRegion( NULL, data->rdh.dwSize + data->rdh.nRgnSize, data );
} }
} }
else size = reply->total_size; else size = reply->total_size;
@ -532,7 +532,7 @@ void map_window_region( HWND from, HWND to, HRGN hrgn )
rect[i].top += offset.y; rect[i].top += offset.y;
rect[i].bottom += offset.y; rect[i].bottom += offset.y;
} }
if ((new_rgn = ExtCreateRegion( NULL, data->rdh.nCount, data ))) if ((new_rgn = ExtCreateRegion( NULL, data->rdh.dwSize + data->rdh.nRgnSize, data )))
{ {
CombineRgn( hrgn, new_rgn, 0, RGN_COPY ); CombineRgn( hrgn, new_rgn, 0, RGN_COPY );
DeleteObject( new_rgn ); DeleteObject( new_rgn );
@ -2018,7 +2018,7 @@ static void update_surface_region( HWND hwnd )
data->rdh.iType = RDH_RECTANGLES; data->rdh.iType = RDH_RECTANGLES;
data->rdh.nCount = reply_size / sizeof(RECT); data->rdh.nCount = reply_size / sizeof(RECT);
data->rdh.nRgnSize = reply_size; data->rdh.nRgnSize = reply_size;
region = ExtCreateRegion( NULL, size, data ); region = ExtCreateRegion( NULL, data->rdh.dwSize + data->rdh.nRgnSize, data );
OffsetRgn( region, -reply->visible_rect.left, -reply->visible_rect.top ); OffsetRgn( region, -reply->visible_rect.left, -reply->visible_rect.top );
} }
} }