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

Re: [3/3] ntdll: Add more tests for calling int $0x2d on x86 and x86_64.
by Marvin Feb. 18, 2016

Feb. 18, 2016

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=20653 Your paranoid android. === wvistau64 (32 bit exception) === exception.c:490: Test failed: 42: Unexpected eip 0x3e0000/0x3e0001 exception: unhandled exception 80000004 at 003E0000 exception.c:490: Test failed: 42: Unexpected eip 0x77baed97/0x3e0001 === w7u (32 bit exception) === exception.c:490: Test failed: 42: Unexpected eip 0x2f0000/0x2f0001 exception: unhandled exception 80000004 at 002F0000 exception.c:490: Test failed: 42: Unexpected eip 0x77cde34f/0x2f0001 === w1064 (32 bit exception) === Failure running script in VM: network read timed out (Connect:AgentVersion.h:0/9) === w1064 (64 bit exception) === Failure running script in VM: network read timed out (Connect:AgentVersion.h:0/9)

1 0

Re: [PATCH] packet: create packet.dll and Implement GetAdapterNames(try 3)
by Sebastian Lackner Feb. 18, 2016

Feb. 18, 2016

On 18.02.2016 11:15, Jianqiu Zhang wrote: > From 4810b411a8b76ce09356da0333d5aef434e30465 Mon Sep 17 00:00:00 2001 > From: Jianqiu Zhang <zhangjianqiu_133(a)yeah.net> > Date: Sun, 14 Feb 2016 17:27:37 +0800 > Subject: [PATCH] packet: create packet.dll and Implement GetAdapterNames > > Signed-off-by: Jianqiu Zhang <zhangjianqiu_133(a)yeah.net> It seems your mail client corrupted the patch. To workaround that, you can send your patch as attachment. Also, you either attached the wrong version of your patch, or missed some of the feedback I gave in the last reply. The memory leaks and ordinals in the spec file are still present for example.

1 0

Re: ntdll/tests: Add more tests for calling int $0x2d on x86 and x86_64. (v2)
by Marvin Feb. 18, 2016

Feb. 18, 2016

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=20657 Your paranoid android. === wvistau64 (32 bit exception) === exception.c:490: Test failed: 42: Unexpected eip 0x2d0000/0x2d0001 exception: unhandled exception 80000004 at 002D0000 exception.c:490: Test failed: 42: Unexpected eip 0x77baed97/0x2d0001 === w7u (32 bit exception) === exception.c:490: Test failed: 42: Unexpected eip 0x2f0000/0x2f0001 exception: unhandled exception 80000004 at 002F0000 exception.c:490: Test failed: 42: Unexpected eip 0x77cde34f/0x2f0001 === w1064 (32 bit exception) === Failure running script in VM: network read timed out (Connect:AgentVersion.h:0/9) === w1064 (64 bit exception) === Failure running script in VM: network read timed out (Connect:AgentVersion.h:0/9)

2 1

Re: [2/3] ntdll: Implement handling of int $0x2d for x86_64.
by Sebastian Lackner Feb. 18, 2016

Feb. 18, 2016

On 18.02.2016 09:58, Sebastian Lackner wrote: > Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> > --- > dlls/ntdll/signal_x86_64.c | 53 +++++++++++++++++++++++++++++++++++++++++++-- > 1 file changed, 51 insertions(+), 2 deletions(-) > I'd like to add the remark, that depending on the logic of the anti-debugger trick, more work is necessary for proper int $0x2d support on x86_64. What we also need is the equivalent of http://source.winehq.org/git/wine.git/patch/eab168cf9eaa6ed9f8800b25155d329… for x86_64. I'll take care of that when I know that the first three patches are fine.

1 0

Re: [3/3] ntdll: Add more tests for calling int $0x2d on x86 and x86_64.
by Marvin Feb. 18, 2016

Feb. 18, 2016

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=20653 Your paranoid android. === wvistau64 (32 bit exception) === exception.c:490: Test failed: 42: Unexpected eip 0x2c0000/0x2c0001 exception: unhandled exception 80000004 at 002C0000 exception.c:490: Test failed: 42: Unexpected eip 0x77baed97/0x2c0001 === w7u (32 bit exception) === exception.c:490: Test failed: 42: Unexpected eip 0x3f0000/0x3f0001 exception: unhandled exception 80000004 at 003F0000 exception.c:490: Test failed: 42: Unexpected eip 0x77cde34f/0x3f0001 === w1064 (32 bit exception) === Failure running script in VM: network read timed out (Connect:AgentVersion.h:0/9) === w1064 (64 bit exception) === Failure running script in VM: network read timed out (Connect:AgentVersion.h:0/9)

