April 2012 - Wine-commits - list.winehq.org

Francois Gouget : po: Fix a few line feed / line wrapping issues in the Esperanto translation.
by Alexandre Julliard 20 Apr '12

20 Apr '12

Module: wine Branch: master Commit: 2d4926c6449c0d939a37b05b1974ff82e71d018b URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d4926c6449c0d939a37b05b1… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Apr 19 22:26:04 2012 +0200 po: Fix a few line feed / line wrapping issues in the Esperanto translation. --- po/eo.po | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/po/eo.po b/po/eo.po index 8aa443f..5f00ef0 100644 --- a/po/eo.po +++ b/po/eo.po @@ -2752,9 +2752,7 @@ msgstr "" #: cryptui.rc:152 msgid "The specified file already exists. Do you want to replace it?" -msgstr "" -"Dosiero estas jam ekzistanta.\n" -"Ĉu vi volas anstataŭi ĝin?" +msgstr "Dosiero estas jam ekzistanta. Ĉu vi volas anstataŭi ĝin?" #: cryptui.rc:153 msgid "DER-Encoded Binary X.509 (*.cer)" @@ -7951,6 +7949,7 @@ msgid "" "Do you want to replace it?" msgstr "" "Dosiero jam ekzistas je vojo %1.\n" +"\n" "Ĉu vi volas anstataŭi ĝin?" #: shell32.rc:247 @@ -7960,6 +7959,7 @@ msgid "" "Do you want to replace it?" msgstr "" "Dosierujo jam ekzistas je %1.\n" +"\n" "Ĉu vi volas anstataŭi ĝin?" #: shell32.rc:248

1 0

Henri Verbeet : d3d8: Properly retrieve an interface pointer in IDirect3DSwapChain8Impl_GetBackBuffer ().
by Alexandre Julliard 20 Apr '12

20 Apr '12

