November 2015 - Wine-Commits

Matteo Bruni : wined3d: Add ARB_ES2_COMPATIBILITY entry to the core extensions table.
by Alexandre Julliard Nov. 30, 2015

Nov. 30, 2015

Module: wine Branch: master Commit: b5ba93831a092d92f79a297b8168ff20102fa83d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5ba93831a092d92f79a297b8… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Nov 27 20:39:33 2015 +0100 wined3d: Add ARB_ES2_COMPATIBILITY entry to the core extensions table. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 6aae3a3..4b4209a 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3436,6 +3436,8 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter) {ARB_SHADER_BIT_ENCODING, MAKEDWORD_VERSION(3, 3)}, {ARB_TIMER_QUERY, MAKEDWORD_VERSION(3, 3)}, + {ARB_ES2_COMPATIBILITY, MAKEDWORD_VERSION(4, 1)}, + {ARB_MAP_BUFFER_ALIGNMENT, MAKEDWORD_VERSION(4, 2)}, {ARB_DEBUG_OUTPUT, MAKEDWORD_VERSION(4, 3)},

1 0

Matteo Bruni : d3dx9: Don' t take the fastpath when converting between texture formats of different type.
by Alexandre Julliard Nov. 30, 2015

Nov. 30, 2015

Module: wine Branch: master Commit: d71970f658fbf9a7278f159e13c9851b0edee4d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d71970f658fbf9a7278f159e1… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Nov 27 20:39:32 2015 +0100 d3dx9: Don't take the fastpath when converting between texture formats of different type. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/surface.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index b8bb710..b14f5e7 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -1525,7 +1525,6 @@ void copy_pixels(const BYTE *src, UINT src_row_pitch, UINT src_slice_pitch, * Copies the source buffer to the destination buffer, performing * any necessary format conversion and color keying. * Pixels outsize the source rect are blacked out. - * Works only for ARGB formats with 1 - 4 bytes per pixel. */ void convert_argb_pixels(const BYTE *src, UINT src_row_pitch, UINT src_slice_pitch, const struct volume *src_size, const struct pixel_format_desc *src_format, BYTE *dst, UINT dst_row_pitch, UINT dst_slice_pitch, @@ -1562,6 +1561,7 @@ void convert_argb_pixels(const BYTE *src, UINT src_row_pitch, UINT src_slice_pit for (x = 0; x < min_width; x++) { if (!src_format->to_rgba && !dst_format->from_rgba + && src_format->type == dst_format->type && src_format->bytes_per_pixel <= 4 && dst_format->bytes_per_pixel <= 4) { DWORD val; @@ -1628,7 +1628,6 @@ void convert_argb_pixels(const BYTE *src, UINT src_row_pitch, UINT src_slice_pit * Copies the source buffer to the destination buffer, performing * any necessary format conversion, color keying and stretching * using a point filter. - * Works only for ARGB formats with 1 - 4 bytes per pixel. */ void point_filter_argb_pixels(const BYTE *src, UINT src_row_pitch, UINT src_slice_pitch, const struct volume *src_size, const struct pixel_format_desc *src_format, BYTE *dst, UINT dst_row_pitch, UINT dst_slice_pitch, @@ -1665,6 +1664,7 @@ void point_filter_argb_pixels(const BYTE *src, UINT src_row_pitch, UINT src_slic const BYTE *src_ptr = src_row_ptr + (x * src_size->width / dst_size->width) * src_format->bytes_per_pixel; if (!src_format->to_rgba && !dst_format->from_rgba + && src_format->type == dst_format->type && src_format->bytes_per_pixel <= 4 && dst_format->bytes_per_pixel <= 4) { DWORD val;

1 0

Dmitry Timoshkov : oleaut32: Simplify 'for' loop.
by Alexandre Julliard Nov. 30, 2015

Nov. 30, 2015

