wine-commits February 2017

wine-commits@winehq.org

2 participants
838 discussions

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: 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: 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

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

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

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

Nikolay Sivov : regedit: Make it clear whether it is a key or a value that is about to be removed.
by Alexandre Julliard 17 Feb '17

17 Feb '17

Module: wine Branch: master Commit: 71a6eeb7326930a188cbb145eaaeccca51b1e820 URL: http://source.winehq.org/git/wine.git/?a=commit;h=71a6eeb7326930a188cbb145e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 17 11:57:56 2017 +0000 regedit: Make it clear whether it is a key or a value that is about to be removed. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ar.po | 161 ++++++++++++++++++++++++-------------------- po/bg.po | 161 ++++++++++++++++++++++++-------------------- po/ca.po | 161 ++++++++++++++++++++++++-------------------- po/cs.po | 161 ++++++++++++++++++++++++-------------------- po/da.po | 161 ++++++++++++++++++++++++-------------------- po/de.po | 161 ++++++++++++++++++++++++-------------------- po/el.po | 157 ++++++++++++++++++++++-------------------- po/en.po | 158 +++++++++++++++++++++++-------------------- po/en_US.po | 158 +++++++++++++++++++++++-------------------- po/eo.po | 161 ++++++++++++++++++++++++-------------------- po/es.po | 161 ++++++++++++++++++++++++-------------------- po/fa.po | 157 ++++++++++++++++++++++-------------------- po/fi.po | 161 ++++++++++++++++++++++++-------------------- po/fr.po | 161 ++++++++++++++++++++++++-------------------- po/he.po | 161 ++++++++++++++++++++++++-------------------- po/hi.po | 157 ++++++++++++++++++++++-------------------- po/hr.po | 161 ++++++++++++++++++++++++-------------------- po/hu.po | 161 ++++++++++++++++++++++++-------------------- po/it.po | 161 ++++++++++++++++++++++++-------------------- po/ja.po | 161 ++++++++++++++++++++++++-------------------- po/ko.po | 161 ++++++++++++++++++++++++-------------------- po/lt.po | 161 ++++++++++++++++++++++++-------------------- po/ml.po | 157 ++++++++++++++++++++++-------------------- po/nb_NO.po | 161 ++++++++++++++++++++++++-------------------- po/nl.po | 161 ++++++++++++++++++++++++-------------------- po/or.po | 157 ++++++++++++++++++++++-------------------- po/pa.po | 157 ++++++++++++++++++++++-------------------- po/pl.po | 161 ++++++++++++++++++++++++-------------------- po/pt_BR.po | 161 ++++++++++++++++++++++++-------------------- po/pt_PT.po | 161 ++++++++++++++++++++++++-------------------- po/rm.po | 158 +++++++++++++++++++++++-------------------- po/ro.po | 161 ++++++++++++++++++++++++-------------------- po/ru.po | 161 ++++++++++++++++++++++++-------------------- po/sk.po | 161 ++++++++++++++++++++++++-------------------- po/sl.po | 161 ++++++++++++++++++++++++-------------------- po/sr_RS(a)cyrillic.po | 160 +++++++++++++++++++++++-------------------- po/sr_RS(a)latin.po | 160 +++++++++++++++++++++++-------------------- po/sv.po | 161 ++++++++++++++++++++++++-------------------- po/te.po | 157 ++++++++++++++++++++++-------------------- po/th.po | 158 +++++++++++++++++++++++-------------------- po/tr.po | 161 ++++++++++++++++++++++++-------------------- po/uk.po | 161 ++++++++++++++++++++++++-------------------- po/wa.po | 158 +++++++++++++++++++++++-------------------- po/wine.pot | 157 ++++++++++++++++++++++-------------------- po/zh_CN.po | 161 ++++++++++++++++++++++++-------------------- po/zh_TW.po | 161 ++++++++++++++++++++++++-------------------- programs/regedit/edit.c | 5 +- programs/regedit/framewnd.c | 4 +- programs/regedit/regedit.rc | 8 ++- programs/regedit/resource.h | 8 ++- 50 files changed, 3968 insertions(+), 3414 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=71a6eeb7326930a188cbb…

1 0

Kim Malmo : po: Update Norwegian translation.
by Alexandre Julliard 17 Feb '17

17 Feb '17