Module: wine Branch: master Commit: 532d2246928d1fe17b55989a0e21eeea5e58aa84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=532d2246928d1fe17b55989a0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 19 20:44:56 2012 +0200 d3d8: Properly retrieve an interface pointer in IDirect3DSwapChain8Impl_GetBackBuffer(). --- dlls/d3d8/swapchain.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/d3d8/swapchain.c b/dlls/d3d8/swapchain.c index 8979519..9d2da09 100644 --- a/dlls/d3d8/swapchain.c +++ b/dlls/d3d8/swapchain.c @@ -110,6 +110,7 @@ static HRESULT WINAPI IDirect3DSwapChain8Impl_GetBackBuffer(IDirect3DSwapChain8 { IDirect3DSwapChain8Impl *This = impl_from_IDirect3DSwapChain8(iface); struct wined3d_surface *wined3d_surface = NULL; + IDirect3DSurface8Impl *surface_impl; HRESULT hr; TRACE("iface %p, backbuffer_idx %u, backbuffer_type %#x, backbuffer %p.\n", @@ -120,7 +121,8 @@ static HRESULT WINAPI IDirect3DSwapChain8Impl_GetBackBuffer(IDirect3DSwapChain8 iBackBuffer, (enum wined3d_backbuffer_type)Type, &wined3d_surface); if (SUCCEEDED(hr) && wined3d_surface) { - *ppBackBuffer = wined3d_surface_get_parent(wined3d_surface); + surface_impl = wined3d_surface_get_parent(wined3d_surface); + *ppBackBuffer = &surface_impl->IDirect3DSurface8_iface; IDirect3DSurface8_AddRef(*ppBackBuffer); wined3d_surface_decref(wined3d_surface); }

1 0

Henri Verbeet : d3d8: Use the surface implementation pointer in reset_enum_callback().
by Alexandre Julliard 20 Apr '12

20 Apr '12

Module: wine Branch: master Commit: 5cc7d0645b71cb6cb1656ad8df70946674a50b78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5cc7d0645b71cb6cb1656ad8d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 19 20:44:57 2012 +0200 d3d8: Use the surface implementation pointer in reset_enum_callback(). --- dlls/d3d8/device.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index ea2ce17..36296d2 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -535,7 +535,7 @@ static HRESULT CDECL reset_enum_callback(struct wined3d_resource *resource) wined3d_resource_get_desc(resource, &desc); if (desc.pool == WINED3D_POOL_DEFAULT) { - IDirect3DSurface8 *surface; + IDirect3DSurface8Impl *surface; if (desc.resource_type != WINED3D_RTYPE_SURFACE) { @@ -544,9 +544,7 @@ static HRESULT CDECL reset_enum_callback(struct wined3d_resource *resource) } surface = wined3d_resource_get_parent(resource); - - IDirect3DSurface8_AddRef(surface); - if (IDirect3DSurface8_Release(surface)) + if (surface->ref) { WARN("Surface %p (resource %p) in pool D3DPOOL_DEFAULT blocks the Reset call.\n", surface, resource); return D3DERR_DEVICELOST;

1 0

Henri Verbeet : d3d8: Properly retrieve an interface pointer in IDirect3DDevice8Impl_GetBackBuffer ().
by Alexandre Julliard 20 Apr '12

20 Apr '12

Module: wine Branch: master Commit: 230c5fc7f9c94fd31d4aab2e79e83457ceefcd3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=230c5fc7f9c94fd31d4aab2e7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 19 20:44:58 2012 +0200 d3d8: Properly retrieve an interface pointer in IDirect3DDevice8Impl_GetBackBuffer(). --- dlls/d3d8/device.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 36296d2..0a0e35d 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -619,6 +619,7 @@ static HRESULT WINAPI IDirect3DDevice8Impl_GetBackBuffer(IDirect3DDevice8 *iface { IDirect3DDevice8Impl *This = impl_from_IDirect3DDevice8(iface); struct wined3d_surface *wined3d_surface = NULL; + IDirect3DSurface8Impl *surface_impl; HRESULT hr; TRACE("iface %p, backbuffer_idx %u, backbuffer_type %#x, backbuffer %p.\n", @@ -629,7 +630,8 @@ static HRESULT WINAPI IDirect3DDevice8Impl_GetBackBuffer(IDirect3DDevice8 *iface BackBuffer, (enum wined3d_backbuffer_type)Type, &wined3d_surface); if (SUCCEEDED(hr) && wined3d_surface && ppBackBuffer) { - *ppBackBuffer = wined3d_surface_get_parent(wined3d_surface); + surface_impl = wined3d_surface_get_parent(wined3d_surface); + *ppBackBuffer = &surface_impl->IDirect3DSurface8_iface; IDirect3DSurface8_AddRef(*ppBackBuffer); wined3d_surface_decref(wined3d_surface); }

1 0

Henri Verbeet : dxgi: COM cleanup for the surface IUnknown interface.
by Alexandre Julliard 20 Apr '12

20 Apr '12

Module: wine Branch: master Commit: 5d358a2bac82229a7c9bafa3381b252d9506da7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d358a2bac82229a7c9bafa33… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 19 20:44:59 2012 +0200 dxgi: COM cleanup for the surface IUnknown interface. --- dlls/dxgi/device.c | 2 +- dlls/dxgi/dxgi_private.h | 2 +- dlls/dxgi/surface.c | 36 ++++++++++++++++++------------------ 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/dlls/dxgi/device.c b/dlls/dxgi/device.c index bc01b16..3115032 100644 --- a/dlls/dxgi/device.c +++ b/dlls/dxgi/device.c @@ -284,7 +284,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_device_create_surface(IWineDXGIDevice *ifa } TRACE("Created IDXGISurface %p\n", object); - *surface = outer ? (void *)&object->inner_unknown_vtbl : object; + *surface = outer ? &object->IUnknown_iface : (IUnknown *)&object->IDXGISurface_iface; return S_OK; } diff --git a/dlls/dxgi/dxgi_private.h b/dlls/dxgi/dxgi_private.h index 533f1fa..4c426ba 100644 --- a/dlls/dxgi/dxgi_private.h +++ b/dlls/dxgi/dxgi_private.h @@ -136,7 +136,7 @@ HRESULT dxgi_swapchain_init(struct dxgi_swapchain *swapchain, struct dxgi_device struct dxgi_surface { IDXGISurface IDXGISurface_iface; - const struct IUnknownVtbl *inner_unknown_vtbl; + IUnknown IUnknown_iface; IUnknown *outer_unknown; LONG refcount; IDXGIDevice *device; diff --git a/dlls/dxgi/surface.c b/dlls/dxgi/surface.c index 374832b..f7fa931 100644 --- a/dlls/dxgi/surface.c +++ b/dlls/dxgi/surface.c @@ -26,54 +26,54 @@ WINE_DEFAULT_DEBUG_CHANNEL(dxgi); /* Inner IUnknown methods */ -static inline struct dxgi_surface *dxgi_surface_from_inner_unknown(IUnknown *iface) +static inline struct dxgi_surface *impl_from_IUnknown(IUnknown *iface) { - return (struct dxgi_surface *)((char*)iface - FIELD_OFFSET(struct dxgi_surface, inner_unknown_vtbl)); + return CONTAINING_RECORD(iface, struct dxgi_surface, IUnknown_iface); } -static HRESULT STDMETHODCALLTYPE dxgi_surface_inner_QueryInterface(IUnknown *iface, REFIID riid, void **object) +static HRESULT STDMETHODCALLTYPE dxgi_surface_inner_QueryInterface(IUnknown *iface, REFIID riid, void **out) { - struct dxgi_surface *This = dxgi_surface_from_inner_unknown(iface); + struct dxgi_surface *surface = impl_from_IUnknown(iface); - TRACE("iface %p, riid %s, object %p\n", iface, debugstr_guid(riid), object); + TRACE("iface %p, riid %s, out %p.\n", iface, debugstr_guid(riid), out); if (IsEqualGUID(riid, &IID_IDXGISurface) || IsEqualGUID(riid, &IID_IDXGIDeviceSubObject) || IsEqualGUID(riid, &IID_IDXGIObject) || IsEqualGUID(riid, &IID_IUnknown)) { - IDXGISurface_AddRef(&This->IDXGISurface_iface); - *object = &This->IDXGISurface_iface; + IDXGISurface_AddRef(&surface->IDXGISurface_iface); + *out = &surface->IDXGISurface_iface; return S_OK; } WARN("%s not implemented, returning E_NOINTERFACE\n", debugstr_guid(riid)); - *object = NULL; + *out = NULL; return E_NOINTERFACE; } static ULONG STDMETHODCALLTYPE dxgi_surface_inner_AddRef(IUnknown *iface) { - struct dxgi_surface *This = dxgi_surface_from_inner_unknown(iface); - ULONG refcount = InterlockedIncrement(&This->refcount); + struct dxgi_surface *surface = impl_from_IUnknown(iface); + ULONG refcount = InterlockedIncrement(&surface->refcount); - TRACE("%p increasing refcount to %u\n", This, refcount); + TRACE("%p increasing refcount to %u.\n", surface, refcount); return refcount; } static ULONG STDMETHODCALLTYPE dxgi_surface_inner_Release(IUnknown *iface) { - struct dxgi_surface *This = dxgi_surface_from_inner_unknown(iface); - ULONG refcount = InterlockedDecrement(&This->refcount); + struct dxgi_surface *surface = impl_from_IUnknown(iface); + ULONG refcount = InterlockedDecrement(&surface->refcount); - TRACE("%p decreasing refcount to %u\n", This, refcount); + TRACE("%p decreasing refcount to %u.\n", surface, refcount); if (!refcount) { - IDXGIDevice_Release(This->device); - HeapFree(GetProcessHeap(), 0, This); + IDXGIDevice_Release(surface->device); + HeapFree(GetProcessHeap(), 0, surface); } return refcount; @@ -206,9 +206,9 @@ static const struct IUnknownVtbl dxgi_surface_inner_unknown_vtbl = HRESULT dxgi_surface_init(struct dxgi_surface *surface, IDXGIDevice *device, IUnknown *outer) { surface->IDXGISurface_iface.lpVtbl = &dxgi_surface_vtbl; - surface->inner_unknown_vtbl = &dxgi_surface_inner_unknown_vtbl; + surface->IUnknown_iface.lpVtbl = &dxgi_surface_inner_unknown_vtbl; surface->refcount = 1; - surface->outer_unknown = outer ? outer : (IUnknown *)&surface->inner_unknown_vtbl; + surface->outer_unknown = outer ? outer : &surface->IUnknown_iface; surface->device = device; IDXGIDevice_AddRef(device);

1 0

Henri Verbeet : ddraw/tests: Add a helper function to set the viewport background material.
by Alexandre Julliard 20 Apr '12

20 Apr '12

Module: wine Branch: master Commit: e744bf78c85d083771f2f42269c7069d756f5280 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e744bf78c85d083771f2f4226… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 19 20:45:00 2012 +0200 ddraw/tests: Add a helper function to set the viewport background material. --- dlls/ddraw/tests/ddraw1.c | 40 +++++++++++++++----------------------- dlls/ddraw/tests/ddraw2.c | 47 ++++++++++++++++---------------------------- 2 files changed, 33 insertions(+), 54 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e744bf78c85d083771f2f…

1 0

André Hentschel : winedbg: Add "load address" and new nops to the Thumb disassembler.
by Alexandre Julliard 20 Apr '12

20 Apr '12

Module: wine Branch: master Commit: 474791fd89b5dff791d238958141d3e94e53e0f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=474791fd89b5dff791d238958… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Apr 19 23:05:04 2012 +0200 winedbg: Add "load address" and new nops to the Thumb disassembler. --- programs/winedbg/be_arm.c | 30 ++++++++++++++++++++---------- 1 files changed, 20 insertions(+), 10 deletions(-) diff --git a/programs/winedbg/be_arm.c b/programs/winedbg/be_arm.c index db7931d..92d4094 100644 --- a/programs/winedbg/be_arm.c +++ b/programs/winedbg/be_arm.c @@ -332,6 +332,12 @@ static WORD thumb_disasm_hireg(WORD inst, ADDRESS64 *addr) if (h1) dst += 8; if (h2) src += 8; + if (op == 2 && dst == src) /* mov rx, rx */ + { + dbg_printf("\n\tnop"); + return 0; + } + if (op == 3) dbg_printf("\n\tb%sx\t%s", h1?"l":"", tbl_regs[src]); else @@ -398,6 +404,15 @@ static WORD thumb_disasm_condbranch(WORD inst, ADDRESS64 *addr) return 0; } +static WORD thumb_disasm_loadadr(WORD inst, ADDRESS64 *addr) +{ + WORD src = (inst >> 11) & 0x01; + WORD offset = (inst & 0xff) << 2; + + dbg_printf("\n\tadd\t%s, %s, #%d", tbl_regs[(inst >> 8) & 0x07], src ? "sp" : "pc", offset); + return 0; +} + static WORD thumb_disasm_swi(WORD inst, ADDRESS64 *addr) { WORD comment = inst & 0x00ff; @@ -506,6 +521,7 @@ static const struct inst_thumb16 tbl_thumb16[] = { { 0xf600, 0xb400, thumb_disasm_blocktrans }, { 0xf800, 0xf000, thumb_disasm_longbl }, { 0xf000, 0xd000, thumb_disasm_condbranch }, + { 0xf000, 0xa000, thumb_disasm_loadadr }, { 0xf800, 0x4800, thumb_disasm_ldrpcrel }, { 0xf000, 0x9000, thumb_disasm_ldrsprel }, { 0xff00, 0xb000, thumb_disasm_addsprel }, @@ -514,7 +530,7 @@ static const struct inst_thumb16 tbl_thumb16[] = { { 0xf000, 0xd000, thumb_disasm_condbranch }, { 0xff00, 0xdf00, thumb_disasm_swi }, { 0xff00, 0xbf00, thumb_disasm_nop }, - { 0xfc00, 0x1c00, thumb_disasm_addsub }, + { 0xf800, 0x1800, thumb_disasm_addsub }, { 0xe000, 0x0000, thumb_disasm_movshift }, { 0x0000, 0x0000, NULL } }; @@ -538,7 +554,7 @@ void be_arm_disasm_one_insn(ADDRESS64 *addr, int display) DWORD_PTR* pval; if (!memory_get_register(CV_ARM_CPSR, &pval, tmp, sizeof(tmp))) - dbg_printf("\n\tmemory_get_register failed: %s\n",tmp); + dbg_printf("\n\tmemory_get_register failed: %s", tmp); else db_disasm_thumb=(*pval & 0x20)?TRUE:FALSE; @@ -559,17 +575,14 @@ void be_arm_disasm_one_insn(ADDRESS64 *addr, int display) } if (!matched) { - dbg_printf("\n\tUnknown Instruction: %08x\n", inst); + dbg_printf("\n\tUnknown Instruction: %08x", inst); addr->Offset += size; return; } else { if (!a_ptr->func(inst)) - { - dbg_printf("\n"); addr->Offset += size; - } return; } } @@ -585,17 +598,14 @@ void be_arm_disasm_one_insn(ADDRESS64 *addr, int display) } if (!matched) { - dbg_printf("\n\tUnknown Instruction: %08x\n", tinst); + dbg_printf("\n\tUnknown Instruction: %04x", tinst); addr->Offset += size; return; } else { if (!t_ptr->func(tinst, addr)) - { - dbg_printf("\n"); addr->Offset += size; - } } return; }

1 0

Nikolay Sivov : msxml3: Support 'namespace-prefixes' feature.
by Alexandre Julliard 20 Apr '12

20 Apr '12

Module: wine Branch: master Commit: 4fb5872bd233c924cadbf3a4011dcd622765e047 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4fb5872bd233c924cadbf3a40… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Apr 20 11:03:18 2012 +0400 msxml3: Support 'namespace-prefixes' feature. --- dlls/msxml3/saxreader.c | 43 ++++++++++++--------- dlls/msxml3/tests/saxreader.c | 83 ++++++++++++++++++++++++++++++++++++++-- 2 files changed, 102 insertions(+), 24 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index eb66899..a5b7a32 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -1160,9 +1160,13 @@ static HRESULT SAXAttributes_populate(saxlocator *locator, static const WCHAR xmlnsW[] = { 'x','m','l','n','s',0 }; struct _attributes *attrs; - int index; + int i; + + /* skip namespace definitions */ + if ((locator->saxreader->features & NamespacePrefixes) == 0) + nb_namespaces = 0; - locator->nb_attributes = nb_namespaces+nb_attributes; + locator->nb_attributes = nb_namespaces + nb_attributes; if(locator->nb_attributes > locator->attributesSize) { attrs = heap_realloc(locator->attributes, sizeof(struct _attributes)*locator->nb_attributes*2); @@ -1178,31 +1182,31 @@ static HRESULT SAXAttributes_populate(saxlocator *locator, attrs = locator->attributes; } - for(index=0; index<nb_namespaces; index++) + for (i = 0; i < nb_namespaces; i++) { - attrs[nb_attributes+index].szLocalname = SysAllocStringLen(NULL, 0); - attrs[nb_attributes+index].szURI = locator->namespaceUri; - attrs[nb_attributes+index].szValue = bstr_from_xmlChar(xmlNamespaces[2*index+1]); - if(!xmlNamespaces[2*index]) - attrs[nb_attributes+index].szQName = SysAllocString(xmlnsW); + attrs[nb_attributes+i].szLocalname = SysAllocStringLen(NULL, 0); + attrs[nb_attributes+i].szURI = locator->namespaceUri; + attrs[nb_attributes+i].szValue = bstr_from_xmlChar(xmlNamespaces[2*i+1]); + if(!xmlNamespaces[2*i]) + attrs[nb_attributes+i].szQName = SysAllocString(xmlnsW); else - attrs[nb_attributes+index].szQName = QName_from_xmlChar(xmlns, xmlNamespaces[2*index]); + attrs[nb_attributes+i].szQName = QName_from_xmlChar(xmlns, xmlNamespaces[2*i]); } - for(index=0; index<nb_attributes; index++) + for (i = 0; i < nb_attributes; i++) { static const xmlChar xmlA[] = "xml"; - if (xmlStrEqual(xmlAttributes[index*5+1], xmlA)) - attrs[index].szURI = bstr_from_xmlChar(xmlAttributes[index*5+2]); + if (xmlStrEqual(xmlAttributes[i*5+1], xmlA)) + attrs[i].szURI = bstr_from_xmlChar(xmlAttributes[i*5+2]); else - attrs[index].szURI = find_element_uri(locator, xmlAttributes[index*5+2]); + attrs[i].szURI = find_element_uri(locator, xmlAttributes[i*5+2]); - attrs[index].szLocalname = bstr_from_xmlChar(xmlAttributes[index*5]); - attrs[index].szValue = bstr_from_xmlCharN(xmlAttributes[index*5+3], - xmlAttributes[index*5+4]-xmlAttributes[index*5+3]); - attrs[index].szQName = QName_from_xmlChar(xmlAttributes[index*5+1], - xmlAttributes[index*5]); + attrs[i].szLocalname = bstr_from_xmlChar(xmlAttributes[i*5]); + attrs[i].szValue = bstr_from_xmlCharN(xmlAttributes[i*5+3], + xmlAttributes[i*5+4]-xmlAttributes[i*5+3]); + attrs[i].szQName = QName_from_xmlChar(xmlAttributes[i*5+1], + xmlAttributes[i*5]); } return S_OK; @@ -2849,7 +2853,8 @@ static HRESULT WINAPI saxxmlreader_putFeature( /* accepted cases */ if ((feature == ExternalGeneralEntities && value == VARIANT_FALSE) || (feature == ExternalParameterEntities && value == VARIANT_FALSE) || - feature == Namespaces) + feature == Namespaces || + feature == NamespacePrefixes) { return set_feature_value(This, feature, value); } diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index 5c768f4..00a3553 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -787,6 +787,50 @@ static struct call_entry content_handler_test_attributes_alternate_6[] = { { CH_ENDTEST } }; +/* 'namespaces' is on, 'namespace-prefixes' if off */ +static struct attribute_entry ch_attributes_no_prefix[] = { + { "prefix_test", "arg1", "test:arg1", "arg1" }, + { "", "arg2", "arg2", "arg2" }, + { "prefix_test", "ar3", "test:ar3", "arg3" }, + { NULL } +}; + +static struct call_entry content_handler_test_attributes_alt_no_prefix[] = { + { CH_PUTDOCUMENTLOCATOR, 1, 0, S_OK }, + { CH_STARTDOCUMENT, 1, 22, S_OK }, + { CH_STARTPREFIXMAPPING, 2, 95, S_OK, "test", "prefix_test" }, + { CH_STARTPREFIXMAPPING, 2, 95, S_OK, "", "prefix" }, + { CH_STARTELEMENT, 2, 95, S_OK, "prefix", "document", "document", ch_attributes_no_prefix }, + { CH_CHARACTERS, 3, 1, S_OK, "\n" }, + { CH_STARTPREFIXMAPPING, 3, 24, S_OK, "p", "test" }, + { CH_STARTELEMENT, 3, 24, S_OK, "prefix", "node1", "node1", NULL }, + { CH_ENDELEMENT, 3, 24, S_OK, "prefix", "node1", "node1" }, + { CH_ENDPREFIXMAPPING, 3, 24, S_OK, "p" }, + { CH_ENDELEMENT, 3, 35, S_OK, "prefix", "document", "document" }, + { CH_ENDPREFIXMAPPING, 3, 35, S_OK, "test" }, + { CH_ENDPREFIXMAPPING, 3, 35, S_OK, "" }, + { CH_ENDDOCUMENT, 4, 0, S_OK }, + { CH_ENDTEST } +}; + +static struct call_entry content_handler_test_attributes_no_prefix[] = { + { CH_PUTDOCUMENTLOCATOR, 0, 0, S_OK }, + { CH_STARTDOCUMENT, 0, 0, S_OK }, + { CH_STARTPREFIXMAPPING, 2, 96, S_OK, "test", "prefix_test" }, + { CH_STARTPREFIXMAPPING, 2, 96, S_OK, "", "prefix" }, + { CH_STARTELEMENT, 2, 96, S_OK, "prefix", "document", "document", ch_attributes_no_prefix }, + { CH_CHARACTERS, 2, 96, S_OK, "\n" }, + { CH_STARTPREFIXMAPPING, 3, 25, S_OK, "p", "test" }, + { CH_STARTELEMENT, 3, 25, S_OK, "prefix", "node1", "node1", NULL }, + { CH_ENDELEMENT, 3, 25, S_OK, "prefix", "node1", "node1" }, + { CH_ENDPREFIXMAPPING, 3, 25, S_OK, "p" }, + { CH_ENDELEMENT, 3, 27, S_OK, "prefix", "document", "document" }, + { CH_ENDPREFIXMAPPING, 3, 27, S_OK, "" }, + { CH_ENDPREFIXMAPPING, 3, 27, S_OK, "test" }, + { CH_ENDDOCUMENT, 0, 0 }, + { CH_ENDTEST } +}; + static struct attribute_entry xmlspace_attrs[] = { { "http://www.w3.org/XML/1998/namespace", "space", "xml:space", "preserve" }, { NULL } @@ -1765,12 +1809,12 @@ static void test_saxreader(void) static const CHAR testXmlA[] = "test.xml"; static const WCHAR testXmlW[] = {'t','e','s','t','.','x','m','l',0}; IXMLDOMDocument *doc; - BSTR str; VARIANT_BOOL v; while (table->clsid) { struct call_entry *test_seq; + BSTR str; if (!is_clsid_supported(table->clsid, reader_support_data)) { @@ -1967,6 +2011,7 @@ static void test_saxreader(void) str = SysAllocString(szSimpleXML); hr = IXMLDOMDocument_loadXML(doc, str, &v); EXPECT_HR(hr, S_OK); + SysFreeString(str); V_VT(&var) = VT_UNKNOWN; V_UNKNOWN(&var) = (IUnknown*)doc; @@ -2031,15 +2076,42 @@ static void test_saxreader(void) hr = ISAXXMLReader_parse(reader, var); EXPECT_HR(hr, S_OK); ok_sequence(sequences, CONTENT_HANDLER_INDEX, test_seq, "content test attributes", TRUE); + hr = ISAXXMLReader_putFeature(reader, _bstr_("http://xml.org/sax/features/namespaces"), VARIANT_TRUE); + EXPECT_HR(hr, S_OK); + + /* switch off 'namespace-prefixes' feature */ + hr = ISAXXMLReader_putFeature(reader, _bstr_("http://xml.org/sax/features/namespace-prefixes"), VARIANT_FALSE); + EXPECT_HR(hr, S_OK); + + CreateStreamOnHGlobal(NULL, TRUE, &stream); + size.QuadPart = strlen(test_attributes); + IStream_SetSize(stream, size); + IStream_Write(stream, test_attributes, strlen(test_attributes), &written); + pos.QuadPart = 0; + IStream_Seek(stream, pos, STREAM_SEEK_SET, NULL); + V_VT(&var) = VT_UNKNOWN|VT_DISPATCH; + V_UNKNOWN(&var) = (IUnknown*)stream; + + if (IsEqualGUID(table->clsid, &CLSID_SAXXMLReader40) || + IsEqualGUID(table->clsid, &CLSID_SAXXMLReader60)) + { + test_seq = content_handler_test_attributes_alt_no_prefix; + } + else + test_seq = content_handler_test_attributes_no_prefix; + + set_expected_seq(test_seq); + hr = ISAXXMLReader_parse(reader, var); + EXPECT_HR(hr, S_OK); + ok_sequence(sequences, CONTENT_HANDLER_INDEX, test_seq, "content test attributes", FALSE); + + hr = ISAXXMLReader_putFeature(reader, _bstr_("http://xml.org/sax/features/namespace-prefixes"), VARIANT_TRUE); + EXPECT_HR(hr, S_OK); ISAXXMLReader_Release(reader); table++; } - return; - - ISAXXMLReader_Release(reader); - SysFreeString(str); free_bstrs(); } @@ -2161,6 +2233,7 @@ static const struct feature_ns_entry_t feature_ns_entry_data[] = { static const char *feature_names[] = { "http://xml.org/sax/features/namespaces", + "http://xml.org/sax/features/namespace-prefixes", 0 };

1 0

Hans Leidekker : msi: Fix install state detection for registry components.
by Alexandre Julliard 20 Apr '12

20 Apr '12

Module: wine Branch: master Commit: fc73c9db0aeeedc4084e37e7b8493f9e8d94ac00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc73c9db0aeeedc4084e37e7b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Apr 20 10:55:52 2012 +0200 msi: Fix install state detection for registry components. --- dlls/msi/msi.c | 2 +- dlls/msi/tests/msi.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index 4d18265..4783573 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -2217,7 +2217,7 @@ UINT WINAPI MsiQueryComponentStateW(LPCWSTR szProductCode, else { if (lstrlenW(val) > 2 && - val[0] >= '0' && val[0] <= '9' && val[1] >= '0' && val[1] <= '9') + val[0] >= '0' && val[0] <= '9' && val[1] >= '0' && val[1] <= '9' && val[2] != ':') { *pdwState = INSTALLSTATE_SOURCE; } diff --git a/dlls/msi/tests/msi.c b/dlls/msi/tests/msi.c index 8768d2a..f7d0717 100644 --- a/dlls/msi/tests/msi.c +++ b/dlls/msi/tests/msi.c @@ -1646,10 +1646,10 @@ static void test_MsiQueryComponentState(void) ok(state == INSTALLSTATE_SOURCE, "Expected INSTALLSTATE_SOURCE, got %d\n", state); ok(error == 0xdeadbeef, "expected 0xdeadbeef, got %u\n", error); - res = RegSetValueExA(compkey, prod_squashed, 0, REG_SZ, (const BYTE *)"01", 3); + res = RegSetValueExA(compkey, prod_squashed, 0, REG_SZ, (const BYTE *)"01:", 4); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); - /* bad INSTALLSTATE_SOURCE */ + /* registry component */ state = MAGIC_ERROR; SetLastError(0xdeadbeef); r = pMsiQueryComponentStateA(prodcode, NULL, MSIINSTALLCONTEXT_MACHINE, component, &state);

1 0

Hans Leidekker : msi/tests: Add a test for MsiEnumProductsEx.
by Alexandre Julliard 20 Apr '12

20 Apr '12

Module: wine Branch: master Commit: 2e51464e4da52d726fdc2ba6e5f24cb1bd4fd93e URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e51464e4da52d726fdc2ba6e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Apr 20 10:56:11 2012 +0200 msi/tests: Add a test for MsiEnumProductsEx. --- dlls/msi/tests/msi.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/msi.c b/dlls/msi/tests/msi.c index f7d0717..67b7e52 100644 --- a/dlls/msi/tests/msi.c +++ b/dlls/msi/tests/msi.c @@ -11882,6 +11882,13 @@ static void test_MsiEnumProductsEx(void) ok( len == sizeof(sid), "got %u\n", len ); ok( !sid[0], "got %s\n", sid ); + sid[0] = 0; + len = 0; + r = pMsiEnumProductsExA( NULL, usersid, MSIINSTALLCONTEXT_USERUNMANAGED, 0, NULL, NULL, sid, &len ); + ok( r == ERROR_MORE_DATA, "got %u\n", r ); + ok( len, "length unchanged\n" ); + ok( !sid[0], "got %s\n", sid ); + guid[0] = 0; context = 0xdeadbeef; sid[0] = 0;

1 0