wine-commits November 2015

2 participants
623 discussions

Matteo Bruni : wined3d: Handle D3DRS_SRGBWRITEENABLE in clears when ARB_framebuffer_sRGB is not supported.

by Alexandre Julliard

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));

8 years, 5 months

Matteo Bruni : wined3d: Respect D3DRS_SRGBWRITEENABLE in clears.

by Alexandre Julliard

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));

8 years, 5 months

Matteo Bruni : include: Add missing D3DPMISCCAPS_POSTBLENDSRGBCONVERT flag.

by Alexandre Julliard

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)

8 years, 5 months

Matteo Bruni : wined3d: Add ARB_ES2_COMPATIBILITY entry to the core extensions table.

by Alexandre Julliard

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)},

8 years, 5 months

Matteo Bruni : wined3d: Flush the GL context before switching away from it.

by Alexandre Julliard

Module: wine Branch: master Commit: 6dd054ca587b1d95c324c10383f1f81155ed9ffb URL: http://source.winehq.org/git/wine.git/?a=commit;h=6dd054ca587b1d95c324c1038… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Nov 27 20:39:31 2015 +0100 wined3d: Flush the GL context before switching away from it. We might end up not using the old context anymore after that and the GL implementation is allowed to delay executing commands indefinitely if we don't flush. 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/context.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 0e8b32b..5eeccab 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1129,6 +1129,11 @@ BOOL context_set_current(struct wined3d_context *ctx) } else { + if (wglGetCurrentContext()) + { + TRACE("Flushing context %p before switching to %p.\n", old, ctx); + glFlush(); + } old->current = 0; } }

8 years, 5 months

Hugh McMaster : kernel32: Replace NULL argument with pointer to DWORD.

by Alexandre Julliard

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; }

8 years, 5 months

Hugh McMaster : loader: Fix a typo and improve a sentence in wine.man.in.

by Alexandre Julliard

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.

8 years, 5 months

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

by Alexandre Julliard

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 ); }

8 years, 5 months

Alexandre Julliard : winoldapp: Grab the Win16 lock again before exiting.

by Alexandre Julliard

Module: wine Branch: master Commit: 6e6a0e2a2c3df15f8f62216227e3f6f454ba7e65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e6a0e2a2c3df15f8f6221622… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 30 21:04:16 2015 +0900 winoldapp: Grab the Win16 lock again before exiting. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winoldap.mod16/winoldap.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/programs/winoldap.mod16/winoldap.c b/programs/winoldap.mod16/winoldap.c index 410a567..c6342d0 100644 --- a/programs/winoldap.mod16/winoldap.c +++ b/programs/winoldap.mod16/winoldap.c @@ -76,14 +76,13 @@ WORD WINAPI WinMain16( HINSTANCE16 inst, HINSTANCE16 prev, LPSTR cmdline, WORD s if (wait_input_idle( info.hProcess, 10000 ) == WAIT_FAILED) WINE_WARN("WaitForInputIdle failed: Error %d\n", GetLastError() ); ReleaseThunkLock( &count ); - WaitForSingleObject( info.hProcess, INFINITE ); + RestoreThunkLock( count ); + GetExitCodeProcess( info.hProcess, &exit_code ); CloseHandle( info.hThread ); CloseHandle( info.hProcess ); } - else - ReleaseThunkLock( &count ); HeapFree( GetProcessHeap(), 0, cmdline ); ExitThread( exit_code );

8 years, 5 months

Hans Leidekker : ieframe: Don't release the advise sink in IOleObject:: SetClientSite.

by Alexandre Julliard

Module: wine Branch: master Commit: 10f35222dc8e7184963076a7e8e58ad64651638e URL: http://source.winehq.org/git/wine.git/?a=commit;h=10f35222dc8e7184963076a7e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Nov 30 10:48:04 2015 +0100 ieframe: Don't release the advise sink in IOleObject::SetClientSite. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ieframe/oleobject.c | 5 ----- dlls/ieframe/tests/webbrowser.c | 30 ++++++++++++++++++++++++++++++ dlls/ieframe/webbrowser.c | 3 +++ 3 files changed, 33 insertions(+), 5 deletions(-) diff --git a/dlls/ieframe/oleobject.c b/dlls/ieframe/oleobject.c index 2d3cac6..1076afe 100644 --- a/dlls/ieframe/oleobject.c +++ b/dlls/ieframe/oleobject.c @@ -311,11 +311,6 @@ static void release_client_site(WebBrowser *This) IOleInPlaceUIWindow_Release(This->uiwindow); This->uiwindow = NULL; } - - if(This->sink) { - IAdviseSink_Release(This->sink); - This->sink = NULL; - } } typedef struct { diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c index c8dfa5b..1617dcb 100644 --- a/dlls/ieframe/tests/webbrowser.c +++ b/dlls/ieframe/tests/webbrowser.c @@ -4003,6 +4003,7 @@ static void test_SetAdvise(void) IWebBrowser2 *browser; IViewObject2 *view; IAdviseSink *sink; + IOleObject *oleobj; DWORD aspects, flags; if (!(browser = create_webbrowser())) return; @@ -4031,9 +4032,38 @@ static void test_SetAdvise(void) ok(!flags, "got %08x\n", aspects); ok(sink == &test_sink, "got %p\n", sink); + hr = IWebBrowser2_QueryInterface(browser, &IID_IOleObject, (void **)&oleobj); + ok(hr == S_OK, "got %08x\n", hr); + + SET_EXPECT(GetContainer); + SET_EXPECT(Site_GetWindow); + SET_EXPECT(Invoke_AMBIENT_OFFLINEIFNOTCONNECTED); + SET_EXPECT(Invoke_AMBIENT_SILENT); + hr = IOleObject_SetClientSite(oleobj, &ClientSite); + ok(hr == S_OK, "got %08x\n", hr); + CHECK_CALLED(GetContainer); + CHECK_CALLED(Site_GetWindow); + CHECK_CALLED(Invoke_AMBIENT_OFFLINEIFNOTCONNECTED); + CHECK_CALLED(Invoke_AMBIENT_SILENT); + + sink = (IAdviseSink *)0xdeadbeef; + hr = IViewObject2_GetAdvise(view, &aspects, &flags, &sink); + ok(hr == S_OK, "got %08x\n", hr); + ok(sink == &test_sink, "got %p\n", sink); + + hr = IOleObject_SetClientSite(oleobj, NULL); + ok(hr == S_OK, "got %08x\n", hr); + + aspects = flags = 0xdeadbeef; + sink = (IAdviseSink *)0xdeadbeef; + hr = IViewObject2_GetAdvise(view, &aspects, &flags, &sink); + ok(hr == S_OK, "got %08x\n", hr); + ok(sink == &test_sink, "got %p\n", sink); + hr = IViewObject2_SetAdvise(view, 0, 0, NULL); ok(hr == S_OK, "got %08x\n", hr); + IOleObject_Release(oleobj); IViewObject2_Release(view); IWebBrowser2_Release(browser); } diff --git a/dlls/ieframe/webbrowser.c b/dlls/ieframe/webbrowser.c index 0378d6b..03acf38 100644 --- a/dlls/ieframe/webbrowser.c +++ b/dlls/ieframe/webbrowser.c @@ -167,6 +167,9 @@ static ULONG WINAPI WebBrowser_Release(IWebBrowser2 *iface) TRACE("(%p) ref=%d\n", This, ref); if(!ref) { + if(This->sink) + IAdviseSink_Release(This->sink); + if(This->doc_host.document) IUnknown_Release(This->doc_host.document);

8 years, 5 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2015