July 2021 - Wine-devel - list.winehq.org

[PATCH] mfplat: Use D3DFORMAT for dxgi buffer copy function
by Adrian Thiele 07 Jul '21

07 Jul '21

Signed-off-by: Adrian Thiele <adrian.thiele(a)live.de> --- dlls/mfplat/buffer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mfplat/buffer.c b/dlls/mfplat/buffer.c index c1829043e1b..9081dc39eab 100644 --- a/dlls/mfplat/buffer.c +++ b/dlls/mfplat/buffer.c @@ -1473,7 +1473,7 @@ static HRESULT create_dxgi_surface_buffer(IUnknown *surface, unsigned int sub_re object->_2d.width = stride; object->_2d.height = desc.Height; object->max_length = object->_2d.plane_size; - object->_2d.copy_image = get_2d_buffer_copy_func(desc.Format); + object->_2d.copy_image = get_2d_buffer_copy_func(format); if (FAILED(hr = init_attributes_object(&object->dxgi_surface.attributes, 0))) { -- 2.32.0

3 2

[PATCH 3/4] d2d1: Add ID2D1Image interface for d2d effect.
by Ziqing Hui 07 Jul '21

07 Jul '21

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/d2d1/d2d1_private.h | 5 +++- dlls/d2d1/device.c | 3 +- dlls/d2d1/effect.c | 64 +++++++++++++++++++++++++++++++++++----- dlls/d2d1/tests/d2d1.c | 1 - 4 files changed, 63 insertions(+), 10 deletions(-)

2 1

[PATCH 2/4] d2d1/tests: Add initial tests for d2d effect.
by Ziqing Hui 07 Jul '21

07 Jul '21

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/d2d1/tests/d2d1.c | 54 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+)

2 1

[PATCH 1/4] include: Add d2d1effects.idl.
by Ziqing Hui 07 Jul '21

07 Jul '21

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- include/Makefile.in | 1 + include/d2d1effects.idl | 724 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 725 insertions(+) create mode 100755 include/d2d1effects.idl

2 1

[PATCH v2 1/3] wined3d: Introduce a wined3d_bound_range() helper.
by Zebediah Figura 07 Jul '21

07 Jul '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/d3d8/device.c | 5 ++--- dlls/d3d9/device.c | 4 ++-- dlls/ddraw/device.c | 4 ++-- dlls/ddraw/viewport.c | 8 ++++---- dlls/wined3d/device.c | 6 +++--- dlls/wined3d/palette.c | 2 +- dlls/wined3d/stateblock.c | 6 ++---- dlls/wined3d/view.c | 9 +++------ include/wine/wined3d.h | 11 +++++++++++ 9 files changed, 30 insertions(+), 25 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index b14e6679763..c0fa38e090a 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -3071,7 +3071,7 @@ static HRESULT WINAPI d3d8_device_GetVertexShaderConstant(IDirect3DDevice8 *ifac if (!constants) return D3DERR_INVALIDCALL; - if (start_idx >= device->vs_uniform_count || count > device->vs_uniform_count - start_idx) + if (!wined3d_bound_range(start_idx, count, device->vs_uniform_count)) { WARN("Trying to access %u constants, but d3d8 only supports %u.\n", start_idx + count, device->vs_uniform_count); @@ -3375,8 +3375,7 @@ static HRESULT WINAPI d3d8_device_GetPixelShaderConstant(IDirect3DDevice8 *iface TRACE("iface %p, start_idx %u, constants %p, count %u.\n", iface, start_idx, constants, count); - if (!constants || start_idx >= D3D8_MAX_PIXEL_SHADER_CONSTANTF - || count > D3D8_MAX_PIXEL_SHADER_CONSTANTF - start_idx) + if (!constants || !wined3d_bound_range(start_idx, count, D3D8_MAX_PIXEL_SHADER_CONSTANTF)) return WINED3DERR_INVALIDCALL; wined3d_mutex_lock(); diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 932d6d2d814..c8b906a981f 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -3684,7 +3684,7 @@ static HRESULT WINAPI d3d9_device_GetVertexShaderConstantF(IDirect3DDevice9Ex *i if (!constants) return D3DERR_INVALIDCALL; - if (start_idx >= device->vs_uniform_count || count > device->vs_uniform_count - start_idx) + if (!wined3d_bound_range(start_idx, count, device->vs_uniform_count)) { WARN("Trying to access %u constants, but d3d9 only supports %u\n", start_idx + count, device->vs_uniform_count); @@ -4033,7 +4033,7 @@ static HRESULT WINAPI d3d9_device_GetPixelShaderConstantF(IDirect3DDevice9Ex *if TRACE("iface %p, start_idx %u, constants %p, count %u.\n", iface, start_idx, constants, count); - if (!constants || start_idx >= WINED3D_MAX_PS_CONSTS_F || count > WINED3D_MAX_PS_CONSTS_F - start_idx) + if (!constants || !wined3d_bound_range(start_idx, count, WINED3D_MAX_PS_CONSTS_F)) return WINED3DERR_INVALIDCALL; wined3d_mutex_lock(); diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index e9070cfbda6..b66ae7698c8 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -5373,8 +5373,8 @@ static HRESULT d3d_device7_SetViewport(IDirect3DDevice7 *iface, D3DVIEWPORT7 *vi surface = wined3d_rendertarget_view_get_sub_resource_parent(rtv); wined3d_texture_get_sub_resource_desc(surface->wined3d_texture, surface->sub_resource_idx, &rt_desc); - if (viewport->dwX > rt_desc.width || viewport->dwWidth > rt_desc.width - viewport->dwX - || viewport->dwY > rt_desc.height || viewport->dwHeight > rt_desc.height - viewport->dwY) + if (!wined3d_bound_range(viewport->dwX, viewport->dwWidth, rt_desc.width) + || !wined3d_bound_range(viewport->dwY, viewport->dwHeight, rt_desc.height)) { WARN("Invalid viewport, returning E_INVALIDARG.\n"); wined3d_mutex_unlock(); diff --git a/dlls/ddraw/viewport.c b/dlls/ddraw/viewport.c index ada3f1757b7..13a6a147083 100644 --- a/dlls/ddraw/viewport.c +++ b/dlls/ddraw/viewport.c @@ -414,8 +414,8 @@ static HRESULT WINAPI d3d_viewport_SetViewport(IDirect3DViewport3 *iface, D3DVIE surface = wined3d_rendertarget_view_get_sub_resource_parent(rtv); wined3d_texture_get_sub_resource_desc(surface->wined3d_texture, surface->sub_resource_idx, &rt_desc); - if (vp->dwX > rt_desc.width || vp->dwWidth > rt_desc.width - vp->dwX - || vp->dwY > rt_desc.height || vp->dwHeight > rt_desc.height - vp->dwY) + if (!wined3d_bound_range(vp->dwX, vp->dwWidth, rt_desc.width) + || !wined3d_bound_range(vp->dwY, vp->dwHeight, rt_desc.height)) { WARN("Invalid viewport, returning DDERR_INVALIDPARAMS.\n"); wined3d_mutex_unlock(); @@ -1043,8 +1043,8 @@ static HRESULT WINAPI d3d_viewport_SetViewport2(IDirect3DViewport3 *iface, D3DVI surface = wined3d_rendertarget_view_get_sub_resource_parent(rtv); wined3d_texture_get_sub_resource_desc(surface->wined3d_texture, surface->sub_resource_idx, &rt_desc); - if (vp->dwX > rt_desc.width || vp->dwWidth > rt_desc.width - vp->dwX - || vp->dwY > rt_desc.height || vp->dwHeight > rt_desc.height - vp->dwY) + if (!wined3d_bound_range(vp->dwX, vp->dwWidth, rt_desc.width) + || !wined3d_bound_range(vp->dwY, vp->dwHeight, rt_desc.height)) { WARN("Invalid viewport, returning DDERR_INVALIDPARAMS.\n"); wined3d_mutex_unlock(); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 175a3b7ed0b..e9d4d0a0677 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1837,7 +1837,7 @@ void CDECL wined3d_device_context_set_constant_buffers(struct wined3d_device_con TRACE("context %p, type %#x, start_idx %u, count %u, buffers %p.\n", context, type, start_idx, count, buffers); - if (start_idx >= MAX_CONSTANT_BUFFERS || count > MAX_CONSTANT_BUFFERS - start_idx) + if (!wined3d_bound_range(start_idx, count, MAX_CONSTANT_BUFFERS)) { WARN("Invalid constant buffer index %u, count %u.\n", start_idx, count); return; @@ -1988,7 +1988,7 @@ void CDECL wined3d_device_context_set_shader_resource_views(struct wined3d_devic TRACE("context %p, type %#x, start_idx %u, count %u, views %p.\n", context, type, start_idx, count, views); - if (start_idx >= MAX_SHADER_RESOURCE_VIEWS || count > MAX_SHADER_RESOURCE_VIEWS - start_idx) + if (!wined3d_bound_range(start_idx, count, MAX_SHADER_RESOURCE_VIEWS)) { WARN("Invalid view index %u, count %u.\n", start_idx, count); return; @@ -2040,7 +2040,7 @@ void CDECL wined3d_device_context_set_samplers(struct wined3d_device_context *co TRACE("context %p, type %#x, start_idx %u, count %u, samplers %p.\n", context, type, start_idx, count, samplers); - if (start_idx >= MAX_SAMPLER_OBJECTS || count > MAX_SAMPLER_OBJECTS - start_idx) + if (!wined3d_bound_range(start_idx, count, MAX_SAMPLER_OBJECTS)) { WARN("Invalid sampler index %u, count %u.\n", start_idx, count); return; diff --git a/dlls/wined3d/palette.c b/dlls/wined3d/palette.c index 615fb00905f..85105d1f8de 100644 --- a/dlls/wined3d/palette.c +++ b/dlls/wined3d/palette.c @@ -61,7 +61,7 @@ HRESULT CDECL wined3d_palette_get_entries(const struct wined3d_palette *palette, if (flags) return WINED3DERR_INVALIDCALL; /* unchecked */ - if (start > palette->size || count > palette->size - start) + if (!wined3d_bound_range(start, count, palette->size)) return WINED3DERR_INVALIDCALL; if (palette->flags & WINED3D_PALETTE_8BIT_ENTRIES) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 1f1ba262336..4cf30941d62 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1204,8 +1204,7 @@ HRESULT CDECL wined3d_stateblock_set_vs_consts_f(struct wined3d_stateblock *stat TRACE("stateblock %p, start_idx %u, count %u, constants %p.\n", stateblock, start_idx, count, constants); - if (!constants || start_idx >= d3d_info->limits.vs_uniform_count - || count > d3d_info->limits.vs_uniform_count - start_idx) + if (!constants || !wined3d_bound_range(start_idx, count, d3d_info->limits.vs_uniform_count)) return WINED3DERR_INVALIDCALL; memcpy(&stateblock->stateblock_state.vs_consts_f[start_idx], constants, count * sizeof(*constants)); @@ -1273,8 +1272,7 @@ HRESULT CDECL wined3d_stateblock_set_ps_consts_f(struct wined3d_stateblock *stat TRACE("stateblock %p, start_idx %u, count %u, constants %p.\n", stateblock, start_idx, count, constants); - if (!constants || start_idx >= d3d_info->limits.ps_uniform_count - || count > d3d_info->limits.ps_uniform_count - start_idx) + if (!constants || !wined3d_bound_range(start_idx, count, d3d_info->limits.ps_uniform_count)) return WINED3DERR_INVALIDCALL; memcpy(&stateblock->stateblock_state.ps_consts_f[start_idx], constants, count * sizeof(*constants)); diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 03d6a4d17b5..55742fb06b6 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -132,8 +132,7 @@ static const struct wined3d_format *validate_resource_view(const struct wined3d_ return NULL; buffer_size = buffer->resource.size / element_size; - if (desc->u.buffer.start_idx >= buffer_size - || desc->u.buffer.count > buffer_size - desc->u.buffer.start_idx) + if (!wined3d_bound_range(desc->u.buffer.start_idx, desc->u.buffer.count, buffer_size)) return NULL; } else @@ -156,11 +155,9 @@ static const struct wined3d_format *validate_resource_view(const struct wined3d_ if (!desc->u.texture.level_count || (mip_slice && desc->u.texture.level_count != 1) - || desc->u.texture.level_idx >= texture->level_count - || desc->u.texture.level_count > texture->level_count - desc->u.texture.level_idx + || !wined3d_bound_range(desc->u.texture.level_idx, desc->u.texture.level_count, texture->level_count) || !desc->u.texture.layer_count - || desc->u.texture.layer_idx >= depth_or_layer_count - || desc->u.texture.layer_count > depth_or_layer_count - desc->u.texture.layer_idx) + || !wined3d_bound_range(desc->u.texture.layer_idx, desc->u.texture.layer_count, depth_or_layer_count)) return NULL; } diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 80a636edc9f..10253cab87d 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2927,6 +2927,17 @@ static inline int wined3d_bit_scan(unsigned int *x) return bit_offset; } +static inline bool wined3d_bound_range(unsigned int start, unsigned int count, unsigned int limit) +{ +#if defined(__GNUC__) && __GNUC__ >= 5 + unsigned int sum; + + return !__builtin_add_overflow(start, count, &sum) && sum <= limit; +#else + return start <= limit && count <= limit - start; +#endif +} + static inline void wined3d_box_set(struct wined3d_box *box, unsigned int left, unsigned int top, unsigned int right, unsigned int bottom, unsigned int front, unsigned int back) { -- 2.30.2

3 5

[PATCH v3 1/3] mshtml: Move assert.h include to mshtml_private.h.
by Paul Gofman 07 Jul '21

07 Jul '21

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/mshtml/dispex.c | 1 - dlls/mshtml/htmlanchor.c | 1 - dlls/mshtml/htmlarea.c | 1 - dlls/mshtml/htmlattr.c | 1 - dlls/mshtml/htmlbody.c | 1 - dlls/mshtml/htmlcurstyle.c | 1 - dlls/mshtml/htmldoc.c | 1 - dlls/mshtml/htmlelem.c | 1 - dlls/mshtml/htmlelemcol.c | 1 - dlls/mshtml/htmlevent.c | 1 - dlls/mshtml/htmlform.c | 1 - dlls/mshtml/htmlframe.c | 1 - dlls/mshtml/htmlimg.c | 1 - dlls/mshtml/htmlinput.c | 1 - dlls/mshtml/htmllink.c | 1 - dlls/mshtml/htmlnode.c | 1 - dlls/mshtml/htmlobject.c | 1 - dlls/mshtml/htmlscript.c | 1 - dlls/mshtml/htmlselect.c | 1 - dlls/mshtml/htmlstyle.c | 1 - dlls/mshtml/htmlstyleelem.c | 1 - dlls/mshtml/htmlstylesheet.c | 1 - dlls/mshtml/htmltable.c | 1 - dlls/mshtml/htmltextarea.c | 1 - dlls/mshtml/htmltextnode.c | 1 - dlls/mshtml/htmlwindow.c | 1 - dlls/mshtml/mshtml_private.h | 2 ++ dlls/mshtml/mutation.c | 1 - dlls/mshtml/navigate.c | 1 - dlls/mshtml/nsembed.c | 1 - dlls/mshtml/nsevents.c | 1 - dlls/mshtml/nsio.c | 1 - dlls/mshtml/oleobj.c | 1 - dlls/mshtml/omnavigator.c | 1 - dlls/mshtml/pluginhost.c | 1 - dlls/mshtml/range.c | 1 - dlls/mshtml/script.c | 1 - dlls/mshtml/secmgr.c | 1 - dlls/mshtml/svg.c | 1 - dlls/mshtml/task.c | 1 - dlls/mshtml/xmlhttprequest.c | 1 - 41 files changed, 2 insertions(+), 40 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index 39630590228..6d248691d6b 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -17,7 +17,6 @@ */ #include <stdarg.h> -#include <assert.h> #define COBJMACROS #define NONAMELESSUNION diff --git a/dlls/mshtml/htmlanchor.c b/dlls/mshtml/htmlanchor.c index a0e96af822e..da48601fe87 100644 --- a/dlls/mshtml/htmlanchor.c +++ b/dlls/mshtml/htmlanchor.c @@ -18,7 +18,6 @@ #include <stdarg.h> #include <stdio.h> -#include <assert.h> #define COBJMACROS diff --git a/dlls/mshtml/htmlarea.c b/dlls/mshtml/htmlarea.c index a5ebfe757ae..a0708c4b062 100644 --- a/dlls/mshtml/htmlarea.c +++ b/dlls/mshtml/htmlarea.c @@ -17,7 +17,6 @@ */ #include <stdarg.h> -#include <assert.h> #define COBJMACROS diff --git a/dlls/mshtml/htmlattr.c b/dlls/mshtml/htmlattr.c index 14b79812eb0..dc8c45e488a 100644 --- a/dlls/mshtml/htmlattr.c +++ b/dlls/mshtml/htmlattr.c @@ -18,7 +18,6 @@ #include <stdarg.h> -#include <assert.h> #define COBJMACROS diff --git a/dlls/mshtml/htmlbody.c b/dlls/mshtml/htmlbody.c index 9955a8e6498..32c49fe1214 100644 --- a/dlls/mshtml/htmlbody.c +++ b/dlls/mshtml/htmlbody.c @@ -18,7 +18,6 @@ #include <stdarg.h> #include <stdio.h> -#include <assert.h> #define COBJMACROS diff --git a/dlls/mshtml/htmlcurstyle.c b/dlls/mshtml/htmlcurstyle.c index 85ac99aef92..2abe5df30ec 100644 --- a/dlls/mshtml/htmlcurstyle.c +++ b/dlls/mshtml/htmlcurstyle.c @@ -17,7 +17,6 @@ */ #include <stdarg.h> -#include <assert.h> #define COBJMACROS diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 79241fc34cc..9faf987d7b9 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -18,7 +18,6 @@ #include <stdarg.h> #include <stdio.h> -#include <assert.h> #define COBJMACROS diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 8187cbf867e..b9677ec867a 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -17,7 +17,6 @@ */ #include <stdarg.h> -#include <assert.h> #include <math.h> #define COBJMACROS diff --git a/dlls/mshtml/htmlelemcol.c b/dlls/mshtml/htmlelemcol.c index f4722d96729..e72f21ffaa5 100644 --- a/dlls/mshtml/htmlelemcol.c +++ b/dlls/mshtml/htmlelemcol.c @@ -17,7 +17,6 @@ */ #include <stdarg.h> -#include <assert.h> #define COBJMACROS diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index b3b95083f80..17f5fb35b71 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -17,7 +17,6 @@ */ #include <stdarg.h> -#include <assert.h> #define COBJMACROS diff --git a/dlls/mshtml/htmlform.c b/dlls/mshtml/htmlform.c index 5906202f1c7..5d0928e4a9c 100644 --- a/dlls/mshtml/htmlform.c +++ b/dlls/mshtml/htmlform.c @@ -17,7 +17,6 @@ */ #include <stdarg.h> -#include <assert.h> #define COBJMACROS diff --git a/dlls/mshtml/htmlframe.c b/dlls/mshtml/htmlframe.c index 972ddc80a50..7118ea86b57 100644 --- a/dlls/mshtml/htmlframe.c +++ b/dlls/mshtml/htmlframe.c @@ -17,7 +17,6 @@ */ #include <stdarg.h> -#include <assert.h> #define COBJMACROS diff --git a/dlls/mshtml/htmlimg.c b/dlls/mshtml/htmlimg.c index 2dfd53eb0b9..f89e8e5ae84 100644 --- a/dlls/mshtml/htmlimg.c +++ b/dlls/mshtml/htmlimg.c @@ -17,7 +17,6 @@ */ #include <stdarg.h> -#include <assert.h> #define COBJMACROS diff --git a/dlls/mshtml/htmlinput.c b/dlls/mshtml/htmlinput.c index 2ba5833f3c0..1a0a739d5d5 100644 --- a/dlls/mshtml/htmlinput.c +++ b/dlls/mshtml/htmlinput.c @@ -17,7 +17,6 @@ */ #include <stdarg.h> -#include <assert.h> #include <limits.h> #define COBJMACROS diff --git a/dlls/mshtml/htmllink.c b/dlls/mshtml/htmllink.c index 22342027cbc..ddf67ca0f73 100644 --- a/dlls/mshtml/htmllink.c +++ b/dlls/mshtml/htmllink.c @@ -17,7 +17,6 @@ */ #include <stdarg.h> -#include <assert.h> #define COBJMACROS diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index a2692b1a230..b5ff02bcee2 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -17,7 +17,6 @@ */ #include <stdarg.h> -#include <assert.h> #define COBJMACROS diff --git a/dlls/mshtml/htmlobject.c b/dlls/mshtml/htmlobject.c index b71b0e7db6f..67025489751 100644 --- a/dlls/mshtml/htmlobject.c +++ b/dlls/mshtml/htmlobject.c @@ -17,7 +17,6 @@ */ #include <stdarg.h> -#include <assert.h> #define COBJMACROS diff --git a/dlls/mshtml/htmlscript.c b/dlls/mshtml/htmlscript.c index 4d7997e31a6..9b7f95e3bb0 100644 --- a/dlls/mshtml/htmlscript.c +++ b/dlls/mshtml/htmlscript.c @@ -17,7 +17,6 @@ */ #include <stdarg.h> -#include <assert.h> #define COBJMACROS diff --git a/dlls/mshtml/htmlselect.c b/dlls/mshtml/htmlselect.c index 301d9fa5dc3..ad801f8433b 100644 --- a/dlls/mshtml/htmlselect.c +++ b/dlls/mshtml/htmlselect.c @@ -17,7 +17,6 @@ */ #include <stdarg.h> -#include <assert.h> #define COBJMACROS diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index c4bd3a84867..4ee81ba7e99 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -17,7 +17,6 @@ */ #include <stdarg.h> -#include <assert.h> #include <math.h> #define COBJMACROS diff --git a/dlls/mshtml/htmlstyleelem.c b/dlls/mshtml/htmlstyleelem.c index 538e79f0b5e..d2a4a75fe90 100644 --- a/dlls/mshtml/htmlstyleelem.c +++ b/dlls/mshtml/htmlstyleelem.c @@ -17,7 +17,6 @@ */ #include <stdarg.h> -#include <assert.h> #define COBJMACROS diff --git a/dlls/mshtml/htmlstylesheet.c b/dlls/mshtml/htmlstylesheet.c index 243aea2e618..4519b06155e 100644 --- a/dlls/mshtml/htmlstylesheet.c +++ b/dlls/mshtml/htmlstylesheet.c @@ -17,7 +17,6 @@ */ #include <stdarg.h> -#include <assert.h> #define COBJMACROS diff --git a/dlls/mshtml/htmltable.c b/dlls/mshtml/htmltable.c index ad74ad30966..178e9e52304 100644 --- a/dlls/mshtml/htmltable.c +++ b/dlls/mshtml/htmltable.c @@ -17,7 +17,6 @@ */ #include <stdarg.h> -#include <assert.h> #define COBJMACROS diff --git a/dlls/mshtml/htmltextarea.c b/dlls/mshtml/htmltextarea.c index fb8c3830862..57f33732a01 100644 --- a/dlls/mshtml/htmltextarea.c +++ b/dlls/mshtml/htmltextarea.c @@ -17,7 +17,6 @@ */ #include <stdarg.h> -#include <assert.h> #define COBJMACROS diff --git a/dlls/mshtml/htmltextnode.c b/dlls/mshtml/htmltextnode.c index c2e7f375ada..56a0572459a 100644 --- a/dlls/mshtml/htmltextnode.c +++ b/dlls/mshtml/htmltextnode.c @@ -18,7 +18,6 @@ #include <stdarg.h> -#include <assert.h> #define COBJMACROS diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 0ca4cd6397e..4196d1f45ad 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -17,7 +17,6 @@ */ #include <stdarg.h> -#include <assert.h> #define COBJMACROS diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 7bc645e549f..e3486aa3314 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -40,6 +40,8 @@ #include "nsiface.h" +#include <assert.h> + #define NS_ERROR_GENERATE_FAILURE(module,code) \ ((nsresult) (((UINT32)(1u<<31)) | ((UINT32)(module+0x45)<<16) | ((UINT32)(code)))) #define NS_ERROR_GENERATE_SUCCESS(module,code) \ diff --git a/dlls/mshtml/mutation.c b/dlls/mshtml/mutation.c index 247a3277927..abe403ea976 100644 --- a/dlls/mshtml/mutation.c +++ b/dlls/mshtml/mutation.c @@ -17,7 +17,6 @@ */ #include <stdarg.h> -#include <assert.h> #define COBJMACROS diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 233f58c89fd..8cbe0ec9304 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -17,7 +17,6 @@ */ #include <stdarg.h> -#include <assert.h> #define COBJMACROS #define NONAMELESSUNION diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index d4fe7e96fc2..ae94f224fac 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -17,7 +17,6 @@ */ #include <stdarg.h> -#include <assert.h> #define COBJMACROS diff --git a/dlls/mshtml/nsevents.c b/dlls/mshtml/nsevents.c index b060ae521c5..21908b09563 100644 --- a/dlls/mshtml/nsevents.c +++ b/dlls/mshtml/nsevents.c @@ -17,7 +17,6 @@ */ #include <stdarg.h> -#include <assert.h> #define COBJMACROS diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index ea8eae2007d..abf05aaa41b 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -17,7 +17,6 @@ */ #include <stdarg.h> -#include <assert.h> #define COBJMACROS diff --git a/dlls/mshtml/oleobj.c b/dlls/mshtml/oleobj.c index fb3ff8a8b73..c7ce641a949 100644 --- a/dlls/mshtml/oleobj.c +++ b/dlls/mshtml/oleobj.c @@ -18,7 +18,6 @@ #include <stdarg.h> #include <stdio.h> -#include <assert.h> #define COBJMACROS diff --git a/dlls/mshtml/omnavigator.c b/dlls/mshtml/omnavigator.c index 43067b813a1..a8f829b6a57 100644 --- a/dlls/mshtml/omnavigator.c +++ b/dlls/mshtml/omnavigator.c @@ -17,7 +17,6 @@ */ #include <stdarg.h> -#include <assert.h> #define COBJMACROS diff --git a/dlls/mshtml/pluginhost.c b/dlls/mshtml/pluginhost.c index d880cc89a9d..ad67db5548c 100644 --- a/dlls/mshtml/pluginhost.c +++ b/dlls/mshtml/pluginhost.c @@ -17,7 +17,6 @@ */ #include <stdarg.h> -#include <assert.h> #define COBJMACROS diff --git a/dlls/mshtml/range.c b/dlls/mshtml/range.c index 8c802ee9ede..89f68046a33 100644 --- a/dlls/mshtml/range.c +++ b/dlls/mshtml/range.c @@ -17,7 +17,6 @@ */ #include <stdarg.h> -#include <assert.h> #define COBJMACROS diff --git a/dlls/mshtml/script.c b/dlls/mshtml/script.c index 8f7f502e121..28e07a50c8e 100644 --- a/dlls/mshtml/script.c +++ b/dlls/mshtml/script.c @@ -17,7 +17,6 @@ */ #include <stdarg.h> -#include <assert.h> #define COBJMACROS diff --git a/dlls/mshtml/secmgr.c b/dlls/mshtml/secmgr.c index 019327caa47..a72099f33b9 100644 --- a/dlls/mshtml/secmgr.c +++ b/dlls/mshtml/secmgr.c @@ -18,7 +18,6 @@ #include <stdarg.h> #include <stdio.h> -#include <assert.h> #define COBJMACROS diff --git a/dlls/mshtml/svg.c b/dlls/mshtml/svg.c index e1de57fc4b1..75036cb39d6 100644 --- a/dlls/mshtml/svg.c +++ b/dlls/mshtml/svg.c @@ -17,7 +17,6 @@ */ #include <stdarg.h> -#include <assert.h> #include <math.h> #define COBJMACROS diff --git a/dlls/mshtml/task.c b/dlls/mshtml/task.c index 28cb88ab5f1..67b7633a5b4 100644 --- a/dlls/mshtml/task.c +++ b/dlls/mshtml/task.c @@ -18,7 +18,6 @@ #include <stdarg.h> #include <stdio.h> -#include <assert.h> #define COBJMACROS diff --git a/dlls/mshtml/xmlhttprequest.c b/dlls/mshtml/xmlhttprequest.c index 814162acbbc..d7d8ce51593 100644 --- a/dlls/mshtml/xmlhttprequest.c +++ b/dlls/mshtml/xmlhttprequest.c @@ -17,7 +17,6 @@ */ #include <stdarg.h> -#include <assert.h> #define COBJMACROS -- 2.31.1

3 5

[PATCH 5/5] gdi32: Move region helper functions to objects.c.
by Jacek Caban 07 Jul '21

07 Jul '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/objects.c | 28 +++++++++++++++++++++++++ dlls/gdi32/region.c | 49 -------------------------------------------- 2 files changed, 28 insertions(+), 49 deletions(-)

2 1

[PATCH 4/5] gdi32: Use ntgdi names for region functions.
by Jacek Caban 07 Jul '21

07 Jul '21

2 1

[PATCH 3/5] gdi32: Use ntgdi names for region constructors.
by Jacek Caban 07 Jul '21

07 Jul '21

2 1

[PATCH 2/5] gdi32: Introduce NtGdiExtCreateRegion.
by Jacek Caban 07 Jul '21

07 Jul '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/objects.c | 16 ++++++++++++++++ dlls/gdi32/region.c | 18 ++++++------------ 2 files changed, 22 insertions(+), 12 deletions(-)

2 1