July 2016 - Wine-devel - list.winehq.org

Re: [PATCH 3/4] quartz: Try all surfaces when calling GetSurface
by Andrew Eikum 20 Jul '16

20 Jul '16

On Wed, Jul 20, 2016 at 02:37:11PM +1000, Jan Schmidt wrote: > If the surface we want is refused, cycle through all > possible ones. Some applications (Silver at least) > request 2 surfaces, but then refuse to return anything > other than the first one. > I'm not necessarily opposed to this, but it does seem unlikely that the application would request two surfaces be used, but only provide one. I noticed that we set num_surfaces to 2 in VMR9_maybe_init. Is this function calling IVMRSurfaceAllocatorEx9::InitializeDevice on the application-provided allocator, or on our default implementation? This seems like where the application should tell us it wants only one surface. If it is calling the application's allocator, then maybe they don't handle VMR9AllocationInfo::MinBuffers > 1 very well. Why do we set MinBuffers to 2 here, I wonder. Aric? Andrew > Signed-off-by: Jan Schmidt <jan(a)centricular.com> > --- > dlls/quartz/vmr9.c | 14 ++++++++++++-- > 1 file changed, 12 insertions(+), 2 deletions(-) > > diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c > index d590a71..8455678 100644 > --- a/dlls/quartz/vmr9.c > +++ b/dlls/quartz/vmr9.c > @@ -292,6 +292,7 @@ static HRESULT WINAPI VMR9_DoRenderSample(BaseRenderer *iface, IMediaSample * pS > REFERENCE_TIME tStart, tStop; > VMR9PresentationInfo info; > HRESULT hr; > + int i; > > TRACE("%p %p\n", iface, pSample); > > @@ -338,10 +339,19 @@ static HRESULT WINAPI VMR9_DoRenderSample(BaseRenderer *iface, IMediaSample * pS > info.szAspectRatio.cx = This->bmiheader.biWidth; > info.szAspectRatio.cy = This->bmiheader.biHeight; > > - hr = IVMRSurfaceAllocatorEx9_GetSurface(This->allocator, This->cookie, (++This->cur_surface)%This->num_surfaces, 0, &info.lpSurf); > + /* Sometimes apps refuse to return the surface we request, > + * so try each and see if any are available if the first fails */ > + for (i = 0; i < This->num_surfaces; i++) { > + hr = IVMRSurfaceAllocatorEx9_GetSurface(This->allocator, This->cookie, > + (++This->cur_surface) % This->num_surfaces, 0, &info.lpSurf); > + if (SUCCEEDED (hr)) > + break; > + } > > - if (FAILED(hr)) > + if (FAILED(hr)) { > + ERR("Failed to get render surface (%x)\n", hr); > return hr; > + } > > VMR9_SendSampleData(This, &info, pbSrcStream, cbSrcStream); > IDirect3DSurface9_Release(info.lpSurf); > -- > 2.7.4 > > >

2 1

Re: [PATCH 1/5] wined3d: Fix immediate draws when ARB_vertex_array_bgra is not supported.
by Henri Verbeet 20 Jul '16

20 Jul '16

On 20 July 2016 at 00:33, Matteo Bruni <mbruni(a)codeweavers.com> wrote: > @@ -5848,7 +5850,7 @@ static void wined3d_adapter_init_ffp_attrib_ops(struct wined3d_adapter *adapter) > ops->generic[WINED3D_FFP_EMIT_FLOAT2] = (wined3d_generic_attrib_func)gl_info->gl_ops.ext.p_glVertexAttrib2fv; > ops->generic[WINED3D_FFP_EMIT_FLOAT3] = (wined3d_generic_attrib_func)gl_info->gl_ops.ext.p_glVertexAttrib3fv; > ops->generic[WINED3D_FFP_EMIT_FLOAT4] = (wined3d_generic_attrib_func)gl_info->gl_ops.ext.p_glVertexAttrib4fv; > - if (gl_info->supported[ARB_VERTEX_ARRAY_BGRA]) > + if (!gl_info->supported[ARB_VERTEX_ARRAY_BGRA]) > ops->generic[WINED3D_FFP_EMIT_D3DCOLOR] = generic_d3dcolor; > else > ops->generic[WINED3D_FFP_EMIT_D3DCOLOR] = This looks wrong. When ARB_vertex_array_bgra is not supported, shaders swizzle the corresponding input registers (see also shader_glsl_swizzle_to_str() and shader_arb_get_swizzle()), so the attribute upload code shouldn't.

2 2

Re: [5/5] msvcirt: Implement istream::getdouble
by Marvin 20 Jul '16

20 Jul '16

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=24393 Your paranoid android. === wxppro (32 bit msvcirt) === msvcirt.c:4839: Test failed: Test 48: wrong return, expected 4 got 5 msvcirt.c:4839: Test failed: Test 49: wrong return, expected 4 got 5 msvcirt.c:4839: Test failed: Test 50: wrong return, expected 4 got 5 msvcirt.c:4839: Test failed: Test 51: wrong return, expected 4 got 5 msvcirt.c:4841: Test failed: Test 52: expected 2 got 0 msvcirt.c:4843: Test failed: Test 52: expected 003E601D got 003E601C msvcirt.c:4839: Test failed: Test 54: wrong return, expected 4 got 5 msvcirt.c:4839: Test failed: Test 57: wrong return, expected -1 got 0 msvcirt.c:4839: Test failed: Test 58: wrong return, expected -1 got 0 msvcirt.c:4839: Test failed: Test 59: wrong return, expected -1 got 0 msvcirt.c:4839: Test failed: Test 61: wrong return, expected 0 got 1 msvcirt.c:4839: Test failed: Test 62: wrong return, expected 1 got 2 === w2003std (32 bit msvcirt) === msvcirt.c:4839: Test failed: Test 48: wrong return, expected 4 got 5 msvcirt.c:4839: Test failed: Test 49: wrong return, expected 4 got 5 msvcirt.c:4839: Test failed: Test 50: wrong return, expected 4 got 5 msvcirt.c:4839: Test failed: Test 51: wrong return, expected 4 got 5 msvcirt.c:4841: Test failed: Test 52: expected 2 got 0 msvcirt.c:4843: Test failed: Test 52: expected 003D60B5 got 003D60B4 msvcirt.c:4839: Test failed: Test 54: wrong return, expected 4 got 5 msvcirt.c:4839: Test failed: Test 57: wrong return, expected -1 got 0 msvcirt.c:4839: Test failed: Test 58: wrong return, expected -1 got 0 msvcirt.c:4839: Test failed: Test 59: wrong return, expected -1 got 0 msvcirt.c:4839: Test failed: Test 61: wrong return, expected 0 got 1 msvcirt.c:4839: Test failed: Test 62: wrong return, expected 1 got 2

