October 2014 - Wine-Devel - list.winehq.org

Re: [PATCH 3/5] wined3d: Track texture allocation per-texture.
by Farmboy0 Oct. 12, 2014

Oct. 12, 2014

On 08.10.2014 08:47, Henri Verbeet wrote: > --- > dlls/wined3d/surface.c | 13 +++-------- > dlls/wined3d/texture.c | 47 ++++++++++++++++++++++++++++++---------- > dlls/wined3d/volume.c | 8 +++---- > dlls/wined3d/wined3d_private.h | 14 ++++++------ > 4 files changed, 49 insertions(+), 33 deletions(-) > > diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c > index d02d5f2..0967220 100644 > --- a/dlls/wined3d/surface.c > +++ b/dlls/wined3d/surface.c > @@ -599,11 +599,6 @@ static void surface_evict_sysmem(struct wined3d_surface *surface) > surface_invalidate_location(surface, WINED3D_LOCATION_SYSMEM); > } > > -static void surface_force_reload(struct wined3d_surface *surface) > -{ > - surface->flags &= ~(SFLAG_ALLOCATED | SFLAG_SRGBALLOCATED); > -} > - > static void surface_release_client_storage(struct wined3d_surface *surface) > { > struct wined3d_context *context = context_acquire(surface->resource.device, NULL); > @@ -621,11 +616,9 @@ static void surface_release_client_storage(struct wined3d_surface *surface) > gl_info->gl_ops.gl.p_glTexImage2D(surface->texture_target, surface->texture_level, > GL_RGB, 1, 1, 0, GL_RGB, GL_UNSIGNED_BYTE, NULL); > } > + wined3d_texture_force_reload(surface->container); > > context_release(context); > - > - surface_invalidate_location(surface, WINED3D_LOCATION_TEXTURE_RGB | WINED3D_LOCATION_TEXTURE_SRGB); > - surface_force_reload(surface); > } > > static BOOL surface_use_pbo(const struct wined3d_surface *surface) > @@ -1211,7 +1204,7 @@ static void surface_unload(struct wined3d_resource *resource) > surface_load_location(surface, surface->resource.map_binding); > surface_invalidate_location(surface, ~surface->resource.map_binding); > } > - surface->flags &= ~(SFLAG_ALLOCATED | SFLAG_SRGBALLOCATED); > + wined3d_texture_force_reload(surface->container); > > context = context_acquire(device, NULL); > gl_info = context->gl_info; > @@ -1845,7 +1838,7 @@ void surface_load(struct wined3d_surface *surface, BOOL srgb) > surface_invalidate_location(surface, ~surface->resource.map_binding); > /* Switching color keying on / off may change the internal format. */ > if (ck_changed) > - surface_force_reload(surface); > + wined3d_texture_force_reload(surface->container); > } > else if (!(surface->locations & location)) > { > diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c > index 27a10c6..bc75305 100644 > --- a/dlls/wined3d/texture.c > +++ b/dlls/wined3d/texture.c > @@ -751,7 +751,26 @@ HRESULT CDECL wined3d_texture_update_desc(struct wined3d_texture *texture, UINT > > void wined3d_texture_prepare_texture(struct wined3d_texture *texture, struct wined3d_context *context, BOOL srgb) > { > + DWORD alloc_flag = srgb ? WINED3D_TEXTURE_SRGB_ALLOCATED : WINED3D_TEXTURE_RGB_ALLOCATED; > + > + if (texture->flags & alloc_flag) > + return; > + > texture->texture_ops->texture_prepare_texture(texture, context, srgb); > + texture->flags |= alloc_flag; > +} > + > +void wined3d_texture_force_reload(struct wined3d_texture *texture) > +{ > + unsigned int sub_count = texture->level_count * texture->layer_count; > + unsigned int i; > + > + texture->flags &= ~(WINED3D_TEXTURE_RGB_ALLOCATED | WINED3D_TEXTURE_SRGB_ALLOCATED); > + for (i = 0; i < sub_count; ++i) > + { > + texture->texture_ops->texture_sub_resource_invalidate_location(texture->sub_resources[i], > + WINED3D_LOCATION_TEXTURE_RGB | WINED3D_LOCATION_TEXTURE_SRGB); > + } > } > > void CDECL wined3d_texture_generate_mipmaps(struct wined3d_texture *texture) > @@ -817,11 +836,17 @@ static void texture2d_sub_resource_cleanup(struct wined3d_resource *sub_resource > wined3d_surface_destroy(surface); > } > > +static void texture2d_sub_resource_invalidate_location(struct wined3d_resource *sub_resource, DWORD location) > +{ > + struct wined3d_surface *surface = surface_from_resource(sub_resource); > + > + surface_invalidate_location(surface, location); > +} > + > /* Context activation is done by the caller. */ > static void texture2d_prepare_texture(struct wined3d_texture *texture, struct wined3d_context *context, BOOL srgb) > { > UINT sub_count = texture->level_count * texture->layer_count; > - DWORD alloc_flag = srgb ? SFLAG_SRGBALLOCATED : SFLAG_ALLOCATED; > const struct wined3d_format *format = texture->resource.format; > const struct wined3d_gl_info *gl_info = context->gl_info; > const struct wined3d_color_key_conversion *conversion; > @@ -864,9 +889,6 @@ static void texture2d_prepare_texture(struct wined3d_texture *texture, struct wi > GLsizei width = surface->pow2Width; > const BYTE *mem = NULL; > > - if (surface->flags & alloc_flag) > - continue; > - > if (converted) > surface->flags |= SFLAG_CONVERTED; > else > @@ -922,8 +944,6 @@ static void texture2d_prepare_texture(struct wined3d_texture *texture, struct wi > gl_info->gl_ops.gl.p_glPixelStorei(GL_UNPACK_CLIENT_STORAGE_APPLE, GL_FALSE); > checkGLcall("glPixelStorei(GL_UNPACK_CLIENT_STORAGE_APPLE, GL_FALSE)"); > } > - > - surface->flags |= alloc_flag; > } > } > > @@ -932,6 +952,7 @@ static const struct wined3d_texture_ops texture2d_ops = > texture2d_sub_resource_load, > texture2d_sub_resource_add_dirty_region, > texture2d_sub_resource_cleanup, > + texture2d_sub_resource_invalidate_location, > texture2d_prepare_texture, > }; > > @@ -1261,9 +1282,15 @@ static void texture3d_sub_resource_cleanup(struct wined3d_resource *sub_resource > wined3d_volume_destroy(volume); > } > > +static void texture3d_sub_resource_invalidate_location(struct wined3d_resource *sub_resource, DWORD location) > +{ > + struct wined3d_volume *volume = volume_from_resource(sub_resource); > + > + wined3d_volume_invalidate_location(volume, location); > +} > + > static void texture3d_prepare_texture(struct wined3d_texture *texture, struct wined3d_context *context, BOOL srgb) > { > - DWORD alloc_flag = srgb ? WINED3D_VFLAG_SRGB_ALLOCATED : WINED3D_VFLAG_ALLOCATED; > unsigned int sub_count = texture->level_count * texture->layer_count; > const struct wined3d_format *format = texture->resource.format; > const struct wined3d_gl_info *gl_info = context->gl_info; > @@ -1276,9 +1303,6 @@ static void texture3d_prepare_texture(struct wined3d_texture *texture, struct wi > struct wined3d_volume *volume = volume_from_resource(texture->sub_resources[i]); > void *mem = NULL; > > - if (volume->flags & alloc_flag) > - continue; > - > if (gl_info->supported[APPLE_CLIENT_STORAGE] && !format->convert > && volume_prepare_system_memory(volume)) > { > @@ -1300,8 +1324,6 @@ static void texture3d_prepare_texture(struct wined3d_texture *texture, struct wi > gl_info->gl_ops.gl.p_glPixelStorei(GL_UNPACK_CLIENT_STORAGE_APPLE, GL_FALSE); > checkGLcall("glPixelStorei(GL_UNPACK_CLIENT_STORAGE_APPLE, GL_FALSE)"); > } > - > - volume->flags |= alloc_flag; > } > } > > @@ -1310,6 +1332,7 @@ static const struct wined3d_texture_ops texture3d_ops = > texture3d_sub_resource_load, > texture3d_sub_resource_add_dirty_region, > texture3d_sub_resource_cleanup, > + texture3d_sub_resource_invalidate_location, > texture3d_prepare_texture, > }; > > diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c > index 92bc1e1..0cbc7d4 100644 > --- a/dlls/wined3d/volume.c > +++ b/dlls/wined3d/volume.c > @@ -262,9 +262,9 @@ static void wined3d_volume_load_location(struct wined3d_volume *volume, > case WINED3D_LOCATION_TEXTURE_RGB: > case WINED3D_LOCATION_TEXTURE_SRGB: > if ((location == WINED3D_LOCATION_TEXTURE_RGB > - && !(volume->flags & WINED3D_VFLAG_ALLOCATED)) > + && !(volume->container->flags & WINED3D_TEXTURE_RGB_ALLOCATED)) > || (location == WINED3D_LOCATION_TEXTURE_SRGB > - && !(volume->flags & WINED3D_VFLAG_SRGB_ALLOCATED))) > + && !(volume->container->flags & WINED3D_TEXTURE_SRGB_ALLOCATED))) > ERR("Trying to load (s)RGB texture without prior allocation.\n"); > > if (volume->locations & WINED3D_LOCATION_DISCARDED) > @@ -451,8 +451,8 @@ static void volume_unload(struct wined3d_resource *resource) > } > > /* The texture name is managed by the container. */ > - volume->flags &= ~(WINED3D_VFLAG_ALLOCATED | WINED3D_VFLAG_SRGB_ALLOCATED > - | WINED3D_VFLAG_CLIENT_STORAGE); > + wined3d_texture_force_reload(volume->container); > + volume->flags &= ~WINED3D_VFLAG_CLIENT_STORAGE; > > resource_unload(resource); > } > diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h > index 17a68dc..5ec5088 100644 > --- a/dlls/wined3d/wined3d_private.h > +++ b/dlls/wined3d/wined3d_private.h > @@ -2116,6 +2116,7 @@ struct wined3d_texture_ops > void (*texture_sub_resource_add_dirty_region)(struct wined3d_resource *sub_resource, > const struct wined3d_box *dirty_region); > void (*texture_sub_resource_cleanup)(struct wined3d_resource *sub_resource); > + void (*texture_sub_resource_invalidate_location)(struct wined3d_resource *sub_resource, DWORD location); > void (*texture_prepare_texture)(struct wined3d_texture *texture, > struct wined3d_context *context, BOOL srgb); > }; > @@ -2123,8 +2124,10 @@ struct wined3d_texture_ops > #define WINED3D_TEXTURE_COND_NP2 0x00000001 > #define WINED3D_TEXTURE_POW2_MAT_IDENT 0x00000002 > #define WINED3D_TEXTURE_IS_SRGB 0x00000004 > -#define WINED3D_TEXTURE_RGB_VALID 0x00000008 > -#define WINED3D_TEXTURE_SRGB_VALID 0x00000010 > +#define WINED3D_TEXTURE_RGB_ALLOCATED 0x00000008 > +#define WINED3D_TEXTURE_RGB_VALID 0x00000010 > +#define WINED3D_TEXTURE_SRGB_ALLOCATED 0x00000020 > +#define WINED3D_TEXTURE_SRGB_VALID 0x00000040 > > struct wined3d_texture > { > @@ -2170,6 +2173,7 @@ void wined3d_texture_bind(struct wined3d_texture *texture, > struct wined3d_context *context, BOOL srgb) DECLSPEC_HIDDEN; > void wined3d_texture_bind_and_dirtify(struct wined3d_texture *texture, > struct wined3d_context *context, BOOL srgb) DECLSPEC_HIDDEN; > +void wined3d_texture_force_reload(struct wined3d_texture *texture) DECLSPEC_HIDDEN; > void wined3d_texture_load(struct wined3d_texture *texture, > struct wined3d_context *context, BOOL srgb) DECLSPEC_HIDDEN; > void wined3d_texture_prepare_texture(struct wined3d_texture *texture, > @@ -2191,9 +2195,7 @@ void wined3d_texture_set_swapchain(struct wined3d_texture *texture, > > const char *wined3d_debug_location(DWORD location) DECLSPEC_HIDDEN; > > -#define WINED3D_VFLAG_ALLOCATED 0x00000001 > -#define WINED3D_VFLAG_SRGB_ALLOCATED 0x00000002 > -#define WINED3D_VFLAG_CLIENT_STORAGE 0x00000004 > +#define WINED3D_VFLAG_CLIENT_STORAGE 0x00000001 > > struct wined3d_volume > { > @@ -2354,8 +2356,6 @@ void flip_surface(struct wined3d_surface *front, struct wined3d_surface *back) D > #define SFLAG_GLCKEY 0x00000100 /* The GL texture was created with a color key. */ > #define SFLAG_CLIENT 0x00000200 /* GL_APPLE_client_storage is used with this surface. */ > #define SFLAG_DIBSECTION 0x00000400 /* Has a DIB section attached for GetDC. */ > -#define SFLAG_ALLOCATED 0x00000800 /* A GL texture is allocated for this surface. */ > -#define SFLAG_SRGBALLOCATED 0x00001000 /* A sRGB GL texture is allocated for this surface. */ > > struct wined3d_sampler > { Hi, This commit causes problems with Eve Online. When switching from Fullscreen to Windowed I get the following errors and the 3d objects look like a mess of colors. err:d3d_surface:surface_load_location Surface 0x1f834240 does not have any up to date location. err:d3d_surface:surface_invalidate_location Surface 0x1f834240 does not have any up to date location. I have bisected the following commit to be the offender: commit ee8a5b7dd1e554ef32229c766715f23ba17c9f6c Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 8 08:47:20 2014 +0200 wined3d: Track texture allocation per-texture.