Module: wine Branch: master Commit: 71887af48ada91c3cc365da7619e903e77dbb67b URL: http://source.winehq.org/git/wine.git/?a=commit;h=71887af48ada91c3cc365da76… Author: Kim Malmo <berencamlost(a)msn.com> Date: Fri Feb 17 11:06:13 2017 +0000 po: Update Norwegian translation. Signed-off-by: Kim Malmo <berencamlost(a)msn.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/nb_NO.po | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/po/nb_NO.po b/po/nb_NO.po index 120b42c..08bb949 100644 --- a/po/nb_NO.po +++ b/po/nb_NO.po @@ -9344,10 +9344,8 @@ msgid "Confidentiality Required" msgstr "Krever konfidensialitet" #: wldap32.rc:46 -#, fuzzy -#| msgid "Shutdown in progress.\n" msgid "SASL Bind in Progress" -msgstr "Avslutting pågår.\n" +msgstr "SASL binding pågår" #: wldap32.rc:48 msgid "No Such Attribute" @@ -11939,17 +11937,12 @@ msgstr "Kan ikke gi nytt navn til den valgte registerverdien." #: regedit.rc:220 msgid "" "The keys and values contained in %1 were successfully added to the registry." -msgstr "" +msgstr "Nøklene og verdiene i %1 ble vellykket lagt til registeret." #: regedit.rc:221 -#, fuzzy -#| msgid "" -#| "Unable to rename the key '%1'.\n" -#| "The specified key name already exists." msgid "Unable to import %1. The specified file is not a valid registry file." msgstr "" -"Kan ikke gi nytt navn til nøkkel \"%1\".\n" -"Det spesifiserte nøkkelnavnet finnes allerede." +"Kan ikke importere %1. Den spesifiserte filen er ikke en gyldig registerfil." #: regedit.rc:373 msgid ""

1 0

Sebastian Lackner : ntdll/tests: Add tests for FileIoCompletionNotificationInformation info class.
by Alexandre Julliard 17 Feb '17

17 Feb '17

