February 2017 - Wine-Commits

Francois Gouget : winhttp: Add __WINE_ALLOC_SIZE attributes to heap_xxx() functions.
by Alexandre Julliard Feb. 15, 2017

Feb. 15, 2017

Module: wine Branch: master Commit: c43dd195de0ca0016ed248aace6ac55056541592 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c43dd195de0ca0016ed248aac… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Feb 8 17:53:47 2017 +0100 winhttp: Add __WINE_ALLOC_SIZE attributes to heap_xxx() functions. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/winhttp_private.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index 388fc33..46c2aaa 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -306,22 +306,22 @@ void destroy_authinfo( struct authinfo * ) DECLSPEC_HIDDEN; extern HRESULT WinHttpRequest_create( void ** ) DECLSPEC_HIDDEN; void release_typelib( void ) DECLSPEC_HIDDEN; -static inline void *heap_alloc( SIZE_T size ) +static inline void* __WINE_ALLOC_SIZE(1) heap_alloc( SIZE_T size ) { return HeapAlloc( GetProcessHeap(), 0, size ); } -static inline void *heap_alloc_zero( SIZE_T size ) +static inline void* __WINE_ALLOC_SIZE(1) heap_alloc_zero( SIZE_T size ) { return HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, size ); } -static inline void *heap_realloc( LPVOID mem, SIZE_T size ) +static inline void* __WINE_ALLOC_SIZE(2) heap_realloc( LPVOID mem, SIZE_T size ) { return HeapReAlloc( GetProcessHeap(), 0, mem, size ); } -static inline void *heap_realloc_zero( LPVOID mem, SIZE_T size ) +static inline void* __WINE_ALLOC_SIZE(2) heap_realloc_zero( LPVOID mem, SIZE_T size ) { return HeapReAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, mem, size ); }

1 0

Henri Verbeet : wined3d: Get rid of the unused "depth_blt_texture" field from struct wined3d_device.
by Alexandre Julliard Feb. 15, 2017

Feb. 15, 2017

Module: wine Branch: master Commit: 908010d47bfeaed417250897bb18e569f5632394 URL: http://source.winehq.org/git/wine.git/?a=commit;h=908010d47bfeaed417250897b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 15 14:17:12 2017 +0100 wined3d: Get rid of the unused "depth_blt_texture" field from struct wined3d_device. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 17 ----------------- dlls/wined3d/wined3d_private.h | 3 --- 2 files changed, 20 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index b4b1803..6452420 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1126,15 +1126,6 @@ HRESULT CDECL wined3d_device_uninit_3d(struct wined3d_device *device) wine_rb_clear(&device->samplers, device_free_sampler, NULL); - /* Destroy the depth blt resources, they will be invalid after the reset. Also free shader - * private data, it might contain opengl pointers - */ - if (device->depth_blt_texture) - { - gl_info->gl_ops.gl.p_glDeleteTextures(1, &device->depth_blt_texture); - device->depth_blt_texture = 0; - } - /* Destroy the shader backend. Note that this has to happen after all shaders are destroyed. */ device->blitter->free_private(device); device->shader_backend->shader_free_private(device); @@ -4540,7 +4531,6 @@ void CDECL wined3d_device_evict_managed_resources(struct wined3d_device *device) static void delete_opengl_contexts(struct wined3d_device *device, struct wined3d_swapchain *swapchain) { struct wined3d_resource *resource, *cursor; - const struct wined3d_gl_info *gl_info; struct wined3d_context *context; struct wined3d_shader *shader; @@ -4556,13 +4546,6 @@ static void delete_opengl_contexts(struct wined3d_device *device, struct wined3d } context = context_acquire(device, NULL); - gl_info = context->gl_info; - - if (device->depth_blt_texture) - { - gl_info->gl_ops.gl.p_glDeleteTextures(1, &device->depth_blt_texture); - device->depth_blt_texture = 0; - } device->blitter->free_private(device); device->shader_backend->shader_free_private(device); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 23a8559..6b3d3e6 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2618,9 +2618,6 @@ struct wined3d_device struct wined3d_fb_state fb; struct wined3d_rendertarget_view *auto_depth_stencil_view; - /* For rendering to a texture using glCopyTexImage */ - GLuint depth_blt_texture; - /* Cursor management */ UINT xHotSpot; UINT yHotSpot;

1 0