1 0

Re: [PATCH 2/2] ntdll: Improve invalid parameter handling in NtAccessCheck. (try 3)
by Marvin Feb. 18, 2016

Feb. 18, 2016

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=20648 Your paranoid android. === w1064 (32 bit security) === security.c:3945: Test failed: MACHINE\Software owner SID (S-1-5-18) != Administrators SID (S-1-5-32-544). security.c:3986: Test failed: Builtin Users ACE has unexpected flags (0x12 != 0xa) security.c:3990: Test failed: Builtin Users ACE has unexpected mask (0x20019 != 0x80000000) security.c:3999: Test failed: Builtin Admins ACE has unexpected flags (0x12 != 0x0)

1 0

Re: [PATCH 1/2] advapi32/tests: Add more invalid parameter tests for AccessCheck. (try 3)
by Marvin Feb. 18, 2016

Feb. 18, 2016

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=20647 Your paranoid android. === w1064 (32 bit security) === security.c:3964: Test failed: MACHINE\Software owner SID (S-1-5-18) != Administrators SID (S-1-5-32-544). security.c:4005: Test failed: Builtin Users ACE has unexpected flags (0x12 != 0xa) security.c:4009: Test failed: Builtin Users ACE has unexpected mask (0x20019 != 0x80000000) security.c:4018: Test failed: Builtin Admins ACE has unexpected flags (0x12 != 0x0)

1 0

Re: [PATCH 2/3] ntdll: Improve invalid parameter handling in NtAccessCheck. (try 2)
by Alexandre Julliard Feb. 18, 2016

Feb. 18, 2016

