reactos/wine
1
0
Fork 0
mirror of https://github.com/reactos/wine.git synced 2025-01-23 12:25:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

user32: Completely free owned DCEs when the corresponding window/class is destroyed.

Browse Source 
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Alexandre Julliard 2016-05-21 09:54:40 +09:00
parent 5f7e4ce642
commit d341b0c381
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dlls/gdi32/tests/dc.c
View File

@ -812,7 +812,6 @@ static void test_DeleteDC(void)
ok(ret, "UnregisterClassA failed\n");
ret = GetObjectType(hdc_test);
todo_wine
ok(!ret, "GetObjectType should fail for a deleted DC\n");
/* CS_OWNDC */

16
dlls/user32/painting.c
View File

@ -338,16 +338,17 @@ static struct dce *get_window_dce( HWND hwnd )
*/
void free_dce( struct dce *dce, HWND hwnd )
{
struct dce *dce_to_free = NULL;
USER_Lock();
if (dce)
{
if (!--dce->count)
{
/* turn it into a cache entry */
SetHookFlags( dce->hdc, DCHF_RESETDC );
release_dce( dce );
dce->flags |= DCX_CACHE;
list_remove( &dce->entry );
dce_to_free = dce;
}
else if (dce->hwnd == hwnd)
{
@ -362,7 +363,7 @@ void free_dce( struct dce *dce, HWND hwnd )
LIST_FOR_EACH_ENTRY( dce, &dce_list, struct dce, entry )
{
if (dce->hwnd != hwnd) continue;
if (!(dce->flags & DCX_CACHE)) continue;
if (!(dce->flags & DCX_CACHE)) break;
if (dce->count) WARN( "GetDC() without ReleaseDC() for window %p\n", hwnd );
dce->count = 0;
@ -371,6 +372,13 @@ void free_dce( struct dce *dce, HWND hwnd )
}
USER_Unlock();
if (dce_to_free)
{
SetDCHook( dce_to_free->hdc, NULL, 0 );
DeleteDC( dce_to_free->hdc );
HeapFree( GetProcessHeap(), 0, dce_to_free );
}
}