wine-commits January 2014

wine-commits@winehq.org

3 participants
814 discussions

Stefan Dösinger : wined3d: Load surfaces into map binding memory on unload.
by Alexandre Julliard 10 Jan '14

10 Jan '14

Module: wine Branch: master Commit: badf3d8db77aa3db21d2bd41b05b730dd31c65ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=badf3d8db77aa3db21d2bd41b… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Jan 10 12:40:46 2014 +0100 wined3d: Load surfaces into map binding memory on unload. A surface can stay in DIB or user memory just fine. When buffers get their own location an exception for them has to be added. --- dlls/wined3d/surface.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 6e15c00..19ae138 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1369,7 +1369,7 @@ static void surface_unload(struct wined3d_resource *resource) if (!(surface->flags & SFLAG_PBO)) { surface_init_sysmem(surface); - surface_validate_location(surface, SFLAG_INSYSMEM); + surface_validate_location(surface, surface->map_binding); } /* We also get here when the ddraw swapchain is destroyed, for example * for a mode switch. In this case this surface won't necessarily be @@ -1379,9 +1379,9 @@ static void surface_unload(struct wined3d_resource *resource) } else { - surface_load_location(surface, SFLAG_INSYSMEM); + surface_load_location(surface, surface->map_binding); } - surface_invalidate_location(surface, ~SFLAG_INSYSMEM); + surface_invalidate_location(surface, ~surface->map_binding); surface->flags &= ~(SFLAG_ALLOCATED | SFLAG_SRGBALLOCATED); context = context_acquire(device, NULL);

1 0

Stefan Dösinger : wined3d: Move location flag updating out of surface_init_sysmem.
by Alexandre Julliard 10 Jan '14

10 Jan '14

Module: wine Branch: master Commit: 18bf8b49b38709e39d4ccd4d60bbb98c49adc083 URL: http://source.winehq.org/git/wine.git/?a=commit;h=18bf8b49b38709e39d4ccd4d6… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Jan 10 12:40:45 2014 +0100 wined3d: Move location flag updating out of surface_init_sysmem. --- dlls/wined3d/surface.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index ee07e19..6e15c00 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1341,9 +1341,6 @@ static BOOL surface_init_sysmem(struct wined3d_surface *surface) surface->resource.allocatedMemory = surface->resource.heap_memory; } - surface_validate_location(surface, SFLAG_INSYSMEM); - surface_invalidate_location(surface, ~SFLAG_INSYSMEM); - return TRUE; } @@ -1370,7 +1367,10 @@ static void surface_unload(struct wined3d_resource *resource) * and all flags get lost */ if (!(surface->flags & SFLAG_PBO)) + { surface_init_sysmem(surface); + surface_validate_location(surface, SFLAG_INSYSMEM); + } /* We also get here when the ddraw swapchain is destroyed, for example * for a mode switch. In this case this surface won't necessarily be * an implicit surface. We have to mark it lost so that the @@ -2784,11 +2784,12 @@ HRESULT CDECL wined3d_surface_update_desc(struct wined3d_surface *surface, return hr; } surface->resource.allocatedMemory = surface->dib.bitmap_data; - surface->flags |= SFLAG_INSYSMEM; } else if (!surface_init_sysmem(surface)) return E_OUTOFMEMORY; + surface_validate_location(surface, SFLAG_INSYSMEM); + return WINED3D_OK; }

1 0

Stefan Dösinger : wined3d: Mark the map binding up to date in texture2d_sub_resource_add_dirty_region.
by Alexandre Julliard 10 Jan '14

10 Jan '14

Module: wine Branch: master Commit: c770d3f5732880f1f3c7adabb939487451e5e608 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c770d3f5732880f1f3c7adabb… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Jan 10 12:40:44 2014 +0100 wined3d: Mark the map binding up to date in texture2d_sub_resource_add_dirty_region. --- dlls/wined3d/texture.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 0d6b974..f06db6d 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -735,8 +735,8 @@ static void texture2d_sub_resource_add_dirty_region(struct wined3d_resource *sub { struct wined3d_surface *surface = surface_from_resource(sub_resource); - surface_load_location(surface, SFLAG_INSYSMEM); - surface_invalidate_location(surface, ~SFLAG_INSYSMEM); + surface_load_location(surface, surface->map_binding); + surface_invalidate_location(surface, ~surface->map_binding); } static void texture2d_sub_resource_cleanup(struct wined3d_resource *sub_resource)

1 0

Stefan Dösinger : wined3d: Use the map binding for RGB<->sRGB loads.
by Alexandre Julliard 10 Jan '14

10 Jan '14

Module: wine Branch: master Commit: 1b561e815ef3eec2f6b131d11fd96d8f5f73510a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b561e815ef3eec2f6b131d11… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Jan 10 12:40:43 2014 +0100 wined3d: Use the map binding for RGB<->sRGB loads. --- dlls/wined3d/surface.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 45c3663..ee07e19 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -5003,20 +5003,20 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface, if (srgb) { - if ((surface->flags & (SFLAG_INTEXTURE | SFLAG_INSYSMEM)) == SFLAG_INTEXTURE) + if ((surface->flags & (SFLAG_INTEXTURE | surface->map_binding)) == SFLAG_INTEXTURE) { /* Performance warning... */ FIXME("Downloading RGB surface %p to reload it as sRGB.\n", surface); - surface_load_location(surface, SFLAG_INSYSMEM); + surface_load_location(surface, surface->map_binding); } } else { - if ((surface->flags & (SFLAG_INSRGBTEX | SFLAG_INSYSMEM)) == SFLAG_INSRGBTEX) + if ((surface->flags & (SFLAG_INSRGBTEX | surface->map_binding)) == SFLAG_INSRGBTEX) { /* Performance warning... */ FIXME("Downloading sRGB surface %p to reload it as RGB.\n", surface); - surface_load_location(surface, SFLAG_INSYSMEM); + surface_load_location(surface, surface->map_binding); } }