2 1

Re: Add WWN 377
by Rico Schüller Oct. 11, 2014

Oct. 11, 2014

On 10.10.2014 21:48, André Hentschel wrote: > diff --git a/news/de/2014101001.xml b/news/de/2014101001.xml > new file mode 100644 > index 0000000..8ad495c > --- /dev/null > +++ b/news/de/2014101001.xml > @@ -0,0 +1,11 @@ > +<news> > + <date>10. Oktober 2014</date> > + <title>World Wine News Ausgabe 377</title> > + <body> > +<a href="{$root}/wwn/377">WWN Ausgabe 377 (en)</a> wurde heute verÃ¶ffentlicht. > +<ul> > +<li><a href="{$root}/wwn/377#Idea for a Wine staging tree">Idea fÃ¼r einen Wine Staging Tree</a></li> <li><a href="{$root}/wwn/377#Idea for a Wine staging tree">Idee ... Cheers Rico

1 0

Re: [PATCH] mshtml/tests: Fix typo.
by Marvin Oct. 11, 2014

Oct. 11, 2014

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=9465 Your paranoid android. === w2000pro (32 bit) === No test summary line found === wxppro (32 bit) === No test summary line found === wvistau64 (32 bit) === No test summary line found === w2008s64 (32 bit) === No test summary line found === w7u (32 bit) === No test summary line found === w8 (32 bit) === No test summary line found === wvistau64 (64 bit) === No test summary line found === w2008s64 (64 bit) === No test summary line found