Module: wine Branch: master Commit: f9ede5c4c11f999f940945616e5c69f860d93397 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9ede5c4c11f999f940945616… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Feb 17 05:14:59 2017 +0100 ntdll/tests: Add tests for FileIoCompletionNotificationInformation info class. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/file.c | 132 ++++++++++++++++++++++++++++++++++++++++++++++++ include/winternl.h | 8 +++ 2 files changed, 140 insertions(+) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 1a02ce5..5053eb1 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -3261,6 +3261,137 @@ static void test_file_all_name_information(void) HeapFree( GetProcessHeap(), 0, file_name ); } +static void test_file_completion_information(void) +{ + static const char buf[] = "testdata"; + FILE_IO_COMPLETION_NOTIFICATION_INFORMATION info; + OVERLAPPED ov, *pov; + IO_STATUS_BLOCK io; + NTSTATUS status; + DWORD num_bytes; + HANDLE port, h; + ULONG_PTR key; + BOOL ret; + int i; + + if (!(h = create_temp_file(0))) return; + + status = pNtSetInformationFile(h, &io, &info, sizeof(info) - 1, FileIoCompletionNotificationInformation); + todo_wine + ok(status == STATUS_INFO_LENGTH_MISMATCH || status == STATUS_INVALID_INFO_CLASS /* XP */, + "expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status); + if (status == STATUS_INVALID_INFO_CLASS || status == STATUS_NOT_IMPLEMENTED) + { + skip("FileIoCompletionNotificationInformation class not supported\n"); + CloseHandle(h); + return; + } + + info.Flags = FILE_SKIP_COMPLETION_PORT_ON_SUCCESS; + status = pNtSetInformationFile(h, &io, &info, sizeof(info), FileIoCompletionNotificationInformation); + ok(status == STATUS_INVALID_PARAMETER, "expected STATUS_INVALID_PARAMETER, got %08x\n", status); + + CloseHandle(h); + if (!(h = create_temp_file(FILE_FLAG_OVERLAPPED))) return; + + info.Flags = FILE_SKIP_SET_EVENT_ON_HANDLE; + status = pNtSetInformationFile(h, &io, &info, sizeof(info), FileIoCompletionNotificationInformation); + ok(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %08x\n", status); + + info.Flags = FILE_SKIP_SET_USER_EVENT_ON_FAST_IO; + status = pNtSetInformationFile(h, &io, &info, sizeof(info), FileIoCompletionNotificationInformation); + ok(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %08x\n", status); + + CloseHandle(h); + if (!(h = create_temp_file(FILE_FLAG_OVERLAPPED))) return; + + memset(&ov, 0, sizeof(ov)); + ov.hEvent = CreateEventA(NULL, TRUE, FALSE, NULL); + port = CreateIoCompletionPort(h, NULL, 0xdeadbeef, 0); + ok(port != NULL, "CreateIoCompletionPort failed, error %u\n", GetLastError()); + + for (i = 0; i < 10; i++) + { + SetLastError(0xdeadbeef); + ret = WriteFile(h, buf, sizeof(buf), &num_bytes, &ov); + if (ret || GetLastError() != ERROR_IO_PENDING) break; + ret = GetOverlappedResult(h, &ov, &num_bytes, TRUE); + ok(ret, "GetOverlappedResult failed, error %u\n", GetLastError()); + ret = GetQueuedCompletionStatus(port, &num_bytes, &key, &pov, 1000); + ok(ret, "GetQueuedCompletionStatus failed, error %u\n", GetLastError()); + ret = FALSE; + } + if (ret) + { + ok(num_bytes == sizeof(buf), "expected sizeof(buf), got %u\n", num_bytes); + + key = 0; + pov = NULL; + ret = GetQueuedCompletionStatus(port, &num_bytes, &key, &pov, 1000); + ok(ret, "GetQueuedCompletionStatus failed, error %u\n", GetLastError()); + ok(key == 0xdeadbeef, "expected 0xdeadbeef, got %lx\n", key); + ok(pov == &ov, "expected %p, got %p\n", &ov, pov); + } + else + win_skip("WriteFile never returned TRUE\n"); + + info.Flags = FILE_SKIP_COMPLETION_PORT_ON_SUCCESS; + status = pNtSetInformationFile(h, &io, &info, sizeof(info), FileIoCompletionNotificationInformation); + ok(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %08x\n", status); + + for (i = 0; i < 10; i++) + { + SetLastError(0xdeadbeef); + ret = WriteFile(h, buf, sizeof(buf), &num_bytes, &ov); + if (ret || GetLastError() != ERROR_IO_PENDING) break; + ret = GetOverlappedResult(h, &ov, &num_bytes, TRUE); + ok(ret, "GetOverlappedResult failed, error %u\n", GetLastError()); + ret = FALSE; + } + if (ret) + { + ok(num_bytes == sizeof(buf), "expected sizeof(buf), got %u\n", num_bytes); + + pov = (void *)0xdeadbeef; + ret = GetQueuedCompletionStatus(port, &num_bytes, &key, &pov, 500); + ok(!ret, "GetQueuedCompletionStatus succeeded\n"); + ok(pov == NULL, "expected NULL, got %p\n", pov); + } + else + win_skip("WriteFile never returned TRUE\n"); + + info.Flags = 0; + status = pNtSetInformationFile(h, &io, &info, sizeof(info), FileIoCompletionNotificationInformation); + ok(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %08x\n", status); + + for (i = 0; i < 10; i++) + { + SetLastError(0xdeadbeef); + ret = WriteFile(h, buf, sizeof(buf), &num_bytes, &ov); + if (ret || GetLastError() != ERROR_IO_PENDING) break; + ret = GetOverlappedResult(h, &ov, &num_bytes, TRUE); + ok(ret, "GetOverlappedResult failed, error %u\n", GetLastError()); + ret = GetQueuedCompletionStatus(port, &num_bytes, &key, &pov, 1000); + ok(ret, "GetQueuedCompletionStatus failed, error %u\n", GetLastError()); + ret = FALSE; + } + if (ret) + { + ok(num_bytes == sizeof(buf), "expected sizeof(buf), got %u\n", num_bytes); + + pov = (void *)0xdeadbeef; + ret = GetQueuedCompletionStatus(port, &num_bytes, &key, &pov, 1000); + ok(!ret, "GetQueuedCompletionStatus succeeded\n"); + ok(pov == NULL, "expected NULL, got %p\n", pov); + } + else + win_skip("WriteFile never returned TRUE\n"); + + CloseHandle(ov.hEvent); + CloseHandle(port); + CloseHandle(h); +} + static void test_file_id_information(void) { BY_HANDLE_FILE_INFORMATION info; @@ -4299,6 +4430,7 @@ START_TEST(file) test_file_rename_information(); test_file_link_information(); test_file_disposition_information(); + test_file_completion_information(); test_file_id_information(); test_query_volume_information_file(); test_query_attribute_information_file(); diff --git a/include/winternl.h b/include/winternl.h index f6308f5..5cd1664 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -741,6 +741,14 @@ typedef struct _FILE_ALL_INFORMATION { FILE_NAME_INFORMATION NameInformation; } FILE_ALL_INFORMATION, *PFILE_ALL_INFORMATION; +typedef struct _FILE_IO_COMPLETION_NOTIFICATION_INFORMATION { + ULONG Flags; +} FILE_IO_COMPLETION_NOTIFICATION_INFORMATION, *PFILE_IO_COMPLETION_NOTIFICATION_INFORMATION; + +#define FILE_SKIP_COMPLETION_PORT_ON_SUCCESS 0x1 +#define FILE_SKIP_SET_EVENT_ON_HANDLE 0x2 +#define FILE_SKIP_SET_USER_EVENT_ON_FAST_IO 0x4 + typedef enum _FSINFOCLASS { FileFsVolumeInformation = 1, FileFsLabelInformation,

1 0

Michael Müller : advapi32/tests: Add tests for AddMandatoryAce.
by Alexandre Julliard 17 Feb '17

17 Feb '17

Module: wine Branch: master Commit: cca89314838290b3b1fd525de9d1fe68a82e1814 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cca89314838290b3b1fd525de… Author: Michael Müller <michael(a)fds-team.de> Date: Thu Feb 16 20:58:39 2017 +0100 advapi32/tests: Add tests for AddMandatoryAce. 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/advapi32/tests/security.c | 45 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index c31dfbe..34bde87 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -65,6 +65,7 @@ static BOOL (WINAPI *pAddAccessAllowedAceEx)(PACL, DWORD, DWORD, DWORD, PSID); static BOOL (WINAPI *pAddAccessDeniedAceEx)(PACL, DWORD, DWORD, DWORD, PSID); static BOOL (WINAPI *pAddAuditAccessAceEx)(PACL, DWORD, DWORD, DWORD, PSID, BOOL, BOOL); +static BOOL (WINAPI *pAddMandatoryAce)(PACL,DWORD,DWORD,DWORD,PSID); static VOID (WINAPI *pBuildTrusteeWithSidA)( PTRUSTEEA pTrustee, PSID pSid ); static VOID (WINAPI *pBuildTrusteeWithNameA)( PTRUSTEEA pTrustee, LPSTR pName ); static VOID (WINAPI *pBuildTrusteeWithObjectsAndNameA)( PTRUSTEEA pTrustee, @@ -199,6 +200,7 @@ static void init(void) pAddAccessAllowedAceEx = (void *)GetProcAddress(hmod, "AddAccessAllowedAceEx"); pAddAccessDeniedAceEx = (void *)GetProcAddress(hmod, "AddAccessDeniedAceEx"); pAddAuditAccessAceEx = (void *)GetProcAddress(hmod, "AddAuditAccessAceEx"); + pAddMandatoryAce = (void *)GetProcAddress(hmod, "AddMandatoryAce"); pCheckTokenMembership = (void *)GetProcAddress(hmod, "CheckTokenMembership"); pConvertStringSecurityDescriptorToSecurityDescriptorA = (void *)GetProcAddress(hmod, "ConvertStringSecurityDescriptorToSecurityDescriptorA" ); @@ -6156,6 +6158,48 @@ static void test_AddAce(void) ok(GetLastError() == ERROR_INVALID_PARAMETER, "GetLastError() = %d\n", GetLastError()); } +static void test_AddMandatoryAce(void) +{ + static SID low_level = {SID_REVISION, 1, {SECURITY_MANDATORY_LABEL_AUTHORITY}, + {SECURITY_MANDATORY_LOW_RID}}; + SYSTEM_MANDATORY_LABEL_ACE *ace; + char buffer_acl[256]; + ACL *pAcl = (ACL *)&buffer_acl; + BOOL ret, found; + DWORD index; + + if (!pAddMandatoryAce) + { + win_skip("AddMandatoryAce not supported, skipping test\n"); + return; + } + + ret = InitializeAcl(pAcl, 256, ACL_REVISION); + ok(ret, "InitializeAcl failed with %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = pAddMandatoryAce(pAcl, ACL_REVISION, 0, 0x1234, &low_level); + ok(!ret, "AddMandatoryAce succeeded\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_PARAMETER got %u\n", GetLastError()); + + ret = pAddMandatoryAce(pAcl, ACL_REVISION, 0, SYSTEM_MANDATORY_LABEL_NO_WRITE_UP, &low_level); + ok(ret, "AddMandatoryAce failed with %u\n", GetLastError()); + + index = 0; + found = FALSE; + while (pGetAce( pAcl, index++, (void **)&ace )) + { + if (ace->Header.AceType != SYSTEM_MANDATORY_LABEL_ACE_TYPE) continue; + ok(ace->Header.AceFlags == 0, "Expected flags 0, got %x\n", ace->Header.AceFlags); + ok(ace->Mask == SYSTEM_MANDATORY_LABEL_NO_WRITE_UP, + "Expected mask SYSTEM_MANDATORY_LABEL_NO_WRITE_UP, got %x\n", ace->Mask); + ok(EqualSid(&ace->SidStart, &low_level), "Expected low integrity level\n"); + found = TRUE; + } + ok(found, "Could not find mandatory label ace\n"); +} + static void test_system_security_access(void) { static const WCHAR testkeyW[] = @@ -6495,6 +6539,7 @@ START_TEST(security) test_default_dacl_owner_sid(); test_AdjustTokenPrivileges(); test_AddAce(); + test_AddMandatoryAce(); test_system_security_access(); test_GetSidIdentifierAuthority(); test_pseudo_tokens();

1 0

← Newer
1
...
32
33
34
35
36
37
38
...
84
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2017