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

Nikolay Sivov : ole32: Fix CreataDataCache() return value when requested riid is not IUnknown, for aggregation case.
by Alexandre Julliard 22 Mar '16

22 Mar '16

Module: wine Branch: master Commit: fde61d467abd7c8357c25d17b39b2a5e8e9b871c URL: http://source.winehq.org/git/wine.git/?a=commit;h=fde61d467abd7c8357c25d17b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 21 11:55:57 2016 +0300 ole32: Fix CreataDataCache() return value when requested riid is not IUnknown, for aggregation case. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/datacache.c | 2 +- dlls/ole32/tests/ole2.c | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c index e93e867..21f63d3 100644 --- a/dlls/ole32/datacache.c +++ b/dlls/ole32/datacache.c @@ -2464,7 +2464,7 @@ HRESULT WINAPI CreateDataCache( * IUnknown pointer can be returned to the outside. */ if ( pUnkOuter && !IsEqualIID(&IID_IUnknown, riid) ) - return CLASS_E_NOAGGREGATION; + return E_INVALIDARG; /* * Try to construct a new instance of the class. diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c index d58105c..afff6ba 100644 --- a/dlls/ole32/tests/ole2.c +++ b/dlls/ole32/tests/ole2.c @@ -1598,7 +1598,6 @@ static void test_data_cache(void) /* requested is not IUnknown */ hr = CreateDataCache(&unknown, &CLSID_NULL, &IID_IOleCache2, (void**)&pOleCache); -todo_wine ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); hr = CreateDataCache(&unknown, &CLSID_NULL, &IID_IUnknown, (void**)&unk);

1 0

Nikolay Sivov : msctf/tests: Fix a crash on unsupported interface.
by Alexandre Julliard 22 Mar '16

22 Mar '16

Module: wine Branch: master Commit: 6834367a167b30e0180b58df6461e28701a9df0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=6834367a167b30e0180b58df6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 22 10:55:03 2016 +0300 msctf/tests: Fix a crash on unsupported interface. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msctf/tests/inputprocessor.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/dlls/msctf/tests/inputprocessor.c b/dlls/msctf/tests/inputprocessor.c index 080d7f0..8c9c884 100644 --- a/dlls/msctf/tests/inputprocessor.c +++ b/dlls/msctf/tests/inputprocessor.c @@ -1427,13 +1427,16 @@ static void test_startSession(void) ok(cid == cid2, "Second activate client ID does not match\n"); hr = ITfThreadMgr_QueryInterface(g_tm, &IID_ITfThreadMgrEx, (void **)&tmex); - ok(SUCCEEDED(hr), "Unable to acquire ITfThreadMgrEx interface\n"); - - hr = ITfThreadMgrEx_ActivateEx(tmex, &cid2, 0); - ok(SUCCEEDED(hr), "Failed to Activate\n"); - ok(cid == cid2, "ActivateEx client ID does not match\n"); + if (hr == S_OK) + { + hr = ITfThreadMgrEx_ActivateEx(tmex, &cid2, 0); + ok(SUCCEEDED(hr), "Failed to Activate\n"); + ok(cid == cid2, "ActivateEx client ID does not match\n"); - ITfThreadMgrEx_Release(tmex); + ITfThreadMgrEx_Release(tmex); + } + else + win_skip("ITfThreadMgrEx is not supported\n"); hr = ITfThreadMgr_Deactivate(g_tm); ok(SUCCEEDED(hr), "Failed to Deactivate\n");

1 0

Francois Gouget : dinput: Make ff_effect_direction_to_rad() static.
by Alexandre Julliard 22 Mar '16

22 Mar '16

Module: wine Branch: master Commit: adb39b8fde7ce607bc4b0399f1bfa68308c19e47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=adb39b8fde7ce607bc4b0399f… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Mar 22 11:24:53 2016 +0100 dinput: Make ff_effect_direction_to_rad() static. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/effect_linuxinput.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dinput/effect_linuxinput.c b/dlls/dinput/effect_linuxinput.c index 0e7be2c..ad7d3ad 100644 --- a/dlls/dinput/effect_linuxinput.c +++ b/dlls/dinput/effect_linuxinput.c @@ -67,7 +67,7 @@ static inline LinuxInputEffectImpl *impl_from_IDirectInputEffect(IDirectInputEff return CONTAINING_RECORD(iface, LinuxInputEffectImpl, IDirectInputEffect_iface); } -double ff_effect_direction_to_rad(unsigned int dir) +static double ff_effect_direction_to_rad(unsigned int dir) { return (dir & 0xffff) * M_PI / 0x8000; }