1 0

Stefan Dösinger : wined3d: Use the map binding to reload surfaces on color key changes.
by Alexandre Julliard 10 Jan '14

10 Jan '14

Module: wine Branch: master Commit: 5c1df19b16151dc9f0d3454c0a002c55652b1400 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c1df19b16151dc9f0d3454c0… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Jan 10 12:40:42 2014 +0100 wined3d: Use the map binding to reload surfaces on color key changes. --- dlls/wined3d/surface.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 9cc8a71..45c3663 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2308,8 +2308,8 @@ void surface_load(struct wined3d_surface *surface, BOOL srgb) /* To perform the color key conversion we need a sysmem copy of * the surface. Make sure we have it. */ - surface_load_location(surface, SFLAG_INSYSMEM); - surface_invalidate_location(surface, ~SFLAG_INSYSMEM); + surface_load_location(surface, surface->map_binding); + surface_invalidate_location(surface, ~surface->map_binding); /* Switching color keying on / off may change the internal format. */ if (ck_changed) surface_force_reload(surface);

1 0

Stefan Dösinger : wined3d: Use the map binding to reload surfaces on palette changes.
by Alexandre Julliard 10 Jan '14

10 Jan '14

Module: wine Branch: master Commit: 5479ccea20ef8d03f7d1b29482cf2f63bd6e94fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=5479ccea20ef8d03f7d1b2948… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Jan 10 12:40:41 2014 +0100 wined3d: Use the map binding to reload surfaces on palette changes. --- dlls/wined3d/surface.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index b6dcb95..9cc8a71 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -755,12 +755,12 @@ static void surface_realize_palette(struct wined3d_surface *surface) } else { - if (!(surface->flags & SFLAG_INSYSMEM)) + if (!(surface->flags & surface->map_binding)) { TRACE("Palette changed with surface that does not have an up to date system memory copy.\n"); - surface_load_location(surface, SFLAG_INSYSMEM); + surface_load_location(surface, surface->map_binding); } - surface_invalidate_location(surface, ~SFLAG_INSYSMEM); + surface_invalidate_location(surface, ~surface->map_binding); } }

1 0

Stefan Dösinger : wined3d: Add a map_binding field to surfaces.
by Alexandre Julliard 10 Jan '14

10 Jan '14

