October 2010 - Wine-commits

Henri Verbeet : wined3d: Pass a sub-resource index instead of a miplevel to volume texture methods.
by Alexandre Julliard 21 Oct '10

21 Oct '10

Module: wine Branch: master Commit: 7f8ea7fffce72ee7d4bcfe9d3adf95b343b66fb0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f8ea7fffce72ee7d4bcfe9d3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 21 12:40:46 2010 +0200 wined3d: Pass a sub-resource index instead of a miplevel to volume texture methods. For volume textures this is mostly just a conceptual change, it'll only make a difference for texture arrays and cube textures. --- dlls/wined3d/volumetexture.c | 44 +++++++++++++++++++++++++---------------- include/wine/wined3d.idl | 8 +++--- 2 files changed, 31 insertions(+), 21 deletions(-) diff --git a/dlls/wined3d/volumetexture.c b/dlls/wined3d/volumetexture.c index c8f596d..9773c60 100644 --- a/dlls/wined3d/volumetexture.c +++ b/dlls/wined3d/volumetexture.c @@ -249,18 +249,28 @@ static BOOL WINAPI IWineD3DVolumeTextureImpl_IsCondNP2(IWineD3DVolumeTexture *if return FALSE; } -/* ******************************************* - IWineD3DVolumeTexture IWineD3DVolumeTexture parts follow - ******************************************* */ +static IWineD3DResourceImpl *volumetexture_get_sub_resource(IWineD3DBaseTextureImpl *texture, UINT sub_resource_idx) +{ + UINT sub_count = texture->baseTexture.level_count * texture->baseTexture.layer_count; + + if (sub_resource_idx >= sub_count) + { + WARN("sub_resource_idx %u >= sub_count %u.\n", sub_resource_idx, sub_count); + return NULL; + } + + return texture->baseTexture.sub_resources[sub_resource_idx]; +} + static HRESULT WINAPI IWineD3DVolumeTextureImpl_GetLevelDesc(IWineD3DVolumeTexture *iface, - UINT level, WINED3DVOLUME_DESC *desc) + UINT sub_resource_idx, WINED3DVOLUME_DESC *desc) { IWineD3DBaseTextureImpl *texture = (IWineD3DBaseTextureImpl *)iface; IWineD3DVolume *volume; - TRACE("iface %p, level %u, desc %p.\n", iface, level, desc); + TRACE("iface %p, sub_resource_idx %u, desc %p.\n", iface, sub_resource_idx, desc); - if (!(volume = (IWineD3DVolume *)basetexture_get_sub_resource(texture, 0, level))) + if (!(volume = (IWineD3DVolume *)volumetexture_get_sub_resource(texture, sub_resource_idx))) { WARN("Failed to get sub-resource.\n"); return WINED3DERR_INVALIDCALL; @@ -272,14 +282,14 @@ static HRESULT WINAPI IWineD3DVolumeTextureImpl_GetLevelDesc(IWineD3DVolumeTextu } static HRESULT WINAPI IWineD3DVolumeTextureImpl_GetVolumeLevel(IWineD3DVolumeTexture *iface, - UINT level, IWineD3DVolume **volume) + UINT sub_resource_idx, IWineD3DVolume **volume) { IWineD3DBaseTextureImpl *texture = (IWineD3DBaseTextureImpl *)iface; IWineD3DVolume *v; - TRACE("iface %p, level %u, volume %p.\n", iface, level, volume); + TRACE("iface %p, sub_resource_idx %u, volume %p.\n", iface, sub_resource_idx, volume); - if (!(v = (IWineD3DVolume *)basetexture_get_sub_resource(texture, 0, level))) + if (!(v= (IWineD3DVolume *)volumetexture_get_sub_resource(texture, sub_resource_idx))) { WARN("Failed to get sub-resource.\n"); return WINED3DERR_INVALIDCALL; @@ -294,15 +304,15 @@ static HRESULT WINAPI IWineD3DVolumeTextureImpl_GetVolumeLevel(IWineD3DVolumeTex } static HRESULT WINAPI IWineD3DVolumeTextureImpl_Map(IWineD3DVolumeTexture *iface, - UINT level, WINED3DLOCKED_BOX *locked_box, const WINED3DBOX *box, DWORD flags) + UINT sub_resource_idx, WINED3DLOCKED_BOX *locked_box, const WINED3DBOX *box, DWORD flags) { IWineD3DBaseTextureImpl *texture = (IWineD3DBaseTextureImpl *)iface; IWineD3DVolume *volume; - TRACE("iface %p, level %u, locked_box %p, box %p, flags %#x.\n", - iface, level, locked_box, box, flags); + TRACE("iface %p, sub_resource_idx %u, locked_box %p, box %p, flags %#x.\n", + iface, sub_resource_idx, locked_box, box, flags); - if (!(volume = (IWineD3DVolume *)basetexture_get_sub_resource(texture, 0, level))) + if (!(volume = (IWineD3DVolume *)volumetexture_get_sub_resource(texture, sub_resource_idx))) { WARN("Failed to get sub-resource.\n"); return WINED3DERR_INVALIDCALL; @@ -311,14 +321,14 @@ static HRESULT WINAPI IWineD3DVolumeTextureImpl_Map(IWineD3DVolumeTexture *iface return IWineD3DVolume_Map(volume, locked_box, box, flags); } -static HRESULT WINAPI IWineD3DVolumeTextureImpl_Unmap(IWineD3DVolumeTexture *iface, UINT level) +static HRESULT WINAPI IWineD3DVolumeTextureImpl_Unmap(IWineD3DVolumeTexture *iface, UINT sub_resource_idx) { IWineD3DBaseTextureImpl *texture = (IWineD3DBaseTextureImpl *)iface; IWineD3DVolume *volume; - TRACE("iface %p, level %u.\n", iface, level); + TRACE("iface %p, sub_resource_idx %u.\n", iface, sub_resource_idx); - if (!(volume = (IWineD3DVolume *)basetexture_get_sub_resource(texture, 0, level))) + if (!(volume = (IWineD3DVolume *)volumetexture_get_sub_resource(texture, sub_resource_idx))) { WARN("Failed to get sub-resource.\n"); return WINED3DERR_INVALIDCALL; @@ -334,7 +344,7 @@ static HRESULT WINAPI IWineD3DVolumeTextureImpl_AddDirtyBox(IWineD3DVolumeTextur TRACE("iface %p, dirty_box %p.\n", iface, dirty_box); - if (!(volume = (IWineD3DVolume *)basetexture_get_sub_resource(texture, 0, 0))) + if (!(volume = (IWineD3DVolume *)volumetexture_get_sub_resource(texture, 0))) { WARN("Failed to get sub-resource.\n"); return WINED3DERR_INVALIDCALL; diff --git a/include/wine/wined3d.idl b/include/wine/wined3d.idl index fda722a..d720db5 100644 --- a/include/wine/wined3d.idl +++ b/include/wine/wined3d.idl @@ -2606,21 +2606,21 @@ interface IWineD3DCubeTexture : IWineD3DBaseTexture interface IWineD3DVolumeTexture : IWineD3DBaseTexture { HRESULT GetLevelDesc( - [in] UINT level, + [in] UINT sub_resource_idx, [out] WINED3DVOLUME_DESC *desc ); HRESULT GetVolumeLevel( - [in] UINT level, + [in] UINT sub_resource_idx, [out] IWineD3DVolume **volume ); HRESULT Map( - [in] UINT level, + [in] UINT sub_resource_idx, [out] WINED3DLOCKED_BOX *locked_box, [in] const WINED3DBOX *box, [in] DWORD flags ); HRESULT Unmap( - [in] UINT level + [in] UINT sub_resource_idx ); HRESULT AddDirtyBox( [in] const WINED3DBOX *dirty_box