Module: wine Branch: master Commit: 1616f0ede9d55cfa7a57a6968b4351bc35b40e9e URL: http://source.winehq.org/git/wine.git/?a=commit;h=1616f0ede9d55cfa7a57a6968… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Nov 30 12:26:33 2015 +0800 oleaut32: Simplify 'for' loop. Variable 'i' is not used neither in the loop nor at its end. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/typelib.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 0891098..0a83b79 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -4486,9 +4486,9 @@ static ITypeLib2* ITypeLib2_Constructor_SLTG(LPVOID pLib, DWORD dwTLBLength) /* We'll set up a ptr to the main library block, which is the last one. */ - for(pBlk = pFirstBlk, order = pHeader->first_blk - 1, i = 0; + for(pBlk = pFirstBlk, order = pHeader->first_blk - 1; pBlkEntry[order].next != 0; - order = pBlkEntry[order].next - 1, i++) { + order = pBlkEntry[order].next - 1) { pBlk = (char*)pBlk + pBlkEntry[order].len; } pLibBlk = pBlk;

1 0

Matteo Bruni : wined3d: Handle D3DRS_SRGBWRITEENABLE in clears when ARB_framebuffer_sRGB is not supported.
by Alexandre Julliard Nov. 30, 2015

Nov. 30, 2015

Module: wine Branch: master Commit: 66d8e38ba4c5d67ae6e287cac557acfeae8b5bcd URL: http://source.winehq.org/git/wine.git/?a=commit;h=66d8e38ba4c5d67ae6e287cac… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Nov 27 20:39:36 2015 +0100 wined3d: Handle D3DRS_SRGBWRITEENABLE in clears when ARB_framebuffer_sRGB is not supported. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/visual.c | 14 ++------------ dlls/wined3d/device.c | 29 +++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 12 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index e126258..24915ff 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -905,7 +905,6 @@ static void clear_test(void) IDirect3DDevice9 *device; IDirect3D9 *d3d; ULONG refcount; - D3DCAPS9 caps; HWND window; window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, @@ -1155,9 +1154,6 @@ static void clear_test(void) IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); /* Test D3DRS_SRGBWRITEENABLE interactions with clears. */ - hr = IDirect3DDevice9_GetDeviceCaps(device, &caps); - ok(SUCCEEDED(hr), "Failed to get device caps, hr %#x.\n", hr); - hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0x7f7f7f7f, 0.0, 0); ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); @@ -1195,10 +1191,7 @@ static void clear_test(void) ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); color = getPixelColor(device, 320, 240); - if (caps.PrimitiveMiscCaps & D3DPMISCCAPS_POSTBLENDSRGBCONVERT) - ok(color_match(color, 0x00bbbbbb, 1), "Clear has color %08x.\n", color); - else - todo_wine ok(color_match(color, 0x00bbbbbb, 1), "Clear has color %08x.\n", color); + ok(color_match(color, 0x00bbbbbb, 1), "Clear has color %08x.\n", color); hr = IDirect3DDevice9_SetRenderState(device, D3DRS_SRGBWRITEENABLE, FALSE); ok(SUCCEEDED(hr), "Failed to disable sRGB write, hr %#x.\n", hr); @@ -1250,10 +1243,7 @@ static void clear_test(void) ok(SUCCEEDED(hr), "Failed to blit surface, hr %#x.\n", hr); color = getPixelColor(device, 320, 240); - if (caps.PrimitiveMiscCaps & D3DPMISCCAPS_POSTBLENDSRGBCONVERT) - ok(color_match(color, 0x00bbbbbb, 1), "Clear has color %08x.\n", color); - else - todo_wine ok(color_match(color, 0x00bbbbbb, 1), "Clear has color %08x.\n", color); + ok(color_match(color, 0x00bbbbbb, 1), "Clear has color %08x.\n", color); hr = IDirect3DDevice9_SetRenderState(device, D3DRS_SRGBWRITEENABLE, FALSE); ok(SUCCEEDED(hr), "Failed to disable sRGB write, hr %#x.\n", hr); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 170536d..057ae18 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -294,6 +294,7 @@ void device_clear_render_targets(struct wined3d_device *device, UINT rt_count, c const RECT *clear_rect = (rect_count > 0 && rects) ? (const RECT *)rects : NULL; const struct wined3d_gl_info *gl_info; UINT drawable_width, drawable_height; + struct wined3d_color corrected_color; struct wined3d_context *context; GLbitfield clear_mask = 0; BOOL render_offscreen; @@ -402,6 +403,34 @@ void device_clear_render_targets(struct wined3d_device *device, UINT rt_count, c } } + if (!gl_info->supported[ARB_FRAMEBUFFER_SRGB] + && device->state.render_states[WINED3D_RS_SRGBWRITEENABLE]) + { + if (fb->render_targets[0]->format_flags & WINED3DFMT_FLAG_SRGB_WRITE) + { + if (rt_count > 1) + WARN("Clearing multiple sRGB render targets with no GL_ARB_framebuffer_sRGB " + "support, this might cause graphical issues.\n"); + + corrected_color.r = color->r < wined3d_srgb_const1[0] + ? color->r * wined3d_srgb_const0[3] + : pow(color->r, wined3d_srgb_const0[0]) * wined3d_srgb_const0[1] + - wined3d_srgb_const0[2]; + corrected_color.r = min(max(corrected_color.r, 0.0f), 1.0f); + corrected_color.g = color->g < wined3d_srgb_const1[0] + ? color->g * wined3d_srgb_const0[3] + : pow(color->g, wined3d_srgb_const0[0]) * wined3d_srgb_const0[1] + - wined3d_srgb_const0[2]; + corrected_color.g = min(max(corrected_color.g, 0.0f), 1.0f); + corrected_color.b = color->b < wined3d_srgb_const1[0] + ? color->b * wined3d_srgb_const0[3] + : pow(color->b, wined3d_srgb_const0[0]) * wined3d_srgb_const0[1] + - wined3d_srgb_const0[2]; + corrected_color.b = min(max(corrected_color.b, 0.0f), 1.0f); + color = &corrected_color; + } + } + gl_info->gl_ops.gl.p_glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE); context_invalidate_state(context, STATE_RENDER(WINED3D_RS_COLORWRITEENABLE)); context_invalidate_state(context, STATE_RENDER(WINED3D_RS_COLORWRITEENABLE1));

