February 2018 - Wine-Commits

Alexandre Julliard : ntdll: Use MAP_SHARED also for read-only mappings.
by Alexandre Julliard Feb. 6, 2018

Feb. 6, 2018

Module: wine Branch: master Commit: b1f8a91e6c1f9bf5524eb130a912fb8727f258ff URL: https://source.winehq.org/git/wine.git/?a=commit;h=b1f8a91e6c1f9bf5524eb130… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 6 10:43:12 2018 +0100 ntdll: Use MAP_SHARED also for read-only mappings. This essentially reverts commit dac252ecb42fb17c2f3f2deb559262514b58e990. It's necessary for macOS. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/virtual.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 534daf9..426af01 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -1146,7 +1146,7 @@ static NTSTATUS map_file_into_view( struct file_view *view, int fd, size_t start { void *ptr; int prot = VIRTUAL_GetUnixProt( vprot | VPROT_COMMITTED /* make sure it is accessible */ ); - unsigned int flags = MAP_FIXED | ((vprot & VPROT_WRITE) ? MAP_SHARED : MAP_PRIVATE); + unsigned int flags = MAP_FIXED | ((vprot & VPROT_WRITECOPY) ? MAP_PRIVATE : MAP_SHARED); assert( start < view->size ); assert( start + size <= view->size ); @@ -1171,7 +1171,7 @@ static NTSTATUS map_file_into_view( struct file_view *view, int fd, size_t start break; case ENOEXEC: case ENODEV: /* filesystem doesn't support mmap(), fall back to read() */ - if (flags & MAP_SHARED) + if (vprot & VPROT_WRITE) { ERR( "shared writable mmap not supported, broken filesystem?\n" ); return STATUS_NOT_SUPPORTED;

1 0

Józef Kucia : wined3d: Use wined3d_bit_scan() in wined3d_enable_clip_distances().
by Alexandre Julliard Feb. 6, 2018

Feb. 6, 2018

Module: wine Branch: master Commit: dea7b8890cc9c7c2f2cf74a3974921927bb27bd5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dea7b8890cc9c7c2f2cf74a3… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Feb 6 11:40:03 2018 +0100 wined3d: Use wined3d_bit_scan() in wined3d_enable_clip_distances(). 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/wined3d/context.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 2e12d75..81a0f4f 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2368,16 +2368,16 @@ void context_enable_clip_distances(struct wined3d_context *context, unsigned int context->clip_distance_mask = enable_mask; enable_mask &= ~current_mask; - for (i = 0; enable_mask; enable_mask >>= 1, ++i) + while (enable_mask) { - if (enable_mask & 1) - gl_info->gl_ops.gl.p_glEnable(GL_CLIP_DISTANCE0 + i); + i = wined3d_bit_scan(&enable_mask); + gl_info->gl_ops.gl.p_glEnable(GL_CLIP_DISTANCE0 + i); } disable_mask &= current_mask; - for (i = 0; disable_mask; disable_mask >>= 1, ++i) + while (disable_mask) { - if (disable_mask & 1) - gl_info->gl_ops.gl.p_glDisable(GL_CLIP_DISTANCE0 + i); + i = wined3d_bit_scan(&disable_mask); + gl_info->gl_ops.gl.p_glDisable(GL_CLIP_DISTANCE0 + i); } checkGLcall("toggle clip distances"); }

1 0

Nikolay Sivov : msxml3: Use the global HeapAlloc() helpers.
by Alexandre Julliard Feb. 6, 2018

Feb. 6, 2018

