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

Aric Stewart : winejoystick.drv: Initialize unhandled dwPOV to JOY_POVCENTERED.
by Alexandre Julliard 03 Mar '16

03 Mar '16

Module: wine Branch: master Commit: ae2ead16ce3dfe9d906390a092ebda9d1a3d3354 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae2ead16ce3dfe9d906390a09… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Mar 2 11:27:52 2016 -0600 winejoystick.drv: Initialize unhandled dwPOV to JOY_POVCENTERED. This is a fix for broken applications that do not bother to check the flags to see if JOY_RETURNPOV is set and instead blindly read dwPOV. The previous value of 0 resulted in the POV appearing to be constantly in the UP position. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winejoystick.drv/joystick_osx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winejoystick.drv/joystick_osx.c b/dlls/winejoystick.drv/joystick_osx.c index da45450..72552d0 100644 --- a/dlls/winejoystick.drv/joystick_osx.c +++ b/dlls/winejoystick.drv/joystick_osx.c @@ -715,7 +715,7 @@ LRESULT driver_joyGetPosEx(DWORD_PTR device_id, JOYINFOEX* info) } else { - info->dwPOV = 0; + info->dwPOV = JOY_POVCENTERED; info->dwFlags &= ~JOY_RETURNPOV; } }

1 0

Aric Stewart : winejoystick.drv: Gracefully handle polling an unplugged device.
by Alexandre Julliard 03 Mar '16

03 Mar '16

