September 2014 - Wine-commits

Jactry Zeng : riched20: Implement ITextRange::GetStart and ITextRange:: GetEnd.
by Alexandre Julliard 16 Sep '14

16 Sep '14

Module: wine Branch: master Commit: b56c96a619efa56dd8b224ce17ba54beb6503346 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b56c96a619efa56dd8b224ce1… Author: Jactry Zeng <wine(a)jactry.com> Date: Tue Sep 16 18:38:56 2014 +0800 riched20: Implement ITextRange::GetStart and ITextRange::GetEnd. --- dlls/riched20/richole.c | 14 +++++++--- dlls/riched20/tests/richole.c | 65 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 75 insertions(+), 4 deletions(-) diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index 963368f..dab26f3 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -638,8 +638,11 @@ static HRESULT WINAPI ITextRange_fnGetStart(ITextRange *me, LONG *pcpFirst) if (!This->reOle) return CO_E_RELEASED; - FIXME("not implemented %p\n", This); - return E_NOTIMPL; + if (!pcpFirst) + return E_INVALIDARG; + *pcpFirst = This->start; + TRACE("%d\n", *pcpFirst); + return S_OK; } static HRESULT WINAPI ITextRange_fnSetStart(ITextRange *me, LONG cpFirst) @@ -658,8 +661,11 @@ static HRESULT WINAPI ITextRange_fnGetEnd(ITextRange *me, LONG *pcpLim) if (!This->reOle) return CO_E_RELEASED; - FIXME("not implemented %p\n", This); - return E_NOTIMPL; + if (!pcpLim) + return E_INVALIDARG; + *pcpLim = This->end; + TRACE("%d\n", *pcpLim); + return S_OK; } static HRESULT WINAPI ITextRange_fnSetEnd(ITextRange *me, LONG cpLim) diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c index 2e9b45a..681c5f7 100644 --- a/dlls/riched20/tests/richole.c +++ b/dlls/riched20/tests/richole.c @@ -631,6 +631,70 @@ static void test_ITextSelection_GetChar(void) release_interfaces(&w, &reOle, &txtDoc, &txtSel); } +static void test_ITextRange_GetStart_GetEnd(void) +{ + HWND w; + IRichEditOle *reOle = NULL; + ITextDocument *txtDoc = NULL; + ITextRange *txtRge = NULL; + HRESULT hres; + int first, lim, start, end; + static const CHAR test_text1[] = "TestSomeText"; + + create_interfaces(&w, &reOle, &txtDoc, NULL); + SendMessageA(w, WM_SETTEXT, 0, (LPARAM)test_text1); + + first = 1, lim = 6; + ITextDocument_Range(txtDoc, first, lim, &txtRge); + start = 0xdeadbeef; + hres = ITextRange_GetStart(txtRge, &start); + ok(hres == S_OK, "ITextRange_GetStart\n"); + ok(start == 1, "got wrong start value: %d\n", start); + end = 0xdeadbeef; + hres = ITextRange_GetEnd(txtRge, &end); + ok(hres == S_OK, "ITextRange_GetEnd\n"); + ok(end == 6, "got wrong end value: %d\n", end); + ITextRange_Release(txtRge); + + first = 6, lim = 1; + ITextDocument_Range(txtDoc, first, lim, &txtRge); + start = 0xdeadbeef; + hres = ITextRange_GetStart(txtRge, &start); + ok(hres == S_OK, "ITextRange_GetStart\n"); + ok(start == 1, "got wrong start value: %d\n", start); + end = 0xdeadbeef; + hres = ITextRange_GetEnd(txtRge, &end); + ok(hres == S_OK, "ITextRange_GetEnd\n"); + ok(end == 6, "got wrong end value: %d\n", end); + ITextRange_Release(txtRge); + + first = -1, lim = 13; + ITextDocument_Range(txtDoc, first, lim, &txtRge); + start = 0xdeadbeef; + hres = ITextRange_GetStart(txtRge, &start); + ok(hres == S_OK, "ITextRange_GetStart\n"); + ok(start == 0, "got wrong start value: %d\n", start); + end = 0xdeadbeef; + hres = ITextRange_GetEnd(txtRge, &end); + ok(hres == S_OK, "ITextRange_GetEnd\n"); + ok(end == 13, "got wrong end value: %d\n", end); + ITextRange_Release(txtRge); + + first = 13, lim = 13; + ITextDocument_Range(txtDoc, first, lim, &txtRge); + start = 0xdeadbeef; + hres = ITextRange_GetStart(txtRge, &start); + ok(hres == S_OK, "ITextRange_GetStart\n"); + ok(start == 12, "got wrong start value: %d\n", start); + end = 0xdeadbeef; + hres = ITextRange_GetEnd(txtRge, &end); + ok(hres == S_OK, "ITextRange_GetEnd\n"); + ok(end == 12, "got wrong end value: %d\n", end); + ITextRange_Release(txtRge); + + release_interfaces(&w, &reOle, &txtDoc, NULL); +} + START_TEST(richole) { /* Must explicitly LoadLibrary(). The test has no references to functions in @@ -644,4 +708,5 @@ START_TEST(richole) test_ITextSelection_GetChar(); test_ITextDocument_Range(); test_ITextRange_GetChar(); + test_ITextRange_GetStart_GetEnd(); }

1 0

Jactry Zeng : riched20: Implement ITextSelection:: GetStart and ITextSelection::GetEnd.
by Alexandre Julliard 16 Sep '14

16 Sep '14

Module: wine Branch: master Commit: 52fee14932cfed76e52627f39df806b14d2b76f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=52fee14932cfed76e52627f39… Author: Jactry Zeng <wine(a)jactry.com> Date: Tue Sep 16 18:39:10 2014 +0800 riched20: Implement ITextSelection::GetStart and ITextSelection::GetEnd. --- dlls/riched20/richole.c | 16 +++++++++--- dlls/riched20/tests/richole.c | 61 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 73 insertions(+), 4 deletions(-) diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index dab26f3..ddaee28 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -1630,11 +1630,15 @@ static HRESULT WINAPI ITextSelection_fnSetFormattedText(ITextSelection *me, ITex static HRESULT WINAPI ITextSelection_fnGetStart(ITextSelection *me, LONG *pcpFirst) { ITextSelectionImpl *This = impl_from_ITextSelection(me); + LONG lim; if (!This->reOle) return CO_E_RELEASED; - FIXME("not implemented\n"); - return E_NOTIMPL; + if (!pcpFirst) + return E_INVALIDARG; + ME_GetSelectionOfs(This->reOle->editor, pcpFirst, &lim); + TRACE("%d\n", *pcpFirst); + return S_OK; } static HRESULT WINAPI ITextSelection_fnSetStart(ITextSelection *me, LONG cpFirst) @@ -1650,11 +1654,15 @@ static HRESULT WINAPI ITextSelection_fnSetStart(ITextSelection *me, LONG cpFirst static HRESULT WINAPI ITextSelection_fnGetEnd(ITextSelection *me, LONG *pcpLim) { ITextSelectionImpl *This = impl_from_ITextSelection(me); + LONG first; if (!This->reOle) return CO_E_RELEASED; - FIXME("not implemented\n"); - return E_NOTIMPL; + if (!pcpLim) + return E_INVALIDARG; + ME_GetSelectionOfs(This->reOle->editor, &first, pcpLim); + TRACE("%d\n", *pcpLim); + return S_OK; } static HRESULT WINAPI ITextSelection_fnSetEnd(ITextSelection *me, LONG cpLim) diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c index 681c5f7..312ab28 100644 --- a/dlls/riched20/tests/richole.c +++ b/dlls/riched20/tests/richole.c @@ -695,6 +695,66 @@ static void test_ITextRange_GetStart_GetEnd(void) release_interfaces(&w, &reOle, &txtDoc, NULL); } +static void test_ITextSelection_GetStart_GetEnd(void) +{ + HWND w; + IRichEditOle *reOle = NULL; + ITextDocument *txtDoc = NULL; + ITextSelection *txtSel = NULL; + HRESULT hres; + int first, lim, start, end; + static const CHAR test_text1[] = "TestSomeText"; + + create_interfaces(&w, &reOle, &txtDoc, &txtSel); + SendMessageA(w, WM_SETTEXT, 0, (LPARAM)test_text1); + + first = 2, lim = 5; + SendMessageA(w, EM_SETSEL, first, lim); + start = 0xdeadbeef; + hres = ITextSelection_GetStart(txtSel, &start); + ok(hres == S_OK, "ITextSelection_GetStart\n"); + ok(start == 2, "got wrong start value: %d\n", start); + end = 0xdeadbeef; + hres = ITextSelection_GetEnd(txtSel, &end); + ok(hres == S_OK, "ITextSelection_GetEnd\n"); + ok(end == 5, "got wrong end value: %d\n", end); + + first = 5, lim = 2; + SendMessageA(w, EM_SETSEL, first, lim); + start = 0xdeadbeef; + hres = ITextSelection_GetStart(txtSel, &start); + ok(hres == S_OK, "ITextSelection_GetStart\n"); + ok(start == 2, "got wrong start value: %d\n", start); + end = 0xdeadbeef; + hres = ITextSelection_GetEnd(txtSel, &end); + ok(hres == S_OK, "ITextSelection_GetEnd\n"); + ok(end == 5, "got wrong end value: %d\n", end); + + first = 0, lim = -1; + SendMessageA(w, EM_SETSEL, first, lim); + start = 0xdeadbeef; + hres = ITextSelection_GetStart(txtSel, &start); + ok(hres == S_OK, "ITextSelection_GetStart\n"); + ok(start == 0, "got wrong start value: %d\n", start); + end = 0xdeadbeef; + hres = ITextSelection_GetEnd(txtSel, &end); + ok(hres == S_OK, "ITextSelection_GetEnd\n"); + ok(end == 13, "got wrong end value: %d\n", end); + + first = 13, lim = 13; + SendMessageA(w, EM_SETSEL, first, lim); + start = 0xdeadbeef; + hres = ITextSelection_GetStart(txtSel, &start); + ok(hres == S_OK, "ITextSelection_GetStart\n"); + ok(start == 12, "got wrong start value: %d\n", start); + end = 0xdeadbeef; + hres = ITextSelection_GetEnd(txtSel, &end); + ok(hres == S_OK, "ITextSelection_GetEnd\n"); + ok(end == 12, "got wrong end value: %d\n", end); + + release_interfaces(&w, &reOle, &txtDoc, &txtSel); +} + START_TEST(richole) { /* Must explicitly LoadLibrary(). The test has no references to functions in @@ -706,6 +766,7 @@ START_TEST(richole) test_ITextDocument_Open(); test_ITextSelection_GetText(); test_ITextSelection_GetChar(); + test_ITextSelection_GetStart_GetEnd(); test_ITextDocument_Range(); test_ITextRange_GetChar(); test_ITextRange_GetStart_GetEnd();

1 0

Jacek Caban : mshtml: Added IHTMLElement::get_sourceIndex implementation.
by Alexandre Julliard 16 Sep '14

16 Sep '14

Module: wine Branch: master Commit: 063ef3ca0e15981645eb7f5bc872db4ccdcad6cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=063ef3ca0e15981645eb7f5bc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 16 20:20:02 2014 +0200 mshtml: Added IHTMLElement::get_sourceIndex implementation. --- dlls/mshtml/htmlelem.c | 6 ++-- dlls/mshtml/htmlelemcol.c | 70 ++++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/tests/dom.c | 60 ++++++++++++++++++++++++++++--------- 4 files changed, 121 insertions(+), 16 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 363a89a..3037c10 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -907,8 +907,10 @@ static HRESULT WINAPI HTMLElement_contains(IHTMLElement *iface, IHTMLElement *pC static HRESULT WINAPI HTMLElement_get_sourceIndex(IHTMLElement *iface, LONG *p) { HTMLElement *This = impl_from_IHTMLElement(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_elem_source_index(This, p); } static HRESULT WINAPI HTMLElement_get_recordNumber(IHTMLElement *iface, VARIANT *p) diff --git a/dlls/mshtml/htmlelemcol.c b/dlls/mshtml/htmlelemcol.c index 8fd61ed..1542926 100644 --- a/dlls/mshtml/htmlelemcol.c +++ b/dlls/mshtml/htmlelemcol.c @@ -17,6 +17,7 @@ */ #include <stdarg.h> +#include <assert.h> #define COBJMACROS @@ -746,6 +747,75 @@ IHTMLElementCollection *create_collection_from_htmlcol(HTMLDocumentNode *doc, ns return HTMLElementCollection_Create(buf.buf, buf.len); } +HRESULT get_elem_source_index(HTMLElement *elem, LONG *ret) +{ + elem_vector_t buf = {NULL, 0, 8}; + nsIDOMNode *parent_node, *iter; + UINT16 parent_type; + HTMLDOMNode *node; + int i; + nsresult nsres; + HRESULT hres; + + iter = elem->node.nsnode; + nsIDOMNode_AddRef(iter); + + /* Find document or document fragment parent. */ + while(1) { + nsres = nsIDOMNode_GetParentNode(iter, &parent_node); + nsIDOMNode_Release(iter); + assert(nsres == NS_OK); + if(!parent_node) + break; + + nsres = nsIDOMNode_GetNodeType(parent_node, &parent_type); + assert(nsres == NS_OK); + + if(parent_type != ELEMENT_NODE) { + if(parent_type != DOCUMENT_NODE && parent_type != DOCUMENT_FRAGMENT_NODE) + FIXME("Unexpected parent_type %d\n", parent_type); + break; + } + + iter = parent_node; + } + + if(!parent_node) { + *ret = -1; + return S_OK; + } + + hres = get_node(elem->node.doc, parent_node, TRUE, &node); + nsIDOMNode_Release(parent_node); + if(FAILED(hres)) + return hres; + + + /* Create all children collection and find the element in it. + * This could be optimized if we ever find the reason. */ + buf.buf = heap_alloc(buf.size*sizeof(*buf.buf)); + if(!buf.buf) { + IHTMLDOMNode_Release(&node->IHTMLDOMNode_iface); + return E_OUTOFMEMORY; + } + + create_all_list(elem->node.doc, node, &buf); + + for(i=0; i < buf.len; i++) { + if(buf.buf[i] == elem) + break; + } + IHTMLDOMNode_Release(&node->IHTMLDOMNode_iface); + heap_free(buf.buf); + if(i == buf.len) { + FIXME("The element is not in parent's child list?\n"); + return E_UNEXPECTED; + } + + *ret = i; + return S_OK; +} + static IHTMLElementCollection *HTMLElementCollection_Create(HTMLElement **elems, DWORD len) { HTMLElementCollection *ret = heap_alloc_zero(sizeof(HTMLElementCollection)); diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 19e424f..78d61f0 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -961,6 +961,7 @@ HRESULT wrap_iface(IUnknown*,IUnknown*,IUnknown**) DECLSPEC_HIDDEN; IHTMLElementCollection *create_all_collection(HTMLDOMNode*,BOOL) DECLSPEC_HIDDEN; IHTMLElementCollection *create_collection_from_nodelist(HTMLDocumentNode*,nsIDOMNodeList*) DECLSPEC_HIDDEN; IHTMLElementCollection *create_collection_from_htmlcol(HTMLDocumentNode*,nsIDOMHTMLCollection*) DECLSPEC_HIDDEN; +HRESULT get_elem_source_index(HTMLElement*,LONG*) DECLSPEC_HIDDEN; nsresult get_elem_attr_value(nsIDOMHTMLElement*,const WCHAR*,nsAString*,const PRUnichar**) DECLSPEC_HIDDEN; HRESULT elem_string_attr_getter(HTMLElement*,const WCHAR*,BOOL,BSTR*) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 17f39ce..9f352f6 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -1142,6 +1142,17 @@ static void _test_elem_offset(unsigned line, IUnknown *unk, const char *parent_t IHTMLElement_Release(elem); } +#define test_elem_source_index(a,b) _test_elem_source_index(__LINE__,a,b) +static void _test_elem_source_index(unsigned line, IHTMLElement *elem, int index) +{ + LONG l = 0xdeadbeef; + HRESULT hres; + + hres = IHTMLElement_get_sourceIndex(elem, &l); + ok_(__FILE__,line)(hres == S_OK, "get_sourceIndex failed: %08x\n", hres); + ok_(__FILE__,line)(l == index, "sourceIndex = %d, expected %d\n", l, index); +} + #define get_doc_node(d) _get_doc_node(__LINE__,d) static IHTMLDocument2 *_get_doc_node(unsigned line, IHTMLDocument2 *doc) { @@ -2105,6 +2116,26 @@ static void _test_range_parent(unsigned line, IHTMLTxtRange *range, elem_type_t IHTMLElement_Release(elem); } +#define get_elem_col_item_idx(a,b) _get_elem_col_item_idx(__LINE__,a,b) +static IHTMLElement *_get_elem_col_item_idx(unsigned line, IHTMLElementCollection *col, int i) +{ + VARIANT name, index; + IHTMLElement *elem; + IDispatch *disp; + HRESULT hres; + + V_VT(&index) = VT_EMPTY; + V_VT(&name) = VT_I4; + V_I4(&name) = i; + hres = IHTMLElementCollection_item(col, name, index, &disp); + ok_(__FILE__,line)(hres == S_OK, "item failed: %08x\n", hres); + ok_(__FILE__,line)(disp != NULL, "disp == NULL\n"); + + elem = _get_elem_iface(line, (IUnknown*)disp); + IDispatch_Release(disp); + return elem; +} + #define test_elem_collection(c,t,l) _test_elem_collection(__LINE__,c,t,l) static void _test_elem_collection(unsigned line, IUnknown *unk, const elem_type_t *elem_types, LONG exlen) @@ -2290,20 +2321,8 @@ static void _test_elem_getelembytag(unsigned line, IUnknown *unk, elem_type_t ty HeapFree(GetProcessHeap(), 0, types); - if(ret) { - IDispatch *disp; - VARIANT v; - - V_VT(&v) = VT_I4; - V_I4(&v) = 0; - disp = NULL; - hres = IHTMLElementCollection_item(col, v, v, &disp); - ok(hres == S_OK, "item failed: %08x\n", hres); - ok(disp != NULL, "disp == NULL\n"); - *ret = _get_elem_iface(line, (IUnknown*)disp); - IDispatch_Release(disp); - } - + if(ret) + *ret = get_elem_col_item_idx(col, 0); IHTMLElementCollection_Release(col); } @@ -6909,6 +6928,15 @@ static void test_elems(IHTMLDocument2 *doc) ok(hres == S_OK, "get_all failed: %08x\n", hres); test_elem_collection((IUnknown*)col, all_types, sizeof(all_types)/sizeof(all_types[0])); test_elem_col_item(col, "x", item_types, sizeof(item_types)/sizeof(item_types[0])); + + elem = get_elem_col_item_idx(col, 0); + test_elem_source_index(elem, 0); + IHTMLElement_Release(elem); + + elem = get_elem_col_item_idx(col, 3); + test_elem_source_index(elem, 3); + IHTMLElement_Release(elem); + IHTMLElementCollection_Release(col); hres = IHTMLDocument2_get_images(doc, &collection); @@ -7012,6 +7040,7 @@ static void test_elems(IHTMLDocument2 *doc) elem2 = test_elem_get_parent((IUnknown*)elem3); ok(elem2 == NULL, "elem2 != NULL\n"); + test_elem_source_index(elem3, 0); IHTMLElement_Release(elem3); test_elem_getelembytag((IUnknown*)elem, ET_OPTION, 2, NULL); @@ -7737,6 +7766,7 @@ static void test_create_elems(IHTMLDocument2 *doc) ok(type == 1, "type=%d\n", type); test_ifaces((IUnknown*)elem, elem_iids); test_disp((IUnknown*)elem, &DIID_DispHTMLGenericElement, "[object]"); + test_elem_source_index(elem, -1); body = doc_get_body(doc); test_node_has_child((IUnknown*)body, VARIANT_FALSE); @@ -8333,7 +8363,9 @@ static void test_docfrag(IHTMLDocument2 *doc) ok(location == (void*)0xdeadbeef, "location changed\n"); br = test_create_elem(doc, "BR"); + test_elem_source_index(br, -1); test_node_append_child((IUnknown*)frag, (IUnknown*)br); + test_elem_source_index(br, 0); IHTMLElement_Release(br); div = get_elem_by_id(doc, "divid", TRUE);

1 0

Jacek Caban : jscript: Add DISPATCH_PROPERTYGET flag only for DISPATCH_METHOD call in disp_call_value.
by Alexandre Julliard 16 Sep '14

16 Sep '14

Module: wine Branch: master Commit: 02406d4fd4d55a9ef3950f2ba3932088b2fcbac5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=02406d4fd4d55a9ef3950f2ba… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 16 20:42:33 2014 +0200 jscript: Add DISPATCH_PROPERTYGET flag only for DISPATCH_METHOD call in disp_call_value. Spotted by Qian Hong. --- dlls/jscript/dispex.c | 2 +- dlls/jscript/tests/run.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 347e7e1..604bd26 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -1202,7 +1202,7 @@ HRESULT disp_call_value(script_ctx_t *ctx, IDispatch *disp, IDispatch *jsthis, W return hres; } - if(r && argc) + if(r && argc && flags == DISPATCH_METHOD) flags |= DISPATCH_PROPERTYGET; hres = IDispatch_QueryInterface(disp, &IID_IDispatchEx, (void**)&dispex); diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c index f6d600a..b8edd7d 100644 --- a/dlls/jscript/tests/run.c +++ b/dlls/jscript/tests/run.c @@ -95,6 +95,7 @@ DEFINE_EXPECT(dispexfunc_value); DEFINE_EXPECT(testobj_delete_test); DEFINE_EXPECT(testobj_delete_nodelete); DEFINE_EXPECT(testobj_value); +DEFINE_EXPECT(testobj_construct); DEFINE_EXPECT(testobj_prop_d); DEFINE_EXPECT(testobj_withprop_d); DEFINE_EXPECT(testobj_withprop_i); @@ -364,6 +365,10 @@ static HRESULT WINAPI testObj_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, case INVOKE_FUNC|INVOKE_PROPERTYGET: ok(pdp->cArgs == 1, "cArgs = %d\n", pdp->cArgs); break; + case DISPATCH_CONSTRUCT: + CHECK_EXPECT(testobj_construct); + ok(pdp->cArgs == 1, "cArgs = %d\n", pdp->cArgs); + break; default: ok(0, "invalid flag (%x)\n", wFlags); } @@ -2121,6 +2126,10 @@ static BOOL run_tests(void) parse_script_a("ok(String.prototype.concat.call(testObj, ' OK') === '1 OK', 'wrong concat result');"); CHECK_CALLED(testobj_value); + SET_EXPECT(testobj_construct); + parse_script_a("var t = new testObj(1);"); + CHECK_CALLED(testobj_construct); + SET_EXPECT(global_propget_d); SET_EXPECT(global_propget_i); parse_script_a("this.testPropGet;");

