September 2016 - Wine-Commits

Stefan Dösinger : ddraw/tests: Port test_transform_vertices to ddraw2 and ddraw4.
by Alexandre Julliard Sept. 2, 2016

Sept. 2, 2016

Module: wine Branch: master Commit: 85ae10698cd7a173bac9d9220e4fa2c83ad4a97c URL: http://source.winehq.org/git/wine.git/?a=commit;h=85ae10698cd7a173bac9d9220… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Thu Sep 1 23:46:48 2016 +0100 ddraw/tests: Port test_transform_vertices to ddraw2 and ddraw4. Signed-off-by: Stefan Dösinger <stefandoesinger(a)gmx.at> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw2.c | 497 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 462 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 959 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=85ae10698cd7a173bac9d…

1 0

Stefan Dösinger : ddraw/tests: Test matrices in TransformVertices.
by Alexandre Julliard Sept. 2, 2016

Sept. 2, 2016

Module: wine Branch: master Commit: 33fbdd8bdca60d48c3e0afc7224d57408ec45057 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33fbdd8bdca60d48c3e0afc72… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Thu Sep 1 23:46:47 2016 +0100 ddraw/tests: Test matrices in TransformVertices. Signed-off-by: Stefan Dösinger <stefandoesinger(a)gmx.at> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw1.c | 109 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 109 insertions(+) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index e8194b3..1271022 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -9130,6 +9130,11 @@ static void test_transform_vertices(void) HWND window; HRESULT hr; IDirect3DViewport *viewport; + IDirect3DExecuteBuffer *execute_buffer; + D3DEXECUTEBUFFERDESC exec_desc; + UINT inst_length; + void *ptr; + D3DMATRIXHANDLE world_handle, view_handle, proj_handle; static struct transform_input position_tests[] = { { 0.0f, 0.0f, 0.0f, 0.0f, 1, 2, 3, 4, 5}, @@ -9163,6 +9168,28 @@ static void test_transform_vertices(void) }; unsigned int i; DWORD offscreen; + static D3DMATRIX mat_scale = + { + 2.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 2.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 2.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 1.0f, + }, + mat_translate1 = + { + 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 1.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 1.0f, 0.0f, + 1.0f, 0.0f, 0.0f, 1.0f, + }, + mat_translate2 = + { + 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, 1.0f, 0.0f, 1.0f, + }; + for (i = 0; i < ARRAY_SIZE(out); ++i) { @@ -9439,6 +9466,83 @@ static void test_transform_vertices(void) ok(SUCCEEDED(hr), "Failed to transform vertices, hr %#x.\n", hr); ok(offscreen == D3DCLIP_RIGHT, "Offscreen is %x.\n", offscreen); + /* Test the effect of Matrices. + * + * Basically the x coodinate ends up as ((x + 1) * 2 + 0) * 5 and + * y as ((y + 0) * 2 + 1) * 5. The 5 comes from dvScaleX/Y, 2 from + * the view matrix and the +1's from the world and projection matrix. */ + vp_data.dwX = 0; + vp_data.dwX = 0; + vp_data.dwWidth = 256; + vp_data.dwHeight = 256; + vp_data.dvScaleX = 5.0f; + vp_data.dvScaleY = 5.0f; + vp_data.dvMinZ = 0.0f; + vp_data.dvMaxZ = 1.0f; + hr = IDirect3DViewport_SetViewport(viewport, &vp_data); + ok(SUCCEEDED(hr), "Failed to set viewport, hr %#x.\n", hr); + + hr = IDirect3DDevice_CreateMatrix(device, &world_handle); + ok(hr == D3D_OK, "Creating a matrix object failed, hr %#x.\n", hr); + hr = IDirect3DDevice_SetMatrix(device, world_handle, &mat_translate1); + ok(hr == D3D_OK, "Setting a matrix object failed, hr %#x.\n", hr); + + hr = IDirect3DDevice_CreateMatrix(device, &view_handle); + ok(hr == D3D_OK, "Creating a matrix object failed, hr %#x.\n", hr); + hr = IDirect3DDevice_SetMatrix(device, view_handle, &mat_scale); + ok(hr == D3D_OK, "Setting a matrix object failed, hr %#x.\n", hr); + + hr = IDirect3DDevice_CreateMatrix(device, &proj_handle); + ok(hr == D3D_OK, "Creating a matrix object failed, hr %#x.\n", hr); + hr = IDirect3DDevice_SetMatrix(device, proj_handle, &mat_translate2); + ok(hr == D3D_OK, "Setting a matrix object failed, hr %#x.\n", hr); + + memset(&exec_desc, 0, sizeof(exec_desc)); + exec_desc.dwSize = sizeof(exec_desc); + exec_desc.dwFlags = D3DDEB_BUFSIZE | D3DDEB_CAPS; + exec_desc.dwBufferSize = 1024; + exec_desc.dwCaps = D3DDEBCAPS_SYSTEMMEMORY; + hr = IDirect3DDevice_CreateExecuteBuffer(device, &exec_desc, &execute_buffer, NULL); + ok(SUCCEEDED(hr), "Failed to create execute buffer, hr %#x.\n", hr); + + hr = IDirect3DExecuteBuffer_Lock(execute_buffer, &exec_desc); + ok(SUCCEEDED(hr), "Failed to lock execute buffer, hr %#x.\n", hr); + ptr = (BYTE *)exec_desc.lpData; + emit_set_ts(&ptr, D3DTRANSFORMSTATE_WORLD, world_handle); + emit_set_ts(&ptr, D3DTRANSFORMSTATE_VIEW, view_handle); + emit_set_ts(&ptr, D3DTRANSFORMSTATE_PROJECTION, proj_handle); + emit_end(&ptr); + inst_length = (BYTE *)ptr - (BYTE *)exec_desc.lpData; + hr = IDirect3DExecuteBuffer_Unlock(execute_buffer); + ok(SUCCEEDED(hr), "Failed to unlock execute buffer, hr %#x.\n", hr); + + set_execute_data(execute_buffer, 0, 0, inst_length); + hr = IDirect3DDevice_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice_Execute(device, execute_buffer, viewport, D3DEXECUTE_CLIPPED); + ok(SUCCEEDED(hr), "Failed to execute exec buffer, hr %#x.\n", hr); + hr = IDirect3DDevice_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + + transformdata.lpIn = position_tests; + transformdata.dwInSize = sizeof(position_tests[0]); + hr = IDirect3DViewport_TransformVertices(viewport, ARRAY_SIZE(position_tests), + &transformdata, D3DTRANSFORM_UNCLIPPED, &offscreen); + ok(SUCCEEDED(hr), "Failed to transform vertices, hr %#x.\n", hr); + + for (i = 0; i < ARRAY_SIZE(position_tests); ++i) + { + static const struct vec4 cmp[] = + { + {138.0f, 123.0f, 0.0f, 1.0f}, {148.0f, 113.0f, 2.0f, 1.0f}, {128.0f, 133.0f, -2.0f, 1.0f}, + {143.0f, 118.0f, 1.0f, 1.0f}, {133.0f, 128.0f, -1.0f, 1.0f}, {133.0f, 128.0f, 0.0f, 1.0f} + }; + + todo_wine ok(compare_vec4(&cmp[i], out[i].x, out[i].y, out[i].z, out[i].w, 4096), + "Vertex %u differs. Got %f %f %f %f.\n", i, + out[i].x, out[i].y, out[i].z, out[i].w); + } + /* Invalid flags. */ offscreen = 0xdeadbeef; hr = IDirect3DViewport_TransformVertices(viewport, ARRAY_SIZE(position_tests), @@ -9496,6 +9600,11 @@ static void test_transform_vertices(void) ok(SUCCEEDED(hr), "Failed to transform vertices, hr %#x.\n", hr); ok(offscreen == ~0U, "Offscreen is %x.\n", offscreen); + IDirect3DDevice_DeleteMatrix(device, world_handle); + IDirect3DDevice_DeleteMatrix(device, view_handle); + IDirect3DDevice_DeleteMatrix(device, proj_handle); + IDirect3DExecuteBuffer_Release(execute_buffer); + destroy_viewport(device, viewport); refcount = IDirect3DDevice_Release(device); ok(!refcount, "Device has %u references left.\n", refcount);

1 0

Stefan Dösinger : ddraw/tests: Make the vec parameter of compare_vec4 const.
by Alexandre Julliard Sept. 2, 2016

Sept. 2, 2016

Module: wine Branch: master Commit: bc1bcf0f31755254401712dc2bd1217096b94ed3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc1bcf0f31755254401712dc2… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Thu Sep 1 23:46:46 2016 +0100 ddraw/tests: Make the vec parameter of compare_vec4 const. Signed-off-by: Stefan Dösinger <stefandoesinger(a)gmx.at> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw4.c | 2 +- dlls/ddraw/tests/ddraw7.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 988a82f..2c7eae1 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -68,7 +68,7 @@ static BOOL compare_float(float f, float g, unsigned int ulps) return TRUE; } -static BOOL compare_vec4(struct vec4 *vec, float x, float y, float z, float w, unsigned int ulps) +static BOOL compare_vec4(const struct vec4 *vec, float x, float y, float z, float w, unsigned int ulps) { return compare_float(vec->x, x, ulps) && compare_float(vec->y, y, ulps) diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 48134c5..a193e38 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -76,7 +76,7 @@ static BOOL compare_vec3(struct vec3 *vec, float x, float y, float z, unsigned i && compare_float(vec->z, z, ulps); } -static BOOL compare_vec4(struct vec4 *vec, float x, float y, float z, float w, unsigned int ulps) +static BOOL compare_vec4(const struct vec4 *vec, float x, float y, float z, float w, unsigned int ulps) { return compare_float(vec->x, x, ulps) && compare_float(vec->y, y, ulps)

1 0

Nikolay Sivov : wined3d: Add texture flag to indicate GetDC() capability.
by Alexandre Julliard Sept. 2, 2016

Sept. 2, 2016

Module: wine Branch: master Commit: 53b7a2a1a12793b9d9528db916474affe70474ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=53b7a2a1a12793b9d9528db91… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 1 19:01:12 2016 +0300 wined3d: Add texture flag to indicate GetDC() capability. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/d3d9_private.h | 2 +- dlls/d3d9/device.c | 25 ++++++++++++++++++++++++- dlls/d3d9/surface.c | 25 ------------------------- dlls/d3d9/texture.c | 6 ++++++ dlls/wined3d/texture.c | 9 +++++++++ dlls/wined3d/wined3d_private.h | 1 + include/wine/wined3d.h | 1 + 7 files changed, 42 insertions(+), 27 deletions(-) diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index e4f4c09..3317e9c 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -43,6 +43,7 @@ extern HRESULT vdecl_convert_fvf(DWORD FVF, D3DVERTEXELEMENT9 **ppVertexElements) DECLSPEC_HIDDEN; D3DFORMAT d3dformat_from_wined3dformat(enum wined3d_format_id format) DECLSPEC_HIDDEN; +BOOL is_gdi_compat_format(D3DFORMAT format) DECLSPEC_HIDDEN; enum wined3d_format_id wined3dformat_from_d3dformat(D3DFORMAT format) DECLSPEC_HIDDEN; void present_parameters_from_wined3d_swapchain_desc(D3DPRESENT_PARAMETERS *present_parameters, const struct wined3d_swapchain_desc *swapchain_desc) DECLSPEC_HIDDEN; @@ -227,7 +228,6 @@ struct d3d9_surface IDirect3DDevice9Ex *parent_device; IUnknown *container; struct d3d9_texture *texture; - BOOL getdc_supported; }; struct wined3d_rendertarget_view *d3d9_surface_get_rendertarget_view(struct d3d9_surface *surface) DECLSPEC_HIDDEN; diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index c3f3007..b8c4638 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1125,6 +1125,9 @@ static HRESULT d3d9_device_create_surface(struct d3d9_device *device, UINT width desc.depth = 1; desc.size = 0; + if (is_gdi_compat_format(format)) + flags |= WINED3D_TEXTURE_CREATE_GET_DC; + wined3d_mutex_lock(); if (FAILED(hr = wined3d_texture_create(device->wined3d_device, &desc, @@ -1153,6 +1156,22 @@ static HRESULT d3d9_device_create_surface(struct d3d9_device *device, UINT width return D3D_OK; } +BOOL is_gdi_compat_format(D3DFORMAT format) +{ + switch (format) + { + case D3DFMT_A8R8G8B8: + case D3DFMT_X8R8G8B8: + case D3DFMT_R5G6B5: + case D3DFMT_X1R5G5B5: + case D3DFMT_A1R5G5B5: + case D3DFMT_R8G8B8: + return TRUE; + default: + return FALSE; + } +} + static HRESULT WINAPI d3d9_device_CreateRenderTarget(IDirect3DDevice9Ex *iface, UINT width, UINT height, D3DFORMAT format, D3DMULTISAMPLE_TYPE multisample_type, DWORD multisample_quality, BOOL lockable, IDirect3DSurface9 **surface, HANDLE *shared_handle) @@ -3722,6 +3741,7 @@ static HRESULT CDECL device_parent_create_swapchain_texture(struct wined3d_devic void *container_parent, const struct wined3d_resource_desc *desc, struct wined3d_texture **texture) { struct d3d9_device *device = device_from_device_parent(device_parent); + DWORD flags = WINED3D_TEXTURE_CREATE_MAPPABLE; struct d3d9_surface *d3d_surface; HRESULT hr; @@ -3731,8 +3751,11 @@ static HRESULT CDECL device_parent_create_swapchain_texture(struct wined3d_devic if (container_parent == device_parent) container_parent = &device->IDirect3DDevice9Ex_iface; + if (is_gdi_compat_format(d3dformat_from_wined3dformat(desc->format))) + flags |= WINED3D_TEXTURE_CREATE_GET_DC; + if (FAILED(hr = wined3d_texture_create(device->wined3d_device, desc, 1, 1, - WINED3D_TEXTURE_CREATE_MAPPABLE, NULL, container_parent, &d3d9_null_wined3d_parent_ops, texture))) + flags, NULL, container_parent, &d3d9_null_wined3d_parent_ops, texture))) { WARN("Failed to create texture, hr %#x.\n", hr); return hr; diff --git a/dlls/d3d9/surface.c b/dlls/d3d9/surface.c index b007f78..be68682 100644 --- a/dlls/d3d9/surface.c +++ b/dlls/d3d9/surface.c @@ -287,13 +287,6 @@ static HRESULT WINAPI d3d9_surface_GetDC(IDirect3DSurface9 *iface, HDC *dc) TRACE("iface %p, dc %p.\n", iface, dc); - if (!surface->getdc_supported) - { - WARN("Surface does not support GetDC, returning D3DERR_INVALIDCALL\n"); - /* Don't touch the DC */ - return D3DERR_INVALIDCALL; - } - wined3d_mutex_lock(); hr = wined3d_texture_get_dc(surface->wined3d_texture, surface->sub_resource_idx, dc); wined3d_mutex_unlock(); @@ -354,7 +347,6 @@ static const struct wined3d_parent_ops d3d9_surface_wined3d_parent_ops = void surface_init(struct d3d9_surface *surface, struct wined3d_texture *wined3d_texture, unsigned int sub_resource_idx, const struct wined3d_parent_ops **parent_ops) { - struct wined3d_resource_desc desc; IDirect3DBaseTexture9 *texture; surface->IDirect3DSurface9_iface.lpVtbl = &d3d9_surface_vtbl; @@ -372,23 +364,6 @@ void surface_init(struct d3d9_surface *surface, struct wined3d_texture *wined3d_ IDirect3DBaseTexture9_Release(texture); } - wined3d_resource_get_desc(wined3d_texture_get_resource(wined3d_texture), &desc); - switch (d3dformat_from_wined3dformat(desc.format)) - { - case D3DFMT_A8R8G8B8: - case D3DFMT_X8R8G8B8: - case D3DFMT_R5G6B5: - case D3DFMT_X1R5G5B5: - case D3DFMT_A1R5G5B5: - case D3DFMT_R8G8B8: - surface->getdc_supported = TRUE; - break; - - default: - surface->getdc_supported = FALSE; - break; - } - *parent_ops = &d3d9_surface_wined3d_parent_ops; } diff --git a/dlls/d3d9/texture.c b/dlls/d3d9/texture.c index bd93d21..46e4218 100644 --- a/dlls/d3d9/texture.c +++ b/dlls/d3d9/texture.c @@ -1257,6 +1257,9 @@ HRESULT texture_init(struct d3d9_texture *texture, struct d3d9_device *device, if (pool != D3DPOOL_DEFAULT || (usage & D3DUSAGE_DYNAMIC)) flags |= WINED3D_TEXTURE_CREATE_MAPPABLE; + if (is_gdi_compat_format(format)) + flags |= WINED3D_TEXTURE_CREATE_GET_DC; + if (!levels) { if (usage & D3DUSAGE_AUTOGENMIPMAP) @@ -1307,6 +1310,9 @@ HRESULT cubetexture_init(struct d3d9_texture *texture, struct d3d9_device *devic if (pool != D3DPOOL_DEFAULT || (usage & D3DUSAGE_DYNAMIC)) flags |= WINED3D_TEXTURE_CREATE_MAPPABLE; + if (is_gdi_compat_format(format)) + flags |= WINED3D_TEXTURE_CREATE_GET_DC; + if (!levels) { if (usage & D3DUSAGE_AUTOGENMIPMAP) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index cf5fc93..a13f2c6 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -324,6 +324,8 @@ static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struc texture->flags |= WINED3D_TEXTURE_POW2_MAT_IDENT | WINED3D_TEXTURE_NORMALIZED_COORDS; if (flags & WINED3D_TEXTURE_CREATE_GET_DC_LENIENT) texture->flags |= WINED3D_TEXTURE_PIN_SYSMEM | WINED3D_TEXTURE_GET_DC_LENIENT; + if (flags & (WINED3D_TEXTURE_CREATE_GET_DC | WINED3D_TEXTURE_CREATE_GET_DC_LENIENT)) + texture->flags |= WINED3D_TEXTURE_GET_DC; if (flags & WINED3D_TEXTURE_CREATE_DISCARD) texture->flags |= WINED3D_TEXTURE_DISCARD; @@ -2866,6 +2868,13 @@ HRESULT CDECL wined3d_texture_get_dc(struct wined3d_texture *texture, unsigned i TRACE("texture %p, sub_resource_idx %u, dc %p.\n", texture, sub_resource_idx, dc); + if (!(texture->flags & WINED3D_TEXTURE_GET_DC)) + { + WARN("Texture does not support GetDC\n"); + /* Don't touch the DC */ + return WINED3DERR_INVALIDCALL; + } + if (!(sub_resource = wined3d_texture_get_sub_resource(texture, sub_resource_idx))) return WINED3DERR_INVALIDCALL; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 2dd60ed..4479837 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2640,6 +2640,7 @@ struct wined3d_texture_ops #define WINED3D_TEXTURE_GET_DC_LENIENT 0x00000800 #define WINED3D_TEXTURE_DC_IN_USE 0x00001000 #define WINED3D_TEXTURE_DISCARD 0x00002000 +#define WINED3D_TEXTURE_GET_DC 0x00004000 #define WINED3D_TEXTURE_ASYNC_COLOR_KEY 0x00000001 diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index f2900a9..e42ef77 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1490,6 +1490,7 @@ enum wined3d_display_rotation #define WINED3D_TEXTURE_CREATE_MAPPABLE 0x00000001 #define WINED3D_TEXTURE_CREATE_DISCARD 0x00000002 #define WINED3D_TEXTURE_CREATE_GET_DC_LENIENT 0x00000004 +#define WINED3D_TEXTURE_CREATE_GET_DC 0x00000008 #define WINED3D_APPEND_ALIGNED_ELEMENT 0xffffffff

1 0

Ken Thomases : winemac: Set windows to transparent until they have content to draw, to reduce flicker.
by Alexandre Julliard Sept. 2, 2016

Sept. 2, 2016

Module: wine Branch: master Commit: fdd7db05931df0a9d1318108ed206cb50e311d1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=fdd7db05931df0a9d1318108e… Author: Ken Thomases <ken(a)codeweavers.com> Date: Fri Sep 2 03:08:01 2016 -0500 winemac: Set windows to transparent until they have content to draw, to reduce flicker. When a window is shown, it may not have drawn its content into the backing surface, yet. Cocoa will draw the window, starting with its standard light gray background and then the content view. However, the content view won't have anything to draw, yet, though, so the window background is not drawn over. A short while later, usually, the app will paint its content into the window backing surface and Cocoa will be told to redraw the window. This works, but the user can often see the flash of the window background color first. This is especially visible for windows with dark content. Part of the fix is to set the window background to transparent until the content view has actually drawn once since the window was shown. That's not sufficient on its own, though. We had disabled Cocoa's automatic display mechanism for windows and put display on a display-link timer. This meant that the window was not actually cleared to its transparent color. When the window was shown, the Window Server displayed a white backing buffer. It is the app process which should fill that backing buffer with clear color but, because we had disabled auto-display, that wasn't getting done at the same time the window was displayed. It was happening some time after. Again, the result was a visible flicker of white. So, we now temporarily re-enable auto-display just before showing a window. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/cocoa_window.h | 1 + dlls/winemac.drv/cocoa_window.m | 31 ++++++++++++++++++++++++++++--- 2 files changed, 29 insertions(+), 3 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.h b/dlls/winemac.drv/cocoa_window.h index d52a9d2..f037b08 100644 --- a/dlls/winemac.drv/cocoa_window.h +++ b/dlls/winemac.drv/cocoa_window.h @@ -34,6 +34,7 @@ BOOL fullscreen; BOOL pendingMinimize; BOOL savedVisibleState; + BOOL drawnSinceShown; WineWindow* latentParentWindow; NSMutableArray* latentChildWindows; diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index c6e0709..8e8ac9f 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -317,6 +317,7 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi @property (readwrite, nonatomic) BOOL disabled; @property (readwrite, nonatomic) BOOL noActivate; @property (readwrite, nonatomic) BOOL floating; +(a)property (readwrite, nonatomic) BOOL drawnSinceShown; @property (readwrite, getter=isFakingClose, nonatomic) BOOL fakingClose; @property (retain, nonatomic) NSWindow* latentParentWindow; @@ -346,6 +347,8 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi - (BOOL) becameEligibleParentOrChild; - (void) becameIneligibleChild; + - (void) windowDidDrawContent; + @end @@ -383,7 +386,7 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi if ([window contentView] != self) return; - if (window.shapeChangedSinceLastDraw && window.shape && !window.colorKeyed && !window.usePerPixelAlpha) + if (window.drawnSinceShown && window.shapeChangedSinceLastDraw && window.shape && !window.colorKeyed && !window.usePerPixelAlpha) { [[NSColor clearColor] setFill]; NSRectFill(rect); @@ -441,6 +444,8 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi CGImageRelease(image); } } + + [window windowDidDrawContent]; } pthread_mutex_unlock(window.surface_mutex); @@ -449,7 +454,7 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi // If the window may be transparent, then we have to invalidate the // shadow every time we draw. Also, if this is the first time we've // drawn since changing from transparent to opaque. - if (window.colorKeyed || window.usePerPixelAlpha || window.shapeChangedSinceLastDraw) + if (window.drawnSinceShown && (window.colorKeyed || window.usePerPixelAlpha || window.shapeChangedSinceLastDraw)) { window.shapeChangedSinceLastDraw = FALSE; [window invalidateShadow]; @@ -794,6 +799,7 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi static WineWindow* causing_becomeKeyWindow; @synthesize disabled, noActivate, floating, fullscreen, fakingClose, latentParentWindow, hwnd, queue; + @synthesize drawnSinceShown; @synthesize surface, surface_mutex; @synthesize shape, shapeData, shapeChangedSinceLastDraw; @synthesize colorKeyed, colorKeyRed, colorKeyGreen, colorKeyBlue; @@ -831,7 +837,8 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi [window setAcceptsMouseMovedEvents:YES]; [window setColorSpace:[NSColorSpace genericRGBColorSpace]]; [window setDelegate:window]; - [window setAutodisplay:NO]; + [window setBackgroundColor:[NSColor clearColor]]; + [window setOpaque:NO]; window.hwnd = hwnd; window.queue = queue; window->savedContentMinSize = NSZeroSize; @@ -1191,6 +1198,8 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi { if ([self level] > [child level]) [child setLevel:[self level]]; + if (![child isVisible]) + [child setAutodisplay:YES]; [self addChildWindow:child ordered:NSWindowAbove]; [child checkWineDisplayLink]; [latentChildWindows removeObjectIdenticalTo:child]; @@ -1455,6 +1464,7 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi // Then the levels get fixed by -adjustWindowLevels. if ([self level] != [other level]) [self setLevel:[other level]]; + [self setAutodisplay:YES]; [self orderWindow:orderingMode relativeTo:[other windowNumber]]; [self checkWineDisplayLink]; @@ -1474,6 +1484,7 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi next = [controller frontWineWindow]; if (next && [self level] < [next level]) [self setLevel:[next level]]; + [self setAutodisplay:YES]; [self orderFront:nil]; [self checkWineDisplayLink]; needAdjustWindowLevels = TRUE; @@ -1530,6 +1541,9 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi else [self orderOut:nil]; [self checkWineDisplayLink]; + [self setBackgroundColor:[NSColor clearColor]]; + [self setOpaque:NO]; + drawnSinceShown = NO; savedVisibleState = FALSE; if (wasVisible && wasOnActiveSpace && fullscreen) [controller updateFullscreenWindows]; @@ -2266,6 +2280,17 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi [self setAutodisplay:NO]; } + - (void) windowDidDrawContent + { + if (!drawnSinceShown) + { + drawnSinceShown = YES; + dispatch_async(dispatch_get_main_queue(), ^{ + [self checkTransparency]; + }); + } + } + - (NSArray*) childWineWindows { NSArray* childWindows = self.childWindows;

1 0

Ken Thomases : winemac: Trace when a window' s per-pixel-alpha setting changes.
by Alexandre Julliard Sept. 2, 2016

Sept. 2, 2016

Module: wine Branch: master Commit: 5c5eef8d40dd7ece5d4bbbfaed0924f05ae61b24 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c5eef8d40dd7ece5d4bbbfae… Author: Ken Thomases <ken(a)codeweavers.com> Date: Fri Sep 2 03:08:00 2016 -0500 winemac: Trace when a window's per-pixel-alpha setting changes. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/window.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index 73025d7..f4be7ce 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -481,6 +481,7 @@ static void sync_window_opacity(struct macdrv_win_data *data, COLORREF key, BYTE if (!data->per_pixel_alpha != !per_pixel_alpha) { + TRACE("setting window %p/%p per-pixel-alpha to %d\n", data->hwnd, data->cocoa_window, per_pixel_alpha); macdrv_window_use_per_pixel_alpha(data->cocoa_window, per_pixel_alpha); data->per_pixel_alpha = per_pixel_alpha; needs_flush = TRUE;

1 0

Hugh McMaster : reg/tests: Exclude the null terminating character from MultiByteToWideChar conversion.
by Alexandre Julliard Sept. 2, 2016

Sept. 2, 2016

Module: wine Branch: master Commit: 6d72a0cca355444070f3b5eae96f865a9efcf9f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d72a0cca355444070f3b5eae… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Sep 1 13:37:06 2016 +0000 reg/tests: Exclude the null terminating character from MultiByteToWideChar conversion. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 715cdbd..1e3d1d2 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -727,17 +727,19 @@ static BOOL test_import_str_(unsigned line, const char *file_contents, DWORD *rc #define test_import_wstr(c,r) test_import_wstr_(__LINE__,c,r) static BOOL test_import_wstr_(unsigned line, const char *file_contents, DWORD *rc) { - int len, memsize; + int lenA, len, memsize; WCHAR *wstr; HANDLE regfile; DWORD written; BOOL ret; - len = MultiByteToWideChar(CP_UTF8, 0, file_contents, -1, NULL, 0); + lenA = strlen(file_contents); + + len = MultiByteToWideChar(CP_UTF8, 0, file_contents, lenA, NULL, 0); memsize = len * sizeof(WCHAR); wstr = HeapAlloc(GetProcessHeap(), 0, memsize); if (!wstr) return FALSE; - MultiByteToWideChar(CP_UTF8, 0, file_contents, -1, wstr, memsize); + MultiByteToWideChar(CP_UTF8, 0, file_contents, lenA, wstr, memsize); regfile = CreateFileA("test.reg", GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL);

1 0

Huw Davies : ole32: Mask out the flag bit.
by Alexandre Julliard Sept. 2, 2016

Sept. 2, 2016

Module: wine Branch: master Commit: 1ed2a613a7977b342b54c55e49b728cf81f53ddc URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ed2a613a7977b342b54c55e4… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Sep 2 11:41:04 2016 +0100 ole32: Mask out the flag bit. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/rpc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ole32/rpc.c b/dlls/ole32/rpc.c index e8bf9bf..ec5dc59 100644 --- a/dlls/ole32/rpc.c +++ b/dlls/ole32/rpc.c @@ -664,7 +664,7 @@ static HRESULT WINAPI ClientRpcChannelBuffer_GetBuffer(LPRPCCHANNELBUFFER iface, message_state->channel_hook_info.cbSize = sizeof(message_state->channel_hook_info); message_state->channel_hook_info.uCausality = COM_CurrentCausalityId(); message_state->channel_hook_info.dwServerPid = This->server_pid; - message_state->channel_hook_info.iMethod = msg->ProcNum; + message_state->channel_hook_info.iMethod = msg->ProcNum & ~RPC_FLAGS_VALID_BIT; message_state->channel_hook_info.pObject = NULL; /* only present on server-side */ message_state->target_hwnd = NULL; message_state->target_tid = 0;

1 0

Jacek Caban : rbtree.h: Pass compare function instead of wine_rb_functions to wine_rb_init.
by Alexandre Julliard Sept. 2, 2016

Sept. 2, 2016

Module: wine Branch: master Commit: acc0bb0521a17f69d104f66dc9b0577621ee32ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=acc0bb0521a17f69d104f66dc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 1 10:55:49 2016 +0200 rbtree.h: Pass compare function instead of wine_rb_functions to wine_rb_init. Also change return type to void since the function can no longer fail. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/d3d10_main.c | 10 +------ dlls/d3d10/d3d10_private.h | 4 --- dlls/d3d10/utils.c | 15 ----------- dlls/d3d11/device.c | 55 +++----------------------------------- dlls/d3dcompiler_43/reflection.c | 25 +---------------- dlls/d3dcompiler_43/utils.c | 46 +++---------------------------- dlls/dbghelp/dbghelp_private.h | 2 +- dlls/dbghelp/module.c | 2 +- dlls/dbghelp/source.c | 25 +---------------- dlls/wined3d/arb_program_shader.c | 22 +++------------ dlls/wined3d/ati_fragment_shader.c | 2 +- dlls/wined3d/device.c | 10 +------ dlls/wined3d/glsl_shader.c | 14 +++------- dlls/wined3d/utils.c | 35 ++---------------------- dlls/wined3d/wined3d_private.h | 9 +++---- include/wine/rbtree.h | 16 +++-------- 16 files changed, 30 insertions(+), 262 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=acc0bb0521a17f69d104f…

1 0

Nikolay Sivov : quartz: Remove some interface pointer casts.
by Alexandre Julliard Sept. 2, 2016

Sept. 2, 2016

Module: wine Branch: master Commit: c6110acfda7f2e3f66cdd37547d01edcf0a83db5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6110acfda7f2e3f66cdd3754… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Sep 2 13:55:20 2016 +0300 quartz: Remove some interface pointer casts. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/avisplit.c | 2 +- dlls/quartz/mpegsplit.c | 2 +- dlls/quartz/parser.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/quartz/avisplit.c b/dlls/quartz/avisplit.c index 74529f2..a1b4fbe 100644 --- a/dlls/quartz/avisplit.c +++ b/dlls/quartz/avisplit.c @@ -690,7 +690,7 @@ static HRESULT AVISplitter_ProcessStreamList(AVISplitterImpl * This, const BYTE ZeroMemory(&amt, sizeof(amt)); piOutput.dir = PINDIR_OUTPUT; - piOutput.pFilter = (IBaseFilter *)This; + piOutput.pFilter = &This->Parser.filter.IBaseFilter_iface; wsprintfW(piOutput.achName, wszStreamTemplate, This->Parser.cStreams); This->streams = CoTaskMemRealloc(This->streams, sizeof(StreamData) * (This->Parser.cStreams+1)); stream = This->streams + This->Parser.cStreams; diff --git a/dlls/quartz/mpegsplit.c b/dlls/quartz/mpegsplit.c index 9b581e9..8d42bd8 100644 --- a/dlls/quartz/mpegsplit.c +++ b/dlls/quartz/mpegsplit.c @@ -374,7 +374,7 @@ static HRESULT MPEGSplitter_init_audio(MPEGSplitterImpl *This, const BYTE *heade ZeroMemory(pamt, sizeof(*pamt)); ppiOutput->dir = PINDIR_OUTPUT; - ppiOutput->pFilter = (IBaseFilter*)This; + ppiOutput->pFilter = &This->Parser.filter.IBaseFilter_iface; wsprintfW(ppiOutput->achName, wszAudioStream); pamt->formattype = FORMAT_WaveFormatEx; diff --git a/dlls/quartz/parser.c b/dlls/quartz/parser.c index fd98787..bc6b34d 100644 --- a/dlls/quartz/parser.c +++ b/dlls/quartz/parser.c @@ -455,7 +455,7 @@ HRESULT Parser_AddPin(ParserImpl * This, const PIN_INFO * piOutput, ALLOCATOR_PR CopyMediaType(pin->pmt, amt); pin->dwSamplesProcessed = 0; - pin->pin.pin.pinInfo.pFilter = (LPVOID)This; + pin->pin.pin.pinInfo.pFilter = &This->filter.IBaseFilter_iface; pin->allocProps = *props; This->cStreams++; BaseFilterImpl_IncrementPinVersion(&This->filter);

1 0