October 2012 - Wine-commits

Alexandre Julliard : gdi32: Process the object HDC list outside of the critical section.
by Alexandre Julliard 17 Oct '12

17 Oct '12

Module: wine Branch: master Commit: 5f14ff42a80d03200dfd6eca4485bdb0ce75617c URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f14ff42a80d03200dfd6eca4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 17 13:08:11 2012 +0200 gdi32: Process the object HDC list outside of the critical section. --- dlls/gdi32/gdiobj.c | 37 +++++++++++++++++-------------------- 1 files changed, 17 insertions(+), 20 deletions(-) diff --git a/dlls/gdi32/gdiobj.c b/dlls/gdi32/gdiobj.c index 750e95b..afc0c59 100644 --- a/dlls/gdi32/gdiobj.c +++ b/dlls/gdi32/gdiobj.c @@ -810,7 +810,7 @@ BOOL WINAPI DeleteObject( HGDIOBJ obj ) { struct gdi_handle_entry *entry; struct hdc_list *hdcs_head; - const struct gdi_obj_funcs *funcs; + const struct gdi_obj_funcs *funcs = NULL; EnterCriticalSection( &gdi_section ); if (!(entry = handle_entry( obj ))) @@ -826,41 +826,38 @@ BOOL WINAPI DeleteObject( HGDIOBJ obj ) return TRUE; } - while ((hdcs_head = entry->hdcs) != NULL) + hdcs_head = entry->hdcs; + entry->hdcs = NULL; + + if (entry->obj->selcount) { + TRACE("delayed for %p because object in use, count %u\n", obj, entry->obj->selcount ); + entry->obj->deleted = 1; /* mark for delete */ + } + else funcs = entry->funcs; + + LeaveCriticalSection( &gdi_section ); + + while (hdcs_head) + { + struct hdc_list *next = hdcs_head->next; DC *dc = get_dc_ptr(hdcs_head->hdc); - entry->hdcs = hdcs_head->next; TRACE("hdc %p has interest in %p\n", hdcs_head->hdc, obj); - if(dc) { PHYSDEV physdev = GET_DC_PHYSDEV( dc, pDeleteObject ); - LeaveCriticalSection( &gdi_section ); physdev->funcs->pDeleteObject( physdev, obj ); - EnterCriticalSection( &gdi_section ); /* and grab it again */ - entry = handle_entry( obj ); release_dc_ptr( dc ); } HeapFree(GetProcessHeap(), 0, hdcs_head); - if (!entry) return FALSE; + hdcs_head = next; } - if (entry->obj->selcount) - { - TRACE("delayed for %p because object in use, count %u\n", obj, entry->obj->selcount ); - entry->obj->deleted = 1; /* mark for delete */ - LeaveCriticalSection( &gdi_section ); - return TRUE; - } - - funcs = entry->funcs; - LeaveCriticalSection( &gdi_section ); - TRACE("%p\n", obj ); if (funcs && funcs->pDeleteObject) return funcs->pDeleteObject( obj ); - return FALSE; + return TRUE; } /***********************************************************************

1 0

Alexandre Julliard : gdi32: Store the object selection count directly in the GDI handle table.
by Alexandre Julliard 17 Oct '12

17 Oct '12

Module: wine Branch: master Commit: b95dd7e831215ca80b341332598df600bd148a36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b95dd7e831215ca80b3413325… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 17 13:17:56 2012 +0200 gdi32: Store the object selection count directly in the GDI handle table. --- dlls/gdi32/bitmap.c | 2 +- dlls/gdi32/dib.c | 2 +- dlls/gdi32/gdi_private.h | 2 +- dlls/gdi32/gdiobj.c | 56 ++++++++++++++++++++++++++++++--------------- 4 files changed, 40 insertions(+), 22 deletions(-) diff --git a/dlls/gdi32/bitmap.c b/dlls/gdi32/bitmap.c index 38bc172..0055fe4 100644 --- a/dlls/gdi32/bitmap.c +++ b/dlls/gdi32/bitmap.c @@ -436,7 +436,7 @@ static HGDIOBJ BITMAP_SelectObject( HGDIOBJ handle, HDC hdc ) goto done; } - if (bitmap->header.selcount && (handle != GetStockObject(DEFAULT_BITMAP))) + if (handle != GetStockObject(DEFAULT_BITMAP) && GDI_get_ref_count( handle )) { WARN( "Bitmap already selected in another DC\n" ); GDI_ReleaseObj( handle ); diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index eed57e8..89ac980 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -1589,7 +1589,7 @@ static HGDIOBJ DIB_SelectObject( HGDIOBJ handle, HDC hdc ) goto done; } - if (bitmap->header.selcount) + if (GDI_get_ref_count( handle )) { WARN( "Bitmap already selected in another DC\n" ); GDI_ReleaseObj( handle ); diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 5dadbc2..cb2f9cd 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -61,7 +61,6 @@ typedef struct tagGDIOBJHDR { WORD system : 1; /* system object flag */ WORD deleted : 1; /* whether DeleteObject has been called on this object */ - DWORD selcount; /* number of times the object is selected in a DC */ } GDIOBJHDR; typedef struct tagGdiFont GdiFont; @@ -316,6 +315,7 @@ extern void *free_gdi_handle( HGDIOBJ handle ) DECLSPEC_HIDDEN; extern void *GDI_GetObjPtr( HGDIOBJ, WORD ) DECLSPEC_HIDDEN; extern void GDI_ReleaseObj( HGDIOBJ ) DECLSPEC_HIDDEN; extern void GDI_CheckNotLock(void) DECLSPEC_HIDDEN; +extern UINT GDI_get_ref_count( HGDIOBJ handle ) DECLSPEC_HIDDEN; extern HGDIOBJ GDI_inc_ref_count( HGDIOBJ handle ) DECLSPEC_HIDDEN; extern BOOL GDI_dec_ref_count( HGDIOBJ handle ) DECLSPEC_HIDDEN; extern void GDI_hdc_using_object(HGDIOBJ obj, HDC hdc) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/gdiobj.c b/dlls/gdi32/gdiobj.c index afc0c59..4fe72a9 100644 --- a/dlls/gdi32/gdiobj.c +++ b/dlls/gdi32/gdiobj.c @@ -53,6 +53,7 @@ struct gdi_handle_entry const struct gdi_obj_funcs *funcs; /* type-specific functions */ struct hdc_list *hdcs; /* list of HDCs interested in this object */ WORD type; /* object type (one of the OBJ_* constants) */ + WORD selcount; /* number of times the object is selected in a DC */ }; static struct gdi_handle_entry gdi_handles[MAX_GDI_HANDLES]; @@ -524,21 +525,36 @@ static UINT get_default_charset( void ) /*********************************************************************** + * GDI_get_ref_count + * + * Retrieve the reference count of a GDI object. + * Note: the object must be locked otherwise the count is meaningless. + */ +UINT GDI_get_ref_count( HGDIOBJ handle ) +{ + struct gdi_handle_entry *entry; + UINT ret = 0; + + EnterCriticalSection( &gdi_section ); + if ((entry = handle_entry( handle ))) ret = entry->selcount; + LeaveCriticalSection( &gdi_section ); + return ret; +} + + +/*********************************************************************** * GDI_inc_ref_count * * Increment the reference count of a GDI object. */ HGDIOBJ GDI_inc_ref_count( HGDIOBJ handle ) { - GDIOBJHDR *header; + struct gdi_handle_entry *entry; - if ((header = GDI_GetObjPtr( handle, 0 ))) - { - header->selcount++; - GDI_ReleaseObj( handle ); - } + EnterCriticalSection( &gdi_section ); + if ((entry = handle_entry( handle ))) entry->selcount++; else handle = 0; - + LeaveCriticalSection( &gdi_section ); return handle; } @@ -550,22 +566,24 @@ HGDIOBJ GDI_inc_ref_count( HGDIOBJ handle ) */ BOOL GDI_dec_ref_count( HGDIOBJ handle ) { - GDIOBJHDR *header; + struct gdi_handle_entry *entry; - if ((header = GDI_GetObjPtr( handle, 0 ))) + EnterCriticalSection( &gdi_section ); + if ((entry = handle_entry( handle ))) { - assert( header->selcount ); - if (!--header->selcount && header->deleted) + assert( entry->selcount ); + if (!--entry->selcount && entry->obj->deleted) { /* handle delayed DeleteObject*/ - header->deleted = 0; - GDI_ReleaseObj( handle ); + entry->obj->deleted = 0; + LeaveCriticalSection( &gdi_section ); TRACE( "executing delayed DeleteObject for %p\n", handle ); DeleteObject( handle ); + return TRUE; } - else GDI_ReleaseObj( handle ); } - return header != NULL; + LeaveCriticalSection( &gdi_section ); + return entry != NULL; } @@ -668,7 +686,7 @@ static void dump_gdi_objects( void ) } TRACE( "handle %p obj %p type %s selcount %u deleted %u\n", entry_to_handle( entry ), entry->obj, gdi_obj_type( entry->type ), - entry->obj->selcount, entry->obj->deleted ); + entry->selcount, entry->obj->deleted ); } LeaveCriticalSection( &gdi_section ); } @@ -689,7 +707,6 @@ HGDIOBJ alloc_gdi_handle( GDIOBJHDR *obj, WORD type, const struct gdi_obj_funcs /* initialize the object header */ obj->system = 0; obj->deleted = 0; - obj->selcount = 0; EnterCriticalSection( &gdi_section ); for (i = next_gdi_handle + 1; i < MAX_GDI_HANDLES; i++) @@ -708,6 +725,7 @@ HGDIOBJ alloc_gdi_handle( GDIOBJHDR *obj, WORD type, const struct gdi_obj_funcs entry->funcs = funcs; entry->hdcs = NULL; entry->type = type; + entry->selcount = 0; next_gdi_handle = i; ret = entry_to_handle( entry ); LeaveCriticalSection( &gdi_section ); @@ -829,9 +847,9 @@ BOOL WINAPI DeleteObject( HGDIOBJ obj ) hdcs_head = entry->hdcs; entry->hdcs = NULL; - if (entry->obj->selcount) + if (entry->selcount) { - TRACE("delayed for %p because object in use, count %u\n", obj, entry->obj->selcount ); + TRACE("delayed for %p because object in use, count %u\n", obj, entry->selcount ); entry->obj->deleted = 1; /* mark for delete */ } else funcs = entry->funcs;

1 0

Alexandre Julliard : gdi32: Store the object flags directly in the GDI handle table.
by Alexandre Julliard 17 Oct '12

17 Oct '12

Module: wine Branch: master Commit: dfeeedcf744f43edb146586a27ff321f857122ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfeeedcf744f43edb146586a2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 17 13:20:46 2012 +0200 gdi32: Store the object flags directly in the GDI handle table. --- dlls/gdi32/gdi_private.h | 4 +--- dlls/gdi32/gdiobj.c | 34 ++++++++++++++++++---------------- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index cb2f9cd..792cf63 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -59,8 +59,6 @@ struct gdi_obj_funcs typedef struct tagGDIOBJHDR { - WORD system : 1; /* system object flag */ - WORD deleted : 1; /* whether DeleteObject has been called on this object */ } GDIOBJHDR; typedef struct tagGdiFont GdiFont; @@ -310,7 +308,7 @@ extern BOOL WineEngInit(void) DECLSPEC_HIDDEN; extern BOOL WineEngRemoveFontResourceEx(LPCWSTR, DWORD, PVOID) DECLSPEC_HIDDEN; /* gdiobj.c */ -extern HGDIOBJ alloc_gdi_handle( GDIOBJHDR *obj, WORD type, const struct gdi_obj_funcs *funcs ) DECLSPEC_HIDDEN; +extern HGDIOBJ alloc_gdi_handle( void *obj, WORD type, const struct gdi_obj_funcs *funcs ) DECLSPEC_HIDDEN; extern void *free_gdi_handle( HGDIOBJ handle ) DECLSPEC_HIDDEN; extern void *GDI_GetObjPtr( HGDIOBJ, WORD ) DECLSPEC_HIDDEN; extern void GDI_ReleaseObj( HGDIOBJ ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/gdiobj.c b/dlls/gdi32/gdiobj.c index 4fe72a9..46c9ec3 100644 --- a/dlls/gdi32/gdiobj.c +++ b/dlls/gdi32/gdiobj.c @@ -49,11 +49,13 @@ struct hdc_list struct gdi_handle_entry { - GDIOBJHDR *obj; /* pointer to the object-specific data */ + void *obj; /* pointer to the object-specific data */ const struct gdi_obj_funcs *funcs; /* type-specific functions */ struct hdc_list *hdcs; /* list of HDCs interested in this object */ WORD type; /* object type (one of the OBJ_* constants) */ WORD selcount; /* number of times the object is selected in a DC */ + WORD system : 1; /* system object flag */ + WORD deleted : 1; /* whether DeleteObject has been called on this object */ }; static struct gdi_handle_entry gdi_handles[MAX_GDI_HANDLES]; @@ -479,9 +481,11 @@ static const struct DefaultFontInfo default_fonts[] = */ void CDECL __wine_make_gdi_object_system( HGDIOBJ handle, BOOL set) { - GDIOBJHDR *ptr = GDI_GetObjPtr( handle, 0 ); - ptr->system = !!set; - GDI_ReleaseObj( handle ); + struct gdi_handle_entry *entry; + + EnterCriticalSection( &gdi_section ); + if ((entry = handle_entry( handle ))) entry->system = !!set; + LeaveCriticalSection( &gdi_section ); } /****************************************************************************** @@ -572,10 +576,10 @@ BOOL GDI_dec_ref_count( HGDIOBJ handle ) if ((entry = handle_entry( handle ))) { assert( entry->selcount ); - if (!--entry->selcount && entry->obj->deleted) + if (!--entry->selcount && entry->deleted) { /* handle delayed DeleteObject*/ - entry->obj->deleted = 0; + entry->deleted = 0; LeaveCriticalSection( &gdi_section ); TRACE( "executing delayed DeleteObject for %p\n", handle ); DeleteObject( handle ); @@ -686,7 +690,7 @@ static void dump_gdi_objects( void ) } TRACE( "handle %p obj %p type %s selcount %u deleted %u\n", entry_to_handle( entry ), entry->obj, gdi_obj_type( entry->type ), - entry->selcount, entry->obj->deleted ); + entry->selcount, entry->deleted ); } LeaveCriticalSection( &gdi_section ); } @@ -696,7 +700,7 @@ static void dump_gdi_objects( void ) * * Allocate a GDI handle for an object, which must have been allocated on the process heap. */ -HGDIOBJ alloc_gdi_handle( GDIOBJHDR *obj, WORD type, const struct gdi_obj_funcs *funcs ) +HGDIOBJ alloc_gdi_handle( void *obj, WORD type, const struct gdi_obj_funcs *funcs ) { struct gdi_handle_entry *entry; HGDIOBJ ret; @@ -704,10 +708,6 @@ HGDIOBJ alloc_gdi_handle( GDIOBJHDR *obj, WORD type, const struct gdi_obj_funcs assert( type ); /* type 0 is reserved to mark free entries */ - /* initialize the object header */ - obj->system = 0; - obj->deleted = 0; - EnterCriticalSection( &gdi_section ); for (i = next_gdi_handle + 1; i < MAX_GDI_HANDLES; i++) if (!gdi_handles[i].type) goto found; @@ -726,6 +726,8 @@ HGDIOBJ alloc_gdi_handle( GDIOBJHDR *obj, WORD type, const struct gdi_obj_funcs entry->hdcs = NULL; entry->type = type; entry->selcount = 0; + entry->system = 0; + entry->deleted = 0; next_gdi_handle = i; ret = entry_to_handle( entry ); LeaveCriticalSection( &gdi_section ); @@ -837,7 +839,7 @@ BOOL WINAPI DeleteObject( HGDIOBJ obj ) return FALSE; } - if (entry->obj->system) + if (entry->system) { TRACE("Preserving system object %p\n", obj); LeaveCriticalSection( &gdi_section ); @@ -850,7 +852,7 @@ BOOL WINAPI DeleteObject( HGDIOBJ obj ) if (entry->selcount) { TRACE("delayed for %p because object in use, count %u\n", obj, entry->selcount ); - entry->obj->deleted = 1; /* mark for delete */ + entry->deleted = 1; /* mark for delete */ } else funcs = entry->funcs; @@ -891,7 +893,7 @@ void GDI_hdc_using_object(HGDIOBJ obj, HDC hdc) TRACE("obj %p hdc %p\n", obj, hdc); EnterCriticalSection( &gdi_section ); - if ((entry = handle_entry( obj )) && !entry->obj->system) + if ((entry = handle_entry( obj )) && !entry->system) { for (phdc = entry->hdcs; phdc; phdc = phdc->next) if (phdc->hdc == hdc) break; @@ -919,7 +921,7 @@ void GDI_hdc_not_using_object(HGDIOBJ obj, HDC hdc) TRACE("obj %p hdc %p\n", obj, hdc); EnterCriticalSection( &gdi_section ); - if ((entry = handle_entry( obj )) && !entry->obj->system) + if ((entry = handle_entry( obj )) && !entry->system) { for (pphdc = &entry->hdcs; *pphdc; pphdc = &(*pphdc)->next) if ((*pphdc)->hdc == hdc)

1 0

Alexandre Julliard : gdi32: Get rid of the RGNOBJ type, instead store a pointer to the region itself.
by Alexandre Julliard 17 Oct '12

17 Oct '12

Module: wine Branch: master Commit: 89ecf02ca5ab0ce07850162c383f1ebdbf522658 URL: http://source.winehq.org/git/wine.git/?a=commit;h=89ecf02ca5ab0ce07850162c3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 17 13:28:25 2012 +0200 gdi32: Get rid of the RGNOBJ type, instead store a pointer to the region itself. --- dlls/gdi32/gdi_private.h | 7 ++- dlls/gdi32/region.c | 217 +++++++++++++++++++++------------------------- 2 files changed, 104 insertions(+), 120 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=89ecf02ca5ab0ce078501…

1 0

Alexandre Julliard : gdi32: Get rid of the METAFILEOBJ type, instead store a pointer to the metafile data.
by Alexandre Julliard 17 Oct '12

17 Oct '12

Module: wine Branch: master Commit: 3964aa4a8db926347d12dae84c07f037f3c4fac2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3964aa4a8db926347d12dae84… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 17 13:46:32 2012 +0200 gdi32: Get rid of the METAFILEOBJ type, instead store a pointer to the metafile data. --- dlls/gdi32/metafile.c | 158 ++++++++++++++++++------------------------------- 1 files changed, 58 insertions(+), 100 deletions(-) diff --git a/dlls/gdi32/metafile.c b/dlls/gdi32/metafile.c index fbc88d1..dbbffee 100644 --- a/dlls/gdi32/metafile.c +++ b/dlls/gdi32/metafile.c @@ -71,12 +71,6 @@ typedef struct } METAHEADERDISK; #include "poppack.h" -typedef struct -{ - GDIOBJHDR header; - METAHEADER *mh; -} METAFILEOBJ; - /****************************************************************** * MF_AddHandle @@ -108,31 +102,7 @@ static int MF_AddHandle(HANDLETABLE *ht, UINT htlen, HGDIOBJ hobj) */ HMETAFILE MF_Create_HMETAFILE(METAHEADER *mh) { - HMETAFILE hmf; - METAFILEOBJ *metaObj; - - if (!(metaObj = HeapAlloc( GetProcessHeap(), 0, sizeof(*metaObj) ))) return 0; - metaObj->mh = mh; - if (!(hmf = alloc_gdi_handle( &metaObj->header, OBJ_METAFILE, NULL ))) - HeapFree( GetProcessHeap(), 0, metaObj ); - return hmf; -} - -/****************************************************************** - * MF_GetMetaHeader - * - * Returns ptr to METAHEADER associated with HMETAFILE - */ -static METAHEADER *MF_GetMetaHeader( HMETAFILE hmf ) -{ - METAHEADER *ret = NULL; - METAFILEOBJ * metaObj = GDI_GetObjPtr( hmf, OBJ_METAFILE ); - if (metaObj) - { - ret = metaObj->mh; - GDI_ReleaseObj( hmf ); - } - return ret; + return alloc_gdi_handle( mh, OBJ_METAFILE, NULL ); } /****************************************************************** @@ -164,10 +134,9 @@ static POINT *convert_points( UINT count, const POINTS *pts ) BOOL WINAPI DeleteMetaFile( HMETAFILE hmf ) { - METAFILEOBJ * metaObj = free_gdi_handle( hmf ); - if (!metaObj) return FALSE; - HeapFree( GetProcessHeap(), 0, metaObj->mh ); - return HeapFree( GetProcessHeap(), 0, metaObj ); + METAHEADER *mh = free_gdi_handle( hmf ); + if (!mh) return FALSE; + return HeapFree( GetProcessHeap(), 0, mh ); } /****************************************************************** @@ -312,6 +281,24 @@ METAHEADER *MF_CreateMetaHeaderDisk(METAHEADER *mh, LPCVOID filename, BOOL uni ) return mh; } +/* return a copy of the metafile bits, to be freed with HeapFree */ +static METAHEADER *get_metafile_bits( HMETAFILE hmf ) +{ + METAHEADER *ret, *mh = GDI_GetObjPtr( hmf, OBJ_METAFILE ); + + if (!mh) return NULL; + + if (mh->mtType != METAFILE_DISK) + { + ret = HeapAlloc( GetProcessHeap(), 0, mh->mtSize * 2 ); + if (ret) memcpy( ret, mh, mh->mtSize * 2 ); + } + else ret = MF_LoadDiskBasedMetaFile( mh ); + + GDI_ReleaseObj( hmf ); + return ret; +} + /****************************************************************** * CopyMetaFileW (GDI32.@) * @@ -331,33 +318,25 @@ METAHEADER *MF_CreateMetaHeaderDisk(METAHEADER *mh, LPCVOID filename, BOOL uni ) */ HMETAFILE WINAPI CopyMetaFileW( HMETAFILE hSrcMetaFile, LPCWSTR lpFilename ) { - METAHEADER *mh = MF_GetMetaHeader( hSrcMetaFile ); - METAHEADER *mh2 = NULL; + METAHEADER *mh = get_metafile_bits( hSrcMetaFile ); HANDLE hFile; TRACE("(%p,%s)\n", hSrcMetaFile, debugstr_w(lpFilename)); if(!mh) return 0; - if(mh->mtType == METAFILE_DISK) - mh2 = MF_LoadDiskBasedMetaFile(mh); - else { - mh2 = HeapAlloc( GetProcessHeap(), 0, mh->mtSize * 2 ); - memcpy( mh2, mh, mh->mtSize * 2 ); - } - if(lpFilename) { /* disk based metafile */ DWORD w; if((hFile = CreateFileW(lpFilename, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0)) == INVALID_HANDLE_VALUE) { - HeapFree( GetProcessHeap(), 0, mh2 ); + HeapFree( GetProcessHeap(), 0, mh ); return 0; } - WriteFile(hFile, mh2, mh2->mtSize * 2, &w, NULL); + WriteFile(hFile, mh, mh->mtSize * 2, &w, NULL); CloseHandle(hFile); } - return MF_Create_HMETAFILE( mh2 ); + return MF_Create_HMETAFILE( mh ); } @@ -380,14 +359,23 @@ HMETAFILE WINAPI CopyMetaFileA( HMETAFILE hSrcMetaFile, LPCSTR lpFilename ) return ret; } -/******************************************************************* - * MF_PlayMetaFile +/****************************************************************** + * PlayMetaFile (GDI32.@) + * + * Renders the metafile specified by hmf in the DC specified by + * hdc. Returns FALSE on failure, TRUE on success. + * + * PARAMS + * hdc [I] handle of DC to render in + * hmf [I] handle of metafile to render * - * Helper for PlayMetaFile + * RETURNS + * Success: TRUE + * Failure: FALSE */ -static BOOL MF_PlayMetaFile( HDC hdc, METAHEADER *mh) +BOOL WINAPI PlayMetaFile( HDC hdc, HMETAFILE hmf ) { - + METAHEADER *mh = get_metafile_bits( hmf ); METARECORD *mr; HANDLETABLE *ht; unsigned int offset = 0; @@ -396,14 +384,8 @@ static BOOL MF_PlayMetaFile( HDC hdc, METAHEADER *mh) HBRUSH hBrush; HPALETTE hPal; HRGN hRgn; - BOOL loaded = FALSE; if (!mh) return FALSE; - if(mh->mtType == METAFILE_DISK) { /* Create a memory-based copy */ - mh = MF_LoadDiskBasedMetaFile(mh); - if(!mh) return FALSE; - loaded = TRUE; - } /* save DC */ hPen = GetCurrentObject(hdc, OBJ_PEN); @@ -420,7 +402,11 @@ static BOOL MF_PlayMetaFile( HDC hdc, METAHEADER *mh) /* create the handle table */ ht = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(HANDLETABLE) * mh->mtNoObjects); - if(!ht) return FALSE; + if(!ht) + { + HeapFree( GetProcessHeap(), 0, mh ); + return FALSE; + } /* loop through metafile playing records */ offset = mh->mtHeaderSize * 2; @@ -455,34 +441,12 @@ static BOOL MF_PlayMetaFile( HDC hdc, METAHEADER *mh) if(*(ht->objectHandle + i) != 0) DeleteObject(*(ht->objectHandle + i)); - /* free handle table */ HeapFree( GetProcessHeap(), 0, ht ); - if(loaded) - HeapFree( GetProcessHeap(), 0, mh ); + HeapFree( GetProcessHeap(), 0, mh ); return TRUE; } /****************************************************************** - * PlayMetaFile (GDI32.@) - * - * Renders the metafile specified by hmf in the DC specified by - * hdc. Returns FALSE on failure, TRUE on success. - * - * PARAMS - * hdc [I] handle of DC to render in - * hmf [I] handle of metafile to render - * - * RETURNS - * Success: TRUE - * Failure: FALSE - */ -BOOL WINAPI PlayMetaFile( HDC hdc, HMETAFILE hmf ) -{ - METAHEADER *mh = MF_GetMetaHeader( hmf ); - return MF_PlayMetaFile( hdc, mh ); -} - -/****************************************************************** * EnumMetaFile (GDI32.@) * * Loop through the metafile records in hmf, calling the user-specified @@ -495,7 +459,7 @@ BOOL WINAPI PlayMetaFile( HDC hdc, HMETAFILE hmf ) */ BOOL WINAPI EnumMetaFile(HDC hdc, HMETAFILE hmf, MFENUMPROC lpEnumFunc, LPARAM lpData) { - METAHEADER *mhTemp = NULL, *mh = MF_GetMetaHeader(hmf); + METAHEADER *mh = get_metafile_bits( hmf ); METARECORD *mr; HANDLETABLE *ht; BOOL result = TRUE; @@ -505,14 +469,9 @@ BOOL WINAPI EnumMetaFile(HDC hdc, HMETAFILE hmf, MFENUMPROC lpEnumFunc, LPARAM l HBRUSH hBrush; HFONT hFont; - TRACE("(%p,%p,%p,%p)\n", hdc, hmf, lpEnumFunc, (void*)lpData); + TRACE("(%p,%p,%p,%lx)\n", hdc, hmf, lpEnumFunc, lpData); + if (!mh) return 0; - if(mh->mtType == METAFILE_DISK) - { - /* Create a memory-based copy */ - if (!(mhTemp = MF_LoadDiskBasedMetaFile(mh))) return FALSE; - mh = mhTemp; - } /* save the current pen, brush and font */ hPen = GetCurrentObject(hdc, OBJ_PEN); @@ -534,7 +493,7 @@ BOOL WINAPI EnumMetaFile(HDC hdc, HMETAFILE hmf, MFENUMPROC lpEnumFunc, LPARAM l } TRACE("Calling EnumFunc with record type %x\n", mr->rdFunction); - if (!lpEnumFunc( hdc, ht, mr, mh->mtNoObjects, (LONG)lpData )) + if (!lpEnumFunc( hdc, ht, mr, mh->mtNoObjects, lpData )) { result = FALSE; break; @@ -553,10 +512,8 @@ BOOL WINAPI EnumMetaFile(HDC hdc, HMETAFILE hmf, MFENUMPROC lpEnumFunc, LPARAM l if(*(ht->objectHandle + i) != 0) DeleteObject(*(ht->objectHandle + i)); - /* free handle table */ HeapFree( GetProcessHeap(), 0, ht); - /* free a copy of metafile */ - HeapFree( GetProcessHeap(), 0, mhTemp ); + HeapFree( GetProcessHeap(), 0, mh); return result; } @@ -1129,7 +1086,7 @@ HMETAFILE WINAPI SetMetaFileBitsEx( UINT size, const BYTE *lpData ) */ UINT WINAPI GetMetaFileBitsEx( HMETAFILE hmf, UINT nSize, LPVOID buf ) { - METAHEADER *mh = MF_GetMetaHeader(hmf); + METAHEADER *mh = GDI_GetObjPtr( hmf, OBJ_METAFILE ); UINT mfSize; TRACE("(%p,%d,%p)\n", hmf, nSize, buf); @@ -1137,12 +1094,13 @@ UINT WINAPI GetMetaFileBitsEx( HMETAFILE hmf, UINT nSize, LPVOID buf ) if(mh->mtType == METAFILE_DISK) FIXME("Disk-based metafile?\n"); mfSize = mh->mtSize * 2; - if (!buf) { - TRACE("returning size %d\n", mfSize); - return mfSize; + if (buf) + { + if(mfSize > nSize) mfSize = nSize; + memmove(buf, mh, mfSize); } - if(mfSize > nSize) mfSize = nSize; - memmove(buf, mh, mfSize); + GDI_ReleaseObj( hmf ); + TRACE("returning size %d\n", mfSize); return mfSize; }

1 0

Alexandre Julliard : gdi32: Get rid of the GDIOBJHDR type.
by Alexandre Julliard 17 Oct '12

17 Oct '12

Module: wine Branch: master Commit: df357093ccfd78156e7db3c0a7ff5bead6317341 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df357093ccfd78156e7db3c0a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 17 13:48:45 2012 +0200 gdi32: Get rid of the GDIOBJHDR type. --- dlls/gdi32/bitmap.c | 2 +- dlls/gdi32/brush.c | 3 +-- dlls/gdi32/dc.c | 2 +- dlls/gdi32/dib.c | 2 +- dlls/gdi32/enhmetafile.c | 3 +-- dlls/gdi32/font.c | 3 +-- dlls/gdi32/gdi_private.h | 6 ------ dlls/gdi32/gdiobj.c | 4 ++-- dlls/gdi32/palette.c | 3 +-- dlls/gdi32/pen.c | 5 ++--- 10 files changed, 11 insertions(+), 22 deletions(-) diff --git a/dlls/gdi32/bitmap.c b/dlls/gdi32/bitmap.c index 0055fe4..821f879 100644 --- a/dlls/gdi32/bitmap.c +++ b/dlls/gdi32/bitmap.c @@ -211,7 +211,7 @@ HBITMAP WINAPI CreateBitmapIndirect( const BITMAP *bmp ) bmpobj->dib.dsBm = bm; bmpobj->dib.dsBm.bmBits = NULL; - if (!(hbitmap = alloc_gdi_handle( &bmpobj->header, OBJ_BITMAP, &bitmap_funcs ))) + if (!(hbitmap = alloc_gdi_handle( bmpobj, OBJ_BITMAP, &bitmap_funcs ))) { HeapFree( GetProcessHeap(), 0, bmpobj ); return 0; diff --git a/dlls/gdi32/brush.c b/dlls/gdi32/brush.c index 0516a0f..4f0c17d 100644 --- a/dlls/gdi32/brush.c +++ b/dlls/gdi32/brush.c @@ -34,7 +34,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(gdi); /* GDI logical brush object */ typedef struct { - GDIOBJHDR header; LOGBRUSH logbrush; struct brush_pattern pattern; } BRUSHOBJ; @@ -201,7 +200,7 @@ HBRUSH WINAPI CreateBrushIndirect( const LOGBRUSH * brush ) ptr->logbrush = *brush; if (store_brush_pattern( &ptr->logbrush, &ptr->pattern ) && - (hbrush = alloc_gdi_handle( &ptr->header, OBJ_BRUSH, &brush_funcs ))) + (hbrush = alloc_gdi_handle( ptr, OBJ_BRUSH, &brush_funcs ))) { TRACE("%p\n", hbrush); return hbrush; diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 5a68aa6..8d4cde0 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -118,7 +118,7 @@ DC *alloc_dc_ptr( WORD magic ) reset_bounds( &dc->bounds ); - if (!(dc->hSelf = alloc_gdi_handle( &dc->header, magic, &dc_funcs ))) + if (!(dc->hSelf = alloc_gdi_handle( dc, magic, &dc_funcs ))) { HeapFree( GetProcessHeap(), 0, dc ); return NULL; diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index 89ac980..e5361c1 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -1549,7 +1549,7 @@ HBITMAP WINAPI CreateDIBSection(HDC hdc, CONST BITMAPINFO *bmi, UINT usage, if (!bmp->dib.dsBm.bmBits) goto error; - if (!(ret = alloc_gdi_handle( &bmp->header, OBJ_BITMAP, &dib_funcs ))) goto error; + if (!(ret = alloc_gdi_handle( bmp, OBJ_BITMAP, &dib_funcs ))) goto error; if (bits) *bits = bmp->dib.dsBm.bmBits; return ret; diff --git a/dlls/gdi32/enhmetafile.c b/dlls/gdi32/enhmetafile.c index ea0ce3b..796796e 100644 --- a/dlls/gdi32/enhmetafile.c +++ b/dlls/gdi32/enhmetafile.c @@ -50,7 +50,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(enhmetafile); typedef struct { - GDIOBJHDR header; ENHMETAHEADER *emh; BOOL on_disk; /* true if metafile is on disk */ } ENHMETAFILEOBJ; @@ -270,7 +269,7 @@ HENHMETAFILE EMF_Create_HENHMETAFILE(ENHMETAHEADER *emh, BOOL on_disk ) metaObj->emh = emh; metaObj->on_disk = on_disk; - if (!(hmf = alloc_gdi_handle( &metaObj->header, OBJ_ENHMETAFILE, NULL ))) + if (!(hmf = alloc_gdi_handle( metaObj, OBJ_ENHMETAFILE, NULL ))) HeapFree( GetProcessHeap(), 0, metaObj ); return hmf; } diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 85a27f1..1f26772 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -110,7 +110,6 @@ static const struct gdi_obj_funcs font_funcs = typedef struct { - GDIOBJHDR header; LOGFONTW logfont; } FONTOBJ; @@ -447,7 +446,7 @@ HFONT WINAPI CreateFontIndirectExW( const ENUMLOGFONTEXDVW *penumex ) plf->lfOrientation/10., plf->lfEscapement/10., fontPtr); } - if (!(hFont = alloc_gdi_handle( &fontPtr->header, OBJ_FONT, &font_funcs ))) + if (!(hFont = alloc_gdi_handle( fontPtr, OBJ_FONT, &font_funcs ))) { HeapFree( GetProcessHeap(), 0, fontPtr ); return 0; diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index c3e342a..2f4c297 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -57,15 +57,10 @@ struct gdi_obj_funcs BOOL (*pDeleteObject)( HGDIOBJ handle ); }; -typedef struct tagGDIOBJHDR -{ -} GDIOBJHDR; - typedef struct tagGdiFont GdiFont; typedef struct tagDC { - GDIOBJHDR header; HDC hSelf; /* Handle to this DC */ struct gdi_physdev nulldrv; /* physdev for the null driver */ PHYSDEV physDev; /* current top of the physdev stack */ @@ -180,7 +175,6 @@ static inline PHYSDEV find_dc_driver( DC *dc, const struct gdi_dc_funcs *funcs ) typedef struct tagBITMAPOBJ { - GDIOBJHDR header; DIBSECTION dib; SIZE size; /* For SetBitmapDimension() */ RGBQUAD *color_table; /* DIB color table if <= 8bpp (always 1 << bpp in size) */ diff --git a/dlls/gdi32/gdiobj.c b/dlls/gdi32/gdiobj.c index 46c9ec3..aa8db8c 100644 --- a/dlls/gdi32/gdiobj.c +++ b/dlls/gdi32/gdiobj.c @@ -744,7 +744,7 @@ HGDIOBJ alloc_gdi_handle( void *obj, WORD type, const struct gdi_obj_funcs *func */ void *free_gdi_handle( HGDIOBJ handle ) { - GDIOBJHDR *object = NULL; + void *object = NULL; struct gdi_handle_entry *entry; EnterCriticalSection( &gdi_section ); @@ -769,7 +769,7 @@ void *free_gdi_handle( HGDIOBJ handle ) */ void *GDI_GetObjPtr( HGDIOBJ handle, WORD type ) { - GDIOBJHDR *ptr = NULL; + void *ptr = NULL; struct gdi_handle_entry *entry; EnterCriticalSection( &gdi_section ); diff --git a/dlls/gdi32/palette.c b/dlls/gdi32/palette.c index afb723b..6a29c76 100644 --- a/dlls/gdi32/palette.c +++ b/dlls/gdi32/palette.c @@ -42,7 +42,6 @@ typedef BOOL (*unrealize_function)(HPALETTE); typedef struct tagPALETTEOBJ { - GDIOBJHDR header; unrealize_function unrealize; WORD version; /* palette version */ WORD count; /* count of palette entries */ @@ -130,7 +129,7 @@ HPALETTE WINAPI CreatePalette( return 0; } memcpy( palettePtr->entries, palette->palPalEntry, size ); - if (!(hpalette = alloc_gdi_handle( &palettePtr->header, OBJ_PAL, &palette_funcs ))) + if (!(hpalette = alloc_gdi_handle( palettePtr, OBJ_PAL, &palette_funcs ))) { HeapFree( GetProcessHeap(), 0, palettePtr->entries ); HeapFree( GetProcessHeap(), 0, palettePtr ); diff --git a/dlls/gdi32/pen.c b/dlls/gdi32/pen.c index 94c3933..2ae2f2b 100644 --- a/dlls/gdi32/pen.c +++ b/dlls/gdi32/pen.c @@ -36,7 +36,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(gdi); /* GDI logical pen object */ typedef struct { - GDIOBJHDR header; struct brush_pattern pattern; EXTLOGPEN logpen; } PENOBJ; @@ -113,7 +112,7 @@ HPEN WINAPI CreatePenIndirect( const LOGPEN * pen ) break; } - if (!(hpen = alloc_gdi_handle( &penPtr->header, OBJ_PEN, &pen_funcs ))) + if (!(hpen = alloc_gdi_handle( penPtr, OBJ_PEN, &pen_funcs ))) HeapFree( GetProcessHeap(), 0, penPtr ); return hpen; } @@ -203,7 +202,7 @@ HPEN WINAPI ExtCreatePen( DWORD style, DWORD width, penPtr->logpen.elpNumEntries = style_count; memcpy(penPtr->logpen.elpStyleEntry, style_bits, style_count * sizeof(DWORD)); - if (!(hpen = alloc_gdi_handle( &penPtr->header, OBJ_EXTPEN, &pen_funcs ))) + if (!(hpen = alloc_gdi_handle( penPtr, OBJ_EXTPEN, &pen_funcs ))) { free_brush_pattern( &penPtr->pattern ); HeapFree( GetProcessHeap(), 0, penPtr );

1 0

Jacek Caban : mshtml: Added HTMLImgElement::onabort implementation.
by Alexandre Julliard 17 Oct '12

17 Oct '12

Module: wine Branch: master Commit: 5e0f624c418b9668b03f3ee70a43e289aef91c59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e0f624c418b9668b03f3ee70… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 17 12:18:30 2012 +0200 mshtml: Added HTMLImgElement::onabort implementation. --- dlls/mshtml/htmlevent.c | 7 ++++++- dlls/mshtml/htmlevent.h | 1 + dlls/mshtml/htmlimg.c | 12 ++++++++---- 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 94a9e7e..b2dfa61 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -45,6 +45,9 @@ struct event_target_t { handler_vector_t *event_table[EVENTID_LAST]; }; +static const WCHAR abortW[] = {'a','b','o','r','t',0}; +static const WCHAR onabortW[] = {'o','n','a','b','o','r','t',0}; + static const WCHAR beforeunloadW[] = {'b','e','f','o','r','e','u','n','l','o','a','d',0}; static const WCHAR onbeforeunloadW[] = {'o','n','b','e','f','o','r','e','u','n','l','o','a','d',0}; @@ -160,6 +163,8 @@ typedef struct { #define EVENT_HASDEFAULTHANDLERS 0x0020 static const event_info_t event_info[] = { + {abortW, onabortW, EVENTT_NONE, DISPID_EVMETH_ONABORT, + EVENT_NODEHANDLER}, {beforeunloadW, onbeforeunloadW, EVENTT_NONE, DISPID_EVMETH_ONBEFOREUNLOAD, EVENT_DEFAULTLISTENER|EVENT_FORWARDBODY}, {blurW, onblurW, EVENTT_HTML, DISPID_EVMETH_ONBLUR, @@ -216,7 +221,7 @@ static const event_info_t event_info[] = { EVENT_DEFAULTLISTENER|EVENT_BUBBLE|EVENT_CANCELABLE} }; -static const eventid_t node_handled_list[] = { EVENTID_ERROR, EVENTID_LOAD }; +static const eventid_t node_handled_list[] = { EVENTID_ABORT, EVENTID_ERROR, EVENTID_LOAD }; eventid_t str_to_eid(LPCWSTR str) { diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h index 174d2f7..8aa8ed1 100644 --- a/dlls/mshtml/htmlevent.h +++ b/dlls/mshtml/htmlevent.h @@ -17,6 +17,7 @@ */ typedef enum { + EVENTID_ABORT, EVENTID_BEFOREUNLOAD, EVENTID_BLUR, EVENTID_CHANGE, diff --git a/dlls/mshtml/htmlimg.c b/dlls/mshtml/htmlimg.c index bc6ec80..4ca02fc 100644 --- a/dlls/mshtml/htmlimg.c +++ b/dlls/mshtml/htmlimg.c @@ -429,15 +429,19 @@ static HRESULT WINAPI HTMLImgElement_get_onerror(IHTMLImgElement *iface, VARIANT static HRESULT WINAPI HTMLImgElement_put_onabort(IHTMLImgElement *iface, VARIANT v) { HTMLImgElement *This = impl_from_IHTMLImgElement(iface); - FIXME("(%p)->()\n", This); - return E_NOTIMPL; + + TRACE("(%p)->()\n", This); + + return set_node_event(&This->element.node, EVENTID_ABORT, &v); } static HRESULT WINAPI HTMLImgElement_get_onabort(IHTMLImgElement *iface, VARIANT *p) { HTMLImgElement *This = impl_from_IHTMLImgElement(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_node_event(&This->element.node, EVENTID_ABORT, p); } static HRESULT WINAPI HTMLImgElement_put_name(IHTMLImgElement *iface, BSTR v)

1 0

Jacek Caban : mshtml: Added IOmNavigator::onLine semi-stub.
by Alexandre Julliard 17 Oct '12

17 Oct '12

Module: wine Branch: master Commit: 75994335e3b3080072c487116cdeb2ec95464ea4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=75994335e3b3080072c487116… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 17 12:18:48 2012 +0200 mshtml: Added IOmNavigator::onLine semi-stub. --- dlls/mshtml/omnavigator.c | 7 +++++-- dlls/mshtml/tests/dom.c | 6 ++++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/omnavigator.c b/dlls/mshtml/omnavigator.c index 73bb0bb..6d7ec15 100644 --- a/dlls/mshtml/omnavigator.c +++ b/dlls/mshtml/omnavigator.c @@ -881,8 +881,11 @@ static HRESULT WINAPI OmNavigator_get_connectionSpeed(IOmNavigator *iface, LONG static HRESULT WINAPI OmNavigator_get_onLine(IOmNavigator *iface, VARIANT_BOOL *p) { OmNavigator *This = impl_from_IOmNavigator(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + WARN("(%p)->(%p) semi-stub, returning true\n", This, p); + + *p = VARIANT_TRUE; + return S_OK; } static HRESULT WINAPI OmNavigator_get_userProfile(IOmNavigator *iface, IHTMLOpsProfile **p) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 02ba3ef..ea54b4d 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -4496,6 +4496,7 @@ static void test_navigator(IHTMLDocument2 *doc) { IHTMLWindow2 *window; IOmNavigator *navigator, *navigator2; + VARIANT_BOOL b; char buf[512]; DWORD size; ULONG ref; @@ -4581,6 +4582,11 @@ static void test_navigator(IHTMLDocument2 *doc) ok(!strcmp_wa(bstr, "[object]"), "toString returned %s\n", wine_dbgstr_w(bstr)); SysFreeString(bstr); + b = 100; + hres = IOmNavigator_get_onLine(navigator, &b); + ok(hres == S_OK, "get_onLine failed: %08x\n", hres); + ok(b == VARIANT_TRUE, "onLine = %x\n", b); + size = sizeof(buf); hres = ObtainUserAgentString(0, buf, &size); ok(hres == S_OK, "ObtainUserAgentString failed: %08x\n", hres);

1 0

Jacek Caban : mshtml: Use detach_inner_window in release_inner_window.
by Alexandre Julliard 17 Oct '12

17 Oct '12

Module: wine Branch: master Commit: d1c1f9e8300786cfe6a4f113bc26b529e694c6ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1c1f9e8300786cfe6a4f113b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 17 12:19:12 2012 +0200 mshtml: Use detach_inner_window in release_inner_window. --- dlls/mshtml/htmlevent.c | 4 +++- dlls/mshtml/htmlwindow.c | 27 ++++++++++++++------------- 2 files changed, 17 insertions(+), 14 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index b2dfa61..641d453 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -1312,8 +1312,10 @@ void detach_events(HTMLDocumentNode *doc) int i; for(i=0; i < EVENTID_LAST; i++) { - if(doc->event_vector[i]) + if(doc->event_vector[i]) { detach_nsevent(doc, event_info[i].name); + doc->event_vector[i] = FALSE; + } } } diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 92659cf..f9995d7 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -106,23 +106,23 @@ static inline HRESULT get_window_event(HTMLWindow *window, eventid_t eid, VARIAN return get_event_handler(&window->inner_window->doc->body_event_target, eid, var); } -static void detach_inner_window(HTMLOuterWindow *outer_window) +static void detach_inner_window(HTMLInnerWindow *window) { - HTMLInnerWindow *window = outer_window->base.inner_window; - - if(!window) - return; + HTMLOuterWindow *outer_window = window->base.outer_window; - if(outer_window->doc_obj && outer_window == outer_window->doc_obj->basedoc.window) + if(outer_window && outer_window->doc_obj && outer_window == outer_window->doc_obj->basedoc.window) window->doc->basedoc.cp_container.forward_container = NULL; - detach_events(window->doc); + if(window->doc) + detach_events(window->doc); abort_window_bindings(window); release_script_hosts(window); - window->doc->basedoc.window = NULL; window->base.outer_window = NULL; - IHTMLWindow2_Release(&window->base.IHTMLWindow2_iface); + if(outer_window && outer_window->base.inner_window == window) { + outer_window->base.inner_window = NULL; + IHTMLWindow2_Release(&window->base.IHTMLWindow2_iface); + } } static inline HTMLWindow *impl_from_IHTMLWindow2(IHTMLWindow2 *iface) @@ -206,7 +206,8 @@ static void release_outer_window(HTMLOuterWindow *This) remove_target_tasks(This->task_magic); set_current_mon(This, NULL); - detach_inner_window(This); + if(This->base.inner_window) + detach_inner_window(This->base.inner_window); release_children(This); if(This->secmgr) @@ -231,9 +232,8 @@ static void release_inner_window(HTMLInnerWindow *This) TRACE("%p\n", This); + detach_inner_window(This); remove_target_tasks(This->task_magic); - abort_window_bindings(This); - release_script_hosts(This); if(This->doc) { This->doc->window = NULL; @@ -2877,7 +2877,8 @@ HRESULT update_window_doc(HTMLInnerWindow *window) return S_OK; } - detach_inner_window(outer_window); + if(outer_window->base.inner_window) + detach_inner_window(outer_window->base.inner_window); outer_window->base.inner_window = window; outer_window->pending_window = NULL;

1 0

Jacek Caban : mshtml: Make HTMLInnerWindow the owner of timers.
by Alexandre Julliard 17 Oct '12

17 Oct '12

Module: wine Branch: master Commit: 4a491ea7e48a3a5f03f765f981fd5db0f0f2848a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a491ea7e48a3a5f03f765f98… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 17 12:19:34 2012 +0200 mshtml: Make HTMLInnerWindow the owner of timers. --- dlls/mshtml/htmlwindow.c | 6 +++--- dlls/mshtml/mshtml_private.h | 4 ++-- dlls/mshtml/task.c | 12 ++++++------ 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index f9995d7..209a649 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -567,7 +567,7 @@ static HRESULT WINAPI HTMLWindow2_clearTimeout(IHTMLWindow2 *iface, LONG timerID TRACE("(%p)->(%d)\n", This, timerID); - return clear_task_timer(&This->inner_window->doc->basedoc, FALSE, timerID); + return clear_task_timer(This->inner_window, FALSE, timerID); } #define MAX_MESSAGE_LEN 2000 @@ -1243,7 +1243,7 @@ static HRESULT WINAPI HTMLWindow2_clearInterval(IHTMLWindow2 *iface, LONG timerI TRACE("(%p)->(%d)\n", This, timerID); - return clear_task_timer(&This->inner_window->doc->basedoc, TRUE, timerID); + return clear_task_timer(This->inner_window, TRUE, timerID); } static HRESULT WINAPI HTMLWindow2_put_offscreenBuffering(IHTMLWindow2 *iface, VARIANT v) @@ -1563,7 +1563,7 @@ static HRESULT window_set_timer(HTMLInnerWindow *This, VARIANT *expr, LONG msec, if(!disp) return E_FAIL; - *timer_id = set_task_timer(&This->doc->basedoc, msec, interval, disp); + *timer_id = set_task_timer(This, msec, interval, disp); IDispatch_Release(disp); return S_OK; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 737731f..c54a865 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -980,8 +980,8 @@ LONG get_task_target_magic(void) DECLSPEC_HIDDEN; void push_task(task_t*,task_proc_t,task_proc_t,LONG) DECLSPEC_HIDDEN; void remove_target_tasks(LONG) DECLSPEC_HIDDEN; -DWORD set_task_timer(HTMLDocument*,DWORD,BOOL,IDispatch*) DECLSPEC_HIDDEN; -HRESULT clear_task_timer(HTMLDocument*,BOOL,DWORD) DECLSPEC_HIDDEN; +DWORD set_task_timer(HTMLInnerWindow*,DWORD,BOOL,IDispatch*) DECLSPEC_HIDDEN; +HRESULT clear_task_timer(HTMLInnerWindow*,BOOL,DWORD) DECLSPEC_HIDDEN; const char *debugstr_variant(const VARIANT*) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/task.c b/dlls/mshtml/task.c index a38437c..0fea1ca 100644 --- a/dlls/mshtml/task.c +++ b/dlls/mshtml/task.c @@ -38,7 +38,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); #define TIMER_ID 0x3000 typedef struct { - HTMLDocument *doc; + HTMLInnerWindow *window; DWORD id; DWORD time; DWORD interval; @@ -107,7 +107,7 @@ void remove_target_tasks(LONG target) LIST_FOR_EACH_SAFE(liter, ltmp, &thread_data->timer_list) { timer = LIST_ENTRY(liter, task_timer_t, entry); - if(timer->doc->task_magic == target) + if(timer->window->task_magic == target) release_task_timer(thread_data->thread_hwnd, timer); } @@ -163,7 +163,7 @@ static BOOL queue_timer(thread_data_t *thread_data, task_timer_t *timer) return FALSE; } -DWORD set_task_timer(HTMLDocument *doc, DWORD msec, BOOL interval, IDispatch *disp) +DWORD set_task_timer(HTMLInnerWindow *window, DWORD msec, BOOL interval, IDispatch *disp) { thread_data_t *thread_data = get_thread_data(TRUE); task_timer_t *timer; @@ -173,7 +173,7 @@ DWORD set_task_timer(HTMLDocument *doc, DWORD msec, BOOL interval, IDispatch *di timer = heap_alloc(sizeof(task_timer_t)); timer->id = id_cnt++; - timer->doc = doc; + timer->window = window; timer->time = tc + msec; timer->interval = interval ? msec : 0; list_init(&timer->entry); @@ -187,7 +187,7 @@ DWORD set_task_timer(HTMLDocument *doc, DWORD msec, BOOL interval, IDispatch *di return timer->id; } -HRESULT clear_task_timer(HTMLDocument *doc, BOOL interval, DWORD id) +HRESULT clear_task_timer(HTMLInnerWindow *window, BOOL interval, DWORD id) { thread_data_t *thread_data = get_thread_data(FALSE); task_timer_t *iter; @@ -196,7 +196,7 @@ HRESULT clear_task_timer(HTMLDocument *doc, BOOL interval, DWORD id) return S_OK; LIST_FOR_EACH_ENTRY(iter, &thread_data->timer_list, task_timer_t, entry) { - if(iter->id == id && iter->doc == doc && (iter->interval == 0) == !interval) { + if(iter->id == id && iter->window == window && !iter->interval == !interval) { release_task_timer(thread_data->thread_hwnd, iter); return S_OK; }

1 0