1 0

Matteo Bruni : wined3d: Respect D3DRS_SRGBWRITEENABLE in clears.
by Alexandre Julliard Nov. 30, 2015

Nov. 30, 2015

Module: wine Branch: master Commit: 787a2716e1f7e3ade07b16c820ee2026153c80da URL: http://source.winehq.org/git/wine.git/?a=commit;h=787a2716e1f7e3ade07b16c82… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Nov 27 20:39:35 2015 +0100 wined3d: Respect D3DRS_SRGBWRITEENABLE in clears. This only handles the case where ARB_framebuffer_sRGB and EXT_texture_sRGB_decode are supported by the GL implementation. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/visual.c | 151 ++++++++++++++++++++++++++++++++++++++++++++++- dlls/wined3d/context.c | 10 +++- 2 files changed, 159 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 7ab751c..e126258 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -873,7 +873,27 @@ done: static void clear_test(void) { - /* Tests the correctness of clearing parameters */ + static const D3DMATRIX 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, + }}}; + static const struct + { + struct vec3 position; + DWORD diffuse; + } + quad[] = + { + {{-1.0f, -1.0f, 0.1f}, 0xff7f7f7f}, + {{ 1.0f, -1.0f, 0.1f}, 0xff7f7f7f}, + {{-1.0f, 1.0f, 0.1f}, 0xff7f7f7f}, + {{ 1.0f, 1.0f, 0.1f}, 0xff7f7f7f}, + }; + IDirect3DSurface9 *surface0, *surface1, *backbuffer; + IDirect3DTexture9 *texture; HRESULT hr; D3DRECT rect[2]; D3DRECT rect_negneg; @@ -885,6 +905,7 @@ static void clear_test(void) IDirect3DDevice9 *device; IDirect3D9 *d3d; ULONG refcount; + D3DCAPS9 caps; HWND window; window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, @@ -1133,6 +1154,134 @@ static void clear_test(void) IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + /* Test D3DRS_SRGBWRITEENABLE interactions with clears. */ + hr = IDirect3DDevice9_GetDeviceCaps(device, &caps); + ok(SUCCEEDED(hr), "Failed to get device caps, hr %#x.\n", hr); + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0x7f7f7f7f, 0.0, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + + color = getPixelColor(device, 320, 240); + ok(color_match(color, 0x007f7f7f, 1), "Clear has color %08x.\n", color); + + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_SRGBWRITEENABLE, TRUE); + ok(SUCCEEDED(hr), "Failed to enable sRGB write, hr %#x.\n", hr); + + /* Draw something to make sure the SRGBWRITEENABLE setting is applied. */ + hr = IDirect3DDevice9_SetTransform(device, D3DTS_WORLD, &mat); + ok(SUCCEEDED(hr), "Failed to set world matrix, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_CLIPPING, FALSE); + ok(SUCCEEDED(hr), "Failed to disable clipping, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ZENABLE, FALSE); + ok(SUCCEEDED(hr), "Failed to disable z test, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGENABLE, FALSE); + ok(SUCCEEDED(hr), "Failed to disable fog, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_STENCILENABLE, FALSE); + ok(SUCCEEDED(hr), "Failed to disable stencil test, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_CULLMODE, D3DCULL_NONE); + ok(SUCCEEDED(hr), "Failed to disable culling, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_LIGHTING, FALSE); + ok(SUCCEEDED(hr), "Failed to disable lighting, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ | D3DFVF_DIFFUSE); + ok(SUCCEEDED(hr), "Failed to set FVF, hr %#x.\n", hr); + hr = IDirect3DDevice9_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, sizeof(quad)); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0x7f7f7f7f, 0.0, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + + color = getPixelColor(device, 320, 240); + if (caps.PrimitiveMiscCaps & D3DPMISCCAPS_POSTBLENDSRGBCONVERT) + ok(color_match(color, 0x00bbbbbb, 1), "Clear has color %08x.\n", color); + else + todo_wine ok(color_match(color, 0x00bbbbbb, 1), "Clear has color %08x.\n", color); + + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_SRGBWRITEENABLE, FALSE); + ok(SUCCEEDED(hr), "Failed to disable sRGB write, hr %#x.\n", hr); + + /* Switching to a new render target seems to be enough to make Windows pick + * up on the changed render state. */ + hr = IDirect3DDevice9_CreateTexture(device, 128, 128, 2, D3DUSAGE_RENDERTARGET, + D3DFMT_X8R8G8B8, D3DPOOL_DEFAULT, &texture, NULL); + ok(SUCCEEDED(hr), "Failed to create the offscreen render target, hr %#x.\n", hr); + hr = IDirect3DDevice9_GetBackBuffer(device, 0, 0, D3DBACKBUFFER_TYPE_MONO, &backbuffer); + ok(SUCCEEDED(hr), "Failed to get backbuffer, hr %#x.\n", hr); + hr = IDirect3DTexture9_GetSurfaceLevel(texture, 0, &surface0); + ok(SUCCEEDED(hr), "Failed to get offscreen surface, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderTarget(device, 0, surface0); + ok(SUCCEEDED(hr), "Failed to set render target, hr %#x.\n", hr); + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0x7f7f7f7f, 0.0, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetRenderTarget(device, 0, backbuffer); + ok(SUCCEEDED(hr), "Failed to set render target, hr %#x.\n", hr); + + hr = IDirect3DDevice9_StretchRect(device, surface0, NULL, backbuffer, NULL, D3DTEXF_NONE); + ok(SUCCEEDED(hr), "Failed to blit surface, hr %#x.\n", hr); + + color = getPixelColor(device, 64, 64); + ok(color_match(color, 0x007f7f7f, 1), "Clear has color %08x.\n", color); + + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_SRGBWRITEENABLE, TRUE); + ok(SUCCEEDED(hr), "Failed to enable sRGB write, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetRenderTarget(device, 0, surface0); + ok(SUCCEEDED(hr), "Failed to set render target, hr %#x.\n", hr); + + hr = IDirect3DDevice9_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, sizeof(quad)); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0x7f7f7f7f, 0.0, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetRenderTarget(device, 0, backbuffer); + ok(SUCCEEDED(hr), "Failed to set render target, hr %#x.\n", hr); + + hr = IDirect3DDevice9_StretchRect(device, surface0, NULL, backbuffer, NULL, D3DTEXF_NONE); + ok(SUCCEEDED(hr), "Failed to blit surface, hr %#x.\n", hr); + + color = getPixelColor(device, 320, 240); + if (caps.PrimitiveMiscCaps & D3DPMISCCAPS_POSTBLENDSRGBCONVERT) + ok(color_match(color, 0x00bbbbbb, 1), "Clear has color %08x.\n", color); + else + todo_wine ok(color_match(color, 0x00bbbbbb, 1), "Clear has color %08x.\n", color); + + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_SRGBWRITEENABLE, FALSE); + ok(SUCCEEDED(hr), "Failed to disable sRGB write, hr %#x.\n", hr); + /* Switching to another surface of the same texture is also enough to make + * the setting "stick". */ + hr = IDirect3DTexture9_GetSurfaceLevel(texture, 1, &surface1); + ok(SUCCEEDED(hr), "Failed to get offscreen surface, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderTarget(device, 0, surface1); + ok(SUCCEEDED(hr), "Failed to set render target, hr %#x.\n", hr); + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0x7f7f7f7f, 0.0, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x\n", hr); + + hr = IDirect3DDevice9_SetRenderTarget(device, 0, backbuffer); + ok(SUCCEEDED(hr), "Failed to set render target, hr %#x.\n", hr); + + hr = IDirect3DDevice9_StretchRect(device, surface1, NULL, backbuffer, NULL, D3DTEXF_NONE); + ok(SUCCEEDED(hr), "Failed to blit surface, hr %#x.\n", hr); + + color = getPixelColor(device, 320, 240); + ok(color_match(color, 0x007f7f7f, 1), "Clear has color %08x.\n", color); + + IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + + IDirect3DSurface9_Release(surface1); + IDirect3DSurface9_Release(surface0); + IDirect3DSurface9_Release(backbuffer); + IDirect3DTexture9_Release(texture); refcount = IDirect3DDevice9_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); done: diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 5eeccab..1e357e7 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2467,7 +2467,15 @@ BOOL context_apply_clear_state(struct wined3d_context *context, const struct win * performance incredibly. */ gl_info->gl_ops.gl.p_glDisable(GL_BLEND); gl_info->gl_ops.gl.p_glEnable(GL_SCISSOR_TEST); - checkGLcall("glEnable GL_SCISSOR_TEST"); + if (gl_info->supported[ARB_FRAMEBUFFER_SRGB]) + { + if (device->state.render_states[WINED3D_RS_SRGBWRITEENABLE]) + gl_info->gl_ops.gl.p_glEnable(GL_FRAMEBUFFER_SRGB); + else + gl_info->gl_ops.gl.p_glDisable(GL_FRAMEBUFFER_SRGB); + context_invalidate_state(context, STATE_RENDER(WINED3D_RS_SRGBWRITEENABLE)); + } + checkGLcall("setting up state for clear"); context_invalidate_state(context, STATE_RENDER(WINED3D_RS_ALPHABLENDENABLE)); context_invalidate_state(context, STATE_RENDER(WINED3D_RS_SCISSORTESTENABLE));

