February 2018 - Wine-Commits

Alexandre Julliard : winex11: Implement refcounting of GL drawables.
by Alexandre Julliard Feb. 12, 2018

Feb. 12, 2018

Module: wine Branch: master Commit: 6dc30a2ed31091698f5a0cac47d0959780f08c9c URL: https://source.winehq.org/git/wine.git/?a=commit;h=6dc30a2ed31091698f5a0cac… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 12 15:34:28 2018 +0100 winex11: Implement refcounting of GL drawables. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/opengl.c | 251 +++++++++++++++++++++++----------------------- 1 file changed, 125 insertions(+), 126 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6dc30a2ed31091698f5a…

1 0

Nikolay Sivov : user32/tests: Extend message conversion tests.
by Alexandre Julliard Feb. 12, 2018

Feb. 12, 2018

Module: wine Branch: master Commit: eebdb457bfefb462b53fb3e690dd08355036a62b URL: https://source.winehq.org/git/wine.git/?a=commit;h=eebdb457bfefb462b53fb3e6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Feb 11 19:30:08 2018 +0300 user32/tests: Extend message conversion tests. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/dialog.c | 153 ++++++++++++++++++++++++++++++++++----------- 1 file changed, 118 insertions(+), 35 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=eebdb457bfefb462b53f…

1 0

Henri Verbeet : ddrawex: Use the global memory allocation helpers.
by Alexandre Julliard Feb. 12, 2018

Feb. 12, 2018

Module: wine Branch: master Commit: 71c2c2dad2ef899397f13388a730e761606fa619 URL: https://source.winehq.org/git/wine.git/?a=commit;h=71c2c2dad2ef899397f13388… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sat Feb 10 01:00:43 2018 +0330 ddrawex: Use the global memory allocation helpers. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddrawex/ddraw.c | 12 +++++++----- dlls/ddrawex/ddrawex_private.h | 2 ++ dlls/ddrawex/main.c | 12 ++++++------ dlls/ddrawex/surface.c | 4 ++-- 4 files changed, 17 insertions(+), 13 deletions(-) diff --git a/dlls/ddrawex/ddraw.c b/dlls/ddrawex/ddraw.c index e2df885..2bb7e90 100644 --- a/dlls/ddrawex/ddraw.c +++ b/dlls/ddrawex/ddraw.c @@ -166,7 +166,7 @@ static ULONG WINAPI ddrawex4_Release(IDirectDraw4 *iface) if (!refcount) { IDirectDraw4_Release(ddrawex->parent); - HeapFree(GetProcessHeap(), 0, ddrawex); + heap_free(ddrawex); } return refcount; @@ -1426,7 +1426,7 @@ HRESULT WINAPI ddrawex_factory_CreateDirectDraw(IDirectDrawFactory *iface, GUID if (outer_unknown) FIXME("Implement aggregation in ddrawex's IDirectDraw interface.\n"); - if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) + if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; object->ref = 1; @@ -1447,9 +1447,11 @@ HRESULT WINAPI ddrawex_factory_CreateDirectDraw(IDirectDrawFactory *iface, GUID return DD_OK; err: - if(object && object->parent) IDirectDraw4_Release(object->parent); - if(parent) IDirectDraw_Release(parent); - HeapFree(GetProcessHeap(), 0, object); + if (object && object->parent) + IDirectDraw4_Release(object->parent); + if (parent) + IDirectDraw_Release(parent); + heap_free(object); *ddraw = NULL; return hr; } diff --git a/dlls/ddrawex/ddrawex_private.h b/dlls/ddrawex/ddrawex_private.h index 0ddec63..f5adf79 100644 --- a/dlls/ddrawex/ddrawex_private.h +++ b/dlls/ddrawex/ddrawex_private.h @@ -19,6 +19,8 @@ #ifndef __WINE_DLLS_DDRAWEX_DDRAWEX_PRIVATE_H #define __WINE_DLLS_DDRAWEX_DDRAWEX_PRIVATE_H +#include "wine/heap.h" + DEFINE_GUID(CLSID_DirectDrawFactory, 0x4fd2a832, 0x86c8, 0x11d0, 0x8f, 0xca, 0x0, 0xc0, 0x4f, 0xd9, 0x18, 0x9d); DEFINE_GUID(IID_IDirectDrawFactory, 0x4fd2a833, 0x86c8, 0x11d0, 0x8f, 0xca, 0x0, 0xc0, 0x4f, 0xd9, 0x18, 0x9d); diff --git a/dlls/ddrawex/main.c b/dlls/ddrawex/main.c index 855b6d7..9fc6c2c 100644 --- a/dlls/ddrawex/main.c +++ b/dlls/ddrawex/main.c @@ -84,7 +84,7 @@ static ULONG WINAPI ddrawex_class_factory_Release(IClassFactory *iface) TRACE("%p decreasing refcount to %u.\n", iface, refcount); if (!refcount) - HeapFree(GetProcessHeap(), 0, factory); + heap_free(factory); return refcount; } @@ -163,7 +163,7 @@ static ULONG WINAPI ddrawex_factory_Release(IDirectDrawFactory *iface) TRACE("%p decreasing refcount to %u.\n", iface, refcount); if (!refcount) - HeapFree(GetProcessHeap(), 0, factory); + heap_free(factory); return refcount; } @@ -195,13 +195,13 @@ static HRESULT ddrawex_factory_create(IUnknown *outer_unknown, REFIID riid, void if (outer_unknown) return CLASS_E_NOAGGREGATION; - if (!(factory = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*factory)))) + if (!(factory = heap_alloc_zero(sizeof(*factory)))) return E_OUTOFMEMORY; factory->IDirectDrawFactory_iface.lpVtbl = &ddrawex_factory_vtbl; if (FAILED(hr = ddrawex_factory_QueryInterface(&factory->IDirectDrawFactory_iface, riid, out))) - HeapFree(GetProcessHeap(), 0, factory); + heap_free(factory); return hr; } @@ -234,8 +234,8 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **out) return CLASS_E_CLASSNOTAVAILABLE; } - factory = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*factory)); - if (factory == NULL) return E_OUTOFMEMORY; + if (!(factory = heap_alloc_zero(sizeof(*factory)))) + return E_OUTOFMEMORY; factory->IClassFactory_iface.lpVtbl = &ddrawex_class_factory_vtbl; factory->ref = 1; diff --git a/dlls/ddrawex/surface.c b/dlls/ddrawex/surface.c index 6f1637e..9fcda86 100644 --- a/dlls/ddrawex/surface.c +++ b/dlls/ddrawex/surface.c @@ -124,7 +124,7 @@ static ULONG WINAPI ddrawex_surface4_Release(IDirectDrawSurface4 *iface) { IDirectDrawSurface4_FreePrivateData(surface->parent, &IID_DDrawexPriv); IDirectDrawSurface4_Release(surface->parent); - HeapFree(GetProcessHeap(), 0, surface); + heap_free(surface); } return refcount; @@ -1208,7 +1208,7 @@ IDirectDrawSurface4 *dds_get_outer(IDirectDrawSurface4 *inner) struct ddrawex_surface *impl; TRACE("Creating new ddrawex surface wrapper for surface %p\n", inner); - impl = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*impl)); + impl = heap_alloc_zero(sizeof(*impl)); impl->ref = 1; impl->IDirectDrawSurface3_iface.lpVtbl = &ddrawex_surface3_vtbl; impl->IDirectDrawSurface4_iface.lpVtbl = &ddrawex_surface4_vtbl;