1 0

Marcus Meissner : shell32: Added stub for SHEnumerateUnreadMailAccountsW.
by Alexandre Julliard 15 Sep '14

15 Sep '14

Module: wine Branch: master Commit: 97be8d027b56806e8263f2040b9484f73f551f80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97be8d027b56806e8263f2040… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Sep 13 00:54:00 2014 +0200 shell32: Added stub for SHEnumerateUnreadMailAccountsW. --- dlls/shell32/shell32.spec | 1 + dlls/shell32/shell32_main.c | 9 +++++++++ include/shellapi.h | 4 ++++ 3 files changed, 14 insertions(+) diff --git a/dlls/shell32/shell32.spec b/dlls/shell32/shell32.spec index a85b45d..f219c8f 100644 --- a/dlls/shell32/shell32.spec +++ b/dlls/shell32/shell32.spec @@ -348,6 +348,7 @@ @ stdcall SHCreateShellItemArrayFromIDLists(long ptr ptr) @ stdcall SHEmptyRecycleBinA(long str long) @ stdcall SHEmptyRecycleBinW(long wstr long) +@ stdcall SHEnumerateUnreadMailAccountsW(ptr long ptr long) @ stdcall SHExtractIconsW(wstr long long long ptr ptr long long) user32.PrivateExtractIconsW @ stdcall SHFileOperation(ptr) SHFileOperationA @ stdcall SHFileOperationA(ptr) diff --git a/dlls/shell32/shell32_main.c b/dlls/shell32/shell32_main.c index 3bf442e..cabf5e4 100644 --- a/dlls/shell32/shell32_main.c +++ b/dlls/shell32/shell32_main.c @@ -1385,3 +1385,12 @@ HRESULT WINAPI SHSetUnreadMailCountW(LPCWSTR mailaddress, DWORD count, LPCWSTR e FIXME("%s %x %s: stub\n", debugstr_w(mailaddress), count, debugstr_w(executecommand)); return E_NOTIMPL; } + +/*********************************************************************** + * SHEnumerateUnreadMailAccountsW (SHELL32.@) + */ +HRESULT WINAPI SHEnumerateUnreadMailAccountsW(HKEY user, DWORD idx, LPWSTR mailaddress, INT mailaddresslen) +{ + FIXME("%p %d %p %d: stub\n", user, idx, mailaddress, mailaddresslen); + return E_NOTIMPL; +} diff --git a/include/shellapi.h b/include/shellapi.h index acc345d..ecf0b21 100644 --- a/include/shellapi.h +++ b/include/shellapi.h @@ -649,6 +649,10 @@ DWORD WINAPI DoEnvironmentSubstA(LPSTR, UINT); DWORD WINAPI DoEnvironmentSubstW(LPWSTR, UINT); #define DoEnvironmentSubst WINELIB_NAME_AW(DoEnvironmentSubst) +HRESULT WINAPI SHEnumerateUnreadMailAccountsA(HKEY,DWORD,LPSTR,INT); +HRESULT WINAPI SHEnumerateUnreadMailAccountsW(HKEY,DWORD,LPWSTR,INT); +#define SHEnumerateUnreadMailAccounts WINELIB_NAME_AW(SHEnumerateUnreadMailAccounts) + #ifdef __cplusplus } /* extern "C" */

