wine-commits March 2020

wine-commits@winehq.org

1 participants
996 discussions

Chip Davis : ddraw: Introduce a helper to convert ddraw stateblock types to wined3d types.
by Alexandre Julliard 31 Mar '20

31 Mar '20

Module: wine Branch: master Commit: 7dce36c8f5a85d9c47d9644834974132d589ee9b URL: https://source.winehq.org/git/wine.git/?a=commit;h=7dce36c8f5a85d9c47d96448… Author: Chip Davis <cdavis(a)codeweavers.com> Date: Tue Mar 31 19:57:15 2020 +0430 ddraw: Introduce a helper to convert ddraw stateblock types to wined3d types. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/device.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index ede9c77031..e09100dfdc 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -101,6 +101,11 @@ static enum wined3d_primitive_type wined3d_primitive_type_from_ddraw(D3DPRIMITIV return (enum wined3d_primitive_type)type; } +static enum wined3d_stateblock_type wined3d_stateblock_type_from_ddraw(D3DSTATEBLOCKTYPE type) +{ + return (enum wined3d_stateblock_type)type; +} + static inline struct d3d_device *impl_from_IUnknown(IUnknown *iface) { return CONTAINING_RECORD(iface, struct d3d_device, IUnknown_inner); @@ -5969,9 +5974,8 @@ static HRESULT d3d_device7_CreateStateBlock(IDirect3DDevice7 *iface, return D3DERR_INBEGINSTATEBLOCK; } - /* The D3DSTATEBLOCKTYPE enum is fine here. */ - hr = wined3d_stateblock_create(device->wined3d_device, device->state, type, &wined3d_sb); - if (FAILED(hr)) + if (FAILED(hr = wined3d_stateblock_create(device->wined3d_device, + device->state, wined3d_stateblock_type_from_ddraw(type), &wined3d_sb))) { WARN("Failed to create stateblock, hr %#x.\n", hr); wined3d_mutex_unlock();

1 0

Chip Davis : ddraw: Introduce a helper to convert ddraw primitive types to wined3d types.
by Alexandre Julliard 31 Mar '20

31 Mar '20

Module: wine Branch: master Commit: 02d03a66a588e6c170358cc1016f3f1dc71b0a5e URL: https://source.winehq.org/git/wine.git/?a=commit;h=02d03a66a588e6c170358cc1… Author: Chip Davis <cdavis(a)codeweavers.com> Date: Tue Mar 31 19:57:14 2020 +0430 ddraw: Introduce a helper to convert ddraw primitive types to wined3d types. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/device.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 4a10eb07df..ede9c77031 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -96,6 +96,11 @@ static enum wined3d_transform_state wined3d_transform_state_from_ddraw(D3DTRANSF } } +static enum wined3d_primitive_type wined3d_primitive_type_from_ddraw(D3DPRIMITIVETYPE type) +{ + return (enum wined3d_primitive_type)type; +} + static inline struct d3d_device *impl_from_IUnknown(IUnknown *iface) { return CONTAINING_RECORD(iface, struct d3d_device, IUnknown_inner); @@ -3464,7 +3469,7 @@ static HRESULT d3d_device7_DrawPrimitive(IDirect3DDevice7 *iface, goto done; wined3d_stateblock_set_vertex_declaration(device->state, ddraw_find_decl(device->ddraw, fvf)); - wined3d_device_set_primitive_type(device->wined3d_device, primitive_type, 0); + wined3d_device_set_primitive_type(device->wined3d_device, wined3d_primitive_type_from_ddraw(primitive_type), 0); wined3d_device_apply_stateblock(device->wined3d_device, device->state); hr = wined3d_device_draw_primitive(device->wined3d_device, vb_pos / stride, vertex_count); @@ -3675,7 +3680,7 @@ static HRESULT d3d_device7_DrawIndexedPrimitive(IDirect3DDevice7 *iface, wined3d_stateblock_set_index_buffer(device->state, device->index_buffer, WINED3DFMT_R16_UINT); wined3d_stateblock_set_vertex_declaration(device->state, ddraw_find_decl(device->ddraw, fvf)); - wined3d_device_set_primitive_type(device->wined3d_device, primitive_type, 0); + wined3d_device_set_primitive_type(device->wined3d_device, wined3d_primitive_type_from_ddraw(primitive_type), 0); wined3d_stateblock_set_base_vertex_index(device->state, vb_pos / stride); wined3d_device_apply_stateblock(device->wined3d_device, device->state); hr = wined3d_device_draw_indexed_primitive(device->wined3d_device, ib_pos / sizeof(*indices), index_count); @@ -4002,7 +4007,7 @@ static HRESULT d3d_device7_DrawPrimitiveStrided(IDirect3DDevice7 *iface, D3DPRIM goto done; wined3d_stateblock_set_vertex_declaration(device->state, ddraw_find_decl(device->ddraw, fvf)); - wined3d_device_set_primitive_type(device->wined3d_device, primitive_type, 0); + wined3d_device_set_primitive_type(device->wined3d_device, wined3d_primitive_type_from_ddraw(primitive_type), 0); wined3d_device_apply_stateblock(device->wined3d_device, device->state); hr = wined3d_device_draw_primitive(device->wined3d_device, vb_pos / dst_stride, vertex_count); @@ -4138,7 +4143,7 @@ static HRESULT d3d_device7_DrawIndexedPrimitiveStrided(IDirect3DDevice7 *iface, wined3d_stateblock_set_base_vertex_index(device->state, vb_pos / vtx_dst_stride); wined3d_stateblock_set_vertex_declaration(device->state, ddraw_find_decl(device->ddraw, fvf)); - wined3d_device_set_primitive_type(device->wined3d_device, primitive_type, 0); + wined3d_device_set_primitive_type(device->wined3d_device, wined3d_primitive_type_from_ddraw(primitive_type), 0); wined3d_device_apply_stateblock(device->wined3d_device, device->state); hr = wined3d_device_draw_indexed_primitive(device->wined3d_device, ib_pos / sizeof(WORD), index_count); @@ -4260,7 +4265,7 @@ static HRESULT d3d_device7_DrawPrimitiveVB(IDirect3DDevice7 *iface, D3DPRIMITIVE } /* Now draw the primitives */ - wined3d_device_set_primitive_type(device->wined3d_device, primitive_type, 0); + wined3d_device_set_primitive_type(device->wined3d_device, wined3d_primitive_type_from_ddraw(primitive_type), 0); wined3d_device_apply_stateblock(device->wined3d_device, device->state); hr = wined3d_device_draw_primitive(device->wined3d_device, start_vertex, vertex_count); @@ -4414,7 +4419,7 @@ static HRESULT d3d_device7_DrawIndexedPrimitiveVB(IDirect3DDevice7 *iface, return hr; } - wined3d_device_set_primitive_type(device->wined3d_device, primitive_type, 0); + wined3d_device_set_primitive_type(device->wined3d_device, wined3d_primitive_type_from_ddraw(primitive_type), 0); wined3d_device_apply_stateblock(device->wined3d_device, device->state); hr = wined3d_device_draw_indexed_primitive(device->wined3d_device, ib_pos / sizeof(WORD), index_count);

