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

Nikolay Sivov : avifil32: Use matching buffer length for dest string ( Coverity).
by Alexandre Julliard March 11, 2016

March 11, 2016

Module: wine Branch: master Commit: 94c1c8e504edb82cd112c71fc6427991713685c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=94c1c8e504edb82cd112c71fc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 10 12:26:57 2016 +0300 avifil32: Use matching buffer length for dest string (Coverity). Reported issue is about potential overflow when copying to fixed size buffer from larger source buffer Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/avifil32/api.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/avifil32/api.c b/dlls/avifil32/api.c index 7232450..0715d58 100644 --- a/dlls/avifil32/api.c +++ b/dlls/avifil32/api.c @@ -1036,14 +1036,16 @@ HRESULT WINAPI AVIBuildFilterW(LPWSTR szFilter, LONG cbFilter, BOOL fSaving) return AVIERR_ERROR; } for (n = 0;RegEnumKeyW(hKey, n, szFileExt, sizeof(szFileExt)/sizeof(szFileExt[0])) == ERROR_SUCCESS;n++) { + WCHAR clsidW[40]; + /* get CLSID to extension */ - size = sizeof(szValue); - if (RegQueryValueW(hKey, szFileExt, szValue, &size) != ERROR_SUCCESS) + size = sizeof(clsidW); + if (RegQueryValueW(hKey, szFileExt, clsidW, &size) != ERROR_SUCCESS) break; /* search if the CLSID is already known */ for (i = 1; i <= count; i++) { - if (lstrcmpW(lp[i].szClsid, szValue) == 0) + if (lstrcmpW(lp[i].szClsid, clsidW) == 0) break; /* a new one */ } @@ -1058,7 +1060,7 @@ HRESULT WINAPI AVIBuildFilterW(LPWSTR szFilter, LONG cbFilter, BOOL fSaving) break; } - lstrcpyW(lp[i].szClsid, szValue); + lstrcpyW(lp[i].szClsid, clsidW); count++; }

1 0

Andrew Eikum : mmdevapi: Implement IAudioEndpointVolume::GetVolumeRange.
by Alexandre Julliard March 11, 2016

March 11, 2016