Module: wine Branch: master Commit: 1046551c347ceaf357a0fc2095d529dc4472b3f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1046551c347ceaf357a0fc209… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Jan 10 12:40:40 2014 +0100 wined3d: Add a map_binding field to surfaces. Buffers, heap memory, user memory and DIBs will have their own locations. This field specifies which location is used when the surface is mapped. --- dlls/wined3d/surface.c | 100 +++++++++++++++++++++++++--------------- dlls/wined3d/wined3d_private.h | 2 +- 2 files changed, 64 insertions(+), 38 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 832caa5..b6dcb95 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -797,47 +797,55 @@ static BYTE *surface_map(struct wined3d_surface *surface, const RECT *rect, DWOR { TRACE("WINED3D_MAP_DISCARD flag passed, marking SYSMEM as up to date.\n"); surface_prepare_system_memory(surface); - surface_validate_location(surface, SFLAG_INSYSMEM); + surface_validate_location(surface, surface->map_binding); } else { if (surface->resource.usage & WINED3DUSAGE_DYNAMIC) WARN_(d3d_perf)("Mapping a dynamic surface without WINED3D_MAP_DISCARD.\n"); - surface_load_location(surface, SFLAG_INSYSMEM); + surface_load_location(surface, surface->map_binding); } if (!(flags & (WINED3D_MAP_NO_DIRTY_UPDATE | WINED3D_MAP_READONLY))) - surface_invalidate_location(surface, ~SFLAG_INSYSMEM); + surface_invalidate_location(surface, ~surface->map_binding); - if (surface->flags & SFLAG_PBO) + switch (surface->map_binding) { - BYTE *ret; - const struct wined3d_gl_info *gl_info; - struct wined3d_context *context; + case SFLAG_INSYSMEM: + if (surface->flags & SFLAG_PBO) + { + BYTE *ret; + const struct wined3d_gl_info *gl_info; + struct wined3d_context *context; - context = context_acquire(device, NULL); - gl_info = context->gl_info; + context = context_acquire(device, NULL); + gl_info = context->gl_info; - GL_EXTCALL(glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, surface->pbo)); - checkGLcall("glBindBufferARB"); + GL_EXTCALL(glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, surface->pbo)); + checkGLcall("glBindBufferARB"); - ret = GL_EXTCALL(glMapBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, GL_READ_WRITE_ARB)); - checkGLcall("glMapBufferARB"); + ret = GL_EXTCALL(glMapBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, GL_READ_WRITE_ARB)); + checkGLcall("glMapBufferARB"); - /* Make sure the PBO isn't set anymore in order not to break non-PBO - * calls. */ - GL_EXTCALL(glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, 0)); - checkGLcall("glBindBufferARB"); + /* Make sure the PBO isn't set anymore in order not to break non-PBO + * calls. */ + GL_EXTCALL(glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, 0)); + checkGLcall("glBindBufferARB"); - context_release(context); - return ret; - } + context_release(context); + return ret; + } - if (surface->user_memory) - return surface->user_memory; + if (surface->user_memory) + return surface->user_memory; + + return surface->resource.allocatedMemory; - return surface->resource.allocatedMemory; + default: + ERR("Unexpected map binding %s.\n", debug_surflocation(surface->map_binding)); + return NULL; + } } static void surface_unmap(struct wined3d_surface *surface) @@ -848,21 +856,29 @@ static void surface_unmap(struct wined3d_surface *surface) memset(&surface->lockedRect, 0, sizeof(surface->lockedRect)); - if (surface->flags & SFLAG_PBO) + switch (surface->map_binding) { - const struct wined3d_gl_info *gl_info; - struct wined3d_context *context; + case SFLAG_INSYSMEM: + if (surface->flags & SFLAG_PBO) + { + const struct wined3d_gl_info *gl_info; + struct wined3d_context *context; - TRACE("Freeing PBO memory.\n"); + TRACE("Freeing PBO memory.\n"); - context = context_acquire(device, NULL); - gl_info = context->gl_info; + context = context_acquire(device, NULL); + gl_info = context->gl_info; - GL_EXTCALL(glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, surface->pbo)); - GL_EXTCALL(glUnmapBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB)); - GL_EXTCALL(glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, 0)); - checkGLcall("glUnmapBufferARB"); - context_release(context); + GL_EXTCALL(glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, surface->pbo)); + GL_EXTCALL(glUnmapBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB)); + GL_EXTCALL(glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, 0)); + checkGLcall("glUnmapBufferARB"); + context_release(context); + } + break; + + default: + ERR("Unexpected map binding %s.\n", debug_surflocation(surface->map_binding)); } TRACE("dirtyfied %u.\n", surface->flags & (SFLAG_INDRAWABLE | SFLAG_INTEXTURE) ? 0 : 1); @@ -1497,10 +1513,18 @@ static BYTE *gdi_surface_map(struct wined3d_surface *surface, const RECT *rect, TRACE("surface %p, rect %s, flags %#x.\n", surface, wine_dbgstr_rect(rect), flags); - if (surface->user_memory) - return surface->user_memory; + switch (surface->map_binding) + { + case SFLAG_INSYSMEM: + if (surface->user_memory) + return surface->user_memory; - return surface->resource.allocatedMemory; + return surface->resource.allocatedMemory; + + default: + ERR("Unexpected map binding %s.\n", debug_surflocation(surface->map_binding)); + return NULL; + } } static void gdi_surface_unmap(struct wined3d_surface *surface) @@ -6397,6 +6421,8 @@ static HRESULT surface_init(struct wined3d_surface *surface, struct wined3d_text surface->resource.allocatedMemory = surface->dib.bitmap_data; } + surface->map_binding = SFLAG_INSYSMEM; + return hr; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index b985745..3dc735d 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2192,7 +2192,7 @@ struct wined3d_surface struct wined3d_texture *container; struct wined3d_swapchain *swapchain; struct wined3d_palette *palette; /* D3D7 style palette handling */ - DWORD draw_binding; + DWORD draw_binding, map_binding; void *user_memory; DWORD flags;

