April 2016 - Wine-Commits - list.winehq.org

Jacek Caban : taskschd.idl: Added IDailyTrigger declaration.
by Alexandre Julliard April 15, 2016

April 15, 2016

Module: wine Branch: master Commit: e8ad3c9794411415508681f5b6924dd139b1bcb9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8ad3c9794411415508681f5b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 15 14:31:47 2016 +0200 taskschd.idl: Added IDailyTrigger declaration. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/taskschd.idl | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/include/taskschd.idl b/include/taskschd.idl index 6b86a01..d557755 100644 --- a/include/taskschd.idl +++ b/include/taskschd.idl @@ -393,6 +393,21 @@ interface ITrigger : IDispatch } [ + odl, + uuid(126c5cd8-b288-41d5-8dbf-e491446adc5c), + oleautomation, + dual, + nonextensible +] +interface IDailyTrigger : ITrigger +{ + [propget] HRESULT DaysInterval([out, retval] short *pDays); + [propput] HRESULT DaysInterval([in] short days); + [propget] HRESULT RandomDelay([out, retval] BSTR *pRandomDelay); + [propput] HRESULT RandomDelay([in] BSTR randomDelay); +} + +[ object, oleautomation, uuid(85df5081-1b24-4f32-878a-d9d14df4cb77)

1 0

Caron Wills : wined3d: Add Nvidia GeForce 830M.
by Alexandre Julliard April 15, 2016

April 15, 2016

Module: wine Branch: master Commit: e184b81ce264d243c44bff3428149c21e838bf40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e184b81ce264d243c44bff342… Author: Caron Wills <caron(a)codeweavers.com> Date: Thu Apr 14 18:23:11 2016 +0000 wined3d: Add Nvidia GeForce 830M. Signed-off-by: Caron Wills <caron(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 3 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index fa47125..8358930 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1286,6 +1286,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX780TI, "NVIDIA GeForce GTX 780 Ti", DRIVER_NVIDIA_GEFORCE8, 3072}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTXTITAN, "NVIDIA GeForce GTX TITAN Black", DRIVER_NVIDIA_GEFORCE8, 6144}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_820M, "NVIDIA GeForce 820M", DRIVER_NVIDIA_GEFORCE8, 2048}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_830M, "NVIDIA GeForce 830M", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX860M, "NVIDIA GeForce GTX 860M", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX950, "NVIDIA GeForce GTX 950", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX950M, "NVIDIA GeForce GTX 950M", DRIVER_NVIDIA_GEFORCE8, 4096}, @@ -1750,6 +1751,7 @@ cards_nvidia_binary[] = {"GTX 950M", CARD_NVIDIA_GEFORCE_GTX950M}, /* GeForce 900 - midend mobile */ {"GTX 950", CARD_NVIDIA_GEFORCE_GTX950}, /* GeForce 900 - midend */ {"GTX 860M", CARD_NVIDIA_GEFORCE_GTX860M}, /* GeForce 800 - mobile */ + {"GeForce 830M", CARD_NVIDIA_GEFORCE_830M}, /* GeForce 800 - mobile */ {"GeForce 820M", CARD_NVIDIA_GEFORCE_820M}, /* GeForce 800 - mobile */ {"GTX 780 Ti", CARD_NVIDIA_GEFORCE_GTX780TI}, /* Geforce 700 - highend */ {"GTX TITAN Black", CARD_NVIDIA_GEFORCE_GTXTITAN}, /* Geforce 700 - highend */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 0f55d79..24515da 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1795,6 +1795,7 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_GTX780TI = 0x100a, CARD_NVIDIA_GEFORCE_GTXTITAN = 0x100c, CARD_NVIDIA_GEFORCE_820M = 0x0fed, + CARD_NVIDIA_GEFORCE_830M = 0x1340, CARD_NVIDIA_GEFORCE_GTX860M = 0x1392, /* Other PCI ID 0x119a */ CARD_NVIDIA_GEFORCE_GTX950 = 0x1402, CARD_NVIDIA_GEFORCE_GTX950M = 0x139a,

1 0

Michael Müller : compobj.dll16: Fix implementation of StringFromGUID2.
by Alexandre Julliard April 15, 2016

April 15, 2016