Qian Hong <qhong(a)codeweavers.com> writes: > @@ -1586,7 +1586,16 @@ NtAccessCheck( > SecurityDescriptor, ClientToken, DesiredAccess, GenericMapping, > PrivilegeSet, ReturnLength, GrantedAccess, AccessStatus); > > - if (!PrivilegeSet || !ReturnLength) > + if (!ReturnLength) > + return STATUS_ACCESS_VIOLATION; > + > + if (*ReturnLength == 0) > + { > + *ReturnLength = sizeof(PRIVILEGE_SET); Shouldn't this depend on the number of privileges to be returned? -- Alexandre Julliard julliard(a)winehq.org

2 1

Re: shell32/tests: Only look for Explorer windows for the progman tests.
by Marvin Feb. 18, 2016

Feb. 18, 2016

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=20640 Your paranoid android. === w2003std (32 bit progman_dde) === progman_dde.c:383: Test failed: Window "C:\Documents and Settings\All Users\Start Menu\Programs\Group1" was not created in 45 seconds - assumed failure. [S_G:12]

1 0

Re: crypt32/tests: Clarify some base64 test failed messages.
by Marvin Feb. 18, 2016

Feb. 18, 2016

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=20639 Your paranoid android. === w1064 (32 bit base64) === base64.c:342: Test failed: Expected ERROR_INVALID_DATA, got ret=1 le=13 base64.c:342: Test failed: Expected ERROR_INVALID_DATA, got ret=1 le=13 base64.c:342: Test failed: Expected ERROR_INVALID_DATA, got ret=1 le=13 === w1064 (64 bit base64) === base64.c:342: Test failed: Expected ERROR_INVALID_DATA, got ret=1 le=13 base64.c:342: Test failed: Expected ERROR_INVALID_DATA, got ret=1 le=13 base64.c:342: Test failed: Expected ERROR_INVALID_DATA, got ret=1 le=13

1 0

Re: mshtml/tests: Trace the buffer when it is unexpectedly changed in mshtml:protocol.
by Marvin Feb. 18, 2016

Feb. 18, 2016

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=20637 Your paranoid android. === w1064 (32 bit protocol) === protocol.c:723: Test failed: buf changed buf[0]='' === w1064 (64 bit protocol) === protocol.c:723: Test failed: buf changed buf[0]=''

1 0

Re: schedsvc/tests: Recognize Windows 10's RPC version.
by Marvin Feb. 18, 2016

Feb. 18, 2016

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=20636 Your paranoid android. === w1064 (32 bit rpcapi) === rpcapi.c:151: Test failed: expected ERROR_FILE_NOT_FOUND, got 0

1 0

Re: mshtml/tests: Use todo_wine_if() in tests
by Marvin Feb. 17, 2016

Feb. 17, 2016

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=20627 Your paranoid android. === wvistau64 (32 bit htmldoc) === htmldoc.c:5329: Test failed: elem == NULL

1 0

Re: [PATCH] comctl32/tooltip: Protect TTM_ADDTOOLW from invalid text pointers (resend)
by Alexandre Julliard Feb. 17, 2016

Feb. 17, 2016

Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> writes: > @@ -1076,10 +1077,19 @@ TOOLTIPS_AddToolT (TOOLTIPS_INFO *infoPtr, const TTTOOLINFOW *ti, BOOL isW) > toolPtr->lpszText = LPSTR_TEXTCALLBACKW; > } > else if (isW) { > - INT len = lstrlenW (ti->lpszText); > - TRACE("add text %s!\n", debugstr_w(ti->lpszText)); > - toolPtr->lpszText = Alloc ((len + 1)*sizeof(WCHAR)); > - strcpyW (toolPtr->lpszText, ti->lpszText); > + __TRY > + { > + INT len = lstrlenW (ti->lpszText); > + TRACE("add text %s!\n", debugstr_w(ti->lpszText)); > + toolPtr->lpszText = Alloc ((len + 1)*sizeof(WCHAR)); > + strcpyW (toolPtr->lpszText, ti->lpszText); > + } > + __EXCEPT_PAGE_FAULT > + { > + WARN("Invalid lpszText.\n"); > + return FALSE; You can't just return like that without cleaning up. -- Alexandre Julliard julliard(a)winehq.org

3 3

Re: [PATCH] winemac.drv: Actually make the GL context current even if no drawables were given.
by Ken Thomases Feb. 17, 2016

Feb. 17, 2016

On Feb 16, 2016, at 1:50 PM, Charles Davis <cdavis5x(a)gmail.com> wrote: > > The spec for GL_ARB_framebuffer_object (and thus, OpenGL 3.x and up) is > quite clear on what happens when a context is made current with no > drawable(s). In fact, the WGL_ARB_create_context extension amends > WGL_ARB_make_current_read (as well as the base spec for wglMakeCurrent) > specifically to allow this. > > Signed-off-by: Charles Davis <cdavis5x(a)gmail.com> > --- > dlls/winemac.drv/cocoa_opengl.m | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/dlls/winemac.drv/cocoa_opengl.m b/dlls/winemac.drv/cocoa_opengl.m > index ec2b191..4694dfd 100644 > --- a/dlls/winemac.drv/cocoa_opengl.m > +++ b/dlls/winemac.drv/cocoa_opengl.m > @@ -235,7 +235,10 @@ void macdrv_make_context_current(macdrv_opengl_context c, macdrv_view v) > } > > if (context) > + { > [context removeFromViews:YES]; > + [context makeCurrentContext]; > + } > } I don't think this can be sufficient. The logic in macdrv_wglMakeContextCurrentARB() essentially means that macdrv_make_context_current() will never be called with a NULL view and a non-NULL context. The "if" statement that you're changing is mostly just extra safety and, as things stand, shouldn't ever execute its statement. -Ken

1 0

Re: [PATCH] gdi32: Declare our intent explicitly to the compiler.
by Michael Stefaniuc Feb. 17, 2016

Feb. 17, 2016

