wine-commits July 2012

wine-commits@winehq.org

2 participants
712 discussions

Jacek Caban : mshtml: Use inner window directly from document node in htmlevent.c.
by Alexandre Julliard 30 Jul '12

30 Jul '12

Module: wine Branch: master Commit: 7ff231d7fbbb81e11259ca41049cae9f03ac2e3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ff231d7fbbb81e11259ca410… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 30 15:55:42 2012 +0200 mshtml: Use inner window directly from document node in htmlevent.c. --- dlls/mshtml/htmlevent.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index ca966ba..1836664 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -997,7 +997,7 @@ void fire_event(HTMLDocumentNode *doc, eventid_t eid, BOOL set_event, nsIDOMNode TRACE("(%p) %s\n", doc, debugstr_w(event_info[eid].name)); - window = doc->basedoc.window->base.inner_window; + window = doc->window; prev_event = window->event; if(set_event) { hres = get_node(doc, target, TRUE, &node); @@ -1388,7 +1388,7 @@ void check_event_attr(HTMLDocumentNode *doc, nsIDOMElement *nselem) TRACE("%p.%s = %s\n", nselem, debugstr_w(event_info[i].attr_name), debugstr_w(attr_value)); - disp = script_parse_event(doc->basedoc.window->base.inner_window, attr_value); + disp = script_parse_event(doc->window, attr_value); if(disp) { hres = get_node(doc, (nsIDOMNode*)nselem, TRUE, &node); if(SUCCEEDED(hres)) {

1 0

Jacek Caban : mshtml: Store inner window directly in HTMLDocumentNode.
by Alexandre Julliard 30 Jul '12

30 Jul '12

Module: wine Branch: master Commit: 27f799d8804603b711d9e2c572fce25e231090a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27f799d8804603b711d9e2c57… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 30 15:55:30 2012 +0200 mshtml: Store inner window directly in HTMLDocumentNode. --- dlls/mshtml/htmldoc.c | 19 ++++++++++++++----- dlls/mshtml/htmlwindow.c | 6 ++++-- dlls/mshtml/mshtml_private.h | 4 +++- 3 files changed, 21 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index a43522a..86615df 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -2091,8 +2091,13 @@ static void HTMLDocumentNode_destructor(HTMLDOMNode *iface) detach_plugin_host(LIST_ENTRY(list_head(&This->plugin_hosts), PluginHost, entry)); if(This->nsdoc) { + assert(!This->window); release_document_mutation(This); nsIDOMHTMLDocument_Release(This->nsdoc); + }else if(This->window) { + /* document fragments own reference to inner window */ + IHTMLWindow2_Release(&This->window->base.IHTMLWindow2_iface); + This->window = NULL; } heap_free(This->event_vector); @@ -2124,6 +2129,7 @@ static void HTMLDocumentNode_unlink(HTMLDOMNode *iface) release_document_mutation(This); This->nsdoc = NULL; nsIDOMHTMLDocument_Release(nsdoc); + This->window = NULL; } } @@ -2238,7 +2244,7 @@ static dispex_static_data_t HTMLDocumentNode_dispex = { HTMLDocumentNode_iface_tids }; -static HTMLDocumentNode *alloc_doc_node(HTMLDocumentObj *doc_obj, HTMLOuterWindow *window) +static HTMLDocumentNode *alloc_doc_node(HTMLDocumentObj *doc_obj, HTMLInnerWindow *window) { HTMLDocumentNode *doc; @@ -2249,7 +2255,8 @@ static HTMLDocumentNode *alloc_doc_node(HTMLDocumentObj *doc_obj, HTMLOuterWindo doc->ref = 1; doc->basedoc.doc_node = doc; doc->basedoc.doc_obj = doc_obj; - doc->basedoc.window = window; + doc->basedoc.window = window->base.outer_window; + doc->window = window; init_dispex(&doc->node.dispex, (IUnknown*)&doc->node.IHTMLDOMNode_iface, &HTMLDocumentNode_dispex); @@ -2264,7 +2271,7 @@ static HTMLDocumentNode *alloc_doc_node(HTMLDocumentObj *doc_obj, HTMLOuterWindo return doc; } -HRESULT create_doc_from_nsdoc(nsIDOMHTMLDocument *nsdoc, HTMLDocumentObj *doc_obj, HTMLOuterWindow *window, HTMLDocumentNode **ret) +HRESULT create_doc_from_nsdoc(nsIDOMHTMLDocument *nsdoc, HTMLDocumentObj *doc_obj, HTMLInnerWindow *window, HTMLDocumentNode **ret) { HTMLDocumentNode *doc; @@ -2272,7 +2279,7 @@ HRESULT create_doc_from_nsdoc(nsIDOMHTMLDocument *nsdoc, HTMLDocumentObj *doc_ob if(!doc) return E_OUTOFMEMORY; - if(!doc_obj->basedoc.window || window == doc_obj->basedoc.window) + if(!doc_obj->basedoc.window || window->base.outer_window == doc_obj->basedoc.window) doc->basedoc.cp_container.forward_container = &doc_obj->basedoc.cp_container; HTMLDOMNode_Init(doc, &doc->node, (nsIDOMNode*)nsdoc); @@ -2294,10 +2301,12 @@ HRESULT create_document_fragment(nsIDOMNode *nsnode, HTMLDocumentNode *doc_node, { HTMLDocumentNode *doc_frag; - doc_frag = alloc_doc_node(doc_node->basedoc.doc_obj, doc_node->basedoc.window); + doc_frag = alloc_doc_node(doc_node->basedoc.doc_obj, doc_node->window); if(!doc_frag) return E_OUTOFMEMORY; + IHTMLWindow2_AddRef(&doc_frag->window->base.IHTMLWindow2_iface); + HTMLDOMNode_Init(doc_node, &doc_frag->node, nsnode); doc_frag->node.vtbl = &HTMLDocumentFragmentImplVtbl; doc_frag->node.cp_container = &doc_frag->basedoc.cp_container; diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 3ade07e..dd25263 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -239,8 +239,10 @@ static void release_inner_window(HTMLInnerWindow *This) abort_window_bindings(This); release_script_hosts(This); - if(This->doc) + if(This->doc) { + This->doc->window = NULL; htmldoc_release(&This->doc->basedoc); + } release_dispex(&This->dispex); @@ -2745,7 +2747,7 @@ HRESULT update_window_doc(HTMLInnerWindow *window) return E_FAIL; } - hres = create_doc_from_nsdoc(nshtmldoc, outer_window->doc_obj, outer_window, &window->doc); + hres = create_doc_from_nsdoc(nshtmldoc, outer_window->doc_obj, window, &window->doc); nsIDOMHTMLDocument_Release(nshtmldoc); if(FAILED(hres)) return hres; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index b636685..0bc9d4a 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -679,6 +679,8 @@ struct HTMLDocumentNode { LONG ref; + HTMLInnerWindow *window; + nsIDOMHTMLDocument *nsdoc; BOOL content_ready; event_target_t *body_event_target; @@ -700,7 +702,7 @@ struct HTMLDocumentNode { HRESULT HTMLDocument_Create(IUnknown*,REFIID,void**) DECLSPEC_HIDDEN; HRESULT HTMLLoadOptions_Create(IUnknown*,REFIID,void**) DECLSPEC_HIDDEN; -HRESULT create_doc_from_nsdoc(nsIDOMHTMLDocument*,HTMLDocumentObj*,HTMLOuterWindow*,HTMLDocumentNode**) DECLSPEC_HIDDEN; +HRESULT create_doc_from_nsdoc(nsIDOMHTMLDocument*,HTMLDocumentObj*,HTMLInnerWindow*,HTMLDocumentNode**) DECLSPEC_HIDDEN; HRESULT create_document_fragment(nsIDOMNode*,HTMLDocumentNode*,HTMLDocumentNode**) DECLSPEC_HIDDEN; HRESULT HTMLOuterWindow_Create(HTMLDocumentObj*,nsIDOMWindow*,HTMLOuterWindow*,HTMLOuterWindow**) DECLSPEC_HIDDEN;

1 0

Hans Leidekker : wbemprox: Add support for enumerating class properties.
by Alexandre Julliard 30 Jul '12

30 Jul '12

Module: wine Branch: master Commit: 348e5d85fa5fac43dcbd228ca431ad949167285f URL: http://source.winehq.org/git/wine.git/?a=commit;h=348e5d85fa5fac43dcbd228ca… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jul 30 15:05:09 2012 +0200 wbemprox: Add support for enumerating class properties. --- dlls/wbemprox/class.c | 39 ++++++++++++++++++++++++++++++++----- dlls/wbemprox/table.c | 18 +++++++++++++++++ dlls/wbemprox/wbemprox_private.h | 1 + 3 files changed, 52 insertions(+), 6 deletions(-) diff --git a/dlls/wbemprox/class.c b/dlls/wbemprox/class.c index e9f1f13..030aed5 100644 --- a/dlls/wbemprox/class.c +++ b/dlls/wbemprox/class.c @@ -220,6 +220,7 @@ struct class_object IEnumWbemClassObject *iter; UINT index; UINT index_method; + UINT index_property; }; static inline struct class_object *impl_from_IWbemClassObject( @@ -351,8 +352,14 @@ static HRESULT WINAPI class_object_BeginEnumeration( IWbemClassObject *iface, LONG lEnumFlags ) { - FIXME("%p, %08x\n", iface, lEnumFlags); - return E_NOTIMPL; + struct class_object *co = impl_from_IWbemClassObject( iface ); + + TRACE("%p, %08x\n", iface, lEnumFlags); + + if (lEnumFlags) FIXME("flags 0x%08x not supported\n", lEnumFlags); + + co->index_property = 0; + return S_OK; } static HRESULT WINAPI class_object_Next( @@ -363,15 +370,34 @@ static HRESULT WINAPI class_object_Next( CIMTYPE *pType, LONG *plFlavor ) { - FIXME("%p, %08x, %p, %p, %p, %p\n", iface, lFlags, strName, pVal, pType, plFlavor); - return E_NOTIMPL; + struct class_object *co = impl_from_IWbemClassObject( iface ); + struct enum_class_object *ec = impl_from_IEnumWbemClassObject( co->iter ); + struct view *view = ec->query->view; + const WCHAR *property; + HRESULT hr; + + TRACE("%p, %08x, %p, %p, %p, %p\n", iface, lFlags, strName, pVal, pType, plFlavor); + + if (!(property = get_property_name( co->name, co->index_property ))) return WBEM_S_NO_MORE_DATA; + if (!(*strName = SysAllocString( property ))) return E_OUTOFMEMORY; + if ((hr = get_propval( view, co->index, property, pVal, pType, plFlavor ) != S_OK)) + { + SysFreeString( *strName ); + return hr; + } + co->index_property++; + return S_OK; } static HRESULT WINAPI class_object_EndEnumeration( IWbemClassObject *iface ) { - FIXME("%p\n", iface); - return E_NOTIMPL; + struct class_object *co = impl_from_IWbemClassObject( iface ); + + TRACE("%p\n", iface); + + co->index_property = 0; + return S_OK; } static HRESULT WINAPI class_object_GetPropertyQualifierSet( @@ -773,6 +799,7 @@ HRESULT create_class_object( co->iter = iter; co->index = index; co->index_method = 0; + co->index_property = 0; if (iter) IEnumWbemClassObject_AddRef( iter ); *obj = &co->IWbemClassObject_iface; diff --git a/dlls/wbemprox/table.c b/dlls/wbemprox/table.c index 231c27d..6b584ff 100644 --- a/dlls/wbemprox/table.c +++ b/dlls/wbemprox/table.c @@ -349,3 +349,21 @@ const WCHAR *get_method_name( const WCHAR *class, UINT index ) } return NULL; } + +const WCHAR *get_property_name( const WCHAR *class, UINT index ) +{ + struct table *table; + UINT i, count = 0; + + if (!(table = get_table( class ))) return NULL; + + for (i = 0; i < table->num_cols; i++) + { + if (!(table->columns[i].type & COL_FLAG_METHOD)) + { + if (index == count) return table->columns[i].name; + count++; + } + } + return NULL; +} diff --git a/dlls/wbemprox/wbemprox_private.h b/dlls/wbemprox/wbemprox_private.h index f6aa2b8..69b04e7 100644 --- a/dlls/wbemprox/wbemprox_private.h +++ b/dlls/wbemprox/wbemprox_private.h @@ -152,6 +152,7 @@ HRESULT put_propval( const struct view *, UINT, const WCHAR *, VARIANT *, CIMTYP HRESULT get_properties( const struct view *, SAFEARRAY ** ) DECLSPEC_HIDDEN; HRESULT get_object( const WCHAR *, IWbemClassObject ** ) DECLSPEC_HIDDEN; const WCHAR *get_method_name( const WCHAR *, UINT ) DECLSPEC_HIDDEN; +const WCHAR *get_property_name( const WCHAR *, UINT ) DECLSPEC_HIDDEN; HRESULT WbemLocator_create(IUnknown *, LPVOID *) DECLSPEC_HIDDEN; HRESULT WbemServices_create(IUnknown *, const WCHAR *, LPVOID *) DECLSPEC_HIDDEN;

1 0

Hans Leidekker : wbemprox: Add support for enumerating class methods.
by Alexandre Julliard 30 Jul '12

30 Jul '12

Module: wine Branch: master Commit: a26b5dc09a9732da264728ae0e318a5d09efdd77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a26b5dc09a9732da264728ae0… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jul 30 15:04:49 2012 +0200 wbemprox: Add support for enumerating class methods. --- dlls/wbemprox/class.c | 55 ++++++++++++++++++++++++++++++++----- dlls/wbemprox/table.c | 18 ++++++++++++ dlls/wbemprox/wbemprox_private.h | 1 + 3 files changed, 66 insertions(+), 8 deletions(-) diff --git a/dlls/wbemprox/class.c b/dlls/wbemprox/class.c index 74e1c71..e9f1f13 100644 --- a/dlls/wbemprox/class.c +++ b/dlls/wbemprox/class.c @@ -219,6 +219,7 @@ struct class_object WCHAR *name; IEnumWbemClassObject *iter; UINT index; + UINT index_method; }; static inline struct class_object *impl_from_IWbemClassObject( @@ -643,8 +644,19 @@ static HRESULT WINAPI class_object_BeginMethodEnumeration( IWbemClassObject *iface, LONG lEnumFlags) { - FIXME("%p, %08x\n", iface, lEnumFlags); - return E_NOTIMPL; + struct class_object *co = impl_from_IWbemClassObject( iface ); + + TRACE("%p, %08x\n", iface, lEnumFlags); + + if (lEnumFlags) FIXME("flags 0x%08x not supported\n", lEnumFlags); + + if (co->iter) + { + WARN("not allowed on instance\n"); + return WBEM_E_ILLEGAL_OPERATION; + } + co->index_method = 0; + return S_OK; } static HRESULT WINAPI class_object_NextMethod( @@ -654,15 +666,41 @@ static HRESULT WINAPI class_object_NextMethod( IWbemClassObject **ppInSignature, IWbemClassObject **ppOutSignature) { - FIXME("%p, %08x, %p, %p, %p\n", iface, lFlags, pstrName, ppInSignature, ppOutSignature); - return E_NOTIMPL; + struct class_object *co = impl_from_IWbemClassObject( iface ); + const WCHAR *method; + HRESULT hr; + + TRACE("%p, %08x, %p, %p, %p\n", iface, lFlags, pstrName, ppInSignature, ppOutSignature); + + if (!(method = get_method_name( co->name, co->index_method ))) return WBEM_S_NO_MORE_DATA; + + hr = create_signature( co->name, method, PARAM_IN, ppInSignature ); + if (hr != S_OK) return hr; + + hr = create_signature( co->name, method, PARAM_OUT, ppOutSignature ); + if (hr != S_OK) IWbemClassObject_Release( *ppInSignature ); + else + { + if (!(*pstrName = SysAllocString( method ))) + { + IWbemClassObject_Release( *ppInSignature ); + IWbemClassObject_Release( *ppOutSignature ); + return E_OUTOFMEMORY; + } + co->index_method++; + } + return hr; } static HRESULT WINAPI class_object_EndMethodEnumeration( IWbemClassObject *iface ) { - FIXME("%p\n", iface); - return E_NOTIMPL; + struct class_object *co = impl_from_IWbemClassObject( iface ); + + TRACE("%p\n", iface); + + co->index_method = 0; + return S_OK; } static HRESULT WINAPI class_object_GetMethodQualifierSet( @@ -732,8 +770,9 @@ HRESULT create_class_object( heap_free( co ); return E_OUTOFMEMORY; } - co->iter = iter; - co->index = index; + co->iter = iter; + co->index = index; + co->index_method = 0; if (iter) IEnumWbemClassObject_AddRef( iter ); *obj = &co->IWbemClassObject_iface; diff --git a/dlls/wbemprox/table.c b/dlls/wbemprox/table.c index 5b6f4b4..231c27d 100644 --- a/dlls/wbemprox/table.c +++ b/dlls/wbemprox/table.c @@ -331,3 +331,21 @@ BOOL add_table( struct table *table ) list_add_tail( table_list, &table->entry ); return TRUE; } + +const WCHAR *get_method_name( const WCHAR *class, UINT index ) +{ + struct table *table; + UINT i, count = 0; + + if (!(table = get_table( class ))) return NULL; + + for (i = 0; i < table->num_cols; i++) + { + if (table->columns[i].type & COL_FLAG_METHOD) + { + if (index == count) return table->columns[i].name; + count++; + } + } + return NULL; +} diff --git a/dlls/wbemprox/wbemprox_private.h b/dlls/wbemprox/wbemprox_private.h index 34a3384..f6aa2b8 100644 --- a/dlls/wbemprox/wbemprox_private.h +++ b/dlls/wbemprox/wbemprox_private.h @@ -151,6 +151,7 @@ HRESULT get_propval( const struct view *, UINT, const WCHAR *, VARIANT *, HRESULT put_propval( const struct view *, UINT, const WCHAR *, VARIANT *, CIMTYPE ) DECLSPEC_HIDDEN; HRESULT get_properties( const struct view *, SAFEARRAY ** ) DECLSPEC_HIDDEN; HRESULT get_object( const WCHAR *, IWbemClassObject ** ) DECLSPEC_HIDDEN; +const WCHAR *get_method_name( const WCHAR *, UINT ) DECLSPEC_HIDDEN; HRESULT WbemLocator_create(IUnknown *, LPVOID *) DECLSPEC_HIDDEN; HRESULT WbemServices_create(IUnknown *, const WCHAR *, LPVOID *) DECLSPEC_HIDDEN;

1 0

Hans Leidekker : wbemprox: Store the class name in the class object.
by Alexandre Julliard 30 Jul '12

30 Jul '12

Module: wine Branch: master Commit: 12caddb4be1265811ecaff928eb35d1c6368a782 URL: http://source.winehq.org/git/wine.git/?a=commit;h=12caddb4be1265811ecaff928… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jul 30 15:04:30 2012 +0200 wbemprox: Store the class name in the class object. --- dlls/wbemprox/class.c | 26 ++++++++++++++++---------- dlls/wbemprox/services.c | 2 +- dlls/wbemprox/wbemprox_private.h | 3 ++- 3 files changed, 19 insertions(+), 12 deletions(-) diff --git a/dlls/wbemprox/class.c b/dlls/wbemprox/class.c index 801a553..74e1c71 100644 --- a/dlls/wbemprox/class.c +++ b/dlls/wbemprox/class.c @@ -125,7 +125,7 @@ static HRESULT WINAPI enum_class_object_Next( *puReturned = 0; if (ec->index + uCount > view->count) return WBEM_S_FALSE; - hr = WbemClassObject_create( NULL, iface, ec->index, (void **)apObjects ); + hr = create_class_object( view->table->name, iface, ec->index, apObjects ); if (hr != S_OK) return hr; ec->index++; @@ -216,6 +216,7 @@ struct class_object { IWbemClassObject IWbemClassObject_iface; LONG refs; + WCHAR *name; IEnumWbemClassObject *iter; UINT index; }; @@ -242,6 +243,7 @@ static ULONG WINAPI class_object_Release( { TRACE("destroying %p\n", co); if (co->iter) IEnumWbemClassObject_Release( co->iter ); + heap_free( co->name ); heap_free( co ); } return refs; @@ -606,16 +608,14 @@ static HRESULT WINAPI class_object_GetMethod( IWbemClassObject **ppOutSignature ) { struct class_object *co = impl_from_IWbemClassObject( iface ); - struct enum_class_object *ec = impl_from_IEnumWbemClassObject( co->iter ); - struct view *view = ec->query->view; HRESULT hr; TRACE("%p, %s, %08x, %p, %p\n", iface, debugstr_w(wszName), lFlags, ppInSignature, ppOutSignature); - hr = create_signature( view->table->name, wszName, PARAM_IN, ppInSignature ); + hr = create_signature( co->name, wszName, PARAM_IN, ppInSignature ); if (hr != S_OK) return hr; - hr = create_signature( view->table->name, wszName, PARAM_OUT, ppOutSignature ); + hr = create_signature( co->name, wszName, PARAM_OUT, ppOutSignature ); if (hr != S_OK) IWbemClassObject_Release( *ppInSignature ); return hr; } @@ -714,24 +714,30 @@ static const IWbemClassObjectVtbl class_object_vtbl = class_object_GetMethodOrigin }; -HRESULT WbemClassObject_create( - IUnknown *pUnkOuter, IEnumWbemClassObject *iter, UINT index, LPVOID *ppObj ) +HRESULT create_class_object( + const WCHAR *name, IEnumWbemClassObject *iter, UINT index, IWbemClassObject **obj ) { struct class_object *co; - TRACE("%p, %p\n", pUnkOuter, ppObj); + TRACE("%s, %p\n", debugstr_w(name), obj); co = heap_alloc( sizeof(*co) ); if (!co) return E_OUTOFMEMORY; co->IWbemClassObject_iface.lpVtbl = &class_object_vtbl; co->refs = 1; + co->name = heap_strdupW( name ); + if (!co->name) + { + heap_free( co ); + return E_OUTOFMEMORY; + } co->iter = iter; co->index = index; if (iter) IEnumWbemClassObject_AddRef( iter ); - *ppObj = &co->IWbemClassObject_iface; + *obj = &co->IWbemClassObject_iface; - TRACE("returning iface %p\n", *ppObj); + TRACE("returning iface %p\n", *obj); return S_OK; } diff --git a/dlls/wbemprox/services.c b/dlls/wbemprox/services.c index 8c9c2f4..abd31c5 100644 --- a/dlls/wbemprox/services.c +++ b/dlls/wbemprox/services.c @@ -334,7 +334,7 @@ HRESULT get_object( const WCHAR *object_path, IWbemClassObject **obj ) free_path( path ); return hr; } - hr = WbemClassObject_create( NULL, iter, 0, (void **)obj ); + hr = create_class_object( path->class, iter, 0, obj ); IEnumWbemClassObject_Release( iter ); free_path( path ); return hr; diff --git a/dlls/wbemprox/wbemprox_private.h b/dlls/wbemprox/wbemprox_private.h index a5f0a42..34a3384 100644 --- a/dlls/wbemprox/wbemprox_private.h +++ b/dlls/wbemprox/wbemprox_private.h @@ -154,7 +154,8 @@ HRESULT get_object( const WCHAR *, IWbemClassObject ** ) DECLSPEC_HIDDEN; HRESULT WbemLocator_create(IUnknown *, LPVOID *) DECLSPEC_HIDDEN; HRESULT WbemServices_create(IUnknown *, const WCHAR *, LPVOID *) DECLSPEC_HIDDEN; -HRESULT WbemClassObject_create(IUnknown *, IEnumWbemClassObject *, UINT, LPVOID *) DECLSPEC_HIDDEN; +HRESULT create_class_object(const WCHAR *, IEnumWbemClassObject *, UINT, + IWbemClassObject **) DECLSPEC_HIDDEN; HRESULT EnumWbemClassObject_create(IUnknown *, struct query *, LPVOID *) DECLSPEC_HIDDEN; static void *heap_alloc( size_t len ) __WINE_ALLOC_SIZE(1);

1 0

Hans Leidekker : wbemprox: Implement Win32_Service. AcceptPause and Win32_Service.AcceptStop.
by Alexandre Julliard 30 Jul '12

30 Jul '12

Module: wine Branch: master Commit: 54d21602267f790368a02c21faf52396f6385c15 URL: http://source.winehq.org/git/wine.git/?a=commit;h=54d21602267f790368a02c21f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jul 30 15:04:15 2012 +0200 wbemprox: Implement Win32_Service.AcceptPause and Win32_Service.AcceptStop. --- dlls/wbemprox/builtin.c | 20 +++++++++++++++----- 1 files changed, 15 insertions(+), 5 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index b2c657f..ce18b92 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -65,6 +65,10 @@ static const WCHAR class_stdregprovW[] = static const WCHAR class_videocontrollerW[] = {'W','i','n','3','2','_','V','i','d','e','o','C','o','n','t','r','o','l','l','e','r',0}; +static const WCHAR prop_acceptpauseW[] = + {'A','c','c','e','p','t','P','a','u','s','e',0}; +static const WCHAR prop_acceptstopW[] = + {'A','c','c','e','p','t','S','t','o','p',0}; static const WCHAR prop_adapterramW[] = {'A','d','a','p','t','e','r','R','A','M',0}; static const WCHAR prop_captionW[] = @@ -249,6 +253,8 @@ static const struct column col_processor[] = }; static const struct column col_service[] = { + { prop_acceptpauseW, CIM_BOOLEAN }, + { prop_acceptstopW, CIM_BOOLEAN }, { prop_displaynameW, CIM_STRING|COL_FLAG_DYNAMIC }, { prop_nameW, CIM_STRING|COL_FLAG_DYNAMIC|COL_FLAG_KEY }, { prop_processidW, CIM_UINT32 }, @@ -383,6 +389,8 @@ struct record_processor }; struct record_service { + int accept_pause; + int accept_stop; const WCHAR *displayname; const WCHAR *name; UINT32 process_id; @@ -860,11 +868,13 @@ static void fill_service( struct table *table ) { status = &services[i].ServiceStatusProcess; rec = (struct record_service *)(table->data + offset); - rec->displayname = heap_strdupW( services[i].lpDisplayName ); - rec->name = heap_strdupW( services[i].lpServiceName ); - rec->process_id = status->dwProcessId; - rec->servicetype = get_service_type( status->dwServiceType ); - rec->state = get_service_state( status->dwCurrentState ); + rec->accept_pause = (status->dwControlsAccepted & SERVICE_ACCEPT_PAUSE_CONTINUE) ? -1 : 0; + rec->accept_stop = (status->dwControlsAccepted & SERVICE_ACCEPT_STOP) ? -1 : 0; + rec->displayname = heap_strdupW( services[i].lpDisplayName ); + rec->name = heap_strdupW( services[i].lpServiceName ); + rec->process_id = status->dwProcessId; + rec->servicetype = get_service_type( status->dwServiceType ); + rec->state = get_service_state( status->dwCurrentState ); offset += sizeof(*rec); num_rows++; }

1 0

Hans Leidekker : wbemprox: Add support for boolean properties.
by Alexandre Julliard 30 Jul '12

30 Jul '12

Module: wine Branch: master Commit: 773f5f8dc234ca2a7c83a502c4b83a424f22d749 URL: http://source.winehq.org/git/wine.git/?a=commit;h=773f5f8dc234ca2a7c83a502c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jul 30 15:04:03 2012 +0200 wbemprox: Add support for boolean properties. --- dlls/wbemprox/query.c | 11 +++++++++++ dlls/wbemprox/table.c | 5 +++++ 2 files changed, 16 insertions(+), 0 deletions(-) diff --git a/dlls/wbemprox/query.c b/dlls/wbemprox/query.c index 15423d9..d2b0e76 100644 --- a/dlls/wbemprox/query.c +++ b/dlls/wbemprox/query.c @@ -550,6 +550,10 @@ static void set_variant( VARTYPE vartype, LONGLONG val, BSTR val_bstr, VARIANT * { switch (vartype) { + case VT_BOOL: + V_VT( ret ) = VT_BOOL; + V_BOOL( ret ) = val; + return; case VT_BSTR: V_VT( ret ) = VT_BSTR; V_BSTR( ret ) = val_bstr; @@ -601,6 +605,9 @@ HRESULT get_propval( const struct view *view, UINT index, const WCHAR *name, VAR switch (view->table->columns[column].type & COL_TYPE_MASK) { + case CIM_BOOLEAN: + if (!vartype) vartype = VT_BOOL; + break; case CIM_STRING: case CIM_DATETIME: if (val) @@ -650,6 +657,10 @@ static HRESULT variant_to_longlong( VARIANT *var, LONGLONG *val, CIMTYPE *type ) } switch (V_VT( var )) { + case VT_BOOL: + *val = V_BOOL( var ); + *type = CIM_BOOLEAN; + break; case VT_BSTR: *val = (INT_PTR)SysAllocString( V_BSTR( var ) ); if (!*val) return E_OUTOFMEMORY; diff --git a/dlls/wbemprox/table.c b/dlls/wbemprox/table.c index d94a8e8..5b6f4b4 100644 --- a/dlls/wbemprox/table.c +++ b/dlls/wbemprox/table.c @@ -50,6 +50,8 @@ UINT get_type_size( CIMTYPE type ) switch (type) { + case CIM_BOOLEAN: + return sizeof(int); case CIM_SINT16: case CIM_UINT16: return sizeof(INT16); @@ -102,6 +104,9 @@ HRESULT get_value( const struct table *table, UINT row, UINT column, LONGLONG *v } switch (table->columns[column].type & COL_TYPE_MASK) { + case CIM_BOOLEAN: + *val = *(const int *)ptr; + break; case CIM_DATETIME: case CIM_STRING: *val = (LONGLONG)(INT_PTR)*(const WCHAR **)ptr;

1 0

Alexandre Julliard : gdi32: Clip solid pen regions to the DIB rectangle to avoid overflows.
by Alexandre Julliard 30 Jul '12

30 Jul '12

Module: wine Branch: master Commit: 6714f16c74180c450edb8b9f9bdba43c14c0b8e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6714f16c74180c450edb8b9f9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 30 13:59:04 2012 +0200 gdi32: Clip solid pen regions to the DIB rectangle to avoid overflows. --- dlls/gdi32/dibdrv/dc.c | 12 +++ dlls/gdi32/dibdrv/dibdrv.h | 1 + dlls/gdi32/dibdrv/objects.c | 177 +++++++++++++++++++++++++------------------ 3 files changed, 116 insertions(+), 74 deletions(-) diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index de64d18..73895c9 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -255,6 +255,18 @@ DWORD convert_bitmapinfo( const BITMAPINFO *src_info, void *src_bits, struct bit return ERROR_SUCCESS; } +int clip_rect_to_dib( const dib_info *dib, RECT *rc ) +{ + RECT rect; + + rect.left = max( 0, -dib->rect.left ); + rect.top = max( 0, -dib->rect.top ); + rect.right = min( dib->rect.right, dib->width ) - dib->rect.left; + rect.bottom = min( dib->rect.bottom, dib->height ) - dib->rect.top; + if (is_rect_empty( &rect )) return 0; + return intersect_rect( rc, &rect, rc ); +} + int get_clipped_rects( const dib_info *dib, const RECT *rc, HRGN clip, struct clipped_rects *clip_rects ) { const WINEREGION *region; diff --git a/dlls/gdi32/dibdrv/dibdrv.h b/dlls/gdi32/dibdrv/dibdrv.h index 7802d17..0a99fba 100644 --- a/dlls/gdi32/dibdrv/dibdrv.h +++ b/dlls/gdi32/dibdrv/dibdrv.h @@ -244,6 +244,7 @@ extern void copy_dib_color_info(dib_info *dst, const dib_info *src) DECLSPEC_HID extern BOOL convert_dib(dib_info *dst, const dib_info *src) DECLSPEC_HIDDEN; extern COLORREF make_rgb_colorref( HDC hdc, dib_info *dib, COLORREF color, BOOL *got_pixel, DWORD *pixel ) DECLSPEC_HIDDEN; extern DWORD get_pixel_color(dibdrv_physdev *pdev, COLORREF color, BOOL mono_fixup) DECLSPEC_HIDDEN; +extern int clip_rect_to_dib( const dib_info *dib, RECT *rc ) DECLSPEC_HIDDEN; extern int get_clipped_rects( const dib_info *dib, const RECT *rc, HRGN clip, struct clipped_rects *clip_rects ) DECLSPEC_HIDDEN; extern void add_clipped_bounds( dibdrv_physdev *dev, const RECT *rect, HRGN clip ) DECLSPEC_HIDDEN; extern int clip_line(const POINT *start, const POINT *end, const RECT *clip, diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index 0292537..f9736f6 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -654,6 +654,87 @@ static BOOL solid_pen_line(dibdrv_physdev *pdev, POINT *start, POINT *end, DWORD return TRUE; } +static void solid_line_region( const dib_info *dib, const POINT *start, const struct line_params *params, + HRGN region ) +{ + int len, err = params->err_start; + RECT rect; + + rect.left = start->x; + rect.top = start->y; + rect.right = start->x + 1; + rect.bottom = start->y + 1; + + if (params->x_major) + { + if (params->x_inc > 0) + { + for (len = params->length; len; len--, rect.right++) + { + if (err + params->bias > 0) + { + add_rect_to_region( region, &rect ); + rect.left = rect.right; + rect.top += params->y_inc; + rect.bottom += params->y_inc; + err += params->err_add_1; + } + else err += params->err_add_2; + } + } + else + { + for (len = params->length; len; len--, rect.left--) + { + if (err + params->bias > 0) + { + add_rect_to_region( region, &rect ); + rect.right = rect.left; + rect.top += params->y_inc; + rect.bottom += params->y_inc; + err += params->err_add_1; + } + else err += params->err_add_2; + } + } + } + else + { + if (params->y_inc > 0) + { + for (len = params->length; len; len--, rect.bottom++) + { + if (err + params->bias > 0) + { + add_rect_to_region( region, &rect ); + rect.top = rect.bottom; + rect.left += params->x_inc; + rect.right += params->x_inc; + err += params->err_add_1; + } + else err += params->err_add_2; + } + } + else + { + for (len = params->length; len; len--, rect.top--) + { + if (err + params->bias > 0) + { + add_rect_to_region( region, &rect ); + rect.bottom = rect.top; + rect.left += params->x_inc; + rect.right += params->x_inc; + err += params->err_add_1; + } + else err += params->err_add_2; + } + } + } + /* add final rect */ + add_rect_to_region( region, &rect ); +} + static BOOL solid_pen_line_region( dibdrv_physdev *pdev, POINT *start, POINT *end, HRGN region ) { RECT rect; @@ -667,99 +748,47 @@ static BOOL solid_pen_line_region( dibdrv_physdev *pdev, POINT *start, POINT *en { rect.right = end->x; order_end_points(&rect.left, &rect.right); - add_rect_to_region( region, &rect ); + if (clip_rect_to_dib( &pdev->dib, &rect )) add_rect_to_region( region, &rect ); } else if(start->x == end->x) { rect.bottom = end->y; order_end_points(&rect.top, &rect.bottom); - add_rect_to_region( region, &rect ); + if (clip_rect_to_dib( &pdev->dib, &rect )) add_rect_to_region( region, &rect ); } else { - INT dx = end->x - start->x, dy = end->y - start->y; - INT abs_dx = abs(dx), abs_dy = abs(dy); - DWORD octant = get_octant_mask(dx, dy); - INT bias = get_bias( octant ); + bres_params clip_params; + struct line_params line_params; + POINT p1 = crop_coords( *start ), p2 = crop_coords( *end ); - if (is_xmajor( octant )) + init_bres_params( start, end, &clip_params, &line_params, &rect ); + if (clip_rect_to_dib( &pdev->dib, &rect )) { - int y_inc = is_y_increasing( octant ) ? 1 : -1; - int err_add_1 = 2 * abs_dy - 2 * abs_dx; - int err_add_2 = 2 * abs_dy; - int err = 2 * abs_dy - abs_dx; + POINT clipped_start, clipped_end; - if (is_x_increasing( octant )) - { - for (rect.right = start->x + 1; rect.right <= end->x; rect.right++) - { - if (err + bias > 0) - { - add_rect_to_region( region, &rect ); - rect.left = rect.right; - rect.top += y_inc; - rect.bottom += y_inc; - err += err_add_1; - } - else err += err_add_2; - } - } - else + if (clip_line( &p1, &p2, &rect, &clip_params, &clipped_start, &clipped_end )) { - for (rect.left = start->x; rect.left > end->x; rect.left--) - { - if (err + bias > 0) - { - add_rect_to_region( region, &rect ); - rect.right = rect.left; - rect.top += y_inc; - rect.bottom += y_inc; - err += err_add_1; - } - else err += err_add_2; - } - } - } - else - { - int x_inc = is_x_increasing( octant ) ? 1 : -1; - int err_add_1 = 2 * abs_dx - 2 * abs_dy; - int err_add_2 = 2 * abs_dx; - int err = 2 * abs_dx - abs_dy; + int m = abs(clipped_start.x - p1.x); + int n = abs(clipped_start.y - p1.y); - if (is_y_increasing( octant )) - { - for (rect.bottom = start->y + 1; rect.bottom <= end->y; rect.bottom++) + if (line_params.x_major) { - if (err + bias > 0) - { - add_rect_to_region( region, &rect ); - rect.top = rect.bottom; - rect.left += x_inc; - rect.right += x_inc; - err += err_add_1; - } - else err += err_add_2; + line_params.err_start = 2 * clip_params.dy - clip_params.dx + + m * 2 * clip_params.dy - n * 2 * clip_params.dx; + line_params.length = abs( clipped_end.x - clipped_start.x ) + 1; } - } - else - { - for (rect.top = start->y; rect.top > end->y; rect.top--) + else { - if (err + bias > 0) - { - add_rect_to_region( region, &rect ); - rect.bottom = rect.top; - rect.left += x_inc; - rect.right += x_inc; - err += err_add_1; - } - else err += err_add_2; + line_params.err_start = 2 * clip_params.dx - clip_params.dy + + n * 2 * clip_params.dx - m * 2 * clip_params.dy; + line_params.length = abs( clipped_end.y - clipped_start.y ) + 1; } + + if (clipped_end.x == p2.x && clipped_end.y == p2.y) line_params.length--; + solid_line_region( &pdev->dib, &clipped_start, &line_params, region ); } } - /* add final rect */ - add_rect_to_region( region, &rect ); } return TRUE; }

1 0

Alexandre Julliard : gdi32: Limit line drawing coordinates to reasonable values to avoid overflows.
by Alexandre Julliard 30 Jul '12

30 Jul '12

Module: wine Branch: master Commit: a9151e5da3a2633505d21a3af86d2f11fb5c58a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9151e5da3a2633505d21a3af… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 30 12:47:24 2012 +0200 gdi32: Limit line drawing coordinates to reasonable values to avoid overflows. --- dlls/gdi32/dibdrv/objects.c | 27 ++++++++++++++++++++------- 1 files changed, 20 insertions(+), 7 deletions(-) diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index 026ea50..0292537 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -300,6 +300,17 @@ static inline DWORD calc_outcode(const POINT *pt, const RECT *clip) return out; } +/* crop coordinates to a reasonable range to avoid overflows in calculations */ +static inline POINT crop_coords( POINT pt ) +{ + if (pt.x >= 0x10000000 || pt.x <= -0x10000000 || pt.y >= 0x10000000 || pt.y <= -0x10000000) + { + pt.x /= 8; + pt.y /= 8; + } + return pt; +} + static void init_bres_params( const POINT *start, const POINT *end, bres_params *clip_params, struct line_params *line_params, RECT *rect ) { @@ -603,6 +614,7 @@ static BOOL solid_pen_line(dibdrv_physdev *pdev, POINT *start, POINT *end, DWORD { bres_params clip_params; struct line_params line_params; + POINT p1 = crop_coords( *start ), p2 = crop_coords( *end ); init_bres_params( start, end, &clip_params, &line_params, &rect ); if (!get_clipped_rects( &pdev->dib, &rect, pdev->clip, &clipped_rects )) return TRUE; @@ -611,11 +623,11 @@ static BOOL solid_pen_line(dibdrv_physdev *pdev, POINT *start, POINT *end, DWORD POINT clipped_start, clipped_end; int clip_status; - clip_status = clip_line(start, end, clipped_rects.rects + i, &clip_params, &clipped_start, &clipped_end); + clip_status = clip_line( &p1, &p2, clipped_rects.rects + i, &clip_params, &clipped_start, &clipped_end); if(clip_status) { - int m = abs(clipped_start.x - start->x); - int n = abs(clipped_start.y - start->y); + int m = abs(clipped_start.x - p1.x); + int n = abs(clipped_start.y - p1.y); if (line_params.x_major) { @@ -630,7 +642,7 @@ static BOOL solid_pen_line(dibdrv_physdev *pdev, POINT *start, POINT *end, DWORD line_params.length = abs( clipped_end.y - clipped_start.y ) + 1; } - if (clipped_end.x == end->x && clipped_end.y == end->y) line_params.length--; + if (clipped_end.x == p2.x && clipped_end.y == p2.y) line_params.length--; pdev->dib.funcs->solid_line( &pdev->dib, &clipped_start, &line_params, and, xor ); @@ -987,6 +999,7 @@ static BOOL dashed_pen_line(dibdrv_physdev *pdev, POINT *start, POINT *end) { bres_params clip_params; struct line_params line_params; + POINT p1 = crop_coords( *start ), p2 = crop_coords( *end ); init_bres_params( start, end, &clip_params, &line_params, &rect ); get_clipped_rects( &pdev->dib, &rect, pdev->clip, &clipped_rects ); @@ -994,12 +1007,12 @@ static BOOL dashed_pen_line(dibdrv_physdev *pdev, POINT *start, POINT *end) { POINT clipped_start, clipped_end; int clip_status; - clip_status = clip_line(start, end, clipped_rects.rects + i, &clip_params, &clipped_start, &clipped_end); + clip_status = clip_line(&p1, &p2, clipped_rects.rects + i, &clip_params, &clipped_start, &clipped_end); if(clip_status) { - int m = abs(clipped_start.x - start->x); - int n = abs(clipped_start.y - start->y); + int m = abs(clipped_start.x - p1.x); + int n = abs(clipped_start.y - p1.y); pdev->dash_pos = start_pos;

1 0

Alexandre Julliard : gdi32: Add a helper function to initialize Bresenham parameters for line drawing.
by Alexandre Julliard 30 Jul '12

30 Jul '12

Module: wine Branch: master Commit: 78d12e7fccafb16cf8df8e498e599665565a8624 URL: http://source.winehq.org/git/wine.git/?a=commit;h=78d12e7fccafb16cf8df8e498… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 30 12:02:34 2012 +0200 gdi32: Add a helper function to initialize Bresenham parameters for line drawing. --- dlls/gdi32/dibdrv/objects.c | 105 ++++++++++++++++++------------------------ 1 files changed, 45 insertions(+), 60 deletions(-) diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index 04548ce..026ea50 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -300,6 +300,39 @@ static inline DWORD calc_outcode(const POINT *pt, const RECT *clip) return out; } +static void init_bres_params( const POINT *start, const POINT *end, bres_params *clip_params, + struct line_params *line_params, RECT *rect ) +{ + INT dx = end->x - start->x, dy = end->y - start->y; + INT abs_dx = abs(dx), abs_dy = abs(dy); + + clip_params->dx = abs_dx; + clip_params->dy = abs_dy; + clip_params->octant = get_octant_mask(dx, dy); + clip_params->bias = get_bias( clip_params->octant ); + + line_params->bias = clip_params->bias; + line_params->x_major = is_xmajor( clip_params->octant ); + line_params->x_inc = is_x_increasing( clip_params->octant ) ? 1 : -1; + line_params->y_inc = is_y_increasing( clip_params->octant ) ? 1 : -1; + + if (line_params->x_major) + { + line_params->err_add_1 = 2 * abs_dy - 2 * abs_dx; + line_params->err_add_2 = 2 * abs_dy; + } + else + { + line_params->err_add_1 = 2 * abs_dx - 2 * abs_dy; + line_params->err_add_2 = 2 * abs_dx; + } + + rect->left = min( start->x, end->x ); + rect->top = min( start->y, end->y ); + rect->right = max( start->x, end->x ) + 1; + rect->bottom = max( start->y, end->y ) + 1; +} + /****************************************************************************** * clip_line * @@ -570,34 +603,8 @@ static BOOL solid_pen_line(dibdrv_physdev *pdev, POINT *start, POINT *end, DWORD { bres_params clip_params; struct line_params line_params; - INT dx = end->x - start->x, dy = end->y - start->y; - INT abs_dx = abs(dx), abs_dy = abs(dy); - - clip_params.dx = abs_dx; - clip_params.dy = abs_dy; - clip_params.octant = get_octant_mask(dx, dy); - clip_params.bias = get_bias( clip_params.octant ); - - line_params.bias = clip_params.bias; - line_params.x_major = is_xmajor( clip_params.octant ); - line_params.x_inc = is_x_increasing( clip_params.octant ) ? 1 : -1; - line_params.y_inc = is_y_increasing( clip_params.octant ) ? 1 : -1; - - if (line_params.x_major) - { - line_params.err_add_1 = 2 * abs_dy - 2 * abs_dx; - line_params.err_add_2 = 2 * abs_dy; - } - else - { - line_params.err_add_1 = 2 * abs_dx - 2 * abs_dy; - line_params.err_add_2 = 2 * abs_dx; - } - rect.left = min( start->x, end->x ); - rect.top = min( start->y, end->y ); - rect.right = max( start->x, end->x ) + 1; - rect.bottom = max( start->y, end->y ) + 1; + init_bres_params( start, end, &clip_params, &line_params, &rect ); if (!get_clipped_rects( &pdev->dib, &rect, pdev->clip, &clipped_rects )) return TRUE; for (i = 0; i < clipped_rects.count; i++) { @@ -612,12 +619,14 @@ static BOOL solid_pen_line(dibdrv_physdev *pdev, POINT *start, POINT *end, DWORD if (line_params.x_major) { - line_params.err_start = 2 * abs_dy - abs_dx + m * 2 * abs_dy - n * 2 * abs_dx; + line_params.err_start = 2 * clip_params.dy - clip_params.dx + + m * 2 * clip_params.dy - n * 2 * clip_params.dx; line_params.length = abs( clipped_end.x - clipped_start.x ) + 1; } else { - line_params.err_start = 2 * abs_dx - abs_dy + n * 2 * abs_dx - m * 2 * abs_dy; + line_params.err_start = 2 * clip_params.dx - clip_params.dy + + n * 2 * clip_params.dx - m * 2 * clip_params.dy; line_params.length = abs( clipped_end.y - clipped_start.y ) + 1; } @@ -978,34 +987,8 @@ static BOOL dashed_pen_line(dibdrv_physdev *pdev, POINT *start, POINT *end) { bres_params clip_params; struct line_params line_params; - INT dx = end->x - start->x, dy = end->y - start->y; - INT abs_dx = abs(dx), abs_dy = abs(dy); - - clip_params.dx = abs_dx; - clip_params.dy = abs_dy; - clip_params.octant = get_octant_mask(dx, dy); - clip_params.bias = get_bias( clip_params.octant ); - line_params.bias = clip_params.bias; - line_params.x_major = is_xmajor( clip_params.octant ); - line_params.x_inc = is_x_increasing( clip_params.octant ) ? 1 : -1; - line_params.y_inc = is_y_increasing( clip_params.octant ) ? 1 : -1; - - if (line_params.x_major) - { - line_params.err_add_1 = 2 * abs_dy - 2 * abs_dx; - line_params.err_add_2 = 2 * abs_dy; - } - else - { - line_params.err_add_1 = 2 * abs_dx - 2 * abs_dy; - line_params.err_add_2 = 2 * abs_dx; - } - - rect.left = min( start->x, end->x ); - rect.top = min( start->y, end->y ); - rect.right = max( start->x, end->x ) + 1; - rect.bottom = max( start->y, end->y ) + 1; + init_bres_params( start, end, &clip_params, &line_params, &rect ); get_clipped_rects( &pdev->dib, &rect, pdev->clip, &clipped_rects ); for (i = 0; i < clipped_rects.count; i++) { @@ -1022,13 +1005,15 @@ static BOOL dashed_pen_line(dibdrv_physdev *pdev, POINT *start, POINT *end) if (line_params.x_major) { - line_params.err_start = 2 * abs_dy - abs_dx + m * 2 * abs_dy - n * 2 * abs_dx; + line_params.err_start = 2 * clip_params.dy - clip_params.dx + + m * 2 * clip_params.dy - n * 2 * clip_params.dx; line_params.length = abs( clipped_end.x - clipped_start.x ) + 1; skip_dash(pdev, m); } else { - line_params.err_start = 2 * abs_dx - abs_dy + n * 2 * abs_dx - m * 2 * abs_dy; + line_params.err_start = 2 * clip_params.dx - clip_params.dy + + n * 2 * clip_params.dx - m * 2 * clip_params.dy; line_params.length = abs( clipped_end.y - clipped_start.y ) + 1; skip_dash(pdev, n); } @@ -1041,9 +1026,9 @@ static BOOL dashed_pen_line(dibdrv_physdev *pdev, POINT *start, POINT *end) } pdev->dash_pos = start_pos; if(line_params.x_major) - skip_dash(pdev, abs_dx); + skip_dash(pdev, clip_params.dx); else - skip_dash(pdev, abs_dy); + skip_dash(pdev, clip_params.dy); } free_clipped_rects( &clipped_rects );

1 0

← Newer
1
2
3
4
5
6
7
8
...
72
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits July 2012