February 2017 - Wine-commits

Nikolay Sivov : d2d1/tests: Test to show that WIC bitmap is locked within BeginDraw()/EndDraw().
by Alexandre Julliard 17 Feb '17

17 Feb '17

Module: wine Branch: master Commit: 93959d21e97b007562f7d7a507c5f0d65b376439 URL: http://source.winehq.org/git/wine.git/?a=commit;h=93959d21e97b007562f7d7a50… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Feb 16 18:09:21 2017 +0300 d2d1/tests: Test to show that WIC bitmap is locked within BeginDraw()/EndDraw(). 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/tests/d2d1.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 5c6f346..19efd73 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -3971,6 +3971,7 @@ static void test_gdi_interop(void) ID2D1GdiInteropRenderTarget *interop; D2D1_RENDER_TARGET_PROPERTIES desc; IWICImagingFactory *wic_factory; + IWICBitmapLock *wic_lock; IWICBitmap *wic_bitmap; ID2D1RenderTarget *rt; ID2D1Factory *factory; @@ -4065,6 +4066,19 @@ todo_wine match = compare_wic_bitmap(wic_bitmap, "60cacbf3d72e1e7834203da608037b1bf83b40e8"); ok(match, "Bitmap does not match.\n"); + /* Bitmap is locked at BeginDraw(). */ + hr = IWICBitmap_Lock(wic_bitmap, NULL, WICBitmapLockRead, &wic_lock); + ok(SUCCEEDED(hr), "Expected bitmap to be unlocked, hr %#x.\n", hr); + IWICBitmapLock_Release(wic_lock); + + ID2D1RenderTarget_BeginDraw(rt); + hr = IWICBitmap_Lock(wic_bitmap, NULL, WICBitmapLockRead, &wic_lock); +todo_wine + ok(hr == WINCODEC_ERR_ALREADYLOCKED, "Expected bitmap to be locked, hr %#x.\n", hr); + if (SUCCEEDED(hr)) + IWICBitmapLock_Release(wic_lock); + ID2D1RenderTarget_EndDraw(rt, NULL, NULL); + ID2D1GdiInteropRenderTarget_Release(interop); ID2D1RenderTarget_Release(rt);

1 0

Sebastian Lackner : mmdevapi: Use InitOnce to initialize audio drivers.
by Alexandre Julliard 17 Feb '17

17 Feb '17