Module: wine Branch: master Commit: 7e1d1aa573c438aa3bf80595723167b1ff0a31a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e1d1aa573c438aa3bf805957… Author: Michael Müller <michael(a)fds-team.de> Date: Thu Apr 14 21:01:03 2016 +0200 compobj.dll16: Fix implementation of StringFromGUID2. 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/compobj.dll16/compobj.c | 10 ++++++++-- dlls/compobj.dll16/compobj.dll16.spec | 2 +- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/compobj.dll16/compobj.c b/dlls/compobj.dll16/compobj.c index 6261c13..b934a06 100644 --- a/dlls/compobj.dll16/compobj.c +++ b/dlls/compobj.dll16/compobj.c @@ -54,6 +54,7 @@ typedef LPCSTR LPCOLESTR16; #define STDMETHOD16(m) HRESULT (STDMETHOD16CALLTYPE *m) #define STDMETHOD16_(t,m) t (STDMETHOD16CALLTYPE *m) +#define CHARS_IN_GUID 39 /*********************************************************************** * IMalloc16 interface @@ -689,9 +690,14 @@ HRESULT WINAPI CLSIDFromProgID16(LPCOLESTR16 progid, LPCLSID riid) /****************************************************************************** * StringFromGUID2 [COMPOBJ.76] */ -INT WINAPI StringFromGUID216(REFGUID id, LPOLESTR str, INT cmax) +INT16 WINAPI StringFromGUID216(REFGUID id, LPOLESTR16 str, INT16 cmax) { - return StringFromGUID2( id, str, cmax ); + static const char format[] = "{%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}"; + if (!id || cmax < CHARS_IN_GUID) return 0; + sprintf( str, format, id->Data1, id->Data2, id->Data3, + id->Data4[0], id->Data4[1], id->Data4[2], id->Data4[3], + id->Data4[4], id->Data4[5], id->Data4[6], id->Data4[7] ); + return CHARS_IN_GUID; } diff --git a/dlls/compobj.dll16/compobj.dll16.spec b/dlls/compobj.dll16/compobj.dll16.spec index d3022ae..03cf925 100644 --- a/dlls/compobj.dll16/compobj.dll16.spec +++ b/dlls/compobj.dll16/compobj.dll16.spec @@ -72,7 +72,7 @@ 72 stub _IID_IEXTERNALCONNECTION 73 pascal CoCreateGuid(ptr) CoCreateGuid16 75 stub FNASSERT -76 pascal StringFromGUID2(ptr ptr word) StringFromGUID216 +76 pascal -ret16 StringFromGUID2(ptr ptr word) StringFromGUID216 77 stub COGETCLASSEXT 78 stub OLE1CLASSFROMCLSID2 79 stub CLSIDFROMOLE1CLASS

1 0

Stefan Dösinger : wined3d: Explicitly pass a wined3d_state structure to context_apply_draw_state().
by Alexandre Julliard April 15, 2016

April 15, 2016