1 0

David Hedberg : shell32: Handle INameSpaceTreeControlEvents:: OnSelectionChanged.
by Alexandre Julliard 21 Oct '10

21 Oct '10

Module: wine Branch: master Commit: c143f805cd883ef5dc8ce95e2c7c15b3fd8a508f URL: http://source.winehq.org/git/wine.git/?a=commit;h=c143f805cd883ef5dc8ce95e2… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Thu Oct 21 13:19:46 2010 +0200 shell32: Handle INameSpaceTreeControlEvents::OnSelectionChanged. --- dlls/shell32/ebrowser.c | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/ebrowser.c b/dlls/shell32/ebrowser.c index fed9ace..9cee1f0 100644 --- a/dlls/shell32/ebrowser.c +++ b/dlls/shell32/ebrowser.c @@ -1809,8 +1809,19 @@ static HRESULT WINAPI NSTCEvents_fnOnSelectionChanged(INameSpaceTreeControlEvent IShellItemArray *psiaSelection) { ExplorerBrowserImpl *This = impl_from_INameSpaceTreeControlEvents(iface); + IShellItem *psi; + HRESULT hr; TRACE("%p (%p)\n", This, psiaSelection); - return E_NOTIMPL; + + hr = IShellItemArray_GetItemAt(psiaSelection, 0, &psi); + if(SUCCEEDED(hr)) + { + hr = IExplorerBrowser_BrowseToObject((IExplorerBrowser*)This, + (IUnknown*)psi, SBSP_DEFBROWSER); + IShellItem_Release(psi); + } + + return hr; } static HRESULT WINAPI NSTCEvents_fnOnKeyboardInput(INameSpaceTreeControlEvents *iface,

1 0

David Hedberg : shell32: Replace bitwise XOR with a contextually more proper operator.
by Alexandre Julliard 21 Oct '10

21 Oct '10

Module: wine Branch: master Commit: aefe637b56c73b963550dda0deaadeece312e2a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aefe637b56c73b963550dda0d… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Thu Oct 21 13:19:45 2010 +0200 shell32: Replace bitwise XOR with a contextually more proper operator. --- dlls/shell32/ebrowser.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/ebrowser.c b/dlls/shell32/ebrowser.c index 9cee1f0..87ff578 100644 --- a/dlls/shell32/ebrowser.c +++ b/dlls/shell32/ebrowser.c @@ -472,7 +472,7 @@ static void update_panestate(ExplorerBrowserImpl *This) else show_navpane = FALSE; - if(This->navpane.show ^ show_navpane) + if(This->navpane.show != show_navpane) { update_layout(This); size_panes(This);

1 0

Juan Lang : crypt32/tests: Fix test failures on Win98/NT4.
by Alexandre Julliard 21 Oct '10

21 Oct '10

Module: wine Branch: master Commit: 2b8cad3235fcb186045d80013142bf4fcd6f768d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b8cad3235fcb186045d80013… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Oct 21 05:09:24 2010 -0700 crypt32/tests: Fix test failures on Win98/NT4. --- dlls/crypt32/tests/str.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/tests/str.c b/dlls/crypt32/tests/str.c index ff652f3..8dbc60f 100644 --- a/dlls/crypt32/tests/str.c +++ b/dlls/crypt32/tests/str.c @@ -287,8 +287,6 @@ static void test_CertRDNValueToStrW(void) { sizeof(bin6), bin6 }, localhostW }, { "1.2.840.113549.1.9.1", CERT_RDN_IA5_STRING, { sizeof(bin7), bin7 }, aricW }, - { "2.5.4.3", CERT_RDN_UTF8_STRING, - { sizeof(bin8), bin8 }, ePKIW }, }; DWORD i, ret; WCHAR buffer[2000];

