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

Nikolay Sivov : msxml3: Store namespace info for created attribute, fix returned properties.
by Alexandre Julliard July 27, 2013

July 27, 2013

Module: wine Branch: master Commit: 88e94c7ef8c2ea8a48d14397520724c1d897febc URL: http://source.winehq.org/git/wine.git/?a=commit;h=88e94c7ef8c2ea8a48d143975… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jul 26 08:44:57 2013 +0400 msxml3: Store namespace info for created attribute, fix returned properties. --- dlls/msxml3/attribute.c | 45 ++++++++++++++++++++- dlls/msxml3/domdoc.c | 23 +++++++++-- dlls/msxml3/tests/domdoc.c | 94 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 156 insertions(+), 6 deletions(-) diff --git a/dlls/msxml3/attribute.c b/dlls/msxml3/attribute.c index 70dee2a..bb0655c 100644 --- a/dlls/msxml3/attribute.c +++ b/dlls/msxml3/attribute.c @@ -43,6 +43,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(msxml); #ifdef HAVE_LIBXML2 +static const xmlChar xmlns[] = "xmlns"; + typedef struct _domattr { xmlnode node; @@ -542,8 +544,29 @@ static HRESULT WINAPI domattr_get_namespaceURI( BSTR* p) { domattr *This = impl_from_IXMLDOMAttribute( iface ); + xmlNsPtr ns = This->node.node->ns; + TRACE("(%p)->(%p)\n", This, p); - return node_get_namespaceURI(&This->node, p); + + if (!p) + return E_INVALIDARG; + + *p = NULL; + + if (ns) + { + /* special case for default namespace definition */ + if (xmlStrEqual(This->node.node->name, xmlns)) + *p = bstr_from_xmlChar(xmlns); + else if (xmlStrEqual(ns->prefix, xmlns)) + *p = SysAllocStringLen(NULL, 0); + else if (ns->href) + *p = bstr_from_xmlChar(ns->href); + } + + TRACE("uri: %s\n", debugstr_w(*p)); + + return *p ? S_OK : S_FALSE; } static HRESULT WINAPI domattr_get_prefix( @@ -551,8 +574,26 @@ static HRESULT WINAPI domattr_get_prefix( BSTR* prefix) { domattr *This = impl_from_IXMLDOMAttribute( iface ); + xmlNsPtr ns = This->node.node->ns; + TRACE("(%p)->(%p)\n", This, prefix); - return node_get_prefix( &This->node, prefix ); + + if (!prefix) return E_INVALIDARG; + + *prefix = NULL; + + if (ns) + { + /* special case for default namespace definition */ + if (xmlStrEqual(This->node.node->name, xmlns)) + *prefix = bstr_from_xmlChar(xmlns); + else if (ns->prefix) + *prefix = bstr_from_xmlChar(ns->prefix); + } + + TRACE("prefix: %s\n", debugstr_w(*prefix)); + + return *prefix ? S_OK : S_FALSE; } static HRESULT WINAPI domattr_get_baseName( diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 7eae2d4..a96b5c7 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -1934,9 +1934,6 @@ static HRESULT WINAPI domdoc_createNode( hr = get_node_type(Type, &node_type); if(FAILED(hr)) return hr; - if(namespaceURI && namespaceURI[0] && node_type != NODE_ELEMENT) - FIXME("nodes with namespaces currently not supported.\n"); - TRACE("node_type %d\n", node_type); /* exit earlier for types that need name */ @@ -1979,8 +1976,26 @@ static HRESULT WINAPI domdoc_createNode( break; } case NODE_ATTRIBUTE: - xmlnode = (xmlNodePtr)xmlNewDocProp(get_doc(This), xml_name, NULL); + { + xmlChar *local, *prefix; + + local = xmlSplitQName2(xml_name, &prefix); + + xmlnode = (xmlNodePtr)xmlNewDocProp(get_doc(This), local ? local : xml_name, NULL); + + if (local || (href && *href)) + { + /* we need a floating namespace here, it can't be created linked to attribute from + a start */ + xmlNsPtr ns = xmlNewNs(NULL, href, prefix); + xmlSetNs(xmlnode, ns); + } + + xmlFree(local); + xmlFree(prefix); + break; + } case NODE_TEXT: xmlnode = (xmlNodePtr)xmlNewDocText(get_doc(This), NULL); break; diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 5f1b5c3..a32eda8 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -11590,6 +11590,99 @@ static void test_xsltext(void) free_bstrs(); } +struct attrtest_t { + const char *name; + const char *uri; + const char *prefix; + const char *href; +}; + +static struct attrtest_t attrtests[] = { + { "xmlns", "http://www.w3.org/2000/xmlns/", "xmlns", "xmlns" }, + { "xmlns", "nondefaulturi", "xmlns", "xmlns" }, + { "c", "http://www.w3.org/2000/xmlns/", NULL, "http://www.w3.org/2000/xmlns/" }, + { "c", "nsref1", NULL, "nsref1" }, + { "ns:c", "nsref1", "ns", "nsref1" }, + { "xmlns:c", "http://www.w3.org/2000/xmlns/", "xmlns", "" }, + { "xmlns:c", "nondefaulturi", "xmlns", "" }, + { 0 } +}; + +static void test_create_attribute(void) +{ + struct attrtest_t *ptr = attrtests; + IXMLDOMElement *el; + IXMLDOMDocument *doc; + IXMLDOMNode *node, *node2; + VARIANT var; + HRESULT hr; + int i = 0; + BSTR str; + + doc = create_document(&IID_IXMLDOMDocument); + + while (ptr->name) + { + V_VT(&var) = VT_I1; + V_I1(&var) = NODE_ATTRIBUTE; + hr = IXMLDOMDocument_createNode(doc, var, _bstr_(ptr->name), _bstr_(ptr->uri), &node); + ok(hr == S_OK, "got 0x%08x\n", hr); + + str = NULL; + hr = IXMLDOMNode_get_prefix(node, &str); + if (ptr->prefix) + { + ok(hr == S_OK, "%d: got 0x%08x\n", i, hr); + ok(!lstrcmpW(str, _bstr_(ptr->prefix)), "%d: got prefix %s, expected %s\n", i, wine_dbgstr_w(str), ptr->prefix); + } + else + { + ok(hr == S_FALSE, "%d: got 0x%08x\n", i, hr); + ok(str == NULL, "%d: got prefix %s\n", i, wine_dbgstr_w(str)); + } + + str = NULL; + hr = IXMLDOMNode_get_namespaceURI(node, &str); + ok(hr == S_OK, "%d: got 0x%08x\n", i, hr); + ok(!lstrcmpW(str, _bstr_(ptr->href)), "%d: got uri %s, expected %s\n", i, wine_dbgstr_w(str), ptr->href); + SysFreeString(str); + + IXMLDOMNode_Release(node); + free_bstrs(); + + i++; + ptr++; + } + + V_VT(&var) = VT_I1; + V_I1(&var) = NODE_ELEMENT; + hr = IXMLDOMDocument_createNode(doc, var, _bstr_("e"), NULL, &node2); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXMLDOMNode_QueryInterface(node2, &IID_IXMLDOMElement, (void**)&el); + ok(hr == S_OK, "got 0x%08x\n", hr); + IXMLDOMNode_Release(node2); + + V_VT(&var) = VT_I1; + V_I1(&var) = NODE_ATTRIBUTE; + hr = IXMLDOMDocument_createNode(doc, var, _bstr_("xmlns:a"), _bstr_("http://www.w3.org/2000/xmlns/"), &node); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXMLDOMElement_setAttributeNode(el, (IXMLDOMAttribute*)node, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + + /* for some reason default namespace uri is not reported */ + hr = IXMLDOMNode_get_namespaceURI(node, &str); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(str, _bstr_("")), "got uri %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + + IXMLDOMNode_Release(node); + IXMLDOMElement_Release(el); + IXMLDOMDocument_Release(doc); + free_bstrs(); +} + START_TEST(domdoc) { IXMLDOMDocument *doc; @@ -11644,6 +11737,7 @@ START_TEST(domdoc) test_setAttributeNode(); test_put_dataType(); test_createNode(); + test_create_attribute(); test_get_prefix(); test_default_properties(); test_selectSingleNode();