Module: wine Branch: master Commit: aad6fb4a424d3ae1952da1633073ff9a9b3abf82 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aad6fb4a424d3ae1952da1633… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Apr 14 19:32:50 2016 +0200 wined3d: Explicitly pass a wined3d_state structure to context_apply_draw_state(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 4 ++-- dlls/wined3d/drawprim.c | 2 +- dlls/wined3d/wined3d_private.h | 3 ++- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index d683327..3cd7c8c 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -3318,9 +3318,9 @@ static void context_bind_shader_resources(struct wined3d_context *context, const } /* Context activation is done by the caller. */ -BOOL context_apply_draw_state(struct wined3d_context *context, struct wined3d_device *device) +BOOL context_apply_draw_state(struct wined3d_context *context, + const struct wined3d_device *device, const struct wined3d_state *state) { - const struct wined3d_state *state = &device->state; const struct StateEntry *state_table = context->state_table; const struct wined3d_fb_state *fb = state->fb; unsigned int i; diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 6857b0d..bd62b68 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -488,7 +488,7 @@ void draw_primitive(struct wined3d_device *device, const struct wined3d_state *s wined3d_surface_prepare(ds, context, location); } - if (!context_apply_draw_state(context, device)) + if (!context_apply_draw_state(context, device, state)) { context_release(context); WARN("Unable to apply draw state, skipping draw.\n"); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 7c3ea65..0f55d79 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1582,7 +1582,8 @@ void context_alloc_occlusion_query(struct wined3d_context *context, void context_apply_blit_state(struct wined3d_context *context, const struct wined3d_device *device) DECLSPEC_HIDDEN; BOOL context_apply_clear_state(struct wined3d_context *context, const struct wined3d_state *state, UINT rt_count, const struct wined3d_fb_state *fb) DECLSPEC_HIDDEN; -BOOL context_apply_draw_state(struct wined3d_context *context, struct wined3d_device *device) DECLSPEC_HIDDEN; +BOOL context_apply_draw_state(struct wined3d_context *context, + const struct wined3d_device *device, const struct wined3d_state *state) DECLSPEC_HIDDEN; void context_apply_fbo_state_blit(struct wined3d_context *context, GLenum target, struct wined3d_surface *render_target, struct wined3d_surface *depth_stencil, DWORD location) DECLSPEC_HIDDEN; void context_active_texture(struct wined3d_context *context, const struct wined3d_gl_info *gl_info,

1 0

Tag wine-1.9.8 : Alexandre Julliard : Release 1.9.8
by Alexandre Julliard April 15, 2016

April 15, 2016

Module: wine Branch: refs/tags/wine-1.9.8 Tag: 76fdcbefa3d5e1ace9163c125f428b08ad917541 URL: http://source.winehq.org/git/wine.git/?a=tag;h=76fdcbefa3d5e1ace9163c125f42… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 15 23:58:34 2016 +0900 Release 1.9.8

1 0

Alexandre Julliard : Release 1.9.8.
by Alexandre Julliard April 15, 2016

April 15, 2016

Module: wine Branch: master Commit: f0429adbffce1f67b88b8c0a3e3a5badb6d6526e URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0429adbffce1f67b88b8c0a3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 15 23:58:34 2016 +0900 Release 1.9.8. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 811 ++++++++++++++++++++++++++++---------------------------------- AUTHORS | 3 + VERSION | 2 +- configure | 18 +- 4 files changed, 374 insertions(+), 460 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f0429adbffce1f67b88b8…

1 0

Nikolay Sivov : dwrite/tests: Test for superscript/subscript font metrics.
by Alexandre Julliard April 15, 2016

April 15, 2016

Module: wine Branch: master Commit: c7a174f76b1761529a0bb470635783856cef574b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7a174f76b1761529a0bb4706… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Apr 14 23:22:56 2016 +0300 dwrite/tests: Test for superscript/subscript font metrics. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/font.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 9687dc5..5d8a4ca 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -1575,6 +1575,15 @@ static void get_expected_font_metrics(IDWriteFontFace *fontface, DWRITE_FONT_MET metrics->strikethroughPosition = GET_BE_WORD(tt_os2->yStrikeoutPosition); metrics->strikethroughThickness = GET_BE_WORD(tt_os2->yStrikeoutSize); + + metrics->subscriptPositionX = GET_BE_WORD(tt_os2->ySubscriptXOffset); + metrics->subscriptPositionY = -GET_BE_WORD(tt_os2->ySubscriptYOffset); + metrics->subscriptSizeX = GET_BE_WORD(tt_os2->ySubscriptXSize); + metrics->subscriptSizeY = GET_BE_WORD(tt_os2->ySubscriptYSize); + metrics->superscriptPositionX = GET_BE_WORD(tt_os2->ySuperscriptXOffset); + metrics->superscriptPositionY = GET_BE_WORD(tt_os2->ySuperscriptYOffset); + metrics->superscriptSizeX = GET_BE_WORD(tt_os2->ySuperscriptXSize); + metrics->superscriptSizeY = GET_BE_WORD(tt_os2->ySuperscriptYSize); } if (tt_post) { @@ -1631,6 +1640,23 @@ static void check_font_metrics(const WCHAR *nameW, BOOL has_metrics1, const DWRI m1->glyphBoxRight, expected->glyphBoxRight); ok(m1->glyphBoxBottom == expected->glyphBoxBottom, "font %s: glyphBoxBottom %d, expected %d\n", wine_dbgstr_w(nameW), m1->glyphBoxBottom, expected->glyphBoxBottom); + + ok(m1->subscriptPositionX == expected->subscriptPositionX, "font %s: subscriptPositionX %d, expected %d\n", + wine_dbgstr_w(nameW), m1->subscriptPositionX, expected->subscriptPositionX); + ok(m1->subscriptPositionY == expected->subscriptPositionY, "font %s: subscriptPositionY %d, expected %d\n", + wine_dbgstr_w(nameW), m1->subscriptPositionY, expected->subscriptPositionY); + ok(m1->subscriptSizeX == expected->subscriptSizeX, "font %s: subscriptSizeX %d, expected %d\n", + wine_dbgstr_w(nameW), m1->subscriptSizeX, expected->subscriptSizeX); + ok(m1->subscriptSizeY == expected->subscriptSizeY, "font %s: subscriptSizeY %d, expected %d\n", + wine_dbgstr_w(nameW), m1->subscriptSizeY, expected->subscriptSizeY); + ok(m1->superscriptPositionX == expected->superscriptPositionX, "font %s: superscriptPositionX %d, expected %d\n", + wine_dbgstr_w(nameW), m1->superscriptPositionX, expected->superscriptPositionX); + ok(m1->superscriptPositionY == expected->superscriptPositionY, "font %s: superscriptPositionY %d, expected %d\n", + wine_dbgstr_w(nameW), m1->superscriptPositionY, expected->superscriptPositionY); + ok(m1->superscriptSizeX == expected->superscriptSizeX, "font %s: superscriptSizeX %d, expected %d\n", + wine_dbgstr_w(nameW), m1->superscriptSizeX, expected->superscriptSizeX); + ok(m1->superscriptSizeY == expected->superscriptSizeY, "font %s: superscriptSizeY %d, expected %d\n", + wine_dbgstr_w(nameW), m1->superscriptSizeY, expected->superscriptSizeY); } }

1 0

Dmitry Timoshkov : windowscodecs: Allocate correct amount of memory for PNG image data.
by Alexandre Julliard April 15, 2016

April 15, 2016

Module: wine Branch: master Commit: 2f74d91d87b20d6f3e131b1afcedb646329ab1af URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f74d91d87b20d6f3e131b1af… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Apr 14 18:47:50 2016 +0200 windowscodecs: Allocate correct amount of memory for PNG image data. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/pngformat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/windowscodecs/pngformat.c b/dlls/windowscodecs/pngformat.c index cd9165b..3eb4d0e 100644 --- a/dlls/windowscodecs/pngformat.c +++ b/dlls/windowscodecs/pngformat.c @@ -664,7 +664,7 @@ static HRESULT WINAPI PngDecoder_Initialize(IWICBitmapDecoder *iface, IStream *p /* read the image data */ This->width = ppng_get_image_width(This->png_ptr, This->info_ptr); This->height = ppng_get_image_height(This->png_ptr, This->info_ptr); - This->stride = This->width * This->bpp; + This->stride = (This->width * This->bpp + 7) / 8; image_size = This->stride * This->height; This->image_bits = HeapAlloc(GetProcessHeap(), 0, image_size);

1 0

Sebastian Lackner : kernel32/tests: Port stack commit tests to x86_64.
by Alexandre Julliard April 15, 2016

April 15, 2016

Module: wine Branch: master Commit: 99130182bafe311b358ba7dc520b866c3f79124c URL: http://source.winehq.org/git/wine.git/?a=commit;h=99130182bafe311b358ba7dc5… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Apr 15 10:54:04 2016 +0200 kernel32/tests: Port stack commit tests to x86_64. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/virtual.c | 160 ++++++++++++++++++++++++------------------ 1 file changed, 90 insertions(+), 70 deletions(-) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index bfec2b9..5503e25 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -1805,6 +1805,93 @@ static void test_write_watch(void) VirtualFree( base, 0, MEM_RELEASE ); } +#if defined(__i386__) || defined(__x86_64__) + +static DWORD WINAPI stack_commit_func( void *arg ) +{ + volatile char *p = (char *)&p; + + /* trigger all guard pages, to ensure that the pages are committed */ + while (p >= (char *)NtCurrentTeb()->DeallocationStack + 4 * 0x1000) + { + p[0] |= 0; + p -= 0x1000; + } + + ok( arg == (void *)0xdeadbeef, "expected 0xdeadbeef, got %p\n", arg ); + return 42; +} + +static void test_stack_commit(void) +{ +#ifdef __i386__ + static const char code_call_on_stack[] = { + 0x55, /* pushl %ebp */ + 0x56, /* pushl %esi */ + 0x89, 0xe6, /* movl %esp,%esi */ + 0x8b, 0x4c, 0x24, 0x0c, /* movl 12(%esp),%ecx - func */ + 0x8b, 0x54, 0x24, 0x10, /* movl 16(%esp),%edx - arg */ + 0x8b, 0x44, 0x24, 0x14, /* movl 20(%esp),%eax - stack */ + 0x83, 0xe0, 0xf0, /* andl $~15,%eax */ + 0x83, 0xe8, 0x0c, /* subl $12,%eax */ + 0x89, 0xc4, /* movl %eax,%esp */ + 0x52, /* pushl %edx */ + 0x31, 0xed, /* xorl %ebp,%ebp */ + 0xff, 0xd1, /* call *%ecx */ + 0x89, 0xf4, /* movl %esi,%esp */ + 0x5e, /* popl %esi */ + 0x5d, /* popl %ebp */ + 0xc2, 0x0c, 0x00 }; /* ret $12 */ +#else + static const char code_call_on_stack[] = { + 0x55, /* pushq %rbp */ + 0x48, 0x89, 0xe5, /* movq %rsp,%rbp */ + /* %rcx - func, %rdx - arg, %r8 - stack */ + 0x48, 0x87, 0xca, /* xchgq %rcx,%rdx */ + 0x49, 0x83, 0xe0, 0xf0, /* andq $~15,%r8 */ + 0x49, 0x83, 0xe8, 0x20, /* subq $0x20,%r8 */ + 0x4c, 0x89, 0xc4, /* movq %r8,%rsp */ + 0xff, 0xd2, /* callq *%rdx */ + 0x48, 0x89, 0xec, /* movq %rbp,%rsp */ + 0x5d, /* popq %rbp */ + 0xc3 }; /* ret */ +#endif + DWORD (WINAPI *call_on_stack)( DWORD (WINAPI *func)(void *), void *arg, void *stack ); + void *old_stack, *old_stack_base, *old_stack_limit; + void *new_stack, *new_stack_base; + DWORD result; + + call_on_stack = VirtualAlloc( 0, 0x1000, MEM_RESERVE | MEM_COMMIT, PAGE_EXECUTE_READWRITE ); + ok( call_on_stack != NULL, "VirtualAlloc failed %u\n", GetLastError() ); + memcpy( call_on_stack, code_call_on_stack, sizeof(code_call_on_stack) ); + + /* allocate a new stack, only the first guard page is committed */ + new_stack = VirtualAlloc( 0, 0x400000, MEM_RESERVE, PAGE_READWRITE ); + ok( new_stack != NULL, "VirtualAlloc failed %u\n", GetLastError() ); + new_stack_base = (char *)new_stack + 0x400000; + VirtualAlloc( (char *)new_stack_base - 0x1000, 0x1000, MEM_COMMIT, PAGE_READWRITE | PAGE_GUARD ); + + old_stack = NtCurrentTeb()->DeallocationStack; + old_stack_base = NtCurrentTeb()->Tib.StackBase; + old_stack_limit = NtCurrentTeb()->Tib.StackLimit; + + NtCurrentTeb()->DeallocationStack = new_stack; + NtCurrentTeb()->Tib.StackBase = new_stack_base; + NtCurrentTeb()->Tib.StackLimit = new_stack_base; + + result = call_on_stack( stack_commit_func, (void *)0xdeadbeef, new_stack_base ); + + NtCurrentTeb()->DeallocationStack = old_stack; + NtCurrentTeb()->Tib.StackBase = old_stack_base; + NtCurrentTeb()->Tib.StackLimit = old_stack_limit; + + ok( result == 42, "expected 42, got %u\n", result ); + + VirtualFree( new_stack, 0, MEM_RELEASE ); + VirtualFree( call_on_stack, 0, MEM_RELEASE ); +} + +#endif /* defined(__i386__) || defined(__x86_64__) */ #ifdef __i386__ static LONG num_guard_page_calls; @@ -2050,75 +2137,6 @@ static void test_guard_page(void) VirtualFree( base, 0, MEM_RELEASE ); } -static DWORD WINAPI stack_commit_func( void *arg ) -{ - volatile char *p = (char *)&p; - - /* trigger all guard pages, to ensure that the pages are committed */ - while (p >= (char *)NtCurrentTeb()->DeallocationStack + 3 * 0x1000) - { - p[0] |= 0; - p -= 0x1000; - } - - ok( arg == (void *)0xdeadbeef, "expected 0xdeadbeef, got %p\n", arg ); - return 42; -} - -static void test_stack_commit(void) -{ - static const char code_call_on_stack[] = { - 0x55, /* pushl %ebp */ - 0x56, /* pushl %esi */ - 0x89, 0xe6, /* movl %esp,%esi */ - 0x8b, 0x4c, 0x24, 0x0c, /* movl 12(%esp),%ecx - func */ - 0x8b, 0x54, 0x24, 0x10, /* movl 16(%esp),%edx - arg */ - 0x8b, 0x44, 0x24, 0x14, /* movl 20(%esp),%eax - stack */ - 0x83, 0xe0, 0xf0, /* andl $~15,%eax */ - 0x83, 0xe8, 0x0c, /* subl $12,%eax */ - 0x89, 0xc4, /* movl %eax,%esp */ - 0x52, /* pushl %edx */ - 0x31, 0xed, /* xorl %ebp,%ebp */ - 0xff, 0xd1, /* call *%ecx */ - 0x89, 0xf4, /* movl %esi,%esp */ - 0x5e, /* popl %esi */ - 0x5d, /* popl %ebp */ - 0xc2, 0x0c, 0x00 }; /* ret $12 */ - - DWORD (WINAPI *call_on_stack)( DWORD (WINAPI *func)(void *), void *arg, void *stack ); - void *old_stack, *old_stack_base, *old_stack_limit; - void *new_stack, *new_stack_base; - DWORD result; - - call_on_stack = VirtualAlloc( 0, 0x1000, MEM_RESERVE | MEM_COMMIT, PAGE_EXECUTE_READWRITE ); - ok( call_on_stack != NULL, "VirtualAlloc failed %u\n", GetLastError() ); - memcpy( call_on_stack, code_call_on_stack, sizeof(code_call_on_stack) ); - - /* allocate a new stack, only the first guard page is committed */ - new_stack = VirtualAlloc( 0, 0x400000, MEM_RESERVE, PAGE_READWRITE ); - ok( new_stack != NULL, "VirtualAlloc failed %u\n", GetLastError() ); - new_stack_base = (char *)new_stack + 0x400000; - VirtualAlloc( (char *)new_stack_base - 0x1000, 0x1000, MEM_COMMIT, PAGE_READWRITE | PAGE_GUARD ); - - old_stack = NtCurrentTeb()->DeallocationStack; - old_stack_base = NtCurrentTeb()->Tib.StackBase; - old_stack_limit = NtCurrentTeb()->Tib.StackLimit; - - NtCurrentTeb()->DeallocationStack = new_stack; - NtCurrentTeb()->Tib.StackBase = new_stack_base; - NtCurrentTeb()->Tib.StackLimit = new_stack_base; - - result = call_on_stack( stack_commit_func, (void *)0xdeadbeef, new_stack_base ); - ok( result == 42, "expected 42, got %u\n", result ); - - NtCurrentTeb()->DeallocationStack = old_stack; - NtCurrentTeb()->Tib.StackBase = old_stack_base; - NtCurrentTeb()->Tib.StackLimit = old_stack_limit; - - VirtualFree( new_stack, 0, MEM_RELEASE ); - VirtualFree( call_on_stack, 0, MEM_RELEASE ); -} - static LONG num_execute_fault_calls; static DWORD execute_fault_seh_handler( EXCEPTION_RECORD *rec, EXCEPTION_REGISTRATION_RECORD *frame, @@ -3824,9 +3842,11 @@ START_TEST(virtual) test_IsBadWritePtr(); test_IsBadCodePtr(); test_write_watch(); +#if defined(__i386__) || defined(__x86_64__) + test_stack_commit(); +#endif #ifdef __i386__ test_guard_page(); - test_stack_commit(); /* The following tests should be executed as a last step, and in exactly this * order, since ATL thunk emulation cannot be enabled anymore on Windows. */ test_atl_thunk_emulation( MEM_EXECUTE_OPTION_ENABLE );

1 0

Sebastian Lackner : kernel32/tests: Use inline implementation of NtCurrentTeb for virtual tests.
by Alexandre Julliard April 15, 2016

April 15, 2016

Module: wine Branch: master Commit: 2aee9b1ee3343c9711869562bb538c6076bb2dd4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2aee9b1ee3343c9711869562b… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Apr 15 10:53:38 2016 +0200 kernel32/tests: Use inline implementation of NtCurrentTeb for virtual tests. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/virtual.c | 76 ++++++++++++++++--------------------------- 1 file changed, 28 insertions(+), 48 deletions(-) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index 1a8fd6f..bfec2b9 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -43,7 +43,6 @@ static UINT (WINAPI *pResetWriteWatch)(LPVOID,SIZE_T); static NTSTATUS (WINAPI *pNtAreMappedFilesTheSame)(PVOID,PVOID); static NTSTATUS (WINAPI *pNtMapViewOfSection)(HANDLE, HANDLE, PVOID *, ULONG, SIZE_T, const LARGE_INTEGER *, SIZE_T *, ULONG, ULONG, ULONG); static DWORD (WINAPI *pNtUnmapViewOfSection)(HANDLE, PVOID); -static struct _TEB * (WINAPI *pNtCurrentTeb)(void); static PVOID (WINAPI *pRtlAddVectoredExceptionHandler)(ULONG, PVECTORED_EXCEPTION_HANDLER); static ULONG (WINAPI *pRtlRemoveVectoredExceptionHandler)(PVOID); static BOOL (WINAPI *pGetProcessDEPPolicy)(HANDLE, LPDWORD, PBOOL); @@ -1838,12 +1837,6 @@ static void test_guard_page(void) BOOL success; char *base; - if (!pNtCurrentTeb) - { - win_skip( "NtCurrentTeb not supported\n" ); - return; - } - size = 0x1000; base = VirtualAlloc( 0, size, MEM_RESERVE | MEM_COMMIT, PAGE_READWRITE | PAGE_GUARD ); ok( base != NULL, "VirtualAlloc failed %u\n", GetLastError() ); @@ -1906,8 +1899,8 @@ static void test_guard_page(void) /* test directly accessing the memory - we need to setup an exception handler first */ frame.Handler = guard_page_handler; - frame.Prev = pNtCurrentTeb()->Tib.ExceptionList; - pNtCurrentTeb()->Tib.ExceptionList = &frame; + frame.Prev = NtCurrentTeb()->Tib.ExceptionList; + NtCurrentTeb()->Tib.ExceptionList = &frame; InterlockedExchange( &num_guard_page_calls, 0 ); InterlockedExchange( &old_value, *value ); /* exception handler increments value by 0x100 */ @@ -1915,7 +1908,7 @@ static void test_guard_page(void) ok( old_value == 0x101, "memory block contains wrong value, expected 0x101, got 0x%x\n", old_value ); ok( num_guard_page_calls == 1, "expected one callback of guard page handler, got %d calls\n", num_guard_page_calls ); - pNtCurrentTeb()->Tib.ExceptionList = frame.Prev; + NtCurrentTeb()->Tib.ExceptionList = frame.Prev; /* check info structure again, PAGE_GUARD should be removed now */ ret = VirtualQuery( base, &info, sizeof(info) ); @@ -1928,8 +1921,8 @@ static void test_guard_page(void) /* test accessing second integer in memory */ frame.Handler = guard_page_handler; - frame.Prev = pNtCurrentTeb()->Tib.ExceptionList; - pNtCurrentTeb()->Tib.ExceptionList = &frame; + frame.Prev = NtCurrentTeb()->Tib.ExceptionList; + NtCurrentTeb()->Tib.ExceptionList = &frame; InterlockedExchange( &num_guard_page_calls, 0 ); old_value = *(value + 1); @@ -1937,7 +1930,7 @@ static void test_guard_page(void) ok( *value == 2, "memory block contains wrong value, expected 2, got 0x%x\n", *value ); ok( num_guard_page_calls == 1, "expected one callback of guard page handler, got %d calls\n", num_guard_page_calls ); - pNtCurrentTeb()->Tib.ExceptionList = frame.Prev; + NtCurrentTeb()->Tib.ExceptionList = frame.Prev; success = VirtualLock( base, size ); ok( success, "VirtualLock failed %u\n", GetLastError() ); @@ -1982,15 +1975,15 @@ static void test_guard_page(void) /* writing to a page should trigger should trigger guard page, even if write watch is set */ frame.Handler = guard_page_handler; - frame.Prev = pNtCurrentTeb()->Tib.ExceptionList; - pNtCurrentTeb()->Tib.ExceptionList = &frame; + frame.Prev = NtCurrentTeb()->Tib.ExceptionList; + NtCurrentTeb()->Tib.ExceptionList = &frame; InterlockedExchange( &num_guard_page_calls, 0 ); *value = 1; *(value + 1) = 2; ok( num_guard_page_calls == 1, "expected one callback of guard page handler, got %d calls\n", num_guard_page_calls ); - pNtCurrentTeb()->Tib.ExceptionList = frame.Prev; + NtCurrentTeb()->Tib.ExceptionList = frame.Prev; count = 64; ret = pGetWriteWatch( WRITE_WATCH_FLAG_RESET, base, size, results, &count, &pagesize ); @@ -2003,8 +1996,8 @@ static void test_guard_page(void) /* write watch is triggered from inside of the guard page handler */ frame.Handler = guard_page_handler; - frame.Prev = pNtCurrentTeb()->Tib.ExceptionList; - pNtCurrentTeb()->Tib.ExceptionList = &frame; + frame.Prev = NtCurrentTeb()->Tib.ExceptionList; + NtCurrentTeb()->Tib.ExceptionList = &frame; InterlockedExchange( &num_guard_page_calls, 0 ); old_value = *(value + 1); /* doesn't trigger write watch */ @@ -2012,7 +2005,7 @@ static void test_guard_page(void) ok( *value == 1, "memory block contains wrong value, expected 1, got 0x%x\n", *value ); ok( num_guard_page_calls == 1, "expected one callback of guard page handler, got %d calls\n", num_guard_page_calls ); - pNtCurrentTeb()->Tib.ExceptionList = frame.Prev; + NtCurrentTeb()->Tib.ExceptionList = frame.Prev; count = 64; ret = pGetWriteWatch( WRITE_WATCH_FLAG_RESET, base, size, results, &count, &pagesize ); @@ -2062,7 +2055,7 @@ static DWORD WINAPI stack_commit_func( void *arg ) volatile char *p = (char *)&p; /* trigger all guard pages, to ensure that the pages are committed */ - while (p >= (char *)pNtCurrentTeb()->DeallocationStack + 3 * 0x1000) + while (p >= (char *)NtCurrentTeb()->DeallocationStack + 3 * 0x1000) { p[0] |= 0; p -= 0x1000; @@ -2097,12 +2090,6 @@ static void test_stack_commit(void) void *new_stack, *new_stack_base; DWORD result; - if (!pNtCurrentTeb) - { - win_skip( "NtCurrentTeb not supported\n" ); - return; - } - call_on_stack = VirtualAlloc( 0, 0x1000, MEM_RESERVE | MEM_COMMIT, PAGE_EXECUTE_READWRITE ); ok( call_on_stack != NULL, "VirtualAlloc failed %u\n", GetLastError() ); memcpy( call_on_stack, code_call_on_stack, sizeof(code_call_on_stack) ); @@ -2113,20 +2100,20 @@ static void test_stack_commit(void) new_stack_base = (char *)new_stack + 0x400000; VirtualAlloc( (char *)new_stack_base - 0x1000, 0x1000, MEM_COMMIT, PAGE_READWRITE | PAGE_GUARD ); - old_stack = pNtCurrentTeb()->DeallocationStack; - old_stack_base = pNtCurrentTeb()->Tib.StackBase; - old_stack_limit = pNtCurrentTeb()->Tib.StackLimit; + old_stack = NtCurrentTeb()->DeallocationStack; + old_stack_base = NtCurrentTeb()->Tib.StackBase; + old_stack_limit = NtCurrentTeb()->Tib.StackLimit; - pNtCurrentTeb()->DeallocationStack = new_stack; - pNtCurrentTeb()->Tib.StackBase = new_stack_base; - pNtCurrentTeb()->Tib.StackLimit = new_stack_base; + NtCurrentTeb()->DeallocationStack = new_stack; + NtCurrentTeb()->Tib.StackBase = new_stack_base; + NtCurrentTeb()->Tib.StackLimit = new_stack_base; result = call_on_stack( stack_commit_func, (void *)0xdeadbeef, new_stack_base ); ok( result == 42, "expected 42, got %u\n", result ); - pNtCurrentTeb()->DeallocationStack = old_stack; - pNtCurrentTeb()->Tib.StackBase = old_stack_base; - pNtCurrentTeb()->Tib.StackLimit = old_stack_limit; + NtCurrentTeb()->DeallocationStack = old_stack; + NtCurrentTeb()->Tib.StackBase = old_stack_base; + NtCurrentTeb()->Tib.StackLimit = old_stack_limit; VirtualFree( new_stack, 0, MEM_RELEASE ); VirtualFree( call_on_stack, 0, MEM_RELEASE ); @@ -2211,14 +2198,14 @@ static inline DWORD send_message_excpt( HWND hWnd, UINT uMsg, WPARAM wParam, LPA DWORD ret; frame.Handler = execute_fault_seh_handler; - frame.Prev = pNtCurrentTeb()->Tib.ExceptionList; - pNtCurrentTeb()->Tib.ExceptionList = &frame; + frame.Prev = NtCurrentTeb()->Tib.ExceptionList; + NtCurrentTeb()->Tib.ExceptionList = &frame; InterlockedExchange( &num_guard_page_calls, 0 ); InterlockedExchange( &num_execute_fault_calls, 0 ); ret = SendMessageA( hWnd, uMsg, wParam, lParam ); - pNtCurrentTeb()->Tib.ExceptionList = frame.Prev; + NtCurrentTeb()->Tib.ExceptionList = frame.Prev; return ret; } @@ -2229,14 +2216,14 @@ static inline DWORD call_proc_excpt( DWORD (CALLBACK *code)(void *), void *arg ) DWORD ret; frame.Handler = execute_fault_seh_handler; - frame.Prev = pNtCurrentTeb()->Tib.ExceptionList; - pNtCurrentTeb()->Tib.ExceptionList = &frame; + frame.Prev = NtCurrentTeb()->Tib.ExceptionList; + NtCurrentTeb()->Tib.ExceptionList = &frame; InterlockedExchange( &num_guard_page_calls, 0 ); InterlockedExchange( &num_execute_fault_calls, 0 ); ret = code( arg ); - pNtCurrentTeb()->Tib.ExceptionList = frame.Prev; + NtCurrentTeb()->Tib.ExceptionList = frame.Prev; return ret; } @@ -2283,12 +2270,6 @@ static void test_atl_thunk_emulation( ULONG dep_flags ) char *base; HWND hWnd; - if (!pNtCurrentTeb) - { - win_skip( "NtCurrentTeb not supported\n" ); - return; - } - trace( "Running DEP tests with ProcessExecuteFlags = %d\n", dep_flags ); NtQueryInformationProcess( GetCurrentProcess(), ProcessExecuteFlags, &old_flags, sizeof(old_flags), NULL ); @@ -3819,7 +3800,6 @@ START_TEST(virtual) pNtAreMappedFilesTheSame = (void *)GetProcAddress( hntdll, "NtAreMappedFilesTheSame" ); pNtMapViewOfSection = (void *)GetProcAddress( hntdll, "NtMapViewOfSection" ); pNtUnmapViewOfSection = (void *)GetProcAddress( hntdll, "NtUnmapViewOfSection" ); - pNtCurrentTeb = (void *)GetProcAddress( hntdll, "NtCurrentTeb" ); pRtlAddVectoredExceptionHandler = (void *)GetProcAddress( hntdll, "RtlAddVectoredExceptionHandler" ); pRtlRemoveVectoredExceptionHandler = (void *)GetProcAddress( hntdll, "RtlRemoveVectoredExceptionHandler" ); pNtProtectVirtualMemory = (void *)GetProcAddress( hntdll, "NtProtectVirtualMemory" );

1 0