wine-commits July 2016

wine-commits@winehq.org

2 participants
680 discussions

Andrey Gusev : include: Fix a typo in IPStore interface.
by Alexandre Julliard 06 Jul '16

06 Jul '16

Module: wine Branch: master Commit: ca5d6c73fe593c8fa357939ef6d8fd7fc61a5c7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca5d6c73fe593c8fa357939ef… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Tue Jul 5 16:10:32 2016 +0300 include: Fix a typo in IPStore interface. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/pstore.idl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/pstore.idl b/include/pstore.idl index 4f9623e..a963b25 100644 --- a/include/pstore.idl +++ b/include/pstore.idl @@ -255,7 +255,7 @@ interface IPStore : IUnknown [in] const GUID* pItemSubtype, [in] LPCWSTR szItemName, [in] PST_ACCESSMODE ModeFlags, - [in] PPST_PROMPTINFO pProomptInfo, + [in] PPST_PROMPTINFO pPromptInfo, [in] DWORD dwFlags ); HRESULT CloseItem(

1 0

Andrey Gusev : pstorec: Fix a typo in PStore_fnOpenItem declaration.
by Alexandre Julliard 06 Jul '16

06 Jul '16

Module: wine Branch: master Commit: 7691a18476e7f24388915a92601f932aeb737a8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7691a18476e7f24388915a926… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Tue Jul 5 16:10:31 2016 +0300 pstorec: Fix a typo in PStore_fnOpenItem declaration. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/pstorec/pstorec.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/pstorec/pstorec.c b/dlls/pstorec/pstorec.c index 269ebca..593629b 100644 --- a/dlls/pstorec/pstorec.c +++ b/dlls/pstorec/pstorec.c @@ -294,10 +294,10 @@ static HRESULT WINAPI PStore_fnWriteItem( IPStore* This, PST_KEY Key, */ static HRESULT WINAPI PStore_fnOpenItem( IPStore* This, PST_KEY Key, const GUID* pItemType, const GUID* pItemSubtype, LPCWSTR szItemName, - PST_ACCESSMODE ModeFlags, PPST_PROMPTINFO pProomptInfo, DWORD dwFlags ) + PST_ACCESSMODE ModeFlags, PPST_PROMPTINFO pPromptInfo, DWORD dwFlags ) { FIXME("(%p,%08x,%s,%s,%s,%08x,%p,%08x) stub\n", This, Key, debugstr_guid(pItemType), - debugstr_guid(pItemSubtype), debugstr_w(szItemName), ModeFlags, pProomptInfo, dwFlags); + debugstr_guid(pItemSubtype), debugstr_w(szItemName), ModeFlags, pPromptInfo, dwFlags); return E_NOTIMPL; }

1 0

Ken Thomases : winspool.drv: Include <cups/ppd.h> to fix building against the macOS 10.12 SDK.
by Alexandre Julliard 06 Jul '16

06 Jul '16

Module: wine Branch: master Commit: 10065d2acd0a9e1e852a8151c95569b99d1b3294 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10065d2acd0a9e1e852a8151c… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Jun 27 15:34:07 2016 -0500 winspool.drv: Include <cups/ppd.h> to fix building against the macOS 10.12 SDK. The cupsGetPPD() function was moved there from <cups/cups.h> because it's deprecated. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 12 ++++++++++++ configure.ac | 3 ++- dlls/winspool.drv/info.c | 3 +++ include/config.h.in | 3 +++ 4 files changed, 20 insertions(+), 1 deletion(-) diff --git a/configure b/configure index 0e1694c..6379e31 100755 --- a/configure +++ b/configure @@ -13054,6 +13054,18 @@ _ACEOF CUPS_CFLAGS="$ac_cups_cflags" fi + for ac_header in cups/ppd.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "cups/ppd.h" "ac_cv_header_cups_ppd_h" "$ac_includes_default" +if test "x$ac_cv_header_cups_ppd_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_CUPS_PPD_H 1 +_ACEOF + +fi + +done + fi done diff --git a/configure.ac b/configure.ac index 7f234b2..e7c1dd1 100644 --- a/configure.ac +++ b/configure.ac @@ -1543,7 +1543,8 @@ then AC_CHECK_HEADERS(cups/cups.h, [WINE_CHECK_SONAME(cups,cupsGetDefault, [CUPS_CFLAGS="$ac_cups_cflags"],, - [$ac_cups_libs])]) + [$ac_cups_libs]) + AC_CHECK_HEADERS(cups/ppd.h)]) CPPFLAGS="$ac_save_CPPFLAGS" fi WINE_NOTICE_WITH(cups,[test "x$ac_cv_lib_soname_cups" = "x"], diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 95f397c..4dea531 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -44,6 +44,9 @@ #ifdef HAVE_CUPS_CUPS_H # include <cups/cups.h> #endif +#ifdef HAVE_CUPS_PPD_H +# include <cups/ppd.h> +#endif #ifdef HAVE_APPLICATIONSERVICES_APPLICATIONSERVICES_H #define GetCurrentProcess GetCurrentProcess_Mac diff --git a/include/config.h.in b/include/config.h.in index 8cffef9..6fd84bf 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -89,6 +89,9 @@ /* Define to 1 if you have the <cups/cups.h> header file. */ #undef HAVE_CUPS_CUPS_H +/* Define to 1 if you have the <cups/ppd.h> header file. */ +#undef HAVE_CUPS_PPD_H + /* Define to 1 if you have the <curses.h> header file. */ #undef HAVE_CURSES_H

