July 2012 - Wine-Commits - list.winehq.org

Jacek Caban : mshtml: Use inner window directly in run_insert_script.
by Alexandre Julliard July 30, 2012

July 30, 2012

Module: wine Branch: master Commit: 8b69ff6b3bedcd8fb586ea548ba001ca1aec57ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b69ff6b3bedcd8fb586ea548… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 30 15:56:33 2012 +0200 mshtml: Use inner window directly in run_insert_script. --- dlls/mshtml/mutation.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/mutation.c b/dlls/mshtml/mutation.c index 12c5c98..129094e 100644 --- a/dlls/mshtml/mutation.c +++ b/dlls/mshtml/mutation.c @@ -316,7 +316,7 @@ static nsresult run_insert_script(HTMLDocumentNode *doc, nsISupports *script_ifa if(nsparser) nsIParser_BeginEvaluatingParserInsertedScript(nsparser); - doc_insert_script(doc->basedoc.window->base.inner_window, nsscript); + doc_insert_script(doc->window, nsscript); if(nsparser) { nsIParser_EndEvaluatingParserInsertedScript(nsparser);

1 0

Jacek Caban : mshtml: Use inner window directly in HTMLOptionElementFactory implementation.
by Alexandre Julliard July 30, 2012

July 30, 2012

Module: wine Branch: master Commit: e78537ffa236a05d07b9df5580ccf65b062da3e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e78537ffa236a05d07b9df558… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 30 15:56:07 2012 +0200 mshtml: Use inner window directly in HTMLOptionElementFactory implementation. --- dlls/mshtml/htmloption.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmloption.c b/dlls/mshtml/htmloption.c index fac06ed..8722228 100644 --- a/dlls/mshtml/htmloption.c +++ b/dlls/mshtml/htmloption.c @@ -458,18 +458,18 @@ static HRESULT WINAPI HTMLOptionElementFactory_create(IHTMLOptionElementFactory TRACE("(%p)->(%s %s %s %s %p)\n", This, debugstr_variant(&text), debugstr_variant(&value), debugstr_variant(&defaultselected), debugstr_variant(&selected), optelem); - if(!This->window || !This->window->base.inner_window->doc) { + if(!This->window || !This->window->doc) { WARN("NULL doc\n"); return E_UNEXPECTED; } *optelem = NULL; - hres = create_nselem(This->window->base.inner_window->doc, optionW, &nselem); + hres = create_nselem(This->window->doc, optionW, &nselem); if(FAILED(hres)) return hres; - hres = get_node(This->window->base.inner_window->doc, (nsIDOMNode*)nselem, TRUE, &node); + hres = get_node(This->window->doc, (nsIDOMNode*)nselem, TRUE, &node); nsIDOMHTMLElement_Release(nselem); if(FAILED(hres)) return hres;

1 0

Jacek Caban : mshtml: Use inner window directly in HTMLImageElementFactory implementation.
by Alexandre Julliard July 30, 2012

July 30, 2012

Module: wine Branch: master Commit: dce83a304d98199d00afe22791242920b3e83fdb URL: http://source.winehq.org/git/wine.git/?a=commit;h=dce83a304d98199d00afe2279… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 30 15:55:57 2012 +0200 mshtml: Use inner window directly in HTMLImageElementFactory implementation. --- dlls/mshtml/htmlimg.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlimg.c b/dlls/mshtml/htmlimg.c index be33a71..06c8b3d 100644 --- a/dlls/mshtml/htmlimg.c +++ b/dlls/mshtml/htmlimg.c @@ -809,12 +809,12 @@ static HRESULT WINAPI HTMLImageElementFactory_create(IHTMLImageElementFactory *i TRACE("(%p)->(%s %s %p)\n", This, debugstr_variant(&width), debugstr_variant(&height), img_elem); - if(!This->window || !This->window->base.inner_window->doc) { + if(!This->window || !This->window->doc) { WARN("NULL doc\n"); return E_UNEXPECTED; } - doc = This->window->base.inner_window->doc; + doc = This->window->doc; *img_elem = NULL;

1 0

Jacek Caban : mshtml: Store inner window directly in HTMLDocumentNode.
by Alexandre Julliard July 30, 2012

July 30, 2012

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 July 30, 2012

July 30, 2012

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 July 30, 2012

July 30, 2012

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

Alexandre Julliard : gdi32: Add a helper function to initialize Bresenham parameters for line drawing.
by Alexandre Julliard July 30, 2012

July 30, 2012

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

Nikolay Sivov : msxml3: Enable inline wrappers for tests.
by Alexandre Julliard July 30, 2012

July 30, 2012

Module: wine Branch: master Commit: 6ca60b59c937ca3e31696ef685c068d136c1cbc6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ca60b59c937ca3e31696ef68… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jul 30 10:32:56 2012 +0400 msxml3: Enable inline wrappers for tests. --- dlls/msxml3/tests/Makefile.in | 1 + dlls/msxml3/tests/domdoc.c | 70 ++++++++++++++++++++-------------------- dlls/msxml3/tests/xmldoc.c | 4 +- 3 files changed, 38 insertions(+), 37 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6ca60b59c937ca3e31696…

1 0

Nikolay Sivov : shell32: Use proper macros when calling COM methods.
by Alexandre Julliard July 30, 2012

July 30, 2012

Module: wine Branch: master Commit: bf0c67c3220bbbf527316ff1384e25f00f79d843 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf0c67c3220bbbf527316ff13… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jul 29 12:51:05 2012 +0400 shell32: Use proper macros when calling COM methods. --- dlls/shell32/assoc.c | 2 +- dlls/shell32/cpanelfolder.c | 2 +- dlls/shell32/ebrowser.c | 12 ++++++------ dlls/shell32/recyclebin.c | 2 +- dlls/shell32/shellitem.c | 6 +++--- dlls/shell32/shfldr_desktop.c | 6 +++--- dlls/shell32/shfldr_fs.c | 8 ++++---- dlls/shell32/shfldr_mycomp.c | 14 +++++++------- dlls/shell32/shfldr_netplaces.c | 2 +- dlls/shell32/shfldr_unixfs.c | 12 ++++++------ dlls/shell32/shlfolder.c | 8 ++++---- 11 files changed, 37 insertions(+), 37 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bf0c67c3220bbbf527316…

1 0

Jacek Caban : jscript/tests: Use proper helpers for iface calls.
by Alexandre Julliard July 30, 2012

July 30, 2012

Module: wine Branch: master Commit: 142d0f302623e650a6854ebb2f1e368f4547c536 URL: http://source.winehq.org/git/wine.git/?a=commit;h=142d0f302623e650a6854ebb2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 30 12:02:01 2012 +0200 jscript/tests: Use proper helpers for iface calls. --- dlls/jscript/tests/activex.c | 68 ++++++++++++++++++++++++++++------------- dlls/jscript/tests/caller.c | 30 ++++++++++++++---- dlls/jscript/tests/jscript.c | 34 +++++++++++++++----- dlls/jscript/tests/run.c | 46 +++++++++++++++++++--------- 4 files changed, 125 insertions(+), 53 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=142d0f302623e650a6854…

1 0