June 2014 - Wine-commits - list.winehq.org

Nikolay Sivov : propsys: Implement PSGetPropertySystem().
by Alexandre Julliard 11 Jun '14

11 Jun '14

Module: wine Branch: master Commit: d897b32598db0864a2188adc12fb3cca66f648ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=d897b32598db0864a2188adc1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 26 21:03:54 2014 +0400 propsys: Implement PSGetPropertySystem(). --- dlls/propsys/propsys.spec | 2 +- dlls/propsys/propsys_main.c | 108 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 109 insertions(+), 1 deletion(-) diff --git a/dlls/propsys/propsys.spec b/dlls/propsys/propsys.spec index a64d53a..92b6d7c 100644 --- a/dlls/propsys/propsys.spec +++ b/dlls/propsys/propsys.spec @@ -84,7 +84,7 @@ @ stdcall PSGetPropertyDescriptionListFromString(ptr ptr ptr) @ stub PSGetPropertyFromPropertyStorage @ stub PSGetPropertyKeyFromName -@ stub PSGetPropertySystem +@ stdcall PSGetPropertySystem(ptr ptr) @ stub PSGetPropertyValue @ stub PSLookupPropertyHandlerCLSID @ stdcall PSPropertyKeyFromString(wstr ptr) diff --git a/dlls/propsys/propsys_main.c b/dlls/propsys/propsys_main.c index ad96aab..4bb9d26 100644 --- a/dlls/propsys/propsys_main.c +++ b/dlls/propsys/propsys_main.c @@ -139,6 +139,114 @@ HRESULT WINAPI DllCanUnloadNow(void) return S_FALSE; } +static HRESULT WINAPI propsys_QueryInterface(IPropertySystem *iface, REFIID riid, void **obj) +{ + *obj = NULL; + + if (IsEqualIID(riid, &IID_IPropertySystem) || IsEqualIID(riid, &IID_IUnknown)) { + *obj = iface; + IPropertySystem_AddRef(iface); + return S_OK; + } + + FIXME("%s\n", debugstr_guid(riid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI propsys_AddRef(IPropertySystem *iface) +{ + return 2; +} + +static ULONG WINAPI propsys_Release(IPropertySystem *iface) +{ + return 1; +} + +static HRESULT WINAPI propsys_GetPropertyDescription(IPropertySystem *iface, + REFPROPERTYKEY propkey, REFIID riid, void **ppv) +{ + FIXME("%p %s %p: stub\n", propkey, debugstr_guid(riid), ppv); + return E_NOTIMPL; +} + +static HRESULT WINAPI propsys_GetPropertyDescriptionByName(IPropertySystem *iface, + LPCWSTR canonical_name, REFIID riid, void **ppv) +{ + FIXME("%s %s %p: stub\n", debugstr_w(canonical_name), debugstr_guid(riid), ppv); + return E_NOTIMPL; +} + +static HRESULT WINAPI propsys_GetPropertyDescriptionListFromString(IPropertySystem *iface, + LPCWSTR proplist, REFIID riid, void **ppv) +{ + FIXME("%s %s %p: stub\n", debugstr_w(proplist), debugstr_guid(riid), ppv); + return E_NOTIMPL; +} + +static HRESULT WINAPI propsys_EnumeratePropertyDescriptions(IPropertySystem *iface, + PROPDESC_ENUMFILTER filter, REFIID riid, void **ppv) +{ + FIXME("%d %s %p: stub\n", filter, debugstr_guid(riid), ppv); + return E_NOTIMPL; +} + +static HRESULT WINAPI propsys_FormatForDisplay(IPropertySystem *iface, + REFPROPERTYKEY key, REFPROPVARIANT propvar, PROPDESC_FORMAT_FLAGS flags, + LPWSTR dest, DWORD destlen) +{ + FIXME("%p %p %x %p %d: stub\n", key, propvar, flags, dest, destlen); + return E_NOTIMPL; +} + +static HRESULT WINAPI propsys_FormatForDisplayAlloc(IPropertySystem *iface, + REFPROPERTYKEY key, REFPROPVARIANT propvar, PROPDESC_FORMAT_FLAGS flags, + LPWSTR *text) +{ + FIXME("%p %p %x %p: stub\n", key, propvar, flags, text); + return E_NOTIMPL; +} + +static HRESULT WINAPI propsys_RegisterPropertySchema(IPropertySystem *iface, LPCWSTR path) +{ + FIXME("%s: stub\n", debugstr_w(path)); + return E_NOTIMPL; +} + +static HRESULT WINAPI propsys_UnregisterPropertySchema(IPropertySystem *iface, LPCWSTR path) +{ + FIXME("%s: stub\n", debugstr_w(path)); + return E_NOTIMPL; +} + +static HRESULT WINAPI propsys_RefreshPropertySchema(IPropertySystem *iface) +{ + FIXME("refresh: stub\n"); + return E_NOTIMPL; +} + +static const IPropertySystemVtbl propsysvtbl = { + propsys_QueryInterface, + propsys_AddRef, + propsys_Release, + propsys_GetPropertyDescription, + propsys_GetPropertyDescriptionByName, + propsys_GetPropertyDescriptionListFromString, + propsys_EnumeratePropertyDescriptions, + propsys_FormatForDisplay, + propsys_FormatForDisplayAlloc, + propsys_RegisterPropertySchema, + propsys_UnregisterPropertySchema, + propsys_RefreshPropertySchema +}; + +static IPropertySystem propsys = { &propsysvtbl }; + +HRESULT WINAPI PSGetPropertySystem(REFIID riid, void **obj) +{ + return IPropertySystem_QueryInterface(&propsys, riid, obj); +} + HRESULT WINAPI PSRegisterPropertySchema(PCWSTR path) { FIXME("%s stub\n", debugstr_w(path));

1 0

Nikolay Sivov : propsys: Forward corresponding methods to exports.
by Alexandre Julliard 11 Jun '14

11 Jun '14

Module: wine Branch: master Commit: 47de869fda08f564d45bb48ea2983458a1965de7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47de869fda08f564d45bb48ea… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 27 15:13:49 2014 +0400 propsys: Forward corresponding methods to exports. --- dlls/propsys/propsys_main.c | 15 +++++---------- include/propsys.idl | 2 ++ 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/dlls/propsys/propsys_main.c b/dlls/propsys/propsys_main.c index 4bb9d26..6713adf 100644 --- a/dlls/propsys/propsys_main.c +++ b/dlls/propsys/propsys_main.c @@ -166,8 +166,7 @@ static ULONG WINAPI propsys_Release(IPropertySystem *iface) static HRESULT WINAPI propsys_GetPropertyDescription(IPropertySystem *iface, REFPROPERTYKEY propkey, REFIID riid, void **ppv) { - FIXME("%p %s %p: stub\n", propkey, debugstr_guid(riid), ppv); - return E_NOTIMPL; + return PSGetPropertyDescription(propkey, riid, ppv); } static HRESULT WINAPI propsys_GetPropertyDescriptionByName(IPropertySystem *iface, @@ -180,8 +179,7 @@ static HRESULT WINAPI propsys_GetPropertyDescriptionByName(IPropertySystem *ifac static HRESULT WINAPI propsys_GetPropertyDescriptionListFromString(IPropertySystem *iface, LPCWSTR proplist, REFIID riid, void **ppv) { - FIXME("%s %s %p: stub\n", debugstr_w(proplist), debugstr_guid(riid), ppv); - return E_NOTIMPL; + return PSGetPropertyDescriptionListFromString(proplist, riid, ppv); } static HRESULT WINAPI propsys_EnumeratePropertyDescriptions(IPropertySystem *iface, @@ -209,20 +207,17 @@ static HRESULT WINAPI propsys_FormatForDisplayAlloc(IPropertySystem *iface, static HRESULT WINAPI propsys_RegisterPropertySchema(IPropertySystem *iface, LPCWSTR path) { - FIXME("%s: stub\n", debugstr_w(path)); - return E_NOTIMPL; + return PSRegisterPropertySchema(path); } static HRESULT WINAPI propsys_UnregisterPropertySchema(IPropertySystem *iface, LPCWSTR path) { - FIXME("%s: stub\n", debugstr_w(path)); - return E_NOTIMPL; + return PSUnregisterPropertySchema(path); } static HRESULT WINAPI propsys_RefreshPropertySchema(IPropertySystem *iface) { - FIXME("refresh: stub\n"); - return E_NOTIMPL; + return PSRefreshPropertySchema(); } static const IPropertySystemVtbl propsysvtbl = { diff --git a/include/propsys.idl b/include/propsys.idl index 0117090..04d3fbf 100644 --- a/include/propsys.idl +++ b/include/propsys.idl @@ -804,6 +804,8 @@ cpp_quote("HRESULT WINAPI PSPropertyKeyFromString(LPCWSTR,PROPERTYKEY*);") cpp_quote("HRESULT WINAPI PSGetPropertyDescription(REFPROPERTYKEY,REFIID,void **);") cpp_quote("HRESULT WINAPI PSGetPropertyDescriptionListFromString(LPCWSTR,REFIID,void **);") cpp_quote("HRESULT WINAPI PSRefreshPropertySchema(void);") +cpp_quote("HRESULT WINAPI PSRegisterPropertySchema(LPCWSTR);") +cpp_quote("HRESULT WINAPI PSUnregisterPropertySchema(LPCWSTR);") /* TODO: Add remainder of the C api here */

1 0

Huw Davies : crypt32: Add a new element to SIP_ADD_NEWPROVIDER.
by Alexandre Julliard 11 Jun '14

11 Jun '14

Module: wine Branch: master Commit: f4f01301f0007442ae5f40650615f2e00a5fbc94 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4f01301f0007442ae5f40650… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue May 27 13:25:01 2014 +0100 crypt32: Add a new element to SIP_ADD_NEWPROVIDER. --- dlls/crypt32/sip.c | 2 +- dlls/msisip/main.c | 1 + dlls/wintrust/register.c | 1 + include/mssip.h | 3 +++ 4 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/crypt32/sip.c b/dlls/crypt32/sip.c index 4a32cad..8b561fd 100644 --- a/dlls/crypt32/sip.c +++ b/dlls/crypt32/sip.c @@ -210,7 +210,7 @@ BOOL WINAPI CryptSIPAddProvider(SIP_ADD_NEWPROVIDER *psNewProv) TRACE("%p\n", psNewProv); if (!psNewProv || - psNewProv->cbStruct != sizeof(SIP_ADD_NEWPROVIDER) || + psNewProv->cbStruct < FIELD_OFFSET(SIP_ADD_NEWPROVIDER, pwszGetCapFuncName) || !psNewProv->pwszGetFuncName || !psNewProv->pwszPutFuncName || !psNewProv->pwszCreateFuncName || diff --git a/dlls/msisip/main.c b/dlls/msisip/main.c index 0b4d2c3..882db3d 100644 --- a/dlls/msisip/main.c +++ b/dlls/msisip/main.c @@ -81,6 +81,7 @@ HRESULT WINAPI DllRegisterServer(void) prov.pwszVerifyFuncName = verifyIndirectData; prov.pwszRemoveFuncName = removeSignedDataMsg; prov.pwszIsFunctionNameFmt2 = isMyTypeOfFile; + prov.pwszGetCapFuncName = NULL; return CryptSIPAddProvider(&prov) ? S_OK : S_FALSE; } diff --git a/dlls/wintrust/register.c b/dlls/wintrust/register.c index f039fbd..9981fbc 100644 --- a/dlls/wintrust/register.c +++ b/dlls/wintrust/register.c @@ -911,6 +911,7 @@ static BOOL WINTRUST_SIPPAddProvider(GUID* Subject, WCHAR* MagicNumber) NewProv.pwszVerifyFuncName = CryptSIPVerifyIndirectData; NewProv.pwszRemoveFuncName = CryptSIPRemoveSignedDataMsg; NewProv.pwszIsFunctionNameFmt2 = NULL; + NewProv.pwszGetCapFuncName = NULL; Ret = CryptSIPAddProvider(&NewProv); diff --git a/include/mssip.h b/include/mssip.h index b0b21a6..c14f02d 100644 --- a/include/mssip.h +++ b/include/mssip.h @@ -156,6 +156,9 @@ typedef struct SIP_ADD_NEWPROVIDER_ WCHAR *pwszRemoveFuncName; WCHAR *pwszIsFunctionNameFmt2; + + /* NTDDI_VERSION >= NTDDI_WIN8 */ + WCHAR *pwszGetCapFuncName; } SIP_ADD_NEWPROVIDER, *PSIP_ADD_NEWPROVIDER; #include <poppack.h>

1 0

Huw Davies : crypt32/tests: Fix test failure on win 8.
by Alexandre Julliard 11 Jun '14

11 Jun '14

Module: wine Branch: master Commit: 54129a5171c7bd9f7f4a29bb6aec71b7d6ba54a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=54129a5171c7bd9f7f4a29bb6… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue May 27 13:25:02 2014 +0100 crypt32/tests: Fix test failure on win 8. --- dlls/crypt32/tests/sip.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/crypt32/tests/sip.c b/dlls/crypt32/tests/sip.c index 212c24b..0677903 100644 --- a/dlls/crypt32/tests/sip.c +++ b/dlls/crypt32/tests/sip.c @@ -119,6 +119,9 @@ static void test_AddRemoveProvider(void) newprov.pwszRemoveFuncName = dummyfunction; newprov.pwszIsFunctionNameFmt2 = dummyfunction; newprov.pwszIsFunctionName = dummyfunction; + /* If GetCapFuncName set to NULL, then CryptSIPRemoveProvider fails on win 8 */ + newprov.pwszGetCapFuncName = dummyfunction; + SetLastError(0xdeadbeef); ret = CryptSIPAddProvider(&newprov); ok ( ret, "CryptSIPAddProvider should have succeeded, last error %d\n", GetLastError());

1 0

Jacek Caban : mshtml: Call unlink from HTMLDOMNode::Release.
by Alexandre Julliard 11 Jun '14

11 Jun '14

Module: wine Branch: master Commit: 4745fd03d4c246be377214fb6d7d39f599b9439d URL: http://source.winehq.org/git/wine.git/?a=commit;h=4745fd03d4c246be377214fb6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 27 11:28:44 2014 +0200 mshtml: Call unlink from HTMLDOMNode::Release. --- dlls/mshtml/htmldoc.c | 6 +----- dlls/mshtml/htmlnode.c | 2 ++ 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index dd4949f..a9db920 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -4330,11 +4330,7 @@ static void HTMLDocumentNode_destructor(HTMLDOMNode *iface) This->nsnode_selector = NULL; } - if(This->nsdoc) { - assert(!This->window); - release_document_mutation(This); - nsIDOMHTMLDocument_Release(This->nsdoc); - }else if(This->window) { + if(!This->nsdoc && This->window) { /* document fragments own reference to inner window */ IHTMLWindow2_Release(&This->window->base.IHTMLWindow2_iface); This->window = NULL; diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index 42e7c6a..a89b0ca 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -492,6 +492,8 @@ static ULONG WINAPI HTMLDOMNode_Release(IHTMLDOMNode *iface) TRACE("(%p) ref=%d\n", This, ref); if(!ref) { + if(This->vtbl->unlink) + This->vtbl->unlink(This); This->vtbl->destructor(This); release_dispex(&This->dispex); heap_free(This);

1 0

Jacek Caban : mshtml: Added new helper for getting element attribute value and use it in script.c.
by Alexandre Julliard 11 Jun '14

11 Jun '14

Module: wine Branch: master Commit: 39e24713e9f18e1216be7285b1f17fd8b9393364 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39e24713e9f18e1216be7285b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 27 11:28:56 2014 +0200 mshtml: Added new helper for getting element attribute value and use it in script.c. --- dlls/mshtml/htmlelem.c | 19 +++++++++++++++++++ dlls/mshtml/mshtml_private.h | 2 ++ dlls/mshtml/script.c | 18 +++++------------- 3 files changed, 26 insertions(+), 13 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 04ca05c..6a9d396 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -156,6 +156,25 @@ HRESULT replace_node_by_html(nsIDOMHTMLDocument *nsdoc, nsIDOMNode *nsnode, cons return hres; } +nsresult get_elem_attr_value(nsIDOMHTMLElement *nselem, const WCHAR *name, nsAString *val_str, const PRUnichar **val) +{ + nsAString name_str; + nsresult nsres; + + nsAString_InitDepend(&name_str, name); + nsAString_Init(val_str, NULL); + nsres = nsIDOMHTMLElement_GetAttribute(nselem, &name_str, val_str); + nsAString_Finish(&name_str); + if(NS_FAILED(nsres)) { + ERR("GetAttribute(%s) failed: %08x\n", debugstr_w(name), nsres); + nsAString_Finish(val_str); + return nsres; + } + + nsAString_GetData(val_str, val); + return NS_OK; +} + typedef struct { DispatchEx dispex; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 068c18e..3181ee2 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -959,6 +959,8 @@ 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; +nsresult get_elem_attr_value(nsIDOMHTMLElement*,const WCHAR*,nsAString*,const PRUnichar**) DECLSPEC_HIDDEN; + /* commands */ typedef struct { DWORD id; diff --git a/dlls/mshtml/script.c b/dlls/mshtml/script.c index 4d49587..e5f4ab1 100644 --- a/dlls/mshtml/script.c +++ b/dlls/mshtml/script.c @@ -784,7 +784,7 @@ static void parse_script_elem(ScriptHost *script_host, HTMLScriptElement *script return; } }else { - ERR("GetAttribute(event) failed: %08x\n", nsres); + ERR("GetEvent failed: %08x\n", nsres); } nsAString_Finish(&event_str); @@ -849,7 +849,8 @@ static BOOL get_guid_from_language(LPCWSTR type, GUID *guid) static BOOL get_script_guid(HTMLInnerWindow *window, nsIDOMHTMLScriptElement *nsscript, GUID *guid) { - nsAString attr_str, val_str; + const PRUnichar *language; + nsAString val_str; BOOL ret = FALSE; nsresult nsres; @@ -871,26 +872,17 @@ static BOOL get_script_guid(HTMLInnerWindow *window, nsIDOMHTMLScriptElement *ns ERR("GetType failed: %08x\n", nsres); } - nsAString_InitDepend(&attr_str, languageW); - nsres = nsIDOMHTMLScriptElement_GetAttribute(nsscript, &attr_str, &val_str); - nsAString_Finish(&attr_str); + nsres = get_elem_attr_value((nsIDOMHTMLElement*)nsscript, languageW, &val_str, &language); if(NS_SUCCEEDED(nsres)) { - const PRUnichar *language; - - nsAString_GetData(&val_str, &language); - if(*language) { ret = get_guid_from_language(language, guid); }else { *guid = get_default_script_guid(window); ret = TRUE; } - }else { - ERR("GetAttribute(language) failed: %08x\n", nsres); + nsAString_Finish(&val_str); } - nsAString_Finish(&val_str); - return ret; }

1 0

Jacek Caban : mshtml: Added new helper for GetAttribute based getters and use it in IHTMLMetaElement implementation.
by Alexandre Julliard 11 Jun '14

11 Jun '14

Module: wine Branch: master Commit: b79ef6769bb841d34cfdb876e41ed93b14c724b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b79ef6769bb841d34cfdb876e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 27 11:29:04 2014 +0200 mshtml: Added new helper for GetAttribute based getters and use it in IHTMLMetaElement implementation. --- dlls/mshtml/htmlelem.c | 17 +++++++++++++++++ dlls/mshtml/htmlmeta.c | 30 +++--------------------------- dlls/mshtml/mshtml_private.h | 1 + 3 files changed, 21 insertions(+), 27 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 6a9d396..8e246fe 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -175,6 +175,23 @@ nsresult get_elem_attr_value(nsIDOMHTMLElement *nselem, const WCHAR *name, nsASt return NS_OK; } +HRESULT elem_string_attr_getter(HTMLElement *elem, const WCHAR *name, BSTR *p) +{ + const PRUnichar *val; + nsAString val_str; + nsresult nsres; + + nsres = get_elem_attr_value(elem->nselem, name, &val_str, &val); + if(NS_FAILED(nsres)) + return E_FAIL; + + TRACE("%s: returning %s\n", debugstr_w(name), debugstr_w(val)); + + *p = SysAllocString(val); + nsAString_Finish(&val_str); + return *p ? S_OK : E_OUTOFMEMORY; +} + typedef struct { DispatchEx dispex; diff --git a/dlls/mshtml/htmlmeta.c b/dlls/mshtml/htmlmeta.c index b4ff82e..e9783c8 100644 --- a/dlls/mshtml/htmlmeta.c +++ b/dlls/mshtml/htmlmeta.c @@ -104,19 +104,11 @@ static HRESULT WINAPI HTMLMetaElement_put_httpEquiv(IHTMLMetaElement *iface, BST static HRESULT WINAPI HTMLMetaElement_get_httpEquiv(IHTMLMetaElement *iface, BSTR *p) { HTMLMetaElement *This = impl_from_IHTMLMetaElement(iface); - nsAString httpequiv_str, val_str; - nsresult nsres; - static const PRUnichar httpEquivW[] = {'h','t','t','p','-','e','q','u','i','v',0}; TRACE("(%p)->(%p)\n", This, p); - nsAString_InitDepend(&httpequiv_str, httpEquivW); - nsAString_Init(&val_str, NULL); - nsres = nsIDOMHTMLElement_GetAttribute(This->element.nselem, &httpequiv_str, &val_str); - nsAString_Finish(&httpequiv_str); - - return return_nsstr(nsres, &val_str, p); + return elem_string_attr_getter(&This->element, httpEquivW, p); } static HRESULT WINAPI HTMLMetaElement_put_content(IHTMLMetaElement *iface, BSTR v) @@ -129,19 +121,11 @@ static HRESULT WINAPI HTMLMetaElement_put_content(IHTMLMetaElement *iface, BSTR static HRESULT WINAPI HTMLMetaElement_get_content(IHTMLMetaElement *iface, BSTR *p) { HTMLMetaElement *This = impl_from_IHTMLMetaElement(iface); - nsAString content_str, val_str; - nsresult nsres; - static const PRUnichar contentW[] = {'c','o','n','t','e','n','t',0}; TRACE("(%p)->(%p)\n", This, p); - nsAString_InitDepend(&content_str, contentW); - nsAString_Init(&val_str, NULL); - nsres = nsIDOMHTMLElement_GetAttribute(This->element.nselem, &content_str, &val_str); - nsAString_Finish(&content_str); - - return return_nsstr(nsres, &val_str, p); + return elem_string_attr_getter(&This->element, contentW, p); } static HRESULT WINAPI HTMLMetaElement_put_name(IHTMLMetaElement *iface, BSTR v) @@ -154,19 +138,11 @@ static HRESULT WINAPI HTMLMetaElement_put_name(IHTMLMetaElement *iface, BSTR v) static HRESULT WINAPI HTMLMetaElement_get_name(IHTMLMetaElement *iface, BSTR *p) { HTMLMetaElement *This = impl_from_IHTMLMetaElement(iface); - nsAString name_str, val_str; - nsresult nsres; - static const PRUnichar nameW[] = {'n','a','m','e',0}; TRACE("(%p)->(%p)\n", This, p); - nsAString_InitDepend(&name_str, nameW); - nsAString_Init(&val_str, NULL); - nsres = nsIDOMHTMLElement_GetAttribute(This->element.nselem, &name_str, &val_str); - nsAString_Finish(&name_str); - - return return_nsstr(nsres, &val_str, p); + return elem_string_attr_getter(&This->element, nameW, p); } static HRESULT WINAPI HTMLMetaElement_put_url(IHTMLMetaElement *iface, BSTR v) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 3181ee2..8be7141 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -960,6 +960,7 @@ IHTMLElementCollection *create_collection_from_nodelist(HTMLDocumentNode*,nsIDOM IHTMLElementCollection *create_collection_from_htmlcol(HTMLDocumentNode*,nsIDOMHTMLCollection*) DECLSPEC_HIDDEN; nsresult get_elem_attr_value(nsIDOMHTMLElement*,const WCHAR*,nsAString*,const PRUnichar**) DECLSPEC_HIDDEN; +HRESULT elem_string_attr_getter(HTMLElement*,const WCHAR*,BSTR*) DECLSPEC_HIDDEN; /* commands */ typedef struct {

1 0

Jacek Caban : mshtml: Use get_elem_attr_value helper in get_font_size.
by Alexandre Julliard 11 Jun '14

11 Jun '14

Module: wine Branch: master Commit: 3efaaacf3c5add5e99c689d40ddeea574c6dfd2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=3efaaacf3c5add5e99c689d40… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 27 11:29:11 2014 +0200 mshtml: Use get_elem_attr_value helper in get_font_size. --- dlls/mshtml/editor.c | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/dlls/mshtml/editor.c b/dlls/mshtml/editor.c index cfab2ed..14aab53 100644 --- a/dlls/mshtml/editor.c +++ b/dlls/mshtml/editor.c @@ -263,7 +263,7 @@ static void remove_child_attr(nsIDOMElement *elem, LPCWSTR tag, nsAString *attr_ static void get_font_size(HTMLDocument *This, WCHAR *ret) { nsISelection *nsselection = get_ns_selection(This); - nsIDOMElement *elem = NULL; + nsIDOMHTMLElement *elem = NULL; nsIDOMNode *node = NULL, *tmp_node; nsAString tag_str; LPCWSTR tag; @@ -284,36 +284,29 @@ static void get_font_size(HTMLDocument *This, WCHAR *ret) break; if(node_type == ELEMENT_NODE) { - nsIDOMNode_QueryInterface(node, &IID_nsIDOMElement, (void**)&elem); + nsIDOMNode_QueryInterface(node, &IID_nsIDOMHTMLElement, (void**)&elem); nsAString_Init(&tag_str, NULL); - nsIDOMElement_GetTagName(elem, &tag_str); + nsIDOMHTMLElement_GetTagName(elem, &tag_str); nsAString_GetData(&tag_str, &tag); if(!strcmpiW(tag, fontW)) { - nsAString size_str, val_str; - LPCWSTR val; + nsAString val_str; + const PRUnichar *val; TRACE("found font tag %p\n", elem); - nsAString_InitDepend(&size_str, sizeW); - nsAString_Init(&val_str, NULL); - - nsIDOMElement_GetAttribute(elem, &size_str, &val_str); - nsAString_GetData(&val_str, &val); - + get_elem_attr_value(elem, sizeW, &val_str, &val); if(*val) { TRACE("found size %s\n", debugstr_w(val)); strcpyW(ret, val); } - nsAString_Finish(&size_str); nsAString_Finish(&val_str); } nsAString_Finish(&tag_str); - - nsIDOMElement_Release(elem); + nsIDOMHTMLElement_Release(elem); } if(*ret)

1 0

Jacek Caban : mshtml: Use get_elem_attr_value helper in is_elem_name.
by Alexandre Julliard 11 Jun '14

11 Jun '14

Module: wine Branch: master Commit: d0898685a686befe0fdcd8d0310f1a9b74906887 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0898685a686befe0fdcd8d03… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 27 11:29:28 2014 +0200 mshtml: Use get_elem_attr_value helper in is_elem_name. --- dlls/mshtml/htmlelemcol.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/htmlelemcol.c b/dlls/mshtml/htmlelemcol.c index cb7bad1..8fd61ed 100644 --- a/dlls/mshtml/htmlelemcol.c +++ b/dlls/mshtml/htmlelemcol.c @@ -368,7 +368,7 @@ static BOOL is_elem_id(HTMLElement *elem, LPCWSTR name) static BOOL is_elem_name(HTMLElement *elem, LPCWSTR name) { const PRUnichar *str; - nsAString nsstr, nsname; + nsAString nsstr; BOOL ret = FALSE; nsresult nsres; @@ -385,15 +385,12 @@ static BOOL is_elem_name(HTMLElement *elem, LPCWSTR name) return TRUE; } - nsAString_InitDepend(&nsname, nameW); - nsres = nsIDOMHTMLElement_GetAttribute(elem->nselem, &nsname, &nsstr); - nsAString_Finish(&nsname); + nsres = get_elem_attr_value(elem->nselem, nameW, &nsstr, &str); if(NS_SUCCEEDED(nsres)) { - nsAString_GetData(&nsstr, &str); ret = !strcmpiW(str, name); + nsAString_Finish(&nsstr); } - nsAString_Finish(&nsstr); return ret; }

1 0

Julian Rüger : po: Update German translation.
by Alexandre Julliard 11 Jun '14

11 Jun '14

Module: wine Branch: master Commit: 8c944b0da4919b55e2a1ba5fccfa472076ab2d14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c944b0da4919b55e2a1ba5fc… Author: Julian Rüger <jr98(a)gmx.net> Date: Mon May 26 01:36:03 2014 +0200 po: Update German translation. --- po/de.po | 145 ++++++++++++++++++++++---------------------------------------- 1 file changed, 52 insertions(+), 93 deletions(-) diff --git a/po/de.po b/po/de.po index 6291a37..e68ed94 100644 --- a/po/de.po +++ b/po/de.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2014-04-17 03:01+0200\n" +"PO-Revision-Date: 2014-05-26 01:33+0200\n" "Last-Translator: Julian Rüger\n" "Language-Team: none\n" "Language: German\n" @@ -7129,206 +7129,164 @@ msgid "outline button" msgstr "Gliederung Schaltfläche" #: oleacc.rc:97 -#, fuzzy -#| msgid "Normal" msgctxt "object state" msgid "normal" -msgstr "Mittel" +msgstr "normal" #: oleacc.rc:98 -#, fuzzy -#| msgid "Unavailable" msgctxt "object state" msgid "unavailable" -msgstr "Nicht verfügbar" +msgstr "nicht verfügbar" #: oleacc.rc:99 -#, fuzzy -#| msgid "Select" msgctxt "object state" msgid "selected" -msgstr "Auswählen" +msgstr "ausgewählt" #: oleacc.rc:100 -#, fuzzy -#| msgid "Paused" msgctxt "object state" msgid "focused" -msgstr "Angehalten" +msgstr "fokussiert" #: oleacc.rc:101 -#, fuzzy -#| msgid "&Compressed" msgctxt "object state" msgid "pressed" -msgstr "&Komprimiert" +msgstr "geklickt" #: oleacc.rc:102 msgctxt "object state" msgid "checked" -msgstr "" +msgstr "angekreuzt" #: oleacc.rc:103 -#, fuzzy -#| msgid "Mixed" msgctxt "object state" msgid "mixed" -msgstr "Mixed" +msgstr "gemischt" #: oleacc.rc:104 -#, fuzzy -#| msgid "&Read Only" msgctxt "object state" msgid "read only" -msgstr "&Schreibgeschützt" +msgstr "schreibgeschützt" #: oleacc.rc:105 -#, fuzzy -#| msgid "Hot Tracked Item" msgctxt "object state" msgid "hot tracked" -msgstr "Heiß verfolgtes Element" +msgstr "aktiv hervorgehoben" #: oleacc.rc:106 -#, fuzzy -#| msgid "Defaults" msgctxt "object state" msgid "default" -msgstr "Standards" +msgstr "standard" #: oleacc.rc:107 msgctxt "object state" msgid "expanded" -msgstr "" +msgstr "ausgeklappt" #: oleacc.rc:108 msgctxt "object state" msgid "collapsed" -msgstr "" +msgstr "eingeklappt" #: oleacc.rc:109 msgctxt "object state" msgid "busy" -msgstr "" +msgstr "beschäftigt" #: oleacc.rc:110 msgctxt "object state" msgid "floating" -msgstr "" +msgstr "schwebend" #: oleacc.rc:111 msgctxt "object state" msgid "marqueed" -msgstr "" +msgstr "Lauftext" #: oleacc.rc:112 -#, fuzzy -#| msgid "animation" msgctxt "object state" msgid "animated" -msgstr "Animation" +msgstr "animiert" #: oleacc.rc:113 msgctxt "object state" msgid "invisible" -msgstr "" +msgstr "unsichtbar" #: oleacc.rc:114 msgctxt "object state" msgid "offscreen" -msgstr "" +msgstr "nicht im Bild" #: oleacc.rc:115 -#, fuzzy -#| msgid "&enable" msgctxt "object state" msgid "sizeable" -msgstr "&aktiv" +msgstr "größenänderbar" #: oleacc.rc:116 -#, fuzzy -#| msgid "&enable" msgctxt "object state" msgid "moveable" -msgstr "&aktiv" +msgstr "verschiebbar" #: oleacc.rc:117 msgctxt "object state" msgid "self voicing" -msgstr "" +msgstr "selbst sprechend" #: oleacc.rc:118 -#, fuzzy -#| msgid "Paused" msgctxt "object state" msgid "focusable" -msgstr "Angehalten" +msgstr "fokussierbar" #: oleacc.rc:119 -#, fuzzy -#| msgid "table" msgctxt "object state" msgid "selectable" -msgstr "Tabelle" +msgstr "auswählbar" #: oleacc.rc:120 -#, fuzzy -#| msgid "link" msgctxt "object state" msgid "linked" -msgstr "Link" +msgstr "verknüpft" #: oleacc.rc:121 msgctxt "object state" msgid "traversed" -msgstr "" +msgstr "durchlaufen" #: oleacc.rc:122 -#, fuzzy -#| msgid "table" msgctxt "object state" msgid "multi selectable" -msgstr "Tabelle" +msgstr "mehrfach auswählbar" #: oleacc.rc:123 -#, fuzzy -#| msgid "Please select a file." msgctxt "object state" msgid "extended selectable" -msgstr "Bitte wählen Sie eine Datei." +msgstr "erweitert auswählbar" #: oleacc.rc:124 -#, fuzzy -#| msgid "alert" msgctxt "object state" msgid "alert low" -msgstr "Warnung" +msgstr "niedrige Priorität" #: oleacc.rc:125 -#, fuzzy -#| msgid "alert" msgctxt "object state" msgid "alert medium" -msgstr "Warnung" +msgstr "mittlere Priorität" #: oleacc.rc:126 -#, fuzzy -#| msgid "alert" msgctxt "object state" msgid "alert high" -msgstr "Warnung" +msgstr "hohe Priorität" #: oleacc.rc:127 -#, fuzzy -#| msgid "Write protected.\n" msgctxt "object state" msgid "protected" -msgstr "Schreibgeschützt.\n" +msgstr "geschützt" #: oleacc.rc:128 msgctxt "object state" msgid "has popup" -msgstr "" +msgstr "hat Popup" #: oleaut32.rc:30 oleview.rc:147 msgid "True" @@ -13514,7 +13472,7 @@ msgstr "Alternativer Steuerelementhintergrund" #: winecfg.rc:120 msgid "Hot Tracked Item" -msgstr "Heiß verfolgtes Element" +msgstr "Aktiv hervorgehobenes Element" #: winecfg.rc:121 msgid "Active Title Bar Gradient" @@ -13534,7 +13492,7 @@ msgstr "Menüleiste" #: wineconsole.rc:63 msgid "Cursor size" -msgstr "Cursor Größe" +msgstr "Cursorgröße" #: wineconsole.rc:64 msgid "&Small" @@ -13574,23 +13532,23 @@ msgstr "&aktiv" #: wineconsole.rc:75 msgid "Command history" -msgstr "Befehlsspeicher" +msgstr "Befehlsverlauf" #: wineconsole.rc:76 msgid "&Number of recalled commands:" -msgstr "&Anzahl der Puffer:" +msgstr "Anzahl der gespeicherten &Befehle:" #: wineconsole.rc:79 msgid "&Remove doubles" -msgstr "Alte &Duplikate löschen" +msgstr "&Duplikate entfernen" #: wineconsole.rc:87 msgid "&Font" -msgstr "Schrift&art" +msgstr "&Schriftart" #: wineconsole.rc:89 msgid "&Color" -msgstr "F&arbe" +msgstr "&Farbe" #: wineconsole.rc:100 msgid "Configuration" @@ -13598,7 +13556,7 @@ msgstr "Konfiguration" #: wineconsole.rc:103 msgid "Buffer zone" -msgstr "Fensterpuffergröße" +msgstr "Zeichenpuffer" #: wineconsole.rc:104 msgid "&Width:" @@ -13638,15 +13596,15 @@ msgstr "Konsolenparameter" #: wineconsole.rc:131 msgid "Retain these settings for later sessions" -msgstr "Übernehme diese Einstellungen für spätere Sitzungen" +msgstr "Einstellungen für spätere Sitzungen übernehmen" #: wineconsole.rc:132 msgid "Modify only current session" -msgstr "Verändere nur die aktuelle Sitzung" +msgstr "Nur für aktuelle Sitzung ändern" #: wineconsole.rc:29 msgid "Set &Defaults" -msgstr "Stan&dard" +msgstr "&Standards festlegen" #: wineconsole.rc:31 msgid "&Mark" @@ -13678,11 +13636,12 @@ msgstr "Konfigurationsfehler" #: wineconsole.rc:42 msgid "Screen buffer size must be greater or equal to the window's one" -msgstr "Die Bildschirmgröße muss größer oder gleich der des Fensters sein" +msgstr "" +"Die Größe des Zeichenpuffers muss mindestens der Fenstergröße entsprechen" #: wineconsole.rc:37 msgid "Each character is %1!u! pixels wide and %2!u! pixels high" -msgstr "Jeder Buchstabe ist %1!u! Pixel breit und %2!u! Pixel hoch" +msgstr "Jedes Zeichen ist %1!u! Pixel breit und %2!u! Pixel hoch" #: wineconsole.rc:38 msgid "This is a test" @@ -13698,7 +13657,7 @@ msgstr "wineconsole: Ungültiges Backend\n" #: wineconsole.rc:46 msgid "wineconsole: Unrecognized command line option\n" -msgstr "wineconsole: Nicht erkannte Befehlszeilenoption\n" +msgstr "wineconsole: Unbekannte Befehlszeilenoption\n" #: wineconsole.rc:47 msgid "Starts a program in a Wine console\n" @@ -13758,7 +13717,7 @@ msgstr "" #: winedbg.rc:49 msgid "Program Error" -msgstr "Programm Fehler" +msgstr "Programmfehler" #: winedbg.rc:54 msgid "" @@ -13776,7 +13735,7 @@ msgid "" msgstr "" "Die Ursache kann ein Problem im Programm oder ein Fehler in Wine sein. Sie " "können in der <a href=\"http://appdb.winehq.org\">Anwendungsdatenbank</a> " -"Tipps zum ausführen der Anwendung einholen." +"Tipps zum Ausführen der Anwendung einholen." #: winedbg.rc:61 msgid "Show &Details" @@ -13784,7 +13743,7 @@ msgstr "&Details anzeigen" #: winedbg.rc:66 msgid "Program Error Details" -msgstr "Programm Fehler Details" +msgstr "Programmfehler-Details" #: winedbg.rc:73 msgid "" @@ -13800,7 +13759,7 @@ msgstr "" #: winedbg.rc:38 msgid "Wine program crash" -msgstr "Wine Programm Absturz" +msgstr "Wine Programmabsturz" #: winedbg.rc:39 msgid "Internal errors - invalid parameters received"

1 0