Module: wine Branch: master Commit: db0518507a595fbad33e47c1afe54edcf6a50b5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=db0518507a595fbad33e47c1a… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Feb 17 09:34:25 2017 +0100 mmdevapi: Use InitOnce to initialize audio drivers. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mmdevapi/main.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/mmdevapi/main.c b/dlls/mmdevapi/main.c index 110c802..4246758 100644 --- a/dlls/mmdevapi/main.c +++ b/dlls/mmdevapi/main.c @@ -109,7 +109,7 @@ static BOOL load_driver(const WCHAR *name, DriverFuncs *driver) return TRUE; } -static BOOL init_driver(void) +static BOOL WINAPI init_driver(INIT_ONCE *once, void *param, void **context) { static const WCHAR drv_value[] = {'A','u','d','i','o',0}; @@ -120,9 +120,6 @@ static BOOL init_driver(void) HKEY key; WCHAR reg_list[256], *p, *next, *driver_list = default_list; - if(drvs.module) - return TRUE; - if(RegOpenKeyW(HKEY_CURRENT_USER, drv_keyW, &key) == ERROR_SUCCESS){ DWORD size = sizeof(reg_list); @@ -276,10 +273,11 @@ static IClassFactoryImpl MMDEVAPI_CF[] = { HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) { + static INIT_ONCE init_once = INIT_ONCE_STATIC_INIT; unsigned int i = 0; TRACE("(%s, %s, %p)\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); - if(!init_driver()){ + if(!InitOnceExecuteOnce(&init_once, init_driver, NULL, NULL)) { ERR("Driver initialization failed\n"); return E_FAIL; }

1 0

Sebastian Lackner : wined3d: Remove duplicate assignment of NULL to map_ptr in wined3d_buffer_map.
by Alexandre Julliard 17 Feb '17

17 Feb '17

Module: wine Branch: master Commit: d3c11f507f0fe9d1c2176be8369de1df17ea4ba7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3c11f507f0fe9d1c2176be83… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Feb 17 04:43:39 2017 +0100 wined3d: Remove duplicate assignment of NULL to map_ptr in wined3d_buffer_map. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index b647dfb..91ab130 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1107,7 +1107,6 @@ static HRESULT wined3d_buffer_map(struct wined3d_buffer *buffer, UINT offset, UI buffer->flags |= WINED3D_BUFFER_PIN_SYSMEM; } TRACE("New pointer is %p.\n", buffer->resource.heap_memory); - buffer->map_ptr = NULL; } }

1 0

Henri Verbeet : wined3d: Send primary GL context initialisation through the command stream.
by Alexandre Julliard 17 Feb '17

17 Feb '17

Module: wine Branch: master Commit: 2a28c2069001e31acb57827078e814afd10aed2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a28c2069001e31acb5782707… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 17 14:08:14 2017 +0100 wined3d: Send primary GL context initialisation through the command stream. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 3777331..8192bf9 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -984,8 +984,10 @@ static void wined3d_device_delete_opengl_contexts(struct wined3d_device *device) wined3d_cs_destroy_object(device->cs, wined3d_device_delete_opengl_contexts_cs, device); } -static HRESULT create_primary_opengl_context(struct wined3d_device *device, struct wined3d_swapchain *swapchain) +static void wined3d_device_create_primary_opengl_context_cs(void *object) { + struct wined3d_device *device = object; + struct wined3d_swapchain *swapchain; struct wined3d_context *context; struct wined3d_texture *target; HRESULT hr; @@ -994,21 +996,29 @@ static HRESULT create_primary_opengl_context(struct wined3d_device *device, stru device->adapter->vertex_pipe, device->adapter->fragment_pipe))) { ERR("Failed to allocate shader private data, hr %#x.\n", hr); - return hr; + return; } if (FAILED(hr = device->blitter->alloc_private(device))) { ERR("Failed to allocate blitter private data, hr %#x.\n", hr); device->shader_backend->shader_free_private(device); - return hr; + return; } + swapchain = device->swapchains[0]; target = swapchain->back_buffers ? swapchain->back_buffers[0] : swapchain->front_buffer; context = context_acquire(device, target, 0); create_dummy_textures(device, context); create_default_samplers(device, context); context_release(context); +} + +static HRESULT wined3d_device_create_primary_opengl_context(struct wined3d_device *device) +{ + wined3d_cs_init_object(device->cs, wined3d_device_create_primary_opengl_context_cs, device); + if (!device->swapchains[0]->num_contexts) + return E_FAIL; return WINED3D_OK; } @@ -1069,7 +1079,7 @@ HRESULT CDECL wined3d_device_init_3d(struct wined3d_device *device, } device->swapchains[0] = swapchain; - if (FAILED(hr = create_primary_opengl_context(device, swapchain))) + if (FAILED(hr = wined3d_device_create_primary_opengl_context(device))) goto err_out; device_init_swapchain_state(device, swapchain); @@ -4798,7 +4808,7 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, if (device->d3d_initialized) { if (reset_state) - hr = create_primary_opengl_context(device, swapchain); + hr = wined3d_device_create_primary_opengl_context(device); swapchain_update_swap_interval(swapchain); }

1 0

Henri Verbeet : wined3d: Handle CS op emission from CS op handlers.
by Alexandre Julliard 17 Feb '17

17 Feb '17