Michael Stefaniuc : kernel32: Remove always true if conditions ( coccinellery).
by Alexandre Julliard Feb. 15, 2017

Feb. 15, 2017

Module: wine Branch: master Commit: 1b3cbf52b2175426a55592f2891b85e55329a2bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b3cbf52b2175426a55592f28… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Feb 15 10:51:31 2017 +0100 kernel32: Remove always true if conditions (coccinellery). Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/time.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/time.c b/dlls/kernel32/time.c index 09d06e8..fbe5811 100644 --- a/dlls/kernel32/time.c +++ b/dlls/kernel32/time.c @@ -1308,11 +1308,8 @@ BOOL WINAPI FileTimeToDosDateTime( const FILETIME *ft, LPWORD fatdate, } unixtime = t; tm = gmtime( &unixtime ); - if (fattime) - *fattime = (tm->tm_hour << 11) + (tm->tm_min << 5) + (tm->tm_sec / 2); - if (fatdate) - *fatdate = ((tm->tm_year - 80) << 9) + ((tm->tm_mon + 1) << 5) - + tm->tm_mday; + *fattime = (tm->tm_hour << 11) + (tm->tm_min << 5) + (tm->tm_sec / 2); + *fatdate = ((tm->tm_year - 80) << 9) + ((tm->tm_mon + 1) << 5) + tm->tm_mday; return TRUE; }

1 0

Henri Verbeet : wined3d: Pass a texture and sub-resource index to context_acquire().
by Alexandre Julliard Feb. 15, 2017

Feb. 15, 2017

Module: wine Branch: master Commit: 2641c5c28f407fb157028c8e7dda5e306b6b313c URL: http://source.winehq.org/git/wine.git/?a=commit;h=2641c5c28f407fb157028c8e7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 15 14:17:15 2017 +0100 wined3d: Pass a texture and sub-resource index to context_acquire(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 6 +++--- dlls/wined3d/buffer.c | 14 +++++++------- dlls/wined3d/context.c | 35 +++++++++++++++-------------------- dlls/wined3d/device.c | 21 ++++++++++++--------- dlls/wined3d/drawprim.c | 4 ++-- dlls/wined3d/glsl_shader.c | 2 +- dlls/wined3d/query.c | 31 +++++++++++++++++++------------ dlls/wined3d/sampler.c | 4 ++-- dlls/wined3d/surface.c | 37 +++++++++++++++++++++---------------- dlls/wined3d/swapchain.c | 8 ++++---- dlls/wined3d/texture.c | 20 ++++++++++---------- dlls/wined3d/view.c | 6 +++--- dlls/wined3d/wined3d_private.h | 2 +- 13 files changed, 100 insertions(+), 90 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2641c5c28f407fb157028…

1 0

Jacek Caban : mshtml: Release event target in XMLHttpRequest destructor.
by Alexandre Julliard Feb. 14, 2017

Feb. 14, 2017