1 0

Paul Vriens : avifil32: Add the Serbian (Latin and Cyrillic) translation.
by Alexandre Julliard 21 Oct '10

21 Oct '10

Module: wine Branch: master Commit: 6a69aa7ced0b45933935f4f8fed75ff2d1d40d17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a69aa7ced0b45933935f4f8f… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Oct 21 13:49:57 2010 +0200 avifil32: Add the Serbian (Latin and Cyrillic) translation. Translation by Đorđe Vasiljević. --- dlls/avifil32/Makefile.in | 1 + dlls/avifil32/avifile_Sr.rc | 88 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 89 insertions(+), 0 deletions(-) diff --git a/dlls/avifil32/Makefile.in b/dlls/avifil32/Makefile.in index d9578d8..adf1b35 100644 --- a/dlls/avifil32/Makefile.in +++ b/dlls/avifil32/Makefile.in @@ -34,6 +34,7 @@ RC_SRCS = \ avifile_Ro.rc \ avifile_Ru.rc \ avifile_Si.rc \ + avifile_Sr.rc \ avifile_Sv.rc \ avifile_Tr.rc \ avifile_Uk.rc \ diff --git a/dlls/avifil32/avifile_Sr.rc b/dlls/avifil32/avifile_Sr.rc new file mode 100644 index 0000000..ab9bf4b --- /dev/null +++ b/dlls/avifil32/avifile_Sr.rc @@ -0,0 +1,88 @@ +/* + * Copyright 2002 Michael Günnewig + * Copyright 2010 Đorđe Vasiljević + * + * 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 + */ + +#include "avifile_private.h" + +#pragma code_page(65001) + +LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_CYRILLIC + +IDD_SAVEOPTIONS DIALOG 43, 37, 226, 82 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Поставке сажимања" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Изабери ток:",-1,2,5,154,10 + COMBOBOX IDC_STREAM,2,18,154,61,CBS_DROPDOWNLIST | WS_VSCROLL | + WS_TABSTOP + PUSHBUTTON "&Могућности...",IDC_OPTIONS,170,17,50,14 + AUTOCHECKBOX "&Преплићи сваких",IDC_INTERLEAVE,3,42,85,11,WS_TABSTOP + EDITTEXT IDC_INTERLEAVEEVERY,91,41,32,12,ES_AUTOHSCROLL + LTEXT "кадрова",-1,129,43,36,9 + LTEXT "Текући формат:",-1,3,56,73,9 + LTEXT "Простор за изнајмљивање",IDC_FORMATTEXT,75,56,90,26 + DEFPUSHBUTTON "У реду",IDOK,170,42,50,14 + PUSHBUTTON "Откажи",IDCANCEL,170,61,50,14 +END + +STRINGTABLE +{ + IDS_WAVESTREAMFORMAT "Таласни облик: %s" + IDS_WAVEFILETYPE "Таласни облик" + IDS_ALLMULTIMEDIA "Све мултимедијалне датотеке" + IDS_ALLFILES "Све датотеке (*.*)(a)*.*" + IDS_VIDEO "видео запис" + IDS_AUDIO "аудио запис" + IDS_AVISTREAMFORMAT "%s %s #%d" + IDS_AVIFILETYPE "Wine AVI-default-filehandler" + IDS_UNCOMPRESSED "несажето" +} + +LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_LATIN + +IDD_SAVEOPTIONS DIALOG 43, 37, 226, 82 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Postavke sažimanja" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Izaberi tok:",-1,2,5,154,10 + COMBOBOX IDC_STREAM,2,18,154,61,CBS_DROPDOWNLIST | WS_VSCROLL | + WS_TABSTOP + PUSHBUTTON "&Mogućnosti...",IDC_OPTIONS,170,17,50,14 + AUTOCHECKBOX "&Preplići svakih",IDC_INTERLEAVE,3,42,85,11,WS_TABSTOP + EDITTEXT IDC_INTERLEAVEEVERY,91,41,32,12,ES_AUTOHSCROLL + LTEXT "kadrova",-1,129,43,36,9 + LTEXT "Tekući format:",-1,3,56,73,9 + LTEXT "Prostor za iznajmljivanje",IDC_FORMATTEXT,75,56,90,26 + DEFPUSHBUTTON "U redu",IDOK,170,42,50,14 + PUSHBUTTON "Otkaži",IDCANCEL,170,61,50,14 +END + +STRINGTABLE +{ + IDS_WAVESTREAMFORMAT "Talasni oblik: %s" + IDS_WAVEFILETYPE "Talasni oblik" + IDS_ALLMULTIMEDIA "Sve multimedijalne datoteke" + IDS_ALLFILES "Sve datoteke (*.*)(a)*.*" + IDS_VIDEO "video zapis" + IDS_AUDIO "audio zapis" + IDS_AVISTREAMFORMAT "%s %s #%d" + IDS_AVIFILETYPE "Wine AVI-default-filehandler" + IDS_UNCOMPRESSED "nesažeto" +}

1 0

Adam Martinson : msxml3: Implement schema_cache_addCollection().
by Alexandre Julliard 21 Oct '10

21 Oct '10

