February 2016 - Wine-Commits

Józef Kucia : dxgi: Return S_OK in dxgi_factory_MakeWindowAssociation() stub.
by Alexandre Julliard Feb. 12, 2016

Feb. 12, 2016

Module: wine Branch: master Commit: a36ae03c9fab07b019117bdfda228d0637209b40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a36ae03c9fab07b019117bdfd… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Feb 12 01:27:42 2016 +0100 dxgi: Return S_OK in dxgi_factory_MakeWindowAssociation() stub. 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/dxgi/factory.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dxgi/factory.c b/dlls/dxgi/factory.c index 5da45f3..5956e62 100644 --- a/dlls/dxgi/factory.c +++ b/dlls/dxgi/factory.c @@ -165,7 +165,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_factory_MakeWindowAssociation(IDXGIFactory { FIXME("iface %p, window %p, flags %#x stub!\n", iface, window, flags); - return E_NOTIMPL; + return S_OK; } static HRESULT STDMETHODCALLTYPE dxgi_factory_GetWindowAssociation(IDXGIFactory1 *iface, HWND *window)

1 0

Matteo Bruni : d3d8: Make CheckDeviceType() fail for display formats other than D3DFMT_X8R8G8B8 and D3DFMT_R5G6B5 in full-screen.
by Alexandre Julliard Feb. 12, 2016

Feb. 12, 2016

Module: wine Branch: master Commit: 49a7dc8a16b7e20fb361c8fcff0f5f1efc442902 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49a7dc8a16b7e20fb361c8fcf… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Feb 11 16:10:45 2016 +0100 d3d8: Make CheckDeviceType() fail for display formats other than D3DFMT_X8R8G8B8 and D3DFMT_R5G6B5 in full-screen. 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/d3d8/directx.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/d3d8/directx.c b/dlls/d3d8/directx.c index 7388bf3..863e596 100644 --- a/dlls/d3d8/directx.c +++ b/dlls/d3d8/directx.c @@ -220,6 +220,9 @@ static HRESULT WINAPI d3d8_CheckDeviceType(IDirect3D8 *iface, UINT adapter, D3DD TRACE("iface %p, adapter %u, device_type %#x, display_format %#x, backbuffer_format %#x, windowed %#x.\n", iface, adapter, device_type, display_format, backbuffer_format, windowed); + if (!windowed && display_format != D3DFMT_X8R8G8B8 && display_format != D3DFMT_R5G6B5) + return WINED3DERR_NOTAVAILABLE; + wined3d_mutex_lock(); hr = wined3d_check_device_type(d3d8->wined3d, adapter, device_type, wined3dformat_from_d3dformat(display_format), wined3dformat_from_d3dformat(backbuffer_format), windowed);

1 0

Henri Verbeet : wined3d: Ignore wined3d_sampler_desc.srgb_decode if WINED3D_SRGB_READ_WRITE_CONTROL is not set.
by Alexandre Julliard Feb. 12, 2016

Feb. 12, 2016

Module: wine Branch: master Commit: 553149a049ec194bece863477a92e8efa115791c URL: http://source.winehq.org/git/wine.git/?a=commit;h=553149a049ec194bece863477… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 12 11:06:09 2016 +0100 wined3d: Ignore wined3d_sampler_desc.srgb_decode if WINED3D_SRGB_READ_WRITE_CONTROL is not set. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/sampler.c | 3 ++- dlls/wined3d/state.c | 5 ++--- dlls/wined3d/texture.c | 10 ++++++---- dlls/wined3d/wined3d_private.h | 2 +- 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/sampler.c b/dlls/wined3d/sampler.c index ffa1155..865198b 100644 --- a/dlls/wined3d/sampler.c +++ b/dlls/wined3d/sampler.c @@ -96,7 +96,8 @@ static void wined3d_sampler_init(struct wined3d_sampler *sampler, struct wined3d GL_EXTCALL(glSamplerParameteri(sampler->name, GL_TEXTURE_COMPARE_MODE, GL_COMPARE_R_TO_TEXTURE)); GL_EXTCALL(glSamplerParameteri(sampler->name, GL_TEXTURE_COMPARE_FUNC, wined3d_gl_compare_func(desc->comparison_func))); - if (gl_info->supported[EXT_TEXTURE_SRGB_DECODE] && !desc->srgb_decode) + if ((context->d3d_info->wined3d_creation_flags & WINED3D_SRGB_READ_WRITE_CONTROL) + && gl_info->supported[EXT_TEXTURE_SRGB_DECODE] && !desc->srgb_decode) GL_EXTCALL(glSamplerParameteri(sampler->name, GL_TEXTURE_SRGB_DECODE_EXT, GL_SKIP_DECODE_EXT)); checkGLcall("sampler creation"); diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 903f0d4..58d2fed 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3513,8 +3513,7 @@ static void wined3d_sampler_desc_from_sampler_states(struct wined3d_sampler_desc desc->max_anisotropy = 1; desc->compare = texture->resource.format_flags & WINED3DFMT_FLAG_SHADOW; desc->comparison_func = WINED3D_CMP_LESSEQUAL; - desc->srgb_decode = !(context->d3d_info->wined3d_creation_flags & WINED3D_SRGB_READ_WRITE_CONTROL) - || sampler_states[WINED3D_SAMP_SRGB_TEXTURE]; + desc->srgb_decode = sampler_states[WINED3D_SAMP_SRGB_TEXTURE]; if (!(texture->resource.format_flags & WINED3DFMT_FLAG_FILTERING)) { @@ -3569,7 +3568,7 @@ static void sampler(struct wined3d_context *context, const struct wined3d_state wined3d_texture_bind(texture, context, srgb); if (!gl_info->supported[ARB_SAMPLER_OBJECTS]) { - wined3d_texture_apply_sampler_desc(texture, &desc, gl_info); + wined3d_texture_apply_sampler_desc(texture, &desc, context); } else { diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 58ff5aa..b4c8bb2 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -289,13 +289,14 @@ void wined3d_texture_bind_and_dirtify(struct wined3d_texture *texture, /* Context activation is done by the caller (state handler). */ /* This function relies on the correct texture being bound and loaded. */ void wined3d_texture_apply_sampler_desc(struct wined3d_texture *texture, - const struct wined3d_sampler_desc *sampler_desc, const struct wined3d_gl_info *gl_info) + const struct wined3d_sampler_desc *sampler_desc, const struct wined3d_context *context) { + const struct wined3d_gl_info *gl_info = context->gl_info; GLenum target = texture->target; struct gl_texture *gl_tex; DWORD state; - TRACE("texture %p, sampler_desc %p, gl_info %p.\n", texture, sampler_desc, gl_info); + TRACE("texture %p, sampler_desc %p, context %p.\n", texture, sampler_desc, context); gl_tex = wined3d_texture_get_gl_texture(texture, texture->flags & WINED3D_TEXTURE_IS_SRGB); @@ -357,8 +358,9 @@ void wined3d_texture_apply_sampler_desc(struct wined3d_texture *texture, gl_tex->sampler_desc.max_anisotropy = state; } - /* These should always be the same unless EXT_texture_sRGB_decode is supported. */ - if (!sampler_desc->srgb_decode != !gl_tex->sampler_desc.srgb_decode) + if (!sampler_desc->srgb_decode != !gl_tex->sampler_desc.srgb_decode + && (context->d3d_info->wined3d_creation_flags & WINED3D_SRGB_READ_WRITE_CONTROL) + && gl_info->supported[EXT_TEXTURE_SRGB_DECODE]) { gl_info->gl_ops.gl.p_glTexParameteri(target, GL_TEXTURE_SRGB_DECODE_EXT, sampler_desc->srgb_decode ? GL_DECODE_EXT : GL_SKIP_DECODE_EXT); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 1b8d0f3..2df8cd3 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2396,7 +2396,7 @@ static inline struct gl_texture *wined3d_texture_get_gl_texture(struct wined3d_t } void wined3d_texture_apply_sampler_desc(struct wined3d_texture *texture, - const struct wined3d_sampler_desc *sampler_desc, const struct wined3d_gl_info *gl_info) DECLSPEC_HIDDEN; + const struct wined3d_sampler_desc *sampler_desc, const struct wined3d_context *context) DECLSPEC_HIDDEN; void wined3d_texture_bind(struct wined3d_texture *texture, struct wined3d_context *context, BOOL srgb) DECLSPEC_HIDDEN; void wined3d_texture_bind_and_dirtify(struct wined3d_texture *texture,

1 0

Henri Verbeet : wined3d: Get rid of the surface parameter to wined3d_device_parent_ops.surface_created ().
by Alexandre Julliard Feb. 12, 2016

Feb. 12, 2016

Module: wine Branch: master Commit: 3b5eca269d409ba3ce895d0e5c03f05ab1b6a557 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b5eca269d409ba3ce895d0e5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 12 11:06:08 2016 +0100 wined3d: Get rid of the surface parameter to wined3d_device_parent_ops.surface_created(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 21 ++++----------------- dlls/d3d8/device.c | 8 ++++---- dlls/d3d9/device.c | 8 ++++---- dlls/ddraw/ddraw.c | 6 +++--- dlls/wined3d/surface.c | 2 +- include/wine/wined3d.h | 3 +-- 6 files changed, 17 insertions(+), 31 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index b3e8775..8b7d2f8 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -4819,24 +4819,11 @@ static void CDECL device_parent_activate(struct wined3d_device_parent *device_pa TRACE("device_parent %p, activate %#x.\n", device_parent, activate); } -static HRESULT CDECL device_parent_surface_created(struct wined3d_device_parent *device_parent, - struct wined3d_texture *wined3d_texture, unsigned int sub_resource_idx, struct wined3d_surface *surface, void **parent, - const struct wined3d_parent_ops **parent_ops) -{ - TRACE("device_parent %p, wined3d_texture %p, sub_resource_idx %u, surface %p, parent %p, parent_ops %p.\n", - device_parent, wined3d_texture, sub_resource_idx, surface, parent, parent_ops); - - *parent = NULL; - *parent_ops = &d3d_null_wined3d_parent_ops; - - return S_OK; -} - -static HRESULT CDECL device_parent_volume_created(struct wined3d_device_parent *device_parent, +static HRESULT CDECL device_parent_sub_resource_created(struct wined3d_device_parent *device_parent, struct wined3d_texture *wined3d_texture, unsigned int sub_resource_idx, void **parent, const struct wined3d_parent_ops **parent_ops) { - TRACE("device_parent %p, texture %p, sub_resource_idx %u, parent %p, parent_ops %p.\n", + TRACE("device_parent %p, wined3d_texture %p, sub_resource_idx %u, parent %p, parent_ops %p.\n", device_parent, wined3d_texture, sub_resource_idx, parent, parent_ops); *parent = NULL; @@ -4920,8 +4907,8 @@ static const struct wined3d_device_parent_ops d3d_wined3d_device_parent_ops = device_parent_wined3d_device_created, device_parent_mode_changed, device_parent_activate, - device_parent_surface_created, - device_parent_volume_created, + device_parent_sub_resource_created, + device_parent_sub_resource_created, device_parent_create_swapchain_texture, device_parent_create_swapchain, }; diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 94cb7e7..9154ccb 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -2992,13 +2992,13 @@ static void CDECL device_parent_activate(struct wined3d_device_parent *device_pa } static HRESULT CDECL device_parent_surface_created(struct wined3d_device_parent *device_parent, - struct wined3d_texture *wined3d_texture, unsigned int sub_resource_idx, struct wined3d_surface *surface, void **parent, - const struct wined3d_parent_ops **parent_ops) + struct wined3d_texture *wined3d_texture, unsigned int sub_resource_idx, + void **parent, const struct wined3d_parent_ops **parent_ops) { struct d3d8_surface *d3d_surface; - TRACE("device_parent %p, wined3d_texture %p, sub_resource_idx %u, surface %p, parent %p, parent_ops %p.\n", - device_parent, wined3d_texture, sub_resource_idx, surface, parent, parent_ops); + TRACE("device_parent %p, wined3d_texture %p, sub_resource_idx %u, parent %p, parent_ops %p.\n", + device_parent, wined3d_texture, sub_resource_idx, parent, parent_ops); if (!(d3d_surface = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*d3d_surface)))) return E_OUTOFMEMORY; diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 7f14cd0..382b971 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -3634,13 +3634,13 @@ static void CDECL device_parent_activate(struct wined3d_device_parent *device_pa } static HRESULT CDECL device_parent_surface_created(struct wined3d_device_parent *device_parent, - struct wined3d_texture *wined3d_texture, unsigned int sub_resource_idx, struct wined3d_surface *surface, void **parent, - const struct wined3d_parent_ops **parent_ops) + struct wined3d_texture *wined3d_texture, unsigned int sub_resource_idx, + void **parent, const struct wined3d_parent_ops **parent_ops) { struct d3d9_surface *d3d_surface; - TRACE("device_parent %p, wined3d_texture %p, sub_resource_idx %u, surface %p, parent %p, parent_ops %p.\n", - device_parent, wined3d_texture, sub_resource_idx, surface, parent, parent_ops); + TRACE("device_parent %p, wined3d_texture %p, sub_resource_idx %u, parent %p, parent_ops %p.\n", + device_parent, wined3d_texture, sub_resource_idx, parent, parent_ops); if (!(d3d_surface = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*d3d_surface)))) return E_OUTOFMEMORY; diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index c5bb31c..782b6b5 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -4750,14 +4750,14 @@ void ddraw_update_lost_surfaces(struct ddraw *ddraw) } static HRESULT CDECL device_parent_surface_created(struct wined3d_device_parent *device_parent, - struct wined3d_texture *wined3d_texture, unsigned int sub_resource_idx, struct wined3d_surface *surface, + struct wined3d_texture *wined3d_texture, unsigned int sub_resource_idx, void **parent, const struct wined3d_parent_ops **parent_ops) { struct ddraw *ddraw = ddraw_from_device_parent(device_parent); struct ddraw_surface *ddraw_surface; - TRACE("device_parent %p, wined3d_texture %p, sub_resource_idx %u, surface %p, parent %p, parent_ops %p.\n", - device_parent, wined3d_texture, sub_resource_idx, surface, parent, parent_ops); + TRACE("device_parent %p, wined3d_texture %p, sub_resource_idx %u, parent %p, parent_ops %p.\n", + device_parent, wined3d_texture, sub_resource_idx, parent, parent_ops); /* We have a swapchain or wined3d internal texture. */ if (!wined3d_texture_get_parent(wined3d_texture) || wined3d_texture_get_parent(wined3d_texture) == ddraw) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 7cb16ed..459cbdc 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -5227,7 +5227,7 @@ HRESULT wined3d_surface_create(struct wined3d_texture *container, const struct w } if (FAILED(hr = device_parent->ops->surface_created(device_parent, - container, layer * container->level_count + level, object, &parent, &parent_ops))) + container, layer * container->level_count + level, &parent, &parent_ops))) { WARN("Failed to create surface parent, hr %#x.\n", hr); wined3d_surface_destroy(object); diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index fbecb0b..d5cae29 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2020,7 +2020,6 @@ struct wined3d_sampler; struct wined3d_shader; struct wined3d_shader_resource_view; struct wined3d_stateblock; -struct wined3d_surface; struct wined3d_swapchain; struct wined3d_texture; struct wined3d_vertex_declaration; @@ -2037,7 +2036,7 @@ struct wined3d_device_parent_ops void (__cdecl *activate)(struct wined3d_device_parent *device_parent, BOOL activate); HRESULT (__cdecl *surface_created)(struct wined3d_device_parent *device_parent, struct wined3d_texture *texture, unsigned int sub_resource_idx, - struct wined3d_surface *surface, void **parent, const struct wined3d_parent_ops **parent_ops); + void **parent, const struct wined3d_parent_ops **parent_ops); HRESULT (__cdecl *volume_created)(struct wined3d_device_parent *device_parent, struct wined3d_texture *wined3d_texture, unsigned int sub_resource_idx, void **parent, const struct wined3d_parent_ops **parent_ops);

