October 2012 - Wine-Commits

Jacek Caban : mshtml: Fixed trace message.
by Alexandre Julliard Oct. 17, 2012

Oct. 17, 2012

Module: wine Branch: master Commit: 1dae62f0a98968c1a962d8c0905af0d24061ba2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=1dae62f0a98968c1a962d8c09… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 17 12:20:06 2012 +0200 mshtml: Fixed trace message. --- dlls/mshtml/htmlscript.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/htmlscript.c b/dlls/mshtml/htmlscript.c index befc577..2dc25de 100644 --- a/dlls/mshtml/htmlscript.c +++ b/dlls/mshtml/htmlscript.c @@ -100,7 +100,7 @@ static HRESULT WINAPI HTMLScriptElement_put_src(IHTMLScriptElement *iface, BSTR nsAString src_str; nsresult nsres; - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); if(!This->element.node.doc || !This->element.node.doc->window) { WARN("no windoow\n");

1 0

Jacek Caban : mshtml: Moved remove_target_tasks to detach_inner_window.
by Alexandre Julliard Oct. 17, 2012

Oct. 17, 2012

Module: wine Branch: master Commit: 81e106cfa218ab09b9f7bb108546616bb6986ee2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=81e106cfa218ab09b9f7bb108… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 17 12:19:53 2012 +0200 mshtml: Moved remove_target_tasks to detach_inner_window. --- dlls/mshtml/htmlwindow.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 209a649..59b02ab 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -116,6 +116,7 @@ static void detach_inner_window(HTMLInnerWindow *window) if(window->doc) detach_events(window->doc); abort_window_bindings(window); + remove_target_tasks(window->task_magic); release_script_hosts(window); window->base.outer_window = NULL; @@ -233,7 +234,6 @@ static void release_inner_window(HTMLInnerWindow *This) TRACE("%p\n", This); detach_inner_window(This); - remove_target_tasks(This->task_magic); if(This->doc) { This->doc->window = NULL;

1 0

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

Oct. 17, 2012

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

Jacek Caban : mshtml: Use detach_inner_window in release_inner_window.
by Alexandre Julliard Oct. 17, 2012

Oct. 17, 2012

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

Alexandre Julliard : gdi32: Store the HDC list directly in the GDI handle table.
by Alexandre Julliard Oct. 17, 2012

Oct. 17, 2012

Module: wine Branch: master Commit: 2e693d00c9bc38009d305b04b6425ce7b67ceffd URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e693d00c9bc38009d305b04b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 17 13:03:18 2012 +0200 gdi32: Store the HDC list directly in the GDI handle table. --- dlls/gdi32/gdi_private.h | 11 +----- dlls/gdi32/gdiobj.c | 87 ++++++++++++++++++++------------------------- 2 files changed, 41 insertions(+), 57 deletions(-) diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 36566b1..5dadbc2 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -57,18 +57,11 @@ struct gdi_obj_funcs BOOL (*pDeleteObject)( HGDIOBJ handle ); }; -struct hdc_list -{ - HDC hdc; - struct hdc_list *next; -}; - 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 */ - struct hdc_list *hdcs; } GDIOBJHDR; typedef struct tagGdiFont GdiFont; @@ -325,8 +318,8 @@ extern void GDI_ReleaseObj( HGDIOBJ ) DECLSPEC_HIDDEN; extern void GDI_CheckNotLock(void) DECLSPEC_HIDDEN; extern HGDIOBJ GDI_inc_ref_count( HGDIOBJ handle ) DECLSPEC_HIDDEN; extern BOOL GDI_dec_ref_count( HGDIOBJ handle ) DECLSPEC_HIDDEN; -extern BOOL GDI_hdc_using_object(HGDIOBJ obj, HDC hdc) DECLSPEC_HIDDEN; -extern BOOL GDI_hdc_not_using_object(HGDIOBJ obj, HDC hdc) DECLSPEC_HIDDEN; +extern void GDI_hdc_using_object(HGDIOBJ obj, HDC hdc) DECLSPEC_HIDDEN; +extern void GDI_hdc_not_using_object(HGDIOBJ obj, HDC hdc) DECLSPEC_HIDDEN; /* metafile.c */ extern HMETAFILE MF_Create_HMETAFILE(METAHEADER *mh) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/gdiobj.c b/dlls/gdi32/gdiobj.c index 2e32de9..750e95b 100644 --- a/dlls/gdi32/gdiobj.c +++ b/dlls/gdi32/gdiobj.c @@ -41,10 +41,17 @@ WINE_DEFAULT_DEBUG_CHANNEL(gdi); #define FIRST_GDI_HANDLE 16 #define MAX_GDI_HANDLES 16384 +struct hdc_list +{ + HDC hdc; + struct hdc_list *next; +}; + struct gdi_handle_entry { GDIOBJHDR *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) */ }; @@ -683,7 +690,6 @@ HGDIOBJ alloc_gdi_handle( GDIOBJHDR *obj, WORD type, const struct gdi_obj_funcs obj->system = 0; obj->deleted = 0; obj->selcount = 0; - obj->hdcs = NULL; EnterCriticalSection( &gdi_section ); for (i = next_gdi_handle + 1; i < MAX_GDI_HANDLES; i++) @@ -700,6 +706,7 @@ HGDIOBJ alloc_gdi_handle( GDIOBJHDR *obj, WORD type, const struct gdi_obj_funcs entry = &gdi_handles[i]; entry->obj = obj; entry->funcs = funcs; + entry->hdcs = NULL; entry->type = type; next_gdi_handle = i; ret = entry_to_handle( entry ); @@ -819,11 +826,11 @@ BOOL WINAPI DeleteObject( HGDIOBJ obj ) return TRUE; } - while ((hdcs_head = entry->obj->hdcs) != NULL) + while ((hdcs_head = entry->hdcs) != NULL) { DC *dc = get_dc_ptr(hdcs_head->hdc); - entry->obj->hdcs = hdcs_head->next; + entry->hdcs = hdcs_head->next; TRACE("hdc %p has interest in %p\n", hdcs_head->hdc, obj); if(dc) @@ -861,70 +868,54 @@ BOOL WINAPI DeleteObject( HGDIOBJ obj ) * * Call this if the dc requires DeleteObject notification */ -BOOL GDI_hdc_using_object(HGDIOBJ obj, HDC hdc) +void GDI_hdc_using_object(HGDIOBJ obj, HDC hdc) { - GDIOBJHDR * header; - struct hdc_list **pphdc; + struct gdi_handle_entry *entry; + struct hdc_list *phdc; TRACE("obj %p hdc %p\n", obj, hdc); - if (!(header = GDI_GetObjPtr( obj, 0 ))) return FALSE; - - if (header->system) + EnterCriticalSection( &gdi_section ); + if ((entry = handle_entry( obj )) && !entry->obj->system) { - GDI_ReleaseObj(obj); - return FALSE; - } - - for(pphdc = &header->hdcs; *pphdc; pphdc = &(*pphdc)->next) - if((*pphdc)->hdc == hdc) - break; + for (phdc = entry->hdcs; phdc; phdc = phdc->next) + if (phdc->hdc == hdc) break; - if(!*pphdc) { - *pphdc = HeapAlloc(GetProcessHeap(), 0, sizeof(**pphdc)); - (*pphdc)->hdc = hdc; - (*pphdc)->next = NULL; + if (!phdc) + { + phdc = HeapAlloc(GetProcessHeap(), 0, sizeof(*phdc)); + phdc->hdc = hdc; + phdc->next = entry->hdcs; + entry->hdcs = phdc; + } } - - GDI_ReleaseObj(obj); - return TRUE; + LeaveCriticalSection( &gdi_section ); } /*********************************************************************** * GDI_hdc_not_using_object * */ -BOOL GDI_hdc_not_using_object(HGDIOBJ obj, HDC hdc) +void GDI_hdc_not_using_object(HGDIOBJ obj, HDC hdc) { - GDIOBJHDR * header; - struct hdc_list *phdc, **prev; + struct gdi_handle_entry *entry; + struct hdc_list **pphdc; TRACE("obj %p hdc %p\n", obj, hdc); - if (!(header = GDI_GetObjPtr( obj, 0 ))) return FALSE; - - if (header->system) + EnterCriticalSection( &gdi_section ); + if ((entry = handle_entry( obj )) && !entry->obj->system) { - GDI_ReleaseObj(obj); - return FALSE; + for (pphdc = &entry->hdcs; *pphdc; pphdc = &(*pphdc)->next) + if ((*pphdc)->hdc == hdc) + { + struct hdc_list *phdc = *pphdc; + *pphdc = phdc->next; + HeapFree(GetProcessHeap(), 0, phdc); + break; + } } - - phdc = header->hdcs; - prev = &header->hdcs; - - while(phdc) { - if(phdc->hdc == hdc) { - *prev = phdc->next; - HeapFree(GetProcessHeap(), 0, phdc); - phdc = *prev; - } else { - prev = &phdc->next; - phdc = phdc->next; - } - } - - GDI_ReleaseObj(obj); - return TRUE; + LeaveCriticalSection( &gdi_section ); } /***********************************************************************