1 0

Francois Gouget : shell32/tests: Make shlexec' s reset_association_description() static.
by Alexandre Julliard 22 Mar '16

22 Mar '16

Module: wine Branch: master Commit: d02e559b914d5d738f52bf1ec6d739302adfed91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d02e559b914d5d738f52bf1ec… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Mar 22 11:26:24 2016 +0100 shell32/tests: Make shlexec's reset_association_description() static. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shlexec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index 07c3b48..ebf9d80 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -365,7 +365,7 @@ static void WINETEST_PRINTF_ATTR(2,3) _okShell(int condition, const char *msg, . #define okShell okShell_(__FILE__, __LINE__) static char assoc_desc[2048]; -void reset_association_description(void) +static void reset_association_description(void) { *assoc_desc = '\0'; }

1 0

Aaryaman Vasishta : d3drm: Move struct d3drm_texture to header for global access.
by Alexandre Julliard 22 Mar '16

22 Mar '16

Module: wine Branch: master Commit: b05b96a0e2cf3ea1911b2e866445d774cf876f5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b05b96a0e2cf3ea1911b2e866… Author: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Date: Mon Mar 21 21:54:45 2016 +0530 d3drm: Move struct d3drm_texture to header for global access. Signed-off-by: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/d3drm.c | 91 +++++++++++++++++++++++++++++++++++++++++----- dlls/d3drm/d3drm_private.h | 11 +++++- dlls/d3drm/meshbuilder.c | 6 +-- dlls/d3drm/texture.c | 19 ++-------- 4 files changed, 99 insertions(+), 28 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b05b96a0e2cf3ea1911b2…

1 0

Michael Stefaniuc : ddraw: Use SetRect() instead of open coding it.
by Alexandre Julliard 22 Mar '16

22 Mar '16

Module: wine Branch: master Commit: 060387936d5b7253ad1e49700d3efa95bc4f8160 URL: http://source.winehq.org/git/wine.git/?a=commit;h=060387936d5b7253ad1e49700… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Mar 22 10:31:25 2016 +0100 ddraw: Use SetRect() instead of open coding it. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/device.c | 6 +----- dlls/ddraw/surface.c | 20 ++++---------------- 2 files changed, 5 insertions(+), 21 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 23c3e32..21f87d9 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -6077,11 +6077,7 @@ static HRESULT d3d_device7_Load(IDirect3DDevice7 *iface, IDirectDrawSurface7 *ds wined3d_mutex_lock(); if (!src_rect) - { - srcrect.left = srcrect.top = 0; - srcrect.right = src->surface_desc.dwWidth; - srcrect.bottom = src->surface_desc.dwHeight; - } + SetRect(&srcrect, 0, 0, src->surface_desc.dwWidth, src->surface_desc.dwHeight); else srcrect = *src_rect; diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 3709b94..83457fc 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -1407,16 +1407,10 @@ static HRESULT ddraw_surface_blt_clipped(struct ddraw_surface *dst_surface, cons UINT i; if (!dst_rect_in) - { - dst_rect.left = 0; - dst_rect.top = 0; - dst_rect.right = dst_surface->surface_desc.dwWidth; - dst_rect.bottom = dst_surface->surface_desc.dwHeight; - } + SetRect(&dst_rect, 0, 0, dst_surface->surface_desc.dwWidth, + dst_surface->surface_desc.dwHeight); else - { dst_rect = *dst_rect_in; - } if (IsRectEmpty(&dst_rect)) return DDERR_INVALIDRECT; @@ -1424,16 +1418,10 @@ static HRESULT ddraw_surface_blt_clipped(struct ddraw_surface *dst_surface, cons if (src_surface) { if (!src_rect_in) - { - src_rect.left = 0; - src_rect.top = 0; - src_rect.right = src_surface->surface_desc.dwWidth; - src_rect.bottom = src_surface->surface_desc.dwHeight; - } + SetRect(&src_rect, 0, 0, src_surface->surface_desc.dwWidth, + src_surface->surface_desc.dwHeight); else - { src_rect = *src_rect_in; - } if (IsRectEmpty(&src_rect)) return DDERR_INVALIDRECT;