Module: wine Branch: master Commit: 68d2f9c6a65e9d71feae92191123ef578e0e5ab2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68d2f9c6a65e9d71feae92191… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 13 21:11:57 2017 +0100 mshtml: Release event target in XMLHttpRequest destructor. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/xmlhttprequest.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/mshtml/xmlhttprequest.c b/dlls/mshtml/xmlhttprequest.c index efbb79f..51e2445 100644 --- a/dlls/mshtml/xmlhttprequest.c +++ b/dlls/mshtml/xmlhttprequest.c @@ -252,6 +252,7 @@ static ULONG WINAPI HTMLXMLHttpRequest_Release(IHTMLXMLHttpRequest *iface) if(!ref) { if(This->event_listener) detach_xhr_event_listener(This->event_listener); + release_event_target(&This->event_target); release_dispex(&This->event_target.dispex); nsIXMLHttpRequest_Release(This->nsxhr); heap_free(This);

1 0

Jacek Caban : mshtml: Use get_handler_vector in detach_event.
by Alexandre Julliard Feb. 14, 2017

Feb. 14, 2017

Module: wine Branch: master Commit: 57239e7822ac7d3bc41a3734ed2201bc801ab208 URL: http://source.winehq.org/git/wine.git/?a=commit;h=57239e7822ac7d3bc41a3734e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 13 21:11:38 2017 +0100 mshtml: Use get_handler_vector in detach_event. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index d144eeb..e844728 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -1539,9 +1539,9 @@ HRESULT attach_event(EventTarget *event_target, BSTR name, IDispatch *disp, VARI HRESULT detach_event(EventTarget *event_target, BSTR name, IDispatch *disp) { - event_target_t *data; + handler_vector_t *handler_vector; eventid_t eid; - DWORD i = 0; + unsigned i; eid = attr_to_eid(name); if(eid == EVENTID_LAST) { @@ -1549,19 +1549,15 @@ HRESULT detach_event(EventTarget *event_target, BSTR name, IDispatch *disp) return S_OK; } - data = get_event_target_data(event_target, FALSE); - if(!data) - return S_OK; - - if(!data->event_table[eid]) + handler_vector = get_handler_vector(event_target, eid, FALSE); + if(!handler_vector) return S_OK; - while(i < data->event_table[eid]->handler_cnt) { - if(data->event_table[eid]->handlers[i] == disp) { - IDispatch_Release(data->event_table[eid]->handlers[i]); - data->event_table[eid]->handlers[i] = NULL; + for(i = 0; i < handler_vector->handler_cnt; i++) { + if(handler_vector->handlers[i] == disp) { + IDispatch_Release(handler_vector->handlers[i]); + handler_vector->handlers[i] = NULL; } - i++; } return S_OK;

1 0

Jacek Caban : mshtml: Use get_handler_vector in call_event_handlers.
by Alexandre Julliard Feb. 14, 2017

Feb. 14, 2017

Module: wine Branch: master Commit: 02f0483d378538b30e4a5981218dee0e6de3322b URL: http://source.winehq.org/git/wine.git/?a=commit;h=02f0483d378538b30e4a59812… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 13 21:11:21 2017 +0100 mshtml: Use get_handler_vector in call_event_handlers. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 0f835e2..c8438a7 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -1004,12 +1004,12 @@ static BOOL is_cp_event(cp_static_data_t *data, DISPID dispid) void call_event_handlers(HTMLDocumentNode *doc, HTMLEventObj *event_obj, EventTarget *event_target, ConnectionPointContainer *cp_container, eventid_t eid, IDispatch *this_obj) { - event_target_t *data = get_event_target_data(event_target, FALSE); + handler_vector_t *handler_vector = get_handler_vector(event_target, eid, FALSE); const BOOL cancelable = event_info[eid].flags & EVENT_CANCELABLE; VARIANT v; HRESULT hres; - if(data && data->event_table[eid] && data->event_table[eid]->handler_prop) { + if(handler_vector && handler_vector->handler_prop) { DISPID named_arg = DISPID_THIS; VARIANTARG arg; DISPPARAMS dp = {&arg, &named_arg, 1, 1}; @@ -1019,7 +1019,7 @@ void call_event_handlers(HTMLDocumentNode *doc, HTMLEventObj *event_obj, EventTa V_VT(&v) = VT_EMPTY; TRACE("%s >>>\n", debugstr_w(event_info[eid].name)); - hres = call_disp_func(data->event_table[eid]->handler_prop, &dp, &v); + hres = call_disp_func(handler_vector->handler_prop, &dp, &v); if(hres == S_OK) { TRACE("%s <<< %s\n", debugstr_w(event_info[eid].name), debugstr_variant(&v)); @@ -1037,7 +1037,7 @@ void call_event_handlers(HTMLDocumentNode *doc, HTMLEventObj *event_obj, EventTa } } - if(data && data->event_table[eid] && data->event_table[eid]->handler_cnt) { + if(handler_vector && handler_vector->handler_cnt) { VARIANTARG arg; DISPPARAMS dp = {&arg, NULL, 1, 0}; int i; @@ -1045,13 +1045,13 @@ void call_event_handlers(HTMLDocumentNode *doc, HTMLEventObj *event_obj, EventTa V_VT(&arg) = VT_DISPATCH; V_DISPATCH(&arg) = (IDispatch*)&event_obj->dispex.IDispatchEx_iface; - i = data->event_table[eid]->handler_cnt; + i = handler_vector->handler_cnt; while(i--) { - if(data->event_table[eid]->handlers[i]) { + if(handler_vector->handlers[i]) { V_VT(&v) = VT_EMPTY; TRACE("%s [%d] >>>\n", debugstr_w(event_info[eid].name), i); - hres = call_disp_func(data->event_table[eid]->handlers[i], &dp, &v); + hres = call_disp_func(handler_vector->handlers[i], &dp, &v); if(hres == S_OK) { TRACE("%s [%d] <<<\n", debugstr_w(event_info[eid].name), i);

1 0

Jacek Caban : mshtml: Use inner window's event target for body element.
by Alexandre Julliard Feb. 14, 2017

Feb. 14, 2017

Module: wine Branch: master Commit: 74a759673d4aba26aa6312073c5cb3a7441143bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=74a759673d4aba26aa6312073… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 13 21:10:44 2017 +0100 mshtml: Use inner window's event target for body element. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlbody.c | 4 ++-- dlls/mshtml/htmldoc.c | 2 -- dlls/mshtml/htmlwindow.c | 4 +++- dlls/mshtml/mshtml_private.h | 1 - 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/htmlbody.c b/dlls/mshtml/htmlbody.c index 729ef82..fbd04aa 100644 --- a/dlls/mshtml/htmlbody.c +++ b/dlls/mshtml/htmlbody.c @@ -829,8 +829,8 @@ static event_target_t **HTMLBodyElement_get_event_target_ptr(HTMLDOMNode *iface) { HTMLBodyElement *This = impl_from_HTMLDOMNode(iface); - return This->textcont.element.node.doc - ? &This->textcont.element.node.doc->body_event_target + return This->textcont.element.node.doc && This->textcont.element.node.doc->window + ? &This->textcont.element.node.doc->window->event_target.ptr : &This->textcont.element.node.event_target.ptr; } diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index b672c2d..5c15772 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -4644,8 +4644,6 @@ static void HTMLDocumentNode_destructor(HTMLDOMNode *iface) heap_free(This->elem_vars); detach_events(This); - if(This->body_event_target) - release_event_target(This->body_event_target); if(This->catmgr) ICatInformation_Release(This->catmgr); diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index b4ec425..b1efc0d 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -253,6 +253,8 @@ static void release_inner_window(HTMLInnerWindow *This) htmldoc_release(&This->doc->basedoc); } + if(This->event_target.ptr) + release_event_target(This->event_target.ptr); release_dispex(&This->event_target.dispex); for(i=0; i < This->global_prop_cnt; i++) @@ -2943,7 +2945,7 @@ static HRESULT HTMLWindow_invoke(DispatchEx *dispex, DISPID id, LCID lcid, WORD static event_target_t **HTMLWindow_get_event_target_ptr(DispatchEx *dispex) { HTMLInnerWindow *This = impl_from_DispatchEx(dispex); - return &This->doc->body_event_target; + return &This->event_target.ptr; } static void HTMLWindow_bind_event(DispatchEx *dispex, int eid) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index f27b674..8bc0599 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -801,7 +801,6 @@ struct HTMLDocumentNode { nsIDOMHTMLDocument *nsdoc; BOOL content_ready; - event_target_t *body_event_target; IHTMLDOMImplementation *dom_implementation;

1 0

Nikolay Sivov : d2d1: Added support for ID2D1GdiInteropRenderTarget interface.
by Alexandre Julliard Feb. 14, 2017

Feb. 14, 2017

Module: wine Branch: master Commit: 74ed5c7067188db0eff739ed1f36ff2142421d6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=74ed5c7067188db0eff739ed1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 14 18:19:00 2017 +0300 d2d1: Added support for ID2D1GdiInteropRenderTarget interface. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/bitmap_render_target.c | 8 +- dlls/d2d1/d2d1_private.h | 7 +- dlls/d2d1/dc_render_target.c | 8 +- dlls/d2d1/factory.c | 18 +--- dlls/d2d1/hwnd_render_target.c | 8 +- dlls/d2d1/render_target.c | 137 ++++++++++++++++++++++++- dlls/d2d1/tests/d2d1.c | 209 ++++++++++++++++++++++++++++++++++++++- dlls/d2d1/wic_render_target.c | 8 +- 8 files changed, 371 insertions(+), 32 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=74ed5c7067188db0eff73…

1 0

Piotr Caban : wine.inf: Add Dynamic DST/{First, Last}Entry registry keys.
by Alexandre Julliard Feb. 14, 2017

Feb. 14, 2017

Module: wine Branch: master Commit: 8af23cb93e4e1cd3686984399cb50d755f5171e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8af23cb93e4e1cd3686984399… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Feb 14 14:52:56 2017 +0100 wine.inf: Add Dynamic DST/{First,Last}Entry registry keys. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/wine.inf.in | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8af23cb93e4e1cd368698…

1 0