1 0

Re: [PATCH 2/4] quartz: Images in Direct3D surfaces must be top-down
by Henri Verbeet 20 Jul '16

20 Jul '16

On 20 July 2016 at 06:37, Jan Schmidt <jan(a)centricular.com> wrote: > Invert images when copying to a Direct3D surface if > they are provided bottom-up. > Is that observable behaviour? I.e., could you write a test that verifies where the data ends up in the surface? If it isn't, it may be better to just flip the image when presenting it.

2 3

Re: [resend PATCH] msscript: Implement SetAdvise/GetAdvise
by Jacek Caban 20 Jul '16

20 Jul '16

Hi Nikolay, On 19.07.2016 20:42, Nikolay Sivov wrote: > -static HRESULT WINAPI ViewObject_SetAdvise(IViewObjectEx *iface, DWORD aspects, DWORD advf, IAdviseSink *sink) > +static HRESULT WINAPI ViewObject_SetAdvise(IViewObjectEx *iface, DWORD aspects, DWORD flags, IAdviseSink *sink) > { > ScriptControl *This = impl_from_IViewObjectEx(iface); > > - FIXME("(%p)->(%d %d %p)\n", This, aspects, advf, sink); > + TRACE("(%p)->(%d %#x %p)\n", This, aspects, flags, sink); > > - return E_NOTIMPL; > + if (aspects != DVASPECT_CONTENT) > + return DV_E_DVASPECT; Since only DVASPECT_CONTENT is supported and it's also a default value, is there a reason to bother storing it in the object? Thanks, Jacek

2 1

Re: [PATCH] kernel32: Implement SetConsoleFont
by Sebastian Lackner 20 Jul '16

20 Jul '16

On 19.07.2016 14:34, Hugh McMaster wrote: > Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> > --- > dlls/kernel32/console.c | 27 ++++++++++++++++++++++++--- > dlls/kernel32/tests/console.c | 6 +++--- > 2 files changed, 27 insertions(+), 6 deletions(-) > It looks like your code requests the font size from the wineserver (GetConsoleFontSize) just to send it back immediately afterwards. Is that intentional? And wouldn't it make more sense to implement support for multiple font sizes first? Also, please note that the GetNumberOfConsoleFonts() check is unnecessary because GetConsoleFontSize() already takes care of that.

2 3

Re: hlink/tests: Use wine_dbgstr_guid() to print a REFIID.
by Marvin 20 Jul '16

20 Jul '16

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=24381 Your paranoid android. === w1064 (32 bit hlink) === hlink.c:414: Test failed: url only: Saved data differs hlink.c:414: Test failed: url + friendly name: Saved data differs hlink.c:414: Test failed: url + friendly_name + location: Saved data differs hlink.c:414: Test failed: url + target frame name: Saved data differs === w1064 (64 bit hlink) === hlink.c:414: Test failed: url only: Saved data differs hlink.c:414: Test failed: url + friendly name: Saved data differs hlink.c:414: Test failed: url + friendly_name + location: Saved data differs hlink.c:414: Test failed: url + target frame name: Saved data differs

2 1

[v2 PATCH] d3dx10: Add D3DXCpuOptimizations stub
by Andrey Gusev 20 Jul '16

20 Jul '16

+#include <d3dx10.h> Please change to "d3dx10.h"

1 0

[v2 PATCH] d3dx10: Add D3DXCpuOptimizations stub
by Andrey Gusev 20 Jul '16

20 Jul '16

+#include <d3dx10.h> Please change to "d3dx10.h"

1 0

Re: [PATCH 02/11] mshtml: Use bind_to_tree callback to parse dynamically added scripts.
by Marvin 19 Jul '16

19 Jul '16

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=24357 Your paranoid android. === wxppro (32 bit) === Found no trace of the test summary line or of a crash === w2003std (32 bit) === Found no trace of the test summary line or of a crash === wvistau64 (32 bit) === Found no trace of the test summary line or of a crash === w2008s64 (32 bit) === Found no trace of the test summary line or of a crash === w7u (32 bit) === Found no trace of the test summary line or of a crash === w7pro64 (32 bit) === Found no trace of the test summary line or of a crash === w8 (32 bit) === Found no trace of the test summary line or of a crash === w864 (32 bit) === Found no trace of the test summary line or of a crash === w1064 (32 bit) === Found no trace of the test summary line or of a crash === wvistau64 (64 bit) === Found no trace of the test summary line or of a crash === w2008s64 (64 bit) === Found no trace of the test summary line or of a crash === w7pro64 (64 bit) === Found no trace of the test summary line or of a crash === w864 (64 bit) === Found no trace of the test summary line or of a crash === w1064 (64 bit) === Found no trace of the test summary line or of a crash

1 0