October 2012 - Wine-commits

Aric Stewart : imm32: Switch the value of IMMGWL_IMC in the UI window when a new imc opens.
by Alexandre Julliard 15 Oct '12

15 Oct '12

Module: wine Branch: master Commit: 968a1e9b72866dd8663de34303b3ca1040007989 URL: http://source.winehq.org/git/wine.git/?a=commit;h=968a1e9b72866dd8663de3430… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Oct 15 11:01:30 2012 -0500 imm32: Switch the value of IMMGWL_IMC in the UI window when a new imc opens. --- dlls/imm32/imm.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index edd9e71..6bca604 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -2351,6 +2351,8 @@ BOOL WINAPI ImmSetOpenStatus(HIMC hIMC, BOOL fOpen) 0, data->immKbd->hIME, 0); SetWindowLongPtrW(data->immKbd->UIWnd, IMMGWL_IMC, (LONG_PTR)data); } + else if (fOpen) + SetWindowLongPtrW(data->immKbd->UIWnd, IMMGWL_IMC, (LONG_PTR)data); if (!fOpen != !data->IMC.fOpen) {

1 0

Jacek Caban : vbscript: Added Chr implementation.
by Alexandre Julliard 15 Oct '12

15 Oct '12

Module: wine Branch: master Commit: 02f6ea925ec898aaca72b80e473fb7ea100a3e5c URL: http://source.winehq.org/git/wine.git/?a=commit;h=02f6ea925ec898aaca72b80e4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 15 11:15:51 2012 +0200 vbscript: Added Chr implementation. --- dlls/vbscript/global.c | 25 +++++++++++++++++++++++-- dlls/vbscript/tests/api.vbs | 4 ++++ 2 files changed, 27 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 7d60a49..4a4dd8e 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -1070,8 +1070,29 @@ static HRESULT Global_Asc(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIA static HRESULT Global_Chr(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + int c; + HRESULT hres; + + TRACE("%s\n", debugstr_variant(arg)); + + hres = to_int(arg, &c); + if(FAILED(hres)) + return hres; + + if(c <= 0 || c >= 0x100) { + FIXME("invalid arg\n"); + return E_FAIL; + } + + if(res) { + WCHAR ch = c; + + V_VT(res) = VT_BSTR; + V_BSTR(res) = SysAllocStringLen(&ch, 1); + if(!V_BSTR(res)) + return E_OUTOFMEMORY; + } + return S_OK; } static HRESULT Global_AscW(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index 7ccbaa1..e986362 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -50,6 +50,10 @@ TestCStr 3, "3" if isEnglishLang then TestCStr 3.5, "3.5" if isEnglishLang then TestCStr true, "True" +Call ok(getVT(Chr(120)) = "VT_BSTR", "getVT(Chr(120)) = " & getVT(Chr(120))) +Call ok(getVT(Chr(255)) = "VT_BSTR", "getVT(Chr(255)) = " & getVT(Chr(255))) +Call ok(Chr(120) = "x", "Chr(120) = " & Chr(120)) + Call ok(isObject(new EmptyClass), "isObject(new EmptyClass) is not true?") Set x = new EmptyClass Call ok(isObject(x), "isObject(x) is not true?")

1 0

Jacek Caban : mshtml: Added IHTMLLinkElement stub implementation.
by Alexandre Julliard 15 Oct '12

15 Oct '12

Module: wine Branch: master Commit: b75e2c4ddefd0842146d62f7addfe84d30f57f03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b75e2c4ddefd0842146d62f7a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 15 11:16:30 2012 +0200 mshtml: Added IHTMLLinkElement stub implementation. --- dlls/mshtml/Makefile.in | 1 + dlls/mshtml/htmlelem.c | 2 + dlls/mshtml/htmllink.c | 334 ++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/mshtml_private.h | 3 + dlls/mshtml/tests/dom.c | 15 ++- 5 files changed, 353 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b75e2c4ddefd0842146d6…

1 0

Jacek Caban : mshtml: Added IHTMLLinkElement:: disabled property implementation.
by Alexandre Julliard 15 Oct '12

15 Oct '12