2 1

Re: wined3d: Correctly display fog for right-handed projection matrix (try 6)
by Stefan Dösinger Oct. 10, 2014

Oct. 10, 2014

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hi, I missed a few things the last time. This list is exhaustive now, at least as far as I'm concerned. I have listed most things for d3d8, but they apply to the d3d9 test as well. Am 2014-10-10 15:21, schrieb Joachim Priesner: > + static const D3DMATRIX proj_mat = > + {{{ > + 1.0f, 0.0f, 0.0f, 0.0f, > + 0.0f, 1.0f, 0.0f, 0.0f, > + 0.0f, 0.0f, -1.0f, 0.0f, > + 0.0f, 0.0f, -0.0f, 1.0f > + }}}; Minor detail: you left a redundant - in here. (4th row, third column, -0.0f) > + /* Basic vertex shader with fog computation ("foggy"). > + * Using the vertex' x coordinate as fog coordinate so that all test cases that use vertex fog > + * will have a gradient from fully fogged (green, left) to unfogged (red, right). */ This is a bit off-topic, but I'm still noting it here: We don't have any tests for the clamp(0.0, 1.0) we do on the oFog output. Hence it may be interesting to check the middle of the screen in case of the foggy shader. If it is half fogged, the clamp is correct. If it is fully fogged the clamp is wrong (keep in mind that "foggy shaders" have reverse fog with start = 1, end = 0). This shouldn't be part of this patch, but it is an idea for a follow-up test if you or anyone else is interested. > + {0, 0, D3DFOG_NONE, D3DFOG_LINEAR, COLOR_UNFOGGED, COLOR_FOGGED}, > + {0, 1, D3DFOG_NONE, D3DFOG_LINEAR, COLOR_UNFOGGED, COLOR_FOGGED}, > + {0, 0, D3DFOG_LINEAR, D3DFOG_LINEAR, COLOR_UNFOGGED, COLOR_FOGGED}, > + {0, 1, D3DFOG_LINEAR, D3DFOG_LINEAR, COLOR_UNFOGGED, COLOR_FOGGED}, > + {0, 0, D3DFOG_LINEAR, D3DFOG_NONE, COLOR_UNFOGGED, COLOR_FOGGED}, > + {0, 1, D3DFOG_LINEAR, D3DFOG_NONE, COLOR_UNFOGGED, COLOR_FOGGED}, Please add a D3DFOG_NONE, D3DFOG_NONE case for completeness. In case of the shaders I expect the same result as with table fog = NONE, vertex fog = LINEAR. In case of fixed function fragment processing I expect fully fogged because it uses the alpha component of the specular color, which defaults to 0. Fogstart = 255 and fogend = 0 in that case, similar to the vertex shader oFog case. > + /* Note: Shaders expect matrices in column-major form, so they have > + * to be transposed if they are not symmetrical (which is the case at the moment). */ > + hr = IDirect3DDevice8_SetVertexShaderConstant(device, 0, &view_mat, 4); > + ok(SUCCEEDED(hr), "SetVertexShaderConstant (view matrix) failed (%08x)\n", hr); > + hr = IDirect3DDevice8_SetVertexShaderConstant(device, 4, &proj_mat, 4); > + ok(SUCCEEDED(hr), "SetVertexShaderConstant (projection matrix) failed (%08x)\n", hr); I'd expect these calls to fail on hardware that does not support shaders. Same for the Set*Shader(NULL) calls later on. Technically you do not need the matrix multiply inside the shader with the new matrices, but if you want to keep them in to make the fixed function and shader codepaths more similar that's OK with me. The D3DPRASTERCAPS_FOGTABLE capability applies to d3d8/9 as well. I don't know if there's any GPU out there that doesn't support table fog other than my ancient ATI 3D Rage. > + IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); You are not checking the return value here. > + if (caps.PixelShaderVersion >= D3DPS_VERSION(1, 1)) > + { > + hr = IDirect3DDevice9_CreateVertexShader(device, vertex_shader_code1, &vertex_shader[1]); > + ok(SUCCEEDED(hr), "CreateVertexShader failed (%08x)\n", hr); > + hr = IDirect3DDevice9_CreateVertexShader(device, vertex_shader_code2, &vertex_shader[2]); > + ok(SUCCEEDED(hr), "CreateVertexShader failed (%08x)\n", hr); > ... > + } Please check the vertex shader version separately from the pixel shader one. > diff --git a/dlls/ddraw/tests/visual.c b/dlls/ddraw/tests/visual.c > index 0385044..23542ff 100644 > --- a/dlls/ddraw/tests/visual.c > +++ b/dlls/ddraw/tests/visual.c New ddraw tests should go to dlls/ddraw/tests/ddraw*.c. I'm fine with just a ddraw7 test for this. The older ddraw interfaces have a different fog interface (D3DLIGHTSTATE_FOG*, and somehow there's a separate D3DRENDERSTATE_FOGTABLE*). While we could certainly use more tests for this interface it shouldn't be the concern of this patch. > + if (IDirect3DDevice7_BeginScene(device) == D3D_OK) This is not a big issue, but there's no need to have a code branch for BeginScene / EndScene, just let the draws in between fail like you do in d3d8/9. I have never seen a case where BeginScene fails unexpectedly. (Yeah, the existing code isn't consistent on this point.) > + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_FOGEND, end.i); > + ok(SUCCEEDED(hr), "Setting fog end failed (%08x)\n", hr); > ... > + hr = IDirect3DDevice8_SetTransform(device, D3DTS_PROJECTION, &proj_mat); > + ok(SUCCEEDED(hr), "Failed to set projection transform, hr %#x.\n", hr); Another minor style issue: You're mixing %08x and %#x. The preferred one is %#x, but what mostly matters is consistency. Similar for punctuation at the end of the traces. SUCCEEDED(hr) is preferred over hr == D3D_OK. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJUOFewAAoJEN0/YqbEcdMwxSYP/jFB5IT9a+7w8JQ7vlziVdGz KZccLwVFSyJqLhEiTIs7B0yz5rWhkjI6HPxzWRPRMVbNTjlUvsiZRLl8FU6hR86A 1G6azwEnMs0/u9LUOfdphBLdj454+E/NJMr1EzkRjL+PMt49RZwSxdCmxPXK/unx yrxLSPuxCjHGhN6K95/xV8fVkbJoa7va8IeKDHhfoFpdpaUqUqyGaSbNCfiyYj6l cyA8ZBlQEEEYBDg8HopQgw99MmfU3BIL4rY984YnsscYMckI5qjOs+joMcUwHscU Vaflkmh5udcj74sdgPguOwigJeLuLzY6zbWzhUGDFzdkXuwfuF0oe+ws/QcNOYX6 r2d/CGa7nYXfTFewR4SODJT+950P8CwuskLsslBAiPpy4uzVcbhKT2oNh7L7vhU1 +o6gYk98ceCaRdZxajf+j2hElg7N9AkWAK/RfLY25d3ALnKKVDbaidWKot3dVcHN nicK89v6jKSmD/FdbVM9/YUi4QzOZM5IJAItG0OuhS0oU/Bfkpr0e7NXvORxdGPC BpRvQrwIJXWiT43aqK8E1w67mE47PMmqoKjO3qVfWLojC0L7KPybDjGtUKj652Qr ixqPlaERPLeRVyAGtpxHlIE2opyx3fOSy/ZSTq6/PzK4GNZ/hgfTLbUff2ixxa+M cL3+mTtlQSBx9yt9BmUG =ZDPP -----END PGP SIGNATURE-----

1 0

Re: kernel32: fix incorrect lastpart in GetFullPathNameA with DBCS
by Akihiro Sagawa Oct. 10, 2014

Oct. 10, 2014

On Thu, 09 Oct 2014 12:03:15 -0500, Aric Stewart wrote: > --- > dlls/kernel32/path.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > Hi Aric, Thank you for pointing this out, but unfortunately this seems not to be perfect. Because certain DBCS trail byte range is overlapped its lead byte range [1]. To demonstrate this issue, I attached additional test. The first case (0x955c,0x97a0=表裏) is now pass by your patch, but the second one (0x838f,0x8343,0x8393=ワイン) is failure. In my opinion, the solution is looking up the path separator from the beginning of the string like _mbsrchr() in msvcrt. If you have a further question about this, please contact me. [1] For CP 932 (Japanese Shift JIS), Double byte character: Lead byte (first byte): 0x81-0x9f or 0xe0-0xfc, and Trail byte (second byte): 0x40-0x7e or 0x80-0xfc. Single byte character: 0x00-0x7f, 0xa1-0xdf. Regards, Akihiro Sagawa

2 1

Re: wined3d: Correctly display fog for right-handed projection matrix (try 6)
by Marvin Oct. 10, 2014

Oct. 10, 2014

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=9439 Your paranoid android. === w8 (32 bit visual) === visual.c:2716: Test failed: unexpected colortable on offscreen surface

1 0

Re: [PATCH 6/6] wined3d: Don't replicate shader limits values for each shader.
by Henri Verbeet Oct. 10, 2014

Oct. 10, 2014

On 9 October 2014 18:01, Matteo Bruni <mbruni(a)codeweavers.com> wrote: > +static const struct wined3d_shader_limits vs_limits[] = This doesn't really need to be global. It's not even that I mind that much for this kind of static const array, but it actually makes things easier to keep it local to shader_set_limits(). > struct wined3d_shader_limits > { > + unsigned int min_version; > + unsigned int max_version; > unsigned int sampler; > unsigned int constant_int; > unsigned int constant_float; You don't need that to be part of wined3d_shader_limits.

1 0

Re: [PATCH 5/6] d3d9/tests: Port the unsupported shaders test to D3D9Ex.
by Henri Verbeet Oct. 10, 2014

Oct. 10, 2014

On 9 October 2014 18:00, Matteo Bruni <mbruni(a)codeweavers.com> wrote: > +static void test_unsupported_shaders(void) In principle I like this better than "test_wrong_shader()", but could you then please update the d3d8 and d3d9 tests as well? It's a lot easier to find equivalent tests between D3D versions if they at least have the same name.

1 0

Re: [PATCH 1/2] d3d8/tests: Don't check the foreground window if we're not in foreground.
by Francois Gouget Oct. 10, 2014

Oct. 10, 2014

On Wed, 8 Oct 2014, Stefan Dösinger wrote: [...] > There are many more failures in d3d8:device when the test is not in > foreground. Those failures write static lines and I'd prefer the testbot > to be changed to run them in foreground instead. What do you mean by that? The TestBot runs a command line tool in an iconized console. In turn that tool runs the test binary. However I'm not aware of it preventing test windows from being in the foreground. Maybe the console windows being iconized somehow gets inherited by the windows created by the test binary, but shouldn't the test just request to bring its windows to the foreground? -- Francois Gouget <fgouget(a)codeweavers.com>

3 2

Re: [3/3] msvcrt: Added _fflush_nolock() implementation
by Piotr Caban Oct. 10, 2014

Oct. 10, 2014

On 10/09/14 19:52, Iván Matellanes wrote: > @@ -921,22 +921,36 @@ int CDECL MSVCRT_fflush(MSVCRT_FILE* file) > { > if(!file) { > msvcrt_flush_all_buffers(MSVCRT__IOWRT); > + } else if(file->_flag & MSVCRT__IOWRT || file->_flag & MSVCRT__IOREAD) { > + int ret; > + > + MSVCRT__lock_file(file); > + ret = MSVCRT__fflush_nolock(file); > + MSVCRT__unlock_file(file); > + > + return ret; > + } > + return 0; > +} file->_flag should be checked inside the lock (it's already done inside fflush_nolock). Could you please change the code to something like this: if(!file) msvcrt_flush_all_buffers(MSVCRT__IOWRT); MSVCRT__lock_file(file); ret = MSVCRT__fflush_nolock(file); MSVCRT__unlock_file(file); Thanks, Piotr

1 0