Module: wine Branch: master Commit: 491ec41f5a5433d9387a1da1de137819084fa033 URL: http://source.winehq.org/git/wine.git/?a=commit;h=491ec41f5a5433d9387a1da1d… Author: Adam Martinson <amartinson(a)codeweavers.com> Date: Wed Oct 20 16:36:50 2010 -0500 msxml3: Implement schema_cache_addCollection(). --- dlls/msxml3/schema.c | 25 +++++++++++++++++++++++-- dlls/msxml3/tests/schema.c | 19 +++++++++++++++++-- 2 files changed, 40 insertions(+), 4 deletions(-) diff --git a/dlls/msxml3/schema.c b/dlls/msxml3/schema.c index 7eadd51..2df038f 100644 --- a/dlls/msxml3/schema.c +++ b/dlls/msxml3/schema.c @@ -474,10 +474,31 @@ static HRESULT WINAPI schema_cache_get_namespaceURI(IXMLDOMSchemaCollection *ifa return E_NOTIMPL; } +static void cache_copy(void* data, void* dest, xmlChar* name) +{ + schema_cache* This = (schema_cache*) dest; + cache_entry* entry = (cache_entry*) data; + + if (xmlHashLookup(This->cache, name) == NULL) + { + cache_entry_add_ref(entry); + xmlHashAddEntry(This->cache, name, entry); + } +} + static HRESULT WINAPI schema_cache_addCollection(IXMLDOMSchemaCollection *iface, IXMLDOMSchemaCollection *otherCollection) { - FIXME("stub\n"); - return E_NOTIMPL; + schema_cache* This = impl_from_IXMLDOMSchemaCollection(iface); + schema_cache* That = impl_from_IXMLDOMSchemaCollection(otherCollection); + TRACE("(%p)->(%p)\n", This, That); + + if (!otherCollection) + return E_POINTER; + + /* TODO: detect errors while copying & return E_FAIL */ + xmlHashScan(That->cache, cache_copy, This); + + return S_OK; } static HRESULT WINAPI schema_cache_get__newEnum(IXMLDOMSchemaCollection *iface, IUnknown **ppUnk) diff --git a/dlls/msxml3/tests/schema.c b/dlls/msxml3/tests/schema.c index ba99c28..0754a1b 100644 --- a/dlls/msxml3/tests/schema.c +++ b/dlls/msxml3/tests/schema.c @@ -324,6 +324,7 @@ static void test_collection_refs(void) IXMLDOMDocument2 *schema1, *schema2, *schema3; IXMLDOMSchemaCollection *cache1, *cache2, *cache3; VARIANT_BOOL b; + LONG length; schema1 = create_document(&IID_IXMLDOMDocument2); schema2 = create_document(&IID_IXMLDOMDocument2); @@ -376,8 +377,22 @@ static void test_collection_refs(void) if (schema2) todo_wine check_refs(IXMLDOMDocument2, schema2, 1); if (schema3) todo_wine check_refs(IXMLDOMDocument2, schema3, 1); - todo_wine ole_check(IXMLDOMSchemaCollection_addCollection(cache2, cache1)); - todo_wine ole_check(IXMLDOMSchemaCollection_addCollection(cache3, cache2)); + ole_expect(IXMLDOMSchemaCollection_addCollection(cache1, NULL), E_POINTER); + ole_check(IXMLDOMSchemaCollection_addCollection(cache2, cache1)); + ole_check(IXMLDOMSchemaCollection_addCollection(cache3, cache2)); + + length = -1; + ole_check(IXMLDOMSchemaCollection_get_length(cache1, &length)); + ok(length == 1, "expected length 1, got %i", length); + + length = -1; + ole_check(IXMLDOMSchemaCollection_get_length(cache2, &length)); + ok(length == 2, "expected length 2, got %i", length); + + length = -1; + ole_check(IXMLDOMSchemaCollection_get_length(cache3, &length)); + ok(length == 3, "expected length 3, got %i", length); + /* merging collections does not affect the ref count */ check_refs(IXMLDOMSchemaCollection, cache1, 1);

1 0

Adam Martinson : msxml3: Implement schema_cache_get_namespaceURI().
by Alexandre Julliard 21 Oct '10

21 Oct '10