1 0

Matteo Bruni : include: Add missing D3DPMISCCAPS_POSTBLENDSRGBCONVERT flag.
by Alexandre Julliard Nov. 30, 2015

Nov. 30, 2015

Module: wine Branch: master Commit: 74535486af5ac7c4b978e00e7f90e7b0141f3a71 URL: http://source.winehq.org/git/wine.git/?a=commit;h=74535486af5ac7c4b978e00e7… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Nov 27 20:39:34 2015 +0100 include: Add missing D3DPMISCCAPS_POSTBLENDSRGBCONVERT flag. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d3d9caps.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/d3d9caps.h b/include/d3d9caps.h index 5cc757b..424b20c 100644 --- a/include/d3d9caps.h +++ b/include/d3d9caps.h @@ -116,6 +116,9 @@ #define D3DPMISCCAPS_MRTPOSTPIXELSHADERBLENDING __MSABI_LONG(0x00080000) #define D3DPMISCCAPS_FOGVERTEXCLAMPED __MSABI_LONG(0x00100000) +#ifndef D3D_DISABLE_9EX +#define D3DPMISCCAPS_POSTBLENDSRGBCONVERT __MSABI_LONG(0x00200000) +#endif #define D3DPRASTERCAPS_DITHER __MSABI_LONG(0x00000001) #define D3DPRASTERCAPS_PAT __MSABI_LONG(0x00000008)

