December 2011 - Wine-devel - list.winehq.org

Re: [3/4] ddraw: Set correct HEL and HAL color models
by Saulius Krasuckas 17 Jan '12

17 Jan '12

Stefan, it looks like your patch http://source.winehq.org/git/wine.git/commitdiff/9e0baa55cec232656048c972e9… has introduced 2 failures on one virtual w2k3-vmware machine: http://test.winehq.org/data/e7bbb4ef1e95396b72a58f813b4346d9abccb699/2003_w… See earlier results: http://test.winehq.org/data/tests/ddraw:d3d.html Would you mind fixing this, please:)? S.

2 2

Re: [PATCH 2/7] wined3d: Move srgb checks away from d3dfmt_get_conv.
by Diego Nieto Cid 04 Jan '12

04 Jan '12

Hi, I beleive this patch introduced some kind of regression. While testing Fallout the following message was printed to the screen: trace:d3d_surface:surface_allocate_surface (0x1a25f0) : Creating surface (target 0xde1) level 0, d3d format WINED3DFMT_P8_UINT, internal format 0x80e5, width 1024, height 512, gl format 0x1908, gl type=0x1401 err:d3d_surface:surface_allocate_surface >>>>>>>>>>>>>>>>> GL_INVALID_VALUE (0x501) from glTexImage2D @ surface.c / 2571 Internal format 0x80e5 (GL_COLOR_INDEX8_EXT) is not valid for the format 0x1908 (GL_RGBA). Initially, the surface's format is 0x1900 (GL_COLOR_INDEX) which is compatible with the internal format above. On Thu, Apr 08, 2010 at 10:49:46PM +0200, Roderick Colenbrander wrote: > [...] > @@ -1553,7 +1581,7 @@ void surface_prepare_texture(IWineD3DSurfaceImpl *surface, const struct wined3d_ > > if (surface->Flags & alloc_flag) return; > > - d3dfmt_get_conv(surface, TRUE, TRUE, &desc, &convert, srgb); > + d3dfmt_get_conv(surface, TRUE, TRUE, &desc, &convert); > if(convert != NO_CONVERSION) surface->Flags |= SFLAG_CONVERTED; > else surface->Flags &= ~SFLAG_CONVERTED; > > @@ -1569,7 +1597,7 @@ void surface_prepare_texture(IWineD3DSurfaceImpl *surface, const struct wined3d_ > } > > surface_bind_and_dirtify(surface, srgb); > - surface_allocate_surface(surface, gl_info, &desc, width, height); > + surface_allocate_surface(surface, gl_info, &desc, srgb, width, height); > surface->Flags |= alloc_flag; > } > However before surface_allocate_surface is called d3dfmt_get_conv which translates the format to GL_RGBA. But the internal format remains in an incompatible value due to a reordering of the instructions which was introduced by the patch. On Thu, Apr 08, 2010 at 10:49:46PM +0200, Roderick Colenbrander wrote: > [...] > @@ -2126,18 +2153,6 @@ HRESULT d3dfmt_get_conv(IWineD3DSurfaceImpl *This, BOOL need_alpha_ck, BOOL use_ > *desc = *This->resource.format_desc; > *convert = NO_CONVERSION; > > - /* TODO: the caller should perform this check */ > - if(srgb_mode) { > - desc->glInternal = glDesc->glGammaInternal; > - } > - else if (This->resource.usage & WINED3DUSAGE_RENDERTARGET > - && surface_is_offscreen((IWineD3DSurface *) This)) > - { > - desc->glInternal = glDesc->rtInternal; > - } else { > - desc->glInternal = glDesc->glInternal; > - } > - > /* Ok, now look if we have to do any conversion */ > switch(This->resource.format_desc->format) > { Before applying the changes the processing of srgb_mode was done inside d3dfmt_get_conv. Depending on the value of this variable one of glGammaInternal, rtInternal or glInternal was used. But those values were overriden because the conversion was applied afterwards. On Thu, Apr 08, 2010 at 10:49:46PM +0200, Roderick Colenbrander wrote: > [...] > @@ -783,11 +797,25 @@ static void surface_upload_data(IWineD3DSurfaceImpl *This, const struct wined3d_ > * the correct texture. */ > /* Context activation is done by the caller. */ > static void surface_allocate_surface(IWineD3DSurfaceImpl *This, const struct wined3d_gl_info *gl_info, > - const struct wined3d_format_desc *format_desc, GLsizei width, GLsizei height) > + const struct wined3d_format_desc *format_desc, BOOL srgb, GLsizei width, GLsizei height) > { > BOOL enable_client_storage = FALSE; > const BYTE *mem = NULL; > - GLenum internal = format_desc->glInternal; > + GLenum internal; > + > + if (srgb) > + { > + internal = format_desc->glGammaInternal; > + } > + else if (This->resource.usage & WINED3DUSAGE_RENDERTARGET > + && surface_is_offscreen((IWineD3DSurface *)This)) > + { > + internal = format_desc->rtInternal; > + } > + else > + { > + internal = format_desc->glInternal; > + } > > if (format_desc->heightscale != 1.0f && format_desc->heightscale != 0.0f) height *= format_desc->heightscale; > After the change was applied the result of the conversion done inside d3dfmt_get_conv only takes effect in the else branch of srgb processing. The following code is the conversion involved in this particular test case. format->glFormat = GL_RGBA; format->glInternal = GL_RGBA; format->glType = GL_UNSIGNED_BYTE; format->conv_byte_count = 4; It's located in d3dfmt_get_conv under the WINED3DFMT_P8_UINT case. For some reason only glInternal is updated by the conversion. In any case it didn't matter before the patch as none of the internal values were actually used in case a conversion was applied. Should the three internal values be updated by the conversion now that any of them could be used? Even if it would work I'm not sure how correct would be to do that. Could some wined3d developer review the patch with all this in mind? Thanks!

