wine-commits May 2011

wine-commits@winehq.org

2 participants
945 discussions

Jacek Caban : mshtml: Added IHTMLElement::get_offsetLeft implementation.
by Alexandre Julliard 31 May '11

31 May '11

Module: wine Branch: master Commit: 0a77eb68e3007581a0c4d6e25490f3ec65128e98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a77eb68e3007581a0c4d6e25… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 31 12:19:13 2011 +0200 mshtml: Added IHTMLElement::get_offsetLeft implementation. --- dlls/mshtml/htmlelem.c | 23 +++++++++++++++++++++-- dlls/mshtml/tests/dom.c | 3 +++ 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 74a4394..0cf0227 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -819,8 +819,27 @@ static HRESULT WINAPI HTMLElement_get_lang(IHTMLElement *iface, BSTR *p) static HRESULT WINAPI HTMLElement_get_offsetLeft(IHTMLElement *iface, LONG *p) { HTMLElement *This = impl_from_IHTMLElement(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsIDOMNSHTMLElement *nselem; + PRInt32 off_left = 0; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsres = nsIDOMHTMLElement_QueryInterface(This->nselem, &IID_nsIDOMNSHTMLElement, (void**)&nselem); + if(NS_FAILED(nsres)) { + ERR("Could not get nsIDOMNSHTMLElement: %08x\n", nsres); + return E_FAIL; + } + + nsres = nsIDOMNSHTMLElement_GetOffsetLeft(nselem, &off_left); + nsIDOMNSHTMLElement_Release(nselem); + if(NS_FAILED(nsres)) { + ERR("GetOffsetLeft failed: %08x\n", nsres); + return E_FAIL; + } + + *p = off_left; + return S_OK; } static HRESULT WINAPI HTMLElement_get_offsetTop(IHTMLElement *iface, LONG *p) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index d7e8dda..03eb48a 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -947,6 +947,9 @@ static void _test_elem_offset(unsigned line, IUnknown *unk) hres = IHTMLElement_get_offsetWidth(elem, &l); ok_(__FILE__,line) (hres == S_OK, "get_offsetWidth failed: %08x\n", hres); + hres = IHTMLElement_get_offsetLeft(elem, &l); + ok_(__FILE__,line) (hres == S_OK, "get_offsetLeft failed: %08x\n", hres); + IHTMLElement_Release(elem); }

1 0

Jacek Caban : mshtml: Added support for accessing document elements by index.
by Alexandre Julliard 31 May '11

31 May '11