1 0

Hugh McMaster : kernel32: Replace NULL argument with pointer to DWORD.
by Alexandre Julliard Nov. 30, 2015

Nov. 30, 2015

Module: wine Branch: master Commit: 7223330ffc15b0d824b601bb23d3e2c61258b9da URL: http://source.winehq.org/git/wine.git/?a=commit;h=7223330ffc15b0d824b601bb2… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Nov 30 19:08:42 2015 +1100 kernel32: Replace NULL argument with pointer to DWORD. On Windows, passing in NULL can cause a memory access violation. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/editline.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/editline.c b/dlls/kernel32/editline.c index db17508..78ea789 100644 --- a/dlls/kernel32/editline.c +++ b/dlls/kernel32/editline.c @@ -98,7 +98,9 @@ static void WCEL_Dump(WCEL_Context* ctx, const char* pfx) static BOOL WCEL_Get(WCEL_Context* ctx, INPUT_RECORD* ir) { - if (ReadConsoleInputW(ctx->hConIn, ir, 1, NULL)) return TRUE; + DWORD num_read; + + if (ReadConsoleInputW(ctx->hConIn, ir, 1, &num_read)) return TRUE; ctx->error = 1; return FALSE; }

1 0

Hugh McMaster : loader: Fix a typo and improve a sentence in wine.man.in.
by Alexandre Julliard Nov. 30, 2015