Module: wine Branch: master Commit: d87b8b8eb94e703cc4b910504e1a87e0d09162bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=d87b8b8eb94e703cc4b910504… Author: Adam Martinson <amartinson(a)codeweavers.com> Date: Wed Oct 20 16:37:06 2010 -0500 msxml3: Implement schema_cache_get_namespaceURI(). --- dlls/msxml3/schema.c | 29 +++++++++- dlls/msxml3/tests/schema.c | 138 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 165 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/schema.c b/dlls/msxml3/schema.c index 2df038f..93aa2ca 100644 --- a/dlls/msxml3/schema.c +++ b/dlls/msxml3/schema.c @@ -85,6 +85,12 @@ typedef struct _cache_entry LONG ref; } cache_entry; +typedef struct _cache_index_data +{ + LONG index; + BSTR* out; +} cache_index_data; + static LONG cache_entry_add_ref(cache_entry* entry) { LONG ref = InterlockedIncrement(&entry->ref); @@ -468,10 +474,29 @@ static HRESULT WINAPI schema_cache_get_length(IXMLDOMSchemaCollection *iface, LO return S_OK; } +static void cache_index(void* data /* ignored */, void* index, xmlChar* name) +{ + cache_index_data* index_data = (cache_index_data*)index; + + if (index_data->index-- == 0) + *index_data->out = bstr_from_xmlChar(name); +} + static HRESULT WINAPI schema_cache_get_namespaceURI(IXMLDOMSchemaCollection *iface, LONG index, BSTR *len) { - FIXME("stub\n"); - return E_NOTIMPL; + schema_cache* This = impl_from_IXMLDOMSchemaCollection(iface); + cache_index_data data = {index,len}; + TRACE("(%p)->(%i, %p)\n", This, index, len); + + if (!len) + return E_POINTER; + *len = NULL; + + if (index >= xmlHashSize(This->cache)) + return E_FAIL; + + xmlHashScan(This->cache, cache_index, &data); + return S_OK; } static void cache_copy(void* data, void* dest, xmlChar* name) diff --git a/dlls/msxml3/tests/schema.c b/dlls/msxml3/tests/schema.c index 0754a1b..69a0dc3 100644 --- a/dlls/msxml3/tests/schema.c +++ b/dlls/msxml3/tests/schema.c @@ -530,6 +530,143 @@ static void test_length(void) free_bstrs(); } +static void test_collection_content(void) +{ + IXMLDOMDocument2 *schema1, *schema2, *schema3, *schema4, *schema5; + IXMLDOMSchemaCollection *cache1, *cache2; + VARIANT_BOOL b; + BSTR bstr; + BSTR content[5] = {NULL, NULL, NULL, NULL, NULL}; + LONG length; + int i, j; + + schema1 = create_document_version(30, &IID_IXMLDOMDocument2); + schema2 = create_document_version(30, &IID_IXMLDOMDocument2); + schema3 = create_document_version(30, &IID_IXMLDOMDocument2); + + cache1 = create_cache_version(30, &IID_IXMLDOMSchemaCollection); + cache2 = create_cache_version(40, &IID_IXMLDOMSchemaCollection); + + if (!schema1 || !schema2 || !schema3 || !cache1) + { + if (schema1) IXMLDOMDocument2_Release(schema1); + if (schema2) IXMLDOMDocument2_Release(schema2); + if (schema3) IXMLDOMDocument2_Release(schema3); + + if (cache1) IXMLDOMSchemaCollection_Release(cache1); + + return; + } + + ole_check(IXMLDOMDocument2_loadXML(schema1, _bstr_(xdr_schema1_xml), &b)); + ok(b == VARIANT_TRUE, "failed to load XML\n"); + + ole_check(IXMLDOMDocument2_loadXML(schema2, _bstr_(xdr_schema2_xml), &b)); + ok(b == VARIANT_TRUE, "failed to load XML\n"); + + ole_check(IXMLDOMDocument2_loadXML(schema3, _bstr_(xdr_schema3_xml), &b)); + ok(b == VARIANT_TRUE, "failed to load XML\n"); + + ole_check(IXMLDOMSchemaCollection_add(cache1, _bstr_(xdr_schema1_uri), _variantdoc_(schema1))); + ole_check(IXMLDOMSchemaCollection_add(cache1, _bstr_(xdr_schema2_uri), _variantdoc_(schema2))); + ole_check(IXMLDOMSchemaCollection_add(cache1, _bstr_(xdr_schema3_uri), _variantdoc_(schema3))); + + length = -1; + ole_check(IXMLDOMSchemaCollection_get_length(cache1, &length)); + ok(length == 3, "expected length 3, got %i\n", length); + + IXMLDOMDocument2_Release(schema1); + IXMLDOMDocument2_Release(schema2); + IXMLDOMDocument2_Release(schema3); + + if (cache2) + { + schema1 = create_document_version(40, &IID_IXMLDOMDocument2); + schema2 = create_document_version(40, &IID_IXMLDOMDocument2); + schema3 = create_document_version(40, &IID_IXMLDOMDocument2); + schema4 = create_document_version(40, &IID_IXMLDOMDocument2); + schema5 = create_document_version(40, &IID_IXMLDOMDocument2); + ole_check(IXMLDOMDocument2_loadXML(schema1, _bstr_(xdr_schema1_xml), &b)); + ok(b == VARIANT_TRUE, "failed to load XML\n"); + ole_check(IXMLDOMDocument2_loadXML(schema2, _bstr_(xdr_schema2_xml), &b)); + ok(b == VARIANT_TRUE, "failed to load XML\n"); + ole_check(IXMLDOMDocument2_loadXML(schema3, _bstr_(xsd_schema1_xml), &b)); + ok(b == VARIANT_TRUE, "failed to load XML\n"); + ole_check(IXMLDOMDocument2_loadXML(schema4, _bstr_(xsd_schema2_xml), &b)); + ok(b == VARIANT_TRUE, "failed to load XML\n"); + ole_check(IXMLDOMDocument2_loadXML(schema5, _bstr_(xsd_schema3_xml), &b)); + ok(b == VARIANT_TRUE, "failed to load XML\n"); + + /* combining XDR and XSD schemas in the same cache is fine */ + ole_check(IXMLDOMSchemaCollection_add(cache2, _bstr_(xdr_schema1_uri), _variantdoc_(schema1))); + ole_check(IXMLDOMSchemaCollection_add(cache2, _bstr_(xdr_schema2_uri), _variantdoc_(schema2))); + ole_check(IXMLDOMSchemaCollection_add(cache2, _bstr_(xsd_schema1_uri), _variantdoc_(schema3))); + ole_check(IXMLDOMSchemaCollection_add(cache2, _bstr_(xsd_schema2_uri), _variantdoc_(schema4))); + ole_check(IXMLDOMSchemaCollection_add(cache2, _bstr_(xsd_schema3_uri), _variantdoc_(schema5))); + + length = -1; + ole_check(IXMLDOMSchemaCollection_get_length(cache2, &length)); + ok(length == 5, "expected length 5, got %i\n", length); + + IXMLDOMDocument2_Release(schema1); + IXMLDOMDocument2_Release(schema2); + IXMLDOMDocument2_Release(schema3); + IXMLDOMDocument2_Release(schema4); + IXMLDOMDocument2_Release(schema5); + } + + bstr = NULL; + /* error if index is out of range */ + ole_expect(IXMLDOMSchemaCollection_get_namespaceURI(cache1, 3, &bstr), E_FAIL); + if (bstr) SysFreeString(bstr); + /* error if return pointer is NULL */ + ole_expect(IXMLDOMSchemaCollection_get_namespaceURI(cache1, 0, NULL), E_POINTER); + /* pointer is checked first */ + ole_expect(IXMLDOMSchemaCollection_get_namespaceURI(cache1, 3, NULL), E_POINTER); + + for (i = 0; i < 3; ++i) + { + bstr = NULL; + ole_check(IXMLDOMSchemaCollection_get_namespaceURI(cache1, i, &bstr)); + ok(bstr != NULL && *bstr, "expected non-empty string\n"); + content[i] = bstr; + + for (j = 0; j < i; ++j) + ok(lstrcmpW(content[j], bstr), "got duplicate entry\n"); + } + + for (i = 0; i < 3; ++i) + { + SysFreeString(content[i]); + content[i] = NULL; + } + + if (cache2) + { + for (i = 0; i < 5; ++i) + { + bstr = NULL; + ole_check(IXMLDOMSchemaCollection_get_namespaceURI(cache2, i, &bstr)); + ok(bstr != NULL && *bstr, "expected non-empty string\n"); + + for (j = 0; j < i; ++j) + ok(lstrcmpW(content[j], bstr), "got duplicate entry\n"); + content[i] = bstr; + } + + for (i = 0; i < 5; ++i) + { + SysFreeString(content[i]); + content[i] = NULL; + } + } + + IXMLDOMSchemaCollection_Release(cache1); + if (cache2) IXMLDOMSchemaCollection_Release(cache2); + + free_bstrs(); +} + START_TEST(schema) { HRESULT r; @@ -540,6 +677,7 @@ START_TEST(schema) test_schema_refs(); test_collection_refs(); test_length(); + test_collection_content(); CoUninitialize(); }