1 0

Alexandre Julliard : gdi32: Store the object function table directly in the GDI handle table.
by Alexandre Julliard Oct. 17, 2012

Oct. 17, 2012

Module: wine Branch: master Commit: cf3cafdc18d1f839f67e0237cfbb608944746b1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf3cafdc18d1f839f67e0237c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 17 12:43:23 2012 +0200 gdi32: Store the object function table directly in the GDI handle table. --- dlls/gdi32/gdi_private.h | 1 - dlls/gdi32/gdiobj.c | 133 +++++++++++++++++++++------------------------- 2 files changed, 60 insertions(+), 74 deletions(-) diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 9c926d4..36566b1 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -68,7 +68,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 */ - const struct gdi_obj_funcs *funcs; struct hdc_list *hdcs; } GDIOBJHDR; diff --git a/dlls/gdi32/gdiobj.c b/dlls/gdi32/gdiobj.c index 0cd182a..2e32de9 100644 --- a/dlls/gdi32/gdiobj.c +++ b/dlls/gdi32/gdiobj.c @@ -44,6 +44,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(gdi); struct gdi_handle_entry { GDIOBJHDR *obj; /* pointer to the object-specific data */ + const struct gdi_obj_funcs *funcs; /* type-specific functions */ WORD type; /* object type (one of the OBJ_* constants) */ }; @@ -682,7 +683,6 @@ HGDIOBJ alloc_gdi_handle( GDIOBJHDR *obj, WORD type, const struct gdi_obj_funcs obj->system = 0; obj->deleted = 0; obj->selcount = 0; - obj->funcs = funcs; obj->hdcs = NULL; EnterCriticalSection( &gdi_section ); @@ -699,6 +699,7 @@ HGDIOBJ alloc_gdi_handle( GDIOBJHDR *obj, WORD type, const struct gdi_obj_funcs found: entry = &gdi_handles[i]; entry->obj = obj; + entry->funcs = funcs; entry->type = type; next_gdi_handle = i; ret = entry_to_handle( entry ); @@ -728,11 +729,6 @@ void *free_gdi_handle( HGDIOBJ handle ) entry->type = 0; } LeaveCriticalSection( &gdi_section ); - - if (object) - { - object->funcs = NULL; - } return object; } @@ -805,60 +801,59 @@ void GDI_CheckNotLock(void) */ BOOL WINAPI DeleteObject( HGDIOBJ obj ) { - /* Check if object is valid */ - + struct gdi_handle_entry *entry; struct hdc_list *hdcs_head; const struct gdi_obj_funcs *funcs; - GDIOBJHDR * header; - - if (HIWORD(obj)) return FALSE; - if (!(header = GDI_GetObjPtr( obj, 0 ))) return FALSE; + EnterCriticalSection( &gdi_section ); + if (!(entry = handle_entry( obj ))) + { + LeaveCriticalSection( &gdi_section ); + return FALSE; + } - if (header->system) + if (entry->obj->system) { TRACE("Preserving system object %p\n", obj); - GDI_ReleaseObj( obj ); + LeaveCriticalSection( &gdi_section ); return TRUE; } - while ((hdcs_head = header->hdcs) != NULL) + while ((hdcs_head = entry->obj->hdcs) != NULL) { DC *dc = get_dc_ptr(hdcs_head->hdc); - header->hdcs = hdcs_head->next; + entry->obj->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 ); - GDI_ReleaseObj( obj ); /* release the GDI lock */ + LeaveCriticalSection( &gdi_section ); physdev->funcs->pDeleteObject( physdev, obj ); - header = GDI_GetObjPtr( obj, 0 ); /* and grab it again */ + EnterCriticalSection( &gdi_section ); /* and grab it again */ + entry = handle_entry( obj ); release_dc_ptr( dc ); } HeapFree(GetProcessHeap(), 0, hdcs_head); - if (!header) return FALSE; + if (!entry) return FALSE; } - if (header->selcount) + if (entry->obj->selcount) { - TRACE("delayed for %p because object in use, count %u\n", obj, header->selcount ); - header->deleted = 1; /* mark for delete */ - GDI_ReleaseObj( obj ); + 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; } - TRACE("%p\n", obj ); + funcs = entry->funcs; + LeaveCriticalSection( &gdi_section ); - /* Delete object */ + TRACE("%p\n", obj ); - funcs = header->funcs; - GDI_ReleaseObj( obj ); - if (funcs && funcs->pDeleteObject) - return funcs->pDeleteObject( obj ); - else - return FALSE; + if (funcs && funcs->pDeleteObject) return funcs->pDeleteObject( obj ); + return FALSE; } /*********************************************************************** @@ -950,26 +945,25 @@ HGDIOBJ WINAPI GetStockObject( INT obj ) */ INT WINAPI GetObjectA( HGDIOBJ handle, INT count, LPVOID buffer ) { - const struct gdi_obj_funcs *funcs; - GDIOBJHDR * ptr; + struct gdi_handle_entry *entry; + const struct gdi_obj_funcs *funcs = NULL; INT result = 0; TRACE("%p %d %p\n", handle, count, buffer ); - if (!(ptr = GDI_GetObjPtr( handle, 0 ))) return 0; - funcs = ptr->funcs; - GDI_ReleaseObj( handle ); + EnterCriticalSection( &gdi_section ); + if ((entry = handle_entry( handle ))) funcs = entry->funcs; + LeaveCriticalSection( &gdi_section ); - if (funcs && funcs->pGetObjectA) + if (funcs) { - if (buffer && ((ULONG_PTR)buffer >> 16) == 0) /* catch apps getting argument order wrong */ + if (!funcs->pGetObjectA) + SetLastError( ERROR_INVALID_HANDLE ); + else if (buffer && ((ULONG_PTR)buffer >> 16) == 0) /* catch apps getting argument order wrong */ SetLastError( ERROR_NOACCESS ); else result = funcs->pGetObjectA( handle, count, buffer ); } - else - SetLastError( ERROR_INVALID_HANDLE ); - return result; } @@ -978,25 +972,25 @@ INT WINAPI GetObjectA( HGDIOBJ handle, INT count, LPVOID buffer ) */ INT WINAPI GetObjectW( HGDIOBJ handle, INT count, LPVOID buffer ) { - const struct gdi_obj_funcs *funcs; - GDIOBJHDR * ptr; + struct gdi_handle_entry *entry; + const struct gdi_obj_funcs *funcs = NULL; INT result = 0; + TRACE("%p %d %p\n", handle, count, buffer ); - if (!(ptr = GDI_GetObjPtr( handle, 0 ))) return 0; - funcs = ptr->funcs; - GDI_ReleaseObj( handle ); + EnterCriticalSection( &gdi_section ); + if ((entry = handle_entry( handle ))) funcs = entry->funcs; + LeaveCriticalSection( &gdi_section ); - if (funcs && funcs->pGetObjectW) + if (funcs) { - if (buffer && ((ULONG_PTR)buffer >> 16) == 0) /* catch apps getting argument order wrong */ + if (!funcs->pGetObjectW) + SetLastError( ERROR_INVALID_HANDLE ); + else if (buffer && ((ULONG_PTR)buffer >> 16) == 0) /* catch apps getting argument order wrong */ SetLastError( ERROR_NOACCESS ); else result = funcs->pGetObjectW( handle, count, buffer ); } - else - SetLastError( ERROR_INVALID_HANDLE ); - return result; } @@ -1083,19 +1077,17 @@ HGDIOBJ WINAPI GetCurrentObject(HDC hdc,UINT type) */ HGDIOBJ WINAPI SelectObject( HDC hdc, HGDIOBJ hObj ) { - HGDIOBJ ret = 0; - GDIOBJHDR *header; + struct gdi_handle_entry *entry; + const struct gdi_obj_funcs *funcs = NULL; TRACE( "(%p,%p)\n", hdc, hObj ); - header = GDI_GetObjPtr( hObj, 0 ); - if (header) - { - const struct gdi_obj_funcs *funcs = header->funcs; - GDI_ReleaseObj( hObj ); - if (funcs && funcs->pSelectObject) ret = funcs->pSelectObject( hObj, hdc ); - } - return ret; + EnterCriticalSection( &gdi_section ); + if ((entry = handle_entry( hObj ))) funcs = entry->funcs; + LeaveCriticalSection( &gdi_section ); + + if (funcs && funcs->pSelectObject) return funcs->pSelectObject( hObj, hdc ); + return 0; } @@ -1104,20 +1096,15 @@ HGDIOBJ WINAPI SelectObject( HDC hdc, HGDIOBJ hObj ) */ BOOL WINAPI UnrealizeObject( HGDIOBJ obj ) { - BOOL result = FALSE; - GDIOBJHDR * header = GDI_GetObjPtr( obj, 0 ); + struct gdi_handle_entry *entry; + const struct gdi_obj_funcs *funcs = NULL; - if (header) - { - const struct gdi_obj_funcs *funcs = header->funcs; + EnterCriticalSection( &gdi_section ); + if ((entry = handle_entry( obj ))) funcs = entry->funcs; + LeaveCriticalSection( &gdi_section ); - GDI_ReleaseObj( obj ); - if (funcs && funcs->pUnrealizeObject) - result = header->funcs->pUnrealizeObject( obj ); - else - result = TRUE; - } - return result; + if (funcs && funcs->pUnrealizeObject) return funcs->pUnrealizeObject( obj ); + return funcs != NULL; }