1 0

Chip Davis : ddraw: Introduce a helper to convert ddraw transform states to wined3d states.
by Alexandre Julliard 31 Mar '20

31 Mar '20

Module: wine Branch: master Commit: 67d71cb2d03e693a69b6f8d5581e499dfecbd19f URL: https://source.winehq.org/git/wine.git/?a=commit;h=67d71cb2d03e693a69b6f8d5… Author: Chip Davis <cdavis(a)codeweavers.com> Date: Tue Mar 31 19:57:13 2020 +0430 ddraw: Introduce a helper to convert ddraw transform states to wined3d states. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/device.c | 81 ++++++++++++++--------------------------------------- 1 file changed, 21 insertions(+), 60 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index d62d38e07b..4a10eb07df 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -79,6 +79,23 @@ static enum wined3d_render_state wined3d_render_state_from_ddraw(D3DRENDERSTATET return (enum wined3d_render_state)state; } +static enum wined3d_transform_state wined3d_transform_state_from_ddraw(D3DTRANSFORMSTATETYPE state) +{ + switch (state) + { + case D3DTRANSFORMSTATE_WORLD: + return WINED3D_TS_WORLD_MATRIX(0); + case D3DTRANSFORMSTATE_WORLD1: + return WINED3D_TS_WORLD_MATRIX(1); + case D3DTRANSFORMSTATE_WORLD2: + return WINED3D_TS_WORLD_MATRIX(2); + case D3DTRANSFORMSTATE_WORLD3: + return WINED3D_TS_WORLD_MATRIX(3); + default: + return (enum wined3d_transform_state)state; + } +} + static inline struct d3d_device *impl_from_IUnknown(IUnknown *iface) { return CONTAINING_RECORD(iface, struct d3d_device, IUnknown_inner); @@ -3096,34 +3113,16 @@ static HRESULT d3d_device7_SetTransform(IDirect3DDevice7 *iface, D3DTRANSFORMSTATETYPE state, D3DMATRIX *matrix) { struct d3d_device *device = impl_from_IDirect3DDevice7(iface); - enum wined3d_transform_state wined3d_state; TRACE("iface %p, state %#x, matrix %p.\n", iface, state, matrix); - switch (state) - { - case D3DTRANSFORMSTATE_WORLD: - wined3d_state = WINED3D_TS_WORLD_MATRIX(0); - break; - case D3DTRANSFORMSTATE_WORLD1: - wined3d_state = WINED3D_TS_WORLD_MATRIX(1); - break; - case D3DTRANSFORMSTATE_WORLD2: - wined3d_state = WINED3D_TS_WORLD_MATRIX(2); - break; - case D3DTRANSFORMSTATE_WORLD3: - wined3d_state = WINED3D_TS_WORLD_MATRIX(3); - break; - default: - wined3d_state = state; - } - if (!matrix) return DDERR_INVALIDPARAMS; /* Note: D3DMATRIX is compatible with struct wined3d_matrix. */ wined3d_mutex_lock(); - wined3d_stateblock_set_transform(device->update_state, wined3d_state, (const struct wined3d_matrix *)matrix); + wined3d_stateblock_set_transform(device->update_state, + wined3d_transform_state_from_ddraw(state), (const struct wined3d_matrix *)matrix); wined3d_mutex_unlock(); return D3D_OK; @@ -3205,34 +3204,15 @@ static HRESULT d3d_device7_GetTransform(IDirect3DDevice7 *iface, D3DTRANSFORMSTATETYPE state, D3DMATRIX *matrix) { struct d3d_device *device = impl_from_IDirect3DDevice7(iface); - enum wined3d_transform_state wined3d_state; TRACE("iface %p, state %#x, matrix %p.\n", iface, state, matrix); - switch (state) - { - case D3DTRANSFORMSTATE_WORLD: - wined3d_state = WINED3D_TS_WORLD_MATRIX(0); - break; - case D3DTRANSFORMSTATE_WORLD1: - wined3d_state = WINED3D_TS_WORLD_MATRIX(1); - break; - case D3DTRANSFORMSTATE_WORLD2: - wined3d_state = WINED3D_TS_WORLD_MATRIX(2); - break; - case D3DTRANSFORMSTATE_WORLD3: - wined3d_state = WINED3D_TS_WORLD_MATRIX(3); - break; - default: - wined3d_state = state; - } - if (!matrix) return DDERR_INVALIDPARAMS; /* Note: D3DMATRIX is compatible with struct wined3d_matrix. */ wined3d_mutex_lock(); - memcpy(matrix, &device->stateblock_state->transforms[wined3d_state], sizeof(*matrix)); + memcpy(matrix, &device->stateblock_state->transforms[wined3d_transform_state_from_ddraw(state)], sizeof(*matrix)); wined3d_mutex_unlock(); return D3D_OK; @@ -3309,32 +3289,13 @@ static HRESULT d3d_device7_MultiplyTransform(IDirect3DDevice7 *iface, D3DTRANSFORMSTATETYPE state, D3DMATRIX *matrix) { struct d3d_device *device = impl_from_IDirect3DDevice7(iface); - enum wined3d_transform_state wined3d_state; TRACE("iface %p, state %#x, matrix %p.\n", iface, state, matrix); - switch (state) - { - case D3DTRANSFORMSTATE_WORLD: - wined3d_state = WINED3D_TS_WORLD_MATRIX(0); - break; - case D3DTRANSFORMSTATE_WORLD1: - wined3d_state = WINED3D_TS_WORLD_MATRIX(1); - break; - case D3DTRANSFORMSTATE_WORLD2: - wined3d_state = WINED3D_TS_WORLD_MATRIX(2); - break; - case D3DTRANSFORMSTATE_WORLD3: - wined3d_state = WINED3D_TS_WORLD_MATRIX(3); - break; - default: - wined3d_state = state; - } - /* Note: D3DMATRIX is compatible with struct wined3d_matrix. */ wined3d_mutex_lock(); wined3d_stateblock_multiply_transform(device->state, - wined3d_state, (struct wined3d_matrix *)matrix); + wined3d_transform_state_from_ddraw(state), (struct wined3d_matrix *)matrix); wined3d_mutex_unlock(); return D3D_OK;