1 0

Francois Gouget : wined3d: Make wined3d_texture_force_reload() static.
by Alexandre Julliard 22 Mar '16

22 Mar '16

Module: wine Branch: master Commit: 272b8bc190b967acbdba6becb5b54a46bebb2004 URL: http://source.winehq.org/git/wine.git/?a=commit;h=272b8bc190b967acbdba6becb… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Mar 22 11:26:59 2016 +0100 wined3d: Make wined3d_texture_force_reload() static. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 30 +++++++++++++++--------------- dlls/wined3d/wined3d_private.h | 1 - 2 files changed, 15 insertions(+), 16 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 7e28681..2687bf1 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -822,6 +822,21 @@ void wined3d_texture_prepare_buffer_object(struct wined3d_texture *texture, *buffer_object, texture, sub_resource_idx); } +static void wined3d_texture_force_reload(struct wined3d_texture *texture) +{ + unsigned int sub_count = texture->level_count * texture->layer_count; + unsigned int i; + + texture->flags &= ~(WINED3D_TEXTURE_RGB_ALLOCATED | WINED3D_TEXTURE_SRGB_ALLOCATED + | WINED3D_TEXTURE_CONVERTED); + texture->async.flags &= ~WINED3D_TEXTURE_ASYNC_COLOR_KEY; + for (i = 0; i < sub_count; ++i) + { + texture->texture_ops->texture_sub_resource_invalidate_location(texture->sub_resources[i].resource, + WINED3D_LOCATION_TEXTURE_RGB | WINED3D_LOCATION_TEXTURE_SRGB); + } +} + void wined3d_texture_prepare_texture(struct wined3d_texture *texture, struct wined3d_context *context, BOOL srgb) { DWORD alloc_flag = srgb ? WINED3D_TEXTURE_SRGB_ALLOCATED : WINED3D_TEXTURE_RGB_ALLOCATED; @@ -844,21 +859,6 @@ void wined3d_texture_prepare_texture(struct wined3d_texture *texture, struct win texture->flags |= alloc_flag; } -void wined3d_texture_force_reload(struct wined3d_texture *texture) -{ - unsigned int sub_count = texture->level_count * texture->layer_count; - unsigned int i; - - texture->flags &= ~(WINED3D_TEXTURE_RGB_ALLOCATED | WINED3D_TEXTURE_SRGB_ALLOCATED - | WINED3D_TEXTURE_CONVERTED); - texture->async.flags &= ~WINED3D_TEXTURE_ASYNC_COLOR_KEY; - for (i = 0; i < sub_count; ++i) - { - texture->texture_ops->texture_sub_resource_invalidate_location(texture->sub_resources[i].resource, - WINED3D_LOCATION_TEXTURE_RGB | WINED3D_LOCATION_TEXTURE_SRGB); - } -} - void CDECL wined3d_texture_generate_mipmaps(struct wined3d_texture *texture) { /* TODO: Implement filters using GL_SGI_generate_mipmaps. */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index cbaa4b3..7d7a2bb 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2452,7 +2452,6 @@ void wined3d_texture_bind_and_dirtify(struct wined3d_texture *texture, struct wined3d_context *context, BOOL srgb) DECLSPEC_HIDDEN; BOOL wined3d_texture_check_block_align(const struct wined3d_texture *texture, unsigned int level, const struct wined3d_box *box) DECLSPEC_HIDDEN; -void wined3d_texture_force_reload(struct wined3d_texture *texture) DECLSPEC_HIDDEN; struct wined3d_resource *wined3d_texture_get_sub_resource(const struct wined3d_texture *texture, UINT sub_resource_idx) DECLSPEC_HIDDEN; void wined3d_texture_load(struct wined3d_texture *texture,

1 0

Francois Gouget : mshtml: Make some functions static.
by Alexandre Julliard 22 Mar '16

22 Mar '16