Module: wine Branch: master Commit: 9608714d04e786276652a16fed724d3bbf204bac URL: http://source.winehq.org/git/wine.git/?a=commit;h=9608714d04e786276652a16fe… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 15 11:16:51 2012 +0200 mshtml: Added IHTMLLinkElement::disabled property implementation. --- dlls/mshtml/htmllink.c | 48 +++++++++++++++++++++++++++++++++++++++------- dlls/mshtml/nsiface.idl | 27 ++++++++++++++++++++++++++ dlls/mshtml/tests/dom.c | 45 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 112 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/htmllink.c b/dlls/mshtml/htmllink.c index 837538e..e23a808 100644 --- a/dlls/mshtml/htmllink.c +++ b/dlls/mshtml/htmllink.c @@ -17,6 +17,7 @@ */ #include <stdarg.h> +#include <assert.h> #define COBJMACROS @@ -34,6 +35,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); typedef struct { HTMLElement element; IHTMLLinkElement IHTMLLinkElement_iface; + + nsIDOMHTMLLinkElement *nslink; } HTMLLinkElement; static inline HTMLLinkElement *impl_from_IHTMLLinkElement(IHTMLLinkElement *iface) @@ -214,15 +217,28 @@ static HRESULT WINAPI HTMLLinkElement_get_styleSheet(IHTMLLinkElement *iface, IH static HRESULT WINAPI HTMLLinkElement_put_disabled(IHTMLLinkElement *iface, VARIANT_BOOL v) { HTMLLinkElement *This = impl_from_IHTMLLinkElement(iface); - FIXME("(%p)->(%x)\n", This, v); - return E_NOTIMPL; + nsresult nsres; + + TRACE("(%p)->(%x)\n", This, v); + + nsres = nsIDOMHTMLLinkElement_SetDisabled(This->nslink, !!v); + return SUCCEEDED(nsres) ? S_OK : E_FAIL; } static HRESULT WINAPI HTMLLinkElement_get_disabled(IHTMLLinkElement *iface, VARIANT_BOOL *p) { HTMLLinkElement *This = impl_from_IHTMLLinkElement(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + cpp_bool ret; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsres = nsIDOMHTMLLinkElement_GetDisabled(This->nslink, &ret); + if(NS_FAILED(nsres)) + return E_FAIL; + + *p = ret ? VARIANT_TRUE : VARIANT_FALSE; + return S_OK; } static HRESULT WINAPI HTMLLinkElement_put_media(IHTMLLinkElement *iface, BSTR v) @@ -289,19 +305,28 @@ static HRESULT HTMLLinkElement_QI(HTMLDOMNode *iface, REFIID riid, void **ppv) return S_OK; } -static void HTMLLinkElement_destructor(HTMLDOMNode *iface) +static HRESULT HTMLLinkElementImpl_put_disabled(HTMLDOMNode *iface, VARIANT_BOOL v) { HTMLLinkElement *This = impl_from_HTMLDOMNode(iface); + return IHTMLLinkElement_put_disabled(&This->IHTMLLinkElement_iface, v); +} - HTMLElement_destructor(&This->element.node); +static HRESULT HTMLLinkElementImpl_get_disabled(HTMLDOMNode *iface, VARIANT_BOOL *p) +{ + HTMLLinkElement *This = impl_from_HTMLDOMNode(iface); + return IHTMLLinkElement_get_disabled(&This->IHTMLLinkElement_iface, p); } static const NodeImplVtbl HTMLLinkElementImplVtbl = { HTMLLinkElement_QI, - HTMLLinkElement_destructor, + HTMLElement_destructor, HTMLElement_clone, HTMLElement_handle_event, - HTMLElement_get_attr_col + HTMLElement_get_attr_col, + NULL, + NULL, + HTMLLinkElementImpl_put_disabled, + HTMLLinkElementImpl_get_disabled, }; static const tid_t HTMLLinkElement_iface_tids[] = { @@ -319,6 +344,7 @@ static dispex_static_data_t HTMLLinkElement_dispex = { HRESULT HTMLLinkElement_Create(HTMLDocumentNode *doc, nsIDOMHTMLElement *nselem, HTMLElement **elem) { HTMLLinkElement *ret; + nsresult nsres; ret = heap_alloc_zero(sizeof(*ret)); if(!ret) @@ -329,6 +355,12 @@ HRESULT HTMLLinkElement_Create(HTMLDocumentNode *doc, nsIDOMHTMLElement *nselem, HTMLElement_Init(&ret->element, doc, nselem, &HTMLLinkElement_dispex); + nsres = nsIDOMHTMLElement_QueryInterface(nselem, &IID_nsIDOMHTMLLinkElement, (void**)&ret->nslink); + + /* Share nslink reference with nsnode */ + assert(nsres == NS_OK && (nsIDOMNode*)ret->nslink == ret->element.node.nsnode); + nsIDOMNode_Release(ret->element.node.nsnode); + *elem = &ret->element; return S_OK; } diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl index 79b3eee..3dbcac0 100644 --- a/dlls/mshtml/nsiface.idl +++ b/dlls/mshtml/nsiface.idl @@ -1902,6 +1902,33 @@ interface nsIDOMHTMLAnchorElement : nsIDOMHTMLElement [ object, + uuid(59ae3529-170a-41e4-8d7a-241dca6b5760), + local +] +interface nsIDOMHTMLLinkElement : nsIDOMHTMLElement +{ + nsresult GetDisabled(bool *aDisabled); + nsresult SetDisabled(bool aDisabled); + nsresult GetCharset(nsAString *aCharset); + nsresult SetCharset(const nsAString *aCharset); + nsresult GetHref(nsAString *aHref); + nsresult SetHref(const nsAString *aHref); + nsresult GetHreflang(nsAString *aHreflang); + nsresult SetHreflang(const nsAString *aHreflang); + nsresult GetMedia(nsAString *aMedia); + nsresult SetMedia(const nsAString *aMedia); + nsresult GetRel(nsAString *aRel); + nsresult SetRel(const nsAString *aRel); + nsresult GetRev(nsAString *aRev); + nsresult SetRev(const nsAString *aRev); + nsresult GetTarget(nsAString *aTarget); + nsresult SetTarget(const nsAString *aTarget); + nsresult GetType(nsAString *aType); + nsresult SetType(const nsAString *aType); +} + +[ + object, uuid(ae50de74-bc26-402e-85dc-a980f506b655), local ] diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 7c84d0c..f6ce2f0 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -64,6 +64,7 @@ static const char elem_test_str[] = "</body></html>"; static const char elem_test2_str[] = "<html><head><title>test</title><style>.body { margin-right: 0px; }</style>" + "<link id=\"linkid\" rel=\"stylesheet\" href=\"some.css\" type=\"text/css\"></head>" "<body><div id=\"divid\" emptyattr=\"\" onclick=\"parseInt();\"></div></body>" "</html>"; @@ -866,6 +867,17 @@ static IHTMLMetaElement *_get_metaelem_iface(unsigned line, IUnknown *unk) return ret; } +#define get_link_iface(u) _get_link_iface(__LINE__,u) +static IHTMLLinkElement *_get_link_iface(unsigned line, IUnknown *unk) +{ + IHTMLLinkElement *ret; + HRESULT hres; + + hres = IUnknown_QueryInterface(unk, &IID_IHTMLLinkElement, (void**)&ret); + ok_(__FILE__,line) (hres == S_OK, "Could not get IHTMLLinkElement: %08x\n", hres); + return ret; +} + #define test_node_name(u,n) _test_node_name(__LINE__,u,n) static void _test_node_name(unsigned line, IUnknown *unk, const char *exname) { @@ -3415,6 +3427,32 @@ static void _test_meta_httpequiv(unsigned line, IUnknown *unk, const char *exval IHTMLMetaElement_Release(meta); } +#define test_link_disabled(a,b) _test_link_disabled(__LINE__,a,b) +static void _test_link_disabled(unsigned line, IHTMLElement *elem, VARIANT_BOOL v) +{ + IHTMLLinkElement *link = _get_link_iface(line, (IUnknown*)elem); + VARIANT_BOOL b = 10; + HRESULT hres; + + hres = IHTMLLinkElement_get_disabled(link, &b); + ok_(__FILE__,line)(hres == S_OK, "get_disabled failed: %08x\n", hres); + ok_(__FILE__,line)(b == v, "disabled = %x, expected %x\n", b, v); + + IHTMLLinkElement_Release(link); +} + +#define link_put_disabled(a,b) _link_put_disabled(__LINE__,a,b) +static void _link_put_disabled(unsigned line, IHTMLElement *elem, VARIANT_BOOL v) +{ + IHTMLLinkElement *link = _get_link_iface(line, (IUnknown*)elem); + HRESULT hres; + + hres = IHTMLLinkElement_put_disabled(link, v); + ok_(__FILE__,line)(hres == S_OK, "put_disabled failed: %08x\n", hres); + IHTMLLinkElement_Release(link); + _test_link_disabled(line, elem, v); +} + #define get_elem_doc(e) _get_elem_doc(__LINE__,e) static IHTMLDocument2 *_get_elem_doc(unsigned line, IUnknown *unk) { @@ -5913,6 +5951,13 @@ static void test_elems2(IHTMLDocument2 *doc) div = get_doc_elem_by_id(doc, "divid"); + elem = get_elem_by_id(doc, "linkid", TRUE); + if(elem) { + test_link_disabled(elem, VARIANT_FALSE); + link_put_disabled(elem, VARIANT_TRUE); + IHTMLElement_Release(elem); + } + test_elem_set_innerhtml((IUnknown*)div, "<div id=\"innerid\"></div>"); elem2 = get_doc_elem_by_id(doc, "innerid"); ok(elem2 != NULL, "elem2 == NULL\n");