Module: wine Branch: master Commit: 9cb8629fb7d5b80dbaeef3c868b63ae5293e0ccb URL: https://source.winehq.org/git/wine.git/?a=commit;h=9cb8629fb7d5b80dbaeef3c8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 6 08:57:31 2018 +0300 msxml3: Use the global HeapAlloc() helpers. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/saxreader.c | 6 +++--- dlls/msxml3/schema.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index be2caf9..e8d5b27 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -561,7 +561,7 @@ static BOOL bstr_pool_insert(struct bstrpool *pool, BSTR pool_entry) { if (!pool->pool) { - pool->pool = HeapAlloc(GetProcessHeap(), 0, 16 * sizeof(*pool->pool)); + pool->pool = heap_alloc(16 * sizeof(*pool->pool)); if (!pool->pool) return FALSE; @@ -570,7 +570,7 @@ static BOOL bstr_pool_insert(struct bstrpool *pool, BSTR pool_entry) } else if (pool->index == pool->len) { - BSTR *realloc = HeapReAlloc(GetProcessHeap(), 0, pool->pool, pool->len * 2 * sizeof(*realloc)); + BSTR *realloc = heap_realloc(pool->pool, pool->len * 2 * sizeof(*realloc)); if (!realloc) return FALSE; @@ -590,7 +590,7 @@ static void free_bstr_pool(struct bstrpool *pool) for (i = 0; i < pool->index; i++) SysFreeString(pool->pool[i]); - HeapFree(GetProcessHeap(), 0, pool->pool); + heap_free(pool->pool); pool->pool = NULL; pool->index = pool->len = 0; diff --git a/dlls/msxml3/schema.c b/dlls/msxml3/schema.c index 30272cb..8087985 100644 --- a/dlls/msxml3/schema.c +++ b/dlls/msxml3/schema.c @@ -749,7 +749,7 @@ void schemasInit(void) /* Resource is loaded as raw data, * need a null-terminated string */ while (buf[datatypes_len - 1] != '>') datatypes_len--; - datatypes_src = HeapAlloc(GetProcessHeap(), 0, datatypes_len + 1); + datatypes_src = heap_alloc(datatypes_len + 1); memcpy(datatypes_src, buf, datatypes_len); datatypes_src[datatypes_len] = 0; @@ -763,7 +763,7 @@ void schemasInit(void) void schemasCleanup(void) { xmlSchemaFree(datatypes_schema); - HeapFree(GetProcessHeap(), 0, datatypes_src); + heap_free(datatypes_src); xmlSetExternalEntityLoader(_external_entity_loader); }

1 0

Jacek Caban : mshtml: Use IDOMKeyboardEvent instead of nsIDOMKeyEvent in IHTMLEventObj implementation.
by Alexandre Julliard Feb. 6, 2018

Feb. 6, 2018