1 0

Henri Verbeet : d3d8: Set WINED3D_RESOURCE_ACCESS_MAP on 2D textures.
by Alexandre Julliard Feb. 12, 2018

Feb. 12, 2018

Module: wine Branch: master Commit: 405e25d5b495237eca366252e4fdad1f727e9061 URL: https://source.winehq.org/git/wine.git/?a=commit;h=405e25d5b495237eca366252… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sat Feb 10 01:00:42 2018 +0330 d3d8: Set WINED3D_RESOURCE_ACCESS_MAP on 2D textures. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/device.c | 2 +- dlls/d3d8/texture.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 160d296..613cb1e 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1018,7 +1018,7 @@ static HRESULT d3d8_device_create_surface(struct d3d8_device *device, UINT width desc.usage = usage & WINED3DUSAGE_MASK; if (pool == D3DPOOL_SCRATCH) desc.usage |= WINED3DUSAGE_SCRATCH; - desc.access = wined3daccess_from_d3dpool(pool); + desc.access = wined3daccess_from_d3dpool(pool) | WINED3D_RESOURCE_ACCESS_MAP; desc.width = width; desc.height = height; desc.depth = 1; diff --git a/dlls/d3d8/texture.c b/dlls/d3d8/texture.c index 5ad6cf8..6d212a5 100644 --- a/dlls/d3d8/texture.c +++ b/dlls/d3d8/texture.c @@ -1110,7 +1110,7 @@ HRESULT texture_init(struct d3d8_texture *texture, struct d3d8_device *device, desc.usage |= WINED3DUSAGE_TEXTURE; if (pool == D3DPOOL_SCRATCH) desc.usage |= WINED3DUSAGE_SCRATCH; - desc.access = wined3daccess_from_d3dpool(pool); + desc.access = wined3daccess_from_d3dpool(pool) | WINED3D_RESOURCE_ACCESS_MAP; desc.width = width; desc.height = height; desc.depth = 1; @@ -1157,7 +1157,7 @@ HRESULT cubetexture_init(struct d3d8_texture *texture, struct d3d8_device *devic desc.usage |= WINED3DUSAGE_LEGACY_CUBEMAP | WINED3DUSAGE_TEXTURE; if (pool == D3DPOOL_SCRATCH) desc.usage |= WINED3DUSAGE_SCRATCH; - desc.access = wined3daccess_from_d3dpool(pool); + desc.access = wined3daccess_from_d3dpool(pool) | WINED3D_RESOURCE_ACCESS_MAP; desc.width = edge_length; desc.height = edge_length; desc.depth = 1;