Module: wine Branch: master Commit: a42cffbdcc16e7180bd21ee13de78da9c190f6ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=a42cffbdcc16e7180bd21ee13… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 31 12:19:04 2011 +0200 mshtml: Added support for accessing document elements by index. --- dlls/mshtml/htmldoc.c | 127 ++++++++++++++++++++++++++++++++++++++++- dlls/mshtml/mshtml_private.h | 4 + dlls/mshtml/tests/jstest.html | 20 +++++++ 3 files changed, 149 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 6ecb39b..1ebb8eb 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -1557,6 +1557,64 @@ static inline HTMLDocument *impl_from_IDispatchEx(IDispatchEx *iface) return CONTAINING_RECORD(iface, HTMLDocument, IDispatchEx_iface); } +static HRESULT dispid_from_elem_name(HTMLDocumentNode *This, BSTR name, DISPID *dispid) +{ + nsIDOMNodeList *node_list; + nsAString name_str; + PRUint32 len; + unsigned i; + nsresult nsres; + + if(!This->nsdoc) + return DISP_E_UNKNOWNNAME; + + nsAString_InitDepend(&name_str, name); + nsres = nsIDOMHTMLDocument_GetElementsByName(This->nsdoc, &name_str, &node_list); + nsAString_Finish(&name_str); + if(NS_FAILED(nsres)) + return E_FAIL; + + nsres = nsIDOMNodeList_GetLength(node_list, &len); + nsIDOMNodeList_Release(node_list); + if(NS_FAILED(nsres)) + return E_FAIL; + + if(!len) + return DISP_E_UNKNOWNNAME; + + for(i=0; i < This->elem_vars_cnt; i++) { + if(!strcmpW(name, This->elem_vars[i])) { + *dispid = MSHTML_DISPID_CUSTOM_MIN+i; + return S_OK; + } + } + + if(This->elem_vars_cnt == This->elem_vars_size) { + WCHAR **new_vars; + + if(This->elem_vars_size) { + new_vars = heap_realloc(This->elem_vars, This->elem_vars_size*2*sizeof(WCHAR*)); + if(!new_vars) + return E_OUTOFMEMORY; + This->elem_vars_size *= 2; + }else { + new_vars = heap_alloc(16*sizeof(WCHAR*)); + if(!new_vars) + return E_OUTOFMEMORY; + This->elem_vars_size = 16; + } + + This->elem_vars = new_vars; + } + + This->elem_vars[This->elem_vars_cnt] = heap_strdupW(name); + if(!This->elem_vars[This->elem_vars_cnt]) + return E_OUTOFMEMORY; + + *dispid = MSHTML_DISPID_CUSTOM_MIN+This->elem_vars_cnt++; + return S_OK; +} + static HRESULT WINAPI DocDispatchEx_QueryInterface(IDispatchEx *iface, REFIID riid, void **ppv) { HTMLDocument *This = impl_from_IDispatchEx(iface); @@ -1630,8 +1688,13 @@ static HRESULT WINAPI DocDispatchEx_Invoke(IDispatchEx *iface, DISPID dispIdMemb static HRESULT WINAPI DocDispatchEx_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD grfdex, DISPID *pid) { HTMLDocument *This = impl_from_IDispatchEx(iface); + HRESULT hres; - return IDispatchEx_GetDispID(This->dispex, bstrName, grfdex, pid); + hres = IDispatchEx_GetDispID(This->dispex, bstrName, grfdex, pid); + if(hres != DISP_E_UNKNOWNNAME) + return hres; + + return dispid_from_elem_name(This->doc_node, bstrName, pid); } static HRESULT WINAPI DocDispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, WORD wFlags, DISPPARAMS *pdp, @@ -1905,6 +1968,11 @@ static HRESULT HTMLDocumentNode_QI(HTMLDOMNode *iface, REFIID riid, void **ppv) static void HTMLDocumentNode_destructor(HTMLDOMNode *iface) { HTMLDocumentNode *This = impl_from_HTMLDOMNode(iface); + unsigned i; + + for(i=0; i < This->elem_vars_cnt; i++) + heap_free(This->elem_vars[i]); + heap_free(This->elem_vars); if(This->body_event_target) release_event_target(This->body_event_target); @@ -1956,6 +2024,61 @@ static HRESULT HTMLDocumentFragment_clone(HTMLDOMNode *iface, nsIDOMNode *nsnode return S_OK; } +static inline HTMLDocumentNode *impl_from_DispatchEx(DispatchEx *iface) +{ + return CONTAINING_RECORD(iface, HTMLDocumentNode, node.dispex); +} + +static HRESULT HTMLDocumentNode_invoke(DispatchEx *dispex, DISPID id, LCID lcid, WORD flags, DISPPARAMS *params, + VARIANT *res, EXCEPINFO *ei, IServiceProvider *caller) +{ + HTMLDocumentNode *This = impl_from_DispatchEx(dispex); + nsIDOMNodeList *node_list; + nsAString name_str; + nsIDOMNode *nsnode; + HTMLDOMNode *node; + unsigned i; + nsresult nsres; + HRESULT hres; + + if(flags != DISPATCH_PROPERTYGET) { + FIXME("unsupported flags %x\n", flags); + return E_NOTIMPL; + } + + i = id - MSHTML_DISPID_CUSTOM_MIN; + + if(!This->nsdoc || i >= This->elem_vars_cnt) + return DISP_E_UNKNOWNNAME; + + nsAString_InitDepend(&name_str, This->elem_vars[i]); + nsres = nsIDOMHTMLDocument_GetElementsByName(This->nsdoc, &name_str, &node_list); + nsAString_Finish(&name_str); + if(NS_FAILED(nsres)) + return E_FAIL; + + nsres = nsIDOMNodeList_Item(node_list, 0, &nsnode); + nsIDOMNodeList_Release(node_list); + if(NS_FAILED(nsres) || !nsnode) + return DISP_E_UNKNOWNNAME; + + hres = get_node(This, nsnode, TRUE, &node); + if(FAILED(hres)) + return hres; + + IHTMLDOMNode_AddRef(&node->IHTMLDOMNode_iface); + V_VT(res) = VT_DISPATCH; + V_DISPATCH(res) = (IDispatch*)&node->IHTMLDOMNode_iface; + return S_OK; +} + + +static const dispex_static_data_vtbl_t HTMLDocumentNode_dispex_vtbl = { + NULL, + NULL, + HTMLDocumentNode_invoke +}; + static const NodeImplVtbl HTMLDocumentFragmentImplVtbl = { HTMLDocumentNode_QI, HTMLDocumentNode_destructor, @@ -1973,7 +2096,7 @@ static const tid_t HTMLDocumentNode_iface_tids[] = { }; static dispex_static_data_t HTMLDocumentNode_dispex = { - NULL, + &HTMLDocumentNode_dispex_vtbl, DispHTMLDocument_tid, NULL, HTMLDocumentNode_iface_tids diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 6832d54..6fc78ec 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -623,6 +623,10 @@ struct HTMLDocumentNode { nsDocumentEventListener *nsevent_listener; BOOL *event_vector; + WCHAR **elem_vars; + unsigned elem_vars_size; + unsigned elem_vars_cnt; + BOOL skip_mutation_notif; struct list bindings; diff --git a/dlls/mshtml/tests/jstest.html b/dlls/mshtml/tests/jstest.html index c19abe8..b465491 100644 --- a/dlls/mshtml/tests/jstest.html +++ b/dlls/mshtml/tests/jstest.html @@ -43,6 +43,25 @@ function test_createDocumentFragment() { ok(cloned.nodeName === "#document-fragment", "cloned.nodeName = " + cloned.nodeName); } +function test_document_name_as_index() { + document.body.innerHTML = '<form name="formname"></form>'; + var e = document.getElementById("formname"); + ok(!!e, "e is null"); + + ok(document.formname === e, "document.formname != getElementById('formname')"); + ok("formname" in document, "formname' is not in document"); + + document.body.removeChild(e); + + ok(document.formname === undefined, "document.formname is not undefined"); + ok(!("formname" in document), "formname' is in document"); + + document.body.innerHTML = '<form id="formid"></form>'; + var e = document.getElementById("formid"); + ok(!!e, "e is null"); + ok(!("formid" in document), "formid is in document"); +} + var globalVar = false; function runTest() { @@ -55,6 +74,7 @@ function runTest() { test_removeAttribute(document.body); test_select_index(); test_createDocumentFragment(); + test_document_name_as_index(); var r = window.execScript("globalVar = true;"); ok(r === undefined, "execScript returned " + r);

1 0

Alexandre Julliard : widl: Add a more generic way of determining the type of handle for a function.
by Alexandre Julliard 31 May '11

31 May '11

Module: wine Branch: master Commit: 0f8b64a57b0117cf2bb4c2e4c81f5a66f511ce75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f8b64a57b0117cf2bb4c2e4c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 31 13:30:04 2011 +0200 widl: Add a more generic way of determining the type of handle for a function. --- tools/widl/client.c | 73 +++++++++++++++++++++----------------------------- tools/widl/header.c | 70 +++++++++++++++++++++++-------------------------- tools/widl/header.h | 5 +-- tools/widl/parser.y | 35 ++++++++---------------- tools/widl/server.c | 10 +++---- 5 files changed, 82 insertions(+), 111 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0f8b64a57b0117cf2bb4c…

1 0

Alexandre Julliard : widl: Support using custom handle types with the implicit_handle attribute.
by Alexandre Julliard 31 May '11

31 May '11

Module: wine Branch: master Commit: 21cbdaa1eb9cbd122037dcb3ad62d257dc2077c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=21cbdaa1eb9cbd122037dcb3a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 31 13:01:32 2011 +0200 widl: Support using custom handle types with the implicit_handle attribute. --- tools/widl/client.c | 14 +++++++------- tools/widl/header.c | 9 +++++++-- tools/widl/parser.y | 13 ++++++++++++- 3 files changed, 26 insertions(+), 10 deletions(-) diff --git a/tools/widl/client.c b/tools/widl/client.c index aec379c..cf14c9c 100644 --- a/tools/widl/client.c +++ b/tools/widl/client.c @@ -75,7 +75,7 @@ static void check_pointers(const var_t *func) static void write_function_stubs(type_t *iface, unsigned int *proc_offset) { const statement_t *stmt; - const char *implicit_handle = get_attrp(iface->attrs, ATTR_IMPLICIT_HANDLE); + const var_t *implicit_handle = get_attrp(iface->attrs, ATTR_IMPLICIT_HANDLE); int method_count = 0; if (!implicit_handle) @@ -245,7 +245,7 @@ static void write_function_stubs(type_t *iface, unsigned int *proc_offset) } else if (implicit_handle) { - print_client("__frame->_Handle = %s;\n", implicit_handle); + print_client("__frame->_Handle = %s;\n", implicit_handle->name); fprintf(client, "\n"); } @@ -334,7 +334,7 @@ static void write_stubdescdecl(type_t *iface) static void write_stubdescriptor(type_t *iface, int expr_eval_routines) { - const char *implicit_handle = get_attrp(iface->attrs, ATTR_IMPLICIT_HANDLE); + const var_t *implicit_handle = get_attrp(iface->attrs, ATTR_IMPLICIT_HANDLE); print_client("static const MIDL_STUB_DESC %s_StubDesc =\n", iface->name); print_client("{\n"); @@ -345,7 +345,7 @@ static void write_stubdescriptor(type_t *iface, int expr_eval_routines) print_client("{\n"); indent++; if (implicit_handle) - print_client("&%s,\n", implicit_handle); + print_client("&%s,\n", implicit_handle->name); else print_client("&%s__MIDL_AutoBindHandle,\n", iface->name); indent--; @@ -423,12 +423,12 @@ static void write_clientinterfacedecl(type_t *iface) static void write_implicithandledecl(type_t *iface) { - const char *implicit_handle = get_attrp(iface->attrs, ATTR_IMPLICIT_HANDLE); + const var_t *implicit_handle = get_attrp(iface->attrs, ATTR_IMPLICIT_HANDLE); if (implicit_handle) { - fprintf(client, "handle_t %s;\n", implicit_handle); - fprintf(client, "\n"); + write_type_decl( client, implicit_handle->type, implicit_handle->name ); + fprintf(client, ";\n\n"); } } diff --git a/tools/widl/header.c b/tools/widl/header.c index 9df03cc..0ba9022 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -1078,14 +1078,19 @@ static void write_com_interface_end(FILE *header, type_t *iface) static void write_rpc_interface_start(FILE *header, const type_t *iface) { unsigned int ver = get_attrv(iface->attrs, ATTR_VERSION); - const char *var = get_attrp(iface->attrs, ATTR_IMPLICIT_HANDLE); + const var_t *var = get_attrp(iface->attrs, ATTR_IMPLICIT_HANDLE); fprintf(header, "/*****************************************************************************\n"); fprintf(header, " * %s interface (v%d.%d)\n", iface->name, MAJORVERSION(ver), MINORVERSION(ver)); fprintf(header, " */\n"); fprintf(header,"#ifndef __%s_INTERFACE_DEFINED__\n", iface->name); fprintf(header,"#define __%s_INTERFACE_DEFINED__\n\n", iface->name); - if (var) fprintf(header, "extern handle_t %s;\n", var); + if (var) + { + fprintf(header, "extern "); + write_type_decl( header, var->type, var->name ); + fprintf(header, ";\n"); + } if (old_names) { fprintf(header, "extern RPC_IF_HANDLE %s%s_ClientIfHandle;\n", prefix_client, iface->name); diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 6f0cf8c..56d5a8b 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -522,7 +522,7 @@ attribute: { $$ = NULL; } | tIGNORE { $$ = make_attr(ATTR_IGNORE); } | tIIDIS '(' expr ')' { $$ = make_attrp(ATTR_IIDIS, $3); } | tIMMEDIATEBIND { $$ = make_attr(ATTR_IMMEDIATEBIND); } - | tIMPLICITHANDLE '(' tHANDLET aIDENTIFIER ')' { $$ = make_attrp(ATTR_IMPLICIT_HANDLE, $4); } + | tIMPLICITHANDLE '(' arg ')' { $$ = make_attrp(ATTR_IMPLICIT_HANDLE, $3); } | tIN { $$ = make_attr(ATTR_IN); } | tINPUTSYNC { $$ = make_attr(ATTR_INPUTSYNC); } | tLENGTHIS '(' m_exprs ')' { $$ = make_attrp(ATTR_LENGTHIS, $3); } @@ -2124,6 +2124,17 @@ static attr_list_t *check_iface_attrs(const char *name, attr_list_t *attrs) if (!allowed_attr[attr->type].on_interface) error_loc("inapplicable attribute %s for interface %s\n", allowed_attr[attr->type].display_name, name); + if (attr->type == ATTR_IMPLICIT_HANDLE) + { + const var_t *var = attr->u.pval; + if (type_get_type( var->type) == TYPE_BASIC && + type_basic_get_type( var->type ) == TYPE_BASIC_HANDLE) + continue; + if (is_aliaschain_attr( var->type, ATTR_HANDLE )) + continue; + error_loc("attribute %s requires a handle type in interface %s\n", + allowed_attr[attr->type].display_name, name); + } } return attrs; }

1 0

Huw Davies : gdi32/tests: Add tests for 4 bpp brushes.
by Alexandre Julliard 31 May '11

31 May '11

Module: wine Branch: master Commit: 4fc0d3c3179998d0bdf58bf383e1a5d07669ca4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=4fc0d3c3179998d0bdf58bf38… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue May 31 10:02:06 2011 +0100 gdi32/tests: Add tests for 4 bpp brushes. --- dlls/gdi32/tests/dib.c | 32 ++++++++++++++++++++++++++++++++ 1 files changed, 32 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/tests/dib.c b/dlls/gdi32/tests/dib.c index a0de1b5..4322ed8 100644 --- a/dlls/gdi32/tests/dib.c +++ b/dlls/gdi32/tests/dib.c @@ -95,6 +95,7 @@ static const char *sha1_graphics_a8r8g8b8[] = "a694872f38e66a7ff471440c3e6a9310ef78328a", "d7398de15b2837a58a62a701ca1b3384625afec4", "a78b28472bb7ff480ddedd06b9cf2daa775fa7ae", + "5246ef357e7317b9d141a3294d300c195da76cb7", "e2a8eef4aeda3a0f6c950075acba38f1f9e0814d", "8b66f14d51ecdeea12bc993302bb9b7d3ec085a1", "7da9dd3d40d44d92deb9883fb7110443c2d5769a", @@ -122,6 +123,7 @@ static const char *sha1_graphics_a8b8g8r8[] = "42fefefe4435570fa8038ec759140c66c76570e9", "3369889a67d6c79a24ee15f7d14374f9995215e4", "473a1fd07df800c87a5d3286b642ace10c61c6af", + "10cd25a0ed5cd8f978d7d68236f81d949b938e84", "4851c5b7d5bc18590e787c0c218a592ef504e738", "9aa506e3df33e0d5298755aa4144e10eb4b5adcf", "abdf003699364fe45fab7dc61e67c606d0063b40", @@ -149,6 +151,7 @@ static const char *sha1_graphics_r5g5b5[] = "4aac89fc18c128eddb69eea658272af53138a1cb", "9d21bcfdeaf1ca5d47eb823bdefc24d7a95f4f56", "6daaf945a955928c5c124c880522ca4634fb2343", + "12a288390d16e1efa99d4185301de48a4d433b14", "3a50ce21b3563a604b4fc9f247a30f5a981f1ba6", "d7d97e28ed316f6596c737eb83baa5948d86b673", "ecc2991277d7314f55b00e0f284ae3703aeef81e", @@ -176,6 +179,7 @@ static const char *sha1_graphics_r4g4b4[] = "6092ccbab6b6e073c6ac8244d122f2cfc453aa38", "32b6e0aa79b7e96cd0ab2da167f6463c011023a8", "1d283aa4d2b2114f7809fe59357d590c7c779aa7", + "29640e2ddd2d3016da14507c3ce9b2ce32f39bb4", "d591232bbc2592462c819a9486750f64180518fd", "0e183a4c30b3da345129cffe33fe0fc593d8666b", "f14d9a4bd8a365b7c8f068a0dad481b6eb2b178b", @@ -203,6 +207,7 @@ static const char *sha1_graphics_8[] = "9552f48b88982633a44001227abb847dae4d06b0", "cfc67c325c7cdf96d90af9b3cceb8d0504cbb3b0", "7262364067e03c7fa498af1d59d228d6c63b460e", + "5241241a355a667ef0834049adf4218e8b3f16b8", "1f13ea0034db4b0ffa4ddcff9664fd892058f9cd", "3caf512cfddfd463d0750cfe3cadb58548eb2ae8", "4e5e7d5fd64818b2b3d3e793c88f603b699d2f0f", @@ -230,6 +235,7 @@ static const char *sha1_graphics_4[] = "5070ecae5085209508f7450d5f21c69737a178e9", "0f44e12ecd1ea7e39433890443626d4fc35204a4", "eb38683e812fd13dca971ba8f4cfd2b6820d3524", + "73bbc83f88f1aaa6df0158b63e70bb3165163163", "39c16648cf6c261be71a33cec41867f28e119b94", "26ad5116562e7b58c76a26eaf521e2e40899e944", "1bcc54eaf8e3c2b7c59ecccb23c240181d7ba8b8", @@ -404,6 +410,7 @@ static const RECT rectangles[] = static const BITMAPINFOHEADER dib_brush_header_32 = {sizeof(BITMAPINFOHEADER), 16, -16, 1, 32, BI_RGB, 0, 0, 0, 0, 0}; static const BITMAPINFOHEADER dib_brush_header_555 = {sizeof(BITMAPINFOHEADER), 16, -16, 1, 16, BI_RGB, 0, 0, 0, 0, 0}; static const BITMAPINFOHEADER dib_brush_header_8 = {sizeof(BITMAPINFOHEADER), 16, -16, 1, 8, BI_RGB, 0, 0, 0, 0, 0}; +static const BITMAPINFOHEADER dib_brush_header_4 = {sizeof(BITMAPINFOHEADER), 16, -16, 1, 4, BI_RGB, 0, 0, 0, 0, 0}; static void draw_graphics(HDC hdc, BITMAPINFO *bmi, BYTE *bits, const char ***sha1) { @@ -709,6 +716,31 @@ static void draw_graphics(HDC hdc, BITMAPINFO *bmi, BYTE *bits, const char ***sh SelectObject(hdc, orig_brush); DeleteObject(dib_brush); + /* 4 bpp dib pattern brush */ + + brush_bi->bmiHeader = dib_brush_header_4; + dib_brush = CreateDIBPatternBrushPt(brush_bi, DIB_RGB_COLORS); + + SelectObject(hdc, dib_brush); + SetBrushOrgEx(hdc, 1, 1, NULL); + + for(i = 0, y = 10; i < 256; i++) + { + BOOL ret; + + if(!rop_uses_src(rop3[i])) + { + ret = PatBlt(hdc, 10 + i, y, 100, 20, rop3[i]); + ok(ret, "got FALSE for %x\n", rop3[i]); + y += 25; + } + } + compare_hash(bmi, bits, sha1, "top-down 4 bpp dib brush patblt"); + memset(bits, 0xcc, dib_size); + + SelectObject(hdc, orig_brush); + SetBrushOrgEx(hdc, 0, 0, NULL); + /* Rectangle */ SelectObject(hdc, solid_pen);

1 0

Huw Davies : gdi32: Add support for 4 bpp brushes.
by Alexandre Julliard 31 May '11

31 May '11

Module: wine Branch: master Commit: 79e8eaeaf6752f0143f29caa19ffa3eb5b612252 URL: http://source.winehq.org/git/wine.git/?a=commit;h=79e8eaeaf6752f0143f29caa1… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue May 31 10:02:05 2011 +0100 gdi32: Add support for 4 bpp brushes. --- dlls/gdi32/dibdrv/primitives.c | 175 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 175 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/dibdrv/primitives.c b/dlls/gdi32/dibdrv/primitives.c index 8391971..018ef9a 100644 --- a/dlls/gdi32/dibdrv/primitives.c +++ b/dlls/gdi32/dibdrv/primitives.c @@ -536,6 +536,30 @@ static BOOL convert_to_8888(dib_info *dst, const dib_info *src, const RECT *src_ break; } + case 4: + { + BYTE *src_start = get_pixel_ptr_4(src, src_rect->left, src_rect->top), *src_pixel; + for(y = src_rect->top; y < src_rect->bottom; y++) + { + dst_pixel = dst_start; + src_pixel = src_start; + for(x = src_rect->left; x < src_rect->right; x++) + { + RGBQUAD rgb; + if(x & 1) + src_val = *src_pixel++ & 0xf; + else + src_val = (*src_pixel >> 4) & 0xf; + if(src_val >= src->color_table_size) src_val = src->color_table_size - 1; + rgb = src->color_table[src_val]; + *dst_pixel++ = rgb.rgbRed << 16 | rgb.rgbGreen << 8 | rgb.rgbBlue; + } + dst_start += dst->stride / 4; + src_start += src->stride; + } + break; + } + default: FIXME("Unsupported conversion: %d -> 8888\n", src->bit_count); return FALSE; @@ -631,6 +655,32 @@ static BOOL convert_to_32(dib_info *dst, const dib_info *src, const RECT *src_re break; } + case 4: + { + BYTE *src_start = get_pixel_ptr_4(src, src_rect->left, src_rect->top), *src_pixel; + for(y = src_rect->top; y < src_rect->bottom; y++) + { + dst_pixel = dst_start; + src_pixel = src_start; + for(x = src_rect->left; x < src_rect->right; x++) + { + RGBQUAD rgb; + if(x & 1) + src_val = *src_pixel++ & 0xf; + else + src_val = (*src_pixel >> 4) & 0xf; + if(src_val >= src->color_table_size) src_val = src->color_table_size - 1; + rgb = src->color_table[src_val]; + *dst_pixel++ = put_field(rgb.rgbRed, dst->red_shift, dst->red_len) | + put_field(rgb.rgbGreen, dst->green_shift, dst->green_len) | + put_field(rgb.rgbBlue, dst->blue_shift, dst->blue_len); + } + dst_start += dst->stride / 4; + src_start += src->stride; + } + break; + } + default: FIXME("Unsupported conversion: %d -> 32\n", src->bit_count); return FALSE; @@ -724,6 +774,32 @@ static BOOL convert_to_555(dib_info *dst, const dib_info *src, const RECT *src_r break; } + case 4: + { + BYTE *src_start = get_pixel_ptr_4(src, src_rect->left, src_rect->top), *src_pixel; + for(y = src_rect->top; y < src_rect->bottom; y++) + { + dst_pixel = dst_start; + src_pixel = src_start; + for(x = src_rect->left; x < src_rect->right; x++) + { + RGBQUAD rgb; + if(x & 1) + src_val = *src_pixel++ & 0xf; + else + src_val = (*src_pixel >> 4) & 0xf; + if(src_val >= src->color_table_size) src_val = src->color_table_size - 1; + rgb = src->color_table[src_val]; + *dst_pixel++ = ((rgb.rgbRed << 7) & 0x7c00) | + ((rgb.rgbGreen << 2) & 0x03e0) | + ((rgb.rgbBlue >> 3) & 0x001f); + } + dst_start += dst->stride / 2; + src_start += src->stride; + } + break; + } + default: FIXME("Unsupported conversion: %d -> 555\n", src->bit_count); return FALSE; @@ -820,6 +896,32 @@ static BOOL convert_to_16(dib_info *dst, const dib_info *src, const RECT *src_re break; } + case 4: + { + BYTE *src_start = get_pixel_ptr_4(src, src_rect->left, src_rect->top), *src_pixel; + for(y = src_rect->top; y < src_rect->bottom; y++) + { + dst_pixel = dst_start; + src_pixel = src_start; + for(x = src_rect->left; x < src_rect->right; x++) + { + RGBQUAD rgb; + if(x & 1) + src_val = *src_pixel++ & 0xf; + else + src_val = (*src_pixel >> 4) & 0xf; + if(src_val >= src->color_table_size) src_val = src->color_table_size - 1; + rgb = src->color_table[src_val]; + *dst_pixel++ = put_field(rgb.rgbRed, dst->red_shift, dst->red_len) | + put_field(rgb.rgbGreen, dst->green_shift, dst->green_len) | + put_field(rgb.rgbBlue, dst->blue_shift, dst->blue_len); + } + dst_start += dst->stride / 2; + src_start += src->stride; + } + break; + } + default: FIXME("Unsupported conversion: %d -> 16\n", src->bit_count); return FALSE; @@ -940,6 +1042,30 @@ static BOOL convert_to_8(dib_info *dst, const dib_info *src, const RECT *src_rec break; } + case 4: + { + BYTE *src_start = get_pixel_ptr_4(src, src_rect->left, src_rect->top), *src_pixel; + for(y = src_rect->top; y < src_rect->bottom; y++) + { + dst_pixel = dst_start; + src_pixel = src_start; + for(x = src_rect->left; x < src_rect->right; x++) + { + RGBQUAD rgb; + if(x & 1) + src_val = *src_pixel++ & 0xf; + else + src_val = (*src_pixel >> 4) & 0xf; + if(src_val >= src->color_table_size) src_val = src->color_table_size - 1; + rgb = src->color_table[src_val]; + *dst_pixel++ = colorref_to_pixel_colortable(dst, RGB(rgb.rgbRed, rgb.rgbGreen, rgb.rgbBlue)); + } + dst_start += dst->stride; + src_start += src->stride; + } + break; + } + default: FIXME("Unsupported conversion: %d -> 8\n", src->bit_count); return FALSE; @@ -1056,6 +1182,55 @@ static BOOL convert_to_4(dib_info *dst, const dib_info *src, const RECT *src_rec break; } + case 4: + { + BYTE *src_start = get_pixel_ptr_4(src, src_rect->left, src_rect->top), *src_pixel; + + if(color_tables_match(dst, src) && (src_rect->left & 1) == 0) + { + if(src->stride > 0 && dst->stride > 0 && src_rect->left == 0 && src_rect->right == src->width) + memcpy(dst->bits, src_start, (src_rect->bottom - src_rect->top) * src->stride); + else + { + for(y = src_rect->top; y < src_rect->bottom; y++) + { + memcpy(dst_start, src_start, (src_rect->right - src_rect->left + 1) / 2); + dst_start += dst->stride; + src_start += src->stride; + } + } + } + else + { + for(y = src_rect->top; y < src_rect->bottom; y++) + { + dst_pixel = dst_start; + src_pixel = src_start; + for(x = src_rect->left; x < src_rect->right; x++) + { + RGBQUAD rgb; + if(x & 1) + src_val = *src_pixel++ & 0xf; + else + src_val = (*src_pixel >> 4) & 0xf; + if(src_val >= src->color_table_size) src_val = src->color_table_size - 1; + rgb = src->color_table[src_val]; + dst_val = colorref_to_pixel_colortable(dst, RGB(rgb.rgbRed, rgb.rgbGreen, rgb.rgbBlue)); + if((x - src_rect->left) & 1) + { + *dst_pixel = (dst_val & 0x0f) | (*dst_pixel & 0xf0); + dst_pixel++; + } + else + *dst_pixel = (dst_val << 4) & 0xf0; + } + dst_start += dst->stride; + src_start += src->stride; + } + } + break; + } + default: FIXME("Unsupported conversion: %d -> 4\n", src->bit_count); return FALSE;

1 0

Huw Davies : gdi32/tests: Add tests for 4 bpp dibs.
by Alexandre Julliard 31 May '11

31 May '11

Module: wine Branch: master Commit: 850730dab589491f50e29de360c78069f4f7c633 URL: http://source.winehq.org/git/wine.git/?a=commit;h=850730dab589491f50e29de36… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue May 31 10:02:04 2011 +0100 gdi32/tests: Add tests for 4 bpp dibs. --- dlls/gdi32/tests/dib.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 42 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/tests/dib.c b/dlls/gdi32/tests/dib.c index 675c07b..a0de1b5 100644 --- a/dlls/gdi32/tests/dib.c +++ b/dlls/gdi32/tests/dib.c @@ -209,6 +209,33 @@ static const char *sha1_graphics_8[] = NULL }; +static const char *sha1_graphics_4[] = +{ + "fa867e2976a549ecd3b1fa67df54963232fcef8c", + "256d742b4da96b373b4fa5663d0ad3b5faab5c8e", + "d96d8f4232b930bccd53b903b5efaf8c0bdb16f4", + "9401799e6116c35e5f0e5bdca07ea25316757a72", + "482ae2b0ef1d64752b5ef11cc7f35a33eb55d07c", + "dcfb3e01100b41c0f75a1c5f84b6de6b90138281", + "2505598845fa026ea7187582461efbf06cb6904f", + "3981a19363beca8f28d32a5928ac296fd22a5296", + "01404024ebb2c266d17d734059524d874491650f", + "c87bbff3f83b8ec11bb03cfa9bc9ee5166c4c7ef", + "f35c5d62853be78c5d39fb2f45200dc262aa8e18", + "46e94a55f5f58a6b915078d8ffdc725f53aab516", + "665bbbc749a5ffeedc0d62aef0661a5ce845b017", + "1f26a01730f67d40ea711a50d9d801bac15a642e", + "3b53d24178cfacba53103a44dfd5d072b15a6781", + "fa0d5f2d9419d8310fe4af7a290d13c5026c77de", + "5070ecae5085209508f7450d5f21c69737a178e9", + "0f44e12ecd1ea7e39433890443626d4fc35204a4", + "eb38683e812fd13dca971ba8f4cfd2b6820d3524", + "39c16648cf6c261be71a33cec41867f28e119b94", + "26ad5116562e7b58c76a26eaf521e2e40899e944", + "1bcc54eaf8e3c2b7c59ecccb23c240181d7ba8b8", + NULL +}; + static inline DWORD get_stride(BITMAPINFO *bmi) { return ((bmi->bmiHeader.biBitCount * bmi->bmiHeader.biWidth + 31) >> 3) & ~3; @@ -902,6 +929,21 @@ todo_wine SelectObject(mem_dc, orig_bm); DeleteObject(dib); + /* 4 */ + trace("4\n"); + bmi->bmiHeader.biBitCount = 4; + + dib = CreateDIBSection(0, bmi, DIB_RGB_COLORS, (void**)&bits, NULL, 0); + ok(dib != NULL, "ret NULL\n"); + + orig_bm = SelectObject(mem_dc, dib); + + sha1 = sha1_graphics_4; + draw_graphics(mem_dc, bmi, bits, &sha1); + + SelectObject(mem_dc, orig_bm); + DeleteObject(dib); + DeleteDC(mem_dc); }

1 0

Huw Davies : gdi32: Add support for 4 bpp dibs.
by Alexandre Julliard 31 May '11

31 May '11

Module: wine Branch: master Commit: e11eeb0122a2a10fea04ba9888929516608ae49c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e11eeb0122a2a10fea04ba988… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue May 31 10:02:03 2011 +0100 gdi32: Add support for 4 bpp dibs. --- dlls/gdi32/dibdrv/dc.c | 4 + dlls/gdi32/dibdrv/dibdrv.h | 1 + dlls/gdi32/dibdrv/primitives.c | 236 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 241 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e11eeb0122a2a10fea04b…

1 0

Michael Stefaniuc : shell32: Finish the COM cleanup in cpanelfolder.c.
by Alexandre Julliard 31 May '11

31 May '11

Module: wine Branch: master Commit: a81f954b0de2e96e3ab337b02d45ad0d17ea4544 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a81f954b0de2e96e3ab337b02… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue May 31 10:20:27 2011 +0200 shell32: Finish the COM cleanup in cpanelfolder.c. --- dlls/shell32/cpanelfolder.c | 51 ++++++++++++++++++------------------------ 1 files changed, 22 insertions(+), 29 deletions(-) diff --git a/dlls/shell32/cpanelfolder.c b/dlls/shell32/cpanelfolder.c index fb8e9de..611be0f 100644 --- a/dlls/shell32/cpanelfolder.c +++ b/dlls/shell32/cpanelfolder.c @@ -60,10 +60,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell); typedef struct { IShellFolder2 IShellFolder2_iface; - LONG ref; - const IPersistFolder2Vtbl *lpVtblPersistFolder2; - const IShellExecuteHookWVtbl *lpVtblShellExecuteHookW; - const IShellExecuteHookAVtbl *lpVtblShellExecuteHookA; + IPersistFolder2 IPersistFolder2_iface; + IShellExecuteHookW IShellExecuteHookW_iface; + IShellExecuteHookA IShellExecuteHookA_iface; + LONG ref; IUnknown *pUnkOuter; /* used for aggregation */ @@ -82,31 +82,22 @@ static inline ICPanelImpl *impl_from_IShellFolder2(IShellFolder2 *iface) return CONTAINING_RECORD(iface, ICPanelImpl, IShellFolder2_iface); } -static inline ICPanelImpl *impl_from_IPersistFolder2( IPersistFolder2 *iface ) +static inline ICPanelImpl *impl_from_IPersistFolder2(IPersistFolder2 *iface) { - return (ICPanelImpl *)((char*)iface - FIELD_OFFSET(ICPanelImpl, lpVtblPersistFolder2)); + return CONTAINING_RECORD(iface, ICPanelImpl, IPersistFolder2_iface); } -static inline ICPanelImpl *impl_from_IShellExecuteHookW( IShellExecuteHookW *iface ) +static inline ICPanelImpl *impl_from_IShellExecuteHookW(IShellExecuteHookW *iface) { - return (ICPanelImpl *)((char*)iface - FIELD_OFFSET(ICPanelImpl, lpVtblShellExecuteHookW)); + return CONTAINING_RECORD(iface, ICPanelImpl, IShellExecuteHookW_iface); } -static inline ICPanelImpl *impl_from_IShellExecuteHookA( IShellExecuteHookA *iface ) +static inline ICPanelImpl *impl_from_IShellExecuteHookA(IShellExecuteHookA *iface) { - return (ICPanelImpl *)((char*)iface - FIELD_OFFSET(ICPanelImpl, lpVtblShellExecuteHookA)); + return CONTAINING_RECORD(iface, ICPanelImpl, IShellExecuteHookA_iface); } -/* - converts This to an interface pointer -*/ -#define _IPersist_(This) (&(This)->lpVtblPersistFolder2) -#define _IPersistFolder_(This) (&(This)->lpVtblPersistFolder2) -#define _IPersistFolder2_(This) (&(This)->lpVtblPersistFolder2) -#define _IShellExecuteHookW_(This) (&(This)->lpVtblShellExecuteHookW) -#define _IShellExecuteHookA_(This) (&(This)->lpVtblShellExecuteHookA) - /*********************************************************************** * IShellFolder [ControlPanel] implementation */ @@ -138,9 +129,9 @@ HRESULT WINAPI IControlPanel_Constructor(IUnknown* pUnkOuter, REFIID riid, LPVOI sf->ref = 0; sf->IShellFolder2_iface.lpVtbl = &vt_ShellFolder2; - sf->lpVtblPersistFolder2 = &vt_PersistFolder2; - sf->lpVtblShellExecuteHookW = &vt_ShellExecuteHookW; - sf->lpVtblShellExecuteHookA = &vt_ShellExecuteHookA; + sf->IPersistFolder2_iface.lpVtbl = &vt_PersistFolder2; + sf->IShellExecuteHookW_iface.lpVtbl = &vt_ShellExecuteHookW; + sf->IShellExecuteHookA_iface.lpVtbl = &vt_ShellExecuteHookA; sf->pidlRoot = _ILCreateControlPanel(); /* my qualified pidl */ sf->pUnkOuter = pUnkOuter ? pUnkOuter : (IUnknown *)&sf->IShellFolder2_iface; @@ -172,11 +163,11 @@ static HRESULT WINAPI ISF_ControlPanel_fnQueryInterface(IShellFolder2 *iface, RE *ppvObject = This; else if (IsEqualIID(riid, &IID_IPersist) || IsEqualIID(riid, &IID_IPersistFolder) || IsEqualIID(riid, &IID_IPersistFolder2)) - *ppvObject = _IPersistFolder2_(This); + *ppvObject = &This->IPersistFolder2_iface; else if (IsEqualIID(riid, &IID_IShellExecuteHookW)) - *ppvObject = _IShellExecuteHookW_(This); + *ppvObject = &This->IShellExecuteHookW_iface; else if (IsEqualIID(riid, &IID_IShellExecuteHookA)) - *ppvObject = _IShellExecuteHookA_(This); + *ppvObject = &This->IShellExecuteHookA_iface; if (*ppvObject) { IUnknown_AddRef((IUnknown *)(*ppvObject)); @@ -973,10 +964,11 @@ static ULONG STDMETHODCALLTYPE IShellExecuteHookW_fnRelease(IShellExecuteHookW* return IUnknown_Release(This->pUnkOuter); } -static HRESULT WINAPI IShellExecuteHookW_fnExecute(IShellExecuteHookW* iface, LPSHELLEXECUTEINFOW psei) +static HRESULT WINAPI IShellExecuteHookW_fnExecute(IShellExecuteHookW *iface, + LPSHELLEXECUTEINFOW psei) { + ICPanelImpl *This = impl_from_IShellExecuteHookW(iface); static const WCHAR wCplopen[] = {'c','p','l','o','p','e','n','\0'}; - ICPanelImpl *This = (ICPanelImpl *)iface; SHELLEXECUTEINFOW sei_tmp; PIDLCPanelStruct* pcpanel; @@ -1061,9 +1053,10 @@ static ULONG STDMETHODCALLTYPE IShellExecuteHookA_fnRelease(IShellExecuteHookA* return IUnknown_Release(This->pUnkOuter); } -static HRESULT WINAPI IShellExecuteHookA_fnExecute(IShellExecuteHookA* iface, LPSHELLEXECUTEINFOA psei) +static HRESULT WINAPI IShellExecuteHookA_fnExecute(IShellExecuteHookA *iface, + LPSHELLEXECUTEINFOA psei) { - ICPanelImpl *This = (ICPanelImpl *)iface; + ICPanelImpl *This = impl_from_IShellExecuteHookA(iface); SHELLEXECUTEINFOA sei_tmp; PIDLCPanelStruct* pcpanel;

1 0

Michael Stefaniuc : shell32: COM cleanup for the IShellFolder2 iface in cpanelfolder.c.
by Alexandre Julliard 31 May '11

31 May '11

Module: wine Branch: master Commit: 567bb185b55e9a4310e7506ffb881ee02deefcb5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=567bb185b55e9a4310e7506ff… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue May 31 09:54:13 2011 +0200 shell32: COM cleanup for the IShellFolder2 iface in cpanelfolder.c. --- dlls/shell32/cpanelfolder.c | 144 ++++++++++++++++++++++--------------------- 1 files changed, 73 insertions(+), 71 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=567bb185b55e9a4310e75…

1 0

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 May 2011