2 5

new d3d9/device.ok test always fails here, but not a regression?
by Dan Kegel 03 Jan '12

03 Jan '12

Happy New Year's Eve, everyone! 002447357c2b1feca5ef2649429fc55f70238901 added a IDirect3DDevice9::SetCursorPosition() test to d3d9. That test never worked here, I think. I filed http://bugs.winehq.org/show_bug.cgi?id=29094 for it, and marked it as a regression (since tests/device.c used to pass, but fails here after that commit). Henri removed the regression keyword and sha1sum without comment. What's the reasoning there? Is Henri saying there's something wrong with my test setup (stock ubuntu), or are new tests that cause 'make test' to fail not considered regressions? Or something else?

4 6

Status on SetPixelFormat patch from May 2010
by Jeff Cook 31 Dec '11

31 Dec '11

Hello all I am curious about the patch on http://bugs.winehq.org/show_bug.cgi?id=18490 and why it's not in vanilla. http://bugs.winehq.org/show_bug.cgi?id=18490#c9 seems to be a pretty cogent explanation of the issue and the patch appears reasonable enough. It prevents a major crasher in Empire: Total War, which otherwise works really well. Maybe it was just never submitted to wine-patches? Thanks Jeff

3 4

Re: [PATCH 3/3] vbscript: Added InStr tests
by Marvin 30 Dec '11

30 Dec '11

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 http://testbot.winehq.org/JobDetails.pl?Key=16214 Your paranoid android. === WNT4WSSP6 (32 bit) === No test summary line found === W2KPROSP4 (32 bit) === No test summary line found === WXPPROSP3 (32 bit) === No test summary line found === W2K3R2SESP2 (32 bit) === No test summary line found === WVISTAADM (32 bit) === No test summary line found === W2K8SE (32 bit) === No test summary line found === W7PRO (32 bit) === No test summary line found === W7PROX64 (32 bit) === No test summary line found === TEST64_W7SP1 (32 bit) === No test summary line found === W7PROX64 (64 bit) === No test summary line found === TEST64_W7SP1 (64 bit) === No test summary line found

1 0

Re: [7/8]usp10: implement ScriptGetFontLanguageTags
by Alexandre Julliard 30 Dec '11

30 Dec '11

Aric Stewart <aric(a)codeweavers.com> writes: > --- > dlls/usp10/shape.c | 121 > ++++++++++++++++++++++++++++++++++++++++++- > dlls/usp10/tests/usp10.c | 37 ++++++++++++- > dlls/usp10/usp10.c | 11 ++++ > dlls/usp10/usp10.spec | 2 +- > dlls/usp10/usp10_internal.h | 9 +++ > 5 files changed, 176 insertions(+), 4 deletions(-) It doesn't work here: ../../../tools/runtest -q -P wine -M usp10.dll -T ../../.. -p usp10_test.exe.so usp10.c && touch usp10.ok usp10.c:2949: Test failed: wrong return code make: *** [usp10.ok] Error 1 -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [2/2] user32: Make a SetFocus message test for a top level child window pass. Resend.
by Alexandre Julliard 30 Dec '11

30 Dec '11

Dmitry Timoshkov <dmitry(a)baikal.ru> writes: > + hwnd = WIN_GetFullHandle( hwnd ); > > - if (!set_active_window( hwnd, &prev, FALSE, TRUE )) return 0; > + set_active_window( hwnd, &prev, FALSE, TRUE ); > return prev; > } It doesn't seem right to ignore all errors. This would need some more tests. -- Alexandre Julliard julliard(a)winehq.org

2 2

Re: [PATCH 2/9] jscript: Handle invalid break statements in compiler
by Marvin 30 Dec '11

30 Dec '11

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 http://testbot.winehq.org/JobDetails.pl?Key=16211 Your paranoid android. === WNT4WSSP6 (32 bit) === No test summary line found === W2KPROSP4 (32 bit) === No test summary line found === WXPPROSP3 (32 bit) === No test summary line found === W2K3R2SESP2 (32 bit) === No test summary line found === WVISTAADM (32 bit) === No test summary line found === W2K8SE (32 bit) === No test summary line found === W7PRO (32 bit) === No test summary line found === W7PROX64 (32 bit) === No test summary line found === TEST64_W7SP1 (32 bit) === No test summary line found === W7PROX64 (64 bit) === No test summary line found === TEST64_W7SP1 (64 bit) === No test summary line found

1 0

Re: [PATCH 1/9] jscript: Handle invalid break statements in compiler
by Marvin 30 Dec '11

30 Dec '11

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 http://testbot.winehq.org/JobDetails.pl?Key=16210 Your paranoid android. === WNT4WSSP6 (32 bit) === No test summary line found === W2KPROSP4 (32 bit) === No test summary line found === WXPPROSP3 (32 bit) === No test summary line found === W2K3R2SESP2 (32 bit) === No test summary line found === WVISTAADM (32 bit) === No test summary line found === W2K8SE (32 bit) === No test summary line found === W7PRO (32 bit) === No test summary line found === W7PROX64 (32 bit) === No test summary line found === TEST64_W7SP1 (32 bit) === No test summary line found === W7PROX64 (64 bit) === No test summary line found === TEST64_W7SP1 (64 bit) === No test summary line found

1 0

Re: [2/2] user32: Make a SetFocus message test for a top level child window pass. Resend.
by Marvin 30 Dec '11

30 Dec '11

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 http://testbot.winehq.org/JobDetails.pl?Key=16207 Your paranoid android. === W7PROX64 (64 bit msg) === Timeout === TEST64_W7SP1 (64 bit msg) === Timeout

1 0