wine-commits April 2012

wine-commits@winehq.org

2 participants
718 discussions

Jacek Caban : mshtml: Added IHTMLStyle2::overflowX implementation.
by Alexandre Julliard 17 Apr '12

17 Apr '12

Module: wine Branch: master Commit: 5b99a4e88017988c4ffa0db38b9d80326d11f3be URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b99a4e88017988c4ffa0db38… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 17 12:41:27 2012 +0200 mshtml: Added IHTMLStyle2::overflowX implementation. --- dlls/mshtml/htmlstyle.c | 3 +++ dlls/mshtml/htmlstyle.h | 1 + dlls/mshtml/htmlstyle2.c | 12 ++++++++---- dlls/mshtml/tests/style.c | 16 ++++++++++++++++ 4 files changed, 28 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 0ac98b4..9bad1a6 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -134,6 +134,8 @@ static const WCHAR attrMinHeight[] = {'m','i','n','-','h','e','i','g','h','t',0}; static const WCHAR attrOverflow[] = {'o','v','e','r','f','l','o','w',0}; +static const WCHAR attrOverflowX[] = + {'o','v','e','r','f','l','o','w','-','x',0}; static const WCHAR attrPadding[] = {'p','a','d','d','i','n','g',0}; static const WCHAR attrPaddingBottom[] = @@ -229,6 +231,7 @@ static const style_tbl_entry_t style_tbl[] = { {attrMarginTop, DISPID_IHTMLSTYLE_MARGINTOP}, {attrMinHeight, DISPID_IHTMLSTYLE4_MINHEIGHT}, {attrOverflow, DISPID_IHTMLSTYLE_OVERFLOW}, + {attrOverflowX, DISPID_IHTMLSTYLE2_OVERFLOWX}, {attrPadding, DISPID_IHTMLSTYLE_PADDING}, {attrPaddingBottom, DISPID_IHTMLSTYLE_PADDINGBOTTOM}, {attrPaddingLeft, DISPID_IHTMLSTYLE_PADDINGLEFT}, diff --git a/dlls/mshtml/htmlstyle.h b/dlls/mshtml/htmlstyle.h index ef4f2a2..2626eb6 100644 --- a/dlls/mshtml/htmlstyle.h +++ b/dlls/mshtml/htmlstyle.h @@ -83,6 +83,7 @@ typedef enum { STYLEID_MARGIN_TOP, STYLEID_MIN_HEIGHT, STYLEID_OVERFLOW, + STYLEID_OVERFLOW_X, STYLEID_PADDING, STYLEID_PADDING_BOTTOM, STYLEID_PADDING_LEFT, diff --git a/dlls/mshtml/htmlstyle2.c b/dlls/mshtml/htmlstyle2.c index d85ea97..05668f9 100644 --- a/dlls/mshtml/htmlstyle2.c +++ b/dlls/mshtml/htmlstyle2.c @@ -507,15 +507,19 @@ static HRESULT WINAPI HTMLStyle2_get_textAutospace(IHTMLStyle2 *iface, BSTR *p) static HRESULT WINAPI HTMLStyle2_put_overflowX(IHTMLStyle2 *iface, BSTR v) { HTMLStyle *This = impl_from_IHTMLStyle2(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + + return set_nsstyle_attr(This->nsstyle, STYLEID_OVERFLOW_X, v, 0); } static HRESULT WINAPI HTMLStyle2_get_overflowX(IHTMLStyle2 *iface, BSTR *p) { HTMLStyle *This = impl_from_IHTMLStyle2(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_nsstyle_attr(This->nsstyle, STYLEID_OVERFLOW_X, p, 0); } static HRESULT WINAPI HTMLStyle2_put_overflowY(IHTMLStyle2 *iface, BSTR v) diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c index 6a31665..280595e 100644 --- a/dlls/mshtml/tests/style.c +++ b/dlls/mshtml/tests/style.c @@ -344,6 +344,22 @@ static void test_style2(IHTMLStyle2 *style2) hres = IHTMLStyle2_get_bottom(style2, &v); ok(hres == S_OK, "get_bottom failed: %08x\n", hres); test_var_bstr(&v, "4px"); + + /* overflowX */ + str = (void*)0xdeadbeef; + hres = IHTMLStyle2_get_overflowX(style2, &str); + ok(hres == S_OK, "get_overflowX failed: %08x\n", hres); + ok(!str, "overflowX = %s\n", wine_dbgstr_w(str)); + + str = a2bstr("hidden"); + hres = IHTMLStyle2_put_overflowX(style2, str); + ok(hres == S_OK, "put_overflowX failed: %08x\n", hres); + SysFreeString(str); + + str = NULL; + hres = IHTMLStyle2_get_overflowX(style2, &str); + ok(hres == S_OK, "get_overflowX failed: %08x\n", hres); + ok(!strcmp_wa(str, "hidden"), "overflowX = %s\n", wine_dbgstr_w(str)); } static void test_style3(IHTMLStyle3 *style3)

1 0

Jacek Caban : mshtml: Added IHTMLWindow3::detachEvent implementation.
by Alexandre Julliard 17 Apr '12

17 Apr '12

Module: wine Branch: master Commit: c5c94f101f1288cb1c84b61e9ad2742cda2dedf1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5c94f101f1288cb1c84b61e9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 17 12:11:01 2012 +0200 mshtml: Added IHTMLWindow3::detachEvent implementation. --- dlls/mshtml/htmlwindow.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 3ee2273..a0cf108 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -1431,8 +1431,15 @@ static HRESULT WINAPI HTMLWindow3_attachEvent(IHTMLWindow3 *iface, BSTR event, I static HRESULT WINAPI HTMLWindow3_detachEvent(IHTMLWindow3 *iface, BSTR event, IDispatch *pDisp) { HTMLWindow *This = impl_from_IHTMLWindow3(iface); - FIXME("(%p)->()\n", This); - return E_NOTIMPL; + + TRACE("(%p)->()\n", This); + + if(!This->doc) { + FIXME("No document\n"); + return E_FAIL; + } + + return detach_event(This->doc->body_event_target, &This->doc->basedoc, event, pDisp); } static HRESULT window_set_timer(HTMLWindow *This, VARIANT *expr, LONG msec, VARIANT *language,

1 0

Jacek Caban : Added support for shadowing of element pseudo-variables.
by Alexandre Julliard 17 Apr '12

17 Apr '12

Module: wine Branch: master Commit: d9876902124e29bb0f80ff34390b1a2ce9cc52fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9876902124e29bb0f80ff343… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 17 12:10:48 2012 +0200 Added support for shadowing of element pseudo-variables. --- dlls/mshtml/dispex.c | 13 ++++++++++++ dlls/mshtml/htmlwindow.c | 43 +++++++++++++++++++++++++++++----------- dlls/mshtml/mshtml_private.h | 4 ++- dlls/mshtml/tests/jstest.html | 8 +++++++ 4 files changed, 55 insertions(+), 13 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index c42e2ef..66dad69 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -480,6 +480,19 @@ HRESULT dispex_get_dprop_ref(DispatchEx *This, const WCHAR *name, BOOL alloc, VA return S_OK; } +HRESULT dispex_get_dynid(DispatchEx *This, const WCHAR *name, DISPID *id) +{ + dynamic_prop_t *prop; + HRESULT hres; + + hres = get_dynamic_prop(This, name, fdexNameEnsure, &prop); + if(FAILED(hres)) + return hres; + + *id = DISPID_DYNPROP_0 + (prop - This->dynamic_data->props); + return S_OK; +} + static HRESULT dispex_value(DispatchEx *This, LCID lcid, WORD flags, DISPPARAMS *params, VARIANT *res, EXCEPINFO *ei, IServiceProvider *caller) { diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 9069e6d..3ee2273 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -2461,21 +2461,40 @@ static HRESULT HTMLWindow_invoke(DispatchEx *dispex, DISPID id, LCID lcid, WORD IDispatch_Release(disp); break; } - case GLOBAL_ELEMENTVAR: { - IHTMLElement *elem; + case GLOBAL_ELEMENTVAR: + switch(flags) { + case DISPATCH_PROPERTYGET: { + IHTMLElement *elem; - hres = IHTMLDocument3_getElementById(&This->doc->basedoc.IHTMLDocument3_iface, - prop->name, &elem); - if(FAILED(hres)) - return hres; + hres = IHTMLDocument3_getElementById(&This->doc->basedoc.IHTMLDocument3_iface, + prop->name, &elem); + if(FAILED(hres)) + return hres; - if(!elem) - return DISP_E_MEMBERNOTFOUND; + if(!elem) + return DISP_E_MEMBERNOTFOUND; - V_VT(res) = VT_DISPATCH; - V_DISPATCH(res) = (IDispatch*)elem; - break; - } + V_VT(res) = VT_DISPATCH; + V_DISPATCH(res) = (IDispatch*)elem; + return S_OK; + } + case DISPATCH_PROPERTYPUT: { + DISPID dispex_id; + + hres = dispex_get_dynid(&This->dispex, prop->name, &dispex_id); + if(FAILED(hres)) + return hres; + + prop->type = GLOBAL_DISPEXVAR; + prop->id = dispex_id; + return IDispatchEx_InvokeEx(&This->dispex.IDispatchEx_iface, dispex_id, 0, flags, params, res, ei, caller); + } + default: + FIXME("Not suppoted flags: %x\n", flags); + return E_NOTIMPL; + } + case GLOBAL_DISPEXVAR: + return IDispatchEx_InvokeEx(&This->dispex.IDispatchEx_iface, prop->id, 0, flags, params, res, ei, caller); default: ERR("invalid type %d\n", prop->type); hres = DISP_E_MEMBERNOTFOUND; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index c8551fb..3376084 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -229,6 +229,7 @@ BOOL dispex_query_interface(DispatchEx*,REFIID,void**) DECLSPEC_HIDDEN; HRESULT dispex_get_dprop_ref(DispatchEx*,const WCHAR*,BOOL,VARIANT**) DECLSPEC_HIDDEN; HRESULT get_dispids(tid_t,DWORD*,DISPID**) DECLSPEC_HIDDEN; HRESULT remove_prop(DispatchEx*,BSTR,VARIANT_BOOL*) DECLSPEC_HIDDEN; +HRESULT dispex_get_dynid(DispatchEx*,const WCHAR*,DISPID*) DECLSPEC_HIDDEN; void release_typelib(void) DECLSPEC_HIDDEN; HRESULT get_htmldoc_classinfo(ITypeInfo **typeinfo) DECLSPEC_HIDDEN; @@ -248,7 +249,8 @@ typedef struct ScriptHost ScriptHost; typedef enum { GLOBAL_SCRIPTVAR, - GLOBAL_ELEMENTVAR + GLOBAL_ELEMENTVAR, + GLOBAL_DISPEXVAR } global_prop_type_t; typedef struct { diff --git a/dlls/mshtml/tests/jstest.html b/dlls/mshtml/tests/jstest.html index abda45e..10863f4 100644 --- a/dlls/mshtml/tests/jstest.html +++ b/dlls/mshtml/tests/jstest.html @@ -60,6 +60,14 @@ function test_document_name_as_index() { var e = document.getElementById("formid"); ok(!!e, "e is null"); ok(!("formid" in document), "formid is in document"); + + document.body.innerHTML = '<form name="formname"></form>'; + ok("formname" in window, "formname' is not in window"); + ok(typeof(window.formname) === "object", "typeof(window.formname) = " + typeof(window.formname)); + window.formname = 1; + ok(window.formname === 1, "window.formname = " + window.formname); + formname = 2; + ok(window.formname === 2, "window.formname = " + window.formname); } function test_remove_style_attribute() {

1 0

Jacek Caban : mshtml: Added IHTMLDocument2::put_URL implementation.
by Alexandre Julliard 17 Apr '12

17 Apr '12

Module: wine Branch: master Commit: 34b41084a106260e84acad0c120210698dbc022e URL: http://source.winehq.org/git/wine.git/?a=commit;h=34b41084a106260e84acad0c1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 17 12:10:26 2012 +0200 mshtml: Added IHTMLDocument2::put_URL implementation. --- dlls/mshtml/htmldoc.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index a5b20bc..98bdcab 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -595,8 +595,15 @@ static HRESULT WINAPI HTMLDocument_get_lastModified(IHTMLDocument2 *iface, BSTR static HRESULT WINAPI HTMLDocument_put_URL(IHTMLDocument2 *iface, BSTR v) { HTMLDocument *This = impl_from_IHTMLDocument2(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + + if(!This->window) { + FIXME("No window available\n"); + return E_FAIL; + } + + return navigate_url(This->window, v, This->window->url); } static HRESULT WINAPI HTMLDocument_get_URL(IHTMLDocument2 *iface, BSTR *p)

1 0

Dmitry Timoshkov : server: Add access mapping for IO completion objects.
by Alexandre Julliard 17 Apr '12

17 Apr '12

Module: wine Branch: master Commit: 16b7a7f707fd5f38cf5b290d02daed2676120180 URL: http://source.winehq.org/git/wine.git/?a=commit;h=16b7a7f707fd5f38cf5b290d0… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Apr 17 17:02:19 2012 +0900 server: Add access mapping for IO completion objects. --- server/completion.c | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/server/completion.c b/server/completion.c index 2a8f9ac..948d7d1 100644 --- a/server/completion.c +++ b/server/completion.c @@ -53,8 +53,9 @@ struct completion static void completion_dump( struct object*, int ); static struct object_type *completion_get_type( struct object *obj ); +static int completion_signaled( struct object *obj, struct thread *thread ); +static unsigned int completion_map_access( struct object *obj, unsigned int access ); static void completion_destroy( struct object * ); -static int completion_signaled( struct object *obj, struct thread *thread ); static const struct object_ops completion_ops = { @@ -67,7 +68,7 @@ static const struct object_ops completion_ops = no_satisfied, /* satisfied */ no_signal, /* signal */ no_get_fd, /* get_fd */ - no_map_access, /* map_access */ + completion_map_access, /* map_access */ default_get_sd, /* get_sd */ default_set_sd, /* set_sd */ no_lookup_name, /* lookup_name */ @@ -120,6 +121,15 @@ static int completion_signaled( struct object *obj, struct thread *thread ) return !list_empty( &completion->queue ); } +static unsigned int completion_map_access( struct object *obj, unsigned int access ) +{ + if (access & GENERIC_READ) access |= STANDARD_RIGHTS_READ | SYNCHRONIZE | IO_COMPLETION_QUERY_STATE; + if (access & GENERIC_WRITE) access |= STANDARD_RIGHTS_WRITE; + if (access & GENERIC_EXECUTE) access |= STANDARD_RIGHTS_EXECUTE; + if (access & GENERIC_ALL) access |= STANDARD_RIGHTS_ALL | IO_COMPLETION_ALL_ACCESS; + return access & ~(GENERIC_READ | GENERIC_WRITE | GENERIC_EXECUTE | GENERIC_ALL); +} + static struct completion *create_completion( struct directory *root, const struct unicode_str *name, unsigned int attr, unsigned int concurrent ) { struct completion *completion;

1 0

Dmitry Timoshkov : kernel32: Fix some typos, remove not needed casts.
by Alexandre Julliard 17 Apr '12

17 Apr '12

Module: wine Branch: master Commit: d4e57b1598d13fb23843594aefd21eca899ac951 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4e57b1598d13fb23843594ae… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Apr 17 16:59:53 2012 +0900 kernel32: Fix some typos, remove not needed casts. --- dlls/kernel32/tests/virtual.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index 4ca47e0..b537ce0 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -667,7 +667,7 @@ static void test_MapViewOfFile(void) ok(ret, "VirtualQuery failed with error %d\n", GetLastError()); ok(info.BaseAddress == ptr, "BaseAddress should have been %p but was %p instead\n", ptr, info.BaseAddress); ok(info.AllocationBase == ptr, "AllocationBase should have been %p but was %p instead\n", ptr, info.AllocationBase); - ok(info.RegionSize == MAPPING_SIZE, "RegionSize should have been 0x%x but was 0x%x\n", MAPPING_SIZE, (unsigned int)info.RegionSize); + ok(info.RegionSize == MAPPING_SIZE, "RegionSize should have been 0x%x but was 0x%lx\n", MAPPING_SIZE, info.RegionSize); ok(info.State == MEM_RESERVE, "State should have been MEM_RESERVE instead of 0x%x\n", info.State); if (info.Type == MEM_PRIVATE) /* win9x is different for uncommitted mappings */ { @@ -695,7 +695,7 @@ static void test_MapViewOfFile(void) ok(info.AllocationProtect == PAGE_READWRITE, "AllocationProtect should have been PAGE_READWRITE but was 0x%x\n", info.AllocationProtect); ok(info.RegionSize == MAPPING_SIZE, - "RegionSize should have been 0x%x but was 0x%x\n", MAPPING_SIZE, (unsigned int)info.RegionSize); + "RegionSize should have been 0x%x but was 0x%lx\n", MAPPING_SIZE, info.RegionSize); ok(info.State == MEM_RESERVE, "State should have been MEM_RESERVE instead of 0x%x\n", info.State); ok(info.Protect == 0, @@ -711,7 +711,7 @@ static void test_MapViewOfFile(void) ok(ret, "VirtualQuery failed with error %d\n", GetLastError()); ok(info.BaseAddress == ptr, "BaseAddress should have been %p but was %p instead\n", ptr, info.BaseAddress); ok(info.AllocationBase == ptr, "AllocationBase should have been %p but was %p instead\n", ptr, info.AllocationBase); - ok(info.RegionSize == 0x10000, "RegionSize should have been 0x10000 but was 0x%x\n", (unsigned int)info.RegionSize); + ok(info.RegionSize == 0x10000, "RegionSize should have been 0x10000 but was 0x%lx\n", info.RegionSize); ok(info.State == MEM_COMMIT, "State should have been MEM_RESERVE instead of 0x%x\n", info.State); ok(info.Protect == PAGE_READONLY, "Protect should have been 0 instead of 0x%x\n", info.Protect); if (info.Type == MEM_PRIVATE) /* win9x is different for uncommitted mappings */ @@ -740,11 +740,11 @@ static void test_MapViewOfFile(void) ok(info.AllocationProtect == PAGE_READWRITE, "AllocationProtect should have been PAGE_READWRITE but was 0x%x\n", info.AllocationProtect); ok(info.RegionSize == 0x10000, - "RegionSize should have been 0x10000 but was 0x%x\n", (unsigned int)info.RegionSize); + "RegionSize should have been 0x10000 but was 0x%lx\n", info.RegionSize); ok(info.State == MEM_COMMIT, - "State should have been MEM_RESERVE instead of 0x%x\n", info.State); + "State should have been MEM_COMMIT instead of 0x%x\n", info.State); ok(info.Protect == PAGE_READWRITE, - "Protect should have been 0 instead of 0x%x\n", info.Protect); + "Protect should have been PAGE_READWRITE instead of 0x%x\n", info.Protect); ok(info.Type == MEM_MAPPED, "Type should have been MEM_MAPPED instead of 0x%x\n", info.Type); }

1 0

Nikolay Sivov : po: Update Russian translation.
by Alexandre Julliard 17 Apr '12

17 Apr '12

Module: wine Branch: master Commit: d0483ec69d601f34db53be55891f30f8bd9a2b65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0483ec69d601f34db53be558… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 17 09:11:30 2012 +0400 po: Update Russian translation. --- po/ru.po | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/po/ru.po b/po/ru.po index b0eb925..022b8ac 100644 --- a/po/ru.po +++ b/po/ru.po @@ -3458,10 +3458,8 @@ msgid "Expected ')'" msgstr "Ожидается ')'" #: jscript.rc:37 -#, fuzzy -#| msgid "Invalid parameter.\n" msgid "Invalid character" -msgstr "Неверный параметр.\n" +msgstr "Неверный символ" #: jscript.rc:38 msgid "Unterminated string constant"

1 0

Nikolay Sivov : msxml3: Set namespace-prefixes on by default.
by Alexandre Julliard 17 Apr '12

17 Apr '12

Module: wine Branch: master Commit: 9a5da56f561ad5ad476009a778c385bf58f2e6d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a5da56f561ad5ad476009a77… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 17 09:44:44 2012 +0400 msxml3: Set namespace-prefixes on by default. --- dlls/msxml3/saxreader.c | 10 +++++++++- dlls/msxml3/tests/saxreader.c | 4 ++++ 2 files changed, 13 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index e15f3e6..d95550f 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -241,6 +241,11 @@ static const WCHAR FeatureNamespacesW[] = { '/','n','a','m','e','s','p','a','c','e','s',0 }; +static const WCHAR FeatureNamespacePrefixesW[] = { + 'h','t','t','p',':','/','/','x','m','l','.','o','r','g','/','s','a','x','/','f','e','a','t','u','r','e','s', + '/','n','a','m','e','s','p','a','c','e','-','p','r','e','f','i','x','e','s',0 +}; + static inline HRESULT set_feature_value(saxreader *reader, saxreader_features feature, VARIANT_BOOL value) { if (value == VARIANT_TRUE) @@ -2752,6 +2757,9 @@ static HRESULT WINAPI saxxmlreader_getFeature( if (!strcmpW(FeatureNamespacesW, feature)) return get_feature_value(This, Namespaces, value); + if (!strcmpW(FeatureNamespacePrefixesW, feature)) + return get_feature_value(This, NamespacePrefixes, value); + FIXME("(%p)->(%s %p) stub\n", This, debugstr_w(feature), value); return E_NOTIMPL; } @@ -3188,7 +3196,7 @@ HRESULT SAXXMLReader_create(MSXML_VERSION version, IUnknown *outer, LPVOID *ppOb reader->pool.pool = NULL; reader->pool.index = 0; reader->pool.len = 0; - reader->features = Namespaces; + reader->features = Namespaces | NamespacePrefixes; reader->version = version; init_dispex(&reader->dispex, (IUnknown*)&reader->IVBSAXXMLReader_iface, &saxreader_dispex); diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index 41e3775..aa3b2a5 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -2109,7 +2109,11 @@ static void test_saxreader_features(void) value = 0xc; hr = ISAXXMLReader_getFeature(reader, _bstr_("http://xml.org/sax/features/namespaces"), &value); EXPECT_HR(hr, S_OK); + ok(entry->value == value, "%s: got wrong default value %x, expected %x\n", entry->clsid, value, entry->value); + value = 0xc; + hr = ISAXXMLReader_getFeature(reader, _bstr_("http://xml.org/sax/features/namespace-prefixes"), &value); + EXPECT_HR(hr, S_OK); ok(entry->value == value, "%s: got wrong default value %x, expected %x\n", entry->clsid, value, entry->value); ISAXXMLReader_Release(reader);

1 0

Nikolay Sivov : msxml3: Added getIndexFromName() implementation for SAXAttributes.
by Alexandre Julliard 17 Apr '12

17 Apr '12

Module: wine Branch: master Commit: 8dcd01bbeb0b82b8dc28338500ea19f680c080eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=8dcd01bbeb0b82b8dc2833850… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 16 10:29:34 2012 +0400 msxml3: Added getIndexFromName() implementation for SAXAttributes. --- dlls/msxml3/mxwriter.c | 30 +++++++++++-- dlls/msxml3/tests/saxreader.c | 96 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 121 insertions(+), 5 deletions(-) diff --git a/dlls/msxml3/mxwriter.c b/dlls/msxml3/mxwriter.c index a5b9684..603517e 100644 --- a/dlls/msxml3/mxwriter.c +++ b/dlls/msxml3/mxwriter.c @@ -1827,13 +1827,33 @@ static HRESULT WINAPI SAXAttributes_getName(ISAXAttributes *iface, int nIndex, c return E_NOTIMPL; } -static HRESULT WINAPI SAXAttributes_getIndexFromName(ISAXAttributes *iface, const WCHAR * pUri, int cUriLength, - const WCHAR * pLocalName, int cocalNameLength, int * index) +static HRESULT WINAPI SAXAttributes_getIndexFromName(ISAXAttributes *iface, const WCHAR *uri, int uri_len, + const WCHAR *name, int len, int *index) { mxattributes *This = impl_from_ISAXAttributes( iface ); - FIXME("(%p)->(%s:%d %s:%d %p): stub\n", This, debugstr_wn(pUri, cUriLength), cUriLength, - debugstr_wn(pLocalName, cocalNameLength), cocalNameLength, index); - return E_NOTIMPL; + int i; + + TRACE("(%p)->(%s:%d %s:%d %p)\n", This, debugstr_wn(uri, uri_len), uri_len, + debugstr_wn(name, len), len, index); + + if (!index && (This->class_version == MSXML_DEFAULT || This->class_version == MSXML3)) + return E_POINTER; + + if (!uri || !name || !index) return E_INVALIDARG; + + for (i = 0; i < This->length; i++) + { + if (uri_len != SysStringLen(This->attr[i].uri)) continue; + if (strncmpW(uri, This->attr[i].uri, uri_len)) continue; + + if (len != SysStringLen(This->attr[i].local)) continue; + if (strncmpW(name, This->attr[i].local, len)) continue; + + *index = i; + return S_OK; + } + + return E_INVALIDARG; } static HRESULT WINAPI SAXAttributes_getIndexFromQName(ISAXAttributes *iface, const WCHAR *qname, diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index afe887c..41e3775 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -4175,6 +4175,101 @@ static void test_mxattr_qi(void) IVBSAXAttributes_Release(vbsaxattr2); } +static struct msxmlsupported_data_t saxattr_support_data[] = +{ + { &CLSID_SAXAttributes, "SAXAttributes" }, + { &CLSID_SAXAttributes30, "SAXAttributes30" }, + { &CLSID_SAXAttributes40, "SAXAttributes40" }, + { &CLSID_SAXAttributes60, "SAXAttributes60" }, + { NULL } +}; + +static void test_mxattr_localname(void) +{ + static const WCHAR localname1W[] = {'l','o','c','a','l','n','a','m','e','1',0}; + static const WCHAR localnameW[] = {'l','o','c','a','l','n','a','m','e',0}; + static const WCHAR uri1W[] = {'u','r','i','1',0}; + static const WCHAR uriW[] = {'u','r','i',0}; + + const struct msxmlsupported_data_t *table = saxattr_support_data; + + while (table->clsid) + { + ISAXAttributes *saxattr; + IMXAttributes *mxattr; + HRESULT hr; + int index; + + if (!is_clsid_supported(table->clsid, mxattributes_support_data)) + { + table++; + continue; + } + + hr = CoCreateInstance(table->clsid, NULL, CLSCTX_INPROC_SERVER, + &IID_IMXAttributes, (void**)&mxattr); + EXPECT_HR(hr, S_OK); + + hr = IMXAttributes_QueryInterface(mxattr, &IID_ISAXAttributes, (void**)&saxattr); + EXPECT_HR(hr, S_OK); + + hr = ISAXAttributes_getIndexFromName(saxattr, NULL, 0, NULL, 0, &index); + EXPECT_HR(hr, E_INVALIDARG); + + /* add some ambiguos attribute names */ + hr = IMXAttributes_addAttribute(mxattr, _bstr_("uri"), _bstr_("localname"), + _bstr_("a:localname"), _bstr_(""), _bstr_("value")); + EXPECT_HR(hr, S_OK); + hr = IMXAttributes_addAttribute(mxattr, _bstr_("uri"), _bstr_("localname"), + _bstr_("b:localname"), _bstr_(""), _bstr_("value")); + EXPECT_HR(hr, S_OK); + + index = -1; + hr = ISAXAttributes_getIndexFromName(saxattr, uriW, lstrlenW(uriW), localnameW, lstrlenW(localnameW), &index); + EXPECT_HR(hr, S_OK); + ok(index == 0, "%s: got index %d\n", table->name, index); + + index = -1; + hr = ISAXAttributes_getIndexFromName(saxattr, uri1W, lstrlenW(uri1W), localnameW, lstrlenW(localnameW), &index); + EXPECT_HR(hr, E_INVALIDARG); + ok(index == -1, "%s: got index %d\n", table->name, index); + + index = -1; + hr = ISAXAttributes_getIndexFromName(saxattr, uriW, lstrlenW(uriW), localname1W, lstrlenW(localname1W), &index); + EXPECT_HR(hr, E_INVALIDARG); + ok(index == -1, "%s: got index %d\n", table->name, index); + + if (IsEqualGUID(table->clsid, &CLSID_SAXAttributes) || + IsEqualGUID(table->clsid, &CLSID_SAXAttributes30)) + { + hr = ISAXAttributes_getIndexFromName(saxattr, NULL, 0, NULL, 0, NULL); + EXPECT_HR(hr, E_POINTER); + + hr = ISAXAttributes_getIndexFromName(saxattr, uriW, lstrlenW(uriW), localname1W, lstrlenW(localname1W), NULL); + EXPECT_HR(hr, E_POINTER); + } + else + { + hr = ISAXAttributes_getIndexFromName(saxattr, NULL, 0, NULL, 0, NULL); + EXPECT_HR(hr, E_INVALIDARG); + + hr = ISAXAttributes_getIndexFromName(saxattr, uriW, lstrlenW(uriW), localname1W, lstrlenW(localname1W), NULL); + EXPECT_HR(hr, E_INVALIDARG); + } + + hr = ISAXAttributes_getIndexFromName(saxattr, uriW, lstrlenW(uriW), NULL, 0, &index); + EXPECT_HR(hr, E_INVALIDARG); + + hr = ISAXAttributes_getIndexFromName(saxattr, NULL, 0, localname1W, lstrlenW(localname1W), &index); + EXPECT_HR(hr, E_INVALIDARG); + + table++; + + ISAXAttributes_Release(saxattr); + IMXAttributes_Release(mxattr); + } +} + START_TEST(saxreader) { ISAXXMLReader *reader; @@ -4233,6 +4328,7 @@ START_TEST(saxreader) test_mxattr_qi(); test_mxattr_addAttribute(); test_mxattr_clear(); + test_mxattr_localname(); test_mxattr_dispex(); } else

1 0

Nikolay Sivov : msxml3: Added IMXAttributes::clear().
by Alexandre Julliard 17 Apr '12

17 Apr '12

Module: wine Branch: master Commit: 6f95c6990af0e009ad43d2cb06e4c3e0629190c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f95c6990af0e009ad43d2cb0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 16 09:32:03 2012 +0400 msxml3: Added IMXAttributes::clear(). --- dlls/msxml3/mxwriter.c | 19 +++++++++++++++++-- dlls/msxml3/tests/saxreader.c | 8 ++++---- 2 files changed, 21 insertions(+), 6 deletions(-) diff --git a/dlls/msxml3/mxwriter.c b/dlls/msxml3/mxwriter.c index 41979e6..a5b9684 100644 --- a/dlls/msxml3/mxwriter.c +++ b/dlls/msxml3/mxwriter.c @@ -1665,8 +1665,23 @@ static HRESULT WINAPI MXAttributes_addAttributeFromIndex(IMXAttributes *iface, static HRESULT WINAPI MXAttributes_clear(IMXAttributes *iface) { mxattributes *This = impl_from_IMXAttributes( iface ); - FIXME("(%p): stub\n", This); - return E_NOTIMPL; + int i; + + TRACE("(%p)\n", This); + + for (i = 0; i < This->length; i++) + { + SysFreeString(This->attr[i].qname); + SysFreeString(This->attr[i].local); + SysFreeString(This->attr[i].uri); + SysFreeString(This->attr[i].type); + SysFreeString(This->attr[i].value); + memset(&This->attr[i], 0, sizeof(mxattribute)); + } + + This->length = 0; + + return S_OK; } static HRESULT WINAPI MXAttributes_removeAttribute(IMXAttributes *iface, int index) diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index 4e2bd11..afe887c 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -4068,6 +4068,9 @@ static void test_mxattr_clear(void) hr = ISAXAttributes_getQName(saxattr, 0, &ptr, &len); EXPECT_HR(hr, E_INVALIDARG); + hr = IMXAttributes_clear(mxattr); + EXPECT_HR(hr, S_OK); + hr = IMXAttributes_addAttribute(mxattr, _bstr_("uri"), _bstr_("local"), _bstr_("qname"), _bstr_("type"), _bstr_("value")); EXPECT_HR(hr, S_OK); @@ -4094,23 +4097,20 @@ static void test_mxattr_clear(void) ok(!lstrcmpW(ptr, _bstr_("qname")), "got %s\n", wine_dbgstr_w(ptr)); hr = IMXAttributes_clear(mxattr); -todo_wine EXPECT_HR(hr, S_OK); len = -1; hr = ISAXAttributes_getLength(saxattr, &len); EXPECT_HR(hr, S_OK); -todo_wine ok(len == 0, "got %d\n", len); len = -1; ptr = (void*)0xdeadbeef; hr = ISAXAttributes_getQName(saxattr, 0, &ptr, &len); -todo_wine { EXPECT_HR(hr, E_INVALIDARG); ok(len == -1, "got %d\n", len); ok(ptr == (void*)0xdeadbeef, "got %p\n", ptr); -} + IMXAttributes_Release(mxattr); ISAXAttributes_Release(saxattr); free_bstrs();

1 0

← Newer
1
...
28
29
30
31
32
33
34
...
72
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 April 2012