April 2017 - Wine-commits - list.winehq.org

Jacek Caban : mshtml.idl: Added HTMLLinkElement coclass declaration.
by Alexandre Julliard 13 Apr '17

13 Apr '17

Module: wine Branch: master Commit: ab0e68a95ea65130bc7c098c4ad5b5ce919f0d9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab0e68a95ea65130bc7c098c4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 13 16:05:11 2017 +0200 mshtml.idl: Added HTMLLinkElement coclass declaration. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmllink.c | 4 ++-- include/mshtml.idl | 20 ++++++++++++++++++++ 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmllink.c b/dlls/mshtml/htmllink.c index 19913af..aa44c3d 100644 --- a/dlls/mshtml/htmllink.c +++ b/dlls/mshtml/htmllink.c @@ -33,12 +33,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); -typedef struct { +struct HTMLLinkElement { HTMLElement element; IHTMLLinkElement IHTMLLinkElement_iface; nsIDOMHTMLLinkElement *nslink; -} HTMLLinkElement; +}; static inline HTMLLinkElement *impl_from_IHTMLLinkElement(IHTMLLinkElement *iface) { diff --git a/include/mshtml.idl b/include/mshtml.idl index 75946b1..96799bc 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -7680,6 +7680,26 @@ methods: } /***************************************************************************** + * HTMLLinkElement coclass + */ +[ + noncreatable, + uuid(3050f277-98b5-11cf-bb82-00aa00bdce0b) +] +coclass HTMLLinkElement +{ + [default] dispinterface DispHTMLLinkElement; + /* [source, default] dispinterface HTMLLinkElementEvents; */ + /* [source] dispinterface HTMLLinkElementEvents2; */ + WINE_HTMLELEMENT_INTERFACES; + interface IHTMLLinkElement; + interface IHTMLLinkElement2; + interface IHTMLLinkElement3; + interface IHTMLLinkElement4; + /* interface IHTMLLinkElement5; */ +} + +/***************************************************************************** * IHTMLTxtRange interface */ [

1 0

Jacek Caban : mshtml.idl: Added HTMLImg coclass declaration.
by Alexandre Julliard 13 Apr '17

13 Apr '17

Module: wine Branch: master Commit: f40b54483f2a370cbe8c23608531c119fe71aec3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f40b54483f2a370cbe8c23608… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 13 16:05:27 2017 +0200 mshtml.idl: Added HTMLImg coclass declaration. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlimg.c | 134 +++++++++++++++++++++++++------------------------- include/mshtml.idl | 21 ++++++++ 2 files changed, 88 insertions(+), 67 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f40b54483f2a370cbe8c2…

1 0

Jacek Caban : mshtml.idl: Added HTMLXMLHttpRequest coclass declaration.
by Alexandre Julliard 13 Apr '17

13 Apr '17

Module: wine Branch: master Commit: abdec32f68f4a15997f1c879d04a88982fbbe138 URL: http://source.winehq.org/git/wine.git/?a=commit;h=abdec32f68f4a15997f1c879d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 13 16:05:38 2017 +0200 mshtml.idl: Added HTMLXMLHttpRequest coclass declaration. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/xmlhttprequest.c | 14 ++++++-------- include/mshtml.idl | 17 +++++++++++++++++ 2 files changed, 23 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/xmlhttprequest.c b/dlls/mshtml/xmlhttprequest.c index ab14c54..30389a4 100644 --- a/dlls/mshtml/xmlhttprequest.c +++ b/dlls/mshtml/xmlhttprequest.c @@ -92,20 +92,18 @@ static HRESULT return_nscstr(nsresult nsres, nsACString *nscstr, BSTR *p) return S_OK; } -typedef struct XMLHttpReqEventListener XMLHttpReqEventListener; - typedef struct { + nsIDOMEventListener nsIDOMEventListener_iface; + LONG ref; + HTMLXMLHttpRequest *xhr; +} XMLHttpReqEventListener; + +struct HTMLXMLHttpRequest { EventTarget event_target; IHTMLXMLHttpRequest IHTMLXMLHttpRequest_iface; LONG ref; nsIXMLHttpRequest *nsxhr; XMLHttpReqEventListener *event_listener; -} HTMLXMLHttpRequest; - -struct XMLHttpReqEventListener { - nsIDOMEventListener nsIDOMEventListener_iface; - LONG ref; - HTMLXMLHttpRequest *xhr; }; static void detach_xhr_event_listener(XMLHttpReqEventListener *event_listener) diff --git a/include/mshtml.idl b/include/mshtml.idl index 9a98dc8..74a9eb6 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -9134,6 +9134,23 @@ methods: } /***************************************************************************** + * HTMLXMLHttpRequest + */ +[ + noncreatable, + uuid(3051040b-98b5-11cf-bb82-00aa00bdce0b) +] +coclass HTMLXMLHttpRequest +{ + [default] dispinterface DispHTMLXMLHttpRequest; + /* [source, default] dispinterface HTMLXMLHttpRequestEvents; */ + interface IHTMLXMLHttpRequest; + interface IHTMLXMLHttpRequest2; + interface IHTMLDOMConstructor; + interface IEventTarget; +} + +/***************************************************************************** * IHTMLControlElement interface */ [

1 0

Jacek Caban : mshtml.idl: Added HTMLAnchorElement coclass declaration.
by Alexandre Julliard 13 Apr '17

13 Apr '17

Module: wine Branch: master Commit: 0636249b0e488377a3c26956a4527366d0d3b012 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0636249b0e488377a3c26956a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 13 16:05:45 2017 +0200 mshtml.idl: Added HTMLAnchorElement coclass declaration. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlanchor.c | 4 ++-- include/mshtml.idl | 18 ++++++++++++++++++ 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlanchor.c b/dlls/mshtml/htmlanchor.c index 75d465f..191677f 100644 --- a/dlls/mshtml/htmlanchor.c +++ b/dlls/mshtml/htmlanchor.c @@ -35,13 +35,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); -typedef struct { +struct HTMLAnchorElement { HTMLElement element; IHTMLAnchorElement IHTMLAnchorElement_iface; nsIDOMHTMLAnchorElement *nsanchor; -} HTMLAnchorElement; +}; static HRESULT navigate_href_new_window(HTMLElement *element, nsAString *href_str, const WCHAR *target) { diff --git a/include/mshtml.idl b/include/mshtml.idl index 74a9eb6..24721eb 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -9794,6 +9794,24 @@ methods: } /***************************************************************************** + * HTMLAnchorElement coclass + */ +[ + noncreatable, + uuid(3050f248-98b5-11cf-bb82-00aa00bdce0b) +] +coclass HTMLAnchorElement +{ + [default] dispinterface DispHTMLAnchorElement; + /* [source, default] dispinterface HTMLAnchorEvents; */ + /* [source] dispinterface HTMLAnchorEvents2; */ + WINE_HTMLDATAELEMENT_INTERFACES; + interface IHTMLAnchorElement; + /* interface IHTMLAnchorElement2; */ + /* interface IHTMLAnchorElement3; */ +} + +/***************************************************************************** * IHTMLAreaElement interface */ [

1 0

Hugh McMaster : comctl32: Improve right-click handling in treeview controls.
by Alexandre Julliard 13 Apr '17

13 Apr '17

Module: wine Branch: master Commit: d6a6055bc95b701ccb5b439739b975330a4f67c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6a6055bc95b701ccb5b43973… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Apr 4 12:42:49 2017 +0000 comctl32: Improve right-click handling in treeview controls. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/treeview.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index 74206bd..9a37cf3 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -4347,7 +4347,12 @@ TREEVIEW_RButtonDown(TREEVIEW_INFO *infoPtr, LPARAM lParam) ht.pt.x = (short)LOWORD(lParam); ht.pt.y = (short)HIWORD(lParam); - TREEVIEW_HitTest(infoPtr, &ht); + if (TREEVIEW_HitTest(infoPtr, &ht)) + { + infoPtr->focusedItem = ht.hItem; + TREEVIEW_InvalidateItem(infoPtr, infoPtr->focusedItem); + TREEVIEW_InvalidateItem(infoPtr, infoPtr->selectedItem); + } if (TREEVIEW_TrackMouse(infoPtr, ht.pt)) { @@ -4368,6 +4373,13 @@ TREEVIEW_RButtonDown(TREEVIEW_INFO *infoPtr, LPARAM lParam) } } + if (ht.hItem) + { + TREEVIEW_InvalidateItem(infoPtr, infoPtr->focusedItem); + infoPtr->focusedItem = infoPtr->selectedItem; + TREEVIEW_InvalidateItem(infoPtr, infoPtr->focusedItem); + } + return 0; }