1 0

Chip Davis : ddraw: Introduce a helper to convert ddraw render states to wined3d states.
by Alexandre Julliard 31 Mar '20

31 Mar '20

Module: wine Branch: master Commit: c07fdf8a90520ecc083cdf139a724d5bee1c17f0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c07fdf8a90520ecc083cdf13… Author: Chip Davis <cdavis(a)codeweavers.com> Date: Tue Mar 31 19:57:12 2020 +0430 ddraw: Introduce a helper to convert ddraw render states to wined3d states. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/device.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 048ba7fba6..d62d38e07b 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -72,6 +72,13 @@ static inline WORD d3d_fpu_setup(void) return oldcw; } +static enum wined3d_render_state wined3d_render_state_from_ddraw(D3DRENDERSTATETYPE state) +{ + if (state == D3DRENDERSTATE_ZBIAS) + return WINED3D_RS_DEPTHBIAS; + return (enum wined3d_render_state)state; +} + static inline struct d3d_device *impl_from_IUnknown(IUnknown *iface) { return CONTAINING_RECORD(iface, struct d3d_device, IUnknown_inner); @@ -2396,10 +2403,6 @@ static HRESULT d3d_device7_GetRenderState(IDirect3DDevice7 *iface, hr = DDERR_INVALIDPARAMS; break; - case D3DRENDERSTATE_ZBIAS: - *value = device_state->rs[WINED3D_RS_DEPTHBIAS]; - break; - default: if (state >= D3DRENDERSTATE_STIPPLEPATTERN00 && state <= D3DRENDERSTATE_STIPPLEPATTERN31) @@ -2408,7 +2411,7 @@ static HRESULT d3d_device7_GetRenderState(IDirect3DDevice7 *iface, hr = E_NOTIMPL; break; } - *value = device_state->rs[state]; + *value = device_state->rs[wined3d_render_state_from_ddraw(state)]; } wined3d_mutex_unlock(); @@ -2622,10 +2625,6 @@ static HRESULT d3d_device7_SetRenderState(IDirect3DDevice7 *iface, hr = DDERR_INVALIDPARAMS; break; - case D3DRENDERSTATE_ZBIAS: - wined3d_stateblock_set_render_state(device->update_state, WINED3D_RS_DEPTHBIAS, value); - break; - default: if (state >= D3DRENDERSTATE_STIPPLEPATTERN00 && state <= D3DRENDERSTATE_STIPPLEPATTERN31) @@ -2635,7 +2634,7 @@ static HRESULT d3d_device7_SetRenderState(IDirect3DDevice7 *iface, break; } - wined3d_stateblock_set_render_state(device->update_state, state, value); + wined3d_stateblock_set_render_state(device->update_state, wined3d_render_state_from_ddraw(state), value); break; } wined3d_mutex_unlock();

1 0

Chip Davis : d3d8/tests: Avoid abs() on unsigned values in compare_mode().
by Alexandre Julliard 31 Mar '20

31 Mar '20

Module: wine Branch: master Commit: 153e39fc984000c1eda1820ac18b0c27e6d4c3da URL: https://source.winehq.org/git/wine.git/?a=commit;h=153e39fc984000c1eda1820a… Author: Chip Davis <cdavis(a)codeweavers.com> Date: Tue Mar 31 19:57:11 2020 +0430 d3d8/tests: Avoid abs() on unsigned values in compare_mode(). Mostly because Clang complains. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/tests/device.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 6bb8ab3a02..25dea77b99 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -1388,8 +1388,8 @@ static int compare_mode(const void *a, const void *b) { const struct mode *mode_a = a; const struct mode *mode_b = b; - unsigned int w = mode_a->w - mode_b->w; - unsigned int h = mode_a->h - mode_b->h; + int w = mode_a->w - mode_b->w; + int h = mode_a->h - mode_b->h; return abs(w) >= abs(h) ? -w : -h; }

1 0

Zhiyi Zhang : wined3d: Move cursor size check against display mode out of wined3d_device_set_cursor_properties().
by Alexandre Julliard 31 Mar '20

31 Mar '20

Module: wine Branch: master Commit: 49bf4a8707f766287af5bc43438a9eb121b61861 URL: https://source.winehq.org/git/wine.git/?a=commit;h=49bf4a8707f766287af5bc43… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Mar 31 21:40:18 2020 +0800 wined3d: Move cursor size check against display mode out of wined3d_device_set_cursor_properties(). Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/device.c | 22 ++++++++++++++++++++++ dlls/d3d9/device.c | 22 ++++++++++++++++++++++ dlls/wined3d/device.c | 15 --------------- 3 files changed, 44 insertions(+), 15 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 23e93df061..3b3153c6d4 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -739,6 +739,8 @@ static HRESULT WINAPI d3d8_device_SetCursorProperties(IDirect3DDevice8 *iface, { struct d3d8_device *device = impl_from_IDirect3DDevice8(iface); struct d3d8_surface *bitmap_impl = unsafe_impl_from_IDirect3DSurface8(bitmap); + D3DSURFACE_DESC surface_desc; + D3DDISPLAYMODE mode; HRESULT hr; TRACE("iface %p, hotspot_x %u, hotspot_y %u, bitmap %p.\n", @@ -750,6 +752,26 @@ static HRESULT WINAPI d3d8_device_SetCursorProperties(IDirect3DDevice8 *iface, return D3DERR_INVALIDCALL; } + if (FAILED(hr = IDirect3DSurface8_GetDesc(bitmap, &surface_desc))) + { + WARN("Failed to get surface description, hr %#x.\n", hr); + return hr; + } + + if (FAILED(hr = IDirect3D8_GetAdapterDisplayMode(device->d3d_parent, device->adapter_ordinal, + &mode))) + { + WARN("Failed to get device display mode, hr %#x.\n", hr); + return hr; + } + + if (surface_desc.Width > mode.Width || surface_desc.Height > mode.Height) + { + WARN("Surface dimension %ux%u exceeds display mode %ux%u.\n", surface_desc.Width, + surface_desc.Height, mode.Width, mode.Height); + return D3DERR_INVALIDCALL; + } + wined3d_mutex_lock(); hr = wined3d_device_set_cursor_properties(device->wined3d_device, hotspot_x, hotspot_y, bitmap_impl->wined3d_texture, bitmap_impl->sub_resource_idx); diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 61cb505d77..53137da28f 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -787,6 +787,8 @@ static HRESULT WINAPI d3d9_device_SetCursorProperties(IDirect3DDevice9Ex *iface, { struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); struct d3d9_surface *bitmap_impl = unsafe_impl_from_IDirect3DSurface9(bitmap); + D3DSURFACE_DESC surface_desc; + D3DDISPLAYMODE mode; HRESULT hr; TRACE("iface %p, hotspot_x %u, hotspot_y %u, bitmap %p.\n", @@ -798,6 +800,26 @@ static HRESULT WINAPI d3d9_device_SetCursorProperties(IDirect3DDevice9Ex *iface, return D3DERR_INVALIDCALL; } + if (FAILED(hr = IDirect3DSurface9_GetDesc(bitmap, &surface_desc))) + { + WARN("Failed to get surface description, hr %#x.\n", hr); + return hr; + } + + if (FAILED(hr = IDirect3D9_GetAdapterDisplayMode(&device->d3d_parent->IDirect3D9Ex_iface, + device->adapter_ordinal, &mode))) + { + WARN("Failed to get device display mode, hr %#x.\n", hr); + return hr; + } + + if (surface_desc.Width > mode.Width || surface_desc.Height > mode.Height) + { + WARN("Surface dimension %ux%u exceeds display mode %ux%u.\n", surface_desc.Width, + surface_desc.Height, mode.Width, mode.Height); + return D3DERR_INVALIDCALL; + } + wined3d_mutex_lock(); hr = wined3d_device_set_cursor_properties(device->wined3d_device, hotspot_x, hotspot_y, bitmap_impl->wined3d_texture, bitmap_impl->sub_resource_idx); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 05087fee24..ee007568d4 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4910,9 +4910,7 @@ HRESULT CDECL wined3d_device_set_cursor_properties(struct wined3d_device *device { unsigned int texture_level = sub_resource_idx % texture->level_count; unsigned int cursor_width, cursor_height; - struct wined3d_display_mode mode; struct wined3d_map_desc map_desc; - HRESULT hr; TRACE("device %p, x_hotspot %u, y_hotspot %u, texture %p, sub_resource_idx %u.\n", device, x_hotspot, y_hotspot, texture, sub_resource_idx); @@ -4943,19 +4941,6 @@ HRESULT CDECL wined3d_device_set_cursor_properties(struct wined3d_device *device return WINED3DERR_INVALIDCALL; } - if (FAILED(hr = wined3d_output_get_display_mode(&device->adapter->outputs[0], &mode, NULL))) - { - ERR("Failed to get display mode, hr %#x.\n", hr); - return WINED3DERR_INVALIDCALL; - } - - if (cursor_width > mode.width || cursor_height > mode.height) - { - WARN("Texture %p, sub-resource %u dimensions are %ux%u, but screen dimensions are %ux%u.\n", - texture, sub_resource_idx, cursor_width, cursor_height, mode.width, mode.height); - return WINED3DERR_INVALIDCALL; - } - /* Do not store the surface's pointer because the application may * release it after setting the cursor image. Windows doesn't * addref the set surface, so we can't do this either without

1 0

Zhiyi Zhang : wined3d: Check cursor sizes are powers of two.
by Alexandre Julliard 31 Mar '20

31 Mar '20

Module: wine Branch: master Commit: 47f3afb9713136511b9d9b7a80b76a576c605c3e URL: https://source.winehq.org/git/wine.git/?a=commit;h=47f3afb9713136511b9d9b7a… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Mar 31 21:40:06 2020 +0800 wined3d: Check cursor sizes are powers of two. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/tests/device.c | 1 - dlls/d3d9/tests/device.c | 1 - dlls/wined3d/device.c | 13 +++++++++---- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index c96adfc748..6bb8ab3a02 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -1027,7 +1027,6 @@ static void test_cursor(void) expected_hr = D3D_OK; else expected_hr = D3DERR_INVALIDCALL; - todo_wine_if(expected_hr == D3DERR_INVALIDCALL) ok(hr == expected_hr, "Test %u: Expect SetCursorProperties return %#x, got %#x.\n", test_idx, expected_hr, hr); IDirect3DSurface8_Release(cursor); diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 0b6668d12b..efcd630e2d 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -1839,7 +1839,6 @@ static void test_cursor(void) expected_hr = D3D_OK; else expected_hr = D3DERR_INVALIDCALL; - todo_wine_if(expected_hr == D3DERR_INVALIDCALL) ok(hr == expected_hr, "Test %u: Expect SetCursorProperties return %#x, got %#x.\n", test_idx, expected_hr, hr); IDirect3DSurface9_Release(cursor); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index f8caa0c23c..05087fee24 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4934,14 +4934,21 @@ HRESULT CDECL wined3d_device_set_cursor_properties(struct wined3d_device *device return WINED3DERR_INVALIDCALL; } + /* Cursor width and height must all be powers of two */ + cursor_width = wined3d_texture_get_level_width(texture, texture_level); + cursor_height = wined3d_texture_get_level_height(texture, texture_level); + if ((cursor_width & (cursor_width - 1)) || (cursor_height & (cursor_height - 1))) + { + WARN("Cursor size %ux%u are not all powers of two.\n", cursor_width, cursor_height); + return WINED3DERR_INVALIDCALL; + } + if (FAILED(hr = wined3d_output_get_display_mode(&device->adapter->outputs[0], &mode, NULL))) { ERR("Failed to get display mode, hr %#x.\n", hr); return WINED3DERR_INVALIDCALL; } - cursor_width = wined3d_texture_get_level_width(texture, texture_level); - cursor_height = wined3d_texture_get_level_height(texture, texture_level); if (cursor_width > mode.width || cursor_height > mode.height) { WARN("Texture %p, sub-resource %u dimensions are %ux%u, but screen dimensions are %ux%u.\n", @@ -4949,8 +4956,6 @@ HRESULT CDECL wined3d_device_set_cursor_properties(struct wined3d_device *device return WINED3DERR_INVALIDCALL; } - /* TODO: MSDN: Cursor sizes must be a power of 2 */ - /* Do not store the surface's pointer because the application may * release it after setting the cursor image. Windows doesn't * addref the set surface, so we can't do this either without

1 0

Zhiyi Zhang : d3d9/tests: Add cursor size tests.
by Alexandre Julliard 31 Mar '20

31 Mar '20

Module: wine Branch: master Commit: 73d0f236385b9d48d1495748a26fb91bcfffe43b URL: https://source.winehq.org/git/wine.git/?a=commit;h=73d0f236385b9d48d1495748… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Mar 31 21:39:55 2020 +0800 d3d9/tests: Add cursor size tests. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/device.c | 99 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 98 insertions(+), 1 deletion(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 74d330c80b..0b6668d12b 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -1742,16 +1742,30 @@ cleanup: static void test_cursor(void) { + unsigned int adapter_idx, adapter_count, test_idx; IDirect3DSurface9 *cursor = NULL; + struct device_desc device_desc; + unsigned int width, height; IDirect3DDevice9 *device; + HRESULT expected_hr, hr; + D3DDISPLAYMODE mode; CURSORINFO info; IDirect3D9 *d3d; ULONG refcount; HCURSOR cur; HWND window; - HRESULT hr; BOOL ret; + static const DWORD device_flags[] = {0, CREATE_DEVICE_FULLSCREEN}; + static const SIZE cursor_sizes[] = + { + {1, 1}, + {2, 4}, + {3, 2}, + {2, 3}, + {6, 6}, + }; + window = create_window(); ok(!!window, "Failed to create a window.\n"); @@ -1812,8 +1826,91 @@ static void test_cursor(void) ok(info.flags & (CURSOR_SHOWING|CURSOR_SUPPRESSED), "The gdi cursor is hidden (%08x)\n", info.flags); ok(info.hCursor != cur, "The cursor handle is %p\n", info.hCursor); + /* Cursor dimensions must all be powers of two */ + for (test_idx = 0; test_idx < ARRAY_SIZE(cursor_sizes); ++test_idx) + { + width = cursor_sizes[test_idx].cx; + height = cursor_sizes[test_idx].cy; + hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, width, height, D3DFMT_A8R8G8B8, + D3DPOOL_DEFAULT, &cursor, NULL); + ok(hr == D3D_OK, "Test %u: CreateOffscreenPlainSurface failed, hr %#x.\n", test_idx, hr); + hr = IDirect3DDevice9_SetCursorProperties(device, 0, 0, cursor); + if (width && !(width & (width - 1)) && height && !(height & (height - 1))) + expected_hr = D3D_OK; + else + expected_hr = D3DERR_INVALIDCALL; + todo_wine_if(expected_hr == D3DERR_INVALIDCALL) + ok(hr == expected_hr, "Test %u: Expect SetCursorProperties return %#x, got %#x.\n", + test_idx, expected_hr, hr); + IDirect3DSurface9_Release(cursor); + } + refcount = IDirect3DDevice9_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); + + /* Cursor dimensions must not exceed adapter display mode */ + device_desc.device_window = window; + device_desc.width = 640; + device_desc.height = 480; + + adapter_count = IDirect3D9_GetAdapterCount(d3d); + for (adapter_idx = 0; adapter_idx < adapter_count; ++adapter_idx) + { + for (test_idx = 0; test_idx < ARRAY_SIZE(device_flags); ++test_idx) + { + device_desc.adapter_ordinal = adapter_idx; + device_desc.flags = device_flags[test_idx]; + if (!(device = create_device(d3d, window, &device_desc))) + { + skip("Adapter %u test %u: Failed to create a D3D device.\n", adapter_idx, test_idx); + break; + } + + hr = IDirect3D9_GetAdapterDisplayMode(d3d, adapter_idx, &mode); + ok(hr == D3D_OK, "Adapter %u test %u: GetAdapterDisplayMode failed, hr %#x.\n", + adapter_idx, test_idx, hr); + + /* Find the largest width and height that are powers of two and less than the display mode */ + width = 1; + height = 1; + while (width * 2 <= mode.Width) + width *= 2; + while (height * 2 <= mode.Height) + height *= 2; + + hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, width, height, + D3DFMT_A8R8G8B8, D3DPOOL_DEFAULT, &cursor, NULL); + ok(hr == D3D_OK, "Adapter %u test %u: CreateOffscreenPlainSurface failed, hr %#x.\n", + adapter_idx, test_idx, hr); + hr = IDirect3DDevice9_SetCursorProperties(device, 0, 0, cursor); + ok(hr == D3D_OK, "Adapter %u test %u: SetCursorProperties failed, hr %#x.\n", + adapter_idx, test_idx, hr); + IDirect3DSurface9_Release(cursor); + + hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, width * 2, height, + D3DFMT_A8R8G8B8, D3DPOOL_DEFAULT, &cursor, NULL); + ok(hr == D3D_OK, "Adapter %u test %u: CreateOffscreenPlainSurface failed, hr %#x.\n", + adapter_idx, test_idx, hr); + hr = IDirect3DDevice9_SetCursorProperties(device, 0, 0, cursor); + ok(hr == D3DERR_INVALIDCALL, + "Adapter %u test %u: Expect SetCursorProperties return %#x, got %#x.\n", + adapter_idx, test_idx, D3DERR_INVALIDCALL, hr); + IDirect3DSurface9_Release(cursor); + + hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, width, height * 2, + D3DFMT_A8R8G8B8, D3DPOOL_DEFAULT, &cursor, NULL); + ok(hr == D3D_OK, "Adapter %u test %u: CreateOffscreenPlainSurface failed, hr %#x.\n", + adapter_idx, test_idx, hr); + hr = IDirect3DDevice9_SetCursorProperties(device, 0, 0, cursor); + ok(hr == D3DERR_INVALIDCALL, + "Adapter %u test %u: Expect SetCursorProperties return %#x, got %#x.\n", + adapter_idx, test_idx, D3DERR_INVALIDCALL, hr); + IDirect3DSurface9_Release(cursor); + + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Adapter %u: Device has %u references left.\n", adapter_idx, refcount); + } + } cleanup: IDirect3D9_Release(d3d); DestroyWindow(window);

1 0

Zhiyi Zhang : d3d8/tests: Add cursor size tests.
by Alexandre Julliard 31 Mar '20

31 Mar '20

Module: wine Branch: master Commit: a37b901699d75823dfdbb47e25ce15421388a396 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a37b901699d75823dfdbb47e… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Mar 31 21:39:43 2020 +0800 d3d8/tests: Add cursor size tests. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/tests/device.c | 97 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 96 insertions(+), 1 deletion(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index b7aa02adab..c96adfc748 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -931,16 +931,30 @@ cleanup: static void test_cursor(void) { + unsigned int adapter_idx, adapter_count, test_idx; IDirect3DSurface8 *cursor = NULL; + struct device_desc device_desc; + unsigned int width, height; IDirect3DDevice8 *device; + HRESULT expected_hr, hr; + D3DDISPLAYMODE mode; CURSORINFO info; IDirect3D8 *d3d; ULONG refcount; HCURSOR cur; HWND window; - HRESULT hr; BOOL ret; + static const DWORD device_flags[] = {0, CREATE_DEVICE_FULLSCREEN}; + static const SIZE cursor_sizes[] = + { + {1, 1}, + {2, 4}, + {3, 2}, + {2, 3}, + {6, 6}, + }; + window = create_window(); ok(!!window, "Failed to create a window.\n"); @@ -1001,8 +1015,89 @@ static void test_cursor(void) ok(info.flags & (CURSOR_SHOWING|CURSOR_SUPPRESSED), "The gdi cursor is hidden (%08x)\n", info.flags); ok(info.hCursor != cur, "The cursor handle is %p\n", info.hCursor); + /* Cursor dimensions must all be powers of two */ + for (test_idx = 0; test_idx < ARRAY_SIZE(cursor_sizes); ++test_idx) + { + width = cursor_sizes[test_idx].cx; + height = cursor_sizes[test_idx].cy; + hr = IDirect3DDevice8_CreateImageSurface(device, width, height, D3DFMT_A8R8G8B8, &cursor); + ok(hr == D3D_OK, "Test %u: CreateImageSurface failed, hr %#x.\n", test_idx, hr); + hr = IDirect3DDevice8_SetCursorProperties(device, 0, 0, cursor); + if (width && !(width & (width - 1)) && height && !(height & (height - 1))) + expected_hr = D3D_OK; + else + expected_hr = D3DERR_INVALIDCALL; + todo_wine_if(expected_hr == D3DERR_INVALIDCALL) + ok(hr == expected_hr, "Test %u: Expect SetCursorProperties return %#x, got %#x.\n", + test_idx, expected_hr, hr); + IDirect3DSurface8_Release(cursor); + } + refcount = IDirect3DDevice8_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); + + /* Cursor dimensions must not exceed adapter display mode */ + device_desc.device_window = window; + device_desc.width = 640; + device_desc.height = 480; + + adapter_count = IDirect3D8_GetAdapterCount(d3d); + for (adapter_idx = 0; adapter_idx < adapter_count; ++adapter_idx) + { + for (test_idx = 0; test_idx < ARRAY_SIZE(device_flags); ++test_idx) + { + device_desc.adapter_ordinal = adapter_idx; + device_desc.flags = device_flags[test_idx]; + if (!(device = create_device(d3d, window, &device_desc))) + { + skip("Adapter %u test %u: Failed to create a D3D device.\n", adapter_idx, test_idx); + break; + } + + hr = IDirect3D8_GetAdapterDisplayMode(d3d, adapter_idx, &mode); + ok(hr == D3D_OK, "Adapter %u test %u: GetAdapterDisplayMode failed, hr %#x.\n", + adapter_idx, test_idx, hr); + + /* Find the largest width and height that are powers of two and less than the display mode */ + width = 1; + height = 1; + while (width * 2 <= mode.Width) + width *= 2; + while (height * 2 <= mode.Height) + height *= 2; + + hr = IDirect3DDevice8_CreateImageSurface(device, width, height, D3DFMT_A8R8G8B8, &cursor); + ok(hr == D3D_OK, "Adapter %u test %u: CreateImageSurface failed, hr %#x.\n", + adapter_idx, test_idx, hr); + hr = IDirect3DDevice8_SetCursorProperties(device, 0, 0, cursor); + ok(hr == D3D_OK, "Adapter %u test %u: SetCursorProperties failed, hr %#x.\n", + adapter_idx, test_idx, hr); + IDirect3DSurface8_Release(cursor); + + hr = IDirect3DDevice8_CreateImageSurface(device, width * 2, height, D3DFMT_A8R8G8B8, + &cursor); + ok(hr == D3D_OK, "Adapter %u test %u: CreateImageSurface failed, hr %#x.\n", + adapter_idx, test_idx, hr); + hr = IDirect3DDevice8_SetCursorProperties(device, 0, 0, cursor); + ok(hr == D3DERR_INVALIDCALL, + "Adapter %u test %u: Expect SetCursorProperties return %#x, got %#x.\n", + adapter_idx, test_idx, D3DERR_INVALIDCALL, hr); + IDirect3DSurface8_Release(cursor); + + hr = IDirect3DDevice8_CreateImageSurface(device, width, height * 2, D3DFMT_A8R8G8B8, + &cursor); + ok(hr == D3D_OK, "Adapter %u test %u: CreateImageSurface failed, hr %#x.\n", + adapter_idx, test_idx, hr); + hr = IDirect3DDevice8_SetCursorProperties(device, 0, 0, cursor); + ok(hr == D3DERR_INVALIDCALL, + "Adapter %u test %u: Expect SetCursorProperties return %#x, got %#x.\n", + adapter_idx, test_idx, D3DERR_INVALIDCALL, hr); + IDirect3DSurface8_Release(cursor); + + refcount = IDirect3DDevice8_Release(device); + ok(!refcount, "Adapter %u: Device has %u references left.\n", adapter_idx, refcount); + } + } cleanup: IDirect3D8_Release(d3d); DestroyWindow(window);

1 0

Zhiyi Zhang : d3d9/tests: Fix possible test failures.
by Alexandre Julliard 31 Mar '20

31 Mar '20

Module: wine Branch: master Commit: 76a0ab7f061d8e47e4ea0363aae02b8534572903 URL: https://source.winehq.org/git/wine.git/?a=commit;h=76a0ab7f061d8e47e4ea0363… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Mar 31 21:39:32 2020 +0800 d3d9/tests: Fix possible test failures. expect_messages points to a local variable. When it goes out of scope, it reads into random memory, causing failures. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/d3d9ex.c | 17 +++++++++++++---- dlls/d3d9/tests/device.c | 21 +++++++++++++++++---- 2 files changed, 30 insertions(+), 8 deletions(-) diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index 5b24f6b05e..dab5cf6d8d 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -2631,6 +2631,7 @@ static void test_wndproc(void) { struct wndproc_thread_param thread_params; struct device_desc device_desc; + static WINDOWPOS windowpos; IDirect3DDevice9Ex *device; WNDCLASSA wc = {0}; HANDLE thread; @@ -2646,7 +2647,6 @@ static void test_wndproc(void) LONG change_ret, device_style; BOOL ret; IDirect3D9Ex *d3d9ex; - WINDOWPOS windowpos; static const struct message create_messages[] = { @@ -2747,7 +2747,7 @@ static void test_wndproc(void) /* WM_SIZE(SIZE_MAXIMIZED) is unreliable on native. */ {0, 0, FALSE, 0}, }; - struct message mode_change_messages[] = + static const struct message mode_change_messages[] = { {WM_WINDOWPOSCHANGING, DEVICE_WINDOW, FALSE, 0}, {WM_WINDOWPOSCHANGED, DEVICE_WINDOW, FALSE, 0}, @@ -2760,7 +2760,7 @@ static void test_wndproc(void) * ShowWindow does not send such a message because the window is already visible. */ {0, 0, FALSE, 0}, }; - struct message mode_change_messages_hidden[] = + static const struct message mode_change_messages_hidden[] = { {WM_WINDOWPOSCHANGING, DEVICE_WINDOW, FALSE, 0}, {WM_WINDOWPOSCHANGED, DEVICE_WINDOW, FALSE, 0}, @@ -2777,7 +2777,7 @@ static void test_wndproc(void) {WM_DISPLAYCHANGE, FOCUS_WINDOW, FALSE, 0}, {0, 0, FALSE, 0}, }; - struct + static const struct { DWORD create_flags; const struct message *focus_loss_messages; @@ -2859,6 +2859,9 @@ static void test_wndproc(void) return; } + filter_messages = NULL; + expect_messages = NULL; + wc.lpfnWndProc = test_proc; wc.lpszClassName = "d3d9_test_wndproc_wc"; ok(RegisterClassA(&wc), "Failed to register window class.\n"); @@ -3189,6 +3192,7 @@ static void test_wndproc(void) flush_events(); ok(!expect_messages->message, "Expected message %#x for window %#x, but didn't receive it, i=%u.\n", expect_messages->message, expect_messages->window, i); + expect_messages = NULL; /* World of Warplanes hides the window by removing WS_VISIBLE and expects Reset() to show it again. */ device_style = GetWindowLongA(device_window, GWL_STYLE); @@ -3208,6 +3212,7 @@ static void test_wndproc(void) flush_events(); ok(!expect_messages->message, "Expected message %#x for window %#x, but didn't receive it, i=%u.\n", expect_messages->message, expect_messages->window, i); + expect_messages = NULL; if (!(tests[i].create_flags & CREATE_DEVICE_NOWINDOWCHANGES)) { @@ -3244,6 +3249,7 @@ static void test_wndproc(void) done: filter_messages = NULL; + expect_messages = NULL; DestroyWindow(device_window); DestroyWindow(focus_window); SetEvent(thread_params.test_finished); @@ -3270,6 +3276,9 @@ static void test_wndproc_windowed(void) DWORD res, tid; HWND tmp; + filter_messages = NULL; + expect_messages = NULL; + wc.lpfnWndProc = test_proc; wc.lpszClassName = "d3d9_test_wndproc_wc"; ok(RegisterClassA(&wc), "Failed to register window class.\n"); diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 839c030185..74d330c80b 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -3655,6 +3655,7 @@ static void test_wndproc(void) { struct wndproc_thread_param thread_params; struct device_desc device_desc; + static WINDOWPOS windowpos; IDirect3DDevice9 *device; WNDCLASSA wc = {0}; IDirect3D9 *d3d9; @@ -3670,7 +3671,6 @@ static void test_wndproc(void) DEVMODEW devmode; LONG change_ret, device_style; BOOL ret; - WINDOWPOS windowpos; static const struct message create_messages[] = { @@ -3784,7 +3784,7 @@ static void test_wndproc(void) /* WM_SIZE(SIZE_MAXIMIZED) is unreliable on native. */ {0, 0, FALSE, 0}, }; - struct message mode_change_messages[] = + static const struct message mode_change_messages[] = { {WM_WINDOWPOSCHANGING, DEVICE_WINDOW, FALSE, 0}, {WM_WINDOWPOSCHANGED, DEVICE_WINDOW, FALSE, 0}, @@ -3797,7 +3797,7 @@ static void test_wndproc(void) * ShowWindow does not send such a message because the window is already visible. */ {0, 0, FALSE, 0}, }; - struct message mode_change_messages_hidden[] = + static const struct message mode_change_messages_hidden[] = { {WM_WINDOWPOSCHANGING, DEVICE_WINDOW, FALSE, 0}, {WM_WINDOWPOSCHANGED, DEVICE_WINDOW, FALSE, 0}, @@ -3814,7 +3814,7 @@ static void test_wndproc(void) {WM_DISPLAYCHANGE, FOCUS_WINDOW, FALSE, 0}, {0, 0, FALSE, 0}, }; - struct + static const struct { DWORD create_flags; const struct message *focus_loss_messages, *reactivate_messages; @@ -3893,6 +3893,9 @@ static void test_wndproc(void) return; } + filter_messages = NULL; + expect_messages = NULL; + wc.lpfnWndProc = test_proc; wc.lpszClassName = "d3d9_test_wndproc_wc"; ok(RegisterClassA(&wc), "Failed to register window class.\n"); @@ -4258,6 +4261,7 @@ static void test_wndproc(void) flush_events(); ok(!expect_messages->message, "Expected message %#x for window %#x, but didn't receive it, i=%u.\n", expect_messages->message, expect_messages->window, i); + expect_messages = NULL; /* World of Warplanes hides the window by removing WS_VISIBLE and expects Reset() to show it again. */ device_style = GetWindowLongA(device_window, GWL_STYLE); @@ -4277,6 +4281,7 @@ static void test_wndproc(void) flush_events(); ok(!expect_messages->message, "Expected message %#x for window %#x, but didn't receive it, i=%u.\n", expect_messages->message, expect_messages->window, i); + expect_messages = NULL; if (!(tests[i].create_flags & CREATE_DEVICE_NOWINDOWCHANGES)) { @@ -4314,6 +4319,7 @@ static void test_wndproc(void) done: filter_messages = NULL; + expect_messages = NULL; DestroyWindow(device_window); DestroyWindow(focus_window); SetEvent(thread_params.test_finished); @@ -4344,6 +4350,9 @@ static void test_wndproc_windowed(void) d3d9 = Direct3DCreate9(D3D_SDK_VERSION); ok(!!d3d9, "Failed to create a D3D object.\n"); + filter_messages = NULL; + expect_messages = NULL; + wc.lpfnWndProc = test_proc; wc.lpszClassName = "d3d9_test_wndproc_wc"; ok(RegisterClassA(&wc), "Failed to register window class.\n"); @@ -4557,6 +4566,7 @@ static void test_reset_fullscreen(void) d3d = Direct3DCreate9(D3D_SDK_VERSION); ok(!!d3d, "Failed to create a D3D object.\n"); + filter_messages = NULL; expect_messages = messages; wc.cbSize = sizeof(wc); @@ -5259,6 +5269,9 @@ static void test_device_window_reset(void) HRESULT hr; ULONG ref; + filter_messages = NULL; + expect_messages = NULL; + wc.lpfnWndProc = test_proc; wc.lpszClassName = "d3d9_test_wndproc_wc"; ok(RegisterClassA(&wc), "Failed to register window class.\n");

1 0

← Newer
1
2
3
4
5
6
7
8
...
100
Older →

Jump to page:

2025

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 March 2020