Module: wine Branch: master Commit: 2281a7bd7ce351551207d3efc51970066488b1a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2281a7bd7ce351551207d3efc… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Mar 2 14:49:04 2016 -0600 winejoystick.drv: Gracefully handle polling an unplugged device. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winejoystick.drv/joystick_osx.c | 32 +++++++++++++++++++++++++++++--- 1 file changed, 29 insertions(+), 3 deletions(-) diff --git a/dlls/winejoystick.drv/joystick_osx.c b/dlls/winejoystick.drv/joystick_osx.c index 72552d0..48c05a0 100644 --- a/dlls/winejoystick.drv/joystick_osx.c +++ b/dlls/winejoystick.drv/joystick_osx.c @@ -633,6 +633,25 @@ LRESULT driver_joyGetDevCaps(DWORD_PTR device_id, JOYCAPSW* caps, DWORD size) return JOYERR_NOERROR; } +/* + * Helper to get the value from an element + */ +static LRESULT driver_getElementValue(IOHIDDeviceRef device, IOHIDElementRef element, IOHIDValueRef *pValueRef) +{ + IOReturn ret; + ret = IOHIDDeviceGetValue(device, element, pValueRef); + switch (ret) + { + case kIOReturnSuccess: + return JOYERR_NOERROR; + case kIOReturnNotAttached: + return JOYERR_UNPLUGGED; + default: + ERR("IOHIDDeviceGetValue returned 0x%x\n",ret); + return JOYERR_NOCANDO; + } +} + /************************************************************************** * driver_joyGetPosEx */ @@ -655,6 +674,7 @@ LRESULT driver_joyGetPosEx(DWORD_PTR device_id, JOYINFOEX* info) CFIndex i, count; IOHIDValueRef valueRef; long value; + LRESULT rc; if ((joystick = joystick_from_id(device_id)) == NULL) return MMSYSERR_NODRIVER; @@ -673,7 +693,9 @@ LRESULT driver_joyGetPosEx(DWORD_PTR device_id, JOYINFOEX* info) for (i = 0; i < count; i++) { IOHIDElementRef button = (IOHIDElementRef)CFArrayGetValueAtIndex(joystick->buttons, i); - IOHIDDeviceGetValue(device, button, &valueRef); + rc = driver_getElementValue(device, button, &valueRef); + if (rc != JOYERR_NOERROR) + return rc; value = IOHIDValueGetIntegerValue(valueRef); if (value) { @@ -690,7 +712,9 @@ LRESULT driver_joyGetPosEx(DWORD_PTR device_id, JOYINFOEX* info) DWORD* field = (DWORD*)((char*)info + axis_map[i].offset); if (joystick->axes[i].element) { - IOHIDDeviceGetValue(device, joystick->axes[i].element, &valueRef); + rc = driver_getElementValue(device, joystick->axes[i].element, &valueRef); + if (rc != JOYERR_NOERROR) + return rc; value = IOHIDValueGetIntegerValue(valueRef) - joystick->axes[i].min_value; *field = MulDiv(value, 0xFFFF, joystick->axes[i].max_value - joystick->axes[i].min_value); } @@ -706,7 +730,9 @@ LRESULT driver_joyGetPosEx(DWORD_PTR device_id, JOYINFOEX* info) { if (joystick->hatswitch) { - IOHIDDeviceGetValue(device, joystick->hatswitch, &valueRef); + rc = driver_getElementValue(device, joystick->hatswitch, &valueRef); + if (rc != JOYERR_NOERROR) + return rc; value = IOHIDValueGetIntegerValue(valueRef); if (value >= 8) info->dwPOV = JOY_POVCENTERED;

1 0

Henri Verbeet : d3d9: Use wined3d_texture_get_sub_resource_desc() in d3d9_texture_3d_GetLevelDesc().
by Alexandre Julliard 03 Mar '16

03 Mar '16

Module: wine Branch: master Commit: 9f51e8f77e73f7aae77f1e256763fc33dbe6ae78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f51e8f77e73f7aae77f1e256… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 2 19:24:12 2016 +0100 d3d9: Use wined3d_texture_get_sub_resource_desc() in d3d9_texture_3d_GetLevelDesc(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/texture.c | 13 ++++--------- dlls/wined3d/texture.c | 2 +- dlls/wined3d/wined3d.spec | 1 - dlls/wined3d/wined3d_private.h | 2 ++ include/wine/wined3d.h | 2 -- 5 files changed, 7 insertions(+), 13 deletions(-) diff --git a/dlls/d3d9/texture.c b/dlls/d3d9/texture.c index 50ef88d..07bd83e 100644 --- a/dlls/d3d9/texture.c +++ b/dlls/d3d9/texture.c @@ -1077,21 +1077,16 @@ static void WINAPI d3d9_texture_3d_GenerateMipSubLevels(IDirect3DVolumeTexture9 static HRESULT WINAPI d3d9_texture_3d_GetLevelDesc(IDirect3DVolumeTexture9 *iface, UINT level, D3DVOLUME_DESC *desc) { struct d3d9_texture *texture = impl_from_IDirect3DVolumeTexture9(iface); - struct wined3d_resource *sub_resource; - HRESULT hr = D3D_OK; + struct wined3d_sub_resource_desc wined3d_desc; + HRESULT hr; TRACE("iface %p, level %u, desc %p.\n", iface, level, desc); wined3d_mutex_lock(); - if (!(sub_resource = wined3d_texture_get_sub_resource(texture->wined3d_texture, level))) - hr = D3DERR_INVALIDCALL; - else + if (SUCCEEDED(hr = wined3d_texture_get_sub_resource_desc(texture->wined3d_texture, level, &wined3d_desc))) { - struct wined3d_resource_desc wined3d_desc; - - wined3d_resource_get_desc(sub_resource, &wined3d_desc); desc->Format = d3dformat_from_wined3dformat(wined3d_desc.format); - desc->Type = wined3d_desc.resource_type; + desc->Type = D3DRTYPE_VOLUME; desc->Usage = wined3d_desc.usage & WINED3DUSAGE_MASK; desc->Pool = wined3d_desc.pool; desc->Width = wined3d_desc.width; diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 4b24c21..e96b029 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -716,7 +716,7 @@ void CDECL wined3d_texture_generate_mipmaps(struct wined3d_texture *texture) FIXME("texture %p stub!\n", texture); } -struct wined3d_resource * CDECL wined3d_texture_get_sub_resource(const struct wined3d_texture *texture, +struct wined3d_resource *wined3d_texture_get_sub_resource(const struct wined3d_texture *texture, UINT sub_resource_idx) { UINT sub_count = texture->level_count * texture->layer_count; diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 5e2e426..247e4de 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -250,7 +250,6 @@ @ 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_get_sub_resource_desc(ptr long ptr) @ cdecl wined3d_texture_get_sub_resource_parent(ptr long) @ cdecl wined3d_texture_incref(ptr) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index d36c557..d89bd24 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2409,6 +2409,8 @@ void wined3d_texture_bind_and_dirtify(struct wined3d_texture *texture, 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, 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 a4b2a30..e678c39 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2448,8 +2448,6 @@ 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); HRESULT __cdecl wined3d_texture_get_sub_resource_desc(const struct wined3d_texture *texture, unsigned int sub_resource_idx, struct wined3d_sub_resource_desc *desc); void * __cdecl wined3d_texture_get_sub_resource_parent(struct wined3d_texture *texture, unsigned int sub_resource_idx);

1 0

Henri Verbeet : wined3d: Use a single allocation for texture sub-resource objects.
by Alexandre Julliard 03 Mar '16

03 Mar '16

Module: wine Branch: master Commit: e3e5dcd2cd548bed34cc193383da96c1898fee2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3e5dcd2cd548bed34cc19338… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 2 19:24:13 2016 +0100 wined3d: Use a single allocation for texture sub-resource objects. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 57 +----------------- dlls/wined3d/texture.c | 130 ++++++++++++++++++++++++++++++----------- dlls/wined3d/volume.c | 47 +-------------- dlls/wined3d/wined3d_private.h | 25 ++++---- 4 files changed, 117 insertions(+), 142 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e3e5dcd2cd548bed34cc1…

1 0

Henri Verbeet : wined3d: Avoid surface_from_resource() in wined3d_texture_update_desc().
by Alexandre Julliard 03 Mar '16

03 Mar '16

Module: wine Branch: master Commit: aad8f74cc8b6cf382026bbaf2f929d240f2d326f URL: http://source.winehq.org/git/wine.git/?a=commit;h=aad8f74cc8b6cf382026bbaf2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 2 19:24:14 2016 +0100 wined3d: Avoid surface_from_resource() in wined3d_texture_update_desc(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index a664155..651318c 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -631,7 +631,7 @@ HRESULT CDECL wined3d_texture_update_desc(struct wined3d_texture *texture, UINT return WINED3DERR_INVALIDCALL; } - surface = surface_from_resource(texture->sub_resources[0].resource); + surface = texture->sub_resources[0].u.surface; if (surface->resource.map_count || (surface->flags & SFLAG_DCINUSE)) { WARN("Surface is mapped or the DC is in use.\n");

1 0

Henri Verbeet : wined3d: Avoid surface_from_resource() in texture2d_prepare_texture().
by Alexandre Julliard 03 Mar '16

03 Mar '16

Module: wine Branch: master Commit: b309b831deb81f47b22f0c25a5fc0a1db6759d6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b309b831deb81f47b22f0c25a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 2 19:24:15 2016 +0100 wined3d: Avoid surface_from_resource() in texture2d_prepare_texture(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 651318c..af1c1de 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -868,7 +868,7 @@ static void texture2d_prepare_texture(struct wined3d_texture *texture, struct wi for (i = 0; i < sub_count; ++i) { - struct wined3d_surface *surface = surface_from_resource(texture->sub_resources[i].resource); + struct wined3d_surface *surface = texture->sub_resources[i].u.surface; GLsizei height = surface->pow2Height; GLsizei width = surface->pow2Width;

1 0

Henri Verbeet : wined3d: Avoid surface_from_resource() in swapchain_gl_frontbuffer_updated().
by Alexandre Julliard 03 Mar '16

03 Mar '16

Module: wine Branch: master Commit: c059191e0fe795e4643e56bb2ab806c9ce994055 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c059191e0fe795e4643e56bb2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 2 19:24:16 2016 +0100 wined3d: Avoid surface_from_resource() in swapchain_gl_frontbuffer_updated(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/swapchain.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 9b8d04c..299a47a 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -652,7 +652,7 @@ static void swapchain_gl_frontbuffer_updated(struct wined3d_swapchain *swapchain struct wined3d_surface *surface; struct wined3d_context *context; - surface = surface_from_resource(swapchain->front_buffer->sub_resources[0].resource); + surface = swapchain->front_buffer->sub_resources[0].u.surface; context = context_acquire(swapchain->device, surface); surface_load_location(surface, context, surface->container->resource.draw_binding); context_release(context);

1 0

Henri Verbeet : wined3d: Avoid volume_from_resource() in texture3d_prepare_texture().
by Alexandre Julliard 03 Mar '16

03 Mar '16

Module: wine Branch: master Commit: 09c862b6a23c35c2157842f1f7a1fa9a8d17da1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=09c862b6a23c35c2157842f1f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 2 19:24:17 2016 +0100 wined3d: Avoid volume_from_resource() in texture3d_prepare_texture(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index af1c1de..01f54a9 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1207,7 +1207,7 @@ static void texture3d_prepare_texture(struct wined3d_texture *texture, struct wi for (i = 0; i < sub_count; ++i) { - struct wined3d_volume *volume = volume_from_resource(texture->sub_resources[i].resource); + struct wined3d_volume *volume = texture->sub_resources[i].u.volume; GL_EXTCALL(glTexImage3D(GL_TEXTURE_3D, volume->texture_level, srgb ? format->glGammaInternal : format->glInternal,

1 0

Henri Verbeet : wined3d: Store surface/ volume buffer objects in the sub-resource structure.
by Alexandre Julliard 03 Mar '16

03 Mar '16

Module: wine Branch: master Commit: fbe27375370c426c781ba50841ef93ea6ff44502 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbe27375370c426c781ba5084… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 2 19:24:18 2016 +0100 wined3d: Store surface/volume buffer objects in the sub-resource structure. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 52 +++++++++++++++++++++------------ dlls/wined3d/texture.c | 4 +-- dlls/wined3d/volume.c | 65 +++++++++++++++++++++++++----------------- dlls/wined3d/wined3d_private.h | 6 ++-- 4 files changed, 76 insertions(+), 51 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fbe27375370c426c781ba…

1 0

Stefan Dösinger : wined3d: Cleanup sub-resource buffer objects in wined3d_texture_cleanup().
by Alexandre Julliard 03 Mar '16

03 Mar '16

Module: wine Branch: master Commit: 45fa5b6471093db4f97f90b661d1f89d56aa48e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=45fa5b6471093db4f97f90b66… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Mar 2 19:24:19 2016 +0100 wined3d: Cleanup sub-resource buffer objects in wined3d_texture_cleanup(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 11 +---------- dlls/wined3d/texture.c | 27 +++++++++++++++++++++++++++ dlls/wined3d/volume.c | 3 --- 3 files changed, 28 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 994756d..208c254 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -48,13 +48,10 @@ static unsigned int surface_get_sub_resource_idx(const struct wined3d_surface *s void wined3d_surface_cleanup(struct wined3d_surface *surface) { struct wined3d_surface *overlay, *cur; - GLuint buffer_object; TRACE("surface %p.\n", surface); - buffer_object = surface->container->sub_resources[surface_get_sub_resource_idx(surface)].buffer_object; - if (buffer_object || surface->rb_multisample - || surface->rb_resolved || !list_empty(&surface->renderbuffers)) + if (surface->rb_multisample || surface->rb_resolved || !list_empty(&surface->renderbuffers)) { struct wined3d_renderbuffer_entry *entry, *entry2; const struct wined3d_gl_info *gl_info; @@ -64,12 +61,6 @@ void wined3d_surface_cleanup(struct wined3d_surface *surface) context = context_acquire(device, NULL); gl_info = context->gl_info; - if (buffer_object) - { - TRACE("Deleting buffer object %u.\n", buffer_object); - GL_EXTCALL(glDeleteBuffers(1, &buffer_object)); - } - if (surface->rb_multisample) { TRACE("Deleting multisample renderbuffer %u.\n", surface->rb_multisample); diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index cb2b310..a8e9194 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -108,8 +108,35 @@ static void wined3d_texture_unload_gl_texture(struct wined3d_texture *texture) static void wined3d_texture_cleanup(struct wined3d_texture *texture) { + unsigned int sub_count = texture->level_count * texture->layer_count; + struct wined3d_device *device = texture->resource.device; + struct wined3d_context *context = NULL; + const struct wined3d_gl_info *gl_info; + GLuint buffer_object; + unsigned int i; + TRACE("texture %p.\n", texture); + for (i = 0; i < sub_count; ++i) + { + if (!(buffer_object = texture->sub_resources[i].buffer_object)) + continue; + + TRACE("Deleting buffer object %u.\n", buffer_object); + + /* We may not be able to get a context in wined3d_texture_cleanup() in + * general, but if a buffer object was previously created we can. */ + if (!context) + { + context = context_acquire(device, NULL); + gl_info = context->gl_info; + } + + GL_EXTCALL(glDeleteBuffers(1, &buffer_object)); + } + if (context) + context_release(context); + texture->texture_ops->texture_cleanup_sub_resources(texture); wined3d_texture_unload_gl_texture(texture); resource_cleanup(&texture->resource); diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index 3782642..ef0d69b 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -397,9 +397,6 @@ void wined3d_volume_cleanup(struct wined3d_volume *volume) { TRACE("volume %p.\n", volume); - if (volume->container->sub_resources[volume->texture_level].buffer_object) - wined3d_volume_free_pbo(volume); - resource_cleanup(&volume->resource); }

1 0