March 2020 - Wine-commits - list.winehq.org

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 : 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

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

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 : 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 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

Zebediah Figura : qedit/samplegrabber: Use calloc() in sample_grabber_create().
by Alexandre Julliard 31 Mar '20

31 Mar '20

Module: wine Branch: master Commit: 218c382fd4dd69385c46a364f5a514f88d86320a URL: https://source.winehq.org/git/wine.git/?a=commit;h=218c382fd4dd69385c46a364… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Mar 30 17:55:11 2020 -0500 qedit/samplegrabber: Use calloc() in sample_grabber_create(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qedit/samplegrabber.c | 37 ++++++++++++++++--------------------- 1 file changed, 16 insertions(+), 21 deletions(-) diff --git a/dlls/qedit/samplegrabber.c b/dlls/qedit/samplegrabber.c index afb48bf84d..90e4102afa 100644 --- a/dlls/qedit/samplegrabber.c +++ b/dlls/qedit/samplegrabber.c @@ -107,7 +107,7 @@ static void sample_grabber_destroy(struct strmbase_filter *iface) strmbase_source_cleanup(&filter->source); strmbase_passthrough_cleanup(&filter->passthrough); strmbase_filter_cleanup(&filter->filter); - CoTaskMemFree(filter); + free(filter); } static HRESULT sample_grabber_query_interface(struct strmbase_filter *iface, REFIID iid, void **out) @@ -639,32 +639,27 @@ static const struct strmbase_source_ops source_ops = HRESULT sample_grabber_create(IUnknown *outer, IUnknown **out) { - SG_Impl* obj = NULL; + SG_Impl *object; - obj = CoTaskMemAlloc(sizeof(SG_Impl)); - if (NULL == obj) { - *out = NULL; + if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; - } - ZeroMemory(obj, sizeof(SG_Impl)); - strmbase_filter_init(&obj->filter, outer, &CLSID_SampleGrabber, &filter_ops); - obj->ISampleGrabber_iface.lpVtbl = &ISampleGrabber_VTable; - obj->IMemInputPin_iface.lpVtbl = &IMemInputPin_VTable; + strmbase_filter_init(&object->filter, outer, &CLSID_SampleGrabber, &filter_ops); + object->ISampleGrabber_iface.lpVtbl = &ISampleGrabber_VTable; + object->IMemInputPin_iface.lpVtbl = &IMemInputPin_VTable; - strmbase_sink_init(&obj->sink, &obj->filter, L"In", &sink_ops, NULL); + strmbase_sink_init(&object->sink, &object->filter, L"In", &sink_ops, NULL); - strmbase_source_init(&obj->source, &obj->filter, L"Out", &source_ops); - strmbase_passthrough_init(&obj->passthrough, (IUnknown *)&obj->source.pin.IPin_iface); - ISeekingPassThru_Init(&obj->passthrough.ISeekingPassThru_iface, FALSE, &obj->sink.pin.IPin_iface); + strmbase_source_init(&object->source, &object->filter, L"Out", &source_ops); + strmbase_passthrough_init(&object->passthrough, (IUnknown *)&object->source.pin.IPin_iface); + ISeekingPassThru_Init(&object->passthrough.ISeekingPassThru_iface, FALSE, + &object->sink.pin.IPin_iface); - obj->allocator = NULL; - obj->grabberIface = NULL; - obj->grabberMethod = -1; - obj->oneShot = OneShot_None; - obj->bufferLen = -1; - obj->bufferData = NULL; + object->grabberMethod = -1; + object->oneShot = OneShot_None; + object->bufferLen = -1; - *out = &obj->filter.IUnknown_inner; + TRACE("Created sample grabber %p.\n", object); + *out = &object->filter.IUnknown_inner; return S_OK; }

1 0

Zebediah Figura : qedit/samplegrabber: Get rid of the SG_Impl typedef.
by Alexandre Julliard 31 Mar '20

31 Mar '20

Module: wine Branch: master Commit: 933195d0b6f4843c07994ac737e3529d07918350 URL: https://source.winehq.org/git/wine.git/?a=commit;h=933195d0b6f4843c07994ac7… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Mar 30 17:55:12 2020 -0500 qedit/samplegrabber: Get rid of the SG_Impl typedef. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qedit/samplegrabber.c | 96 +++++++++++++++++++++++----------------------- 1 file changed, 48 insertions(+), 48 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=933195d0b6f4843c0799…