1 0

Alexandre Julliard : winex11: Get rid of the WineGLInfo structure.
by Alexandre Julliard Feb. 12, 2018

Feb. 12, 2018

Module: wine Branch: master Commit: 7bc327a1d13418d8da7ab47abc5fe11e1c8a4dc1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7bc327a1d13418d8da7ab47a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 12 16:06:01 2018 +0100 winex11: Get rid of the WineGLInfo structure. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/opengl.c | 145 +++++++++++++++++++--------------------------- 1 file changed, 59 insertions(+), 86 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7bc327a1d13418d8da7a…

1 0

Alexandre Julliard : winex11: Use the client window support also for XComposite child windows.
by Alexandre Julliard Feb. 12, 2018

Feb. 12, 2018

Module: wine Branch: master Commit: 1ce36987eba0a9310f3e0ac6bd55148ededca7c6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1ce36987eba0a9310f3e0ac6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 12 15:49:23 2018 +0100 winex11: Use the client window support also for XComposite child windows. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/opengl.c | 62 ++++--------------------- dlls/winex11.drv/window.c | 116 +++++++++++++++++++++++++++------------------- dlls/winex11.drv/x11drv.h | 4 +- 3 files changed, 80 insertions(+), 102 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1ce36987eba0a9310f3e…

1 0

Alexandre Julliard : winex11: Hold a reference to the drawable from the GL context.
by Alexandre Julliard Feb. 12, 2018

Feb. 12, 2018

Module: wine Branch: master Commit: ac4f2ac36f1b06f7bfe7647753dacbc4ce8522b3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ac4f2ac36f1b06f7bfe76477… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 12 15:41:45 2018 +0100 winex11: Hold a reference to the drawable from the GL context. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/opengl.c | 76 ++++++++++++++++++++++++++++++++++++----------- dlls/winex11.drv/window.c | 59 ++++++++++++++++++++++++++++-------- 2 files changed, 106 insertions(+), 29 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ac4f2ac36f1b06f7bfe7…

1 0

Zhiyi Zhang : urlmon: Do not canonicalize Unicode characters.
by Alexandre Julliard Feb. 12, 2018

Feb. 12, 2018

