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

Alistair Leslie-Hughes : inetcomm: Ignore option OID_CLEANUP_TREE_ON_SAVE.
by Alexandre Julliard July 6, 2016

July 6, 2016

Module: wine Branch: master Commit: 6e6a6ff9d5217f80547f26196346f2d3d191a0b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e6a6ff9d5217f80547f26196… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Jul 1 07:57:18 2016 +0000 inetcomm: Ignore option OID_CLEANUP_TREE_ON_SAVE. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/inetcomm/mimeole.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/inetcomm/mimeole.c b/dlls/inetcomm/mimeole.c index 2ccc162..f98c2db 100644 --- a/dlls/inetcomm/mimeole.c +++ b/dlls/inetcomm/mimeole.c @@ -2509,6 +2509,9 @@ static HRESULT WINAPI MimeMessage_SetOption( case OID_SAVEBODY_KEEPBOUNDARY: FIXME("OID_SAVEBODY_KEEPBOUNDARY (value %d): ignoring\n", pValue->u.boolVal); break; + case OID_CLEANUP_TREE_ON_SAVE: + FIXME("OID_CLEANUP_TREE_ON_SAVE (value %d): ignoring\n", pValue->u.boolVal); + break; default: FIXME("Unhandled oid %08x\n", oid); hr = MIME_E_INVALID_OPTION_ID;

1 0

Michael Stefaniuc : user32/tests: Use wine_dbgstr_rect() to print RECTs.
by Alexandre Julliard July 6, 2016

July 6, 2016

Module: wine Branch: master Commit: a1f0d09ab3c408907b3098b7e12a7a24528f6cc4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1f0d09ab3c408907b3098b7e… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jul 6 08:57:04 2016 +0200 user32/tests: Use wine_dbgstr_rect() to print RECTs. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/scroll.c | 21 ++++++--------------- dlls/user32/tests/win.c | 3 +-- 2 files changed, 7 insertions(+), 17 deletions(-) diff --git a/dlls/user32/tests/scroll.c b/dlls/user32/tests/scroll.c index 7691af3..0bda5dd 100644 --- a/dlls/user32/tests/scroll.c +++ b/dlls/user32/tests/scroll.c @@ -222,11 +222,8 @@ static void test_GetScrollBarInfo(void) ok( ret, "The GetWindowRect() call should not fail.\n" ); ok( !(sbi.rgstate[0] & (STATE_SYSTEM_INVISIBLE|STATE_SYSTEM_OFFSCREEN)), "unexpected rgstate(0x%x)\n", sbi.rgstate[0]); - ok( EqualRect(&rect, &sbi.rcScrollBar), - "WindowRect(%d, %d, %d, %d) != rcScrollBar(%d, %d, %d, %d)\n", - rect.top, rect.left, rect.bottom, rect.right, - sbi.rcScrollBar.top, sbi.rcScrollBar.left, - sbi.rcScrollBar.bottom, sbi.rcScrollBar.right ); + ok(EqualRect(&rect, &sbi.rcScrollBar), "WindowRect %s != rcScrollBar %s\n", + wine_dbgstr_rect(&rect), wine_dbgstr_rect(&sbi.rcScrollBar)); /* Test windows horizontal and vertical scrollbar to make sure rcScrollBar * is still returned in screen coordinates by moving the window, and @@ -243,11 +240,8 @@ static void test_GetScrollBarInfo(void) OffsetRect(&rect, 5, 5); ret = pGetScrollBarInfo( hMainWnd, OBJID_HSCROLL, &sbi); ok( ret, "The GetScrollBarInfo() call should not fail.\n" ); - ok( EqualRect(&rect, &sbi.rcScrollBar), - "PreviousRect(%d, %d, %d, %d) != CurrentRect(%d, %d, %d, %d)\n", - rect.top, rect.left, rect.bottom, rect.right, - sbi.rcScrollBar.top, sbi.rcScrollBar.left, - sbi.rcScrollBar.bottom, sbi.rcScrollBar.right ); + ok(EqualRect(&rect, &sbi.rcScrollBar), "PreviousRect %s != CurrentRect %s\n", + wine_dbgstr_rect(&rect), wine_dbgstr_rect(&sbi.rcScrollBar)); sbi.cbSize = sizeof(sbi); ret = pGetScrollBarInfo( hMainWnd, OBJID_VSCROLL, &sbi); @@ -260,11 +254,8 @@ static void test_GetScrollBarInfo(void) OffsetRect(&rect, 5, 5); ret = pGetScrollBarInfo( hMainWnd, OBJID_VSCROLL, &sbi); ok( ret, "The GetScrollBarInfo() call should not fail.\n" ); - ok( EqualRect(&rect, &sbi.rcScrollBar), - "PreviousRect(%d, %d, %d, %d) != CurrentRect(%d, %d, %d, %d)\n", - rect.top, rect.left, rect.bottom, rect.right, - sbi.rcScrollBar.top, sbi.rcScrollBar.left, - sbi.rcScrollBar.bottom, sbi.rcScrollBar.right ); + ok(EqualRect(&rect, &sbi.rcScrollBar), "PreviousRect %s != CurrentRect %s\n", + wine_dbgstr_rect(&rect), wine_dbgstr_rect(&sbi.rcScrollBar)); DestroyWindow(hScroll); DestroyWindow(hMainWnd); diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 8505983..7195102 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -2504,8 +2504,7 @@ static void test_SetWindowPos(HWND hwnd, HWND hwnd2) ret = SetWindowPos(hwnd_child, hwnd_desktop, 0, 0, 0, 0, 0); ok(!ret, "Got %d\n", ret); GetWindowRect(hwnd_child, &rc2); - ok(EqualRect(&rc1, &rc2), "(%d, %d, %d, %d) != (%d, %d, %d, %d)\n", - rc1.top, rc1.left, rc1.bottom, rc1.right, rc2.top, rc2.left, rc2.bottom, rc2.right); + ok(EqualRect(&rc1, &rc2), "%s != %s\n", wine_dbgstr_rect(&rc1), wine_dbgstr_rect(&rc2)); check_active_state(hwnd2, hwnd2, hwnd2); ret = SetWindowPos(hwnd_desktop, hwnd_child, 0, 0, 0, 0, SWP_NOMOVE|SWP_NOSIZE);

1 0

Jacek Caban : mshtml: Use callback to register additional IDispatch interfaces.
by Alexandre Julliard July 6, 2016

July 6, 2016

Module: wine Branch: master Commit: f6a00dbd25d009aebc0f300b9039537ecc255ca7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6a00dbd25d009aebc0f300b9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 5 22:48:20 2016 +0200 mshtml: Use callback to register additional IDispatch interfaces. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/dispex.c | 15 ++++++++++++--- dlls/mshtml/htmlwindow.c | 7 ++++++- dlls/mshtml/mshtml_private.h | 3 ++- 3 files changed, 20 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index 9a2cebd..791f361 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -343,6 +343,15 @@ static HRESULT process_interface(dispex_data_t *data, tid_t tid, ITypeInfo *disp return S_OK; } +void dispex_info_add_interface(dispex_data_t *info, tid_t tid) +{ + HRESULT hres; + + hres = process_interface(info, tid, NULL); + if(FAILED(hres)) + ERR("process_interface failed: %08x\n", hres); +} + static int dispid_cmp(const void *p1, const void *p2) { return ((const func_info_t*)p1)->id - ((const func_info_t*)p2)->id; @@ -386,15 +395,15 @@ static dispex_data_t *preprocess_dispex_data(const dispex_static_data_t *desc) } list_add_tail(&dispex_data_list, &data->entry); + if(desc->init_info) + desc->init_info(data); + for(tid = desc->iface_tids; *tid; tid++) { hres = process_interface(data, *tid, dti); if(FAILED(hres)) break; } - if(desc->additional_tid) - process_interface(data, desc->additional_tid, NULL); - if(!data->func_cnt) { heap_free(data->funcs); data->name_table = NULL; diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index b75c9ba..54cd078 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -2936,6 +2936,11 @@ static void HTMLWindow_bind_event(DispatchEx *dispex, int eid) dispex_get_vtbl(&This->doc->node.event_target.dispex)->bind_event(&This->doc->node.event_target.dispex, eid); } +static void HTMLWindow_init_dispex_info(dispex_data_t *info) +{ + dispex_info_add_interface(info, IHTMLWindow5_tid); +} + static const dispex_static_data_vtbl_t HTMLWindow_dispex_vtbl = { NULL, NULL, @@ -2957,7 +2962,7 @@ static dispex_static_data_t HTMLWindow_dispex = { &HTMLWindow_dispex_vtbl, DispHTMLWindow2_tid, HTMLWindow_iface_tids, - IHTMLWindow5_tid + HTMLWindow_init_dispex_info }; static void *alloc_window(size_t size) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 04a1ccf..412db24 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -265,7 +265,7 @@ typedef struct { const dispex_static_data_vtbl_t *vtbl; const tid_t disp_tid; const tid_t* const iface_tids; - const tid_t additional_tid; + void (*init_info)(dispex_data_t*); dispex_data_t *data; } dispex_static_data_t; @@ -317,6 +317,7 @@ void dispex_unlink(DispatchEx*) DECLSPEC_HIDDEN; void release_typelib(void) DECLSPEC_HIDDEN; HRESULT get_htmldoc_classinfo(ITypeInfo **typeinfo) DECLSPEC_HIDDEN; const dispex_static_data_vtbl_t *dispex_get_vtbl(DispatchEx*) DECLSPEC_HIDDEN; +void dispex_info_add_interface(dispex_data_t*,tid_t) DECLSPEC_HIDDEN; typedef enum { DISPEXPROP_CUSTOM,

1 0

Andrey Gusev : wined3d: Fix a typo in comment.
by Alexandre Julliard July 6, 2016

July 6, 2016

Module: wine Branch: master Commit: 83f72793f06c3b539b80b346fbb39839423f38e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=83f72793f06c3b539b80b346f… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Tue Jul 5 15:38:25 2016 +0300 wined3d: Fix a typo in comment. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/state.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index b157389..98e78da 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3736,7 +3736,7 @@ void clipplane(struct wined3d_context *context, const struct wined3d_state *stat gl_info->gl_ops.gl.p_glLoadMatrixf(&state->transforms[WINED3D_TS_VIEW]._11); else /* With vertex shaders, clip planes are not transformed in Direct3D, - * while in OpenGL they are still transformed by the model view matix. */ + * while in OpenGL they are still transformed by the model view matrix. */ gl_info->gl_ops.gl.p_glLoadIdentity(); plane[0] = state->clip_planes[index].x;

1 0

Jacek Caban : mshtml: Reimplement IHTMLDocument5:: get_compatMode based on document mode.
by Alexandre Julliard July 6, 2016

July 6, 2016

Module: wine Branch: master Commit: 87f7aea1cad423eb576fec8ea1d508640775d67b URL: http://source.winehq.org/git/wine.git/?a=commit;h=87f7aea1cad423eb576fec8ea… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 5 22:48:04 2016 +0200 mshtml: Reimplement IHTMLDocument5::get_compatMode based on document mode. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmldoc.c | 15 +++++---------- dlls/mshtml/tests/documentmode.js | 5 +++++ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 1c0cc35..8fa3f52 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -2947,19 +2947,14 @@ static HRESULT WINAPI HTMLDocument5_get_onbeforedeactivate(IHTMLDocument5 *iface static HRESULT WINAPI HTMLDocument5_get_compatMode(IHTMLDocument5 *iface, BSTR *p) { HTMLDocument *This = impl_from_IHTMLDocument5(iface); - nsAString mode_str; - nsresult nsres; - TRACE("(%p)->(%p)\n", This, p); + static const WCHAR BackCompatW[] = {'B','a','c','k','C','o','m','p','a','t',0}; + static const WCHAR CSS1CompatW[] = {'C','S','S','1','C','o','m','p','a','t',0}; - if(!This->doc_node->nsdoc) { - WARN("NULL nsdoc\n"); - return E_UNEXPECTED; - } + TRACE("(%p)->(%p)\n", This, p); - nsAString_Init(&mode_str, NULL); - nsres = nsIDOMHTMLDocument_GetCompatMode(This->doc_node->nsdoc, &mode_str); - return return_nsstr(nsres, &mode_str, p); + *p = SysAllocString(This->doc_node->document_mode == COMPAT_MODE_QUIRKS ? BackCompatW : CSS1CompatW); + return *p ? S_OK : E_OUTOFMEMORY; } static const IHTMLDocument5Vtbl HTMLDocument5Vtbl = { diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index 89fe0a9..5979514 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -29,6 +29,11 @@ function test_doc_mode() { ok(opt === document.documentMode, "documentMode = " + document.documentMode); + if(document.documentMode > 5) + ok(document.compatMode === "CSS1Compat", "document.compatMode = " + document.compatMode); + else + ok(document.compatMode === "BackCompat", "document.compatMode = " + document.compatMode); + next_test(); }

1 0

Jacek Caban : mshtml: Preprocess typelib data in init_dispex.
by Alexandre Julliard July 6, 2016

July 6, 2016

Module: wine Branch: master Commit: bb4227d6d5ffb9b9c7d6b73c91f5fec4d7af3353 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb4227d6d5ffb9b9c7d6b73c9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 5 22:46:23 2016 +0200 mshtml: Preprocess typelib data in init_dispex. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/dispex.c | 31 +++++++++++++------------------ 1 file changed, 13 insertions(+), 18 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index 09f0250..7af2854 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -351,7 +351,7 @@ static int func_name_cmp(const void *p1, const void *p2) return strcmpiW((*(func_info_t* const*)p1)->name, (*(func_info_t* const*)p2)->name); } -static dispex_data_t *preprocess_dispex_data(DispatchEx *This) +static dispex_data_t *preprocess_dispex_data(const dispex_static_data_t *desc) { const tid_t *tid; dispex_data_t *data; @@ -359,10 +359,8 @@ static dispex_data_t *preprocess_dispex_data(DispatchEx *This) ITypeInfo *dti; HRESULT hres; - TRACE("(%p)\n", This); - - if(This->data->disp_tid) { - hres = get_typeinfo(This->data->disp_tid, &dti); + if(desc->disp_tid) { + hres = get_typeinfo(desc->disp_tid, &dti); if(FAILED(hres)) { ERR("Could not get disp type info: %08x\n", hres); return NULL; @@ -385,14 +383,14 @@ static dispex_data_t *preprocess_dispex_data(DispatchEx *This) } list_add_tail(&dispex_data_list, &data->entry); - for(tid = This->data->iface_tids; *tid; tid++) { + for(tid = desc->iface_tids; *tid; tid++) { hres = process_interface(data, *tid, dti); if(FAILED(hres)) break; } - if(This->data->additional_tid) - process_interface(data, This->data->additional_tid, NULL); + if(desc->additional_tid) + process_interface(data, desc->additional_tid, NULL); if(!data->func_cnt) { heap_free(data->funcs); @@ -470,16 +468,6 @@ HRESULT get_dispids(tid_t tid, DWORD *ret_size, DISPID **ret) static dispex_data_t *get_dispex_data(DispatchEx *This) { - if(This->data->data) - return This->data->data; - - EnterCriticalSection(&cs_dispex_static_data); - - if(!This->data->data) - This->data->data = preprocess_dispex_data(This); - - LeaveCriticalSection(&cs_dispex_static_data); - return This->data->data; } @@ -1777,6 +1765,13 @@ void release_dispex(DispatchEx *This) void init_dispex(DispatchEx *dispex, IUnknown *outer, dispex_static_data_t *data) { + if(!data->data) { + EnterCriticalSection(&cs_dispex_static_data); + if(!data->data) + data->data = preprocess_dispex_data(data); + LeaveCriticalSection(&cs_dispex_static_data); + } + dispex->IDispatchEx_iface.lpVtbl = &DispatchExVtbl; dispex->outer = outer; dispex->data = data;

1 0

Nikolay Sivov : msxml3: Remove redundant refcount field.
by Alexandre Julliard July 6, 2016

July 6, 2016

Module: wine Branch: master Commit: 01c63bdf7686fe2248bc2ab24a7920fdefb2ef0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=01c63bdf7686fe2248bc2ab24… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jul 5 22:28:00 2016 +0300 msxml3: Remove redundant refcount field. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/httprequest.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/msxml3/httprequest.c b/dlls/msxml3/httprequest.c index e0b6e1c..55339e1 100644 --- a/dlls/msxml3/httprequest.c +++ b/dlls/msxml3/httprequest.c @@ -114,7 +114,6 @@ typedef struct { httprequest req; IServerXMLHTTPRequest IServerXMLHTTPRequest_iface; - LONG ref; } serverhttp; static inline httprequest *impl_from_IXMLHTTPRequest( IXMLHTTPRequest *iface ) @@ -1737,7 +1736,7 @@ static HRESULT WINAPI ServerXMLHTTPRequest_QueryInterface(IServerXMLHTTPRequest static ULONG WINAPI ServerXMLHTTPRequest_AddRef(IServerXMLHTTPRequest *iface) { serverhttp *This = impl_from_IServerXMLHTTPRequest( iface ); - ULONG ref = InterlockedIncrement( &This->ref ); + ULONG ref = InterlockedIncrement( &This->req.ref ); TRACE("(%p)->(%u)\n", This, ref ); return ref; } @@ -1745,7 +1744,7 @@ static ULONG WINAPI ServerXMLHTTPRequest_AddRef(IServerXMLHTTPRequest *iface) static ULONG WINAPI ServerXMLHTTPRequest_Release(IServerXMLHTTPRequest *iface) { serverhttp *This = impl_from_IServerXMLHTTPRequest( iface ); - ULONG ref = InterlockedDecrement( &This->ref ); + ULONG ref = InterlockedDecrement( &This->req.ref ); TRACE("(%p)->(%u)\n", This, ref ); @@ -2041,7 +2040,6 @@ HRESULT ServerXMLHTTP_create(void **obj) init_httprequest(&req->req); req->IServerXMLHTTPRequest_iface.lpVtbl = &ServerXMLHTTPRequestVtbl; - req->ref = 1; *obj = &req->IServerXMLHTTPRequest_iface;

1 0

André Hentschel : ws2_32/tests: Turn a randomly behaving test into a trace.
by Alexandre Julliard July 6, 2016

July 6, 2016

Module: wine Branch: master Commit: 64732ccab43aca40f27cfbda34befddc8594ab7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=64732ccab43aca40f27cfbda3… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Jun 25 15:18:37 2016 +0200 ws2_32/tests: Turn a randomly behaving test into a trace. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/sock.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index ed31f25..d47c175 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -638,14 +638,14 @@ static VOID WINAPI oob_server ( server_params *par ) ok ( n_sent == n_expected, "oob_server (%x): sent less data than expected: %d of %d\n", id, n_sent, n_expected ); - /* Receive a part of the out-of-band data and check atmark state */ + /* Receive a part of the out-of-band data and print atmark state */ n_recvd = do_synchronous_recv ( mem->sock[0].s, mem->sock[0].buf, 8, 0, par->buflen ); ok ( n_recvd == 8, "oob_server (%x): received less data than expected: %d of %d\n", id, n_recvd, 8 ); n_expected -= 8; ioctlsocket ( mem->sock[0].s, SIOCATMARK, &atmark ); - todo_wine ok ( atmark == 0, "oob_server (%x): not at the OOB mark: %i\n", id, atmark ); + trace( "oob_server (%x): %s the OOB mark: %i\n", id, atmark == 1 ? "not at" : "at", atmark ); /* Receive the rest of the out-of-band data and check atmark state */ do_synchronous_recv ( mem->sock[0].s, mem->sock[0].buf, n_expected, 0, par->buflen );

1 0

Jacek Caban : mshtml: Added document.documentMode tests.
by Alexandre Julliard July 6, 2016

July 6, 2016

Module: wine Branch: master Commit: 429e0dde694fc4e81302e0d01efb5b32317f542f URL: http://source.winehq.org/git/wine.git/?a=commit;h=429e0dde694fc4e81302e0d01… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 5 22:47:56 2016 +0200 mshtml: Added document.documentMode tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/documentmode.js | 37 +++++++++++++++++++++++++++++++++++++ dlls/mshtml/tests/rsrc.rc | 3 +++ dlls/mshtml/tests/script.c | 9 +++++++++ 3 files changed, 49 insertions(+) diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js new file mode 100644 index 0000000..89fe0a9 --- /dev/null +++ b/dlls/mshtml/tests/documentmode.js @@ -0,0 +1,37 @@ +/* + * Copyright 2016 Jacek Caban for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +function test_doc_mode() { + var opt = parseInt(document.location.search.substring(1)); + + trace("Testing document mode " + opt); + + if(opt > document.documentMode) { + win_skip("Document mode not supported (expected " + opt + " got " + document.documentMode + ")"); + reportSuccess(); + return; + } + + ok(opt === document.documentMode, "documentMode = " + document.documentMode); + + next_test(); +} + +var tests = [ + test_doc_mode +]; diff --git a/dlls/mshtml/tests/rsrc.rc b/dlls/mshtml/tests/rsrc.rc index a9ab563..8b28dfa 100644 --- a/dlls/mshtml/tests/rsrc.rc +++ b/dlls/mshtml/tests/rsrc.rc @@ -40,6 +40,9 @@ navigation.js HTML "navigation.js" /* @makedep: xhr.js */ xhr.js HTML "xhr.js" +/* @makedep: documentmode.js */ +documentmode.js HTML "documentmode.js" + /* @makedep: blank.html */ blank.html HTML "blank.html" diff --git a/dlls/mshtml/tests/script.c b/dlls/mshtml/tests/script.c index eadf737..eda3005 100644 --- a/dlls/mshtml/tests/script.c +++ b/dlls/mshtml/tests/script.c @@ -3320,6 +3320,15 @@ static void run_js_tests(void) run_script_as_http_with_mode("xhr.js", NULL, "11"); run_script_as_http_with_mode("navigation.js", NULL, NULL); run_script_as_http_with_mode("navigation.js", NULL, "11"); + + run_script_as_http_with_mode("documentmode.js", "?5", NULL); + run_script_as_http_with_mode("documentmode.js", "?5", "5"); + run_script_as_http_with_mode("documentmode.js", "?5", "6"); + run_script_as_http_with_mode("documentmode.js", "?7", "7"); + run_script_as_http_with_mode("documentmode.js", "?8", "8"); + run_script_as_http_with_mode("documentmode.js", "?9", "9"); + run_script_as_http_with_mode("documentmode.js", "?10", "10"); + run_script_as_http_with_mode("documentmode.js", "?11", "11"); } static BOOL init_registry(BOOL init)

1 0

Jacek Caban : mshtml: Expose IHTMLDocument6 to IDispatch.
by Alexandre Julliard July 6, 2016

July 6, 2016

Module: wine Branch: master Commit: 73bdf9d92613160e706816549c6d7b7b517fc73b URL: http://source.winehq.org/git/wine.git/?a=commit;h=73bdf9d92613160e706816549… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 5 22:47:21 2016 +0200 mshtml: Expose IHTMLDocument6 to IDispatch. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmldoc.c | 1 + dlls/mshtml/mshtml_private.h | 1 + 2 files changed, 2 insertions(+) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 1c665b7..1c0cc35 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -4781,6 +4781,7 @@ static const tid_t HTMLDocumentNode_iface_tids[] = { IHTMLDocument3_tid, IHTMLDocument4_tid, IHTMLDocument5_tid, + IHTMLDocument6_tid, IDocumentSelector_tid, 0 }; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 89344ed..04a1ccf 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -143,6 +143,7 @@ typedef struct event_target_t event_target_t; XIID(IHTMLDocument3) \ XIID(IHTMLDocument4) \ XIID(IHTMLDocument5) \ + XIID(IHTMLDocument6) \ XIID(IHTMLDOMAttribute) \ XIID(IHTMLDOMAttribute2) \ XIID(IHTMLDOMChildrenCollection) \

1 0