1 0

Zebediah Figura : qedit/nullrenderer: Use calloc() in null_renderer_create().
by Alexandre Julliard 31 Mar '20

31 Mar '20

Module: wine Branch: master Commit: e838381a645c45f0f48c933245f7b8e0a320a8de URL: https://source.winehq.org/git/wine.git/?a=commit;h=e838381a645c45f0f48c9332… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Mar 30 17:55:13 2020 -0500 qedit/nullrenderer: Use calloc() in null_renderer_create(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qedit/nullrenderer.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/qedit/nullrenderer.c b/dlls/qedit/nullrenderer.c index 9f29ab7828..61de792750 100644 --- a/dlls/qedit/nullrenderer.c +++ b/dlls/qedit/nullrenderer.c @@ -52,7 +52,7 @@ static void null_renderer_destroy(struct strmbase_renderer *iface) NullRendererImpl *filter = impl_from_strmbase_renderer(iface); strmbase_renderer_cleanup(&filter->renderer); - CoTaskMemFree(filter); + free(filter); } static const struct strmbase_renderer_ops renderer_ops = @@ -64,15 +64,14 @@ static const struct strmbase_renderer_ops renderer_ops = HRESULT null_renderer_create(IUnknown *outer, IUnknown **out) { - NullRendererImpl *pNullRenderer; + NullRendererImpl *object; - *out = NULL; + if (!(object = calloc(1, sizeof(*object)))) + return E_OUTOFMEMORY; - pNullRenderer = CoTaskMemAlloc(sizeof(NullRendererImpl)); + strmbase_renderer_init(&object->renderer, outer, &CLSID_NullRenderer, L"In", &renderer_ops); - strmbase_renderer_init(&pNullRenderer->renderer, outer, - &CLSID_NullRenderer, L"In", &renderer_ops); - - *out = &pNullRenderer->renderer.filter.IUnknown_inner; + TRACE("Created null renderer %p.\n", object); + *out = &object->renderer.filter.IUnknown_inner; return S_OK; }

1 0

Zebediah Figura : qedit/nullrenderer: Get rid of the NullRendererImpl typedef.
by Alexandre Julliard 31 Mar '20

31 Mar '20

Module: wine Branch: master Commit: 5217d17170c1d066905ae90f172f2fbdb99abc7e URL: https://source.winehq.org/git/wine.git/?a=commit;h=5217d17170c1d066905ae90f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Mar 30 17:55:14 2020 -0500 qedit/nullrenderer: Get rid of the NullRendererImpl typedef. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qedit/nullrenderer.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/qedit/nullrenderer.c b/dlls/qedit/nullrenderer.c index 61de792750..e703ea2430 100644 --- a/dlls/qedit/nullrenderer.c +++ b/dlls/qedit/nullrenderer.c @@ -26,14 +26,14 @@ WINE_DEFAULT_DEBUG_CHANNEL(qedit); -typedef struct NullRendererImpl +struct null_renderer { struct strmbase_renderer renderer; -} NullRendererImpl; +}; -static inline NullRendererImpl *impl_from_strmbase_renderer(struct strmbase_renderer *iface) +static struct null_renderer *impl_from_strmbase_renderer(struct strmbase_renderer *iface) { - return CONTAINING_RECORD(iface, NullRendererImpl, renderer); + return CONTAINING_RECORD(iface, struct null_renderer, renderer); } static HRESULT WINAPI NullRenderer_DoRenderSample(struct strmbase_renderer *iface, IMediaSample *sample) @@ -49,7 +49,7 @@ static HRESULT WINAPI NullRenderer_CheckMediaType(struct strmbase_renderer *ifac static void null_renderer_destroy(struct strmbase_renderer *iface) { - NullRendererImpl *filter = impl_from_strmbase_renderer(iface); + struct null_renderer *filter = impl_from_strmbase_renderer(iface); strmbase_renderer_cleanup(&filter->renderer); free(filter); @@ -64,7 +64,7 @@ static const struct strmbase_renderer_ops renderer_ops = HRESULT null_renderer_create(IUnknown *outer, IUnknown **out) { - NullRendererImpl *object; + struct null_renderer *object; if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY;

1 0