Module: wine Branch: master Commit: 49ceec53c42f320900d1eda08bad7a40029001e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49ceec53c42f320900d1eda08… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Mar 22 11:26:12 2016 +0100 mshtml: Make some functions static. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlcomment.c | 2 +- dlls/mshtml/htmlstyle.c | 4 ++-- dlls/mshtml/htmlstyle.h | 2 -- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/htmlcomment.c b/dlls/mshtml/htmlcomment.c index abb71a8..0d3d450 100644 --- a/dlls/mshtml/htmlcomment.c +++ b/dlls/mshtml/htmlcomment.c @@ -169,7 +169,7 @@ static void HTMLCommentElement_destructor(HTMLDOMNode *iface) HTMLElement_destructor(&This->element.node); } -HRESULT HTMLCommentElement_clone(HTMLDOMNode *iface, nsIDOMNode *nsnode, HTMLDOMNode **ret) +static HRESULT HTMLCommentElement_clone(HTMLDOMNode *iface, nsIDOMNode *nsnode, HTMLDOMNode **ret) { HTMLCommentElement *This = impl_from_HTMLDOMNode(iface); HTMLElement *new_elem; diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index aea6a92..65083ab 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -396,7 +396,7 @@ static LPWSTR fix_url_value(LPCWSTR val) return ret; } -HRESULT set_nsstyle_attr(nsIDOMCSSStyleDeclaration *nsstyle, styleid_t sid, const WCHAR *value, DWORD flags) +static HRESULT set_nsstyle_attr(nsIDOMCSSStyleDeclaration *nsstyle, styleid_t sid, const WCHAR *value, DWORD flags) { nsAString str_name, str_value, str_empty; LPWSTR val = NULL; @@ -461,7 +461,7 @@ static HRESULT var_to_styleval(const VARIANT *v, WCHAR *buf, DWORD flags, const } } -HRESULT set_nsstyle_attr_var(nsIDOMCSSStyleDeclaration *nsstyle, styleid_t sid, VARIANT *value, DWORD flags) +static HRESULT set_nsstyle_attr_var(nsIDOMCSSStyleDeclaration *nsstyle, styleid_t sid, VARIANT *value, DWORD flags) { const WCHAR *val; WCHAR buf[14]; diff --git a/dlls/mshtml/htmlstyle.h b/dlls/mshtml/htmlstyle.h index e9de151..fbf2ac0 100644 --- a/dlls/mshtml/htmlstyle.h +++ b/dlls/mshtml/htmlstyle.h @@ -124,9 +124,7 @@ typedef enum { HRESULT HTMLStyle_Create(HTMLElement*,HTMLStyle**) DECLSPEC_HIDDEN; HRESULT get_nsstyle_attr(nsIDOMCSSStyleDeclaration*,styleid_t,BSTR*,DWORD) DECLSPEC_HIDDEN; -HRESULT set_nsstyle_attr(nsIDOMCSSStyleDeclaration*,styleid_t,LPCWSTR,DWORD) DECLSPEC_HIDDEN; -HRESULT set_nsstyle_attr_var(nsIDOMCSSStyleDeclaration *nsstyle, styleid_t sid, VARIANT *value, DWORD flags) DECLSPEC_HIDDEN; HRESULT get_nsstyle_attr_var(nsIDOMCSSStyleDeclaration *nsstyle, styleid_t sid, VARIANT *p, DWORD flags) DECLSPEC_HIDDEN; HRESULT get_elem_style(HTMLElement*,styleid_t,BSTR*) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : wined3d: Get rid of wined3d_surface_ops.surface_private_setup().
by Alexandre Julliard 22 Mar '16

22 Mar '16

Module: wine Branch: master Commit: 2d00f77f30b9b9bebf83d9ff0b68a91fb8f9e3ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d00f77f30b9b9bebf83d9ff0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 21 17:40:10 2016 +0100 wined3d: Get rid of wined3d_surface_ops.surface_private_setup(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 62 ++++++------------------------------------ dlls/wined3d/wined3d_private.h | 6 ---- 2 files changed, 9 insertions(+), 59 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index c259c13..532f6f8 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1068,51 +1068,6 @@ static const struct wined3d_resource_ops surface_resource_ops = surface_resource_sub_resource_unmap, }; -static const struct wined3d_surface_ops surface_ops = -{ - surface_private_setup, -}; - -/***************************************************************************** - * Initializes the GDI surface, aka creates the DIB section we render to - * The DIB section creation is done by calling GetDC, which will create the - * section and releasing the dc to allow the app to use it. The dib section - * will stay until the surface is released - * - * GDI surfaces do not need to be a power of 2 in size, so the pow2 sizes - * are set to the real sizes to save memory. The NONPOW2 flag is unset to - * avoid confusion in the shared surface code. - * - * Returns: - * WINED3D_OK on success - * The return values of called methods on failure - * - *****************************************************************************/ -static HRESULT gdi_surface_private_setup(struct wined3d_surface *surface) -{ - HRESULT hr; - - TRACE("surface %p.\n", surface); - - /* Sysmem textures have memory already allocated - release it, - * this avoids an unnecessary memcpy. */ - hr = surface_create_dib_section(surface); - if (FAILED(hr)) - return hr; - surface->resource.map_binding = WINED3D_LOCATION_DIB; - - /* We don't mind the nonpow2 stuff in GDI. */ - surface->pow2Width = surface->resource.width; - surface->pow2Height = surface->resource.height; - - return WINED3D_OK; -} - -static const struct wined3d_surface_ops gdi_surface_ops = -{ - gdi_surface_private_setup, -}; - /* This call just downloads data, the caller is responsible for binding the * correct texture. */ /* Context activation is done by the caller. */ @@ -4673,11 +4628,6 @@ HRESULT wined3d_surface_init(struct wined3d_surface *surface, struct wined3d_tex if (!resource_size) return WINED3DERR_INVALIDCALL; - if (device->wined3d->flags & WINED3D_NO3D) - surface->surface_ops = &gdi_surface_ops; - else - surface->surface_ops = &surface_ops; - if (FAILED(hr = resource_init(&surface->resource, device, WINED3D_RTYPE_SURFACE, format, desc->multisample_type, multisample_quality, desc->usage, desc->pool, desc->width, desc->height, 1, resource_size, NULL, &wined3d_null_parent_ops, &surface_resource_ops))) @@ -4702,7 +4652,7 @@ HRESULT wined3d_surface_init(struct wined3d_surface *surface, struct wined3d_tex surface->texture_layer = layer; /* Call the private setup routine */ - if (FAILED(hr = surface->surface_ops->surface_private_setup(surface))) + if (FAILED(hr = surface_private_setup(surface))) { ERR("Private setup failed, hr %#x.\n", hr); wined3d_surface_cleanup(surface); @@ -4712,9 +4662,15 @@ HRESULT wined3d_surface_init(struct wined3d_surface *surface, struct wined3d_tex /* Similar to lockable rendertargets above, creating the DIB section * during surface initialization prevents the sysmem pointer from changing * after a wined3d_texture_get_dc() call. */ - if ((desc->usage & WINED3DUSAGE_OWNDC) && !surface->hDC - && SUCCEEDED(surface_create_dib_section(surface))) + if ((desc->usage & WINED3DUSAGE_OWNDC) || (device->wined3d->flags & WINED3D_NO3D)) + { + if (FAILED(hr = surface_create_dib_section(surface))) + { + wined3d_surface_cleanup(surface); + return hr; + } surface->resource.map_binding = WINED3D_LOCATION_DIB; + } if (surface->resource.map_binding == WINED3D_LOCATION_DIB) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 3dea1e3..cbaa4b3 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2548,15 +2548,9 @@ struct fbo_entry } key; }; -struct wined3d_surface_ops -{ - HRESULT (*surface_private_setup)(struct wined3d_surface *surface); -}; - struct wined3d_surface { struct wined3d_resource resource; - const struct wined3d_surface_ops *surface_ops; struct wined3d_texture *container; DWORD locations;

1 0

Henri Verbeet : wined3d: Validate (2D) texture dimensions in texture_init( ).
by Alexandre Julliard 22 Mar '16

22 Mar '16

Module: wine Branch: master Commit: ab53ef06519d5e5a528fff54e6481ecf59576755 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab53ef06519d5e5a528fff54e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 21 17:40:11 2016 +0100 wined3d: Validate (2D) texture dimensions in texture_init(). Instead of for each surface individually. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 24 ----------- dlls/wined3d/texture.c | 108 +++++++++++++++++++++++++++---------------------- 2 files changed, 59 insertions(+), 73 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 532f6f8..5842d52 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -557,30 +557,6 @@ static HRESULT surface_private_setup(struct wined3d_surface *surface) } } - if ((surface->pow2Width > gl_info->limits.texture_size || surface->pow2Height > gl_info->limits.texture_size) - && (texture->resource.usage & WINED3DUSAGE_TEXTURE)) - { - /* One of three options: - * 1: Do the same as we do with NPOT and scale the texture, (any - * texture ops would require the texture to be scaled which is - * potentially slow) - * 2: Set the texture to the maximum size (bad idea). - * 3: WARN and return WINED3DERR_NOTAVAILABLE; - * 4: Create the surface, but allow it to be used only for DirectDraw - * Blts. Some apps (e.g. Swat 3) create textures with a Height of - * 16 and a Width > 3000 and blt 16x16 letter areas from them to - * the render target. */ - if (texture->resource.pool == WINED3D_POOL_DEFAULT || texture->resource.pool == WINED3D_POOL_MANAGED) - { - WARN("Unable to allocate a surface which exceeds the maximum OpenGL texture size.\n"); - return WINED3DERR_NOTAVAILABLE; - } - - /* We should never use this surface in combination with OpenGL! */ - TRACE("Creating an oversized surface: %ux%u.\n", - surface->pow2Width, surface->pow2Height); - } - if (texture->resource.usage & WINED3DUSAGE_DEPTHSTENCIL) surface->locations = WINED3D_LOCATION_DISCARDED; diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 4d2a94f..588066f 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -79,7 +79,7 @@ static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struc texture->level_count = level_count; texture->filter_type = (desc->usage & WINED3DUSAGE_AUTOGENMIPMAP) ? WINED3D_TEXF_LINEAR : WINED3D_TEXF_NONE; texture->lod = 0; - texture->flags = WINED3D_TEXTURE_POW2_MAT_IDENT | WINED3D_TEXTURE_NORMALIZED_COORDS; + texture->flags |= WINED3D_TEXTURE_POW2_MAT_IDENT | WINED3D_TEXTURE_NORMALIZED_COORDS; if (flags & WINED3D_TEXTURE_CREATE_PIN_SYSMEM) texture->flags |= WINED3D_TEXTURE_PIN_SYSMEM; @@ -1403,39 +1403,59 @@ static HRESULT texture_init(struct wined3d_texture *texture, const struct wined3 return WINED3DERR_INVALIDCALL; } - /* Non-power2 support. */ - if (gl_info->supported[ARB_TEXTURE_NON_POWER_OF_TWO]) + pow2_width = desc->width; + pow2_height = desc->height; + if (((desc->width & (desc->width - 1)) || (desc->height & (desc->height - 1))) + && !gl_info->supported[ARB_TEXTURE_NON_POWER_OF_TWO]) { - pow2_width = desc->width; - pow2_height = desc->height; - } - else - { - /* Find the nearest pow2 match. */ - pow2_width = pow2_height = 1; - while (pow2_width < desc->width) - pow2_width <<= 1; - while (pow2_height < desc->height) - pow2_height <<= 1; - - if (pow2_width != desc->width || pow2_height != desc->height) + /* level_count == 0 returns an error as well. */ + if (level_count != 1 || desc->usage & WINED3DUSAGE_LEGACY_CUBEMAP) { - /* level_count == 0 returns an error as well */ - if (level_count != 1 || desc->usage & WINED3DUSAGE_LEGACY_CUBEMAP) + if (desc->pool != WINED3D_POOL_SCRATCH) { - if (desc->pool == WINED3D_POOL_SCRATCH) - { - WARN("Creating a scratch mipmapped/cube NPOT texture despite lack of HW support.\n"); - } - else - { - WARN("Attempted to create a mipmapped/cube NPOT texture without unconditional NPOT support.\n"); - return WINED3DERR_INVALIDCALL; - } + WARN("Attempted to create a mipmapped/cube NPOT texture without unconditional NPOT support.\n"); + return WINED3DERR_INVALIDCALL; } + + WARN("Creating a scratch mipmapped/cube NPOT texture despite lack of HW support.\n"); + } + texture->flags |= WINED3D_TEXTURE_COND_NP2; + + if (!gl_info->supported[ARB_TEXTURE_RECTANGLE] && !gl_info->supported[WINED3D_GL_NORMALIZED_TEXRECT]) + { + /* Find the nearest pow2 match. */ + pow2_width = pow2_height = 1; + while (pow2_width < desc->width) + pow2_width <<= 1; + while (pow2_height < desc->height) + pow2_height <<= 1; + texture->flags |= WINED3D_TEXTURE_COND_NP2_EMULATED; } } + if ((pow2_width > gl_info->limits.texture_size || pow2_height > gl_info->limits.texture_size) + && (desc->usage & WINED3DUSAGE_TEXTURE)) + { + /* One of four options: + * 1: Do the same as we do with NPOT and scale the texture. (Any + * texture ops would require the texture to be scaled which is + * potentially slow.) + * 2: Set the texture to the maximum size (bad idea). + * 3: WARN and return WINED3DERR_NOTAVAILABLE. + * 4: Create the surface, but allow it to be used only for DirectDraw + * Blts. Some apps (e.g. Swat 3) create textures with a height of + * 16 and a width > 3000 and blt 16x16 letter areas from them to + * the render target. */ + if (desc->pool == WINED3D_POOL_DEFAULT || desc->pool == WINED3D_POOL_MANAGED) + { + WARN("Dimensions (%ux%u) exceed the maximum texture size.\n", pow2_width, pow2_height); + return WINED3DERR_NOTAVAILABLE; + } + + /* We should never use this surface in combination with OpenGL. */ + TRACE("Creating an oversized (%ux%u) surface.\n", pow2_width, pow2_height); + } + /* Calculate levels for mip mapping. */ if (desc->usage & WINED3DUSAGE_AUTOGENMIPMAP) { @@ -1464,40 +1484,30 @@ static HRESULT texture_init(struct wined3d_texture *texture, const struct wined3 { texture->pow2_matrix[0] = (float)desc->width; texture->pow2_matrix[5] = (float)desc->height; - texture->pow2_matrix[10] = 1.0f; - texture->pow2_matrix[15] = 1.0f; - texture->target = GL_TEXTURE_RECTANGLE_ARB; - texture->flags |= WINED3D_TEXTURE_COND_NP2; texture->flags &= ~(WINED3D_TEXTURE_POW2_MAT_IDENT | WINED3D_TEXTURE_NORMALIZED_COORDS); + texture->target = GL_TEXTURE_RECTANGLE_ARB; } else { - if (desc->usage & WINED3DUSAGE_LEGACY_CUBEMAP) - texture->target = GL_TEXTURE_CUBE_MAP_ARB; - else - texture->target = GL_TEXTURE_2D; - if (desc->width == pow2_width && desc->height == pow2_height) + if (texture->flags & WINED3D_TEXTURE_COND_NP2_EMULATED) { - texture->pow2_matrix[0] = 1.0f; - texture->pow2_matrix[5] = 1.0f; + texture->pow2_matrix[0] = (((float)desc->width) / ((float)pow2_width)); + texture->pow2_matrix[5] = (((float)desc->height) / ((float)pow2_height)); + texture->flags &= ~WINED3D_TEXTURE_POW2_MAT_IDENT; } - else if (gl_info->supported[WINED3D_GL_NORMALIZED_TEXRECT]) + else { texture->pow2_matrix[0] = 1.0f; texture->pow2_matrix[5] = 1.0f; - texture->flags |= WINED3D_TEXTURE_COND_NP2; } + if (desc->usage & WINED3DUSAGE_LEGACY_CUBEMAP) + texture->target = GL_TEXTURE_CUBE_MAP_ARB; else - { - texture->pow2_matrix[0] = (((float)desc->width) / ((float)pow2_width)); - texture->pow2_matrix[5] = (((float)desc->height) / ((float)pow2_height)); - texture->flags &= ~WINED3D_TEXTURE_POW2_MAT_IDENT; - texture->flags |= WINED3D_TEXTURE_COND_NP2_EMULATED; - } - texture->pow2_matrix[10] = 1.0f; - texture->pow2_matrix[15] = 1.0f; + texture->target = GL_TEXTURE_2D; } - TRACE("xf(%f) yf(%f)\n", texture->pow2_matrix[0], texture->pow2_matrix[5]); + texture->pow2_matrix[10] = 1.0f; + texture->pow2_matrix[15] = 1.0f; + TRACE("x scale %.8e, y scale %.8e.\n", texture->pow2_matrix[0], texture->pow2_matrix[5]); if (!(surfaces = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*surfaces) * level_count * layer_count))) {

1 0