1 0

Henri Verbeet : ddraw: Use wined3d_texture_get_pitch() in ddraw_surface_init().
by Alexandre Julliard Feb. 12, 2016

Feb. 12, 2016

Module: wine Branch: master Commit: 6e5fa922994e87d5501aca6b9eb420ab73f071a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e5fa922994e87d5501aca6b9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 12 11:06:07 2016 +0100 ddraw: Use wined3d_texture_get_pitch() in ddraw_surface_init(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/ddraw.c | 2 +- dlls/ddraw/ddraw_private.h | 2 +- dlls/ddraw/surface.c | 14 ++++++-------- dlls/wined3d/surface.c | 13 ------------- dlls/wined3d/texture.c | 2 +- dlls/wined3d/wined3d.spec | 3 +-- dlls/wined3d/wined3d_private.h | 2 -- include/wine/wined3d.h | 4 ++-- 8 files changed, 12 insertions(+), 30 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 5ffc951..c5bb31c 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -4774,7 +4774,7 @@ static HRESULT CDECL device_parent_surface_created(struct wined3d_device_parent return DDERR_OUTOFVIDEOMEMORY; } - ddraw_surface_init(ddraw_surface, ddraw, wined3d_texture, sub_resource_idx, surface, parent_ops); + ddraw_surface_init(ddraw_surface, ddraw, wined3d_texture, sub_resource_idx, parent_ops); *parent = ddraw_surface; ddraw_update_lost_surfaces(ddraw); diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index e6d8f3a..2e7624b 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -213,7 +213,7 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_ struct wined3d_rendertarget_view *ddraw_surface_get_rendertarget_view(struct ddraw_surface *surface) DECLSPEC_HIDDEN; void ddraw_surface_init(struct ddraw_surface *surface, struct ddraw *ddraw, struct wined3d_texture *wined3d_texture, unsigned int sub_resource_idx, - struct wined3d_surface *wined3d_surface, const struct wined3d_parent_ops **parent_ops) DECLSPEC_HIDDEN; + const struct wined3d_parent_ops **parent_ops) DECLSPEC_HIDDEN; ULONG ddraw_surface_release_iface(struct ddraw_surface *This) DECLSPEC_HIDDEN; HRESULT ddraw_surface_update_frontbuffer(struct ddraw_surface *surface, const RECT *rect, BOOL read) DECLSPEC_HIDDEN; diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index ff2c85b..aa6a0d1 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -6253,9 +6253,10 @@ fail: void ddraw_surface_init(struct ddraw_surface *surface, struct ddraw *ddraw, struct wined3d_texture *wined3d_texture, unsigned int sub_resource_idx, - struct wined3d_surface *wined3d_surface, const struct wined3d_parent_ops **parent_ops) + const struct wined3d_parent_ops **parent_ops) { struct ddraw_texture *texture = wined3d_texture_get_parent(wined3d_texture); + unsigned int texture_level, row_pitch, slice_pitch; DDSURFACEDESC2 *desc = &surface->surface_desc; unsigned int version = texture->version; @@ -6290,24 +6291,21 @@ void ddraw_surface_init(struct ddraw_surface *surface, struct ddraw *ddraw, *desc = texture->surface_desc; surface->first_attached = surface; + texture_level = desc->ddsCaps.dwCaps & DDSCAPS_MIPMAP ? sub_resource_idx % desc->u2.dwMipMapCount : 0; + wined3d_texture_get_pitch(wined3d_texture, texture_level, &row_pitch, &slice_pitch); if (format_is_compressed(&desc->u4.ddpfPixelFormat)) { - unsigned int texture_level, row_pitch; - - texture_level = desc->ddsCaps.dwCaps & DDSCAPS_MIPMAP ? sub_resource_idx % desc->u2.dwMipMapCount : 0; - row_pitch = wined3d_surface_get_pitch(wined3d_surface); - if (desc->dwFlags & DDSD_LPSURFACE) desc->u1.dwLinearSize = ~0u; else - desc->u1.dwLinearSize = row_pitch * ((max(1, desc->dwHeight >> texture_level) + 3) / 4); + desc->u1.dwLinearSize = slice_pitch; desc->dwFlags |= DDSD_LINEARSIZE; desc->dwFlags &= ~(DDSD_LPSURFACE | DDSD_PITCH); } else { if (!(desc->dwFlags & DDSD_LPSURFACE)) - desc->u1.lPitch = wined3d_surface_get_pitch(wined3d_surface); + desc->u1.lPitch = row_pitch; desc->dwFlags |= DDSD_PITCH; desc->dwFlags &= ~(DDSD_LPSURFACE | DDSD_LINEARSIZE); } diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index be7b67c..7cb16ed 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1883,19 +1883,6 @@ static inline unsigned short float_32_to_16(const float *in) return ret; } -DWORD CDECL wined3d_surface_get_pitch(const struct wined3d_surface *surface) -{ - unsigned int row_pitch, slice_pitch; - - TRACE("surface %p.\n", surface); - - wined3d_texture_get_pitch(surface->container, surface->texture_level, &row_pitch, &slice_pitch); - - TRACE("Returning %u.\n", row_pitch); - - return row_pitch; -} - HRESULT wined3d_surface_update_desc(struct wined3d_surface *surface, const struct wined3d_gl_info *gl_info) { struct wined3d_resource *texture_resource = &surface->container->resource; diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 8b414a6..58ff5aa 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -499,7 +499,7 @@ void * CDECL wined3d_texture_get_parent(const struct wined3d_texture *texture) return texture->resource.parent; } -void wined3d_texture_get_pitch(const struct wined3d_texture *texture, +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; diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 5933b48..bbd2fb5 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -220,8 +220,6 @@ @ cdecl wined3d_stateblock_decref(ptr) @ cdecl wined3d_stateblock_incref(ptr) -@ cdecl wined3d_surface_get_pitch(ptr) - @ cdecl wined3d_swapchain_create(ptr ptr ptr ptr ptr) @ cdecl wined3d_swapchain_decref(ptr) @ cdecl wined3d_swapchain_get_back_buffer(ptr long) @@ -250,6 +248,7 @@ @ cdecl wined3d_texture_get_lod(ptr) @ cdecl wined3d_texture_get_overlay_position(ptr long ptr ptr) @ cdecl wined3d_texture_get_parent(ptr) +@ cdecl wined3d_texture_get_pitch(ptr long ptr ptr) @ cdecl wined3d_texture_get_resource(ptr) @ cdecl wined3d_texture_get_sub_resource(ptr long) @ cdecl wined3d_texture_incref(ptr) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 81c3af2..1b8d0f3 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2402,8 +2402,6 @@ void wined3d_texture_bind(struct wined3d_texture *texture, void wined3d_texture_bind_and_dirtify(struct wined3d_texture *texture, struct wined3d_context *context, BOOL srgb) DECLSPEC_HIDDEN; void wined3d_texture_force_reload(struct wined3d_texture *texture) DECLSPEC_HIDDEN; -void wined3d_texture_get_pitch(const struct wined3d_texture *texture, - unsigned int level, unsigned int *row_pitch, unsigned int *slice_pitch) DECLSPEC_HIDDEN; void wined3d_texture_load(struct wined3d_texture *texture, struct wined3d_context *context, BOOL srgb) DECLSPEC_HIDDEN; void wined3d_texture_prepare_texture(struct wined3d_texture *texture, diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index f314af3..fbecb0b 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2479,8 +2479,6 @@ HRESULT __cdecl wined3d_stateblock_create(struct wined3d_device *device, ULONG __cdecl wined3d_stateblock_decref(struct wined3d_stateblock *stateblock); ULONG __cdecl wined3d_stateblock_incref(struct wined3d_stateblock *stateblock); -DWORD __cdecl wined3d_surface_get_pitch(const struct wined3d_surface *surface); - HRESULT __cdecl wined3d_swapchain_create(struct wined3d_device *device, struct wined3d_swapchain_desc *desc, void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_swapchain **swapchain); ULONG __cdecl wined3d_swapchain_decref(struct wined3d_swapchain *swapchain); @@ -2527,6 +2525,8 @@ DWORD __cdecl wined3d_texture_get_lod(const struct wined3d_texture *texture); HRESULT __cdecl wined3d_texture_get_overlay_position(const struct wined3d_texture *texture, unsigned int sub_resource_idx, LONG *x, LONG *y); void * __cdecl wined3d_texture_get_parent(const struct wined3d_texture *texture); +void __cdecl wined3d_texture_get_pitch(const struct wined3d_texture *texture, + unsigned int level, unsigned int *row_pitch, unsigned int *slice_pitch); struct wined3d_resource * __cdecl wined3d_texture_get_resource(struct wined3d_texture *texture); struct wined3d_resource * __cdecl wined3d_texture_get_sub_resource(const struct wined3d_texture *texture, UINT sub_resource_idx);

1 0

Henri Verbeet : wined3d: Use wined3d_texture_get_pitch() in surface_load_texture().
by Alexandre Julliard Feb. 12, 2016

Feb. 12, 2016

Module: wine Branch: master Commit: f8c858c375a3329aa5a860f47aa51a4b826a0107 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8c858c375a3329aa5a860f47… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 12 11:06:06 2016 +0100 wined3d: Use wined3d_texture_get_pitch() in surface_load_texture(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index c63b680..be7b67c 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3682,9 +3682,9 @@ static HRESULT surface_load_drawable(struct wined3d_surface *surface, static HRESULT surface_load_texture(struct wined3d_surface *surface, struct wined3d_context *context, BOOL srgb) { + unsigned int width, src_row_pitch, src_slice_pitch, dst_row_pitch, dst_slice_pitch; + const RECT src_rect = {0, 0, surface->resource.width, surface->resource.height}; const struct wined3d_gl_info *gl_info = context->gl_info; - RECT src_rect = {0, 0, surface->resource.width, surface->resource.height}; - unsigned int width, src_pitch, dst_row_pitch, dst_slice_pitch; struct wined3d_device *device = surface->resource.device; const struct wined3d_color_key_conversion *conversion; struct wined3d_texture *texture = surface->container; @@ -3770,9 +3770,9 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface, wined3d_texture_prepare_texture(texture, context, srgb); wined3d_texture_bind_and_dirtify(texture, context, srgb); + wined3d_texture_get_pitch(texture, surface->texture_level, &src_row_pitch, &src_slice_pitch); width = surface->resource.width; - src_pitch = wined3d_surface_get_pitch(surface); format = *texture->resource.format; if ((conversion = wined3d_format_get_color_key_conversion(texture, TRUE))) @@ -3810,9 +3810,9 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface, context_release(context); return E_OUTOFMEMORY; } - format.convert(data.addr, mem, src_pitch, src_pitch * height, + format.convert(data.addr, mem, src_row_pitch, src_slice_pitch, dst_row_pitch, dst_slice_pitch, width, height, 1); - src_pitch = dst_row_pitch; + src_row_pitch = dst_row_pitch; data.addr = mem; } else if (conversion) @@ -3832,14 +3832,14 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface, } if (texture->swapchain && texture->swapchain->palette) palette = texture->swapchain->palette; - conversion->convert(data.addr, src_pitch, mem, dst_row_pitch, + conversion->convert(data.addr, src_row_pitch, mem, dst_row_pitch, width, height, palette, &texture->async.gl_color_key); - src_pitch = dst_row_pitch; + src_row_pitch = dst_row_pitch; data.addr = mem; } wined3d_surface_upload_data(surface, gl_info, &format, &src_rect, - src_pitch, &dst_point, srgb, wined3d_const_bo_address(&data)); + src_row_pitch, &dst_point, srgb, wined3d_const_bo_address(&data)); HeapFree(GetProcessHeap(), 0, mem);

1 0

Charles Davis : winex11.drv: Actually query the swap method attribute.
by Alexandre Julliard Feb. 12, 2016

Feb. 12, 2016

Module: wine Branch: master Commit: 6509f90eacae5990de63d6f9a493fb60dd1982ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=6509f90eacae5990de63d6f9a… Author: Charles Davis <cdavis5x(a)gmail.com> Date: Fri Feb 12 02:01:42 2016 -0700 winex11.drv: Actually query the swap method attribute. Signed-off-by: Charles Davis <cdavis5x(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/opengl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 3d0bd24..704d62a 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -2738,7 +2738,7 @@ static BOOL X11DRV_wglGetPixelFormatAttribivARB( HDC hdc, int iPixelFormat, int case WGL_SWAP_METHOD_ARB: if (has_swap_method) { - hTest = pglXGetFBConfigAttrib(gdi_display, fmt->fbconfig, GLX_DRAWABLE_TYPE, &tmp); + hTest = pglXGetFBConfigAttrib(gdi_display, fmt->fbconfig, GLX_SWAP_METHOD_OML, &tmp); if (hTest) goto get_error; switch (tmp) {

1 0

Charles Davis : configure: Use pkg-config to find libnetapi.
by Alexandre Julliard Feb. 12, 2016

Feb. 12, 2016

Module: wine Branch: master Commit: 2000c7d770426983acc6288b8a9470655d84281f URL: http://source.winehq.org/git/wine.git/?a=commit;h=2000c7d770426983acc6288b8… Author: Charles Davis <cdavis5x(a)gmail.com> Date: Fri Feb 12 01:58:27 2016 -0700 configure: Use pkg-config to find libnetapi. Signed-off-by: Charles Davis <cdavis5x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 36 +++++++++++++++++++++++++++++++++--- configure.ac | 3 ++- 2 files changed, 35 insertions(+), 4 deletions(-) diff --git a/configure b/configure index b001551..a17b9c9 100755 --- a/configure +++ b/configure @@ -636,6 +636,8 @@ UNWINDFLAGS EXCESS_PRECISION_CFLAGS BUILTINFLAG EXTRACFLAGS +NETAPI_LIBS +NETAPI_CFLAGS PROCSTAT_LIBS KSTAT_LIBS MPG123_LIBS @@ -1567,7 +1569,9 @@ PNG_LIBS TIFF_CFLAGS TIFF_LIBS MPG123_CFLAGS -MPG123_LIBS' +MPG123_LIBS +NETAPI_CFLAGS +NETAPI_LIBS' # Initialize some variables set by options. @@ -2322,6 +2326,9 @@ Some influential environment variables: MPG123_CFLAGS C compiler flags for libmpg123, overriding pkg-config MPG123_LIBS Linker flags for libmpg123, overriding pkg-config + NETAPI_CFLAGS + C compiler flags for netapi, overriding pkg-config + NETAPI_LIBS Linker flags for netapi, overriding pkg-config Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. @@ -13884,13 +13891,30 @@ fi if test "x$with_netapi" != "xno" then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -lnetapi" >&5 + if ${NETAPI_CFLAGS:+false} :; then : + if ${PKG_CONFIG+:} false; then : + NETAPI_CFLAGS=`$PKG_CONFIG --cflags netapi 2>/dev/null` +fi +fi + +if ${NETAPI_LIBS:+false} :; then : + if ${PKG_CONFIG+:} false; then : + NETAPI_LIBS=`$PKG_CONFIG --libs netapi 2>/dev/null` +fi +fi + + +$as_echo "$as_me:${as_lineno-$LINENO}: netapi cflags: $NETAPI_CFLAGS" >&5 +$as_echo "$as_me:${as_lineno-$LINENO}: netapi libs: $NETAPI_LIBS" >&5 +ac_save_CPPFLAGS=$CPPFLAGS +CPPFLAGS="$CPPFLAGS $NETAPI_CFLAGS" +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for -lnetapi" >&5 $as_echo_n "checking for -lnetapi... " >&6; } if ${ac_cv_lib_soname_netapi+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_soname_save_LIBS=$LIBS -LIBS="-lnetapi $LIBS" +LIBS="-lnetapi $NETAPI_LIBS $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -13940,6 +13964,10 @@ _ACEOF fi +CPPFLAGS=$ac_save_CPPFLAGS +test -z "$NETAPI_CFLAGS" || NETAPI_CFLAGS=`echo " $NETAPI_CFLAGS" | sed 's/ -I$[^/]$/ -I\$(top_builddir)\/\1/g'` +test -z "$NETAPI_LIBS" || NETAPI_LIBS=`echo " $NETAPI_LIBS" | sed 's/ -L$[^/]$/ -L\$(top_builddir)\/\1/g'` + fi if test "x$enable_winealsa_drv$enable_winecoreaudio_drv$enable_winepulse_drv$enable_wineoss_drv" = xnononono -a \ @@ -17240,6 +17268,8 @@ MPG123_CFLAGS = $MPG123_CFLAGS MPG123_LIBS = $MPG123_LIBS KSTAT_LIBS = $KSTAT_LIBS PROCSTAT_LIBS = $PROCSTAT_LIBS +NETAPI_CFLAGS = $NETAPI_CFLAGS +NETAPI_LIBS = $NETAPI_LIBS EXCESS_PRECISION_CFLAGS = $EXCESS_PRECISION_CFLAGS DL_LIBS = $DL_LIBS POLL_LIBS = $POLL_LIBS diff --git a/configure.ac b/configure.ac index cef9b96..8a90202 100644 --- a/configure.ac +++ b/configure.ac @@ -1710,7 +1710,8 @@ WINE_CHECK_SONAME(odbc,SQLConnect,,[AC_DEFINE_UNQUOTED(SONAME_LIBODBC,["libodbc. dnl **** Check for libnetapi **** if test "x$with_netapi" != "xno" then - WINE_CHECK_SONAME(netapi,libnetapi_init,,[AC_DEFINE_UNQUOTED(SONAME_LIBNETAPI,["libnetapi.$LIBEXT"])]) + WINE_PACKAGE_FLAGS(NETAPI,[netapi],,,, + [WINE_CHECK_SONAME(netapi,libnetapi_init,,[AC_DEFINE_UNQUOTED(SONAME_LIBNETAPI,["libnetapi.$LIBEXT"])],[$NETAPI_LIBS])]) fi dnl **** Check for any sound system ****

1 0

Alexandre Julliard : server: Require a directory as root to open an object with a name.
by Alexandre Julliard Feb. 12, 2016

Feb. 12, 2016

Module: wine Branch: master Commit: 10a38ef0567c34a7f56ee88f6f972507f6eecf2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=10a38ef0567c34a7f56ee88f6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 12 21:06:58 2016 +0900 server: Require a directory as root to open an object with a name. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/handle.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/server/handle.c b/server/handle.c index 3b0d033..37fba69 100644 --- a/server/handle.c +++ b/server/handle.c @@ -592,7 +592,14 @@ obj_handle_t open_object( struct process *process, obj_handle_t parent, unsigned return 0; } - if (parent && !(root = get_handle_obj( process, parent, 0, NULL ))) return 0; + if (parent) + { + if (name->len) + root = get_directory_obj( process, parent ); + else /* opening the object itself can work for non-directories too */ + root = get_handle_obj( process, parent, 0, NULL ); + if (!root) return 0; + } if ((obj = open_named_object( root, ops, name, attributes ))) {

1 0

Vincent Povirk : kernel32/tests: Avoid testing for a hard-coded timezone name.
by Alexandre Julliard Feb. 12, 2016

Feb. 12, 2016

Module: wine Branch: master Commit: 82a55e7bf8c8fb15950c29b108e336e0b686739b URL: http://source.winehq.org/git/wine.git/?a=commit;h=82a55e7bf8c8fb15950c29b10… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Feb 11 11:36:44 2016 -0600 kernel32/tests: Avoid testing for a hard-coded timezone name. It turns out timezone names are localized, so this breaks on non-English Windows 8 and 10 systems. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/time.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/dlls/kernel32/tests/time.c b/dlls/kernel32/tests/time.c index 53af39c..e6e779c 100644 --- a/dlls/kernel32/tests/time.c +++ b/dlls/kernel32/tests/time.c @@ -913,7 +913,7 @@ static void test_GetTimeZoneInformationForYear(void) { BOOL ret; SYSTEMTIME systemtime; - TIME_ZONE_INFORMATION local_tzinfo, tzinfo; + TIME_ZONE_INFORMATION local_tzinfo, tzinfo, tzinfo2; DYNAMIC_TIME_ZONE_INFORMATION dyn_tzinfo; static const WCHAR std_tzname[] = {'G','r','e','e','n','l','a','n','d',' ','S','t','a','n','d','a','r','d',' ','T','i','m','e',0}; static const WCHAR dlt_tzname[] = {'G','r','e','e','n','l','a','n','d',' ','D','a','y','l','i','g','h','t',' ','T','i','m','e',0}; @@ -962,21 +962,24 @@ static void test_GetTimeZoneInformationForYear(void) ret = pGetTimeZoneInformationForYear(2015, &dyn_tzinfo, &tzinfo); ok(ret == TRUE, "GetTimeZoneInformationForYear failed, err %u\n", GetLastError()); ok(tzinfo.Bias == 180, "Expected Bias 180, got %d\n", tzinfo.Bias); - ok(!lstrcmpW(tzinfo.StandardName, std_tzname) || broken(!tzinfo.StandardName[0]) /* vista,7 */, - "Expected StandardName %s, got %s\n", - wine_dbgstr_w(std_tzname), wine_dbgstr_w(tzinfo.StandardName)); ok(tzinfo.StandardDate.wMonth == 10, "Expected standard month 10, got %d\n", tzinfo.StandardDate.wMonth); std_day = day_of_month(&tzinfo.StandardDate, 2015); ok(std_day == 24, "Expected standard day 24, got %d\n", std_day); ok(tzinfo.StandardBias == 0, "Expected StandardBias 0, got %d\n", tzinfo.StandardBias); - ok(!lstrcmpW(tzinfo.DaylightName, dlt_tzname) || broken(!tzinfo.DaylightName[0]) /* vista,7 */, - "Expected DaylightName %s, got %s\n", - wine_dbgstr_w(dlt_tzname), wine_dbgstr_w(tzinfo.DaylightName)); ok(tzinfo.DaylightDate.wMonth == 3, "Expected daylight month 3, got %d\n", tzinfo.DaylightDate.wMonth); dlt_day = day_of_month(&tzinfo.DaylightDate, 2015); ok(dlt_day == 28, "Expected daylight day 28, got %d\n", dlt_day); ok(tzinfo.DaylightBias == -60, "Expected DaylightBias -60, got %d\n", tzinfo.DaylightBias); + ret = pGetTimeZoneInformationForYear(2016, &dyn_tzinfo, &tzinfo2); + ok(ret == TRUE, "GetTimeZoneInformationForYear failed, err %u\n", GetLastError()); + ok(!lstrcmpW(tzinfo.StandardName, tzinfo2.StandardName), + "Got differing StandardName values %s and %s\n", + wine_dbgstr_w(tzinfo.StandardName), wine_dbgstr_w(tzinfo2.StandardName)); + ok(!lstrcmpW(tzinfo.DaylightName, tzinfo2.DaylightName), + "Got differing DaylightName values %s and %s\n", + wine_dbgstr_w(tzinfo.DaylightName), wine_dbgstr_w(tzinfo2.DaylightName)); + memset(&dyn_tzinfo, 0xaa, sizeof(dyn_tzinfo)); lstrcpyW(dyn_tzinfo.TimeZoneKeyName, dlt_tzname);

1 0