Module: wine Branch: master Commit: 89de040e4f2567df48af1cfcad33c34e2a54d9cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=89de040e4f2567df48af1cfca… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Mar 9 12:41:22 2016 -0600 mmdevapi: Implement IAudioEndpointVolume::GetVolumeRange. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mmdevapi/audiovolume.c | 15 ++++++++++----- dlls/mmdevapi/devenum.c | 5 +++-- dlls/mmdevapi/mmdevapi.h | 2 +- dlls/mmdevapi/tests/mmdevenum.c | 1 + dlls/mmdevapi/tests/render.c | 24 ++++++++++++++++++++++++ 5 files changed, 39 insertions(+), 8 deletions(-) diff --git a/dlls/mmdevapi/audiovolume.c b/dlls/mmdevapi/audiovolume.c index 7dddbdf..a49d2e9 100644 --- a/dlls/mmdevapi/audiovolume.c +++ b/dlls/mmdevapi/audiovolume.c @@ -233,10 +233,15 @@ static HRESULT WINAPI AEV_QueryHardwareSupport(IAudioEndpointVolumeEx *iface, DW static HRESULT WINAPI AEV_GetVolumeRange(IAudioEndpointVolumeEx *iface, float *mindb, float *maxdb, float *inc) { TRACE("(%p)->(%p,%p,%p)\n", iface, mindb, maxdb, inc); + if (!mindb || !maxdb || !inc) return E_POINTER; - FIXME("stub\n"); - return E_NOTIMPL; + + *mindb = -100.f; + *maxdb = 0.f; + *inc = 1.f; + + return S_OK; } static HRESULT WINAPI AEV_GetVolumeRangeChannel(IAudioEndpointVolumeEx *iface, UINT chan, float *mindb, float *maxdb, float *inc) @@ -273,17 +278,17 @@ static const IAudioEndpointVolumeExVtbl AEVImpl_Vtbl = { AEV_GetVolumeRangeChannel }; -HRESULT AudioEndpointVolume_Create(MMDevice *parent, IAudioEndpointVolume **ppv) +HRESULT AudioEndpointVolume_Create(MMDevice *parent, IAudioEndpointVolumeEx **ppv) { AEVImpl *This; *ppv = NULL; - This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); + This = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*This)); if (!This) return E_OUTOFMEMORY; This->IAudioEndpointVolumeEx_iface.lpVtbl = &AEVImpl_Vtbl; This->ref = 1; - *ppv = (IAudioEndpointVolume*)&This->IAudioEndpointVolumeEx_iface; + *ppv = &This->IAudioEndpointVolumeEx_iface; return S_OK; } diff --git a/dlls/mmdevapi/devenum.c b/dlls/mmdevapi/devenum.c index e63a199..1694bee 100644 --- a/dlls/mmdevapi/devenum.c +++ b/dlls/mmdevapi/devenum.c @@ -595,8 +595,9 @@ static HRESULT WINAPI MMDevice_Activate(IMMDevice *iface, REFIID riid, DWORD cls if (IsEqualIID(riid, &IID_IAudioClient)){ hr = drvs.pGetAudioEndpoint(&This->devguid, iface, (IAudioClient**)ppv); - }else if (IsEqualIID(riid, &IID_IAudioEndpointVolume)) - hr = AudioEndpointVolume_Create(This, (IAudioEndpointVolume**)ppv); + }else if (IsEqualIID(riid, &IID_IAudioEndpointVolume) || + IsEqualIID(riid, &IID_IAudioEndpointVolumeEx)) + hr = AudioEndpointVolume_Create(This, (IAudioEndpointVolumeEx**)ppv); else if (IsEqualIID(riid, &IID_IAudioSessionManager) || IsEqualIID(riid, &IID_IAudioSessionManager2)) { diff --git a/dlls/mmdevapi/mmdevapi.h b/dlls/mmdevapi/mmdevapi.h index 2b40a05..b85c757 100644 --- a/dlls/mmdevapi/mmdevapi.h +++ b/dlls/mmdevapi/mmdevapi.h @@ -74,6 +74,6 @@ typedef struct MMDevice { } MMDevice; extern HRESULT AudioClient_Create(MMDevice *parent, IAudioClient **ppv) DECLSPEC_HIDDEN; -extern HRESULT AudioEndpointVolume_Create(MMDevice *parent, IAudioEndpointVolume **ppv) DECLSPEC_HIDDEN; +extern HRESULT AudioEndpointVolume_Create(MMDevice *parent, IAudioEndpointVolumeEx **ppv) DECLSPEC_HIDDEN; extern const WCHAR drv_keyW[] DECLSPEC_HIDDEN; diff --git a/dlls/mmdevapi/tests/mmdevenum.c b/dlls/mmdevapi/tests/mmdevenum.c index 12e2156..4f8c848 100644 --- a/dlls/mmdevapi/tests/mmdevenum.c +++ b/dlls/mmdevapi/tests/mmdevenum.c @@ -21,6 +21,7 @@ #define COBJMACROS #include "initguid.h" +#include "endpointvolume.h" #include "mmdeviceapi.h" #include "audioclient.h" #include "audiopolicy.h" diff --git a/dlls/mmdevapi/tests/render.c b/dlls/mmdevapi/tests/render.c index 298c886..1476adc 100644 --- a/dlls/mmdevapi/tests/render.c +++ b/dlls/mmdevapi/tests/render.c @@ -39,6 +39,7 @@ #include "mmsystem.h" #include "audioclient.h" #include "audiopolicy.h" +#include "endpointvolume.h" static const unsigned int win_formats[][4] = { { 8000, 8, 1}, { 8000, 8, 2}, { 8000, 16, 1}, { 8000, 16, 2}, @@ -2242,6 +2243,28 @@ static void test_marshal(void) } +static void test_endpointvolume(void) +{ + HRESULT hr; + IAudioEndpointVolume *aev; + float mindb, maxdb, increment; + + hr = IMMDevice_Activate(dev, &IID_IAudioEndpointVolume, + CLSCTX_INPROC_SERVER, NULL, (void**)&aev); + ok(hr == S_OK, "Activation failed with %08x\n", hr); + if(hr != S_OK) + return; + + hr = IAudioEndpointVolume_GetVolumeRange(aev, &mindb, NULL, NULL); + ok(hr == E_POINTER, "GetVolumeRange should have failed with E_POINTER: 0x%08x\n", hr); + + hr = IAudioEndpointVolume_GetVolumeRange(aev, &mindb, &maxdb, &increment); + ok(hr == S_OK, "GetVolumeRange failed: 0x%08x\n", hr); + trace("got range: [%f,%f]/%f\n", mindb, maxdb, increment); + + IAudioEndpointVolume_Release(aev); +} + START_TEST(render) { HRESULT hr; @@ -2283,6 +2306,7 @@ START_TEST(render) test_volume_dependence(); test_session_creation(); test_worst_case(); + test_endpointvolume(); IMMDevice_Release(dev);

1 0

Henri Verbeet : wined3d: Properly handle discarded surfaces in surface_load_location().
by Alexandre Julliard March 11, 2016

March 11, 2016

Module: wine Branch: master Commit: a80a4c10d36008429fcf3a52deede91645a00a49 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a80a4c10d36008429fcf3a52d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 9 16:21:56 2016 +0100 wined3d: Properly handle discarded surfaces in surface_load_location(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 90 ++++++++++++++++++++------------------------------ 1 file changed, 35 insertions(+), 55 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index e375618..13aae6d 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3237,13 +3237,6 @@ static void surface_load_ds_location(struct wined3d_surface *surface, struct win h = surface->resource.height; } - if (surface->ds_current_size.cx == surface->resource.width - && surface->ds_current_size.cy == surface->resource.height) - { - TRACE("Location (%#x) is already up to date.\n", location); - return; - } - if (surface->current_renderbuffer) { FIXME("Not supported with fixed up depth stencil.\n"); @@ -3251,24 +3244,6 @@ static void surface_load_ds_location(struct wined3d_surface *surface, struct win } wined3d_surface_prepare(surface, context, location); - if (surface->locations & WINED3D_LOCATION_DISCARDED) - { - TRACE("Surface was discarded, no need copy data.\n"); - surface->locations &= ~WINED3D_LOCATION_DISCARDED; - surface->locations |= location; - surface->ds_current_size.cx = surface->resource.width; - surface->ds_current_size.cy = surface->resource.height; - return; - } - - if (!surface->locations) - { - FIXME("No up to date depth stencil location.\n"); - surface->locations |= location; - surface->ds_current_size.cx = surface->resource.width; - surface->ds_current_size.cy = surface->resource.height; - return; - } if (location == WINED3D_LOCATION_TEXTURE_RGB) { @@ -3351,10 +3326,6 @@ static void surface_load_ds_location(struct wined3d_surface *surface, struct win { ERR("Invalid location (%#x) specified.\n", location); } - - surface->locations |= location; - surface->ds_current_size.cx = surface->resource.width; - surface->ds_current_size.cy = surface->resource.height; } void surface_validate_location(struct wined3d_surface *surface, DWORD location) @@ -3687,33 +3658,11 @@ HRESULT surface_load_location(struct wined3d_surface *surface, struct wined3d_co TRACE("surface %p, location %s.\n", surface, wined3d_debug_location(location)); - if (surface->resource.usage & WINED3DUSAGE_DEPTHSTENCIL) + if (surface->locations & location && (!(surface->resource.usage & WINED3DUSAGE_DEPTHSTENCIL) + || (surface->ds_current_size.cx == surface->resource.width + && surface->ds_current_size.cy == surface->resource.height))) { - if ((location == WINED3D_LOCATION_TEXTURE_RGB - && surface->locations & (WINED3D_LOCATION_DRAWABLE | WINED3D_LOCATION_DISCARDED)) - || (location == WINED3D_LOCATION_DRAWABLE - && surface->locations & (WINED3D_LOCATION_TEXTURE_RGB | WINED3D_LOCATION_DISCARDED))) - { - surface_load_ds_location(surface, context, location); - return WINED3D_OK; - } - else if (location & surface->locations - && surface->container->resource.draw_binding != WINED3D_LOCATION_DRAWABLE) - { - /* Already up to date, nothing to do. */ - return WINED3D_OK; - } - else - { - FIXME("Unimplemented copy from %s to %s for depth/stencil buffers.\n", - wined3d_debug_location(surface->locations), wined3d_debug_location(location)); - return WINED3DERR_INVALIDCALL; - } - } - - if (surface->locations & location) - { - TRACE("Location already up to date.\n"); + TRACE("Location (%#x) is already up to date.\n", location); return WINED3D_OK; } @@ -3725,9 +3674,33 @@ HRESULT surface_load_location(struct wined3d_surface *surface, struct wined3d_co required_access, surface->resource.access_flags); } + if (surface->locations & WINED3D_LOCATION_DISCARDED) + { + TRACE("Surface previously discarded, nothing to do.\n"); + wined3d_surface_prepare(surface, context, location); + surface_validate_location(surface, location); + surface_invalidate_location(surface, WINED3D_LOCATION_DISCARDED); + goto done; + } + if (!surface->locations) { ERR("Surface %p does not have any up to date location.\n", surface); + surface_validate_location(surface, WINED3D_LOCATION_DISCARDED); + return surface_load_location(surface, context, location); + } + + if (surface->resource.usage & WINED3DUSAGE_DEPTHSTENCIL) + { + if ((location == WINED3D_LOCATION_TEXTURE_RGB && surface->locations & WINED3D_LOCATION_DRAWABLE) + || (location == WINED3D_LOCATION_DRAWABLE && surface->locations & WINED3D_LOCATION_TEXTURE_RGB)) + { + surface_load_ds_location(surface, context, location); + goto done; + } + + FIXME("Unimplemented copy from %s to %s for depth/stencil buffers.\n", + wined3d_debug_location(surface->locations), wined3d_debug_location(location)); return WINED3DERR_INVALIDCALL; } @@ -3762,8 +3735,15 @@ HRESULT surface_load_location(struct wined3d_surface *surface, struct wined3d_co break; } +done: surface_validate_location(surface, location); + if (surface->resource.usage & WINED3DUSAGE_DEPTHSTENCIL) + { + surface->ds_current_size.cx = surface->resource.width; + surface->ds_current_size.cy = surface->resource.height; + } + if (location != WINED3D_LOCATION_SYSMEM && (surface->locations & WINED3D_LOCATION_SYSMEM)) surface_evict_sysmem(surface);

1 0

Józef Kucia : wined3d: Simplify shader_glsl_append_imm_ivec().
by Alexandre Julliard March 11, 2016

March 11, 2016

Module: wine Branch: master Commit: e09aa6fc9420ef3f2c311d6fa43fd0e685177856 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e09aa6fc9420ef3f2c311d6fa… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Mar 10 07:41:46 2016 +0100 wined3d: Simplify shader_glsl_append_imm_ivec(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 85244c8..2970a95 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -323,26 +323,22 @@ static void shader_glsl_append_imm_vec4(struct wined3d_string_buffer *buffer, co static void shader_glsl_append_imm_ivec(struct wined3d_string_buffer *buffer, const int *values, unsigned int size) { - const char *fmt = "%#x"; - char str[4][17] = {{0}}; int i; - if (1 > size || size > 4) + if (!size || size > 4) { ERR("Invalid vector size %u.\n", size); return; } - for (i = size - 1; i >= 0; --i) - { - sprintf(str[i], fmt, values[i]); - fmt = "%#x, "; - } + if (size > 1) + shader_addline(buffer, "ivec%u(", size); + + for (i = 0; i < size; ++i) + shader_addline(buffer, i ? ", %#x" : "%#x", values[i]); if (size > 1) - shader_addline(buffer, "ivec%u(%s%s%s%s)", size, str[0], str[1], str[2], str[3]); - else - shader_addline(buffer, str[0]); + shader_addline(buffer, ")"); } static const char *get_info_log_line(const char **ptr)

1 0

Henri Verbeet : wined3d: Introduce helpers functions to calculate texture level dimensions.
by Alexandre Julliard March 11, 2016

March 11, 2016

Module: wine Branch: master Commit: 06b5114342deed6a28d8258e75ca102cd1f4ce1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=06b5114342deed6a28d8258e7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 9 16:21:54 2016 +0100 wined3d: Introduce helpers functions to calculate texture level dimensions. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 14 +++++++------- dlls/wined3d/wined3d_private.h | 18 ++++++++++++++++++ 2 files changed, 25 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 3ac6f43..d0f1f91 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -532,8 +532,8 @@ void CDECL wined3d_texture_get_pitch(const struct wined3d_texture *texture, unsigned int level, unsigned int *row_pitch, unsigned int *slice_pitch) { const struct wined3d_resource *resource = &texture->resource; - unsigned int width = max(1, texture->resource.width >> level); - unsigned int height = max(1, texture->resource.height >> level); + unsigned int width = wined3d_texture_get_level_width(texture, level); + unsigned int height = wined3d_texture_get_level_height(texture, level); if (texture->row_pitch) { @@ -1322,8 +1322,8 @@ BOOL wined3d_texture_check_block_align(const struct wined3d_texture *texture, unsigned int level, const struct wined3d_box *box) { const struct wined3d_format *format = texture->resource.format; - unsigned int height = max(1, texture->resource.height >> level); - unsigned int width = max(1, texture->resource.width >> level); + unsigned int height = wined3d_texture_get_level_height(texture, level); + unsigned int width = wined3d_texture_get_level_width(texture, level); unsigned int width_mask, height_mask; if ((box->left >= box->right) @@ -1709,9 +1709,9 @@ HRESULT CDECL wined3d_texture_get_sub_resource_desc(const struct wined3d_texture desc->pool = resource->pool; level_idx = sub_resource_idx % texture->level_count; - desc->width = max(1, resource->width >> level_idx); - desc->height = max(1, resource->height >> level_idx); - desc->depth = max(1, resource->depth >> level_idx); + desc->width = wined3d_texture_get_level_width(texture, level_idx); + desc->height = wined3d_texture_get_level_height(texture, level_idx); + desc->depth = wined3d_texture_get_level_depth(texture, level_idx); desc->size = texture->sub_resources[sub_resource_idx].resource->size; return WINED3D_OK; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 64a4d88..57e6e3f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2414,6 +2414,24 @@ static inline struct gl_texture *wined3d_texture_get_gl_texture(struct wined3d_t return srgb ? &texture->texture_srgb : &texture->texture_rgb; } +static inline unsigned int wined3d_texture_get_level_width(const struct wined3d_texture *texture, + unsigned int level) +{ + return max(1, texture->resource.width >> level); +} + +static inline unsigned int wined3d_texture_get_level_height(const struct wined3d_texture *texture, + unsigned int level) +{ + return max(1, texture->resource.height >> level); +} + +static inline unsigned int wined3d_texture_get_level_depth(const struct wined3d_texture *texture, + unsigned int level) +{ + return max(1, texture->resource.depth >> level); +} + void wined3d_texture_apply_sampler_desc(struct wined3d_texture *texture, const struct wined3d_sampler_desc *sampler_desc, const struct wined3d_context *context) DECLSPEC_HIDDEN; void wined3d_texture_bind(struct wined3d_texture *texture,

1 0

Henri Verbeet : wined3d: Keep track of the download count in the texture.
by Alexandre Julliard March 11, 2016

March 11, 2016

Module: wine Branch: master Commit: bc24fbf6d64d23b1ab0961de3d5bb86a53cb3d79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc24fbf6d64d23b1ab0961de3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 9 16:21:53 2016 +0100 wined3d: Keep track of the download count in the texture. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 35 +++++++++-------------------------- dlls/wined3d/volume.c | 10 ++++++---- dlls/wined3d/wined3d_private.h | 6 ++---- 3 files changed, 17 insertions(+), 34 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 1bdeecf..487fd3f 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -507,11 +507,10 @@ static void surface_prepare_system_memory(struct wined3d_surface *surface) static void surface_evict_sysmem(struct wined3d_surface *surface) { - /* In some conditions the surface memory must not be freed: - * WINED3D_TEXTURE_CONVERTED: Converting the data back would take too long - * WINED3D_TEXTURE_DYNAMIC_MAP: Avoid freeing the data for performance */ - if (surface->resource.map_count || surface->container->flags & (WINED3D_TEXTURE_CONVERTED - | WINED3D_TEXTURE_PIN_SYSMEM | WINED3D_TEXTURE_DYNAMIC_MAP)) + struct wined3d_texture *texture = surface->container; + + if (surface->resource.map_count || texture->download_count > MAXLOCKCOUNT + || texture->flags & (WINED3D_TEXTURE_CONVERTED | WINED3D_TEXTURE_PIN_SYSMEM)) return; wined3d_resource_free_sysmem(&surface->resource); @@ -1259,11 +1258,7 @@ static void surface_download_data(struct wined3d_surface *surface, const struct * standard texture with a non-power2 width instead of a texture boxed up to be a power2 texture. * * internally the texture is still stored in a boxed format so any references to textureName will - * get a boxed texture with width pow2width and not a texture of width resource.width. - * - * Performance should not be an issue, because applications normally do not lock the surfaces when - * rendering. If an app does, the WINED3D_TEXTURE_DYNAMIC_MAP flag will kick in and the memory copy - * won't be released, and doesn't have to be re-read. */ + * get a boxed texture with width pow2width and not a texture of width resource.width. */ src_data = mem; dst_data = data.addr; TRACE("Repacking the surface data from pitch %u to pitch %u.\n", src_row_pitch, dst_row_pitch); @@ -2169,21 +2164,6 @@ HRESULT wined3d_surface_map(struct wined3d_surface *surface, struct wined3d_map_ if (!(surface->resource.access_flags & WINED3D_RESOURCE_ACCESS_CPU)) WARN("Trying to lock unlockable surface.\n"); - /* Performance optimization: Count how often a surface is mapped, if it is - * mapped regularly do not throw away the system memory copy. This avoids - * the need to download the surface from OpenGL all the time. The surface - * is still downloaded if the OpenGL texture is changed. Note that this - * only really makes sense for managed textures.*/ - if (!(texture->flags & WINED3D_TEXTURE_DYNAMIC_MAP) - && surface->resource.map_binding == WINED3D_LOCATION_SYSMEM) - { - if (++surface->lockCount > MAXLOCKCOUNT) - { - TRACE("Surface is mapped regularly, not freeing the system memory copy any more.\n"); - texture->flags |= WINED3D_TEXTURE_DYNAMIC_MAP; - } - } - flags = wined3d_resource_sanitize_map_flags(&texture->resource, flags); if (device->d3d_initialized) @@ -3475,9 +3455,12 @@ static void surface_load_sysmem(struct wined3d_surface *surface, /* Download the surface to system memory. */ if (surface->locations & (WINED3D_LOCATION_TEXTURE_RGB | WINED3D_LOCATION_TEXTURE_SRGB)) { - wined3d_texture_bind_and_dirtify(surface->container, context, + struct wined3d_texture *texture = surface->container; + + wined3d_texture_bind_and_dirtify(texture, context, !(surface->locations & WINED3D_LOCATION_TEXTURE_RGB)); surface_download_data(surface, gl_info, dst_location); + ++texture->download_count; return; } diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index f70b50b..6eb7622 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -234,11 +234,13 @@ static void wined3d_volume_srgb_transfer(struct wined3d_volume *volume, static BOOL wined3d_volume_can_evict(const struct wined3d_volume *volume) { - if (volume->resource.pool != WINED3D_POOL_MANAGED) + struct wined3d_texture *texture = volume->container; + + if (texture->resource.pool != WINED3D_POOL_MANAGED) return FALSE; - if (volume->download_count >= 10) + if (texture->download_count >= 10) return FALSE; - if (volume->resource.format->convert) + if (texture->resource.format->convert) return FALSE; return TRUE; @@ -324,8 +326,8 @@ static BOOL wined3d_volume_load_location(struct wined3d_volume *volume, else wined3d_texture_bind_and_dirtify(texture, context, TRUE); - volume->download_count++; wined3d_volume_download_data(volume, context, &data); + ++texture->download_count; } else { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 61cc3a3..64a4d88 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2352,8 +2352,7 @@ struct wined3d_texture_ops #define WINED3D_TEXTURE_SRGB_VALID 0x00000080 #define WINED3D_TEXTURE_CONVERTED 0x00000100 #define WINED3D_TEXTURE_PIN_SYSMEM 0x00000200 -#define WINED3D_TEXTURE_DYNAMIC_MAP 0x00000400 -#define WINED3D_TEXTURE_NORMALIZED_COORDS 0x00000800 +#define WINED3D_TEXTURE_NORMALIZED_COORDS 0x00000400 #define WINED3D_TEXTURE_ASYNC_COLOR_KEY 0x00000001 @@ -2365,6 +2364,7 @@ struct wined3d_texture struct wined3d_swapchain *swapchain; UINT layer_count; UINT level_count; + unsigned int download_count; float pow2_matrix[16]; UINT lod; enum wined3d_texture_filter_type filter_type; @@ -2457,7 +2457,6 @@ struct wined3d_volume DWORD locations; GLint texture_level; - DWORD download_count; }; static inline struct wined3d_volume *volume_from_resource(struct wined3d_resource *resource) @@ -2537,7 +2536,6 @@ struct wined3d_surface GLenum texture_target; unsigned int texture_level; unsigned int texture_layer; - int lockCount; /* For GetDC */ struct wined3d_surface_dib dib;

1 0

Henri Verbeet : wined3d: Don't call surface_load_ds_location() directly.
by Alexandre Julliard March 11, 2016

March 11, 2016

Module: wine Branch: master Commit: de8e151f6d97211d09abf3676758dd6885bbc63b URL: http://source.winehq.org/git/wine.git/?a=commit;h=de8e151f6d97211d09abf3676… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 9 16:21:55 2016 +0100 wined3d: Don't call surface_load_ds_location() directly. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 4 ++-- dlls/wined3d/drawprim.c | 2 +- dlls/wined3d/surface.c | 6 ++++-- dlls/wined3d/wined3d_private.h | 2 -- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index ff16c9d..d032184 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -203,7 +203,7 @@ void device_switch_onscreen_ds(struct wined3d_device *device, { if (device->onscreen_depth_stencil) { - surface_load_ds_location(device->onscreen_depth_stencil, context, WINED3D_LOCATION_TEXTURE_RGB); + surface_load_location(device->onscreen_depth_stencil, context, WINED3D_LOCATION_TEXTURE_RGB); surface_modify_ds_location(device->onscreen_depth_stencil, WINED3D_LOCATION_TEXTURE_RGB, device->onscreen_depth_stencil->ds_current_size.cx, @@ -280,7 +280,7 @@ static void prepare_ds_clear(struct wined3d_surface *ds, struct wined3d_context } /* Full load. */ - surface_load_ds_location(ds, context, location); + surface_load_location(ds, context, location); SetRect(out_rect, 0, 0, ds->ds_current_size.cx, ds->ds_current_size.cy); } diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 8941761..4771898 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -661,7 +661,7 @@ void draw_primitive(struct wined3d_device *device, UINT start_idx, UINT index_co IntersectRect(&r, &draw_rect, &current_rect); if (!EqualRect(&r, &draw_rect)) - surface_load_ds_location(ds, context, location); + surface_load_location(ds, context, location); else wined3d_surface_prepare(ds, context, location); } diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 487fd3f..e375618 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3213,7 +3213,7 @@ void surface_modify_ds_location(struct wined3d_surface *surface, } /* Context activation is done by the caller. */ -void surface_load_ds_location(struct wined3d_surface *surface, struct wined3d_context *context, DWORD location) +static void surface_load_ds_location(struct wined3d_surface *surface, struct wined3d_context *context, DWORD location) { const struct wined3d_gl_info *gl_info = context->gl_info; struct wined3d_device *device = surface->resource.device; @@ -3689,8 +3689,10 @@ HRESULT surface_load_location(struct wined3d_surface *surface, struct wined3d_co if (surface->resource.usage & WINED3DUSAGE_DEPTHSTENCIL) { - if (location == WINED3D_LOCATION_TEXTURE_RGB + if ((location == WINED3D_LOCATION_TEXTURE_RGB && surface->locations & (WINED3D_LOCATION_DRAWABLE | WINED3D_LOCATION_DISCARDED)) + || (location == WINED3D_LOCATION_DRAWABLE + && surface->locations & (WINED3D_LOCATION_TEXTURE_RGB | WINED3D_LOCATION_DISCARDED))) { surface_load_ds_location(surface, context, location); return WINED3D_OK; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 57e6e3f..ecd37a0 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2604,8 +2604,6 @@ HRESULT wined3d_surface_init(struct wined3d_surface *surface, GLenum target, unsigned int level, unsigned int layer, DWORD flags) DECLSPEC_HIDDEN; void surface_invalidate_location(struct wined3d_surface *surface, DWORD location) DECLSPEC_HIDDEN; void surface_load(struct wined3d_surface *surface, struct wined3d_context *context, BOOL srgb) DECLSPEC_HIDDEN; -void surface_load_ds_location(struct wined3d_surface *surface, - struct wined3d_context *context, DWORD location) DECLSPEC_HIDDEN; void surface_load_fb_texture(struct wined3d_surface *surface, BOOL srgb, struct wined3d_context *context) DECLSPEC_HIDDEN; HRESULT surface_load_location(struct wined3d_surface *surface,

1 0

Huw Davies : gdi32: Don' t update the bounds if any poly{line|gon} has fewer than two points.
by Alexandre Julliard March 9, 2016

March 9, 2016

Module: wine Branch: master Commit: 6e05189ba44d2e06bd49f4bced386a1e8d05a378 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e05189ba44d2e06bd49f4bce… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Mar 9 11:17:04 2016 +0000 gdi32: Don't update the bounds if any poly{line|gon} has fewer than two points. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/enhmfdrv/graphics.c | 33 +++++++++++++++++++++++---------- 1 file changed, 23 insertions(+), 10 deletions(-) diff --git a/dlls/gdi32/enhmfdrv/graphics.c b/dlls/gdi32/enhmfdrv/graphics.c index 83f822a..d3b3325 100644 --- a/dlls/gdi32/enhmfdrv/graphics.c +++ b/dlls/gdi32/enhmfdrv/graphics.c @@ -484,28 +484,33 @@ EMFDRV_PolyPolylinegon( PHYSDEV dev, const POINT* pt, const INT* counts, UINT po EMRPOLYPOLYLINE *emr; DWORD cptl = 0, poly, size, i; INT point; - RECTL bounds; + const RECTL empty = {0, 0, -1, -1}; + RECTL bounds = empty; const POINT *pts; - BOOL ret, use_small_emr = TRUE; - - bounds.left = bounds.right = pt[0].x; - bounds.top = bounds.bottom = pt[0].y; + BOOL ret, use_small_emr = TRUE, bounds_valid = TRUE; pts = pt; for(poly = 0; poly < polys; poly++) { cptl += counts[poly]; + if(counts[poly] < 2) bounds_valid = FALSE; for(point = 0; point < counts[poly]; point++) { /* check whether all points fit in the SHORT int POINT structure */ if( ((pts->x+0x8000) & ~0xffff ) || ((pts->y+0x8000) & ~0xffff ) ) use_small_emr = FALSE; - if(bounds.left > pts->x) bounds.left = pts->x; - else if(bounds.right < pts->x) bounds.right = pts->x; - if(bounds.top > pts->y) bounds.top = pts->y; - else if(bounds.bottom < pts->y) bounds.bottom = pts->y; + if(pts == pt) { + bounds.left = bounds.right = pts->x; + bounds.top = bounds.bottom = pts->y; + } else { + if(bounds.left > pts->x) bounds.left = pts->x; + else if(bounds.right < pts->x) bounds.right = pts->x; + if(bounds.top > pts->y) bounds.top = pts->y; + else if(bounds.bottom < pts->y) bounds.bottom = pts->y; + } pts++; } } + if(!cptl) bounds_valid = FALSE; size = FIELD_OFFSET(EMRPOLYPOLYLINE, aPolyCounts[polys]); if(use_small_emr) @@ -519,7 +524,10 @@ EMFDRV_PolyPolylinegon( PHYSDEV dev, const POINT* pt, const INT* counts, UINT po if(use_small_emr) emr->emr.iType += EMR_POLYPOLYLINE16 - EMR_POLYPOLYLINE; emr->emr.nSize = size; - emr->rclBounds = bounds; + if(bounds_valid) + emr->rclBounds = bounds; + else + emr->rclBounds = empty; emr->nPolys = polys; emr->cptl = cptl; @@ -543,6 +551,11 @@ EMFDRV_PolyPolylinegon( PHYSDEV dev, const POINT* pt, const INT* counts, UINT po } ret = EMFDRV_WriteRecord( dev, &emr->emr ); + if(ret && !bounds_valid) + { + ret = FALSE; + SetLastError( ERROR_INVALID_PARAMETER ); + } if(ret) EMFDRV_UpdateBBox( dev, &emr->rclBounds ); HeapFree( GetProcessHeap(), 0, emr );

1 0

Huw Davies : gdi32: Generate EMR_POLYPOLY{LINE|GON}16 records if the co-ords fit.
by Alexandre Julliard March 9, 2016

March 9, 2016

Module: wine Branch: master Commit: 2e4a37f2cf16bdb4b7e958046eb498d3fc18e83e URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e4a37f2cf16bdb4b7e958046… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Mar 9 11:17:03 2016 +0000 gdi32: Generate EMR_POLYPOLY{LINE|GON}16 records if the co-ords fit. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/enhmfdrv/graphics.c | 39 +++++++++++++++++++++++++++++++++------ 1 file changed, 33 insertions(+), 6 deletions(-) diff --git a/dlls/gdi32/enhmfdrv/graphics.c b/dlls/gdi32/enhmfdrv/graphics.c index cf44e9c..83f822a 100644 --- a/dlls/gdi32/enhmfdrv/graphics.c +++ b/dlls/gdi32/enhmfdrv/graphics.c @@ -482,11 +482,11 @@ EMFDRV_PolyPolylinegon( PHYSDEV dev, const POINT* pt, const INT* counts, UINT po DWORD iType) { EMRPOLYPOLYLINE *emr; - DWORD cptl = 0, poly, size; + DWORD cptl = 0, poly, size, i; INT point; RECTL bounds; const POINT *pts; - BOOL ret; + BOOL ret, use_small_emr = TRUE; bounds.left = bounds.right = pt[0].x; bounds.top = bounds.bottom = pt[0].y; @@ -495,6 +495,10 @@ EMFDRV_PolyPolylinegon( PHYSDEV dev, const POINT* pt, const INT* counts, UINT po for(poly = 0; poly < polys; poly++) { cptl += counts[poly]; for(point = 0; point < counts[poly]; point++) { + /* check whether all points fit in the SHORT int POINT structure */ + if( ((pts->x+0x8000) & ~0xffff ) || + ((pts->y+0x8000) & ~0xffff ) ) + use_small_emr = FALSE; if(bounds.left > pts->x) bounds.left = pts->x; else if(bounds.right < pts->x) bounds.right = pts->x; if(bounds.top > pts->y) bounds.top = pts->y; @@ -503,18 +507,41 @@ EMFDRV_PolyPolylinegon( PHYSDEV dev, const POINT* pt, const INT* counts, UINT po } } - size = sizeof(EMRPOLYPOLYLINE) + (polys - 1) * sizeof(DWORD) + - (cptl - 1) * sizeof(POINTL); + size = FIELD_OFFSET(EMRPOLYPOLYLINE, aPolyCounts[polys]); + if(use_small_emr) + size += cptl * sizeof(POINTS); + else + size += cptl * sizeof(POINTL); emr = HeapAlloc( GetProcessHeap(), 0, size ); emr->emr.iType = iType; + if(use_small_emr) emr->emr.iType += EMR_POLYPOLYLINE16 - EMR_POLYPOLYLINE; + emr->emr.nSize = size; emr->rclBounds = bounds; emr->nPolys = polys; emr->cptl = cptl; - memcpy(emr->aPolyCounts, counts, polys * sizeof(DWORD)); - memcpy(emr->aPolyCounts + polys, pt, cptl * sizeof(POINTL)); + + if(polys) + { + memcpy( emr->aPolyCounts, counts, polys * sizeof(DWORD) ); + if(cptl) + { + if(use_small_emr) + { + POINTS *out_pts = (POINTS *)(emr->aPolyCounts + polys); + for(i = 0; i < cptl; i++ ) + { + out_pts[i].x = pt[i].x; + out_pts[i].y = pt[i].y; + } + } + else + memcpy( emr->aPolyCounts + polys, pt, cptl * sizeof(POINTL) ); + } + } + ret = EMFDRV_WriteRecord( dev, &emr->emr ); if(ret) EMFDRV_UpdateBBox( dev, &emr->rclBounds );

1 0

Matteo Bruni : d3d11/tests: Require feature level 11_0 or 10_0 by default.
by Alexandre Julliard March 9, 2016

March 9, 2016

Module: wine Branch: master Commit: 9da6dd2ac93c97bc6f8cd60f26f20f632b8d8ce0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9da6dd2ac93c97bc6f8cd60f2… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Mar 8 23:19:41 2016 +0100 d3d11/tests: Require feature level 11_0 or 10_0 by default. Otherwise D3D11CreateDevice() might fallback to feature level 9 and the current tests can't handle (nor are interested in) that. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 9d9b2e4..9d6add5 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -187,8 +187,23 @@ static void check_texture_color_(unsigned int line, ID3D11Texture2D *texture, static ID3D11Device *create_device(const D3D_FEATURE_LEVEL *feature_level) { + static const D3D_FEATURE_LEVEL default_feature_level[] = + { + D3D_FEATURE_LEVEL_11_0, + D3D_FEATURE_LEVEL_10_0, + }; + unsigned int feature_level_count; ID3D11Device *device; - UINT feature_level_count = feature_level ? 1 : 0; + + if (feature_level) + { + feature_level_count = 1; + } + else + { + feature_level = default_feature_level; + feature_level_count = sizeof(default_feature_level) / sizeof(default_feature_level[0]); + } if (SUCCEEDED(D3D11CreateDevice(NULL, D3D_DRIVER_TYPE_HARDWARE, NULL, 0, feature_level, feature_level_count, D3D11_SDK_VERSION, &device, NULL, NULL)))

1 0