1 0

Adam Martinson : msxml3: Implement schema_cache_get().
by Alexandre Julliard 21 Oct '10

21 Oct '10

Module: wine Branch: master Commit: 70f10e1a9f3dc468b446188bd96993ea2b3bafb8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=70f10e1a9f3dc468b446188bd… Author: Adam Martinson <amartinson(a)codeweavers.com> Date: Wed Oct 20 16:37:23 2010 -0500 msxml3: Implement schema_cache_get(). --- dlls/msxml3/schema.c | 20 +++++++++++++- dlls/msxml3/tests/schema.c | 58 +++++++++++++++++++++++++------------------ 2 files changed, 52 insertions(+), 26 deletions(-) diff --git a/dlls/msxml3/schema.c b/dlls/msxml3/schema.c index 93aa2ca..bf3bc7e 100644 --- a/dlls/msxml3/schema.c +++ b/dlls/msxml3/schema.c @@ -448,8 +448,24 @@ static HRESULT WINAPI schema_cache_add(IXMLDOMSchemaCollection *iface, BSTR uri, static HRESULT WINAPI schema_cache_get(IXMLDOMSchemaCollection *iface, BSTR uri, IXMLDOMNode **node) { - FIXME("stub\n"); - return E_NOTIMPL; + schema_cache* This = impl_from_IXMLDOMSchemaCollection(iface); + xmlChar* name; + cache_entry* entry; + TRACE("(%p)->(%s, %p)\n", This, wine_dbgstr_w(uri), node); + + if (!node) + return E_POINTER; + + name = xmlChar_from_wchar(uri); + entry = (cache_entry*) xmlHashLookup(This->cache, name); + heap_free(name); + + /* TODO: this should be read-only */ + if (entry) + return DOMDocument_create_from_xmldoc(entry->doc, (IXMLDOMDocument3**)node); + + *node = NULL; + return S_OK; } static HRESULT WINAPI schema_cache_remove(IXMLDOMSchemaCollection *iface, BSTR uri) diff --git a/dlls/msxml3/tests/schema.c b/dlls/msxml3/tests/schema.c index 69a0dc3..9b3a6eb 100644 --- a/dlls/msxml3/tests/schema.c +++ b/dlls/msxml3/tests/schema.c @@ -368,14 +368,14 @@ static void test_collection_refs(void) schema3 = NULL; /* releasing the original doc does not affect the schema cache */ - todo_wine ole_check(IXMLDOMSchemaCollection_get(cache1, _bstr_(xdr_schema1_uri), (IXMLDOMNode**)&schema1)); - todo_wine ole_check(IXMLDOMSchemaCollection_get(cache2, _bstr_(xdr_schema2_uri), (IXMLDOMNode**)&schema2)); - todo_wine ole_check(IXMLDOMSchemaCollection_get(cache3, _bstr_(xdr_schema3_uri), (IXMLDOMNode**)&schema3)); + ole_check(IXMLDOMSchemaCollection_get(cache1, _bstr_(xdr_schema1_uri), (IXMLDOMNode**)&schema1)); + ole_check(IXMLDOMSchemaCollection_get(cache2, _bstr_(xdr_schema2_uri), (IXMLDOMNode**)&schema2)); + ole_check(IXMLDOMSchemaCollection_get(cache3, _bstr_(xdr_schema3_uri), (IXMLDOMNode**)&schema3)); /* we get a read-only domdoc interface, created just for us */ - if (schema1) todo_wine check_refs(IXMLDOMDocument2, schema1, 1); - if (schema2) todo_wine check_refs(IXMLDOMDocument2, schema2, 1); - if (schema3) todo_wine check_refs(IXMLDOMDocument2, schema3, 1); + if (schema1) check_refs(IXMLDOMDocument2, schema1, 1); + if (schema2) check_refs(IXMLDOMDocument2, schema2, 1); + if (schema3) check_refs(IXMLDOMDocument2, schema3, 1); ole_expect(IXMLDOMSchemaCollection_addCollection(cache1, NULL), E_POINTER); ole_check(IXMLDOMSchemaCollection_addCollection(cache2, cache1)); @@ -400,26 +400,26 @@ static void test_collection_refs(void) check_refs(IXMLDOMSchemaCollection, cache3, 1); /* nor does it affect the domdoc instances */ - if (schema1) todo_wine check_refs(IXMLDOMDocument2, schema1, 1); - if (schema2) todo_wine check_refs(IXMLDOMDocument2, schema2, 1); - if (schema3) todo_wine check_refs(IXMLDOMDocument2, schema3, 1); + if (schema1) check_refs(IXMLDOMDocument2, schema1, 1); + if (schema2) check_refs(IXMLDOMDocument2, schema2, 1); + if (schema3) check_refs(IXMLDOMDocument2, schema3, 1); - if (schema1) todo_wine check_ref_expr(IXMLDOMDocument2_Release(schema1), 0); - if (schema2) todo_wine check_ref_expr(IXMLDOMDocument2_Release(schema2), 0); - if (schema3) todo_wine check_ref_expr(IXMLDOMDocument2_Release(schema3), 0); + if (schema1) check_ref_expr(IXMLDOMDocument2_Release(schema1), 0); + if (schema2) check_ref_expr(IXMLDOMDocument2_Release(schema2), 0); + if (schema3) check_ref_expr(IXMLDOMDocument2_Release(schema3), 0); schema1 = NULL; schema2 = NULL; schema3 = NULL; /* releasing the domdoc instances doesn't change the cache */ - todo_wine ole_check(IXMLDOMSchemaCollection_get(cache1, _bstr_(xdr_schema1_uri), (IXMLDOMNode**)&schema1)); - todo_wine ole_check(IXMLDOMSchemaCollection_get(cache2, _bstr_(xdr_schema2_uri), (IXMLDOMNode**)&schema2)); - todo_wine ole_check(IXMLDOMSchemaCollection_get(cache3, _bstr_(xdr_schema3_uri), (IXMLDOMNode**)&schema3)); + ole_check(IXMLDOMSchemaCollection_get(cache1, _bstr_(xdr_schema1_uri), (IXMLDOMNode**)&schema1)); + ole_check(IXMLDOMSchemaCollection_get(cache2, _bstr_(xdr_schema2_uri), (IXMLDOMNode**)&schema2)); + ole_check(IXMLDOMSchemaCollection_get(cache3, _bstr_(xdr_schema3_uri), (IXMLDOMNode**)&schema3)); /* we can just get them again */ - if (schema1) todo_wine check_refs(IXMLDOMDocument2, schema1, 1); - if (schema2) todo_wine check_refs(IXMLDOMDocument2, schema2, 1); - if (schema3) todo_wine check_refs(IXMLDOMDocument2, schema3, 1); + if (schema1) check_refs(IXMLDOMDocument2, schema1, 1); + if (schema2) check_refs(IXMLDOMDocument2, schema2, 1); + if (schema3) check_refs(IXMLDOMDocument2, schema3, 1); /* releasing the caches does not affect the domdoc instances */ check_ref_expr(IXMLDOMSchemaCollection_Release(cache1), 0); @@ -427,13 +427,13 @@ static void test_collection_refs(void) check_ref_expr(IXMLDOMSchemaCollection_Release(cache3), 0); /* they're just for us */ - if (schema1) todo_wine check_refs(IXMLDOMDocument2, schema1, 1); - if (schema2) todo_wine check_refs(IXMLDOMDocument2, schema2, 1); - if (schema3) todo_wine check_refs(IXMLDOMDocument2, schema3, 1); + if (schema1) check_refs(IXMLDOMDocument2, schema1, 1); + if (schema2) check_refs(IXMLDOMDocument2, schema2, 1); + if (schema3) check_refs(IXMLDOMDocument2, schema3, 1); - if (schema1) todo_wine check_ref_expr(IXMLDOMDocument2_Release(schema1), 0); - if (schema2) todo_wine check_ref_expr(IXMLDOMDocument2_Release(schema2), 0); - if (schema3) todo_wine check_ref_expr(IXMLDOMDocument2_Release(schema3), 0); + if (schema1) check_ref_expr(IXMLDOMDocument2_Release(schema1), 0); + if (schema2) check_ref_expr(IXMLDOMDocument2_Release(schema2), 0); + if (schema3) check_ref_expr(IXMLDOMDocument2_Release(schema3), 0); free_bstrs(); } @@ -624,6 +624,16 @@ static void test_collection_content(void) /* pointer is checked first */ ole_expect(IXMLDOMSchemaCollection_get_namespaceURI(cache1, 3, NULL), E_POINTER); + schema1 = NULL; + /* no error if ns uri does not exist */ + ole_check(IXMLDOMSchemaCollection_get(cache1, _bstr_(xsd_schema1_uri), (IXMLDOMNode**)&schema1)); + ok(!schema1, "expected NULL\n"); + /* a NULL bstr corresponds to no-uri ns */ + ole_check(IXMLDOMSchemaCollection_get(cache1, NULL, (IXMLDOMNode**)&schema1)); + ok(!schema1, "expected NULL\n"); + /* error if return pointer is NULL */ + ole_expect(IXMLDOMSchemaCollection_get(cache1, _bstr_(xdr_schema1_uri), NULL), E_POINTER); + for (i = 0; i < 3; ++i) { bstr = NULL;

1 0

Adam Martinson : msxml3: IXMLDOMSchemaCollection2 stubs.
by Alexandre Julliard 21 Oct '10

21 Oct '10

Module: wine Branch: master Commit: 0abee56788bce211841cc0f31088a6d860fd99ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=0abee56788bce211841cc0f31… Author: Adam Martinson <amartinson(a)codeweavers.com> Date: Wed Oct 20 16:38:31 2010 -0500 msxml3: IXMLDOMSchemaCollection2 stubs. --- dlls/msxml3/schema.c | 160 ++++++++++++++++++++++++++++++++------------------ 1 files changed, 102 insertions(+), 58 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0abee56788bce211841cc…

1 0

Adam Martinson : msxml3: Fix a regression bug in domdoc_loadXML().
by Alexandre Julliard 21 Oct '10

21 Oct '10

Module: wine Branch: master Commit: fd9bcfcfe812c0c4f13f9c081e8d029d3966b605 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd9bcfcfe812c0c4f13f9c081… Author: Adam Martinson <amartinson(a)codeweavers.com> Date: Wed Oct 20 17:00:21 2010 -0500 msxml3: Fix a regression bug in domdoc_loadXML(). Caused by commit 776a8662f088e75e88284cc0fc8e72d768771a6f. Fixes parse failures for BSTR's where encoding is explicitly UTF-16. --- dlls/msxml3/domdoc.c | 43 +++++++++++++++++++++++++++++++++++++------ 1 files changed, 37 insertions(+), 6 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index c401100..7669220 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -51,6 +51,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(msxml); #include <libxml/xpathInternals.h> #include <libxml/xmlsave.h> #include <libxml/SAX2.h> +#include <libxml/parserInternals.h> /* not defined in older versions */ #define XML_SAVE_FORMAT 1 @@ -321,9 +322,10 @@ static void sax_characters(void *ctx, const xmlChar *ch, int len) xmlSAX2Characters(ctx, ch, len); } -static xmlDocPtr doparse(domdoc* This, char *ptr, int len) +static xmlDocPtr doparse(domdoc* This, char *ptr, int len, xmlChar const* encoding) { - xmlDocPtr doc; + xmlDocPtr doc = NULL; + xmlParserCtxtPtr pctx; static xmlSAXHandler sax_handler = { xmlSAX2InternalSubset, /* internalSubset */ xmlSAX2IsStandalone, /* isStandalone */ @@ -358,8 +360,33 @@ static xmlDocPtr doparse(domdoc* This, char *ptr, int len) xmlSAX2EndElementNs, /* endElementNs */ NULL /* TODO: serror */ }; + xmlInitParser(); - doc = xmlSAXParseMemoryWithData(&sax_handler, ptr, len, 0, This); + pctx = xmlCreateMemoryParserCtxt(ptr, len); + if (!pctx) + { + ERR("Failed to create parser context\n"); + return NULL; + } + + if (pctx->sax) xmlFree(pctx->sax); + pctx->sax = &sax_handler; + pctx->_private = This; + pctx->recovery = 0; + pctx->encoding = xmlStrdup(encoding); + xmlParseDocument(pctx); + + if (pctx->wellFormed) + { + doc = pctx->myDoc; + } + else + { + xmlFreeDoc(pctx->myDoc); + pctx->myDoc = NULL; + } + pctx->sax = NULL; + xmlFreeParserCtxt(pctx); /* TODO: put this in one of the SAX callbacks */ /* create first child as a <?xml...?> */ @@ -597,7 +624,7 @@ static HRESULT WINAPI domdoc_IPersistStreamInit_Load( len = GlobalSize(hglobal); ptr = GlobalLock(hglobal); if (len != 0) - xmldoc = doparse(This, ptr, len); + xmldoc = doparse(This, ptr, len, NULL); GlobalUnlock(hglobal); if (!xmldoc) @@ -1789,7 +1816,7 @@ static HRESULT domdoc_onDataAvailable(void *obj, char *ptr, DWORD len) domdoc *This = obj; xmlDocPtr xmldoc; - xmldoc = doparse(This, ptr, len); + xmldoc = doparse(This, ptr, len, NULL); if(xmldoc) { xmldoc->_private = create_priv(); return attach_xmldoc(This, xmldoc); @@ -2017,6 +2044,7 @@ static HRESULT WINAPI domdoc_loadXML( VARIANT_BOOL* isSuccessful ) { domdoc *This = impl_from_IXMLDOMDocument3( iface ); + static const xmlChar encoding[] = "UTF-8"; xmlDocPtr xmldoc = NULL; HRESULT hr = S_FALSE, hr2; char *str; @@ -2032,10 +2060,13 @@ static HRESULT WINAPI domdoc_loadXML( if ( bstrXML && bstr_to_utf8( bstrXML, &str, &len ) ) { - xmldoc = doparse(This, str, len); + xmldoc = doparse(This, str, len, encoding); heap_free( str ); if ( !xmldoc ) + { This->error = E_FAIL; + TRACE("failed to parse document\n"); + } else { hr = This->error = S_OK;

1 0