1 0

Jacek Caban : mshtml: Use callback to register additional IDispatch interfaces.
by Alexandre Julliard 06 Jul '16

06 Jul '16

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

Jacek Caban : mshtml: Reimplement IHTMLDocument5:: get_compatMode based on document mode.
by Alexandre Julliard 06 Jul '16

06 Jul '16

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: Added document.documentMode tests.
by Alexandre Julliard 06 Jul '16

06 Jul '16

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: Set compatibility mode based on doctype.
by Alexandre Julliard 06 Jul '16

06 Jul '16

Module: wine Branch: master Commit: 6614df04a8d502c1fc027d14b6b49f41ff0e184d URL: http://source.winehq.org/git/wine.git/?a=commit;h=6614df04a8d502c1fc027d14b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 5 22:47:33 2016 +0200 mshtml: Set compatibility mode based on doctype. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/mutation.c | 11 +++++++++++ dlls/mshtml/nsiface.idl | 15 ++++++++++++++- 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/mutation.c b/dlls/mshtml/mutation.c index dd3d119..a298ecb 100644 --- a/dlls/mshtml/mutation.c +++ b/dlls/mshtml/mutation.c @@ -729,6 +729,17 @@ static void NSAPI nsDocumentObserver_BindToDocument(nsIDocumentObserver *iface, return; } + if(This->document_mode == COMPAT_MODE_QUIRKS) { + nsIDOMDocumentType *nsdoctype; + nsres = nsIContent_QueryInterface(aContent, &IID_nsIDOMDocumentType, (void**)&nsdoctype); + if(NS_SUCCEEDED(nsres)) { + TRACE("doctype node\n"); + /* FIXME: We should set it to something higher for internet zone. */ + set_document_mode(This, COMPAT_MODE_IE7); + nsIDOMDocumentType_Release(nsdoctype); + } + } + nsres = nsIContent_QueryInterface(aContent, &IID_nsIDOMHTMLElement, (void**)&nselem); if(NS_FAILED(nsres)) return; diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl index 1b6104a..e9c717d 100644 --- a/dlls/mshtml/nsiface.idl +++ b/dlls/mshtml/nsiface.idl @@ -134,7 +134,6 @@ typedef nsISupports nsISHistory; typedef nsISupports nsIWidget; typedef nsISupports nsIPrompt; typedef nsISupports nsIAuthPrompt; -typedef nsISupports nsIDOMDocumentType; typedef nsISupports nsIDOMDOMImplementation; typedef nsISupports nsIDOMCDATASection; typedef nsISupports nsIDOMProcessingInstruction; @@ -1201,6 +1200,20 @@ interface nsIDOMComment : nsIDOMCharacterData [ object, + uuid(cd7467b9-0f26-4787-a359-66e80ba8db92), + local +] +interface nsIDOMDocumentType : nsIDOMNode +{ + nsresult GetName(nsAString *aName); + nsresult GetPublicId(nsAString *aPublicId); + nsresult GetSystemId(nsAString *aSystemId); + nsresult GetInternalSubset(nsAString *aInternalSubset); + nsresult MozRemove(); +} + +[ + object, uuid(48eb8d72-95bb-402e-a8fc-f2b187abcbdb), local ]

1 0

Jacek Caban : mshtml: Expose IHTMLDocument6 to IDispatch.
by Alexandre Julliard 06 Jul '16

06 Jul '16

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

Jacek Caban : mshtml: Added IHTMLDocument6:: get_documentMode implementation.
by Alexandre Julliard 06 Jul '16

06 Jul '16