1 0

Piotr Caban : oleaut32: Fix custdata_list initialization in ITypeInfo_fnGetRefTypeInfo.
by Alexandre Julliard July 27, 2013

July 27, 2013

Module: wine Branch: master Commit: 4f62fb2eec7130d7af1d1df35316e04814adc130 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f62fb2eec7130d7af1d1df35… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jul 26 14:10:36 2013 +0200 oleaut32: Fix custdata_list initialization in ITypeInfo_fnGetRefTypeInfo. --- dlls/oleaut32/typelib.c | 15 +++++++++------ 1 files changed, 9 insertions(+), 6 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 2bd9437..996886e 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -1184,6 +1184,7 @@ typedef struct tagITypeInfoImpl /* Implemented Interfaces */ TLBImplType *impltypes; + struct list *pcustdata_list; struct list custdata_list; } ITypeInfoImpl; @@ -2599,7 +2600,7 @@ static ITypeInfoImpl * MSFT_DoTypeInfo( break; } } - MSFT_CustData(pcx, tiBase.oCustData, &ptiRet->custdata_list); + MSFT_CustData(pcx, tiBase.oCustData, ptiRet->pcustdata_list); TRACE_(typelib)("%s guid: %s kind:%s\n", debugstr_w(TLB_get_bstr(ptiRet->Name)), @@ -5367,7 +5368,8 @@ static ITypeInfoImpl* ITypeInfoImpl_Constructor(void) pTypeInfoImpl->hreftype = -1; pTypeInfoImpl->memidConstructor = MEMBERID_NIL; pTypeInfoImpl->memidDestructor = MEMBERID_NIL; - list_init(&pTypeInfoImpl->custdata_list); + pTypeInfoImpl->pcustdata_list = &pTypeInfoImpl->custdata_list; + list_init(pTypeInfoImpl->pcustdata_list); } TRACE("(%p)\n", pTypeInfoImpl); return pTypeInfoImpl; @@ -7389,6 +7391,7 @@ static HRESULT WINAPI ITypeInfo_fnGetRefTypeInfo( *pTypeInfoImpl = *This; pTypeInfoImpl->ref = 0; + list_init(&pTypeInfoImpl->custdata_list); if (This->typekind == TKIND_INTERFACE) pTypeInfoImpl->typekind = TKIND_DISPATCH; @@ -7785,7 +7788,7 @@ static HRESULT WINAPI ITypeInfo2_fnGetCustData( if(!guid || !pVarVal) return E_INVALIDARG; - pCData = TLB_get_custdata_by_guid(&This->custdata_list, guid); + pCData = TLB_get_custdata_by_guid(This->pcustdata_list, guid); VariantInit( pVarVal); if (pCData) @@ -7991,7 +7994,7 @@ static HRESULT WINAPI ITypeInfo2_fnGetAllCustData( TRACE("%p %p\n", This, pCustData); - return TLB_copy_all_custdata(&This->custdata_list, pCustData); + return TLB_copy_all_custdata(This->pcustdata_list, pCustData); } /* ITypeInfo2::GetAllFuncCustData @@ -9416,7 +9419,7 @@ static DWORD WMSFT_compile_typeinfo(ITypeInfoImpl *info, INT16 index, WMSFT_TLBF base->docstringoffs = -1; base->helpstringcontext = info->dwHelpStringContext; base->helpcontext = info->dwHelpContext; - base->oCustData = WMSFT_compile_custdata(&info->custdata_list, file); + base->oCustData = WMSFT_compile_custdata(info->pcustdata_list, file); base->cImplTypes = info->cImplTypes; base->cbSizeVft = info->cbSizeVft; base->size = info->cbSizeInstance; @@ -10756,7 +10759,7 @@ static HRESULT WINAPI ICreateTypeInfo2_fnSetCustData(ICreateTypeInfo2 *iface, tlbguid = TLB_append_guid(&This->pTypeLib->guid_list, guid); - return TLB_set_custdata(&This->custdata_list, tlbguid, varVal); + return TLB_set_custdata(This->pcustdata_list, tlbguid, varVal); } static HRESULT WINAPI ICreateTypeInfo2_fnSetFuncCustData(ICreateTypeInfo2 *iface,

1 0

Hans Leidekker : msi: Merge events.c into dialog.c.
by Alexandre Julliard July 27, 2013

July 27, 2013

Module: wine Branch: master Commit: ec7650908afcccd354b8e4450a31fda63d9cde45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec7650908afcccd354b8e4450… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jul 26 17:19:34 2013 +0200 msi: Merge events.c into dialog.c. --- dlls/msi/Makefile.in | 1 - dlls/msi/dialog.c | 573 ++++++++++++++++++++++++++++++++++++++++---------- dlls/msi/events.c | 449 --------------------------------------- dlls/msi/msipriv.h | 17 +-- dlls/msi/package.c | 10 +- 5 files changed, 466 insertions(+), 584 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ec7650908afcccd354b8e…

1 0

Hans Leidekker : msi: Subscribe to all control events instead of just the first.
by Alexandre Julliard July 27, 2013

July 27, 2013

Module: wine Branch: master Commit: 4759dcc3c1f24b19ef08adce48656d9d148bab8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4759dcc3c1f24b19ef08adce4… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jul 26 17:20:04 2013 +0200 msi: Subscribe to all control events instead of just the first. --- dlls/msi/dialog.c | 46 ++++++++++++++++++++++++++++++---------------- 1 files changed, 30 insertions(+), 16 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index 943b631..1e02467 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -735,27 +735,41 @@ static void event_subscribe( msi_dialog *dialog, const WCHAR *event, const WCHAR list_add_tail( &dialog->package->subscriptions, &sub->entry ); } +struct dialog_control +{ + msi_dialog *dialog; + const WCHAR *control; +}; + +static UINT map_event( MSIRECORD *row, void *param ) +{ + struct dialog_control *dc = param; + const WCHAR *event = MSI_RecordGetString( row, 3 ); + const WCHAR *attribute = MSI_RecordGetString( row, 4 ); + + event_subscribe( dc->dialog, event, dc->control, attribute ); + return ERROR_SUCCESS; +} + static void dialog_map_events( msi_dialog *dialog, const WCHAR *control ) { - static const WCHAR Query[] = { - 'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ', + static const WCHAR queryW[] = + {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ', '`','E','v','e','n','t','M','a','p','p','i','n','g','`',' ', - 'W','H','E','R','E',' ', - '`','D','i','a','l','o','g','_','`',' ','=',' ','\'','%','s','\'',' ', - 'A','N','D',' ', - '`','C','o','n','t','r','o','l','_','`',' ','=',' ','\'','%','s','\'',0 + 'W','H','E','R','E',' ','`','D','i','a','l','o','g','_','`',' ','=',' ','\'','%','s','\'',' ', + 'A','N','D',' ','`','C','o','n','t','r','o','l','_','`',' ','=',' ','\'','%','s','\'',0}; + MSIQUERY *view; + struct dialog_control dialog_control = + { + dialog, + control }; - MSIRECORD *row; - LPCWSTR event, attribute; - row = MSI_QueryGetRecord( dialog->package->db, Query, dialog->name, control ); - if (!row) - return; - - event = MSI_RecordGetString( row, 3 ); - attribute = MSI_RecordGetString( row, 4 ); - event_subscribe( dialog, event, control, attribute ); - msiobj_release( &row->hdr ); + if (!MSI_OpenQuery( dialog->package->db, &view, queryW, dialog->name, control )) + { + MSI_IterateRecords( view, NULL, map_event, &dialog_control ); + msiobj_release( &view->hdr ); + } } /* everything except radio buttons */

1 0

Jacek Caban : urlmon: Moved FindMimeFromData to mimefilter.c.
by Alexandre Julliard July 27, 2013

July 27, 2013

Module: wine Branch: master Commit: dbfe0572bd0d12f08b2987bec4b8bcf8f0258634 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dbfe0572bd0d12f08b2987bec… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 24 15:13:32 2013 +0200 urlmon: Moved FindMimeFromData to mimefilter.c. --- dlls/urlmon/mimefilter.c | 371 +++++++++++++++++++++++++++++++++++++++++++++ dlls/urlmon/urlmon_main.c | 371 --------------------------------------------- 2 files changed, 371 insertions(+), 371 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=dbfe0572bd0d12f08b298…

1 0

Rico Schüller : d3dx9/tests: Add ID3DXConstantTable struct array test.
by Alexandre Julliard July 27, 2013

July 27, 2013

Module: wine Branch: master Commit: b196d0ccdcbbe54e5df0745b3d170ee76fa15185 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b196d0ccdcbbe54e5df0745b3… Author: Rico Schüller <kgbricola(a)web.de> Date: Wed Jul 24 22:30:31 2013 +0200 d3dx9/tests: Add ID3DXConstantTable struct array test. --- dlls/d3dx9_36/tests/shader.c | 377 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 377 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b196d0ccdcbbe54e5df07…

1 0

Piotr Caban : msvcrt: Add _wctomb_s_l implementation.
by Alexandre Julliard July 27, 2013

July 27, 2013

Module: wine Branch: master Commit: 6457163bb27f986d09a085af5a5d971d2b302153 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6457163bb27f986d09a085af5… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jul 25 10:14:33 2013 +0200 msvcrt: Add _wctomb_s_l implementation. --- dlls/msvcr100/msvcr100.spec | 6 +- dlls/msvcr110/msvcr110.spec | 6 +- dlls/msvcr80/msvcr80.spec | 6 +- dlls/msvcr90/msvcr90.spec | 6 +- dlls/msvcrt/msvcrt.spec | 6 +- dlls/msvcrt/tests/string.c | 2 +- dlls/msvcrt/wcs.c | 106 ++++++++++++++++++++++++++++++++++++------- 7 files changed, 106 insertions(+), 32 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index ef6d354..c71f7fa 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1520,8 +1520,8 @@ @ stub _wctime32_s @ cdecl _wctime64(ptr) msvcrt._wctime64 @ stub _wctime64_s -@ stub _wctomb_l -@ stub _wctomb_s_l +@ cdecl _wctomb_l(ptr long ptr) msvcrt._wctomb_l +@ cdecl _wctomb_s_l(ptr ptr long long ptr) msvcrt._wctomb_s_l # extern _wctype @ cdecl _wdupenv_s(ptr ptr wstr) msvcrt._wdupenv_s @ extern _wenviron msvcrt._wenviron @@ -1877,7 +1877,7 @@ @ cdecl wcsxfrm(ptr wstr long) msvcrt.wcsxfrm @ cdecl wctob(long) msvcrt.wctob @ cdecl wctomb(ptr long) msvcrt.wctomb -@ stub wctomb_s +@ cdecl wctomb_s(ptr ptr long long) msvcrt.wctomb_s @ cdecl wmemcpy_s(ptr long ptr long) @ cdecl wmemmove_s(ptr long ptr long) @ varargs wprintf(wstr) msvcrt.wprintf diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index dd76878..40dd029 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1883,8 +1883,8 @@ @ stub _wctime32_s @ cdecl _wctime64(ptr) msvcrt._wctime64 @ stub _wctime64_s -@ stub _wctomb_l -@ stub _wctomb_s_l +@ cdecl _wctomb_l(ptr long ptr) msvcrt._wctomb_l +@ cdecl _wctomb_s_l(ptr ptr long long ptr) msvcrt._wctomb_s_l # extern _wctype @ cdecl _wdupenv_s(ptr ptr wstr) msvcrt._wdupenv_s @ extern _wenviron msvcrt._wenviron @@ -2240,7 +2240,7 @@ @ cdecl wcsxfrm(ptr wstr long) msvcrt.wcsxfrm @ cdecl wctob(long) msvcrt.wctob @ cdecl wctomb(ptr long) msvcrt.wctomb -@ stub wctomb_s +@ cdecl wctomb_s(ptr ptr long long) msvcrt.wctomb_s @ cdecl wmemcpy_s(ptr long ptr long) msvcr100.wmemcpy_s @ cdecl wmemmove_s(ptr long ptr long) msvcr100.wmemmove_s @ varargs wprintf(wstr) msvcrt.wprintf diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 87fbc5d..68530bf 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1198,8 +1198,8 @@ @ stub _wctime32_s @ cdecl _wctime64(ptr) msvcrt._wctime64 @ stub _wctime64_s -@ stub _wctomb_l -@ stub _wctomb_s_l +@ cdecl _wctomb_l(ptr long ptr) msvcrt._wctomb_l +@ cdecl _wctomb_s_l(ptr ptr long long ptr) msvcrt._wctomb_s_l # extern _wctype @ cdecl _wdupenv_s(ptr ptr wstr) msvcrt._wdupenv_s @ extern _wenviron msvcrt._wenviron @@ -1556,7 +1556,7 @@ @ cdecl wcsxfrm(ptr wstr long) msvcrt.wcsxfrm @ cdecl wctob(long) msvcrt.wctob @ cdecl wctomb(ptr long) msvcrt.wctomb -@ stub wctomb_s +@ cdecl wctomb_s(ptr ptr long long) msvcrt.wctomb_s @ varargs wprintf(wstr) msvcrt.wprintf @ varargs wprintf_s(wstr) msvcrt.wprintf_s @ varargs wscanf(wstr) msvcrt.wscanf diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 9800023..6a1657f 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1174,8 +1174,8 @@ @ stub _wctime32_s @ cdecl _wctime64(ptr) msvcrt._wctime64 @ stub _wctime64_s -@ stub _wctomb_l -@ stub _wctomb_s_l +@ cdecl _wctomb_l(ptr long ptr) msvcrt._wctomb_l +@ cdecl _wctomb_s_l(ptr ptr long long ptr) msvcrt._wctomb_s_l # extern _wctype @ cdecl _wdupenv_s(ptr ptr wstr) msvcrt._wdupenv_s @ extern _wenviron msvcrt._wenviron @@ -1529,7 +1529,7 @@ @ cdecl wcsxfrm(ptr wstr long) msvcrt.wcsxfrm @ cdecl wctob(long) msvcrt.wctob @ cdecl wctomb(ptr long) msvcrt.wctomb -@ stub wctomb_s +@ cdecl wctomb_s(ptr ptr long long) msvcrt.wctomb_s @ varargs wprintf(wstr) msvcrt.wprintf @ varargs wprintf_s(wstr) msvcrt.wprintf_s @ varargs wscanf(wstr) msvcrt.wscanf diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index e0e6287..6a812a9 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1139,8 +1139,8 @@ # stub _wctime32_s(ptr long ptr) @ cdecl _wctime64(ptr) MSVCRT__wctime64 # stub _wctime64_s(ptr long ptr) -# stub _wctomb_l(ptr long ptr) -# stub _wctomb_s_l(ptr ptr long long ptr) +@ cdecl _wctomb_l(ptr long ptr) MSVCRT__wctomb_l +@ cdecl _wctomb_s_l(ptr ptr long long ptr) MSVCRT__wctomb_s_l # extern _wctype @ extern _wenviron MSVCRT__wenviron @ varargs _wexecl(wstr wstr) @@ -1510,7 +1510,7 @@ @ stub wcsxfrm(ptr wstr long) @ cdecl wctob(long) MSVCRT_wctob @ cdecl wctomb(ptr long) MSVCRT_wctomb -# stub wctomb_s(ptr ptr long long) +@ cdecl wctomb_s(ptr ptr long long) MSVCRT_wctomb_s @ varargs wprintf(wstr) MSVCRT_wprintf @ varargs wprintf_s(wstr) MSVCRT_wprintf_s @ varargs wscanf(wstr) MSVCRT_wscanf diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 39934f0..7edaa23 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -2356,7 +2356,7 @@ static void test_wctomb(void) ret = p_wcrtomb((char*)dst, 0xffff, NULL); ok(ret == -1, "wcrtomb did not return -1\n"); - ok(dst[0] == 0x3f, "dst[0] = %x, expected 0x20\n", dst[0]); + ok(dst[0] == 0x3f, "dst[0] = %x, expected 0x3f\n", dst[0]); setlocale(LC_ALL, "C"); } diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index c5b630f..dbb12dd 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -1146,6 +1146,96 @@ MSVCRT_wchar_t * CDECL MSVCRT_wcstok( MSVCRT_wchar_t *str, const MSVCRT_wchar_t } /********************************************************************* + * _wctomb_s_l (MSVCRT.@) + */ +int CDECL MSVCRT__wctomb_s_l(int *len, char *mbchar, MSVCRT_size_t size, + MSVCRT_wchar_t wch, MSVCRT__locale_t locale) +{ + MSVCRT_pthreadlocinfo locinfo; + BOOL error; + int mblen; + + if(!mbchar && size>0) { + if(len) + *len = 0; + return 0; + } + + if(len) + *len = -1; + + if(!MSVCRT_CHECK_PMT(size <= INT_MAX)) + return MSVCRT_EINVAL; + + if(!locale) + locinfo = get_locinfo(); + else + locinfo = locale->locinfo; + + if(!locinfo->lc_codepage) { + if(wch > 0xff) { + if(mbchar && size>0) + memset(mbchar, 0, size); + *MSVCRT__errno() = MSVCRT_EILSEQ; + return MSVCRT_EILSEQ; + } + + if(!MSVCRT_CHECK_PMT_ERR(size >= 1, MSVCRT_ERANGE)) + return MSVCRT_ERANGE; + + *mbchar = wch; + if(len) + *len = 1; + return 0; + } + + mblen = WideCharToMultiByte(locinfo->lc_codepage, 0, &wch, 1, mbchar, size, NULL, &error); + if(!mblen || error) { + if(!mblen && GetLastError()==ERROR_INSUFFICIENT_BUFFER) { + if(mbchar && size>0) + memset(mbchar, 0, size); + + MSVCRT_INVALID_PMT("insufficient buffer size", MSVCRT_ERANGE); + return MSVCRT_ERANGE; + } + + *MSVCRT__errno() = MSVCRT_EILSEQ; + return MSVCRT_EILSEQ; + } + + if(len) + *len = mblen; + return 0; +} + +/********************************************************************* + * wctomb_s (MSVCRT.@) + */ +int CDECL MSVCRT_wctomb_s(int *len, char *mbchar, MSVCRT_size_t size, MSVCRT_wchar_t wch) +{ + return MSVCRT__wctomb_s_l(len, mbchar, size, wch, NULL); +} + +/********************************************************************* + * _wctomb_l (MSVCRT.@) + */ +int CDECL MSVCRT__wctomb_l(char *dst, MSVCRT_wchar_t ch, MSVCRT__locale_t locale) +{ + int len; + + MSVCRT__wctomb_s_l(&len, dst, dst ? 6 : 0, ch, locale); + return len; +} + +/********************************************************************* + * wctomb (MSVCRT.@) + */ +INT CDECL MSVCRT_wctomb( char *dst, MSVCRT_wchar_t ch ) +{ + return MSVCRT__wctomb_l(dst, ch, NULL); +} + +/********************************************************************* * wctob (MSVCRT.@) */ INT CDECL MSVCRT_wctob( MSVCRT_wint_t wchar ) @@ -1165,22 +1255,6 @@ INT CDECL MSVCRT_wctob( MSVCRT_wint_t wchar ) } /********************************************************************* - * wctomb (MSVCRT.@) - */ -INT CDECL MSVCRT_wctomb( char *dst, MSVCRT_wchar_t ch ) -{ - BOOL error; - INT size; - - size = WideCharToMultiByte(get_locinfo()->lc_codepage, 0, &ch, 1, dst, dst ? 6 : 0, NULL, &error); - if(!size || error) { - *MSVCRT__errno() = MSVCRT_EINVAL; - return MSVCRT_EOF; - } - return size; -} - -/********************************************************************* * wcrtomb (MSVCRT.@) */ MSVCRT_size_t CDECL MSVCRT_wcrtomb( char *dst, MSVCRT_wchar_t ch, MSVCRT_mbstate_t *s)

1 0

Hans Leidekker : msi: Format text set by means of a control event.
by Alexandre Julliard July 27, 2013

July 27, 2013

Module: wine Branch: master Commit: fdf8ab11d9a2886d5a5e8c04f71c9619dceecfef URL: http://source.winehq.org/git/wine.git/?a=commit;h=fdf8ab11d9a2886d5a5e8c04f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jul 26 17:20:39 2013 +0200 msi: Format text set by means of a control event. --- dlls/msi/dialog.c | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index 1e02467..5a7cbe7 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -621,19 +621,25 @@ static void dialog_handle_event( msi_dialog *dialog, const WCHAR *control, const WCHAR *attribute, MSIRECORD *rec ) { msi_control* ctrl; - LPCWSTR font_text, text = NULL; - LPWSTR font; ctrl = msi_dialog_find_control( dialog, control ); if (!ctrl) return; if( !strcmpW( attribute, szText ) ) { + const WCHAR *font_text, *text = NULL; + WCHAR *font, *text_fmt = NULL; + font_text = MSI_RecordGetString( rec , 1 ); font = msi_dialog_get_style( font_text, &text ); - if (!text) text = szEmpty; + deformat_string( dialog->package, text, &text_fmt ); + if (text_fmt) text = text_fmt; + else text = szEmpty; + SetWindowTextW( ctrl->hwnd, text ); + msi_free( font ); + msi_free( text_fmt ); msi_dialog_check_messages( NULL ); } else if( !strcmpW( attribute, szProgress ) )

1 0

Vincent Povirk : atl: Do not access m_pTermFuncs if the structure is too small.
by Alexandre Julliard July 27, 2013

July 27, 2013

Module: wine Branch: master Commit: d9211c9e5f92a9127308a6c306d4a9af38ae89d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9211c9e5f92a9127308a6c30… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Jul 25 15:13:24 2013 -0500 atl: Do not access m_pTermFuncs if the structure is too small. --- dlls/atl/atl_main.c | 30 +++++++++++++++++++----------- dlls/atl/tests/module.c | 40 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+), 11 deletions(-) diff --git a/dlls/atl/atl_main.c b/dlls/atl/atl_main.c index cc3cce1..985d706 100644 --- a/dlls/atl/atl_main.c +++ b/dlls/atl/atl_main.c @@ -123,15 +123,20 @@ HRESULT WINAPI AtlModuleLoadTypeLib(_ATL_MODULEW *pM, LPCOLESTR lpszIndex, HRESULT WINAPI AtlModuleTerm(_ATL_MODULE *pM) { - _ATL_TERMFUNC_ELEM *iter = pM->m_pTermFuncs, *tmp; + _ATL_TERMFUNC_ELEM *iter, *tmp; TRACE("(%p)\n", pM); - while(iter) { - iter->pFunc(iter->dw); - tmp = iter; - iter = iter->pNext; - HeapFree(GetProcessHeap(), 0, tmp); + if (pM->cbSize > ATLVer1Size) + { + iter = pM->m_pTermFuncs; + + while(iter) { + iter->pFunc(iter->dw); + tmp = iter; + iter = iter->pNext; + HeapFree(GetProcessHeap(), 0, tmp); + } } return S_OK; @@ -143,12 +148,15 @@ HRESULT WINAPI AtlModuleAddTermFunc(_ATL_MODULEW *pM, _ATL_TERMFUNC *pFunc, DWOR TRACE("(%p %p %ld)\n", pM, pFunc, dw); - termfunc_elem = HeapAlloc(GetProcessHeap(), 0, sizeof(_ATL_TERMFUNC_ELEM)); - termfunc_elem->pFunc = pFunc; - termfunc_elem->dw = dw; - termfunc_elem->pNext = pM->m_pTermFuncs; + if (pM->cbSize > ATLVer1Size) + { + termfunc_elem = HeapAlloc(GetProcessHeap(), 0, sizeof(_ATL_TERMFUNC_ELEM)); + termfunc_elem->pFunc = pFunc; + termfunc_elem->dw = dw; + termfunc_elem->pNext = pM->m_pTermFuncs; - pM->m_pTermFuncs = termfunc_elem; + pM->m_pTermFuncs = termfunc_elem; + } return S_OK; } diff --git a/dlls/atl/tests/module.c b/dlls/atl/tests/module.c index 45cff06..192b23e 100644 --- a/dlls/atl/tests/module.c +++ b/dlls/atl/tests/module.c @@ -113,8 +113,48 @@ static void test_winmodule(void) ok(winmod.m_pCreateWndList == create_data+1, "winmod.m_pCreateWndList != create_data\n"); } +static DWORD cb_val; + +static void WINAPI term_callback(DWORD dw) +{ + cb_val = dw; +} + +static void test_term(void) +{ + _ATL_MODULEW test; + HRESULT hres; + + test.cbSize = sizeof(_ATL_MODULEW); + + hres = AtlModuleInit(&test, NULL, NULL); + ok (hres == S_OK, "AtlModuleInit failed (0x%x).\n", (int)hres); + + hres = AtlModuleAddTermFunc(&test, term_callback, 0x22); + ok (hres == S_OK, "AtlModuleAddTermFunc failed (0x%x).\n", (int)hres); + + cb_val = 0xdeadbeef; + hres = AtlModuleTerm(&test); + ok (hres == S_OK, "AtlModuleTerm failed (0x%x).\n", (int)hres); + ok (cb_val == 0x22, "wrong callback value (0x%x).\n", (int)cb_val); + + test.cbSize = FIELD_OFFSET(_ATL_MODULEW, dwAtlBuildVer); + + hres = AtlModuleInit(&test, NULL, NULL); + ok (hres == S_OK, "AtlModuleInit failed (0x%x).\n", (int)hres); + + hres = AtlModuleAddTermFunc(&test, term_callback, 0x23); + ok (hres == S_OK, "AtlModuleAddTermFunc failed (0x%x).\n", (int)hres); + + cb_val = 0xdeadbeef; + hres = AtlModuleTerm(&test); + ok (hres == S_OK, "AtlModuleTerm failed (0x%x).\n", (int)hres); + ok (cb_val == 0xdeadbeef, "wrong callback value (0x%x).\n", (int)cb_val); +} + START_TEST(module) { test_StructSize(); test_winmodule(); + test_term(); }

1 0

Jacek Caban : urlmon/tests: Added more FindMimeFromData tests.
by Alexandre Julliard July 27, 2013

July 27, 2013

Module: wine Branch: master Commit: 7fbcd4cb8152af2094f752ef6f5b6b93c8788a96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fbcd4cb8152af2094f752ef6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 24 15:13:53 2013 +0200 urlmon/tests: Added more FindMimeFromData tests. --- dlls/urlmon/tests/misc.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c index 1a5a3bb..cf5c943 100644 --- a/dlls/urlmon/tests/misc.c +++ b/dlls/urlmon/tests/misc.c @@ -685,6 +685,12 @@ static const struct { {data1, sizeof(data1), "text/plain", NULL, NULL, "res://mshtml.dll/blank.htm", "application/octet-stream"}, {data1, sizeof(data1), "text/plain", NULL, NULL, "file:some%20file%2ejpg", "application/octet-stream"}, {NULL, sizeof(data1), "text/html", NULL, NULL, "res://mshtml.dll/blank.htm"}, + {data1, sizeof(data1), "text/css", NULL, NULL, "http://www.winehq.org/test.css"}, + {data2, sizeof(data2), "text/css", NULL, NULL, "http://www.winehq.org/test.css"}, + {data10, sizeof(data10), "text/html", NULL, NULL, "http://www.winehq.org/test.css"}, + {data1, sizeof(data1), "text/css", NULL, NULL, "http://www.winehq.org/test.css", "text/plain"}, + {data1, sizeof(data1), "text/css", NULL, NULL, "http://www.winehq.org/test.css", "application/octet-stream"}, + {data1, sizeof(data1), "text/test", NULL, NULL, "http://www.winehq.org/test.css", "text/test"} }; static void test_FindMimeFromData(void)

1 0