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

Alexandre Julliard : gdi32/tests: Take into account multi-monitor setups in the clip region tests.
by Alexandre Julliard April 20, 2012

April 20, 2012

Module: wine Branch: master Commit: caf15dd7979b5eb0a446a89116fb4000ac614242 URL: http://source.winehq.org/git/wine.git/?a=commit;h=caf15dd7979b5eb0a446a8911… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 20 12:12:06 2012 +0200 gdi32/tests: Take into account multi-monitor setups in the clip region tests. --- dlls/gdi32/tests/clipping.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/tests/clipping.c b/dlls/gdi32/tests/clipping.c index dcdc8d7..04b2785 100644 --- a/dlls/gdi32/tests/clipping.c +++ b/dlls/gdi32/tests/clipping.c @@ -333,7 +333,7 @@ static void test_GetClipRgn(void) /* Try unsetting and then query the clipping region. */ ret = SelectClipRgn(hdc, NULL); - ok(ret == SIMPLEREGION, + ok(ret == SIMPLEREGION || (ret == COMPLEXREGION && GetSystemMetrics(SM_CMONITORS) > 1), "Expected SelectClipRgn to return SIMPLEREGION, got %d\n", ret); ret = GetClipRgn(hdc, NULL); @@ -434,7 +434,8 @@ static void test_window_dc_clipping(void) ok(ret == 0, "expected 0, got %d\n", ret); ret = ExtSelectClipRgn(hdc, hrgn_empty, RGN_DIFF); - ok(ret == SIMPLEREGION, "expected SIMPLEREGION, got %d\n", ret); + ok(ret == SIMPLEREGION || (ret == COMPLEXREGION && GetSystemMetrics(SM_CMONITORS) > 1), + "expected SIMPLEREGION, got %d\n", ret); ret = GetClipRgn(hdc, hrgn); ok(ret == 1, "expected 1, got %d\n", ret); @@ -446,7 +447,8 @@ static void test_window_dc_clipping(void) rc.left, rc.top, rc.right, rc.bottom); ret = ExtSelectClipRgn(hdc, 0, RGN_COPY); - ok(ret == SIMPLEREGION, "expected SIMPLEREGION, got %d\n", ret); + ok(ret == SIMPLEREGION || (ret == COMPLEXREGION && GetSystemMetrics(SM_CMONITORS) > 1), + "expected SIMPLEREGION, got %d\n", ret); ret = GetClipRgn(hdc, hrgn); ok(ret == 0, "expected 0, got %d\n", ret);

1 0

Francois Gouget : quartz: Mark a bunch of functions as static.
by Alexandre Julliard April 20, 2012

April 20, 2012