Module: wine Branch: master Commit: 6e2ebcd167d4aaa154425f47c5bb614021ab2b18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e2ebcd167d4aaa154425f47c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 5 22:47:14 2016 +0200 mshtml: Added IHTMLDocument6::get_documentMode implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmldoc.c | 27 +++++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 281c267..1c665b7 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -3053,12 +3053,31 @@ static HRESULT WINAPI HTMLDocument6_get_compatible(IHTMLDocument6 *iface, return E_NOTIMPL; } -static HRESULT WINAPI HTMLDocument6_get_documentMode(IHTMLDocument6 *iface, - VARIANT *p) +static HRESULT WINAPI HTMLDocument6_get_documentMode(IHTMLDocument6 *iface, VARIANT *p) { HTMLDocument *This = impl_from_IHTMLDocument6(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + static const int docmode_values[] = { + 5, /* DOCMODE_QUIRKS */ + 7, /* DOCMODE_IE7 */ + 8, /* DOCMODE_IE8 */ + 9, /* DOCMODE_IE8 */ + 10, /* DOCMODE_IE10 */ + 11 /* DOCMODE_IE11 */ + }; + + TRACE("(%p)->(%p)\n", This, p); + + if(!This->doc_node) { + FIXME("NULL doc_node\n"); + return E_UNEXPECTED; + } + + assert(This->doc_node->document_mode < sizeof(docmode_values)/sizeof(*docmode_values)); + + V_VT(p) = VT_I4; + V_I4(p) = docmode_values[This->doc_node->document_mode]; + return S_OK; } static HRESULT WINAPI HTMLDocument6_get_onstorage(IHTMLDocument6 *iface,

1 0

Jacek Caban : mshtml: Store compatibility mode provided by meta element.
by Alexandre Julliard 06 Jul '16

06 Jul '16

Module: wine Branch: master Commit: bda4b35aa39c9b67374aca38744ad2cd7aee36a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bda4b35aa39c9b67374aca387… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 5 22:47:00 2016 +0200 mshtml: Store compatibility mode provided by meta element. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/mshtml_private.h | 13 ++++++ dlls/mshtml/mutation.c | 94 +++++++++++++++++++++++++++++++++++++++++--- dlls/mshtml/nsiface.idl | 17 ++++++++ 3 files changed, 118 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index d2191e3..89344ed 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -229,6 +229,18 @@ TID_LIST LAST_tid } tid_t; +typedef enum { + COMPAT_MODE_QUIRKS, + COMPAT_MODE_IE7, + COMPAT_MODE_IE8, + COMPAT_MODE_IE9, + COMPAT_MODE_IE10, + COMPAT_MODE_IE11 +} compat_mode_t; + +#define COMPAT_MODE_CNT (COMPAT_MODE_IE11+1) +#define COMPAT_MODE_NONE COMPAT_MODE_QUIRKS + typedef struct dispex_data_t dispex_data_t; typedef struct dispex_dynamic_data_t dispex_dynamic_data_t; @@ -775,6 +787,7 @@ struct HTMLDocumentNode { LONG ref; + compat_mode_t document_mode; HTMLInnerWindow *window; nsIDOMHTMLDocument *nsdoc; diff --git a/dlls/mshtml/mutation.c b/dlls/mshtml/mutation.c index adde295..dd3d119 100644 --- a/dlls/mshtml/mutation.c +++ b/dlls/mshtml/mutation.c @@ -361,6 +361,79 @@ static nsresult run_insert_script(HTMLDocumentNode *doc, nsISupports *script_ifa return NS_OK; } +static void set_document_mode(HTMLDocumentNode *doc, compat_mode_t document_mode) +{ + TRACE("%p: %d\n", doc, document_mode); + doc->document_mode = document_mode; +} + +static BOOL parse_ua_compatible(const WCHAR *p, compat_mode_t *r) +{ + int v = 0; + + if(p[0] != 'I' || p[1] != 'E' || p[2] != '=') + return FALSE; + + p += 3; + while('0' <= *p && *p <= '9') + v = v*10 + *(p++)-'0'; + if(*p || !v) + return FALSE; + + switch(v){ + case 7: + *r = COMPAT_MODE_IE7; + break; + case 8: + *r = COMPAT_MODE_IE8; + break; + case 9: + *r = COMPAT_MODE_IE9; + break; + case 10: + *r = COMPAT_MODE_IE10; + break; + default: + *r = v < 7 ? COMPAT_MODE_QUIRKS : COMPAT_MODE_IE11; + } + + return TRUE; +} + +static void process_meta_element(HTMLDocumentNode *doc, nsIDOMHTMLMetaElement *meta_element) +{ + nsAString http_equiv_str, content_str; + nsresult nsres; + + static const WCHAR x_ua_compatibleW[] = {'x','-','u','a','-','c','o','m','p','a','t','i','b','l','e',0}; + + nsAString_Init(&http_equiv_str, NULL); + nsAString_Init(&content_str, NULL); + nsres = nsIDOMHTMLMetaElement_GetHttpEquiv(meta_element, &http_equiv_str); + if(NS_SUCCEEDED(nsres)) + nsres = nsIDOMHTMLMetaElement_GetContent(meta_element, &content_str); + + if(NS_SUCCEEDED(nsres)) { + const PRUnichar *http_equiv, *content; + + nsAString_GetData(&http_equiv_str, &http_equiv); + nsAString_GetData(&content_str, &content); + + TRACE("%s: %s\n", debugstr_w(http_equiv), debugstr_w(content)); + + if(!strcmpiW(http_equiv, x_ua_compatibleW)) { + compat_mode_t document_mode; + if(parse_ua_compatible(content, &document_mode)) + set_document_mode(doc, document_mode); + else + FIXME("Unsupported document mode %s\n", debugstr_w(content)); + } + } + + nsAString_Finish(&http_equiv_str); + nsAString_Finish(&content_str); +} + typedef struct nsRunnable nsRunnable; typedef nsresult (*runnable_proc_t)(HTMLDocumentNode*,nsISupports*,nsISupports*); @@ -640,18 +713,13 @@ static void NSAPI nsDocumentObserver_BindToDocument(nsIDocumentObserver *iface, nsIDOMHTMLIFrameElement *nsiframe; nsIDOMHTMLFrameElement *nsframe; nsIDOMHTMLScriptElement *nsscript; + nsIDOMHTMLMetaElement *nsmeta; nsIDOMHTMLElement *nselem; nsIDOMComment *nscomment; nsresult nsres; TRACE("(%p)->(%p %p)\n", This, aDocument, aContent); - nsres = nsIContent_QueryInterface(aContent, &IID_nsIDOMHTMLElement, (void**)&nselem); - if(NS_SUCCEEDED(nsres)) { - check_event_attr(This, nselem); - nsIDOMHTMLElement_Release(nselem); - } - nsres = nsIContent_QueryInterface(aContent, &IID_nsIDOMComment, (void**)&nscomment); if(NS_SUCCEEDED(nsres)) { TRACE("comment node\n"); @@ -661,6 +729,13 @@ static void NSAPI nsDocumentObserver_BindToDocument(nsIDocumentObserver *iface, return; } + nsres = nsIContent_QueryInterface(aContent, &IID_nsIDOMHTMLElement, (void**)&nselem); + if(NS_FAILED(nsres)) + return; + + check_event_attr(This, nselem); + nsIDOMHTMLElement_Release(nselem); + nsres = nsIContent_QueryInterface(aContent, &IID_nsIDOMHTMLIFrameElement, (void**)&nsiframe); if(NS_SUCCEEDED(nsres)) { TRACE("iframe node\n"); @@ -695,6 +770,13 @@ static void NSAPI nsDocumentObserver_BindToDocument(nsIDocumentObserver *iface, add_script_runner(This, run_insert_script, (nsISupports*)nsscript, NULL); IHTMLScriptElement_Release(&script_elem->IHTMLScriptElement_iface); + return; + } + + nsres = nsIContent_QueryInterface(aContent, &IID_nsIDOMHTMLMetaElement, (void**)&nsmeta); + if(NS_SUCCEEDED(nsres)) { + process_meta_element(This, nsmeta); + nsIDOMHTMLMetaElement_Release(nsmeta); } } diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl index 7d9fbe8..1b6104a 100644 --- a/dlls/mshtml/nsiface.idl +++ b/dlls/mshtml/nsiface.idl @@ -1146,6 +1146,23 @@ interface nsIDOMHTMLHeadElement : nsISupports [ object, + uuid(2a3f789e-0667-464f-a8d7-6f58513443d9), + local +] +interface nsIDOMHTMLMetaElement : nsISupports +{ + nsresult GetContent(nsAString *aContent); + nsresult SetContent(const nsAString *aContent); + nsresult GetHttpEquiv(nsAString *aHttpEquiv); + nsresult SetHttpEquiv(const nsAString *aHttpEquiv); + nsresult GetName(nsAString *aName); + nsresult SetName(const nsAString *aName); + nsresult GetScheme(nsAString *aScheme); + nsresult SetScheme(const nsAString *aScheme); +} + +[ + object, uuid(4109a2d2-e7af-445d-bb72-c7c9b875f35e), local ]

1 0

← Newer
1
...
49
50
51
52
53
54
55
...
68
Older →

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 July 2016