Nov. 30, 2015

Module: wine Branch: master Commit: da26ee745c6364f1c4e416046c36815bdc761fd9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da26ee745c6364f1c4e416046… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Nov 30 19:51:55 2015 +1100 loader: Fix a typo and improve a sentence in wine.man.in. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/wine.man.in | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/loader/wine.man.in b/loader/wine.man.in index f5647a3..1439b3c 100644 --- a/loader/wine.man.in +++ b/loader/wine.man.in @@ -26,8 +26,7 @@ For running CUI executables (Windows console programs), use .B wineconsole instead of .BR wine . -This will display all the output in a separate windows (this requires X11 to -run). Not using +This will display the output in a separate window. Not using .B wineconsole for CUI programs will only provide very limited console support, and your program might not function properly.

1 0

Alexandre Julliard : Revert "user.exe: Release the Win16 lock due to loading 32-bit dlls in CreateWindow."
by Alexandre Julliard Nov. 30, 2015

Nov. 30, 2015

Module: wine Branch: master Commit: b266fcaa66f89c08c056371f7b81b7faadea9a98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b266fcaa66f89c08c056371f7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 30 21:04:47 2015 +0900 Revert "user.exe: Release the Win16 lock due to loading 32-bit dlls in CreateWindow." This reverts commit 9ac7bca209e1b11af898d1b393d13c8dc92c66e1. The bug has now been fixed in winoldap instead. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user.exe16/message.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/dlls/user.exe16/message.c b/dlls/user.exe16/message.c index b5d9225..935b025 100644 --- a/dlls/user.exe16/message.c +++ b/dlls/user.exe16/message.c @@ -2648,17 +2648,11 @@ static DWORD wait_message16( DWORD count, const HANDLE *handles, DWORD timeout, */ HWND create_window16( CREATESTRUCTW *cs, LPCWSTR className, HINSTANCE instance, BOOL unicode ) { - DWORD lock; - HWND ret; - /* map to module handle */ if (instance && !((ULONG_PTR)instance >> 16)) instance = HINSTANCE_32( GetExePtr( HINSTANCE_16(instance) )); - ReleaseThunkLock( &lock ); - ret = wow_handlers32.create_window( cs, className, instance, unicode ); - RestoreThunkLock( lock ); - return ret; + return wow_handlers32.create_window( cs, className, instance, unicode ); }

1 0

Jactry Zeng : riched20/tests: Test EM_REPLACESEL with rtf stream.
by Alexandre Julliard Nov. 30, 2015

Nov. 30, 2015

Module: wine Branch: master Commit: 7365f557b6bc792efb4f73523c318cfce0625092 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7365f557b6bc792efb4f73523… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Fri Nov 27 16:44:20 2015 +0800 riched20/tests: Test EM_REPLACESEL with rtf stream. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/tests/editor.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 31af4b2..46d93aa 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -4561,6 +4561,8 @@ static void test_EM_REPLACESEL(int redraw) int r; GETTEXTEX getText; CHARRANGE cr; + CHAR rtfstream[] = "{\\rtf1 TestSomeText}"; + CHAR urtfstream[] = "{\\urtf1 TestSomeText}"; /* sending some text to the window */ SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)"testing selection"); @@ -4833,6 +4835,48 @@ static void test_EM_REPLACESEL(int redraw) r = SendMessageA(hwndRichEdit, EM_GETLINECOUNT, 0, 0); ok(r == 7, "EM_GETLINECOUNT returned %d, expected 7\n", r); + SendMessageA(hwndRichEdit, WM_SETTEXT, 0, 0); + r = SendMessageA(hwndRichEdit, EM_REPLACESEL, 0, (LPARAM)rtfstream); + todo_wine ok(r == 12, "EM_REPLACESEL returned %d, expected 12\n", r); + r = SendMessageA(hwndRichEdit, EM_EXGETSEL, 0, (LPARAM)&cr); + ok(0 == r, "EM_EXGETSEL returned %d, expected 0\n", r); + todo_wine ok(cr.cpMin == 12, "EM_EXGETSEL returned cpMin=%d, expected 12\n", cr.cpMin); + todo_wine ok(cr.cpMax == 12, "EM_EXGETSEL returned cpMax=%d, expected 12\n", cr.cpMax); + SendMessageA(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM)buffer); + todo_wine ok(!strcmp(buffer, "TestSomeText"), "WM_GETTEXT returned incorrect string\n"); + + SendMessageA(hwndRichEdit, WM_SETTEXT, 0, 0); + r = SendMessageA(hwndRichEdit, EM_REPLACESEL, 0, (LPARAM)urtfstream); + todo_wine ok(r == 12, "EM_REPLACESEL returned %d, expected 12\n", r); + r = SendMessageA(hwndRichEdit, EM_EXGETSEL, 0, (LPARAM)&cr); + ok(0 == r, "EM_EXGETSEL returned %d, expected 0\n", r); + todo_wine ok(cr.cpMin == 12, "EM_EXGETSEL returned cpMin=%d, expected 12\n", cr.cpMin); + todo_wine ok(cr.cpMax == 12, "EM_EXGETSEL returned cpMax=%d, expected 12\n", cr.cpMax); + SendMessageA(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM)buffer); + todo_wine ok(!strcmp(buffer, "TestSomeText"), "WM_GETTEXT returned incorrect string\n"); + + SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)"Wine"); + SendMessageA(hwndRichEdit, EM_SETSEL, 1, 2); + todo_wine r = SendMessageA(hwndRichEdit, EM_REPLACESEL, 0, (LPARAM)rtfstream); + todo_wine ok(r == 12, "EM_REPLACESEL returned %d, expected 12\n", r); + r = SendMessageA(hwndRichEdit, EM_EXGETSEL, 0, (LPARAM)&cr); + ok(0 == r, "EM_EXGETSEL returned %d, expected 0\n", r); + todo_wine ok(cr.cpMin == 13, "EM_EXGETSEL returned cpMin=%d, expected 13\n", cr.cpMin); + todo_wine ok(cr.cpMax == 13, "EM_EXGETSEL returned cpMax=%d, expected 13\n", cr.cpMax); + SendMessageA(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM)buffer); + todo_wine ok(!strcmp(buffer, "WTestSomeTextne"), "WM_GETTEXT returned incorrect string\n"); + + SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)"{\\rtf1 Wine}"); + SendMessageA(hwndRichEdit, EM_SETSEL, 1, 2); + todo_wine r = SendMessageA(hwndRichEdit, EM_REPLACESEL, 0, (LPARAM)rtfstream); + todo_wine ok(r == 12, "EM_REPLACESEL returned %d, expected 12\n", r); + r = SendMessageA(hwndRichEdit, EM_EXGETSEL, 0, (LPARAM)&cr); + ok(0 == r, "EM_EXGETSEL returned %d, expected 0\n", r); + todo_wine ok(cr.cpMin == 13, "EM_EXGETSEL returned cpMin=%d, expected 13\n", cr.cpMin); + todo_wine ok(cr.cpMax == 13, "EM_EXGETSEL returned cpMax=%d, expected 13\n", cr.cpMax); + SendMessageA(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM)buffer); + todo_wine ok(!strcmp(buffer, "WTestSomeTextne"), "WM_GETTEXT returned incorrect string\n"); + if (!redraw) /* This is needed to avoid interferring with keybd_event calls * on other tests that simulate keyboard events. */

1 0