1 0

Alexandre Julliard : gdi32: Store the object type directly in the GDI handle table.
by Alexandre Julliard Oct. 17, 2012

Oct. 17, 2012

Module: wine Branch: master Commit: 2bdf447744b3d380ed266e7627976612ec58ffe2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2bdf447744b3d380ed266e762… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 17 12:25:28 2012 +0200 gdi32: Store the object type directly in the GDI handle table. --- dlls/gdi32/dc.c | 14 +++-- dlls/gdi32/enhmfdrv/init.c | 2 +- dlls/gdi32/gdi_private.h | 1 - dlls/gdi32/gdiobj.c | 114 +++++++++++++++++++++++-------------------- dlls/gdi32/mfdrv/init.c | 2 +- dlls/gdi32/pen.c | 4 +- 6 files changed, 73 insertions(+), 64 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 1f089de..5a68aa6 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -55,16 +55,18 @@ static inline DC *get_dc_obj( HDC hdc ) DC *dc = GDI_GetObjPtr( hdc, 0 ); if (!dc) return NULL; - if ((dc->header.type != OBJ_DC) && - (dc->header.type != OBJ_MEMDC) && - (dc->header.type != OBJ_METADC) && - (dc->header.type != OBJ_ENHMETADC)) + switch (GetObjectType( hdc )) { + case OBJ_DC: + case OBJ_MEMDC: + case OBJ_METADC: + case OBJ_ENHMETADC: + return dc; + default: GDI_ReleaseObj( hdc ); SetLastError( ERROR_INVALID_HANDLE ); - dc = NULL; + return NULL; } - return dc; } diff --git a/dlls/gdi32/enhmfdrv/init.c b/dlls/gdi32/enhmfdrv/init.c index bd4c906..57a4d18 100644 --- a/dlls/gdi32/enhmfdrv/init.c +++ b/dlls/gdi32/enhmfdrv/init.c @@ -435,7 +435,7 @@ HENHMETAFILE WINAPI CloseEnhMetaFile(HDC hdc) /* [in] metafile DC */ TRACE("(%p)\n", hdc ); if (!(dc = get_dc_ptr( hdc ))) return NULL; - if (dc->header.type != OBJ_ENHMETADC) + if (GetObjectType( hdc ) != OBJ_ENHMETADC) { release_dc_ptr( dc ); return NULL; diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 5b79526..9c926d4 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -65,7 +65,6 @@ struct hdc_list typedef struct tagGDIOBJHDR { - WORD type; /* object type (one of the OBJ_* constants) */ 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 */ diff --git a/dlls/gdi32/gdiobj.c b/dlls/gdi32/gdiobj.c index 9da5533..0cd182a 100644 --- a/dlls/gdi32/gdiobj.c +++ b/dlls/gdi32/gdiobj.c @@ -38,12 +38,34 @@ WINE_DEFAULT_DEBUG_CHANNEL(gdi); -#define HGDIOBJ_32(h16) ((HGDIOBJ)(ULONG_PTR)(h16)) +#define FIRST_GDI_HANDLE 16 +#define MAX_GDI_HANDLES 16384 -#define GDI_HEAP_SIZE 0xffe0 +struct gdi_handle_entry +{ + GDIOBJHDR *obj; /* pointer to the object-specific data */ + WORD type; /* object type (one of the OBJ_* constants) */ +}; +static struct gdi_handle_entry gdi_handles[MAX_GDI_HANDLES]; +static int next_gdi_handle; +static LONG debug_count; HMODULE gdi32_module = 0; +static inline HGDIOBJ entry_to_handle( struct gdi_handle_entry *entry ) +{ + unsigned int idx = entry - gdi_handles + FIRST_GDI_HANDLE; + return ULongToHandle( idx << 2 ); +} + +static inline struct gdi_handle_entry *handle_entry( HGDIOBJ handle ) +{ + unsigned int idx = (HandleToULong(handle) >> 2) - FIRST_GDI_HANDLE; + + if (idx < MAX_GDI_HANDLES && gdi_handles[idx].type) return &gdi_handles[idx]; + return NULL; +} + /*********************************************************************** * GDI stock objects */ @@ -600,22 +622,6 @@ BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) return TRUE; } -#define FIRST_GDI_HANDLE 16 -#define MAX_GDI_HANDLES ((GDI_HEAP_SIZE >> 2) - FIRST_GDI_HANDLE) -static GDIOBJHDR *gdi_handles[MAX_GDI_HANDLES]; -static int next_gdi_handle; -static LONG debug_count; - -static inline HGDIOBJ index_to_handle( int index ) -{ - return ULongToHandle( (index + FIRST_GDI_HANDLE) << 2); -} - -static inline int handle_to_index( HGDIOBJ handle ) -{ - return (HandleToULong(handle) >> 2) - FIRST_GDI_HANDLE; -} - static const char *gdi_obj_type( unsigned type ) { switch ( type ) @@ -640,21 +646,21 @@ static const char *gdi_obj_type( unsigned type ) static void dump_gdi_objects( void ) { - int i; + struct gdi_handle_entry *entry; TRACE( "%u objects:\n", MAX_GDI_HANDLES ); EnterCriticalSection( &gdi_section ); - for (i = 0; i < MAX_GDI_HANDLES; i++) + for (entry = gdi_handles; entry < gdi_handles + MAX_GDI_HANDLES; entry++) { - if (!gdi_handles[i]) + if (!entry->type) { - TRACE( "index %d handle %p FREE\n", i, index_to_handle( i )); + TRACE( "handle %p FREE\n", entry_to_handle( entry )); continue; } TRACE( "handle %p obj %p type %s selcount %u deleted %u\n", - index_to_handle( i ), gdi_handles[i], gdi_obj_type( gdi_handles[i]->type ), - gdi_handles[i]->selcount, gdi_handles[i]->deleted ); + entry_to_handle( entry ), entry->obj, gdi_obj_type( entry->type ), + entry->obj->selcount, entry->obj->deleted ); } LeaveCriticalSection( &gdi_section ); } @@ -666,10 +672,13 @@ static void dump_gdi_objects( void ) */ HGDIOBJ alloc_gdi_handle( GDIOBJHDR *obj, WORD type, const struct gdi_obj_funcs *funcs ) { + struct gdi_handle_entry *entry; + HGDIOBJ ret; int i; + assert( type ); /* type 0 is reserved to mark free entries */ + /* initialize the object header */ - obj->type = type; obj->system = 0; obj->deleted = 0; obj->selcount = 0; @@ -678,9 +687,9 @@ HGDIOBJ alloc_gdi_handle( GDIOBJHDR *obj, WORD type, const struct gdi_obj_funcs EnterCriticalSection( &gdi_section ); for (i = next_gdi_handle + 1; i < MAX_GDI_HANDLES; i++) - if (!gdi_handles[i]) goto found; + if (!gdi_handles[i].type) goto found; for (i = 0; i <= next_gdi_handle; i++) - if (!gdi_handles[i]) goto found; + if (!gdi_handles[i].type) goto found; LeaveCriticalSection( &gdi_section ); ERR( "out of GDI object handles, expect a crash\n" ); @@ -688,13 +697,15 @@ HGDIOBJ alloc_gdi_handle( GDIOBJHDR *obj, WORD type, const struct gdi_obj_funcs return 0; found: - gdi_handles[i] = obj; + entry = &gdi_handles[i]; + entry->obj = obj; + entry->type = type; next_gdi_handle = i; + ret = entry_to_handle( entry ); LeaveCriticalSection( &gdi_section ); - TRACE( "allocated %s %p %u/%u\n", - gdi_obj_type(type), index_to_handle( i ), + TRACE( "allocated %s %p %u/%u\n", gdi_obj_type(type), ret, InterlockedIncrement( &debug_count ), MAX_GDI_HANDLES ); - return index_to_handle( i ); + return ret; } @@ -706,20 +717,20 @@ HGDIOBJ alloc_gdi_handle( GDIOBJHDR *obj, WORD type, const struct gdi_obj_funcs void *free_gdi_handle( HGDIOBJ handle ) { GDIOBJHDR *object = NULL; - int i = handle_to_index( handle ); + struct gdi_handle_entry *entry; - if (i >= 0 && i < MAX_GDI_HANDLES) + EnterCriticalSection( &gdi_section ); + if ((entry = handle_entry( handle ))) { - EnterCriticalSection( &gdi_section ); - object = gdi_handles[i]; - gdi_handles[i] = NULL; - LeaveCriticalSection( &gdi_section ); + TRACE( "freed %s %p %u/%u\n", gdi_obj_type( entry->type ), handle, + InterlockedDecrement( &debug_count ) + 1, MAX_GDI_HANDLES ); + object = entry->obj; + entry->type = 0; } + LeaveCriticalSection( &gdi_section ); + if (object) { - TRACE( "freed %s %p %u/%u\n", gdi_obj_type( object->type ), handle, - InterlockedDecrement( &debug_count ) + 1, MAX_GDI_HANDLES ); - object->type = 0; /* mark it as invalid */ object->funcs = NULL; } return object; @@ -736,14 +747,13 @@ void *free_gdi_handle( HGDIOBJ handle ) void *GDI_GetObjPtr( HGDIOBJ handle, WORD type ) { GDIOBJHDR *ptr = NULL; - int i = handle_to_index( handle ); + struct gdi_handle_entry *entry; EnterCriticalSection( &gdi_section ); - if (i >= 0 && i < MAX_GDI_HANDLES) + if ((entry = handle_entry( handle ))) { - ptr = gdi_handles[i]; - if (ptr && type && ptr->type != type) ptr = NULL; + if (!type || entry->type == type) ptr = entry->obj; } if (!ptr) @@ -995,17 +1005,15 @@ INT WINAPI GetObjectW( HGDIOBJ handle, INT count, LPVOID buffer ) */ DWORD WINAPI GetObjectType( HGDIOBJ handle ) { - GDIOBJHDR * ptr; - DWORD result; + struct gdi_handle_entry *entry; + DWORD result = 0; + + EnterCriticalSection( &gdi_section ); + if ((entry = handle_entry( handle ))) result = entry->type; + LeaveCriticalSection( &gdi_section ); - if (!(ptr = GDI_GetObjPtr( handle, 0 ))) - { - SetLastError( ERROR_INVALID_HANDLE ); - return 0; - } - result = ptr->type; - GDI_ReleaseObj( handle ); TRACE("%p -> %u\n", handle, result ); + if (!result) SetLastError( ERROR_INVALID_HANDLE ); return result; } diff --git a/dlls/gdi32/mfdrv/init.c b/dlls/gdi32/mfdrv/init.c index f75637c..03cd22c 100644 --- a/dlls/gdi32/mfdrv/init.c +++ b/dlls/gdi32/mfdrv/init.c @@ -390,7 +390,7 @@ static DC *MFDRV_CloseMetaFile( HDC hdc ) TRACE("(%p)\n", hdc ); if (!(dc = get_dc_ptr( hdc ))) return NULL; - if (dc->header.type != OBJ_METADC) + if (GetObjectType( hdc ) != OBJ_METADC) { release_dc_ptr( dc ); return NULL; diff --git a/dlls/gdi32/pen.c b/dlls/gdi32/pen.c index 6695ee9..94c3933 100644 --- a/dlls/gdi32/pen.c +++ b/dlls/gdi32/pen.c @@ -236,7 +236,7 @@ static HGDIOBJ PEN_SelectObject( HGDIOBJ handle, HDC hdc ) struct brush_pattern *pattern; PHYSDEV physdev = GET_DC_PHYSDEV( dc, pSelectPen ); - switch (pen->header.type) + switch (GetObjectType( handle )) { case OBJ_PEN: pattern = NULL; @@ -293,7 +293,7 @@ static INT PEN_GetObject( HGDIOBJ handle, INT count, LPVOID buffer ) if (!pen) return 0; - switch (pen->header.type) + switch (GetObjectType( handle )) { case OBJ_PEN: {

1 0

Jason Edmeades : cmd: Rename parameter passed to builtin calls.
by Alexandre Julliard Oct. 17, 2012

Oct. 17, 2012

Module: wine Branch: master Commit: 9f83165efb341d7cb65a60ae97d9453df72f0c8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f83165efb341d7cb65a60ae9… Author: Jason Edmeades <jason(a)edmeades.me.uk> Date: Tue Oct 16 23:41:58 2012 +0100 cmd: Rename parameter passed to builtin calls. --- programs/cmd/builtins.c | 142 +++++++++++++++++++++++----------------------- programs/cmd/directory.c | 8 +- programs/cmd/wcmd.h | 18 +++--- 3 files changed, 84 insertions(+), 84 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9f83165efb341d7cb65a6…

1 0

Jason Edmeades : cmd: Handle very odd delimiter support for command line.
by Alexandre Julliard Oct. 17, 2012

Oct. 17, 2012

Module: wine Branch: master Commit: dccccfc27341c2b156fa14c58de2c19cb41b486d URL: http://source.winehq.org/git/wine.git/?a=commit;h=dccccfc27341c2b156fa14c58… Author: Jason Edmeades <jason(a)edmeades.me.uk> Date: Tue Oct 16 23:35:33 2012 +0100 cmd: Handle very odd delimiter support for command line. --- programs/cmd/batch.c | 17 ++++++++-- programs/cmd/builtins.c | 51 ++++++++++++++++--------------- programs/cmd/directory.c | 2 +- programs/cmd/tests/test_cmdline.cmd.exp | 22 +++++++------- programs/cmd/wcmd.h | 2 +- programs/cmd/wcmdmain.c | 19 ++++++----- 6 files changed, 63 insertions(+), 50 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=dccccfc27341c2b156fa1…

1 0

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

Oct. 17, 2012

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