Module: wine Branch: master Commit: b8c5f98c06abe74372f8373ff24e39872bb3fb96 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b8c5f98c06abe74372f8373f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 6 00:10:35 2018 +0100 mshtml: Use IDOMKeyboardEvent instead of nsIDOMKeyEvent in IHTMLEventObj implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 51 +++++++++---------------------------------------- 1 file changed, 9 insertions(+), 42 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index c77f2b7..9f115a8 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -414,16 +414,8 @@ static HRESULT WINAPI HTMLEventObj_get_altKey(IHTMLEventObj *iface, VARIANT_BOOL if(This->event && This->event->mouse_event) return IDOMMouseEvent_get_altKey(&This->event->IDOMMouseEvent_iface, p); - if(This->event) { - nsIDOMKeyEvent *key_event; - nsresult nsres; - - nsres = nsIDOMEvent_QueryInterface(This->event->nsevent, &IID_nsIDOMKeyEvent, (void**)&key_event); - if(NS_SUCCEEDED(nsres)) { - nsIDOMKeyEvent_GetAltKey(key_event, &ret); - nsIDOMKeyEvent_Release(key_event); - } - } + if(This->event && This->event->keyboard_event) + return IDOMKeyboardEvent_get_altKey(&This->event->IDOMKeyboardEvent_iface, p); *p = variant_bool(ret); return S_OK; @@ -439,16 +431,8 @@ static HRESULT WINAPI HTMLEventObj_get_ctrlKey(IHTMLEventObj *iface, VARIANT_BOO if(This->event && This->event->mouse_event) return IDOMMouseEvent_get_ctrlKey(&This->event->IDOMMouseEvent_iface, p); - if(This->event) { - nsIDOMKeyEvent *key_event; - nsresult nsres; - - nsres = nsIDOMEvent_QueryInterface(This->event->nsevent, &IID_nsIDOMKeyEvent, (void**)&key_event); - if(NS_SUCCEEDED(nsres)) { - nsIDOMKeyEvent_GetCtrlKey(key_event, &ret); - nsIDOMKeyEvent_Release(key_event); - } - } + if(This->event && This->event->keyboard_event) + return IDOMKeyboardEvent_get_ctrlKey(&This->event->IDOMKeyboardEvent_iface, p); *p = variant_bool(ret); return S_OK; @@ -464,16 +448,8 @@ static HRESULT WINAPI HTMLEventObj_get_shiftKey(IHTMLEventObj *iface, VARIANT_BO if(This->event && This->event->mouse_event) return IDOMMouseEvent_get_shiftKey(&This->event->IDOMMouseEvent_iface, p); - if(This->event) { - nsIDOMKeyEvent *key_event; - nsresult nsres; - - nsres = nsIDOMEvent_QueryInterface(This->event->nsevent, &IID_nsIDOMKeyEvent, (void**)&key_event); - if(NS_SUCCEEDED(nsres)) { - nsIDOMKeyEvent_GetShiftKey(key_event, &ret); - nsIDOMKeyEvent_Release(key_event); - } - } + if(This->event && This->event->keyboard_event) + return IDOMKeyboardEvent_get_shiftKey(&This->event->IDOMKeyboardEvent_iface, p); *p = variant_bool(ret); return S_OK; @@ -557,22 +533,13 @@ static HRESULT WINAPI HTMLEventObj_put_keyCode(IHTMLEventObj *iface, LONG v) static HRESULT WINAPI HTMLEventObj_get_keyCode(IHTMLEventObj *iface, LONG *p) { HTMLEventObj *This = impl_from_IHTMLEventObj(iface); - UINT32 key_code = 0; TRACE("(%p)->(%p)\n", This, p); - if(This->event) { - nsIDOMKeyEvent *key_event; - nsresult nsres; - - nsres = nsIDOMEvent_QueryInterface(This->event->nsevent, &IID_nsIDOMKeyEvent, (void**)&key_event); - if(NS_SUCCEEDED(nsres)) { - nsIDOMKeyEvent_GetKeyCode(key_event, &key_code); - nsIDOMKeyEvent_Release(key_event); - } - } + if(This->event && This->event->keyboard_event) + return IDOMKeyboardEvent_get_keyCode(&This->event->IDOMKeyboardEvent_iface, p); - *p = key_code; + *p = 0; return S_OK; }

1 0

Henri Verbeet : ddraw: Use wined3d_buffer_create() in d3d_execute_buffer_execute().
by Alexandre Julliard Feb. 6, 2018

Feb. 6, 2018

Module: wine Branch: master Commit: a3ca7a308afc886af916e459d2a66b9936c2ee7f URL: https://source.winehq.org/git/wine.git/?a=commit;h=a3ca7a308afc886af916e459… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Feb 6 03:22:15 2018 +0330 ddraw: Use wined3d_buffer_create() in d3d_execute_buffer_execute(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/executebuffer.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/ddraw/executebuffer.c b/dlls/ddraw/executebuffer.c index ea5a55c..6ce77e3 100644 --- a/dlls/ddraw/executebuffer.c +++ b/dlls/ddraw/executebuffer.c @@ -124,13 +124,19 @@ HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *buffer, if (buffer->index_size < index_count) { - struct wined3d_buffer *new_buffer; unsigned int new_size = max(buffer->index_size * 2, index_count); + struct wined3d_buffer *new_buffer; + struct wined3d_buffer_desc desc; + + desc.byte_width = new_size * sizeof(*indices); + desc.usage = WINED3DUSAGE_DYNAMIC | WINED3DUSAGE_WRITEONLY | WINED3DUSAGE_STATICDECL; + desc.bind_flags = WINED3D_BIND_INDEX_BUFFER; + desc.access = WINED3D_RESOURCE_ACCESS_GPU; + desc.misc_flags = 0; + desc.structure_byte_stride = 0; - hr = wined3d_buffer_create_ib(device->wined3d_device, new_size * sizeof(*indices), - WINED3DUSAGE_DYNAMIC | WINED3DUSAGE_WRITEONLY, WINED3D_POOL_DEFAULT, - NULL, &ddraw_null_wined3d_parent_ops, &new_buffer); - if (FAILED(hr)) + if (FAILED(hr = wined3d_buffer_create(device->wined3d_device, &desc, + NULL, NULL, &ddraw_null_wined3d_parent_ops, &new_buffer))) return hr; buffer->index_size = new_size;

1 0

Henri Verbeet : d3d8: Use wined3d_buffer_create() in indexbuffer_init().
by Alexandre Julliard Feb. 6, 2018

Feb. 6, 2018

Module: wine Branch: master Commit: 9801f09b571e3a15f0c1a2fd8780e20390c1da33 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9801f09b571e3a15f0c1a2fd… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Feb 6 03:22:16 2018 +0330 d3d8: Use wined3d_buffer_create() in indexbuffer_init(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/buffer.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/d3d8/buffer.c b/dlls/d3d8/buffer.c index 43855f2..10ba302 100644 --- a/dlls/d3d8/buffer.c +++ b/dlls/d3d8/buffer.c @@ -565,25 +565,25 @@ static const struct wined3d_parent_ops d3d8_indexbuffer_wined3d_parent_ops = HRESULT indexbuffer_init(struct d3d8_indexbuffer *buffer, struct d3d8_device *device, UINT size, DWORD usage, D3DFORMAT format, D3DPOOL pool) { - enum wined3d_pool wined3d_pool; - DWORD wined3d_usage; + struct wined3d_buffer_desc desc; HRESULT hr; - wined3d_pool = pool; - wined3d_usage = usage & WINED3DUSAGE_MASK; + desc.byte_width = size; + desc.usage = (usage & WINED3DUSAGE_MASK) | WINED3DUSAGE_STATICDECL; if (pool == D3DPOOL_SCRATCH) - { - wined3d_pool = WINED3D_POOL_SYSTEM_MEM; - wined3d_usage |= WINED3DUSAGE_SCRATCH; - } + desc.usage |= WINED3DUSAGE_SCRATCH; + desc.bind_flags = WINED3D_BIND_INDEX_BUFFER; + desc.access = wined3daccess_from_d3dpool(pool); + desc.misc_flags = 0; + desc.structure_byte_stride = 0; buffer->IDirect3DIndexBuffer8_iface.lpVtbl = &d3d8_indexbuffer_vtbl; d3d8_resource_init(&buffer->resource); buffer->format = wined3dformat_from_d3dformat(format); wined3d_mutex_lock(); - hr = wined3d_buffer_create_ib(device->wined3d_device, size, wined3d_usage, wined3d_pool, - buffer, &d3d8_indexbuffer_wined3d_parent_ops, &buffer->wined3d_buffer); + hr = wined3d_buffer_create(device->wined3d_device, &desc, NULL, buffer, + &d3d8_indexbuffer_wined3d_parent_ops, &buffer->wined3d_buffer); wined3d_mutex_unlock(); if (FAILED(hr)) {

1 0

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

Feb. 6, 2018

Module: wine Branch: master Commit: c1cf16189f6573a85743de8562a21b39958f7fc4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c1cf16189f6573a85743de85… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Feb 6 03:22:19 2018 +0330 dxgi: 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/dxgi/adapter.c | 4 ++-- dlls/dxgi/device.c | 10 +++++----- dlls/dxgi/dxgi_main.c | 11 +++++------ dlls/dxgi/dxgi_private.h | 1 + dlls/dxgi/factory.c | 6 +++--- dlls/dxgi/output.c | 4 ++-- dlls/dxgi/surface.c | 2 +- dlls/dxgi/swapchain.c | 2 +- 8 files changed, 20 insertions(+), 20 deletions(-) diff --git a/dlls/dxgi/adapter.c b/dlls/dxgi/adapter.c index 64a18e6..ed2375a 100644 --- a/dlls/dxgi/adapter.c +++ b/dlls/dxgi/adapter.c @@ -73,7 +73,7 @@ static ULONG STDMETHODCALLTYPE dxgi_adapter_Release(IWineDXGIAdapter *iface) { wined3d_private_store_cleanup(&adapter->private_store); IDXGIFactory4_Release(&adapter->factory->IDXGIFactory4_iface); - HeapFree(GetProcessHeap(), 0, adapter); + heap_free(adapter); } return refcount; @@ -356,7 +356,7 @@ static void dxgi_adapter_init(struct dxgi_adapter *adapter, struct dxgi_factory HRESULT dxgi_adapter_create(struct dxgi_factory *factory, UINT ordinal, struct dxgi_adapter **adapter) { - if (!(*adapter = HeapAlloc(GetProcessHeap(), 0, sizeof(**adapter)))) + if (!(*adapter = heap_alloc(sizeof(**adapter)))) return E_OUTOFMEMORY; dxgi_adapter_init(*adapter, factory, ordinal); diff --git a/dlls/dxgi/device.c b/dlls/dxgi/device.c index 6015bbe..b4f36dc 100644 --- a/dlls/dxgi/device.c +++ b/dlls/dxgi/device.c @@ -87,7 +87,7 @@ static ULONG STDMETHODCALLTYPE dxgi_device_Release(IWineDXGIDevice *iface) wined3d_mutex_unlock(); IWineDXGIAdapter_Release(device->adapter); wined3d_private_store_cleanup(&device->private_store); - HeapFree(GetProcessHeap(), 0, device); + heap_free(device); } return refcount; @@ -287,7 +287,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_device_create_surface(IWineDXGIDevice *ifa TRACE("iface %p, wined3d_texture %p, usage %#x, shared_resource %p, outer %p, surface %p.\n", iface, wined3d_texture, usage, shared_resource, outer, surface); - if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) + if (!(object = heap_alloc_zero(sizeof(*object)))) { ERR("Failed to allocate DXGI surface object memory\n"); return E_OUTOFMEMORY; @@ -296,7 +296,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_device_create_surface(IWineDXGIDevice *ifa if (FAILED(hr = dxgi_surface_init(object, (IDXGIDevice *)iface, outer, wined3d_texture))) { WARN("Failed to initialize surface, hr %#x.\n", hr); - HeapFree(GetProcessHeap(), 0, object); + heap_free(object); return hr; } @@ -316,7 +316,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_device_create_swapchain(IWineDXGIDevice *i TRACE("iface %p, desc %p, wined3d_swapchain %p.\n", iface, desc, wined3d_swapchain); - if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) + if (!(object = heap_alloc_zero(sizeof(*object)))) { ERR("Failed to allocate DXGI swapchain object memory\n"); return E_OUTOFMEMORY; @@ -325,7 +325,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_device_create_swapchain(IWineDXGIDevice *i if (FAILED(hr = dxgi_swapchain_init(object, device, desc, implicit))) { WARN("Failed to initialize swapchain, hr %#x.\n", hr); - HeapFree(GetProcessHeap(), 0, object); + heap_free(object); return hr; } diff --git a/dlls/dxgi/dxgi_main.c b/dlls/dxgi/dxgi_main.c index 36cf73b..df8761b 100644 --- a/dlls/dxgi/dxgi_main.c +++ b/dlls/dxgi/dxgi_main.c @@ -35,7 +35,7 @@ static struct dxgi_main dxgi_main; static void dxgi_main_cleanup(void) { - HeapFree(GetProcessHeap(), 0, dxgi_main.device_layers); + heap_free(dxgi_main.device_layers); FreeLibrary(dxgi_main.d3d10core); } @@ -188,8 +188,7 @@ HRESULT WINAPI DXGID3D10CreateDevice(HMODULE d3d10core, IDXGIFactory *factory, I device_size = d3d10_layer.get_size(d3d10_layer.id, &get_size_args, 0); device_size += sizeof(*dxgi_device); - dxgi_device = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, device_size); - if (!dxgi_device) + if (!(dxgi_device = heap_alloc_zero(device_size))) { ERR("Failed to allocate device memory.\n"); return E_OUTOFMEMORY; @@ -199,7 +198,7 @@ HRESULT WINAPI DXGID3D10CreateDevice(HMODULE d3d10core, IDXGIFactory *factory, I if (FAILED(hr)) { WARN("Failed to initialize device, hr %#x.\n", hr); - HeapFree(GetProcessHeap(), 0, dxgi_device); + heap_free(dxgi_device); *device = NULL; return hr; } @@ -220,9 +219,9 @@ HRESULT WINAPI DXGID3D10RegisterLayers(const struct dxgi_device_layer *layers, U wined3d_mutex_lock(); if (!dxgi_main.layer_count) - new_layers = HeapAlloc(GetProcessHeap(), 0, layer_count * sizeof(*new_layers)); + new_layers = heap_alloc(layer_count * sizeof(*new_layers)); else - new_layers = HeapReAlloc(GetProcessHeap(), 0, dxgi_main.device_layers, + new_layers = heap_realloc(dxgi_main.device_layers, (dxgi_main.layer_count + layer_count) * sizeof(*new_layers)); if (!new_layers) diff --git a/dlls/dxgi/dxgi_private.h b/dlls/dxgi/dxgi_private.h index 19c880b..ed79ca2 100644 --- a/dlls/dxgi/dxgi_private.h +++ b/dlls/dxgi/dxgi_private.h @@ -20,6 +20,7 @@ #define __WINE_DXGI_PRIVATE_H #include "wine/debug.h" +#include "wine/heap.h" #include <assert.h> diff --git a/dlls/dxgi/factory.c b/dlls/dxgi/factory.c index 832e2cb..50b7941 100644 --- a/dlls/dxgi/factory.c +++ b/dlls/dxgi/factory.c @@ -81,7 +81,7 @@ static ULONG STDMETHODCALLTYPE dxgi_factory_Release(IDXGIFactory4 *iface) wined3d_decref(factory->wined3d); wined3d_mutex_unlock(); wined3d_private_store_cleanup(&factory->private_store); - HeapFree(GetProcessHeap(), 0, factory); + heap_free(factory); } return refcount; @@ -547,13 +547,13 @@ HRESULT dxgi_factory_create(REFIID riid, void **factory, BOOL extended) struct dxgi_factory *object; HRESULT hr; - if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) + if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; if (FAILED(hr = dxgi_factory_init(object, extended))) { WARN("Failed to initialize factory, hr %#x.\n", hr); - HeapFree(GetProcessHeap(), 0, object); + heap_free(object); return hr; } diff --git a/dlls/dxgi/output.c b/dlls/dxgi/output.c index 9659c85..2b168fb 100644 --- a/dlls/dxgi/output.c +++ b/dlls/dxgi/output.c @@ -81,7 +81,7 @@ static ULONG STDMETHODCALLTYPE dxgi_output_Release(IDXGIOutput4 *iface) { wined3d_private_store_cleanup(&output->private_store); IWineDXGIAdapter_Release(&output->adapter->IWineDXGIAdapter_iface); - HeapFree(GetProcessHeap(), 0, output); + heap_free(output); } return refcount; @@ -447,7 +447,7 @@ static void dxgi_output_init(struct dxgi_output *output, struct dxgi_adapter *ad HRESULT dxgi_output_create(struct dxgi_adapter *adapter, struct dxgi_output **output) { - if (!(*output = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(**output)))) + if (!(*output = heap_alloc_zero(sizeof(**output)))) return E_OUTOFMEMORY; dxgi_output_init(*output, adapter); diff --git a/dlls/dxgi/surface.c b/dlls/dxgi/surface.c index 36fc1e6..ad72a2c 100644 --- a/dlls/dxgi/surface.c +++ b/dlls/dxgi/surface.c @@ -74,7 +74,7 @@ static ULONG STDMETHODCALLTYPE dxgi_surface_inner_Release(IUnknown *iface) if (!refcount) { wined3d_private_store_cleanup(&surface->private_store); - HeapFree(GetProcessHeap(), 0, surface); + heap_free(surface); } return refcount; diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index e5d06c3..1f88d71 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -645,7 +645,7 @@ static void STDMETHODCALLTYPE dxgi_swapchain_wined3d_object_released(void *paren struct dxgi_swapchain *swapchain = parent; wined3d_private_store_cleanup(&swapchain->private_store); - HeapFree(GetProcessHeap(), 0, parent); + heap_free(parent); } static const struct wined3d_parent_ops dxgi_swapchain_wined3d_parent_ops =

1 0

Nikolay Sivov : comctl32/button: Use push button paint handler for split and command link buttons.
by Alexandre Julliard Feb. 6, 2018

Feb. 6, 2018

Module: wine Branch: master Commit: 598d36993430023a6f53aa341d2e7e3e2f171c43 URL: https://source.winehq.org/git/wine.git/?a=commit;h=598d36993430023a6f53aa34… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 6 08:50:22 2018 +0300 comctl32/button: Use push button paint handler for split and command link buttons. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/button.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index de036c6..b0eea99 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -120,7 +120,11 @@ static const WORD maxCheckState[MAX_BTN_TYPE] = BST_UNCHECKED, /* BS_USERBUTTON */ BST_CHECKED, /* BS_AUTORADIOBUTTON */ BST_UNCHECKED, /* BS_PUSHBOX */ - BST_UNCHECKED /* BS_OWNERDRAW */ + BST_UNCHECKED, /* BS_OWNERDRAW */ + BST_UNCHECKED, /* BS_SPLITBUTTON */ + BST_UNCHECKED, /* BS_DEFSPLITBUTTON */ + BST_UNCHECKED, /* BS_COMMANDLINK */ + BST_UNCHECKED /* BS_DEFCOMMANDLINK */ }; typedef void (*pfPaint)( HWND hwnd, HDC hdc, UINT action ); @@ -138,7 +142,11 @@ static const pfPaint btnPaintFunc[MAX_BTN_TYPE] = UB_Paint, /* BS_USERBUTTON */ CB_Paint, /* BS_AUTORADIOBUTTON */ NULL, /* BS_PUSHBOX */ - OB_Paint /* BS_OWNERDRAW */ + OB_Paint, /* BS_OWNERDRAW */ + PB_Paint, /* BS_SPLITBUTTON */ + PB_Paint, /* BS_DEFSPLITBUTTON */ + PB_Paint, /* BS_COMMANDLINK */ + PB_Paint /* BS_DEFCOMMANDLINK */ }; /*********************************************************************

1 0

Michael Stefaniuc : wbemdisp: Use the global HeapAlloc() wrappers.
by Alexandre Julliard Feb. 6, 2018

Feb. 6, 2018

Module: wine Branch: master Commit: 55d367fb6f96129d0970841ca871ee2253b79840 URL: https://source.winehq.org/git/wine.git/?a=commit;h=55d367fb6f96129d0970841c… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Feb 6 01:07:16 2018 +0100 wbemdisp: Use the global HeapAlloc() wrappers. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemdisp/locator.c | 1 + dlls/wbemdisp/main.c | 1 + dlls/wbemdisp/wbemdisp_private.h | 10 ---------- 3 files changed, 2 insertions(+), 10 deletions(-) diff --git a/dlls/wbemdisp/locator.c b/dlls/wbemdisp/locator.c index d1be48f..e782d1f 100644 --- a/dlls/wbemdisp/locator.c +++ b/dlls/wbemdisp/locator.c @@ -30,6 +30,7 @@ #include "wbemdisp.h" #include "wine/debug.h" +#include "wine/heap.h" #include "wine/unicode.h" #include "wbemdisp_private.h" #include "wbemdisp_classes.h" diff --git a/dlls/wbemdisp/main.c b/dlls/wbemdisp/main.c index 97cd1e7..9d9b0ad 100644 --- a/dlls/wbemdisp/main.c +++ b/dlls/wbemdisp/main.c @@ -29,6 +29,7 @@ #include "rpcproxy.h" #include "wine/debug.h" +#include "wine/heap.h" #include "wine/unicode.h" #include "wbemdisp_private.h" #include "wbemdisp_classes.h" diff --git a/dlls/wbemdisp/wbemdisp_private.h b/dlls/wbemdisp/wbemdisp_private.h index 2891248..b03a13e 100644 --- a/dlls/wbemdisp/wbemdisp_private.h +++ b/dlls/wbemdisp/wbemdisp_private.h @@ -17,13 +17,3 @@ */ HRESULT SWbemLocator_create(LPVOID *) DECLSPEC_HIDDEN; - -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size) -{ - return HeapAlloc(GetProcessHeap(), 0, size); -} - -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -}

1 0

Nikolay Sivov : comctl32/tests: Remove some workarounds in ListBox tests.
by Alexandre Julliard Feb. 6, 2018

Feb. 6, 2018

Module: wine Branch: master Commit: e6d315bab6f283457d53bd6c2b22da70e7e36f0d URL: https://source.winehq.org/git/wine.git/?a=commit;h=e6d315bab6f283457d53bd6c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 6 08:50:25 2018 +0300 comctl32/tests: Remove some workarounds in ListBox tests. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/listbox.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/comctl32/tests/listbox.c b/dlls/comctl32/tests/listbox.c index 23aaac2..4d80bea 100644 --- a/dlls/comctl32/tests/listbox.c +++ b/dlls/comctl32/tests/listbox.c @@ -26,6 +26,7 @@ #include "wingdi.h" #include "winuser.h" #include "winnls.h" +#include "commctrl.h" #include "wine/test.h" #include "v6util.h" @@ -50,7 +51,7 @@ static HWND create_listbox(DWORD add_style, HWND parent) if (parent) ctl_id=1; - handle = CreateWindowA("LISTBOX", "TestList", (LBS_STANDARD & ~LBS_SORT) | add_style, 0, 0, 100, 100, + handle = CreateWindowA(WC_LISTBOXA, "TestList", (LBS_STANDARD & ~LBS_SORT) | add_style, 0, 0, 100, 100, parent, (HMENU)ctl_id, NULL, 0); ok(handle != NULL, "Failed to create listbox window.\n"); @@ -207,7 +208,7 @@ static void test_item_height(void) DestroyWindow (hLB); - hLB = CreateWindowA("LISTBOX", "TestList", LBS_OWNERDRAWVARIABLE, 0, 0, 100, 100, NULL, NULL, NULL, 0); + hLB = CreateWindowA(WC_LISTBOXA, "TestList", LBS_OWNERDRAWVARIABLE, 0, 0, 100, 100, NULL, NULL, NULL, 0); itemHeight = SendMessageA(hLB, LB_GETITEMHEIGHT, 0, 0); ok(itemHeight > 0 && itemHeight <= tm.tmHeight, "Unexpected item height %d, expected %d.\n", @@ -430,7 +431,7 @@ static void test_listbox_height(void) HWND hList; int r, id; - hList = CreateWindowA( "ListBox", "list test", 0, + hList = CreateWindowA( WC_LISTBOXA, "list test", 0, 1, 1, 600, 100, NULL, NULL, NULL, NULL ); ok( hList != NULL, "failed to create listbox\n"); @@ -470,21 +471,20 @@ static void test_itemfrompoint(void) without caption). LBS_NOINTEGRALHEIGHT is required in order to test behavior of partially-displayed item. */ - HWND hList = CreateWindowA( "ListBox", "list test", + HWND hList = CreateWindowA( WC_LISTBOXA, "list test", WS_VISIBLE|WS_POPUP|LBS_NOINTEGRALHEIGHT, 1, 1, 600, 100, NULL, NULL, NULL, NULL ); ULONG r, id; RECT rc; - /* For an empty listbox win2k returns 0x1ffff, win98 returns 0x10000, nt4 returns 0xffffffff */ r = SendMessageA(hList, LB_ITEMFROMPOINT, 0, MAKELPARAM( /* x */ 30, /* y */ 30 )); - ok( r == 0x1ffff || r == 0x10000 || r == 0xffffffff, "ret %x\n", r ); + ok( r == MAKELPARAM(0xffff, 1), "Unexpected ret value %#x.\n", r ); r = SendMessageA(hList, LB_ITEMFROMPOINT, 0, MAKELPARAM( 700, 30 )); - ok( r == 0x1ffff || r == 0x10000 || r == 0xffffffff, "ret %x\n", r ); + ok( r == MAKELPARAM(0xffff, 1), "Unexpected ret value %#x.\n", r ); r = SendMessageA(hList, LB_ITEMFROMPOINT, 0, MAKELPARAM( 30, 300 )); - ok( r == 0x1ffff || r == 0x10000 || r == 0xffffffff, "ret %x\n", r ); + ok( r == MAKELPARAM(0xffff, 1), "Unexpected ret value %#x.\n", r ); id = SendMessageA( hList, LB_ADDSTRING, 0, (LPARAM) "hi"); ok( id == 0, "item id wrong\n"); @@ -495,7 +495,7 @@ static void test_itemfrompoint(void) ok( r == 0x1, "ret %x\n", r ); r = SendMessageA(hList, LB_ITEMFROMPOINT, 0, MAKELPARAM( /* x */ 30, /* y */ 601 )); - ok( r == 0x10001, "ret %x\n", r ); + ok( r == MAKELPARAM(1, 1), "Unexpected ret value %#x.\n", r ); /* Resize control so that below assertions about sizes are valid */ r = SendMessageA( hList, LB_GETITEMRECT, 0, (LPARAM)&rc); @@ -551,7 +551,7 @@ static void test_listbox_item_data(void) HWND hList; int r, id; - hList = CreateWindowA( "ListBox", "list test", 0, + hList = CreateWindowA( WC_LISTBOXA, "list test", 0, 1, 1, 600, 100, NULL, NULL, NULL, NULL ); ok( hList != NULL, "failed to create listbox\n"); @@ -591,7 +591,7 @@ static void test_listbox_LB_DIR(void) one file that fits the wildcard w*.c . Normally, the test directory itself satisfies both conditions. */ - hList = CreateWindowA( "ListBox", "list test", WS_VISIBLE|WS_POPUP, + hList = CreateWindowA( WC_LISTBOXA, "list test", WS_VISIBLE|WS_POPUP, 1, 1, 600, 100, NULL, NULL, NULL, NULL ); assert(hList); @@ -902,7 +902,7 @@ static void test_listbox_LB_DIR(void) strcpy(pathBuffer, wildcard); SendMessageA(hList, LB_RESETCONTENT, 0, 0); res = SendMessageA(hList, LB_DIR, DDL_DIRECTORY|DDL_EXCLUSIVE, (LPARAM)pathBuffer); - ok (res != -1 || broken(res == -1), "SendMessage(LB_DIR, DDL_DIRECTORY|DDL_EXCLUSIVE, *) failed err %u\n", + ok (res != -1, "SendMessage(LB_DIR, DDL_DIRECTORY|DDL_EXCLUSIVE, *) failed err %u\n", GetLastError()); itemCount = SendMessageA(hList, LB_GETCOUNT, 0, 0); @@ -1010,11 +1010,11 @@ static HWND g_label; static BOOL on_listbox_container_create(HWND hwnd, CREATESTRUCTA *lpcs) { - g_label = CreateWindowA("Static", "Contents of static control before DlgDirList.", + g_label = CreateWindowA(WC_STATICA, "Contents of static control before DlgDirList.", WS_CHILD | WS_VISIBLE, 10, 10, 512, 32, hwnd, (HMENU)ID_TEST_LABEL, NULL, 0); if (!g_label) return FALSE; - g_listBox = CreateWindowA("ListBox", "DlgDirList test", + g_listBox = CreateWindowA(WC_LISTBOXA, "DlgDirList test", WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_BORDER | WS_VSCROLL, 10, 60, 256, 256, hwnd, (HMENU)ID_TEST_LISTBOX, NULL, 0); if (!g_listBox) return FALSE;

1 0