1 0

Jacek Caban : mshtml: Added IHTMLLinkElement::rel property implementation.
by Alexandre Julliard 15 Oct '12

15 Oct '12

Module: wine Branch: master Commit: c11c695b11782b7940e1db433a6833bdc99ee2a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c11c695b11782b7940e1db433… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 15 11:17:10 2012 +0200 mshtml: Added IHTMLLinkElement::rel property implementation. --- dlls/mshtml/htmllink.c | 22 ++++++++++++++++++---- dlls/mshtml/tests/dom.c | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmllink.c b/dlls/mshtml/htmllink.c index e23a808..383617a 100644 --- a/dlls/mshtml/htmllink.c +++ b/dlls/mshtml/htmllink.c @@ -119,15 +119,29 @@ static HRESULT WINAPI HTMLLinkElement_get_href(IHTMLLinkElement *iface, BSTR *p) static HRESULT WINAPI HTMLLinkElement_put_rel(IHTMLLinkElement *iface, BSTR v) { HTMLLinkElement *This = impl_from_IHTMLLinkElement(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + nsAString rel_str; + nsresult nsres; + + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + + nsAString_InitDepend(&rel_str, v); + nsres = nsIDOMHTMLLinkElement_SetRel(This->nslink, &rel_str); + nsAString_Finish(&rel_str); + + return NS_SUCCEEDED(nsres) ? S_OK : E_FAIL; } static HRESULT WINAPI HTMLLinkElement_get_rel(IHTMLLinkElement *iface, BSTR *p) { HTMLLinkElement *This = impl_from_IHTMLLinkElement(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsAString rel_str; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsAString_Init(&rel_str, NULL); + nsres = nsIDOMHTMLLinkElement_GetRel(This->nslink, &rel_str); + return return_nsstr(nsres, &rel_str, p); } static HRESULT WINAPI HTMLLinkElement_put_rev(IHTMLLinkElement *iface, BSTR v) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index f6ce2f0..30a0f0f 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -3453,6 +3453,37 @@ static void _link_put_disabled(unsigned line, IHTMLElement *elem, VARIANT_BOOL v _test_link_disabled(line, elem, v); } +#define test_link_rel(a,b) _test_link_rel(__LINE__,a,b) +static void _test_link_rel(unsigned line, IHTMLElement *elem, const char *v) +{ + IHTMLLinkElement *link = _get_link_iface(line, (IUnknown*)elem); + BSTR rel; + HRESULT hres; + + hres = IHTMLLinkElement_get_rel(link, &rel); + ok_(__FILE__,line)(hres == S_OK, "get_rel failed: %08x\n", hres); + if(v) + ok_(__FILE__,line)(!strcmp_wa(rel, v), "rel = %s, expected %s\n", wine_dbgstr_w(rel), v); + else + ok_(__FILE__,line)(!rel, "rel = %s, expected NULL\n", wine_dbgstr_w(rel)); + + IHTMLLinkElement_Release(link); +} + +#define link_put_rel(a,b) _link_put_rel(__LINE__,a,b) +static void _link_put_rel(unsigned line, IHTMLElement *elem, const char *v) +{ + IHTMLLinkElement *link = _get_link_iface(line, (IUnknown*)elem); + BSTR str = a2bstr(v); + HRESULT hres; + + hres = IHTMLLinkElement_put_rel(link, str); + ok_(__FILE__,line)(hres == S_OK, "put_disabled failed: %08x\n", hres); + SysFreeString(str); + IHTMLLinkElement_Release(link); + _test_link_rel(line, elem, v); +} + #define get_elem_doc(e) _get_elem_doc(__LINE__,e) static IHTMLDocument2 *_get_elem_doc(unsigned line, IUnknown *unk) { @@ -5954,7 +5985,9 @@ static void test_elems2(IHTMLDocument2 *doc) elem = get_elem_by_id(doc, "linkid", TRUE); if(elem) { test_link_disabled(elem, VARIANT_FALSE); + test_link_rel(elem, "stylesheet"); link_put_disabled(elem, VARIANT_TRUE); + link_put_rel(elem, "prev"); IHTMLElement_Release(elem); }

1 0

Jacek Caban : mshtml: Added IHTMLLinkElement::type property implementation.
by Alexandre Julliard 15 Oct '12

15 Oct '12

Module: wine Branch: master Commit: 9277bf2e010388997f64445b3a2f1834167f71be URL: http://source.winehq.org/git/wine.git/?a=commit;h=9277bf2e010388997f64445b3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 15 11:17:24 2012 +0200 mshtml: Added IHTMLLinkElement::type property implementation. --- dlls/mshtml/htmllink.c | 22 ++++++++++++++++++---- dlls/mshtml/tests/dom.c | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmllink.c b/dlls/mshtml/htmllink.c index 383617a..a200b50 100644 --- a/dlls/mshtml/htmllink.c +++ b/dlls/mshtml/htmllink.c @@ -161,15 +161,29 @@ static HRESULT WINAPI HTMLLinkElement_get_rev(IHTMLLinkElement *iface, BSTR *p) static HRESULT WINAPI HTMLLinkElement_put_type(IHTMLLinkElement *iface, BSTR v) { HTMLLinkElement *This = impl_from_IHTMLLinkElement(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + nsAString type_str; + nsresult nsres; + + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + + nsAString_InitDepend(&type_str, v); + nsres = nsIDOMHTMLLinkElement_SetType(This->nslink, &type_str); + nsAString_Finish(&type_str); + + return NS_SUCCEEDED(nsres) ? S_OK : E_FAIL; } static HRESULT WINAPI HTMLLinkElement_get_type(IHTMLLinkElement *iface, BSTR *p) { HTMLLinkElement *This = impl_from_IHTMLLinkElement(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsAString type_str; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsAString_Init(&type_str, NULL); + nsres = nsIDOMHTMLLinkElement_GetType(This->nslink, &type_str); + return return_nsstr(nsres, &type_str, p); } static HRESULT WINAPI HTMLLinkElement_get_readyState(IHTMLLinkElement *iface, BSTR *p) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 30a0f0f..cc6c836 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -3484,6 +3484,37 @@ static void _link_put_rel(unsigned line, IHTMLElement *elem, const char *v) _test_link_rel(line, elem, v); } +#define test_link_type(a,b) _test_link_type(__LINE__,a,b) +static void _test_link_type(unsigned line, IHTMLElement *elem, const char *v) +{ + IHTMLLinkElement *link = _get_link_iface(line, (IUnknown*)elem); + BSTR type; + HRESULT hres; + + hres = IHTMLLinkElement_get_type(link, &type); + ok_(__FILE__,line)(hres == S_OK, "get_type failed: %08x\n", hres); + if(v) + ok_(__FILE__,line)(!strcmp_wa(type, v), "type = %s, expected %s\n", wine_dbgstr_w(type), v); + else + ok_(__FILE__,line)(!type, "type = %s, expected NULL\n", wine_dbgstr_w(type)); + + IHTMLLinkElement_Release(link); +} + +#define link_put_type(a,b) _link_put_type(__LINE__,a,b) +static void _link_put_type(unsigned line, IHTMLElement *elem, const char *v) +{ + IHTMLLinkElement *link = _get_link_iface(line, (IUnknown*)elem); + BSTR str = a2bstr(v); + HRESULT hres; + + hres = IHTMLLinkElement_put_type(link, str); + ok_(__FILE__,line)(hres == S_OK, "put_disabled failed: %08x\n", hres); + SysFreeString(str); + IHTMLLinkElement_Release(link); + _test_link_type(line, elem, v); +} + #define get_elem_doc(e) _get_elem_doc(__LINE__,e) static IHTMLDocument2 *_get_elem_doc(unsigned line, IUnknown *unk) { @@ -5986,8 +6017,10 @@ static void test_elems2(IHTMLDocument2 *doc) if(elem) { test_link_disabled(elem, VARIANT_FALSE); test_link_rel(elem, "stylesheet"); + test_link_type(elem, "text/css"); link_put_disabled(elem, VARIANT_TRUE); link_put_rel(elem, "prev"); + link_put_type(elem, "text/plain"); IHTMLElement_Release(elem); }

1 0

Alexandre Julliard : user32: Flush window surfaces in all functions that are used to poll for input.
by Alexandre Julliard 15 Oct '12

15 Oct '12

Module: wine Branch: master Commit: d5244c3b242afda6c09dc95ae69b09dcde414f8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5244c3b242afda6c09dc95ae… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 15 12:20:28 2012 +0200 user32: Flush window surfaces in all functions that are used to poll for input. --- dlls/user32/input.c | 18 ++++++++++++------ 1 files changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/user32/input.c b/dlls/user32/input.c index 5a99201..3ca71a6 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -353,6 +353,12 @@ HWND WINAPI GetCapture(void) } +static void check_for_events( UINT flags ) +{ + if (USER_Driver->pMsgWaitForMultipleObjectsEx( 0, NULL, 0, flags, 0 ) == WAIT_TIMEOUT) + flush_window_surfaces( TRUE ); +} + /********************************************************************** * GetAsyncKeyState (USER32.@) * @@ -367,6 +373,8 @@ SHORT WINAPI DECLSPEC_HOTPATCH GetAsyncKeyState( INT key ) if (key < 0 || key >= 256) return 0; + check_for_events( QS_INPUT ); + if ((ret = USER_Driver->pGetAsyncKeyState( key )) == -1) { if (thread_info->key_state && @@ -400,7 +408,7 @@ SHORT WINAPI DECLSPEC_HOTPATCH GetAsyncKeyState( INT key ) */ DWORD WINAPI GetQueueStatus( UINT flags ) { - DWORD ret = 0; + DWORD ret; if (flags & ~(QS_ALLINPUT | QS_ALLPOSTMESSAGE | QS_SMRESULT)) { @@ -408,8 +416,7 @@ DWORD WINAPI GetQueueStatus( UINT flags ) return 0; } - /* check for pending X events */ - USER_Driver->pMsgWaitForMultipleObjectsEx( 0, NULL, 0, flags, 0 ); + check_for_events( flags ); SERVER_START_REQ( get_queue_status ) { @@ -427,10 +434,9 @@ DWORD WINAPI GetQueueStatus( UINT flags ) */ BOOL WINAPI GetInputState(void) { - DWORD ret = 0; + DWORD ret; - /* check for pending X events */ - USER_Driver->pMsgWaitForMultipleObjectsEx( 0, NULL, 0, QS_INPUT, 0 ); + check_for_events( QS_INPUT ); SERVER_START_REQ( get_queue_status ) {

1 0

Jacek Caban : mshtml: Added IHTMLLinkElement::href property implementation.
by Alexandre Julliard 15 Oct '12

15 Oct '12

Module: wine Branch: master Commit: cfef60a30e8724335451e1aa203f609fb295ef25 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cfef60a30e8724335451e1aa2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 15 11:17:42 2012 +0200 mshtml: Added IHTMLLinkElement::href property implementation. --- dlls/mshtml/htmllink.c | 22 ++++++++++++++++++---- dlls/mshtml/tests/dom.c | 35 ++++++++++++++++++++++++++++++++++- 2 files changed, 52 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/htmllink.c b/dlls/mshtml/htmllink.c index a200b50..cfbdcb9 100644 --- a/dlls/mshtml/htmllink.c +++ b/dlls/mshtml/htmllink.c @@ -105,15 +105,29 @@ static HRESULT WINAPI HTMLLinkElement_Invoke(IHTMLLinkElement *iface, DISPID dis static HRESULT WINAPI HTMLLinkElement_put_href(IHTMLLinkElement *iface, BSTR v) { HTMLLinkElement *This = impl_from_IHTMLLinkElement(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + nsAString href_str; + nsresult nsres; + + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + + nsAString_InitDepend(&href_str, v); + nsres = nsIDOMHTMLLinkElement_SetHref(This->nslink, &href_str); + nsAString_Finish(&href_str); + + return NS_SUCCEEDED(nsres) ? S_OK : E_FAIL; } static HRESULT WINAPI HTMLLinkElement_get_href(IHTMLLinkElement *iface, BSTR *p) { HTMLLinkElement *This = impl_from_IHTMLLinkElement(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsAString href_str; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsAString_Init(&href_str, NULL); + nsres = nsIDOMHTMLLinkElement_GetHref(This->nslink, &href_str); + return return_nsstr(nsres, &href_str, p); } static HRESULT WINAPI HTMLLinkElement_put_rel(IHTMLLinkElement *iface, BSTR v) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index cc6c836..02ba3ef 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -64,7 +64,7 @@ static const char elem_test_str[] = "</body></html>"; static const char elem_test2_str[] = "<html><head><title>test</title><style>.body { margin-right: 0px; }</style>" - "<link id=\"linkid\" rel=\"stylesheet\" href=\"some.css\" type=\"text/css\"></head>" + "<link id=\"linkid\" rel=\"stylesheet\" href=\"about:blank\" type=\"text/css\"></head>" "<body><div id=\"divid\" emptyattr=\"\" onclick=\"parseInt();\"></div></body>" "</html>"; @@ -3515,6 +3515,37 @@ static void _link_put_type(unsigned line, IHTMLElement *elem, const char *v) _test_link_type(line, elem, v); } +#define test_link_href(a,b) _test_link_href(__LINE__,a,b) +static void _test_link_href(unsigned line, IHTMLElement *elem, const char *v) +{ + IHTMLLinkElement *link = _get_link_iface(line, (IUnknown*)elem); + BSTR href; + HRESULT hres; + + hres = IHTMLLinkElement_get_href(link, &href); + ok_(__FILE__,line)(hres == S_OK, "get_href failed: %08x\n", hres); + if(v) + ok_(__FILE__,line)(!strcmp_wa(href, v), "href = %s, expected %s\n", wine_dbgstr_w(href), v); + else + ok_(__FILE__,line)(!href, "href = %s, expected NULL\n", wine_dbgstr_w(href)); + + IHTMLLinkElement_Release(link); +} + +#define link_put_href(a,b) _link_put_href(__LINE__,a,b) +static void _link_put_href(unsigned line, IHTMLElement *elem, const char *v) +{ + IHTMLLinkElement *link = _get_link_iface(line, (IUnknown*)elem); + BSTR str = a2bstr(v); + HRESULT hres; + + hres = IHTMLLinkElement_put_href(link, str); + ok_(__FILE__,line)(hres == S_OK, "put_disabled failed: %08x\n", hres); + SysFreeString(str); + IHTMLLinkElement_Release(link); + _test_link_href(line, elem, v); +} + #define get_elem_doc(e) _get_elem_doc(__LINE__,e) static IHTMLDocument2 *_get_elem_doc(unsigned line, IUnknown *unk) { @@ -6018,9 +6049,11 @@ static void test_elems2(IHTMLDocument2 *doc) test_link_disabled(elem, VARIANT_FALSE); test_link_rel(elem, "stylesheet"); test_link_type(elem, "text/css"); + test_link_href(elem, "about:blank"); link_put_disabled(elem, VARIANT_TRUE); link_put_rel(elem, "prev"); link_put_type(elem, "text/plain"); + link_put_href(elem, "about:prev"); IHTMLElement_Release(elem); }

1 0

Alexandre Julliard : winex11: Remove the no longer needed GetAsyncKeyState entry point.
by Alexandre Julliard 15 Oct '12

15 Oct '12

Module: wine Branch: master Commit: 710858abee7a1808c2b17ef00a69f284b342708b URL: http://source.winehq.org/git/wine.git/?a=commit;h=710858abee7a1808c2b17ef00… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 15 12:21:05 2012 +0200 winex11: Remove the no longer needed GetAsyncKeyState entry point. --- dlls/winex11.drv/keyboard.c | 10 ---------- dlls/winex11.drv/winex11.drv.spec | 1 - 2 files changed, 0 insertions(+), 11 deletions(-) diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index ae7e72b..039d15b 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -1902,16 +1902,6 @@ static BOOL match_x11_keyboard_layout(HKL hkl) return (hkl == xHkl); } -/********************************************************************** - * GetAsyncKeyState (X11DRV.@) - */ -SHORT CDECL X11DRV_GetAsyncKeyState(INT key) -{ - /* Photoshop livelocks unless mouse events are included here */ - X11DRV_MsgWaitForMultipleObjectsEx( 0, NULL, 0, QS_KEY | QS_MOUSE, 0 ); - return -1; -} - /*********************************************************************** * GetKeyboardLayout (X11DRV.@) diff --git a/dlls/winex11.drv/winex11.drv.spec b/dlls/winex11.drv/winex11.drv.spec index 8f68a47..db3e4f5 100644 --- a/dlls/winex11.drv/winex11.drv.spec +++ b/dlls/winex11.drv/winex11.drv.spec @@ -6,7 +6,6 @@ @ cdecl ActivateKeyboardLayout(long long) X11DRV_ActivateKeyboardLayout @ cdecl Beep() X11DRV_Beep -@ cdecl GetAsyncKeyState(long) X11DRV_GetAsyncKeyState @ cdecl GetKeyNameText(long ptr long) X11DRV_GetKeyNameText @ cdecl GetKeyboardLayout(long) X11DRV_GetKeyboardLayout @ cdecl GetKeyboardLayoutName(ptr) X11DRV_GetKeyboardLayoutName

1 0

Alexandre Julliard : gdi32: Always return the full DIB surface in GetImage and adjust coordinates accordingly .
by Alexandre Julliard 15 Oct '12

15 Oct '12

Module: wine Branch: master Commit: 36f2b09632261d6f5467e4c4cc20e561f5baec4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=36f2b09632261d6f5467e4c4c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 15 14:16:28 2012 +0200 gdi32: Always return the full DIB surface in GetImage and adjust coordinates accordingly. Based on a patch by Ken Thomases. --- dlls/gdi32/dibdrv/bitblt.c | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/gdi32/dibdrv/bitblt.c b/dlls/gdi32/dibdrv/bitblt.c index ccddac9..e65dcbc 100644 --- a/dlls/gdi32/dibdrv/bitblt.c +++ b/dlls/gdi32/dibdrv/bitblt.c @@ -816,7 +816,7 @@ static DWORD get_image_dib_info( dib_info *dib, BITMAPINFO *info, info->bmiHeader.biYPelsPerMeter = 0; info->bmiHeader.biClrImportant = 0; info->bmiHeader.biWidth = dib->width; - info->bmiHeader.biHeight = dib->height - dib->rect.top; + info->bmiHeader.biHeight = dib->height; info->bmiHeader.biBitCount = dib->bit_count; info->bmiHeader.biSizeImage = info->bmiHeader.biHeight * abs( dib->stride ); if (dib->stride > 0) info->bmiHeader.biHeight = -info->bmiHeader.biHeight; @@ -825,14 +825,13 @@ static DWORD get_image_dib_info( dib_info *dib, BITMAPINFO *info, if (bits) { - if (dib->stride < 0) - bits->ptr = (char *)dib->bits.ptr + (dib->rect.bottom - 1) * dib->stride; - else - bits->ptr = (char *)dib->bits.ptr + dib->rect.top * dib->stride; + bits->ptr = dib->bits.ptr; bits->is_copy = FALSE; bits->free = NULL; + if (dib->stride < 0) bits->ptr = (char *)bits->ptr + (dib->height - 1) * dib->stride; src->x += dib->rect.left; - offset_rect( &src->visrect, dib->rect.left, 0 ); + src->y += dib->rect.top; + offset_rect( &src->visrect, dib->rect.left, dib->rect.top ); } return ERROR_SUCCESS; }

1 0