1 0

Francois Gouget : msvcrt: Prefix _set_output_format() with MSVCRT_ to avoid a collision with MinGW.
by Alexandre Julliard 15 Sep '14

15 Sep '14

Module: wine Branch: master Commit: f63fd8261087f14c00047355e1551d693e2898bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=f63fd8261087f14c00047355e… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Sep 13 22:54:58 2014 +0200 msvcrt: Prefix _set_output_format() with MSVCRT_ to avoid a collision with MinGW. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/misc.c | 2 +- dlls/msvcrt/msvcrt.spec | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 0d6e2dc..84ddcc9 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1274,7 +1274,7 @@ @ cdecl _set_fmode(long) MSVCRT__set_fmode @ cdecl _set_invalid_parameter_handler(ptr) @ stub _set_malloc_crt_max_wait -@ cdecl _set_output_format(long) +@ cdecl _set_output_format(long) MSVCRT__set_output_format @ cdecl _set_printf_count_output(long) MSVCRT__set_printf_count_output @ cdecl _set_purecall_handler(ptr) @ cdecl _seterrormode(long) diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 1114190..36c4137 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1632,7 +1632,7 @@ @ cdecl _set_fmode(long) MSVCRT__set_fmode @ cdecl _set_invalid_parameter_handler(ptr) @ stub _set_malloc_crt_max_wait -@ cdecl _set_output_format(long) +@ cdecl _set_output_format(long) MSVCRT__set_output_format @ cdecl _set_printf_count_output(long) MSVCRT__set_printf_count_output @ cdecl _set_purecall_handler(ptr) @ cdecl _seterrormode(long) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index fc313a4..1745f64 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -953,7 +953,7 @@ @ cdecl _set_fmode(long) MSVCRT__set_fmode @ cdecl _set_invalid_parameter_handler(ptr) @ stub _set_malloc_crt_max_wait -@ cdecl _set_output_format(long) +@ cdecl _set_output_format(long) MSVCRT__set_output_format @ cdecl _set_printf_count_output(long) MSVCRT__set_printf_count_output @ cdecl _set_purecall_handler(ptr) @ cdecl _set_sbh_threshold(long) diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index a89dbfb..ba3757a 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -929,7 +929,7 @@ @ cdecl _set_fmode(long) MSVCRT__set_fmode @ cdecl _set_invalid_parameter_handler(ptr) @ stub _set_malloc_crt_max_wait -@ cdecl _set_output_format(long) +@ cdecl _set_output_format(long) MSVCRT__set_output_format @ cdecl _set_printf_count_output(long) MSVCRT__set_printf_count_output @ cdecl _set_purecall_handler(ptr) @ cdecl _set_sbh_threshold(long) diff --git a/dlls/msvcrt/misc.c b/dlls/msvcrt/misc.c index fc5a5a9..c66152b 100644 --- a/dlls/msvcrt/misc.c +++ b/dlls/msvcrt/misc.c @@ -377,7 +377,7 @@ unsigned int CDECL MSVCRT__get_output_format(void) /********************************************************************* * _set_output_format (MSVCRT.@) */ -unsigned int CDECL _set_output_format(unsigned int new_output_format) +unsigned int CDECL MSVCRT__set_output_format(unsigned int new_output_format) { unsigned int ret = output_format; diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 742ada3..96bbecc 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -898,7 +898,7 @@ @ cdecl _set_error_mode(long) # stub _set_fileinfo(long) @ cdecl _set_fmode(long) MSVCRT__set_fmode -@ cdecl _set_output_format(long) +@ cdecl _set_output_format(long) MSVCRT__set_output_format @ cdecl _set_sbh_threshold(long) @ cdecl _seterrormode(long) @ cdecl -arch=i386,x86_64,arm -norelay _setjmp(ptr) MSVCRT__setjmp

1 0

Jactry Zeng : mshtml: Add IHTMLCurrentStyle:: get_textTransform implementation.
by Alexandre Julliard 15 Sep '14

15 Sep '14

Module: wine Branch: master Commit: e777e9d1baaf84f88b1ca8327e62afa6463f9e4f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e777e9d1baaf84f88b1ca8327… Author: Jactry Zeng <wine(a)jactry.com> Date: Mon Sep 15 09:51:10 2014 +0800 mshtml: Add IHTMLCurrentStyle::get_textTransform implementation. --- dlls/mshtml/htmlcurstyle.c | 4 ++-- dlls/mshtml/tests/style.c | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlcurstyle.c b/dlls/mshtml/htmlcurstyle.c index ca5d60f..5f6cb35 100644 --- a/dlls/mshtml/htmlcurstyle.c +++ b/dlls/mshtml/htmlcurstyle.c @@ -793,8 +793,8 @@ static HRESULT WINAPI HTMLCurrentStyle_get_overflowY(IHTMLCurrentStyle *iface, B static HRESULT WINAPI HTMLCurrentStyle_get_textTransform(IHTMLCurrentStyle *iface, BSTR *p) { HTMLCurrentStyle *This = impl_from_IHTMLCurrentStyle(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, p); + return get_nsstyle_attr(This->nsstyle, STYLEID_TEXT_TRANSFORM, p, 0); } static const IHTMLCurrentStyleVtbl HTMLCurrentStyleVtbl = { diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c index 40552a4..d8c86b1 100644 --- a/dlls/mshtml/tests/style.c +++ b/dlls/mshtml/tests/style.c @@ -2750,6 +2750,10 @@ static void test_current_style(IHTMLCurrentStyle *current_style) ok(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&v)); VariantClear(&v); + hres = IHTMLCurrentStyle_get_textTransform(current_style, &str); + ok(hres == S_OK, "get_textTransform failed: %08x\n", hres); + SysFreeString(str); + current_style2 = get_current_style2_iface((IUnknown*)current_style); b = 100;

1 0

Jactry Zeng : riched20: Avoid invalid memory access.
by Alexandre Julliard 15 Sep '14

15 Sep '14

Module: wine Branch: master Commit: 7d06f6ccb202f1306fb02895d4fd116fd44059c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d06f6ccb202f1306fb02895d… Author: Jactry Zeng <wine(a)jactry.com> Date: Mon Sep 15 10:49:21 2014 +0800 riched20: Avoid invalid memory access. --- dlls/riched20/richole.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index 826fa68..194f471 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -492,8 +492,11 @@ static ULONG WINAPI ITextRange_fnRelease(ITextRange *me) TRACE ("%p ref=%u\n", This, ref); if (ref == 0) { - This->reOle = NULL; - list_remove(&This->entry); + if (This->reOle) + { + list_remove(&This->entry); + This->reOle = NULL; + } heap_free(This); } return ref;

1 0

Henri Verbeet : d2d1: Simplify clip stack handling.
by Alexandre Julliard 15 Sep '14

15 Sep '14

Module: wine Branch: master Commit: 240c45408913b6ab7f2f46ebdb6ad186ae582fb2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=240c45408913b6ab7f2f46ebd… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Sep 15 11:03:33 2014 +0200 d2d1: Simplify clip stack handling. --- dlls/d2d1/d2d1_private.h | 5 ++-- dlls/d2d1/render_target.c | 70 +++++++++++++++++++++-------------------------- 2 files changed, 33 insertions(+), 42 deletions(-) diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 586b978..ade194c 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -28,9 +28,8 @@ struct d2d_clip_stack { D2D1_RECT_F *stack; - unsigned int stack_size; - unsigned int current; - D2D1_RECT_F clip_rect; + unsigned int size; + unsigned int count; }; struct d2d_d3d_render_target diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index 268de41..4d69697 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -63,18 +63,13 @@ static void d2d_rect_set(D2D1_RECT_F *dst, float left, float top, float right, f dst->bottom = bottom; } -static BOOL d2d_clip_stack_init(struct d2d_clip_stack *stack, unsigned int w, unsigned int h) +static BOOL d2d_clip_stack_init(struct d2d_clip_stack *stack) { if (!(stack->stack = HeapAlloc(GetProcessHeap(), 0, INITIAL_CLIP_STACK_SIZE * sizeof(*stack->stack)))) return FALSE; - stack->stack_size = INITIAL_CLIP_STACK_SIZE; - stack->current = 0; - - stack->clip_rect.left = 0.0f; - stack->clip_rect.top = 0.0f; - stack->clip_rect.right = w; - stack->clip_rect.bottom = h; + stack->size = INITIAL_CLIP_STACK_SIZE; + stack->count = 0; return TRUE; } @@ -86,45 +81,37 @@ static void d2d_clip_stack_cleanup(struct d2d_clip_stack *stack) static BOOL d2d_clip_stack_push(struct d2d_clip_stack *stack, const D2D1_RECT_F *rect) { - if (stack->current == stack->stack_size - 1) + D2D1_RECT_F r; + + if (stack->count == stack->size) { D2D1_RECT_F *new_stack; unsigned int new_size; - if (stack->stack_size > UINT_MAX / 2) + if (stack->size > UINT_MAX / 2) return FALSE; - new_size = stack->stack_size * 2; + new_size = stack->size * 2; if (!(new_stack = HeapReAlloc(GetProcessHeap(), 0, stack->stack, new_size * sizeof(*stack->stack)))) return FALSE; stack->stack = new_stack; - stack->stack_size = new_size; + stack->size = new_size; } - stack->stack[stack->current++] = *rect; - d2d_rect_intersect(&stack->clip_rect, rect); + r = *rect; + if (stack->count) + d2d_rect_intersect(&r, &stack->stack[stack->count - 1]); + stack->stack[stack->count++] = r; return TRUE; } -static void d2d_clip_stack_pop(struct d2d_clip_stack *stack, unsigned int w, unsigned int h) +static void d2d_clip_stack_pop(struct d2d_clip_stack *stack) { - unsigned int i; - - if (!stack->current) + if (!stack->count) return; - - --stack->current; - stack->clip_rect.left = 0.0f; - stack->clip_rect.top = 0.0f; - stack->clip_rect.right = w; - stack->clip_rect.bottom = h; - - for (i = 0; i < stack->current; ++i) - { - d2d_rect_intersect(&stack->clip_rect, &stack->stack[i]); - } + --stack->count; } static inline struct d2d_d3d_render_target *impl_from_ID2D1RenderTarget(ID2D1RenderTarget *iface) @@ -565,7 +552,7 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_PopAxisAlignedClip(ID2D1Rend TRACE("iface %p.\n", iface); - d2d_clip_stack_pop(&render_target->clip_stack, render_target->pixel_size.width, render_target->pixel_size.height); + d2d_clip_stack_pop(&render_target->clip_stack); } static void STDMETHODCALLTYPE d2d_d3d_render_target_Clear(ID2D1RenderTarget *iface, const D2D1_COLOR_F *color) @@ -573,7 +560,6 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_Clear(ID2D1RenderTarget *ifa struct d2d_d3d_render_target *render_target = impl_from_ID2D1RenderTarget(iface); D3D10_SUBRESOURCE_DATA buffer_data; D3D10_BUFFER_DESC buffer_desc; - D3D10_RECT scissor_rect; unsigned int offset; D3D10_VIEWPORT vp; ID3D10Buffer *cb; @@ -604,11 +590,6 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_Clear(ID2D1RenderTarget *ifa vp.MinDepth = 0.0f; vp.MaxDepth = 1.0f; - scissor_rect.left = render_target->clip_stack.clip_rect.left + 0.5f; - scissor_rect.top = render_target->clip_stack.clip_rect.top + 0.5f; - scissor_rect.right = render_target->clip_stack.clip_rect.right + 0.5f; - scissor_rect.bottom = render_target->clip_stack.clip_rect.bottom + 0.5f; - if (FAILED(hr = render_target->stateblock->lpVtbl->Capture(render_target->stateblock))) { WARN("Failed to capture stateblock, hr %#x.\n", hr); @@ -627,8 +608,19 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_Clear(ID2D1RenderTarget *ifa ID3D10Device_PSSetConstantBuffers(render_target->device, 0, 1, &cb); ID3D10Device_PSSetShader(render_target->device, render_target->clear_ps); ID3D10Device_RSSetViewports(render_target->device, 1, &vp); - ID3D10Device_RSSetScissorRects(render_target->device, 1, &scissor_rect); - ID3D10Device_RSSetState(render_target->device, render_target->clear_rs); + if (render_target->clip_stack.count) + { + const D2D1_RECT_F *clip_rect; + D3D10_RECT scissor_rect; + + clip_rect = &render_target->clip_stack.stack[render_target->clip_stack.count - 1]; + scissor_rect.left = clip_rect->left + 0.5f; + scissor_rect.top = clip_rect->top + 0.5f; + scissor_rect.right = clip_rect->right + 0.5f; + scissor_rect.bottom = clip_rect->bottom + 0.5f; + ID3D10Device_RSSetScissorRects(render_target->device, 1, &scissor_rect); + ID3D10Device_RSSetState(render_target->device, render_target->clear_rs); + } ID3D10Device_OMSetRenderTargets(render_target->device, 1, &render_target->view, NULL); ID3D10Device_Draw(render_target->device, 4, 0); @@ -975,7 +967,7 @@ HRESULT d2d_d3d_render_target_init(struct d2d_d3d_render_target *render_target, render_target->pixel_size.height = surface_desc.Height; render_target->transform = identity; - if (!d2d_clip_stack_init(&render_target->clip_stack, surface_desc.Width, surface_desc.Height)) + if (!d2d_clip_stack_init(&render_target->clip_stack)) { WARN("Failed to initialize clip stack.\n"); hr = E_FAIL;

1 0

Henri Verbeet : dxgi: Get rid of IWineDXGIAdapter.
by Alexandre Julliard 15 Sep '14

15 Sep '14

Module: wine Branch: master Commit: 22abd896fae8d0dab7d93b875d6c83a753de4ba1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=22abd896fae8d0dab7d93b875… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Sep 15 11:03:34 2014 +0200 dxgi: Get rid of IWineDXGIAdapter. --- dlls/dxgi/adapter.c | 106 ++++++++++++++++++++-------------------------- dlls/dxgi/device.c | 25 ++++------- dlls/dxgi/dxgi_private.h | 7 ++- dlls/dxgi/factory.c | 8 ++-- include/wine/winedxgi.idl | 10 ----- 5 files changed, 63 insertions(+), 93 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=22abd896fae8d0dab7d93…

1 0