Module: wine Branch: master Commit: ac066d3eee85fd6e3a27ca59b158c5e040d91727 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ac066d3eee85fd6e3a27ca59… Author: Zhiyi Zhang <yi.gd.cn(a)gmail.com> Date: Fri Feb 9 23:22:51 2018 +0800 urlmon: Do not canonicalize Unicode characters. Signed-off-by: Zhiyi Zhang <yi.gd.cn(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/tests/uri.c | 268 +++++++++++++++++++++++++++++++++++++++++++++++- dlls/urlmon/uri.c | 21 ++-- 2 files changed, 279 insertions(+), 10 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ac066d3eee85fd6e3a27…

1 0

Henri Verbeet : d3d8: Set WINED3D_RESOURCE_ACCESS_MAP on buffers.
by Alexandre Julliard Feb. 12, 2018

Feb. 12, 2018

Module: wine Branch: master Commit: 2cf1db59ee333898e23aa90be6aa522afed154e3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2cf1db59ee333898e23aa90b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sat Feb 10 01:00:41 2018 +0330 d3d8: Set WINED3D_RESOURCE_ACCESS_MAP on buffers. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/buffer.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d8/buffer.c b/dlls/d3d8/buffer.c index b30762b..71b9dac 100644 --- a/dlls/d3d8/buffer.c +++ b/dlls/d3d8/buffer.c @@ -289,7 +289,7 @@ HRESULT vertexbuffer_init(struct d3d8_vertexbuffer *buffer, struct d3d8_device * desc.byte_width = size; desc.usage = usage & WINED3DUSAGE_MASK; desc.bind_flags = WINED3D_BIND_VERTEX_BUFFER; - desc.access = wined3daccess_from_d3dpool(pool); + desc.access = wined3daccess_from_d3dpool(pool) | WINED3D_RESOURCE_ACCESS_MAP; desc.misc_flags = 0; desc.structure_byte_stride = 0; @@ -577,7 +577,7 @@ HRESULT indexbuffer_init(struct d3d8_indexbuffer *buffer, struct d3d8_device *de if (pool == D3DPOOL_SCRATCH) desc.usage |= WINED3DUSAGE_SCRATCH; desc.bind_flags = WINED3D_BIND_INDEX_BUFFER; - desc.access = wined3daccess_from_d3dpool(pool); + desc.access = wined3daccess_from_d3dpool(pool) | WINED3D_RESOURCE_ACCESS_MAP; desc.misc_flags = 0; desc.structure_byte_stride = 0;

1 0

Jacek Caban : mshtml: Use nsIDOMElement for Gecko elements in npplugin.c.
by Alexandre Julliard Feb. 12, 2018

Feb. 12, 2018

Module: wine Branch: master Commit: 364e1c87a55483dea8dd527a759965d35fc630fd URL: https://source.winehq.org/git/wine.git/?a=commit;h=364e1c87a55483dea8dd527a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 12 01:30:40 2018 +0100 mshtml: Use nsIDOMElement for Gecko elements in npplugin.c. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/npplugin.c | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/dlls/mshtml/npplugin.c b/dlls/mshtml/npplugin.c index 302ff42..0d94d0d 100644 --- a/dlls/mshtml/npplugin.c +++ b/dlls/mshtml/npplugin.c @@ -211,11 +211,10 @@ typedef struct _NPPluginFuncs { NPP_LostFocusPtr lostfocus; } NPPluginFuncs; -static nsIDOMHTMLElement *get_dom_element(NPP instance) +static nsIDOMElement *get_dom_element(NPP instance) { nsISupports *instance_unk = (nsISupports*)instance->ndata; nsIPluginInstance *plugin_instance; - nsIDOMHTMLElement *html_elem; nsIDOMElement *elem; nsresult nsres; @@ -232,24 +231,17 @@ static nsIDOMHTMLElement *get_dom_element(NPP instance) return NULL; } - nsres = nsIDOMElement_QueryInterface(elem, &IID_nsIDOMHTMLElement, (void**)&html_elem); - nsIDOMElement_Release(elem); - if(NS_FAILED(nsres)) { - ERR("Could not get nsIDOMHTMLElement iface: %08x\n", nsres); - return NULL; - } - - return html_elem; + return elem; } -static HTMLInnerWindow *get_elem_window(nsIDOMHTMLElement *elem) +static HTMLInnerWindow *get_elem_window(nsIDOMElement *elem) { mozIDOMWindowProxy *mozwindow; nsIDOMDocument *nsdoc; HTMLOuterWindow *window; nsresult nsres; - nsres = nsIDOMHTMLElement_GetOwnerDocument(elem, &nsdoc); + nsres = nsIDOMElement_GetOwnerDocument(elem, &nsdoc); if(NS_FAILED(nsres)) return NULL; @@ -268,7 +260,7 @@ static NPError CDECL NPP_New(NPMIMEType pluginType, NPP instance, UINT16 mode, I char **argv, NPSavedData *saved) { HTMLPluginContainer *container; - nsIDOMHTMLElement *nselem; + nsIDOMElement *nselem; HTMLInnerWindow *window; HTMLDOMNode *node; NPError err = NPERR_NO_ERROR; @@ -285,12 +277,12 @@ static NPError CDECL NPP_New(NPMIMEType pluginType, NPP instance, UINT16 mode, I window = get_elem_window(nselem); if(!window) { ERR("Could not get element's window object\n"); - nsIDOMHTMLElement_Release(nselem); + nsIDOMElement_Release(nselem); return NPERR_GENERIC_ERROR; } hres = get_node(window->doc, (nsIDOMNode*)nselem, TRUE, &node); - nsIDOMHTMLElement_Release(nselem); + nsIDOMElement_Release(nselem); if(FAILED(hres)) return NPERR_GENERIC_ERROR;

1 0