On 02/17/2016 10:27 AM, Charles Davis wrote: > Clang warns about this abs(3) call because the argument is of > unsigned type. Apparently, though, this is actually a signed value > that just happens to be stored in a DWORD. (Then why is this > parameter to ExtCreatePen() a DWORD?) > > In any case, quiesce this warning with a cast. Well, clang is wrong here. abs() takes a signed integer and the implicit cast from unsigned to signed is perfectly valid C. The policy in Wine is to not uglify the code just to silence misguided static analyzers. And other static code checkers might complain about the superfluous and unneeded explicit cast (I'm working on and off on that). bye michael > > Signed-off-by: Charles Davis <cdavis5x(a)gmail.com> --- > dlls/gdi32/pen.c | 2 +- 1 file changed, 1 insertion(+), 1 > deletion(-) > > diff --git a/dlls/gdi32/pen.c b/dlls/gdi32/pen.c index > 2ae2f2b..cf4b080 100644 --- a/dlls/gdi32/pen.c +++ > b/dlls/gdi32/pen.c @@ -195,7 +195,7 @@ HPEN WINAPI ExtCreatePen( > DWORD style, DWORD width, if (logbrush.lbStyle == BS_DIBPATTERN) > logbrush.lbStyle = BS_DIBPATTERNPT; > > penPtr->logpen.elpPenStyle = style; - penPtr->logpen.elpWidth = > abs(width); + penPtr->logpen.elpWidth = abs((int)width); > penPtr->logpen.elpBrushStyle = logbrush.lbStyle; > penPtr->logpen.elpColor = logbrush.lbColor; penPtr->logpen.elpHatch > = brush->lbHatch;

2 2

Re: [PATCH] wined3d: Implement conversion function for paletted format
by Henri Verbeet Feb. 17, 2016

Feb. 17, 2016

On 16 February 2016 at 21:15, Sergey Isakov <isakov-sl(a)bk.ru> wrote: > This function is required by game Urban Assault. http://www.old-games.com/download/5663/urban-assault > Bug 37398. > With the patch the game is working. > Stefan already described in the bug report why this is suspicious. This would need tests to show this is needed and correct.

1 0

Re: [v2] user32: Use IsTextUnicode instead of a helper.
by Jactry Zeng Feb. 17, 2016

Feb. 17, 2016

Sorry, please ignore this patch. I find another bug of Wine's IsTextUnicode. So I can't use it directly. 2016-02-16 16:13 GMT+08:00 Jactry Zeng <jzeng(a)codeweavers.com>: > Hi, > > This patch try to fix tests in patch 119212: > http://source.winehq.org/patches/data/119212 > > I'm not very sure is IsTextUnicode(IS_TEXT_UNICODE_STATISTICS) good > enough for dealing with all cases may be fed by DDE. But it works > for all cases we have in dlls/user32/tests/dde.c . > > ChangeLog: > - Use IS_TEXT_UNICODE_STATISTICS. > > > Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> > --- > dlls/user32/dde_server.c | 15 ++++----------- > dlls/user32/tests/dde.c | 20 ++++++++++---------- > 2 files changed, 14 insertions(+), 21 deletions(-) > > > > > > -- Regards, Jactry Zeng

1 0

Re: [PATCH] advapi32: Don't print 32-bit values as long integers.
by Alexandre Julliard Feb. 17, 2016

Feb. 17, 2016

Charles Davis <cdavis5x(a)gmail.com> writes: > diff --git a/dlls/advapi32/cred.c b/dlls/advapi32/cred.c > index 10e58eb..ff763ee 100644 > --- a/dlls/advapi32/cred.c > +++ b/dlls/advapi32/cred.c > @@ -260,7 +260,7 @@ static DWORD mac_read_credential_from_item(SecKeychainItemRef item, BOOL require > } > if (status != noErr) > { > - WARN("SecKeychainItemCopyAttributesAndData returned status %ld\n", status); > + WARN("SecKeychainItemCopyAttributesAndData returned status %d\n", (int)status); It would probably be better to change the type instead of adding casts everywhere. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH 5/6] wined3d: Enable SM5 shaders in the GLSL backend.
by Henri Verbeet Feb. 17, 2016

Feb. 17, 2016

On 16 February 2016 at 20:48, Matteo Bruni <mbruni(a)codeweavers.com> wrote: > + /* FIXME: Check for the extensions required for SM5 support > + * (ARB_compute_shader, ARB_tessellation_shader, ARB_gpu_shader5, ...) as > + * soon as we introduce them. */ > if (gl_info->glsl_version >= MAKEDWORD_VERSION(1, 50) && gl_info->supported[WINED3D_GL_VERSION_3_2] > && gl_info->supported[ARB_SHADER_BIT_ENCODING] && gl_info->supported[ARB_SAMPLER_OBJECTS]) > - shader_model = 4; > + shader_model = 5; I'd rather not do this without at least a check for the GL and GLSL versions. It would potentially create the kind of situation where some applications start working a little bit and then stop working once we add the proper check.

1 0

Re: [PATCH 3/6] d3d11: Accept SM5 shaders.
by Henri Verbeet Feb. 17, 2016

Feb. 17, 2016

On 16 February 2016 at 20:48, Matteo Bruni <mbruni(a)codeweavers.com> wrote: > diff --git a/dlls/d3d11/shader.c b/dlls/d3d11/shader.c > index 0e277fc..61dbd4b 100644 > --- a/dlls/d3d11/shader.c > +++ b/dlls/d3d11/shader.c > @@ -389,7 +389,7 @@ static HRESULT d3d_vertex_shader_init(struct d3d_vertex_shader *shader, struct d > desc.byte_code = shader_info.shader_code; > desc.input_signature = &input_signature; > desc.output_signature = &output_signature; > - desc.max_version = 4; > + desc.max_version = 5; I think this should depend on the feature level. I.e., I'd expect creating a SM5 shader to fail on a D3D_FEATURE_LEVEL_10_0 device. (And we'd need feature level support to properly skip the test in patch 6/6, otherwise creating the device would succeed on SM4 hardware, but creating the shader would fail.)

1 0

Re: [PATCH 1/6] wined3d: Add a setting to check relative addressing indices when accessing uniforms.
by Henri Verbeet Feb. 17, 2016

Feb. 17, 2016

On 16 February 2016 at 20:48, Matteo Bruni <mbruni(a)codeweavers.com> wrote: > @@ -2258,9 +2258,25 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * > if (reg->idx[0].rel_addr) > { > if (reg->idx[0].offset) > - sprintf(register_name, "%s_c[%s + %u]", prefix, rel_param0.param_str, reg->idx[0].offset); > + { > + if (wined3d_settings.check_float_constants) > + sprintf(register_name, "(%s + %u >= 0 && %s + %u < %u ? %s_c[%s + %u] : vec4(0.0))", > + rel_param0.param_str, reg->idx[0].offset, > + rel_param0.param_str, reg->idx[0].offset, shader->limits->constant_float, > + prefix, rel_param0.param_str, reg->idx[0].offset); > + else > + sprintf(register_name, "%s_c[%s + %u]", prefix, > + rel_param0.param_str, reg->idx[0].offset); > + } > else > - sprintf(register_name, "%s_c[%s]", prefix, rel_param0.param_str); > + { > + if (wined3d_settings.check_float_constants) > + sprintf(register_name, "(%s >= 0 && %s < %u ? %s_c[%s] : vec4(0.0))", > + rel_param0.param_str, rel_param0.param_str, shader->limits->constant_float, > + prefix, rel_param0.param_str); > + else > + sprintf(register_name, "%s_c[%s]", prefix, rel_param0.param_str); > + } > } > else > { I'd probably just drop the optimization for 0 offsets for check_float_constants. I.e.: if (wined3d_settings.check_float_constants) ... else if (reg->idx[0].offset) ... else ...

1 0

Re: [PATCH] gdi32/tests: Check values returned from GetPath
by Huw Davies Feb. 17, 2016

Feb. 17, 2016

On Wed, Feb 17, 2016 at 02:01:25PM +1100, Alistair Leslie-Hughes wrote: > diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c > index 6804a96..b3f164d 100644 > --- a/dlls/gdi32/tests/metafile.c > +++ b/dlls/gdi32/tests/metafile.c > @@ -3361,12 +3361,46 @@ static void test_emf_polybezier(void) > DeleteEnhMetaFile(hemf); > } > > +static const unsigned char EMF_PATH_BITS[] = > +{ > + 0x01, 0x00, 0x00, 0x00, 0x6c, 0x00, 0x00, 0x00, > + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, > + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, > + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, > + 0xdd, 0xff, 0xff, 0xff, 0xdd, 0xff, 0xff, 0xff, > + 0x20, 0x45, 0x4d, 0x46, 0x00, 0x00, 0x01, 0x00, > + 0xe0, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, > + 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, > + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, > + 0x00, 0x05, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, > + 0xc4, 0x01, 0x00, 0x00, 0x69, 0x01, 0x00, 0x00, > + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, > + 0x00, 0x00, 0x00, 0x00, 0xe3, 0xe3, 0x06, 0x00, > + 0x1c, 0x83, 0x05, 0x00, 0x3b, 0x00, 0x00, 0x00, > + 0x08, 0x00, 0x00, 0x00, 0x1b, 0x00, 0x00, 0x00, > + 0x10, 0x00, 0x00, 0x00, 0x32, 0x00, 0x00, 0x00, > + 0x32, 0x00, 0x00, 0x00, 0x36, 0x00, 0x00, 0x00, > + 0x10, 0x00, 0x00, 0x00, 0x32, 0x00, 0x00, 0x00, > + 0x96, 0x00, 0x00, 0x00, 0x36, 0x00, 0x00, 0x00, > + 0x10, 0x00, 0x00, 0x00, 0x96, 0x00, 0x00, 0x00, > + 0x96, 0x00, 0x00, 0x00, 0x36, 0x00, 0x00, 0x00, > + 0x10, 0x00, 0x00, 0x00, 0x96, 0x00, 0x00, 0x00, > + 0x32, 0x00, 0x00, 0x00, 0x36, 0x00, 0x00, 0x00, > + 0x10, 0x00, 0x00, 0x00, 0x32, 0x00, 0x00, 0x00, > + 0x32, 0x00, 0x00, 0x00, 0x3c, 0x00, 0x00, 0x00, > + 0x08, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, > + 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, > + 0x10, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00 > +}; > + > static void test_emf_GetPath(void) > { > HDC hdcMetafile; > HENHMETAFILE hemf; > BOOL ret; > int size; > + POINT *points; > + BYTE *types; > > SetLastError(0xdeadbeef); > hdcMetafile = CreateEnhMetaFileA(GetDC(0), NULL, NULL, NULL); > @@ -3387,10 +3421,37 @@ static void test_emf_GetPath(void) > > size = GetPath(hdcMetafile, NULL, NULL, 0); > todo_wine ok( size == 5, "GetPath returned %d.\n", size); > + if(size == 5) > + { > + points = HeapAlloc(GetProcessHeap(), 0, size * sizeof(POINT)); > + types = HeapAlloc(GetProcessHeap(), 0, size ); > + > + GetPath(hdcMetafile, points, types, size); > + > + ok(types[0] == PT_MOVETO, "unexpected value %d\n", types[0]); > + ok(points[0].x == 50 && points[0].y == 50, "unexpected point (%d,%d)\n", points[0].x, points[0].y); > + ok(types[1] == PT_LINETO, "unexpected value %d\n", types[1]); > + ok(points[1].x == 50 && points[1].y == 150, "unexpected point (%d,%d)\n", points[1].x, points[1].y); > + ok(types[2] == PT_LINETO, "unexpected value %d\n", types[2]); > + ok(points[2].x == 150 && points[2].y == 150, "unexpected point (%d,%d)\n", points[2].x, points[2].y); > + ok(types[3] == PT_LINETO, "unexpected value %d\n", types[3]); > + ok(points[3].x == 150 && points[3].y == 50, "unexpected point (%d,%d)\n", points[3].x, points[3].y); > + ok(types[4] == PT_LINETO, "unexpected value %d\n", types[4]); > + ok(points[4].x == 50 && points[4].y == 50, "unexpected point (%d,%d)\n", points[4].x, points[4].y); > + > + HeapFree(GetProcessHeap(), 0, points); > + HeapFree(GetProcessHeap(), 0, types); > + } > > hemf = CloseEnhMetaFile(hdcMetafile); > ok(hemf != 0, "CloseEnhMetaFile error %d\n", GetLastError()); > > + if (compare_emf_bits(hemf, EMF_PATH_BITS, sizeof(EMF_PATH_BITS), "test_emf_GetPath", FALSE) != 0) > + { > + dump_emf_bits(hemf, "test_emf_GetPath"); > + dump_emf_records(hemf, "test_emf_GetPath"); > + } > + > DeleteEnhMetaFile(hemf); > } > Please add a Rectangle() call to the path building code. This will show that the metafile doesn't just consist of path elements. Also, as discussed yesterday, please add a similar test for wmfs (this could be a separate patch). Thanks, Huw.

1 0

Re: [PATCH 3/3] advapi32/tests: Add more invalid parameter tests for NtAccessCheck.
by Marvin Feb. 17, 2016

Feb. 17, 2016

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=20604 Your paranoid android. === w1064 (32 bit security) === security.c:4011: Test failed: MACHINE\Software owner SID (S-1-5-18) != Administrators SID (S-1-5-32-544). security.c:4052: Test failed: Builtin Users ACE has unexpected flags (0x12 != 0xa) security.c:4056: Test failed: Builtin Users ACE has unexpected mask (0x20019 != 0x80000000) security.c:4065: Test failed: Builtin Admins ACE has unexpected flags (0x12 != 0x0)

1 0

Re: [PATCH 1/2] advapi32/tests: Add invalid paramater tests for AccessCheck.
by Sebastian Lackner Feb. 17, 2016

Feb. 17, 2016

On 15.02.2016 21:52, Qian Hong wrote: > > Signed-off-by: Qian Hong <qhong(a)codeweavers.com> > --- > dlls/advapi32/tests/security.c | 53 ++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 53 insertions(+) > > > > 0001-advapi32-tests-Add-invalid-paramater-tests-for-AccessC.txt > > > diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c > index 742ede1..69c0f77 100644 > --- a/dlls/advapi32/tests/security.c > +++ b/dlls/advapi32/tests/security.c > @@ -1411,6 +1411,59 @@ static void test_AccessCheck(void) > GetLastError()); > trace("AccessCheck with MAXIMUM_ALLOWED got Access 0x%08x\n", Access); > > + /* Null PrivSet with null PrivSetLen pointer */ > + SetLastError(0xdeadbeef); > + Access = AccessStatus = 0x1abe11ed; > + ret = AccessCheck(SecurityDescriptor, Token, KEY_READ, &Mapping, > + NULL, NULL, &Access, &AccessStatus); > + err = GetLastError(); > + ok(!ret && err == ERROR_NOACCESS, "AccessCheck should have " > + "failed with ERROR_NOACCESS, instead of %d\n", err); > + ok(Access == 0x1abe11ed && AccessStatus == 0x1abe11ed, > + "Access and/or AccessStatus were changed!\n"); > + > + /* Null PrivSet with zero PrivSetLen */ > + SetLastError(0xdeadbeef); > + Access = AccessStatus = 0x1abe11ed; > + PrivSetLen = 0; > + ret = AccessCheck(SecurityDescriptor, Token, KEY_READ, &Mapping, > + 0, &PrivSetLen, &Access, &AccessStatus); > + err = GetLastError(); > +todo_wine > + ok(!ret && err == ERROR_INSUFFICIENT_BUFFER, "AccessCheck should have " > + "failed with ERROR_INSUFFICIENT_BUFFER, instead of %d\n", err); > +todo_wine > + ok(PrivSetLen == sizeof(PRIVILEGE_SET), "PrivSetLen returns %d, expects %d\n", PrivSetLen, sizeof(PRIVILEGE_SET)); This will lead to compile warnings on 64-bit. > + ok(Access == 0x1abe11ed && AccessStatus == 0x1abe11ed, > + "Access and/or AccessStatus were changed!\n"); > + > + /* Valid PrivSet with zero PrivSetLen */ > + SetLastError(0xdeadbeef); > + Access = AccessStatus = 0x1abe11ed; > + PrivSetLen = 0; > + ret = AccessCheck(SecurityDescriptor, Token, KEY_READ, &Mapping, > + PrivSet, &PrivSetLen, &Access, &AccessStatus); > + err = GetLastError(); > +todo_wine > + ok(!ret && err == ERROR_INSUFFICIENT_BUFFER, "AccessCheck should have " > + "failed with ERROR_INSUFFICIENT_BUFFER, instead of %d\n", err); > +todo_wine > + ok(Access == 0x1abe11ed && AccessStatus == 0x1abe11ed, > + "Access and/or AccessStatus were changed!\n"); > + > + PrivSetLen = FIELD_OFFSET(PRIVILEGE_SET, Privilege[16]); > + > + /* Null PrivSet with valid PrivSetLen */ > + SetLastError(0xdeadbeef); > + Access = AccessStatus = 0x1abe11ed; > + ret = AccessCheck(SecurityDescriptor, Token, KEY_READ, &Mapping, > + 0, &PrivSetLen, &Access, &AccessStatus); > + err = GetLastError(); > + ok(!ret && err == ERROR_NOACCESS, "AccessCheck should have " > + "failed with ERROR_NOACCESS, instead of %d\n", err); > + ok(Access == 0x1abe11ed && AccessStatus == 0x1abe11ed, > + "Access and/or AccessStatus were changed!\n"); > + > /* Access denied by SD */ > SetLastError(0xdeadbeef); > Access = AccessStatus = 0x1abe11ed; > > >

2 2