1 0

Jacek Caban : mshtml: Fixed double release in NPP_New.
by Alexandre Julliard 10 Jan '14

10 Jan '14

Module: wine Branch: master Commit: 519166a4482e22a6bbe584b2acb8c488cd3b22e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=519166a4482e22a6bbe584b2a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 10 16:22:17 2014 +0100 mshtml: Fixed double release in NPP_New. --- dlls/mshtml/npplugin.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/mshtml/npplugin.c b/dlls/mshtml/npplugin.c index e681568..57bb772 100644 --- a/dlls/mshtml/npplugin.c +++ b/dlls/mshtml/npplugin.c @@ -671,7 +671,6 @@ static NPError CDECL NPP_New(NPMIMEType pluginType, NPP instance, UINT16 mode, I HRESULT hres; hres = create_plugin_host(window->doc, nselem, obj, &clsid, &host); - nsIDOMElement_Release(nselem); IUnknown_Release(obj); if(SUCCEEDED(hres)) instance->pdata = host;

1 0

Dmitry Timoshkov : advapi32/tests: Add access tests for a process.
by Alexandre Julliard 10 Jan '14

10 Jan '14

Module: wine Branch: master Commit: 615319ebd025cb2c09fefe321b522c458bf2dd91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=615319ebd025cb2c09fefe321… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Jan 10 18:26:20 2014 +0900 advapi32/tests: Add access tests for a process. --- dlls/advapi32/tests/security.c | 79 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 79 insertions(+) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 034cf23..2efe80e 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -35,8 +35,13 @@ #include "wine/test.h" +#ifndef PROCESS_QUERY_LIMITED_INFORMATION +#define PROCESS_QUERY_LIMITED_INFORMATION 0x1000 +#endif + /* PROCESS_ALL_ACCESS in Vista+ PSDKs is incompatible with older Windows versions */ #define PROCESS_ALL_ACCESS_NT4 (PROCESS_ALL_ACCESS & ~0xf000) +#define PROCESS_ALL_ACCESS_VISTA (PROCESS_ALL_ACCESS | 0xf000) #ifndef EVENT_QUERY_STATE #define EVENT_QUERY_STATE 0x0001 @@ -5022,6 +5027,79 @@ todo_wine CloseHandle(thread); } +static void test_process_access(void) +{ + DWORD ret, i, access; + HANDLE process, dup; + STARTUPINFOA sti; + PROCESS_INFORMATION pi; + char cmdline[] = "winver.exe"; + static const struct + { + int generic, mapped; + } map[] = + { + { 0, 0 }, + { GENERIC_READ, STANDARD_RIGHTS_READ | PROCESS_QUERY_INFORMATION | PROCESS_VM_READ }, + { GENERIC_WRITE, STANDARD_RIGHTS_WRITE | PROCESS_SET_QUOTA | PROCESS_SET_INFORMATION | PROCESS_SUSPEND_RESUME | + PROCESS_VM_WRITE | PROCESS_DUP_HANDLE | PROCESS_CREATE_PROCESS | PROCESS_CREATE_THREAD | PROCESS_VM_OPERATION }, + { GENERIC_EXECUTE, STANDARD_RIGHTS_EXECUTE | SYNCHRONIZE }, + { GENERIC_ALL, PROCESS_ALL_ACCESS_NT4 } + }; + + memset(&sti, 0, sizeof(sti)); + sti.cb = sizeof(sti); + SetLastError(0xdeadbeef); + ret = CreateProcessA(NULL, cmdline, NULL, NULL, FALSE, CREATE_SUSPENDED, NULL, NULL, &sti, &pi); + ok(ret, "CreateProcess() error %d\n", GetLastError()); + + CloseHandle(pi.hThread); + process = pi.hProcess; + + access = get_obj_access(process); + ok(access == PROCESS_ALL_ACCESS_NT4 || access == PROCESS_ALL_ACCESS_VISTA, "expected PROCESS_ALL_ACCESS, got %#x\n", access); + + for (i = 0; i < sizeof(map)/sizeof(map[0]); i++) + { + SetLastError( 0xdeadbeef ); + ret = DuplicateHandle(GetCurrentProcess(), process, GetCurrentProcess(), &dup, + map[i].generic, FALSE, 0); + ok(ret, "DuplicateHandle error %d\n", GetLastError()); + + access = get_obj_access(dup); + switch (map[i].generic) + { + case GENERIC_READ: +todo_wine + ok(access == map[i].mapped || access == (map[i].mapped | PROCESS_QUERY_LIMITED_INFORMATION) /* Vista+ */, + "%d: expected %#x, got %#x\n", i, map[i].mapped, access); + break; + case GENERIC_WRITE: +todo_wine + ok(access == map[i].mapped || access == (map[i].mapped | PROCESS_TERMINATE) /* before Vista */, + "%d: expected %#x, got %#x\n", i, map[i].mapped, access); + break; + case GENERIC_EXECUTE: +todo_wine + ok(access == map[i].mapped || access == (map[i].mapped | PROCESS_QUERY_LIMITED_INFORMATION | PROCESS_TERMINATE) /* Vista+ */, + "%d: expected %#x, got %#x\n", i, map[i].mapped, access); + break; + case GENERIC_ALL: + ok(access == map[i].mapped || access == PROCESS_ALL_ACCESS_VISTA, + "%d: expected %#x, got %#x\n", i, map[i].mapped, access); + break; + default: + ok(access == map[i].mapped, "%d: expected %#x, got %#x\n", i, map[i].mapped, access); + break; + } + + CloseHandle(dup); + } + + TerminateProcess(process, 0); + CloseHandle(process); +} + static BOOL validate_impersonation_token(HANDLE token, DWORD *token_type) { DWORD ret, needed; @@ -5099,6 +5177,7 @@ static void test_kernel_objects_security(void) test_file_security(token); test_filemap_security(); test_thread_security(); + test_process_access(); /* FIXME: test other kernel object types */ CloseHandle(process_token);

1 0

Dmitry Timoshkov : advapi32/tests: Add access tests for a thread.
by Alexandre Julliard 10 Jan '14

10 Jan '14

Module: wine Branch: master Commit: eb96f7a5a3752843f5ad4308c741e2f518979768 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb96f7a5a3752843f5ad4308c… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Jan 10 18:26:16 2014 +0900 advapi32/tests: Add access tests for a thread. --- dlls/advapi32/tests/security.c | 73 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 73 insertions(+) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index e6ae638..034cf23 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -46,6 +46,14 @@ #define SEMAPHORE_QUERY_STATE 0x0001 #endif +#ifndef THREAD_SET_LIMITED_INFORMATION +#define THREAD_SET_LIMITED_INFORMATION 0x0400 +#define THREAD_QUERY_LIMITED_INFORMATION 0x0800 +#endif + +#define THREAD_ALL_ACCESS_NT4 (STANDARD_RIGHTS_REQUIRED | SYNCHRONIZE | 0x3ff) +#define THREAD_ALL_ACCESS_VISTA (STANDARD_RIGHTS_REQUIRED | SYNCHRONIZE | 0xffff) + /* copied from Wine winternl.h - not included in the Windows SDK */ typedef enum _OBJECT_INFORMATION_CLASS { ObjectBasicInformation, @@ -4950,6 +4958,70 @@ todo_wine CloseHandle(mapping); } +static void test_thread_security(void) +{ + DWORD ret, i, access; + HANDLE thread, dup; + static const struct + { + int generic, mapped; + } map[] = + { + { 0, 0 }, + { GENERIC_READ, STANDARD_RIGHTS_READ | THREAD_QUERY_INFORMATION | THREAD_GET_CONTEXT }, + { GENERIC_WRITE, STANDARD_RIGHTS_WRITE | THREAD_SET_INFORMATION | THREAD_SET_CONTEXT | THREAD_TERMINATE | THREAD_SUSPEND_RESUME | 0x4 }, + { GENERIC_EXECUTE, STANDARD_RIGHTS_EXECUTE | SYNCHRONIZE }, + { GENERIC_ALL, THREAD_ALL_ACCESS_NT4 } + }; + + SetLastError(0xdeadbeef); + thread = CreateThread(NULL, 0, (void *)0xdeadbeef, NULL, CREATE_SUSPENDED, &ret); + ok(thread != 0, "CreateThread error %d\n", GetLastError()); + + access = get_obj_access(thread); + ok(access == THREAD_ALL_ACCESS_NT4 || access == THREAD_ALL_ACCESS_VISTA, "expected THREAD_ALL_ACCESS, got %#x\n", access); + + for (i = 0; i < sizeof(map)/sizeof(map[0]); i++) + { + SetLastError( 0xdeadbeef ); + ret = DuplicateHandle(GetCurrentProcess(), thread, GetCurrentProcess(), &dup, + map[i].generic, FALSE, 0); + ok(ret, "DuplicateHandle error %d\n", GetLastError()); + + access = get_obj_access(dup); + switch (map[i].generic) + { + case GENERIC_READ: +todo_wine + ok(access == map[i].mapped || access == (map[i].mapped | THREAD_QUERY_LIMITED_INFORMATION) /* Vista+ */, + "%d: expected %#x, got %#x\n", i, map[i].mapped, access); + break; + case GENERIC_WRITE: +todo_wine + ok(access == map[i].mapped || access == (map[i].mapped | THREAD_SET_LIMITED_INFORMATION) /* Vista+ */, + "%d: expected %#x, got %#x\n", i, map[i].mapped, access); + break; + case GENERIC_EXECUTE: +todo_wine + ok(access == map[i].mapped || access == (map[i].mapped | THREAD_QUERY_LIMITED_INFORMATION) /* Vista+ */, + "%d: expected %#x, got %#x\n", i, map[i].mapped, access); + break; + case GENERIC_ALL: + ok(access == map[i].mapped || access == THREAD_ALL_ACCESS_VISTA, + "%d: expected %#x, got %#x\n", i, map[i].mapped, access); + break; + default: + ok(access == map[i].mapped, "%d: expected %#x, got %#x\n", i, map[i].mapped, access); + break; + } + + CloseHandle(dup); + } + + TerminateThread(thread, 0); + CloseHandle(thread); +} + static BOOL validate_impersonation_token(HANDLE token, DWORD *token_type) { DWORD ret, needed; @@ -5026,6 +5098,7 @@ static void test_kernel_objects_security(void) test_semaphore_security(token); test_file_security(token); test_filemap_security(); + test_thread_security(); /* FIXME: test other kernel object types */ CloseHandle(process_token);

1 0

← Newer
1
...
52
53
54
55
56
57
58
...
82
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 January 2014