Module: wine Branch: master Commit: 351e6ddf094256d4de4ffe59d5bd5fe72a5b24a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=351e6ddf094256d4de4ffe59d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 17 14:08:15 2017 +0100 wined3d: Handle CS op emission from CS op handlers. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 37 +++++++++++++++++++++++++++++-------- dlls/wined3d/wined3d_private.h | 2 +- 2 files changed, 30 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 55706cd..10905c0 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -1576,26 +1576,47 @@ static void (* const wined3d_cs_op_handlers[])(struct wined3d_cs *cs, const void static void *wined3d_cs_st_require_space(struct wined3d_cs *cs, size_t size) { - if (size > cs->data_size) + if (size > (cs->data_size - cs->end)) { + size_t new_size; void *new_data; - size = max( size, cs->data_size * 2 ); - if (!(new_data = HeapReAlloc(GetProcessHeap(), 0, cs->data, size))) + new_size = max(size, cs->data_size * 2); + if (!cs->end) + new_data = HeapReAlloc(GetProcessHeap(), 0, cs->data, new_size); + else + new_data = HeapAlloc(GetProcessHeap(), 0, new_size); + if (!new_data) return NULL; - cs->data_size = size; + cs->data_size = new_size; + cs->start = cs->end = 0; cs->data = new_data; } - return cs->data; + cs->end += size; + + return (BYTE *)cs->data + cs->start; } static void wined3d_cs_st_submit(struct wined3d_cs *cs) { - enum wined3d_cs_op opcode = *(const enum wined3d_cs_op *)cs->data; - - wined3d_cs_op_handlers[opcode](cs, cs->data); + enum wined3d_cs_op opcode; + size_t start; + BYTE *data; + + data = cs->data; + start = cs->start; + cs->start = cs->end; + opcode = *(const enum wined3d_cs_op *)&data[start]; + wined3d_cs_op_handlers[opcode](cs, &data[start]); + if (!start) + { + if (cs->data != data) + HeapFree(GetProcessHeap(), 0, data); + else + cs->start = cs->end = 0; + } } static void wined3d_cs_st_push_constants(struct wined3d_cs *cs, enum wined3d_push_constants p, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 54adf26..49fba06 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3170,7 +3170,7 @@ struct wined3d_cs struct wined3d_fb_state fb; struct wined3d_state state; - size_t data_size; + size_t data_size, start, end; void *data; };

1 0

Henri Verbeet : wined3d: Handle system memory copies in wined3d_texture_load_location().
by Alexandre Julliard 17 Feb '17

17 Feb '17

Module: wine Branch: master Commit: a7e5d4038c3a1557ef902499addf16724940b2c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7e5d4038c3a1557ef902499a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 17 14:08:16 2017 +0100 wined3d: Handle system memory copies in wined3d_texture_load_location(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 45 ------------------------------------------- dlls/wined3d/texture.c | 52 +++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 51 insertions(+), 46 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 507be21..b30585c 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2496,45 +2496,6 @@ static HRESULT surface_blt_special(struct wined3d_surface *dst_surface, const RE return WINED3DERR_INVALIDCALL; } -static void surface_copy_simple_location(struct wined3d_surface *surface, DWORD location) -{ - unsigned int sub_resource_idx = surface_get_sub_resource_idx(surface); - struct wined3d_texture *texture = surface->container; - struct wined3d_device *device = texture->resource.device; - struct wined3d_texture_sub_resource *sub_resource; - struct wined3d_context *context; - const struct wined3d_gl_info *gl_info; - struct wined3d_bo_address dst, src; - - sub_resource = &texture->sub_resources[sub_resource_idx]; - wined3d_texture_get_memory(texture, sub_resource_idx, &dst, location); - wined3d_texture_get_memory(texture, sub_resource_idx, &src, sub_resource->locations); - - if (dst.buffer_object) - { - context = context_acquire(device, NULL, 0); - gl_info = context->gl_info; - GL_EXTCALL(glBindBuffer(GL_PIXEL_UNPACK_BUFFER, dst.buffer_object)); - GL_EXTCALL(glBufferSubData(GL_PIXEL_UNPACK_BUFFER, 0, sub_resource->size, src.addr)); - GL_EXTCALL(glBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0)); - checkGLcall("Upload PBO"); - context_release(context); - return; - } - if (src.buffer_object) - { - context = context_acquire(device, NULL, 0); - gl_info = context->gl_info; - GL_EXTCALL(glBindBuffer(GL_PIXEL_PACK_BUFFER, src.buffer_object)); - GL_EXTCALL(glGetBufferSubData(GL_PIXEL_PACK_BUFFER, 0, sub_resource->size, dst.addr)); - GL_EXTCALL(glBindBuffer(GL_PIXEL_PACK_BUFFER, 0)); - checkGLcall("Download PBO"); - context_release(context); - return; - } - memcpy(dst.addr, src.addr, sub_resource->size); -} - /* Context activation is done by the caller. */ static void surface_load_sysmem(struct wined3d_surface *surface, struct wined3d_context *context, DWORD dst_location) @@ -2547,12 +2508,6 @@ static void surface_load_sysmem(struct wined3d_surface *surface, wined3d_texture_prepare_location(texture, sub_resource_idx, context, dst_location); sub_resource = &texture->sub_resources[sub_resource_idx]; - if (sub_resource->locations & surface_simple_locations) - { - surface_copy_simple_location(surface, dst_location); - return; - } - if (sub_resource->locations & (WINED3D_LOCATION_RB_MULTISAMPLE | WINED3D_LOCATION_RB_RESOLVED)) wined3d_texture_load_location(texture, sub_resource_idx, context, WINED3D_LOCATION_TEXTURE_RGB); diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index e6f2c6c..d86e7ec 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -178,11 +178,56 @@ void wined3d_texture_invalidate_location(struct wined3d_texture *texture, sub_resource_idx, texture); } +static BOOL wined3d_texture_copy_sysmem_location(struct wined3d_texture *texture, + unsigned int sub_resource_idx, struct wined3d_context *context, DWORD location) +{ + unsigned int size = texture->sub_resources[sub_resource_idx].size; + struct wined3d_device *device = texture->resource.device; + const struct wined3d_gl_info *gl_info; + struct wined3d_bo_address dst, src; + + if (!wined3d_texture_prepare_location(texture, sub_resource_idx, context, location)) + return FALSE; + + wined3d_texture_get_memory(texture, sub_resource_idx, &dst, location); + wined3d_texture_get_memory(texture, sub_resource_idx, &src, + texture->sub_resources[sub_resource_idx].locations); + + if (dst.buffer_object) + { + context = context_acquire(device, NULL, 0); + gl_info = context->gl_info; + GL_EXTCALL(glBindBuffer(GL_PIXEL_UNPACK_BUFFER, dst.buffer_object)); + GL_EXTCALL(glBufferSubData(GL_PIXEL_UNPACK_BUFFER, 0, size, src.addr)); + GL_EXTCALL(glBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0)); + checkGLcall("PBO upload"); + context_release(context); + return TRUE; + } + + if (src.buffer_object) + { + context = context_acquire(device, NULL, 0); + gl_info = context->gl_info; + GL_EXTCALL(glBindBuffer(GL_PIXEL_PACK_BUFFER, src.buffer_object)); + GL_EXTCALL(glGetBufferSubData(GL_PIXEL_PACK_BUFFER, 0, size, dst.addr)); + GL_EXTCALL(glBindBuffer(GL_PIXEL_PACK_BUFFER, 0)); + checkGLcall("PBO download"); + context_release(context); + return TRUE; + } + + memcpy(dst.addr, src.addr, size); + return TRUE; +} + /* Context activation is done by the caller. Context may be NULL in * WINED3D_NO3D mode. */ BOOL wined3d_texture_load_location(struct wined3d_texture *texture, unsigned int sub_resource_idx, struct wined3d_context *context, DWORD location) { + static const DWORD sysmem_locations = WINED3D_LOCATION_SYSMEM | WINED3D_LOCATION_USER_MEMORY + | WINED3D_LOCATION_BUFFER; DWORD current = texture->sub_resources[sub_resource_idx].locations; BOOL ret; @@ -223,7 +268,12 @@ BOOL wined3d_texture_load_location(struct wined3d_texture *texture, return wined3d_texture_load_location(texture, sub_resource_idx, context, location); } - if ((ret = texture->texture_ops->texture_load_location(texture, sub_resource_idx, context, location))) + if ((location & sysmem_locations) && (current & sysmem_locations)) + ret = wined3d_texture_copy_sysmem_location(texture, sub_resource_idx, context, location); + else + ret = texture->texture_ops->texture_load_location(texture, sub_resource_idx, context, location); + + if (ret) wined3d_texture_validate_location(texture, sub_resource_idx, location); return ret;

1 0

Henri Verbeet : wined3d: Introduce a helper function to lookup a wined3d_light_info structure.
by Alexandre Julliard 17 Feb '17

17 Feb '17

Module: wine Branch: master Commit: e947aa4b038e6282c7c7dc6e5950a7668c16a9f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e947aa4b038e6282c7c7dc6e5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 17 14:08:17 2017 +0100 wined3d: Introduce a helper function to lookup a wined3d_light_info structure. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 64 ++++++------------------------------------ dlls/wined3d/stateblock.c | 15 ++++++++++ dlls/wined3d/wined3d_private.h | 2 ++ 3 files changed, 25 insertions(+), 56 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 8192bf9..e68827c 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1513,7 +1513,6 @@ HRESULT CDECL wined3d_device_set_light(struct wined3d_device *device, { UINT hash_idx = LIGHTMAP_HASHFUNC(light_idx); struct wined3d_light_info *object = NULL; - struct list *e; float rho; TRACE("device %p, light_idx %u, light %p.\n", device, light_idx, light); @@ -1547,15 +1546,7 @@ HRESULT CDECL wined3d_device_set_light(struct wined3d_device *device, return WINED3DERR_INVALIDCALL; } - LIST_FOR_EACH(e, &device->update_state->light_map[hash_idx]) - { - object = LIST_ENTRY(e, struct wined3d_light_info, entry); - if (object->OriginalIndex == light_idx) - break; - object = NULL; - } - - if (!object) + if (!(object = wined3d_state_get_light(device->update_state, light_idx))) { TRACE("Adding new light\n"); object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); @@ -1670,21 +1661,11 @@ HRESULT CDECL wined3d_device_set_light(struct wined3d_device *device, HRESULT CDECL wined3d_device_get_light(const struct wined3d_device *device, UINT light_idx, struct wined3d_light *light) { - UINT hash_idx = LIGHTMAP_HASHFUNC(light_idx); - struct wined3d_light_info *light_info = NULL; - struct list *e; + struct wined3d_light_info *light_info; TRACE("device %p, light_idx %u, light %p.\n", device, light_idx, light); - LIST_FOR_EACH(e, &device->state.light_map[hash_idx]) - { - light_info = LIST_ENTRY(e, struct wined3d_light_info, entry); - if (light_info->OriginalIndex == light_idx) - break; - light_info = NULL; - } - - if (!light_info) + if (!(light_info = wined3d_state_get_light(&device->state, light_idx))) { TRACE("Light information requested but light not defined\n"); return WINED3DERR_INVALIDCALL; @@ -1696,36 +1677,17 @@ HRESULT CDECL wined3d_device_get_light(const struct wined3d_device *device, HRESULT CDECL wined3d_device_set_light_enable(struct wined3d_device *device, UINT light_idx, BOOL enable) { - UINT hash_idx = LIGHTMAP_HASHFUNC(light_idx); - struct wined3d_light_info *light_info = NULL; - struct list *e; + struct wined3d_light_info *light_info; TRACE("device %p, light_idx %u, enable %#x.\n", device, light_idx, enable); - LIST_FOR_EACH(e, &device->update_state->light_map[hash_idx]) - { - light_info = LIST_ENTRY(e, struct wined3d_light_info, entry); - if (light_info->OriginalIndex == light_idx) - break; - light_info = NULL; - } - TRACE("Found light %p.\n", light_info); - /* Special case - enabling an undefined light creates one with a strict set of parameters. */ - if (!light_info) + if (!(light_info = wined3d_state_get_light(device->update_state, light_idx))) { TRACE("Light enabled requested but light not defined, so defining one!\n"); wined3d_device_set_light(device, light_idx, &WINED3D_default_light); - /* Search for it again! Should be fairly quick as near head of list. */ - LIST_FOR_EACH(e, &device->update_state->light_map[hash_idx]) - { - light_info = LIST_ENTRY(e, struct wined3d_light_info, entry); - if (light_info->OriginalIndex == light_idx) - break; - light_info = NULL; - } - if (!light_info) + if (!(light_info = wined3d_state_get_light(device->update_state, light_idx))) { FIXME("Adding default lights has failed dismally\n"); return WINED3DERR_INVALIDCALL; @@ -1799,21 +1761,11 @@ HRESULT CDECL wined3d_device_set_light_enable(struct wined3d_device *device, UIN HRESULT CDECL wined3d_device_get_light_enable(const struct wined3d_device *device, UINT light_idx, BOOL *enable) { - UINT hash_idx = LIGHTMAP_HASHFUNC(light_idx); - struct wined3d_light_info *light_info = NULL; - struct list *e; + struct wined3d_light_info *light_info; TRACE("device %p, light_idx %u, enable %p.\n", device, light_idx, enable); - LIST_FOR_EACH(e, &device->state.light_map[hash_idx]) - { - light_info = LIST_ENTRY(e, struct wined3d_light_info, entry); - if (light_info->OriginalIndex == light_idx) - break; - light_info = NULL; - } - - if (!light_info) + if (!(light_info = wined3d_state_get_light(&device->state, light_idx))) { TRACE("Light enabled state requested but light not defined.\n"); return WINED3DERR_INVALIDCALL; diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 7ab544d..70e31a2 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -560,6 +560,21 @@ ULONG CDECL wined3d_stateblock_decref(struct wined3d_stateblock *stateblock) return refcount; } +struct wined3d_light_info *wined3d_state_get_light(const struct wined3d_state *state, unsigned int idx) +{ + struct wined3d_light_info *light_info; + unsigned int hash_idx; + + hash_idx = LIGHTMAP_HASHFUNC(idx); + LIST_FOR_EACH_ENTRY(light_info, &state->light_map[hash_idx], struct wined3d_light_info, entry) + { + if (light_info->OriginalIndex == idx) + return light_info; + } + + return NULL; +} + static void wined3d_state_record_lights(struct wined3d_state *dst_state, const struct wined3d_state *src_state) { UINT i; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 49fba06..585055c 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3140,6 +3140,8 @@ struct wined3d_stateblock void stateblock_init_contained_states(struct wined3d_stateblock *stateblock) DECLSPEC_HIDDEN; void state_cleanup(struct wined3d_state *state) DECLSPEC_HIDDEN; +struct wined3d_light_info *wined3d_state_get_light(const struct wined3d_state *state, + unsigned int idx) DECLSPEC_HIDDEN; void state_init(struct wined3d_state *state, struct wined3d_fb_state *fb, const struct wined3d_gl_info *gl_info, const struct wined3d_d3d_info *d3d_info, DWORD flags) DECLSPEC_HIDDEN;

1 0

Sebastian Lackner : user32/tests: Add test for EndDeferWindowPos with destroyed window.
by Alexandre Julliard 17 Feb '17

17 Feb '17

Module: wine Branch: master Commit: 6f62f9614d8e1f6a37bd359131d51f78dd7a7c36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f62f9614d8e1f6a37bd35913… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Feb 16 21:59:15 2017 +0100 user32/tests: Add test for EndDeferWindowPos with destroyed window. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/win.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 992bffb..0046c7c 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -9500,6 +9500,7 @@ static void test_winproc_limit(void) static void test_deferwindowpos(void) { HDWP hdwp, hdwp2; + HWND hwnd; BOOL ret; hdwp = BeginDeferWindowPos(0); @@ -9529,6 +9530,17 @@ todo_wine ret = EndDeferWindowPos(hdwp); ok(ret, "got %d\n", ret); + hdwp = BeginDeferWindowPos(0); + ok(hdwp != NULL, "got %p\n", hdwp); + + hwnd = create_tool_window(WS_POPUP, 0); + hdwp2 = DeferWindowPos(hdwp, hwnd, NULL, 0, 0, 10, 10, 0); + ok(hdwp2 != NULL, "got %p, error %d\n", hdwp2, GetLastError()); + DestroyWindow(hwnd); + + ret = EndDeferWindowPos(hdwp); +todo_wine + ok(ret, "got %d\n", ret); } static void test_LockWindowUpdate(HWND parent)

1 0

Rodrigo Rivas Costa : user32: Fix error handling in EndDeferWindowPos.
by Alexandre Julliard 17 Feb '17

17 Feb '17

Module: wine Branch: master Commit: fbd9ed0dee968142227e0b0a320da0f81eee0ca1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbd9ed0dee968142227e0b0a3… Author: Rodrigo Rivas Costa <rodrigorivascosta(a)gmail.com> Date: Thu Feb 16 21:59:39 2017 +0100 user32: Fix error handling in EndDeferWindowPos. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/win.c | 1 - dlls/user32/winpos.c | 9 ++++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 0046c7c..70c1370 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -9539,7 +9539,6 @@ todo_wine DestroyWindow(hwnd); ret = EndDeferWindowPos(hdwp); -todo_wine ok(ret, "got %d\n", ret); } diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index 2fa194f..d94f5a3 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -2430,7 +2430,6 @@ BOOL WINAPI EndDeferWindowPos( HDWP hdwp ) { DWP *pDWP; WINDOWPOS *winpos; - BOOL res = TRUE; int i; TRACE("%p\n", hdwp); @@ -2442,20 +2441,20 @@ BOOL WINAPI EndDeferWindowPos( HDWP hdwp ) return FALSE; } - for (i = 0, winpos = pDWP->winPos; res && i < pDWP->actualCount; i++, winpos++) + for (i = 0, winpos = pDWP->winPos; i < pDWP->actualCount; i++, winpos++) { TRACE("hwnd %p, after %p, %d,%d (%dx%d), flags %08x\n", winpos->hwnd, winpos->hwndInsertAfter, winpos->x, winpos->y, winpos->cx, winpos->cy, winpos->flags); if (WIN_IsCurrentThread( winpos->hwnd )) - res = USER_SetWindowPos( winpos ); + USER_SetWindowPos( winpos ); else - res = SendMessageW( winpos->hwnd, WM_WINE_SETWINDOWPOS, 0, (LPARAM)winpos ); + SendMessageW( winpos->hwnd, WM_WINE_SETWINDOWPOS, 0, (LPARAM)winpos ); } HeapFree( GetProcessHeap(), 0, pDWP->winPos ); HeapFree( GetProcessHeap(), 0, pDWP ); - return res; + return TRUE; }

1 0

Michael Müller : ntdll: Implement RtlAddMandatoryAce.
by Alexandre Julliard 17 Feb '17

17 Feb '17

Module: wine Branch: master Commit: 641ca44c9711cc468e721f1ee66f0af7c1329a00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=641ca44c9711cc468e721f1ee… Author: Michael Müller <michael(a)fds-team.de> Date: Thu Feb 16 20:57:43 2017 +0100 ntdll: Implement RtlAddMandatoryAce. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/sec.c | 27 +++++++++++++++++++++++++++ include/winternl.h | 1 + 3 files changed, 29 insertions(+) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 6e99af9..66618fc 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -423,6 +423,7 @@ @ stdcall RtlAddAuditAccessAceEx(ptr long long long ptr long long) @ stdcall RtlAddAuditAccessObjectAce(ptr long long long ptr ptr ptr long long) # @ stub RtlAddCompoundAce +@ stdcall RtlAddMandatoryAce(ptr long long long long ptr) # @ stub RtlAddRange @ cdecl -arch=arm,x86_64 RtlAddFunctionTable(ptr long long) @ stdcall RtlAddRefActivationContext(ptr) diff --git a/dlls/ntdll/sec.c b/dlls/ntdll/sec.c index 3bc52ac..3f7aa79 100644 --- a/dlls/ntdll/sec.c +++ b/dlls/ntdll/sec.c @@ -1379,6 +1379,33 @@ NTSTATUS WINAPI RtlAddAuditAccessObjectAce( return STATUS_NOT_IMPLEMENTED; } +/************************************************************************** + * RtlAddMandatoryAce [NTDLL.@] + */ +NTSTATUS WINAPI RtlAddMandatoryAce( + IN OUT PACL pAcl, + IN DWORD dwAceRevision, + IN DWORD dwAceFlags, + IN DWORD dwMandatoryFlags, + IN DWORD dwAceType, + IN PSID pSid) +{ + static const DWORD valid_flags = SYSTEM_MANDATORY_LABEL_NO_WRITE_UP | + SYSTEM_MANDATORY_LABEL_NO_READ_UP | + SYSTEM_MANDATORY_LABEL_NO_EXECUTE_UP; + + TRACE("(%p, %u, 0x%08x, 0x%08x, %u, %p)\n", pAcl, dwAceRevision, dwAceFlags, + dwMandatoryFlags, dwAceType, pSid); + + if (dwAceType != SYSTEM_MANDATORY_LABEL_ACE_TYPE) + return STATUS_INVALID_PARAMETER; + + if (dwMandatoryFlags & ~valid_flags) + return STATUS_INVALID_PARAMETER; + + return add_access_ace(pAcl, dwAceRevision, dwAceFlags, dwMandatoryFlags, pSid, dwAceType); +} + /****************************************************************************** * RtlValidAcl [NTDLL.@] */ diff --git a/include/winternl.h b/include/winternl.h index 2f2ea86..f6308f5 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2421,6 +2421,7 @@ NTSYSAPI NTSTATUS WINAPI RtlAddAtomToAtomTable(RTL_ATOM_TABLE,const WCHAR*,RTL_ NTSYSAPI NTSTATUS WINAPI RtlAddAuditAccessAce(PACL,DWORD,DWORD,PSID,BOOL,BOOL); NTSYSAPI NTSTATUS WINAPI RtlAddAuditAccessAceEx(PACL,DWORD,DWORD,DWORD,PSID,BOOL,BOOL); NTSYSAPI NTSTATUS WINAPI RtlAddAuditAccessObjectAce(PACL,DWORD,DWORD,DWORD,GUID*,GUID*,PSID,BOOL,BOOL); +NTSYSAPI NTSTATUS WINAPI RtlAddMandatoryAce(PACL,DWORD,DWORD,DWORD,DWORD,PSID); NTSYSAPI void WINAPI RtlAddRefActivationContext(HANDLE); NTSYSAPI PVOID WINAPI RtlAddVectoredExceptionHandler(ULONG,PVECTORED_EXCEPTION_HANDLER); NTSYSAPI NTSTATUS WINAPI RtlAdjustPrivilege(ULONG,BOOLEAN,BOOLEAN,PBOOLEAN);

1 0