Module: wine Branch: master Commit: a3da9a7ab4431433e7f1113b2e0f13364eff66ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3da9a7ab4431433e7f1113b2… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Apr 20 08:39:55 2012 +0200 quartz: Mark a bunch of functions as static. --- dlls/quartz/dsoundrender.c | 2 +- dlls/quartz/main.c | 2 +- dlls/quartz/videorenderer.c | 22 +++++++++++----------- dlls/quartz/vmr9.c | 22 +++++++++++----------- 4 files changed, 24 insertions(+), 24 deletions(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index 3bbe12d..5d6dac2 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -340,7 +340,7 @@ static HRESULT WINAPI DSoundRender_ShouldDrawSampleNow(BaseRenderer *This, IMedi } -HRESULT WINAPI DSoundRender_PrepareReceive(BaseRenderer *iface, IMediaSample *pSample) +static HRESULT WINAPI DSoundRender_PrepareReceive(BaseRenderer *iface, IMediaSample *pSample) { DSoundRenderImpl *This = impl_from_BaseRenderer(iface); HRESULT hr; diff --git a/dlls/quartz/main.c b/dlls/quartz/main.c index 6488b7e..a75a794 100644 --- a/dlls/quartz/main.c +++ b/dlls/quartz/main.c @@ -37,7 +37,7 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) return QUARTZ_DllMain( hInstDLL, fdwReason, lpv ); } -HRESULT SeekingPassThru_create(IUnknown *pUnkOuter, LPVOID *ppObj) +static HRESULT SeekingPassThru_create(IUnknown *pUnkOuter, LPVOID *ppObj) { return PosPassThru_Construct(pUnkOuter,ppObj); /* from strmbase */ } diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index 27c656c..a7b31cf 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -249,7 +249,7 @@ static DWORD VideoRenderer_SendSampleData(VideoRendererImpl* This, LPBYTE data, return S_OK; } -HRESULT WINAPI VideoRenderer_ShouldDrawSampleNow(BaseRenderer *This, IMediaSample *pSample, REFERENCE_TIME *pStartTime, REFERENCE_TIME *pEndTime) +static HRESULT WINAPI VideoRenderer_ShouldDrawSampleNow(BaseRenderer *This, IMediaSample *pSample, REFERENCE_TIME *pStartTime, REFERENCE_TIME *pEndTime) { /* Preroll means the sample isn't shown, this is used for key frames and things like that */ if (IMediaSample_IsPreroll(pSample) == S_OK) @@ -477,14 +477,14 @@ static const BaseWindowFuncTable renderer_BaseWindowFuncTable = { VideoRenderer_OnSize }; -HRESULT WINAPI VideoRenderer_GetSourceRect(BaseControlVideo* iface, RECT *pSourceRect) +static HRESULT WINAPI VideoRenderer_GetSourceRect(BaseControlVideo* iface, RECT *pSourceRect) { VideoRendererImpl *This = impl_from_BaseControlVideo(iface); CopyRect(pSourceRect,&This->SourceRect); return S_OK; } -HRESULT WINAPI VideoRenderer_GetStaticImage(BaseControlVideo* iface, LONG *pBufferSize, LONG *pDIBImage) +static HRESULT WINAPI VideoRenderer_GetStaticImage(BaseControlVideo* iface, LONG *pBufferSize, LONG *pDIBImage) { VideoRendererImpl *This = impl_from_BaseControlVideo(iface); BITMAPINFOHEADER *bmiHeader; @@ -543,14 +543,14 @@ HRESULT WINAPI VideoRenderer_GetStaticImage(BaseControlVideo* iface, LONG *pBuff return S_OK; } -HRESULT WINAPI VideoRenderer_GetTargetRect(BaseControlVideo* iface, RECT *pTargetRect) +static HRESULT WINAPI VideoRenderer_GetTargetRect(BaseControlVideo* iface, RECT *pTargetRect) { VideoRendererImpl *This = impl_from_BaseControlVideo(iface); CopyRect(pTargetRect,&This->DestRect); return S_OK; } -VIDEOINFOHEADER* WINAPI VideoRenderer_GetVideoFormat(BaseControlVideo* iface) +static VIDEOINFOHEADER* WINAPI VideoRenderer_GetVideoFormat(BaseControlVideo* iface) { VideoRendererImpl *This = impl_from_BaseControlVideo(iface); AM_MEDIA_TYPE *pmt; @@ -572,7 +572,7 @@ VIDEOINFOHEADER* WINAPI VideoRenderer_GetVideoFormat(BaseControlVideo* iface) } } -HRESULT WINAPI VideoRenderer_IsDefaultSourceRect(BaseControlVideo* iface) +static HRESULT WINAPI VideoRenderer_IsDefaultSourceRect(BaseControlVideo* iface) { VideoRendererImpl *This = impl_from_BaseControlVideo(iface); FIXME("(%p/%p)->(): stub !!!\n", This, iface); @@ -580,7 +580,7 @@ HRESULT WINAPI VideoRenderer_IsDefaultSourceRect(BaseControlVideo* iface) return S_OK; } -HRESULT WINAPI VideoRenderer_IsDefaultTargetRect(BaseControlVideo* iface) +static HRESULT WINAPI VideoRenderer_IsDefaultTargetRect(BaseControlVideo* iface) { VideoRendererImpl *This = impl_from_BaseControlVideo(iface); FIXME("(%p/%p)->(): stub !!!\n", This, iface); @@ -588,7 +588,7 @@ HRESULT WINAPI VideoRenderer_IsDefaultTargetRect(BaseControlVideo* iface) return S_OK; } -HRESULT WINAPI VideoRenderer_SetDefaultSourceRect(BaseControlVideo* iface) +static HRESULT WINAPI VideoRenderer_SetDefaultSourceRect(BaseControlVideo* iface) { VideoRendererImpl *This = impl_from_BaseControlVideo(iface); @@ -600,7 +600,7 @@ HRESULT WINAPI VideoRenderer_SetDefaultSourceRect(BaseControlVideo* iface) return S_OK; } -HRESULT WINAPI VideoRenderer_SetDefaultTargetRect(BaseControlVideo* iface) +static HRESULT WINAPI VideoRenderer_SetDefaultTargetRect(BaseControlVideo* iface) { VideoRendererImpl *This = impl_from_BaseControlVideo(iface); RECT rect; @@ -616,14 +616,14 @@ HRESULT WINAPI VideoRenderer_SetDefaultTargetRect(BaseControlVideo* iface) return S_OK; } -HRESULT WINAPI VideoRenderer_SetSourceRect(BaseControlVideo* iface, RECT *pSourceRect) +static HRESULT WINAPI VideoRenderer_SetSourceRect(BaseControlVideo* iface, RECT *pSourceRect) { VideoRendererImpl *This = impl_from_BaseControlVideo(iface); CopyRect(&This->SourceRect,pSourceRect); return S_OK; } -HRESULT WINAPI VideoRenderer_SetTargetRect(BaseControlVideo* iface, RECT *pTargetRect) +static HRESULT WINAPI VideoRenderer_SetTargetRect(BaseControlVideo* iface, RECT *pTargetRect) { VideoRendererImpl *This = impl_from_BaseControlVideo(iface); CopyRect(&This->DestRect,pTargetRect); diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 2f490e5..cd7429d 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -202,7 +202,7 @@ static HRESULT WINAPI VMR9_CheckMediaType(BaseRenderer *iface, const AM_MEDIA_TY return S_OK; } -HRESULT WINAPI VMR9_ShouldDrawSampleNow(BaseRenderer *This, IMediaSample *pSample, REFERENCE_TIME *pStartTime, REFERENCE_TIME *pEndTime) +static HRESULT WINAPI VMR9_ShouldDrawSampleNow(BaseRenderer *This, IMediaSample *pSample, REFERENCE_TIME *pStartTime, REFERENCE_TIME *pEndTime) { /* Preroll means the sample isn't shown, this is used for key frames and things like that */ if (IMediaSample_IsPreroll(pSample) == S_OK) @@ -277,14 +277,14 @@ static const BaseWindowFuncTable renderer_BaseWindowFuncTable = { VMR9_OnSize, }; -HRESULT WINAPI VMR9_GetSourceRect(BaseControlVideo* This, RECT *pSourceRect) +static HRESULT WINAPI VMR9_GetSourceRect(BaseControlVideo* This, RECT *pSourceRect) { VMR9Impl* pVMR9 = impl_from_BaseControlVideo(This); CopyRect(pSourceRect,&pVMR9->source_rect); return S_OK; } -HRESULT WINAPI VMR9_GetStaticImage(BaseControlVideo* This, LONG *pBufferSize, LONG *pDIBImage) +static HRESULT WINAPI VMR9_GetStaticImage(BaseControlVideo* This, LONG *pBufferSize, LONG *pDIBImage) { VMR9Impl* pVMR9 = impl_from_BaseControlVideo(This); BITMAPINFOHEADER *bmiHeader; @@ -343,14 +343,14 @@ HRESULT WINAPI VMR9_GetStaticImage(BaseControlVideo* This, LONG *pBufferSize, LO return S_OK; } -HRESULT WINAPI VMR9_GetTargetRect(BaseControlVideo* This, RECT *pTargetRect) +static HRESULT WINAPI VMR9_GetTargetRect(BaseControlVideo* This, RECT *pTargetRect) { VMR9Impl* pVMR9 = impl_from_BaseControlVideo(This); CopyRect(pTargetRect,&pVMR9->target_rect); return S_OK; } -VIDEOINFOHEADER* WINAPI VMR9_GetVideoFormat(BaseControlVideo* This) +static VIDEOINFOHEADER* WINAPI VMR9_GetVideoFormat(BaseControlVideo* This) { VMR9Impl* pVMR9 = impl_from_BaseControlVideo(This); AM_MEDIA_TYPE *pmt; @@ -372,7 +372,7 @@ VIDEOINFOHEADER* WINAPI VMR9_GetVideoFormat(BaseControlVideo* This) } } -HRESULT WINAPI VMR9_IsDefaultSourceRect(BaseControlVideo* This) +static HRESULT WINAPI VMR9_IsDefaultSourceRect(BaseControlVideo* This) { VMR9Impl* pVMR9 = impl_from_BaseControlVideo(This); FIXME("(%p/%p)->(): stub !!!\n", pVMR9, This); @@ -380,7 +380,7 @@ HRESULT WINAPI VMR9_IsDefaultSourceRect(BaseControlVideo* This) return S_OK; } -HRESULT WINAPI VMR9_IsDefaultTargetRect(BaseControlVideo* This) +static HRESULT WINAPI VMR9_IsDefaultTargetRect(BaseControlVideo* This) { VMR9Impl* pVMR9 = impl_from_BaseControlVideo(This); FIXME("(%p/%p)->(): stub !!!\n", pVMR9, This); @@ -388,7 +388,7 @@ HRESULT WINAPI VMR9_IsDefaultTargetRect(BaseControlVideo* This) return S_OK; } -HRESULT WINAPI VMR9_SetDefaultSourceRect(BaseControlVideo* This) +static HRESULT WINAPI VMR9_SetDefaultSourceRect(BaseControlVideo* This) { VMR9Impl* pVMR9 = impl_from_BaseControlVideo(This); @@ -400,7 +400,7 @@ HRESULT WINAPI VMR9_SetDefaultSourceRect(BaseControlVideo* This) return S_OK; } -HRESULT WINAPI VMR9_SetDefaultTargetRect(BaseControlVideo* This) +static HRESULT WINAPI VMR9_SetDefaultTargetRect(BaseControlVideo* This) { RECT rect; VMR9Impl* pVMR9 = impl_from_BaseControlVideo(This); @@ -416,14 +416,14 @@ HRESULT WINAPI VMR9_SetDefaultTargetRect(BaseControlVideo* This) return S_OK; } -HRESULT WINAPI VMR9_SetSourceRect(BaseControlVideo* This, RECT *pSourceRect) +static HRESULT WINAPI VMR9_SetSourceRect(BaseControlVideo* This, RECT *pSourceRect) { VMR9Impl* pVMR9 = impl_from_BaseControlVideo(This); CopyRect(&pVMR9->source_rect,pSourceRect); return S_OK; } -HRESULT WINAPI VMR9_SetTargetRect(BaseControlVideo* This, RECT *pTargetRect) +static HRESULT WINAPI VMR9_SetTargetRect(BaseControlVideo* This, RECT *pTargetRect) { VMR9Impl* pVMR9 = impl_from_BaseControlVideo(This); CopyRect(&pVMR9->target_rect,pTargetRect);

1 0

Henri Verbeet : d3d8: Use the surface implementation pointer in reset_enum_callback().
by Alexandre Julliard April 20, 2012

April 20, 2012

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 : ddraw/tests: Add a helper function to set the viewport background material.
by Alexandre Julliard April 20, 2012

April 20, 2012

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

Nikolay Sivov : msxml3: Support 'namespace-prefixes' feature.
by Alexandre Julliard April 20, 2012

April 20, 2012

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

Francois Gouget : d3drm/tests: Make object_load_callback() static.
by Alexandre Julliard April 20, 2012

April 20, 2012

Module: wine Branch: master Commit: 118ea982f1dd8b2279cd4d0449701ec2c33de363 URL: http://source.winehq.org/git/wine.git/?a=commit;h=118ea982f1dd8b2279cd4d044… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Apr 20 08:39:47 2012 +0200 d3drm/tests: Make object_load_callback() static. --- dlls/d3drm/tests/d3drm.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 91e1c76..36ae19d 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -613,7 +613,7 @@ static const GUID* refiids[] = &IID_IDirect3DRMFrame }; -void __cdecl object_load_callback(LPDIRECT3DRMOBJECT object, REFIID objectguid, LPVOID arg) +static void __cdecl object_load_callback(LPDIRECT3DRMOBJECT object, REFIID objectguid, LPVOID arg) { ok(object != NULL, "Arg 1 should not be null\n"); ok(IsEqualGUID(objectguid, refiids[nb_objects]), "Arg 2 should is incorrect\n");

1 0

Hans Leidekker : msi/tests: Add a test for MsiEnumProductsEx.
by Alexandre Julliard April 20, 2012

April 20, 2012

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

Jacek Caban : mshtml: Ignore dispid 3000026 in IPropertyNotifySink:: OnChanged tests.
by Alexandre Julliard April 20, 2012

April 20, 2012

Module: wine Branch: master Commit: 1c07d166f12361f41c4e1ba2c86979291464cb9e URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c07d166f12361f41c4e1ba2c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 20 11:31:46 2012 +0200 mshtml: Ignore dispid 3000026 in IPropertyNotifySink::OnChanged tests. --- dlls/mshtml/tests/htmldoc.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 417d952..a486f3f 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -937,6 +937,7 @@ static HRESULT WINAPI PropertyNotifySink_OnChanged(IPropertyNotifySink *iface, D case 3000023: case 3000024: case 3000025: + case 3000026: case 3000028: case 3000029: case 3000030:

1 0

Hans Leidekker : msi: Fix install state detection for registry components.
by Alexandre Julliard April 20, 2012

April 20, 2012

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

Henri Verbeet : d3d8: Properly retrieve an interface pointer in IDirect3DDevice8Impl_GetBackBuffer ().
by Alexandre Julliard April 20, 2012

April 20, 2012

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