1 0

Henri Verbeet : wined3d: Use the "arbfp" blitter for P8 and YUV blits.
by Alexandre Julliard 13 Apr '17

13 Apr '17

Module: wine Branch: master Commit: ecbc1cb6238a198410cca05145677e520e7f6c18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ecbc1cb6238a198410cca0514… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 13 00:10:58 2017 +0200 wined3d: Use the "arbfp" blitter for P8 and YUV blits. This fixes a regression introduced by commit cad4badbcf25992e0c61521aa15e639c2611f5d6. In particular, before that commit, surface_load_drawable() would always use the device blitter, without checking whether that blitter claims to support the blit in question. As it turns out, the FBO blitter claims to support them, and the arbfp blitter claims not to support them. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 11 ++++++----- dlls/wined3d/surface.c | 31 ++++++++++++++++--------------- 2 files changed, 22 insertions(+), 20 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 5a7a5c9..caa0d69 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7707,8 +7707,8 @@ static void arbfp_blit_unset(const struct wined3d_gl_info *gl_info) static BOOL arbfp_blit_supported(const struct wined3d_gl_info *gl_info, const struct wined3d_d3d_info *d3d_info, enum wined3d_blit_op blit_op, - enum wined3d_pool src_pool, const struct wined3d_format *src_format, - enum wined3d_pool dst_pool, const struct wined3d_format *dst_format) + enum wined3d_pool src_pool, const struct wined3d_format *src_format, DWORD src_location, + enum wined3d_pool dst_pool, const struct wined3d_format *dst_format, DWORD dst_location) { enum complex_fixup src_fixup; BOOL decompress; @@ -7746,7 +7746,8 @@ static BOOL arbfp_blit_supported(const struct wined3d_gl_info *gl_info, dump_color_fixup_desc(src_format->color_fixup); } - if (!is_identity_fixup(dst_format->color_fixup)) + if (!is_identity_fixup(dst_format->color_fixup) + && (dst_format->id != src_format->id || dst_location != WINED3D_LOCATION_DRAWABLE)) { TRACE("Destination fixups are not supported\n"); return FALSE; @@ -7796,8 +7797,8 @@ static void arbfp_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_bli RECT s, d; if (!arbfp_blit_supported(&device->adapter->gl_info, &device->adapter->d3d_info, op, - src_texture->resource.pool, src_texture->resource.format, - dst_texture->resource.pool, dst_texture->resource.format)) + src_texture->resource.pool, src_texture->resource.format, src_location, + dst_texture->resource.pool, dst_texture->resource.format, dst_location)) { if ((next = blitter->next)) next->ops->blitter_blit(next, op, context, src_surface, src_location, diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 2bf4854..fdf9e27 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -485,8 +485,8 @@ static void surface_blt_fbo(const struct wined3d_device *device, } static BOOL fbo_blitter_supported(const struct wined3d_gl_info *gl_info, enum wined3d_blit_op blit_op, - DWORD src_usage, enum wined3d_pool src_pool, const struct wined3d_format *src_format, - DWORD dst_usage, enum wined3d_pool dst_pool, const struct wined3d_format *dst_format) + DWORD src_usage, enum wined3d_pool src_pool, const struct wined3d_format *src_format, DWORD src_location, + DWORD dst_usage, enum wined3d_pool dst_pool, const struct wined3d_format *dst_format, DWORD dst_location) { if ((wined3d_settings.offscreen_rendering_mode != ORM_FBO) || !gl_info->fbo_ops.glBlitFramebuffer) return FALSE; @@ -504,9 +504,8 @@ static BOOL fbo_blitter_supported(const struct wined3d_gl_info *gl_info, enum wi if (!((dst_format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_FBO_ATTACHABLE) || (dst_usage & WINED3DUSAGE_RENDERTARGET))) return FALSE; - if (!(src_format->id == dst_format->id - || (is_identity_fixup(src_format->color_fixup) - && is_identity_fixup(dst_format->color_fixup)))) + if ((src_format->id != dst_format->id || dst_location == WINED3D_LOCATION_DRAWABLE) + && (!is_identity_fixup(src_format->color_fixup) || !is_identity_fixup(dst_format->color_fixup))) return FALSE; break; @@ -2184,8 +2183,10 @@ static BOOL surface_load_texture(struct wined3d_surface *surface, if (!depth && sub_resource->locations & (WINED3D_LOCATION_TEXTURE_SRGB | WINED3D_LOCATION_TEXTURE_RGB) && (texture->resource.format_flags & WINED3DFMT_FLAG_FBO_ATTACHABLE_SRGB) && fbo_blitter_supported(gl_info, WINED3D_BLIT_OP_COLOR_BLIT, - texture->resource.usage, texture->resource.pool, texture->resource.format, - texture->resource.usage, texture->resource.pool, texture->resource.format)) + texture->resource.usage, texture->resource.pool, + texture->resource.format, WINED3D_LOCATION_TEXTURE_RGB, + texture->resource.usage, texture->resource.pool, + texture->resource.format, WINED3D_LOCATION_TEXTURE_SRGB)) { if (srgb) surface_blt_fbo(device, context, WINED3D_TEXF_POINT, surface, WINED3D_LOCATION_TEXTURE_RGB, @@ -2198,17 +2199,17 @@ static BOOL surface_load_texture(struct wined3d_surface *surface, } if (!depth && sub_resource->locations & (WINED3D_LOCATION_RB_MULTISAMPLE | WINED3D_LOCATION_RB_RESOLVED) - && (!srgb || (texture->resource.format_flags & WINED3DFMT_FLAG_FBO_ATTACHABLE_SRGB)) - && fbo_blitter_supported(gl_info, WINED3D_BLIT_OP_COLOR_BLIT, - texture->resource.usage, texture->resource.pool, texture->resource.format, - texture->resource.usage, texture->resource.pool, texture->resource.format)) + && (!srgb || (texture->resource.format_flags & WINED3DFMT_FLAG_FBO_ATTACHABLE_SRGB))) { DWORD src_location = sub_resource->locations & WINED3D_LOCATION_RB_RESOLVED ? WINED3D_LOCATION_RB_RESOLVED : WINED3D_LOCATION_RB_MULTISAMPLE; DWORD dst_location = srgb ? WINED3D_LOCATION_TEXTURE_SRGB : WINED3D_LOCATION_TEXTURE_RGB; - surface_blt_fbo(device, context, WINED3D_TEXF_POINT, surface, src_location, - &src_rect, surface, dst_location, &src_rect); + if (fbo_blitter_supported(gl_info, WINED3D_BLIT_OP_COLOR_BLIT, + texture->resource.usage, texture->resource.pool, texture->resource.format, src_location, + texture->resource.usage, texture->resource.pool, texture->resource.format, dst_location)) + surface_blt_fbo(device, context, WINED3D_TEXF_POINT, surface, src_location, + &src_rect, surface, dst_location, &src_rect); return TRUE; } @@ -2412,8 +2413,8 @@ static void fbo_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_blit_ struct wined3d_blitter *next; if (!fbo_blitter_supported(&device->adapter->gl_info, op, - src_resource->usage, src_resource->pool, src_resource->format, - src_resource->usage, dst_resource->pool, dst_resource->format)) + src_resource->usage, src_resource->pool, src_resource->format, src_location, + src_resource->usage, dst_resource->pool, dst_resource->format, dst_location)) { if ((next = blitter->next)) next->ops->blitter_blit(next, op, context, src_surface, src_location,

1 0

Henri Verbeet : wined3d: Do not add wined3d internal resources to the device resource list.
by Alexandre Julliard 13 Apr '17

13 Apr '17

Module: wine Branch: master Commit: b7146d81f24b193971b48c59f3c1e03846d68b58 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7146d81f24b193971b48c59f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 13 00:10:59 2017 +0200 wined3d: Do not add wined3d internal resources to the device resource list. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/resource.c | 35 +++++++++++++++++++++-------------- dlls/wined3d/surface.c | 2 +- include/wine/wined3d.h | 1 + 3 files changed, 23 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index 4e0f6a6..5f75b93 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -57,6 +57,7 @@ static void resource_check_usage(DWORD usage) | WINED3DUSAGE_AUTOGENMIPMAP | WINED3DUSAGE_STATICDECL | WINED3DUSAGE_OVERLAY + | WINED3DUSAGE_PRIVATE | WINED3DUSAGE_LEGACY_CUBEMAP | WINED3DUSAGE_TEXTURE; @@ -216,19 +217,22 @@ HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device * resource->heap_memory = NULL; } - /* Check that we have enough video ram left */ - if (pool == WINED3D_POOL_DEFAULT && device->wined3d->flags & WINED3D_VIDMEM_ACCOUNTING) + if (!(usage & WINED3DUSAGE_PRIVATE)) { - if (size > wined3d_device_get_available_texture_mem(device)) + /* Check that we have enough video ram left */ + if (pool == WINED3D_POOL_DEFAULT && device->wined3d->flags & WINED3D_VIDMEM_ACCOUNTING) { - ERR("Out of adapter memory\n"); - wined3d_resource_free_sysmem(resource); - return WINED3DERR_OUTOFVIDEOMEMORY; + if (size > wined3d_device_get_available_texture_mem(device)) + { + ERR("Out of adapter memory\n"); + wined3d_resource_free_sysmem(resource); + return WINED3DERR_OUTOFVIDEOMEMORY; + } + adapter_adjust_memory(device->adapter, size); } - adapter_adjust_memory(device->adapter, size); - } - device_resource_add(device, resource); + device_resource_add(device, resource); + } return WINED3D_OK; } @@ -248,13 +252,16 @@ void resource_cleanup(struct wined3d_resource *resource) TRACE("Cleaning up resource %p.\n", resource); - if (resource->pool == WINED3D_POOL_DEFAULT && d3d->flags & WINED3D_VIDMEM_ACCOUNTING) + if (!(resource->usage & WINED3DUSAGE_PRIVATE)) { - TRACE("Decrementing device memory pool by %u.\n", resource->size); - adapter_adjust_memory(resource->device->adapter, (INT64)0 - resource->size); - } + if (resource->pool == WINED3D_POOL_DEFAULT && d3d->flags & WINED3D_VIDMEM_ACCOUNTING) + { + TRACE("Decrementing device memory pool by %u.\n", resource->size); + adapter_adjust_memory(resource->device->adapter, (INT64)0 - resource->size); + } - device_resource_released(resource->device, resource); + device_resource_released(resource->device, resource); + } wined3d_resource_acquire(resource); wined3d_cs_destroy_object(resource->device->cs, wined3d_resource_destroy_object, resource); } diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index fdf9e27..625e4f3 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1271,7 +1271,7 @@ static struct wined3d_texture *surface_convert_format(struct wined3d_texture *sr desc.format = dst_format->id; desc.multisample_type = WINED3D_MULTISAMPLE_NONE; desc.multisample_quality = 0; - desc.usage = 0; + desc.usage = WINED3DUSAGE_PRIVATE; desc.pool = WINED3D_POOL_SCRATCH; desc.width = wined3d_texture_get_level_width(src_texture, texture_level); desc.height = wined3d_texture_get_level_height(src_texture, texture_level); diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index e598f80..1bf5a6c 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -870,6 +870,7 @@ enum wined3d_shader_byte_code_format #define WINED3DUSAGE_TEXTAPI 0x10000000 #define WINED3DUSAGE_MASK 0x10007fff +#define WINED3DUSAGE_PRIVATE 0x00400000 #define WINED3DUSAGE_LEGACY_CUBEMAP 0x00800000 #define WINED3DUSAGE_TEXTURE 0x01000000 #define WINED3DUSAGE_OWNDC 0x02000000

1 0

Henri Verbeet : wined3d: Send flushes through the command stream.
by Alexandre Julliard 13 Apr '17

13 Apr '17

Module: wine Branch: master Commit: 972d9dae8b704adc66da87dd3b1daef8b109b787 URL: http://source.winehq.org/git/wine.git/?a=commit;h=972d9dae8b704adc66da87dd3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 13 00:11:00 2017 +0200 wined3d: Send flushes through the command stream. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 26 ++++++++++++++++++++++++++ dlls/wined3d/device.c | 9 +-------- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 28 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 85594e4..6d413d4 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -30,6 +30,7 @@ enum wined3d_cs_op WINED3D_CS_OP_CLEAR, WINED3D_CS_OP_DISPATCH, WINED3D_CS_OP_DRAW, + WINED3D_CS_OP_FLUSH, WINED3D_CS_OP_SET_PREDICATION, WINED3D_CS_OP_SET_VIEWPORT, WINED3D_CS_OP_SET_SCISSOR_RECT, @@ -112,6 +113,11 @@ struct wined3d_cs_draw BOOL indexed; }; +struct wined3d_cs_flush +{ + enum wined3d_cs_op opcode; +}; + struct wined3d_cs_set_predication { enum wined3d_cs_op opcode; @@ -759,6 +765,25 @@ void wined3d_cs_emit_draw(struct wined3d_cs *cs, GLenum primitive_type, int base cs->ops->submit(cs); } +static void wined3d_cs_exec_flush(struct wined3d_cs *cs, const void *data) +{ + struct wined3d_context *context; + + context = context_acquire(cs->device, NULL, 0); + context->gl_info->gl_ops.gl.p_glFlush(); + context_release(context); +} + +void wined3d_cs_emit_flush(struct wined3d_cs *cs) +{ + struct wined3d_cs_flush *op; + + op = cs->ops->require_space(cs, sizeof(*op)); + op->opcode = WINED3D_CS_OP_FLUSH; + + cs->ops->submit(cs); +} + static void wined3d_cs_exec_set_predication(struct wined3d_cs *cs, const void *data) { const struct wined3d_cs_set_predication *op = data; @@ -2007,6 +2032,7 @@ static void (* const wined3d_cs_op_handlers[])(struct wined3d_cs *cs, const void /* WINED3D_CS_OP_CLEAR */ wined3d_cs_exec_clear, /* WINED3D_CS_OP_DISPATCH */ wined3d_cs_exec_dispatch, /* WINED3D_CS_OP_DRAW */ wined3d_cs_exec_draw, + /* WINED3D_CS_OP_FLUSH */ wined3d_cs_exec_flush, /* WINED3D_CS_OP_SET_PREDICATION */ wined3d_cs_exec_set_predication, /* WINED3D_CS_OP_SET_VIEWPORT */ wined3d_cs_exec_set_viewport, /* WINED3D_CS_OP_SET_SCISSOR_RECT */ wined3d_cs_exec_set_scissor_rect, diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index a43e080..83965e7 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3374,8 +3374,6 @@ HRESULT CDECL wined3d_device_begin_scene(struct wined3d_device *device) HRESULT CDECL wined3d_device_end_scene(struct wined3d_device *device) { - struct wined3d_context *context; - TRACE("device %p.\n", device); if (!device->inScene) @@ -3384,12 +3382,7 @@ HRESULT CDECL wined3d_device_end_scene(struct wined3d_device *device) return WINED3DERR_INVALIDCALL; } - context = context_acquire(device, NULL, 0); - /* We only have to do this if we need to read the, swapbuffers performs a flush for us */ - context->gl_info->gl_ops.gl.p_glFlush(); - /* No checkGLcall here to avoid locking the lock just for checking a call that hardly ever - * fails. */ - context_release(context); + wined3d_cs_emit_flush(device->cs); device->inScene = FALSE; return WINED3D_OK; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index b39bc2f..74b61fb 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3258,6 +3258,7 @@ void wined3d_cs_emit_dispatch(struct wined3d_cs *cs, void wined3d_cs_emit_draw(struct wined3d_cs *cs, GLenum primitive_type, int base_vertex_idx, unsigned int start_idx, unsigned int index_count, unsigned int start_instance, unsigned int instance_count, BOOL indexed) DECLSPEC_HIDDEN; +void wined3d_cs_emit_flush(struct wined3d_cs *cs) DECLSPEC_HIDDEN; void wined3d_cs_emit_preload_resource(struct wined3d_cs *cs, struct wined3d_resource *resource) DECLSPEC_HIDDEN; void wined3d_cs_emit_present(struct wined3d_cs *cs, struct wined3d_swapchain *swapchain, const RECT *src_rect, const RECT *dst_rect, HWND dst_window_override, DWORD flags) DECLSPEC_HIDDEN;

1 0

Jacek Caban : server: Introduce async_is_blocking helper and use it in sock_ioctl.
by Alexandre Julliard 12 Apr '17

12 Apr '17

Module: wine Branch: master Commit: 5c8d11270d18eaa3bb11dc7cae3f0006df0d7171 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c8d11270d18eaa3bb11dc7ca… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 12 13:53:41 2017 +0200 server: Introduce async_is_blocking helper and use it in sock_ioctl. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/async.c | 5 +++++ server/file.h | 1 + server/sock.c | 4 ++-- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/server/async.c b/server/async.c index 7323047..f9d8af3 100644 --- a/server/async.c +++ b/server/async.c @@ -472,6 +472,11 @@ struct iosb *async_get_iosb( struct async *async ) return async->iosb ? (struct iosb *)grab_object( async->iosb ) : NULL; } +int async_is_blocking( struct async *async ) +{ + return !async->event && !async->data.apc && !async->data.apc_context; +} + /* find the first pending async in queue */ struct async *find_pending_async( struct async_queue *queue ) { diff --git a/server/file.h b/server/file.h index 94cc37f..5bb935c 100644 --- a/server/file.h +++ b/server/file.h @@ -187,6 +187,7 @@ extern struct completion *fd_get_completion( struct fd *fd, apc_param_t *p_key ) extern void fd_copy_completion( struct fd *src, struct fd *dst ); extern struct iosb *create_iosb( const void *in_data, data_size_t in_size, data_size_t out_size ); extern struct iosb *async_get_iosb( struct async *async ); +extern int async_is_blocking( struct async *async ); extern struct async *find_pending_async( struct async_queue *queue ); extern void cancel_process_asyncs( struct process *process ); diff --git a/server/sock.c b/server/sock.c index 59ab427..fde38c8 100644 --- a/server/sock.c +++ b/server/sock.c @@ -545,14 +545,14 @@ obj_handle_t sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async, switch(code) { case WS_SIO_ADDRESS_LIST_CHANGE: - if ((sock->state & FD_WINE_NONBLOCKING) && blocking) + if ((sock->state & FD_WINE_NONBLOCKING) && async_is_blocking( async )) { set_error( STATUS_CANT_WAIT ); return 0; } if (!(ifchange_q = sock_get_ifchange_q( sock ))) return 0; queue_async( ifchange_q, async ); - if (blocking) wait_handle = alloc_handle( current->process, async, SYNCHRONIZE, 0 ); + if (async_is_blocking( async )) wait_handle = alloc_handle( current->process, async, SYNCHRONIZE, 0 ); set_error( STATUS_PENDING ); return wait_handle; default:

1 0

Jacek Caban : server: Use async_is_blocking in queue_irp.
by Alexandre Julliard 12 Apr '17

12 Apr '17

Module: wine Branch: master Commit: 5126849f7f500d0602f9af9273e7ec47bf2238fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=5126849f7f500d0602f9af927… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 12 13:53:53 2017 +0200 server: Use async_is_blocking in queue_irp. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/device.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/server/device.c b/server/device.c index 8c46a69..82614ee 100644 --- a/server/device.c +++ b/server/device.c @@ -462,12 +462,11 @@ static void set_file_user_ptr( struct device_file *file, client_ptr_t ptr ) } /* queue an irp to the device */ -static obj_handle_t queue_irp( struct device_file *file, struct irp_call *irp, - struct async *async, int blocking ) +static obj_handle_t queue_irp( struct device_file *file, struct irp_call *irp, struct async *async ) { obj_handle_t handle = 0; - if (blocking && !(handle = alloc_handle( current->process, irp, SYNCHRONIZE, 0 ))) return 0; + if (async_is_blocking( async ) && !(handle = alloc_handle( current->process, irp, SYNCHRONIZE, 0 ))) return 0; if (!fd_queue_async( file->fd, async, ASYNC_TYPE_WAIT )) { @@ -501,7 +500,7 @@ static obj_handle_t device_file_read( struct fd *fd, struct async *async, int bl irp = create_irp( file, &params, async ); if (!irp) return 0; - handle = queue_irp( file, irp, async, blocking ); + handle = queue_irp( file, irp, async ); release_object( irp ); return handle; } @@ -522,7 +521,7 @@ static obj_handle_t device_file_write( struct fd *fd, struct async *async, int b irp = create_irp( file, &params, async ); if (!irp) return 0; - handle = queue_irp( file, irp, async, blocking ); + handle = queue_irp( file, irp, async ); release_object( irp ); return handle; } @@ -541,7 +540,7 @@ static obj_handle_t device_file_flush( struct fd *fd, struct async *async, int b irp = create_irp( file, &params, NULL ); if (!irp) return 0; - handle = queue_irp( file, irp, async, blocking ); + handle = queue_irp( file, irp, async ); release_object( irp ); return handle; } @@ -562,7 +561,7 @@ static obj_handle_t device_file_ioctl( struct fd *fd, ioctl_code_t code, struct irp = create_irp( file, &params, async ); if (!irp) return 0; - handle = queue_irp( file, irp, async, blocking ); + handle = queue_irp( file, irp, async ); release_object( irp ); return handle; }

1 0