February 2018 - Wine-Devel - list.winehq.org

[PATCH 5/5] d3d8: Use the global memory allocation helpers.
by Henri Verbeet Feb. 7, 2018

Feb. 7, 2018

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d8/buffer.c | 4 +-- dlls/d3d8/d3d8_main.c | 4 +-- dlls/d3d8/d3d8_private.h | 1 + dlls/d3d8/device.c | 82 +++++++++++++++++++------------------------ dlls/d3d8/directx.c | 7 ++-- dlls/d3d8/shader.c | 9 +++-- dlls/d3d8/surface.c | 2 +- dlls/d3d8/swapchain.c | 6 ++-- dlls/d3d8/texture.c | 2 +- dlls/d3d8/vertexdeclaration.c | 15 ++++---- dlls/d3d8/volume.c | 2 +- 11 files changed, 61 insertions(+), 73 deletions(-) diff --git a/dlls/d3d8/buffer.c b/dlls/d3d8/buffer.c index 14a2fb6..b30762b 100644 --- a/dlls/d3d8/buffer.c +++ b/dlls/d3d8/buffer.c @@ -262,7 +262,7 @@ static void STDMETHODCALLTYPE d3d8_vertexbuffer_wined3d_object_destroyed(void *p { struct d3d8_vertexbuffer *buffer = parent; d3d8_resource_cleanup(&buffer->resource); - HeapFree(GetProcessHeap(), 0, buffer); + heap_free(buffer); } static const struct wined3d_parent_ops d3d8_vertexbuffer_wined3d_parent_ops = @@ -558,7 +558,7 @@ static void STDMETHODCALLTYPE d3d8_indexbuffer_wined3d_object_destroyed(void *pa { struct d3d8_indexbuffer *buffer = parent; d3d8_resource_cleanup(&buffer->resource); - HeapFree(GetProcessHeap(), 0, buffer); + heap_free(buffer); } static const struct wined3d_parent_ops d3d8_indexbuffer_wined3d_parent_ops = diff --git a/dlls/d3d8/d3d8_main.c b/dlls/d3d8/d3d8_main.c index 8ac704c..92c5032 100644 --- a/dlls/d3d8/d3d8_main.c +++ b/dlls/d3d8/d3d8_main.c @@ -41,13 +41,13 @@ IDirect3D8 * WINAPI DECLSPEC_HOTPATCH Direct3DCreate8(UINT sdk_version) TRACE("sdk_version %#x.\n", sdk_version); - if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) + if (!(object = heap_alloc_zero(sizeof(*object)))) return NULL; if (!d3d8_init(object)) { WARN("Failed to initialize d3d8.\n"); - HeapFree(GetProcessHeap(), 0, object); + heap_free(object); return NULL; } diff --git a/dlls/d3d8/d3d8_private.h b/dlls/d3d8/d3d8_private.h index 0e764b1..129cffb 100644 --- a/dlls/d3d8/d3d8_private.h +++ b/dlls/d3d8/d3d8_private.h @@ -33,6 +33,7 @@ #include "winbase.h" #include "wingdi.h" #include "wine/debug.h" +#include "wine/heap.h" #include "d3d8.h" #include "wine/wined3d.h" diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 3ce0460..160d296 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -324,9 +324,9 @@ static DWORD d3d8_allocate_handle(struct d3d8_handle_table *t, void *object, enu { /* Grow the table */ UINT new_size = t->table_size + (t->table_size >> 1); - struct d3d8_handle_entry *new_entries = HeapReAlloc(GetProcessHeap(), - 0, t->entries, new_size * sizeof(*t->entries)); - if (!new_entries) + struct d3d8_handle_entry *new_entries; + + if (!(new_entries = heap_realloc(t->entries, new_size * sizeof(*t->entries)))) { ERR("Failed to grow the handle table.\n"); return D3D8_INVALID_HANDLE; @@ -444,7 +444,7 @@ static ULONG WINAPI d3d8_device_Release(IDirect3DDevice8 *iface) { d3d8_vertex_declaration_destroy(device->decls[i].declaration); } - HeapFree(GetProcessHeap(), 0, device->decls); + heap_free(device->decls); if (device->vertex_buffer) wined3d_buffer_decref(device->vertex_buffer); @@ -454,8 +454,8 @@ static ULONG WINAPI d3d8_device_Release(IDirect3DDevice8 *iface) wined3d_device_uninit_3d(device->wined3d_device); wined3d_device_release_focus_window(device->wined3d_device); wined3d_device_decref(device->wined3d_device); - HeapFree(GetProcessHeap(), 0, device->handle_table.entries); - HeapFree(GetProcessHeap(), 0, device); + heap_free(device->handle_table.entries); + heap_free(device); wined3d_mutex_unlock(); @@ -863,15 +863,14 @@ static HRESULT WINAPI d3d8_device_CreateTexture(IDirect3DDevice8 *iface, return D3DERR_INVALIDCALL; *texture = NULL; - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); - if (!object) + if (!(object = heap_alloc_zero(sizeof(*object)))) return D3DERR_OUTOFVIDEOMEMORY; hr = texture_init(object, device, width, height, levels, usage, format, pool); if (FAILED(hr)) { WARN("Failed to initialize texture, hr %#x.\n", hr); - HeapFree(GetProcessHeap(), 0, object); + heap_free(object); return hr; } @@ -896,15 +895,14 @@ static HRESULT WINAPI d3d8_device_CreateVolumeTexture(IDirect3DDevice8 *iface, return D3DERR_INVALIDCALL; *texture = NULL; - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); - if (!object) + if (!(object = heap_alloc_zero(sizeof(*object)))) return D3DERR_OUTOFVIDEOMEMORY; hr = volumetexture_init(object, device, width, height, depth, levels, usage, format, pool); if (FAILED(hr)) { WARN("Failed to initialize volume texture, hr %#x.\n", hr); - HeapFree(GetProcessHeap(), 0, object); + heap_free(object); return hr; } @@ -928,15 +926,14 @@ static HRESULT WINAPI d3d8_device_CreateCubeTexture(IDirect3DDevice8 *iface, UIN return D3DERR_INVALIDCALL; *texture = NULL; - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); - if (!object) + if (!(object = heap_alloc_zero(sizeof(*object)))) return D3DERR_OUTOFVIDEOMEMORY; hr = cubetexture_init(object, device, edge_length, levels, usage, format, pool); if (FAILED(hr)) { WARN("Failed to initialize cube texture, hr %#x.\n", hr); - HeapFree(GetProcessHeap(), 0, object); + heap_free(object); return hr; } @@ -956,15 +953,14 @@ static HRESULT WINAPI d3d8_device_CreateVertexBuffer(IDirect3DDevice8 *iface, UI TRACE("iface %p, size %u, usage %#x, fvf %#x, pool %#x, buffer %p.\n", iface, size, usage, fvf, pool, buffer); - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); - if (!object) + if (!(object = heap_alloc_zero(sizeof(*object)))) return D3DERR_OUTOFVIDEOMEMORY; hr = vertexbuffer_init(object, device, size, usage, fvf, pool); if (FAILED(hr)) { WARN("Failed to initialize vertex buffer, hr %#x.\n", hr); - HeapFree(GetProcessHeap(), 0, object); + heap_free(object); return hr; } @@ -984,15 +980,14 @@ static HRESULT WINAPI d3d8_device_CreateIndexBuffer(IDirect3DDevice8 *iface, UIN TRACE("iface %p, size %u, usage %#x, format %#x, pool %#x, buffer %p.\n", iface, size, usage, format, pool, buffer); - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); - if (!object) + if (!(object = heap_alloc_zero(sizeof(*object)))) return D3DERR_OUTOFVIDEOMEMORY; hr = indexbuffer_init(object, device, size, usage, format, pool); if (FAILED(hr)) { WARN("Failed to initialize index buffer, hr %#x.\n", hr); - HeapFree(GetProcessHeap(), 0, object); + heap_free(object); return hr; } @@ -2355,8 +2350,7 @@ static HRESULT WINAPI d3d8_device_CreateVertexShader(IDirect3DDevice8 *iface, TRACE("iface %p, declaration %p, byte_code %p, shader %p, usage %#x.\n", iface, declaration, byte_code, shader, usage); - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); - if (!object) + if (!(object = heap_alloc_zero(sizeof(*object)))) { *shader = 0; return E_OUTOFMEMORY; @@ -2368,7 +2362,7 @@ static HRESULT WINAPI d3d8_device_CreateVertexShader(IDirect3DDevice8 *iface, if (handle == D3D8_INVALID_HANDLE) { ERR("Failed to allocate vertex shader handle.\n"); - HeapFree(GetProcessHeap(), 0, object); + heap_free(object); *shader = 0; return E_OUTOFMEMORY; } @@ -2382,7 +2376,7 @@ static HRESULT WINAPI d3d8_device_CreateVertexShader(IDirect3DDevice8 *iface, wined3d_mutex_lock(); d3d8_free_handle(&device->handle_table, handle, D3D8_HANDLE_VS); wined3d_mutex_unlock(); - HeapFree(GetProcessHeap(), 0, object); + heap_free(object); *shader = 0; return hr; } @@ -2422,13 +2416,13 @@ static struct d3d8_vertex_declaration *d3d8_device_get_fvf_declaration(struct d3 } TRACE("not found. Creating and inserting at position %d.\n", low); - if (!(d3d8_declaration = HeapAlloc(GetProcessHeap(), 0, sizeof(*d3d8_declaration)))) + if (!(d3d8_declaration = heap_alloc(sizeof(*d3d8_declaration)))) return NULL; if (FAILED(hr = d3d8_vertex_declaration_init_fvf(d3d8_declaration, device, fvf))) { WARN("Failed to initialize vertex declaration, hr %#x.\n", hr); - HeapFree(GetProcessHeap(), 0, d3d8_declaration); + heap_free(d3d8_declaration); return NULL; } @@ -2436,9 +2430,8 @@ static struct d3d8_vertex_declaration *d3d8_device_get_fvf_declaration(struct d3 { UINT grow = device->declArraySize / 2; - convertedDecls = HeapReAlloc(GetProcessHeap(), 0, convertedDecls, - sizeof(*convertedDecls) * (device->numConvertedDecls + grow)); - if (!convertedDecls) + if (!(convertedDecls = heap_realloc(convertedDecls, + sizeof(*convertedDecls) * (device->numConvertedDecls + grow)))) { d3d8_vertex_declaration_destroy(d3d8_declaration); return NULL; @@ -2733,8 +2726,7 @@ static HRESULT WINAPI d3d8_device_CreatePixelShader(IDirect3DDevice8 *iface, if (!shader) return D3DERR_INVALIDCALL; - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); - if (!object) + if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; wined3d_mutex_lock(); @@ -2743,7 +2735,7 @@ static HRESULT WINAPI d3d8_device_CreatePixelShader(IDirect3DDevice8 *iface, if (handle == D3D8_INVALID_HANDLE) { ERR("Failed to allocate pixel shader handle.\n"); - HeapFree(GetProcessHeap(), 0, object); + heap_free(object); return E_OUTOFMEMORY; } @@ -2756,7 +2748,7 @@ static HRESULT WINAPI d3d8_device_CreatePixelShader(IDirect3DDevice8 *iface, wined3d_mutex_lock(); d3d8_free_handle(&device->handle_table, handle, D3D8_HANDLE_PS); wined3d_mutex_unlock(); - HeapFree(GetProcessHeap(), 0, object); + heap_free(object); *shader = 0; return hr; } @@ -3119,7 +3111,7 @@ static HRESULT CDECL device_parent_surface_created(struct wined3d_device_parent TRACE("device_parent %p, wined3d_texture %p, sub_resource_idx %u, parent %p, parent_ops %p.\n", device_parent, wined3d_texture, sub_resource_idx, parent, parent_ops); - if (!(d3d_surface = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*d3d_surface)))) + if (!(d3d_surface = heap_alloc_zero(sizeof(*d3d_surface)))) return E_OUTOFMEMORY; surface_init(d3d_surface, wined3d_texture, sub_resource_idx, parent_ops); @@ -3138,7 +3130,7 @@ static HRESULT CDECL device_parent_volume_created(struct wined3d_device_parent * TRACE("device_parent %p, texture %p, sub_resource_idx %u, parent %p, parent_ops %p.\n", device_parent, wined3d_texture, sub_resource_idx, parent, parent_ops); - if (!(d3d_volume = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*d3d_volume)))) + if (!(d3d_volume = heap_alloc_zero(sizeof(*d3d_volume)))) return E_OUTOFMEMORY; volume_init(d3d_volume, wined3d_texture, sub_resource_idx, parent_ops); @@ -3234,9 +3226,8 @@ HRESULT device_init(struct d3d8_device *device, struct d3d8 *parent, struct wine device->IDirect3DDevice8_iface.lpVtbl = &d3d8_device_vtbl; device->device_parent.ops = &d3d8_wined3d_device_parent_ops; device->ref = 1; - device->handle_table.entries = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, - D3D8_INITIAL_HANDLE_TABLE_SIZE * sizeof(*device->handle_table.entries)); - if (!device->handle_table.entries) + if (!(device->handle_table.entries = heap_alloc_zero(D3D8_INITIAL_HANDLE_TABLE_SIZE + * sizeof(*device->handle_table.entries)))) { ERR("Failed to allocate handle table memory.\n"); return E_OUTOFMEMORY; @@ -3252,7 +3243,7 @@ HRESULT device_init(struct d3d8_device *device, struct d3d8 *parent, struct wine { WARN("Failed to create wined3d device, hr %#x.\n", hr); wined3d_mutex_unlock(); - HeapFree(GetProcessHeap(), 0, device->handle_table.entries); + heap_free(device->handle_table.entries); return hr; } @@ -3267,7 +3258,7 @@ HRESULT device_init(struct d3d8_device *device, struct d3d8 *parent, struct wine ERR("Failed to acquire focus window, hr %#x.\n", hr); wined3d_device_decref(device->wined3d_device); wined3d_mutex_unlock(); - HeapFree(GetProcessHeap(), 0, device->handle_table.entries); + heap_free(device->handle_table.entries); return hr; } @@ -3286,7 +3277,7 @@ HRESULT device_init(struct d3d8_device *device, struct d3d8 *parent, struct wine wined3d_device_release_focus_window(device->wined3d_device); wined3d_device_decref(device->wined3d_device); wined3d_mutex_unlock(); - HeapFree(GetProcessHeap(), 0, device->handle_table.entries); + heap_free(device->handle_table.entries); return D3DERR_INVALIDCALL; } @@ -3296,7 +3287,7 @@ HRESULT device_init(struct d3d8_device *device, struct d3d8 *parent, struct wine wined3d_device_release_focus_window(device->wined3d_device); wined3d_device_decref(device->wined3d_device); wined3d_mutex_unlock(); - HeapFree(GetProcessHeap(), 0, device->handle_table.entries); + heap_free(device->handle_table.entries); return hr; } @@ -3308,8 +3299,7 @@ HRESULT device_init(struct d3d8_device *device, struct d3d8 *parent, struct wine present_parameters_from_wined3d_swapchain_desc(parameters, &swapchain_desc); device->declArraySize = 16; - device->decls = HeapAlloc(GetProcessHeap(), 0, device->declArraySize * sizeof(*device->decls)); - if (!device->decls) + if (!(device->decls = heap_alloc(device->declArraySize * sizeof(*device->decls)))) { ERR("Failed to allocate FVF vertex declaration map memory.\n"); hr = E_OUTOFMEMORY; @@ -3330,6 +3320,6 @@ err: wined3d_device_release_focus_window(device->wined3d_device); wined3d_device_decref(device->wined3d_device); wined3d_mutex_unlock(); - HeapFree(GetProcessHeap(), 0, device->handle_table.entries); + heap_free(device->handle_table.entries); return hr; } diff --git a/dlls/d3d8/directx.c b/dlls/d3d8/directx.c index 24bd831..68300c0 100644 --- a/dlls/d3d8/directx.c +++ b/dlls/d3d8/directx.c @@ -81,7 +81,7 @@ static ULONG WINAPI d3d8_Release(IDirect3D8 *iface) wined3d_decref(d3d8->wined3d); wined3d_mutex_unlock(); - HeapFree(GetProcessHeap(), 0, d3d8); + heap_free(d3d8); } return refcount; @@ -373,15 +373,14 @@ static HRESULT WINAPI d3d8_CreateDevice(IDirect3D8 *iface, UINT adapter, TRACE("iface %p, adapter %u, device_type %#x, focus_window %p, flags %#x, parameters %p, device %p.\n", iface, adapter, device_type, focus_window, flags, parameters, device); - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); - if (!object) + if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; hr = device_init(object, d3d8, d3d8->wined3d, adapter, device_type, focus_window, flags, parameters); if (FAILED(hr)) { WARN("Failed to initialize device, hr %#x.\n", hr); - HeapFree(GetProcessHeap(), 0, object); + heap_free(object); return hr; } diff --git a/dlls/d3d8/shader.c b/dlls/d3d8/shader.c index 093cb5a..8192b23 100644 --- a/dlls/d3d8/shader.c +++ b/dlls/d3d8/shader.c @@ -26,7 +26,7 @@ static void STDMETHODCALLTYPE d3d8_vertexshader_wined3d_object_destroyed(void *p { struct d3d8_vertex_shader *shader = parent; d3d8_vertex_declaration_destroy(shader->vertex_declaration); - HeapFree(GetProcessHeap(), 0, shader); + heap_free(shader); } void d3d8_vertex_shader_destroy(struct d3d8_vertex_shader *shader) @@ -59,15 +59,14 @@ static HRESULT d3d8_vertexshader_create_vertexdeclaration(struct d3d8_device *de TRACE("device %p, declaration %p, shader_handle %#x, decl_ptr %p.\n", device, declaration, shader_handle, decl_ptr); - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); - if (!object) + if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; hr = d3d8_vertex_declaration_init(object, device, declaration, shader_handle); if (FAILED(hr)) { WARN("Failed to initialize vertex declaration, hr %#x.\n", hr); - HeapFree(GetProcessHeap(), 0, object); + heap_free(object); return hr; } @@ -143,7 +142,7 @@ HRESULT d3d8_vertex_shader_init(struct d3d8_vertex_shader *shader, struct d3d8_d static void STDMETHODCALLTYPE d3d8_pixelshader_wined3d_object_destroyed(void *parent) { - HeapFree(GetProcessHeap(), 0, parent); + heap_free(parent); } void d3d8_pixel_shader_destroy(struct d3d8_pixel_shader *shader) diff --git a/dlls/d3d8/surface.c b/dlls/d3d8/surface.c index 3ece82a..6ad43a4 100644 --- a/dlls/d3d8/surface.c +++ b/dlls/d3d8/surface.c @@ -306,7 +306,7 @@ static void STDMETHODCALLTYPE surface_wined3d_object_destroyed(void *parent) { struct d3d8_surface *surface = parent; d3d8_resource_cleanup(&surface->resource); - HeapFree(GetProcessHeap(), 0, surface); + heap_free(surface); } static const struct wined3d_parent_ops d3d8_surface_wined3d_parent_ops = diff --git a/dlls/d3d8/swapchain.c b/dlls/d3d8/swapchain.c index 6fd30e5..7003aa3 100644 --- a/dlls/d3d8/swapchain.c +++ b/dlls/d3d8/swapchain.c @@ -158,7 +158,7 @@ static const IDirect3DSwapChain8Vtbl d3d8_swapchain_vtbl = static void STDMETHODCALLTYPE d3d8_swapchain_wined3d_object_released(void *parent) { - HeapFree(GetProcessHeap(), 0, parent); + heap_free(parent); } static const struct wined3d_parent_ops d3d8_swapchain_wined3d_parent_ops = @@ -197,13 +197,13 @@ HRESULT d3d8_swapchain_create(struct d3d8_device *device, struct wined3d_swapcha struct d3d8_swapchain *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 = swapchain_init(object, device, desc))) { WARN("Failed to initialize swapchain, hr %#x.\n", hr); - HeapFree(GetProcessHeap(), 0, object); + heap_free(object); return hr; } diff --git a/dlls/d3d8/texture.c b/dlls/d3d8/texture.c index c51a471..5ad6cf8 100644 --- a/dlls/d3d8/texture.c +++ b/dlls/d3d8/texture.c @@ -1083,7 +1083,7 @@ static void STDMETHODCALLTYPE d3d8_texture_wined3d_object_destroyed(void *parent { struct d3d8_texture *texture = parent; d3d8_resource_cleanup(&texture->resource); - HeapFree(GetProcessHeap(), 0, texture); + heap_free(texture); } static const struct wined3d_parent_ops d3d8_texture_wined3d_parent_ops = diff --git a/dlls/d3d8/vertexdeclaration.c b/dlls/d3d8/vertexdeclaration.c index 9206a2c..0cae3cd 100644 --- a/dlls/d3d8/vertexdeclaration.c +++ b/dlls/d3d8/vertexdeclaration.c @@ -266,7 +266,7 @@ static UINT convert_to_wined3d_declaration(const DWORD *d3d8_elements, DWORD *d3 TRACE("d3d8_elements %p, d3d8_elements_size %p, wined3d_elements %p\n", d3d8_elements, d3d8_elements_size, wined3d_elements); /* 128 should be enough for anyone... */ - *wined3d_elements = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, 128 * sizeof(**wined3d_elements)); + *wined3d_elements = heap_alloc_zero(128 * sizeof(**wined3d_elements)); while (D3DVSD_END() != *token) { token_type = ((*token & D3DVSD_TOKENTYPEMASK) >> D3DVSD_TOKENTYPESHIFT); @@ -314,8 +314,8 @@ static UINT convert_to_wined3d_declaration(const DWORD *d3d8_elements, DWORD *d3 static void STDMETHODCALLTYPE d3d8_vertexdeclaration_wined3d_object_destroyed(void *parent) { struct d3d8_vertex_declaration *declaration = parent; - HeapFree(GetProcessHeap(), 0, declaration->elements); - HeapFree(GetProcessHeap(), 0, declaration); + heap_free(declaration->elements); + heap_free(declaration); } void d3d8_vertex_declaration_destroy(struct d3d8_vertex_declaration *declaration) @@ -342,11 +342,10 @@ HRESULT d3d8_vertex_declaration_init(struct d3d8_vertex_declaration *declaration declaration->shader_handle = shader_handle; wined3d_element_count = convert_to_wined3d_declaration(elements, &declaration->elements_size, &wined3d_elements); - declaration->elements = HeapAlloc(GetProcessHeap(), 0, declaration->elements_size); - if (!declaration->elements) + if (!(declaration->elements = heap_alloc(declaration->elements_size))) { ERR("Failed to allocate vertex declaration elements memory.\n"); - HeapFree(GetProcessHeap(), 0, wined3d_elements); + heap_free(wined3d_elements); return E_OUTOFMEMORY; } @@ -356,11 +355,11 @@ HRESULT d3d8_vertex_declaration_init(struct d3d8_vertex_declaration *declaration hr = wined3d_vertex_declaration_create(device->wined3d_device, wined3d_elements, wined3d_element_count, declaration, &d3d8_vertexdeclaration_wined3d_parent_ops, &declaration->wined3d_vertex_declaration); wined3d_mutex_unlock(); - HeapFree(GetProcessHeap(), 0, wined3d_elements); + heap_free(wined3d_elements); if (FAILED(hr)) { WARN("Failed to create wined3d vertex declaration, hr %#x.\n", hr); - HeapFree(GetProcessHeap(), 0, declaration->elements); + heap_free(declaration->elements); return hr; } diff --git a/dlls/d3d8/volume.c b/dlls/d3d8/volume.c index bcc6a93..2e14a59 100644 --- a/dlls/d3d8/volume.c +++ b/dlls/d3d8/volume.c @@ -195,7 +195,7 @@ static void STDMETHODCALLTYPE volume_wined3d_object_destroyed(void *parent) { struct d3d8_volume *volume = parent; d3d8_resource_cleanup(&volume->resource); - HeapFree(GetProcessHeap(), 0, volume); + heap_free(volume); } static const struct wined3d_parent_ops d3d8_volume_wined3d_parent_ops = -- 2.1.4

1 0

[PATCH 4/5] d3d9: Use wined3d_buffer_create() in vertexbuffer_init().
by Henri Verbeet Feb. 7, 2018

Feb. 7, 2018

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d9/buffer.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/dlls/d3d9/buffer.c b/dlls/d3d9/buffer.c index 795164c..30e86f8 100644 --- a/dlls/d3d9/buffer.c +++ b/dlls/d3d9/buffer.c @@ -274,25 +274,29 @@ static const struct wined3d_parent_ops d3d9_vertexbuffer_wined3d_parent_ops = HRESULT vertexbuffer_init(struct d3d9_vertexbuffer *buffer, struct d3d9_device *device, UINT size, UINT usage, DWORD fvf, 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; if (pool == D3DPOOL_SCRATCH) { - wined3d_pool = WINED3D_POOL_SYSTEM_MEM; - wined3d_usage |= WINED3DUSAGE_SCRATCH; + WARN("Vertex buffer with D3DPOOL_SCRATCH requested.\n"); + return D3DERR_INVALIDCALL; } buffer->IDirect3DVertexBuffer9_iface.lpVtbl = &d3d9_vertexbuffer_vtbl; buffer->fvf = fvf; d3d9_resource_init(&buffer->resource); + desc.byte_width = size; + desc.usage = usage & WINED3DUSAGE_MASK; + desc.bind_flags = WINED3D_BIND_VERTEX_BUFFER; + desc.access = wined3daccess_from_d3dpool(pool); + desc.misc_flags = 0; + desc.structure_byte_stride = 0; + wined3d_mutex_lock(); - hr = wined3d_buffer_create_vb(device->wined3d_device, size, wined3d_usage, wined3d_pool, - buffer, &d3d9_vertexbuffer_wined3d_parent_ops, &buffer->wined3d_buffer); + hr = wined3d_buffer_create(device->wined3d_device, &desc, NULL, buffer, + &d3d9_vertexbuffer_wined3d_parent_ops, &buffer->wined3d_buffer); wined3d_mutex_unlock(); if (FAILED(hr)) { -- 2.1.4

1 0

[PATCH 3/5] d3d8: Use wined3d_buffer_create() in d3d8_device_prepare_vertex_buffer().
by Henri Verbeet Feb. 7, 2018

Feb. 7, 2018

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d8/device.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 590ab45..3ce0460 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -2108,15 +2108,22 @@ static HRESULT d3d8_device_prepare_vertex_buffer(struct d3d8_device *device, UIN if (device->vertex_buffer_size < min_size || !device->vertex_buffer) { UINT size = max(device->vertex_buffer_size * 2, min_size); + struct wined3d_buffer_desc desc; struct wined3d_buffer *buffer; TRACE("Growing vertex buffer to %u bytes\n", size); - hr = wined3d_buffer_create_vb(device->wined3d_device, size, WINED3DUSAGE_DYNAMIC | WINED3DUSAGE_WRITEONLY, - WINED3D_POOL_DEFAULT, NULL, &d3d8_null_wined3d_parent_ops, &buffer); - if (FAILED(hr)) + desc.byte_width = size; + desc.usage = WINED3DUSAGE_DYNAMIC | WINED3DUSAGE_WRITEONLY; + desc.bind_flags = WINED3D_BIND_VERTEX_BUFFER; + desc.access = WINED3D_RESOURCE_ACCESS_GPU; + desc.misc_flags = 0; + desc.structure_byte_stride = 0; + + if (FAILED(hr = wined3d_buffer_create(device->wined3d_device, &desc, + NULL, NULL, &d3d8_null_wined3d_parent_ops, &buffer))) { - ERR("(%p) wined3d_buffer_create_vb failed with hr = %08x\n", device, hr); + ERR("Failed to create vertex buffer, hr %#x.\n", hr); return hr; } -- 2.1.4

1 0

[PATCH 2/5] d3d8: Use wined3d_buffer_create() in vertexbuffer_init().
by Henri Verbeet Feb. 7, 2018

Feb. 7, 2018

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d8/buffer.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/dlls/d3d8/buffer.c b/dlls/d3d8/buffer.c index 10ba302..14a2fb6 100644 --- a/dlls/d3d8/buffer.c +++ b/dlls/d3d8/buffer.c @@ -273,25 +273,29 @@ static const struct wined3d_parent_ops d3d8_vertexbuffer_wined3d_parent_ops = HRESULT vertexbuffer_init(struct d3d8_vertexbuffer *buffer, struct d3d8_device *device, UINT size, DWORD usage, DWORD fvf, 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; if (pool == D3DPOOL_SCRATCH) { - wined3d_pool = WINED3D_POOL_SYSTEM_MEM; - wined3d_usage |= WINED3DUSAGE_SCRATCH; + WARN("Vertex buffer with D3DPOOL_SCRATCH requested.\n"); + return D3DERR_INVALIDCALL; } buffer->IDirect3DVertexBuffer8_iface.lpVtbl = &Direct3DVertexBuffer8_Vtbl; d3d8_resource_init(&buffer->resource); buffer->fvf = fvf; + desc.byte_width = size; + desc.usage = usage & WINED3DUSAGE_MASK; + desc.bind_flags = WINED3D_BIND_VERTEX_BUFFER; + desc.access = wined3daccess_from_d3dpool(pool); + desc.misc_flags = 0; + desc.structure_byte_stride = 0; + wined3d_mutex_lock(); - hr = wined3d_buffer_create_vb(device->wined3d_device, size, wined3d_usage, wined3d_pool, - buffer, &d3d8_vertexbuffer_wined3d_parent_ops, &buffer->wined3d_buffer); + hr = wined3d_buffer_create(device->wined3d_device, &desc, NULL, buffer, + &d3d8_vertexbuffer_wined3d_parent_ops, &buffer->wined3d_buffer); wined3d_mutex_unlock(); if (FAILED(hr)) { -- 2.1.4

1 0

[PATCH 1/5] ddraw: Use wined3d_buffer_create() in d3d_vertex_buffer_create_wined3d_buffer().
by Henri Verbeet Feb. 7, 2018

Feb. 7, 2018

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/ddraw/vertexbuffer.c | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/dlls/ddraw/vertexbuffer.c b/dlls/ddraw/vertexbuffer.c index 6a9544b..df8531d 100644 --- a/dlls/ddraw/vertexbuffer.c +++ b/dlls/ddraw/vertexbuffer.c @@ -115,22 +115,24 @@ static ULONG WINAPI d3d_vertex_buffer7_Release(IDirect3DVertexBuffer7 *iface) static HRESULT d3d_vertex_buffer_create_wined3d_buffer(struct d3d_vertex_buffer *buffer, BOOL dynamic, struct wined3d_buffer **wined3d_buffer) { - DWORD usage = WINED3DUSAGE_STATICDECL; - enum wined3d_pool pool; - - if (buffer->Caps & D3DVBCAPS_SYSTEMMEMORY) - pool = WINED3D_POOL_SYSTEM_MEM; - else - pool = WINED3D_POOL_DEFAULT; + struct wined3d_buffer_desc desc; + desc.byte_width = buffer->size; + desc.usage = WINED3DUSAGE_STATICDECL; if (buffer->Caps & D3DVBCAPS_WRITEONLY) - usage |= WINED3DUSAGE_WRITEONLY; + desc.usage |= WINED3DUSAGE_WRITEONLY; if (dynamic) - usage |= WINED3DUSAGE_DYNAMIC; + desc.usage |= WINED3DUSAGE_DYNAMIC; + desc.bind_flags = WINED3D_BIND_VERTEX_BUFFER; + if (buffer->Caps & D3DVBCAPS_SYSTEMMEMORY) + desc.access = WINED3D_RESOURCE_ACCESS_CPU | WINED3D_RESOURCE_ACCESS_MAP; + else + desc.access = WINED3D_RESOURCE_ACCESS_GPU; + desc.misc_flags = 0; + desc.structure_byte_stride = 0; - return wined3d_buffer_create_vb(buffer->ddraw->wined3d_device, - buffer->size, usage, pool, buffer, &ddraw_null_wined3d_parent_ops, - wined3d_buffer); + return wined3d_buffer_create(buffer->ddraw->wined3d_device, &desc, + NULL, buffer, &ddraw_null_wined3d_parent_ops, wined3d_buffer); } /***************************************************************************** -- 2.1.4

1 0

[PATCH] reg: Use the global HeapAlloc() wrappers
by Michael Stefaniuc Feb. 7, 2018

Feb. 7, 2018

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/reg/export.c | 1 + programs/reg/import.c | 1 + programs/reg/reg.c | 15 +++------------ programs/reg/reg.h | 1 - 4 files changed, 5 insertions(+), 13 deletions(-) diff --git a/programs/reg/export.c b/programs/reg/export.c index 39001c81a8..622e7ca8d9 100644 --- a/programs/reg/export.c +++ b/programs/reg/export.c @@ -20,6 +20,7 @@ #include <stdlib.h> #include <wine/unicode.h> +#include <wine/heap.h> #include "reg.h" diff --git a/programs/reg/import.c b/programs/reg/import.c index 8350fa7e69..f2ce80e7cb 100644 --- a/programs/reg/import.c +++ b/programs/reg/import.c @@ -23,6 +23,7 @@ #include <wine/unicode.h> #include <wine/debug.h> +#include <wine/heap.h> #include "reg.h" diff --git a/programs/reg/reg.c b/programs/reg/reg.c index 8d510f7f7e..455d3dd96a 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -21,6 +21,7 @@ #include <stdlib.h> #include <wine/unicode.h> #include <wine/debug.h> +#include <wine/heap.h> #include "reg.h" WINE_DEFAULT_DEBUG_CHANNEL(reg); @@ -81,7 +82,7 @@ static const WCHAR newlineW[] = {'\n',0}; void *heap_xalloc(size_t size) { - void *buf = HeapAlloc(GetProcessHeap(), 0, size); + void *buf = heap_alloc(size); if (!buf) { ERR("Out of memory!\n"); @@ -92,12 +93,7 @@ void *heap_xalloc(size_t size) void *heap_xrealloc(void *buf, size_t size) { - void *new_buf; - - if (buf) - new_buf = HeapReAlloc(GetProcessHeap(), 0, buf, size); - else - new_buf = HeapAlloc(GetProcessHeap(), 0, size); + void *new_buf = heap_realloc(buf, size); if (!new_buf) { @@ -108,11 +104,6 @@ void *heap_xrealloc(void *buf, size_t size) return new_buf; } -BOOL heap_free(void *buf) -{ - return HeapFree(GetProcessHeap(), 0, buf); -} - void output_writeconsole(const WCHAR *str, DWORD wlen) { DWORD count, ret; diff --git a/programs/reg/reg.h b/programs/reg/reg.h index eb792bbf88..dbce738ecd 100644 --- a/programs/reg/reg.h +++ b/programs/reg/reg.h @@ -27,7 +27,6 @@ /* reg.c */ void *heap_xalloc(size_t size); void *heap_xrealloc(void *buf, size_t size); -BOOL heap_free(void *buf); void output_writeconsole(const WCHAR *str, DWORD wlen); void WINAPIV output_message(unsigned int id, ...); BOOL ask_confirm(unsigned int msgid, WCHAR *reg_info); -- 2.14.3

1 0

[PATCH] kernel32: Added support for MOVEFILE_WRITE_THROUGH in MoveFileWithProgress
by Oded Elisha Feb. 7, 2018

Feb. 7, 2018

Added support for MOVEFILE_WRITE_THROUGH using linux sync syscall. Tested on Arch Linux. Signed-off-by: Oded Elisha <oded123456(a)gmail.com> --- dlls/kernel32/path.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index a389743..81610a2 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -1268,6 +1268,9 @@ BOOL WINAPI CopyFileExA(LPCSTR sourceFilename, LPCSTR destFilename, return ret; } +extern int CDECL wine_server_handle_to_fd( HANDLE handle, unsigned int access, int *unix_fd, + unsigned int *options ); + /************************************************************************** * MoveFileWithProgressW (KERNEL32.@) @@ -1283,6 +1286,7 @@ BOOL WINAPI MoveFileWithProgressW( LPCWSTR source, LPCWSTR dest, NTSTATUS status; HANDLE source_handle = 0, dest_handle; ANSI_STRING source_unix, dest_unix; + BOOL should_sync = FALSE; TRACE("(%s,%s,%p,%p,%04x)\n", debugstr_w(source), debugstr_w(dest), fnProgress, param, flag ); @@ -1293,8 +1297,9 @@ BOOL WINAPI MoveFileWithProgressW( LPCWSTR source, LPCWSTR dest, if (!dest) return DeleteFileW( source ); - if (flag & MOVEFILE_WRITE_THROUGH) - FIXME("MOVEFILE_WRITE_THROUGH unimplemented\n"); + if ((flag & MOVEFILE_WRITE_THROUGH) && !(flag & MOVEFILE_DELAY_UNTIL_REBOOT)) { + should_sync = TRUE; + } /* check if we are allowed to rename the source */ @@ -1404,6 +1409,10 @@ BOOL WINAPI MoveFileWithProgressW( LPCWSTR source, LPCWSTR dest, } } + if (should_sync) { + sync(); + } + NtClose( source_handle ); RtlFreeAnsiString( &source_unix ); RtlFreeAnsiString( &dest_unix ); -- 2.16.1

4 7

[PATCH v3 1/9] wined3d: Add WINED3D_RTYPE_TEXTURE_1D.
by Sven Hesse Feb. 7, 2018

Feb. 7, 2018

Signed-off-by: Sven Hesse <shesse(a)codeweavers.com> --- dlls/wined3d/context.c | 1 + dlls/wined3d/device.c | 4 +++- dlls/wined3d/directx.c | 14 ++++++++++++++ dlls/wined3d/resource.c | 1 + dlls/wined3d/utils.c | 1 + include/wine/wined3d.h | 5 +++-- 6 files changed, 23 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index ccfe630e1f..f8419f063c 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1017,6 +1017,7 @@ void context_resource_released(const struct wined3d_device *device, switch (type) { + case WINED3D_RTYPE_TEXTURE_1D: case WINED3D_RTYPE_TEXTURE_2D: case WINED3D_RTYPE_TEXTURE_3D: texture = texture_from_resource(resource); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 2d1603f0b0..096f4010fb 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4239,7 +4239,8 @@ void CDECL wined3d_device_update_sub_resource(struct wined3d_device *device, str height = 1; depth = 1; } - else if (resource->type == WINED3D_RTYPE_TEXTURE_2D || resource->type == WINED3D_RTYPE_TEXTURE_3D) + else if (resource->type == WINED3D_RTYPE_TEXTURE_1D || resource->type == WINED3D_RTYPE_TEXTURE_2D + || resource->type == WINED3D_RTYPE_TEXTURE_3D) { struct wined3d_texture *texture = texture_from_resource(resource); unsigned int level; @@ -5006,6 +5007,7 @@ void device_resource_released(struct wined3d_device *device, struct wined3d_reso switch (type) { + case WINED3D_RTYPE_TEXTURE_1D: case WINED3D_RTYPE_TEXTURE_2D: case WINED3D_RTYPE_TEXTURE_3D: for (i = 0; i < MAX_COMBINED_SAMPLERS; ++i) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 000d0b7546..e1b064d030 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -5312,6 +5312,20 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, UINT ad gl_type_end = WINED3D_GL_RES_TYPE_TEX_3D; break; + case WINED3D_RTYPE_TEXTURE_1D: + allowed_usage = WINED3DUSAGE_AUTOGENMIPMAP + | WINED3DUSAGE_DYNAMIC + | WINED3DUSAGE_SOFTWAREPROCESSING + | WINED3DUSAGE_TEXTURE + | WINED3DUSAGE_QUERY_FILTER + | WINED3DUSAGE_QUERY_POSTPIXELSHADER_BLENDING + | WINED3DUSAGE_QUERY_SRGBREAD + | WINED3DUSAGE_QUERY_SRGBWRITE + | WINED3DUSAGE_QUERY_VERTEXTEXTURE + | WINED3DUSAGE_QUERY_WRAPANDMIP; + gl_type = gl_type_end = WINED3D_GL_RES_TYPE_TEX_1D; + break; + case WINED3D_RTYPE_TEXTURE_2D: allowed_usage = WINED3DUSAGE_DEPTHSTENCIL | WINED3DUSAGE_RENDERTARGET diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index 61ff20679b..82a0082f6d 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -76,6 +76,7 @@ HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device * resource_types[] = { {WINED3D_RTYPE_BUFFER, 0, WINED3D_GL_RES_TYPE_BUFFER}, + {WINED3D_RTYPE_TEXTURE_1D, 0, WINED3D_GL_RES_TYPE_TEX_1D}, {WINED3D_RTYPE_TEXTURE_2D, 0, WINED3D_GL_RES_TYPE_TEX_2D}, {WINED3D_RTYPE_TEXTURE_2D, 0, WINED3D_GL_RES_TYPE_TEX_RECT}, {WINED3D_RTYPE_TEXTURE_2D, 0, WINED3D_GL_RES_TYPE_RB}, diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index a31baa43a7..c1cceebb58 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -4262,6 +4262,7 @@ const char *debug_d3dresourcetype(enum wined3d_resource_type resource_type) #define WINED3D_TO_STR(x) case x: return #x WINED3D_TO_STR(WINED3D_RTYPE_NONE); WINED3D_TO_STR(WINED3D_RTYPE_BUFFER); + WINED3D_TO_STR(WINED3D_RTYPE_TEXTURE_1D); WINED3D_TO_STR(WINED3D_RTYPE_TEXTURE_2D); WINED3D_TO_STR(WINED3D_RTYPE_TEXTURE_3D); #undef WINED3D_TO_STR diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 72168e5fa7..16ea11d8b1 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -676,8 +676,9 @@ enum wined3d_resource_type { WINED3D_RTYPE_NONE = 0, WINED3D_RTYPE_BUFFER = 1, - WINED3D_RTYPE_TEXTURE_2D = 2, - WINED3D_RTYPE_TEXTURE_3D = 3, + WINED3D_RTYPE_TEXTURE_1D = 2, + WINED3D_RTYPE_TEXTURE_2D = 3, + WINED3D_RTYPE_TEXTURE_3D = 4, }; enum wined3d_pool -- 2.16.1

3 10

[PATCH] user32: Improve EnumDisplayDevices
by Andrew Eikum Feb. 7, 2018

Feb. 7, 2018

Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- On my 2-monitor setup this results in: for device 0, got name: \\.\DISPLAY1, string: X11 Windowing System, flags: 0x15 for device 0 sub 0, got name: \\.\DISPLAY1\Monitor0, string: Generic PnP Monitor, flags: 0x3 for device 1, got name: \\.\DISPLAY1, string: X11 Windowing System, flags: 0x11 for device 1 sub 0, got name: \\.\DISPLAY1\Monitor0, string: Generic PnP Monitor, flags: 0x3 Which nearly matches Windows 10 on the same hardware. The differences are the 2nd device should be DISPLAY2, not DISPLAY1; and the primary adapter comes 2nd on Windows. However, DISPLAY1 is hard-coded at least in gdi32, winex11, and winemac, so I hard-coded it here as well. This results in both monitors and adapters having the same name, which is clumsy. But it is sufficient to fix Unity games displaying on the non-primary monitor by default. dlls/user32/misc.c | 94 ++++++++++++++++++++++++++++++++++++++++++++---------- include/wingdi.h | 6 +++- 2 files changed, 82 insertions(+), 18 deletions(-) diff --git a/dlls/user32/misc.c b/dlls/user32/misc.c index 895ccce312..96d5212725 100644 --- a/dlls/user32/misc.c +++ b/dlls/user32/misc.c @@ -243,11 +243,13 @@ DWORD WINAPI SetLogonNotifyWindow(HWINSTA hwinsta,HWND hwnd) return 1; } -static const WCHAR primary_device_name[] = {'\\','\\','.','\\','D','I','S','P','L','A','Y','1',0}; -static const WCHAR primary_device_string[] = {'X','1','1',' ','W','i','n','d','o','w','i','n','g',' ', +static const WCHAR device_name[] = {'\\','\\','.','\\','D','I','S','P','L','A','Y','1',0}; +static const WCHAR device_string[] = {'X','1','1',' ','W','i','n','d','o','w','i','n','g',' ', 'S','y','s','t','e','m',0}; -static const WCHAR primary_device_deviceid[] = {'P','C','I','\\','V','E','N','_','0','0','0','0','&', +static const WCHAR monitor_string[] = {'G','e','n','e','r','i','c',' ','P','n','P',' ','M','o','n','i','t','o','r',0}; +static const WCHAR device_deviceid[] = {'P','C','I','\\','V','E','N','_','0','0','0','0','&', 'D','E','V','_','0','0','0','0',0}; +static const WCHAR monitor0W[] = {'\\','M','o','n','i','t','o','r','0',0}; /*********************************************************************** * EnumDisplayDevicesA (USER32.@) @@ -282,29 +284,87 @@ BOOL WINAPI EnumDisplayDevicesA( LPCSTR lpDevice, DWORD i, LPDISPLAY_DEVICEA lpD return TRUE; } +struct edd_enum_info +{ + UINT idx; + UINT desired; + HMONITOR hmon; +}; + +static BOOL CALLBACK edd_enum( HMONITOR monitor, HDC hdc, LPRECT rect, LPARAM lp ) +{ + struct edd_enum_info *info = (struct edd_enum_info *)lp; + if (info->idx == info->desired) + { + info->hmon = monitor; + return FALSE; + } + info->idx++; + return TRUE; +} + /*********************************************************************** * EnumDisplayDevicesW (USER32.@) */ BOOL WINAPI EnumDisplayDevicesW( LPCWSTR lpDevice, DWORD i, LPDISPLAY_DEVICEW lpDisplayDevice, DWORD dwFlags ) { - FIXME("(%s,%d,%p,0x%08x), stub!\n",debugstr_w(lpDevice),i,lpDisplayDevice,dwFlags); + TRACE("(%s, %d, %p, 0x%08x)\n", debugstr_w(lpDevice), i, lpDisplayDevice, dwFlags); - if (i) + if (!lpDisplayDevice) return FALSE; - memcpy(lpDisplayDevice->DeviceName, primary_device_name, sizeof(primary_device_name)); - memcpy(lpDisplayDevice->DeviceString, primary_device_string, sizeof(primary_device_string)); - - lpDisplayDevice->StateFlags = - DISPLAY_DEVICE_ATTACHED_TO_DESKTOP | - DISPLAY_DEVICE_PRIMARY_DEVICE | - DISPLAY_DEVICE_VGA_COMPATIBLE; - - if(lpDisplayDevice->cb >= offsetof(DISPLAY_DEVICEW, DeviceID) + sizeof(lpDisplayDevice->DeviceID)) - memcpy(lpDisplayDevice->DeviceID, primary_device_deviceid, sizeof(primary_device_deviceid)); - if(lpDisplayDevice->cb >= offsetof(DISPLAY_DEVICEW, DeviceKey) + sizeof(lpDisplayDevice->DeviceKey)) - lpDisplayDevice->DeviceKey[0] = 0; + if (!lpDevice) + { + struct edd_enum_info info = {0}; + MONITORINFO monitor = {0}; + + /* one adapter per monitor */ + info.desired = i; + EnumDisplayMonitors(0, NULL, edd_enum, (LPARAM)&info); + + if (info.hmon == NULL) + return FALSE; + + monitor.cbSize = sizeof(monitor); + if (!GetMonitorInfoW(info.hmon, &monitor)) + return FALSE; + + memcpy(lpDisplayDevice->DeviceName, device_name, sizeof(device_name)); + memcpy(lpDisplayDevice->DeviceString, device_string, sizeof(device_string)); + + lpDisplayDevice->StateFlags = DISPLAY_DEVICE_ATTACHED_TO_DESKTOP | + DISPLAY_DEVICE_VGA_COMPATIBLE; + + if (monitor.dwFlags & MONITORINFOF_PRIMARY) + lpDisplayDevice->StateFlags |= DISPLAY_DEVICE_PRIMARY_DEVICE; + + if (lpDisplayDevice->cb >= offsetof(DISPLAY_DEVICEW, DeviceID) + sizeof(lpDisplayDevice->DeviceID)) + memcpy(lpDisplayDevice->DeviceID, device_deviceid, sizeof(device_deviceid)); + if (lpDisplayDevice->cb >= offsetof(DISPLAY_DEVICEW, DeviceKey) + sizeof(lpDisplayDevice->DeviceKey)) + lpDisplayDevice->DeviceKey[0] = 0; + } + else + { + if (i != 0) + /* one monitor per adapter */ + return FALSE; + + if (strcmpW(lpDevice, device_name) != 0) + return FALSE; + + strcpyW(lpDisplayDevice->DeviceName, lpDevice); + strcatW(lpDisplayDevice->DeviceName, monitor0W); + + memcpy(lpDisplayDevice->DeviceString, monitor_string, sizeof(monitor_string)); + + lpDisplayDevice->StateFlags = DISPLAY_DEVICE_ACTIVE | DISPLAY_DEVICE_ATTACHED; + + if (lpDisplayDevice->cb >= offsetof(DISPLAY_DEVICEW, DeviceID) + sizeof(lpDisplayDevice->DeviceID)) + memcpy(lpDisplayDevice->DeviceID, device_deviceid, sizeof(device_deviceid)); + if (lpDisplayDevice->cb >= offsetof(DISPLAY_DEVICEW, DeviceKey) + sizeof(lpDisplayDevice->DeviceKey)) + lpDisplayDevice->DeviceKey[0] = 0; + } return TRUE; } diff --git a/include/wingdi.h b/include/wingdi.h index 1851654194..03b7ed2ce4 100644 --- a/include/wingdi.h +++ b/include/wingdi.h @@ -3318,13 +3318,17 @@ DECL_WINELIB_TYPE_AW(DISPLAY_DEVICE) DECL_WINELIB_TYPE_AW(PDISPLAY_DEVICE) DECL_WINELIB_TYPE_AW(LPDISPLAY_DEVICE) -/* DISPLAY_DEVICE.StateFlags (?)*/ +/* DISPLAY_DEVICE.StateFlags, adapter flags */ #define DISPLAY_DEVICE_ATTACHED_TO_DESKTOP 0x00000001 #define DISPLAY_DEVICE_MULTI_DRIVER 0x00000002 #define DISPLAY_DEVICE_PRIMARY_DEVICE 0x00000004 #define DISPLAY_DEVICE_MIRRORING_DRIVER 0x00000008 #define DISPLAY_DEVICE_VGA_COMPATIBLE 0x00000010 +/* DISPLAY_DEVICE.StateFlags, monitor flags */ +#define DISPLAY_DEVICE_ACTIVE 0x00000001 +#define DISPLAY_DEVICE_ATTACHED 0x00000002 + typedef struct DISPLAYCONFIG_DESKTOP_IMAGE_INFO { POINTL PathSourceSize; -- 2.16.1

1 1

[PATCH] wscript: Use the global HeapAlloc() wrappers
by Michael Stefaniuc Feb. 7, 2018

Feb. 7, 2018

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/wscript/host.c | 1 + programs/wscript/wscript.h | 15 --------------- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/programs/wscript/host.c b/programs/wscript/host.c index 3c30c3ca5d..fb95c0c94d 100644 --- a/programs/wscript/host.c +++ b/programs/wscript/host.c @@ -28,6 +28,7 @@ #include "wscript.h" #include <wine/debug.h> +#include <wine/heap.h> #include <wine/unicode.h> WINE_DEFAULT_DEBUG_CHANNEL(wscript); diff --git a/programs/wscript/wscript.h b/programs/wscript/wscript.h index 2a64b3456b..d624a2d851 100644 --- a/programs/wscript/wscript.h +++ b/programs/wscript/wscript.h @@ -33,18 +33,3 @@ extern WCHAR **argums; extern int numOfArgs; extern VARIANT_BOOL wshInteractive; - -static inline void * __WINE_ALLOC_SIZE(1) heap_alloc(size_t len) -{ - return HeapAlloc(GetProcessHeap(), 0, len); -} - -static inline void * __WINE_ALLOC_SIZE(1) heap_alloc_zero(size_t len) -{ - return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); -} - -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -} -- 2.14.3

2 1