November 2017 - Wine-commits

Gerald Pfeifer : advapi32/tests: Fix two clang warnings in test_LookupAccount SID_NAME_USE being out of range.
by Alexandre Julliard 06 Nov '17

06 Nov '17

Module: wine Branch: master Commit: 50fe77a35821b852f0b0a51aee8838f33541d5a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=50fe77a35821b852f0b0a51ae… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sun Nov 5 10:46:22 2017 +0100 advapi32/tests: Fix two clang warnings in test_LookupAccount SID_NAME_USE being out of range. Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/security.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index d41e42e..73fd752 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -2534,7 +2534,7 @@ static void test_LookupAccountName(void) "Expected ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); ok(sid_size != 0, "Expected non-zero sid size\n"); ok(domain_size != 0, "Expected non-zero domain size\n"); - ok(sid_use == 0xcafebabe, "Expected 0xcafebabe, got %d\n", sid_use); + ok(sid_use == (SID_NAME_USE)0xcafebabe, "Expected 0xcafebabe, got %d\n", sid_use); sid_save = sid_size; domain_save = domain_size; @@ -2621,7 +2621,7 @@ static void test_LookupAccountName(void) "Expected ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); ok(sid_size != 0, "Expected non-zero sid size\n"); ok(domain_size != 0, "Expected non-zero domain size\n"); - ok(sid_use == 0xcafebabe, "Expected 0xcafebabe, got %d\n", sid_use); + ok(sid_use == (SID_NAME_USE)0xcafebabe, "Expected 0xcafebabe, got %d\n", sid_use); psid = HeapAlloc(GetProcessHeap(), 0, sid_size); domain = HeapAlloc(GetProcessHeap(), 0, domain_size);

1 0

Alex Henrie : kernel32/tests: Detect and handle a redirected stdin.
by Alexandre Julliard 06 Nov '17

06 Nov '17

Module: wine Branch: master Commit: f962bb0039c87c084214ca0bd4f40693db376195 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f962bb0039c87c084214ca0bd… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Fri Nov 3 11:43:20 2017 +0100 kernel32/tests: Detect and handle a redirected stdin. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/console.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index a14bc45..926c052 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -2582,6 +2582,11 @@ static void test_ReadConsole(void) SetLastError(0xdeadbeef); ret = GetFileSize(std_input, NULL); + if (GetLastError() == 0xdeadbeef) + { + skip("stdin is redirected\n"); + return; + } ok(ret == INVALID_FILE_SIZE, "expected INVALID_FILE_SIZE, got %#x\n", ret); ok(GetLastError() == ERROR_INVALID_HANDLE || GetLastError() == ERROR_INVALID_FUNCTION, /* Win 8, 10 */

1 0

Józef Kucia : d3d11/tests: Add test for sample_c_lz instruction.
by Alexandre Julliard 06 Nov '17

06 Nov '17

Module: wine Branch: master Commit: e23ffa5548ae6806fa21fe93fb3f7684ec971b70 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e23ffa5548ae6806fa21fe93f… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Nov 6 10:55:23 2017 +0100 d3d11/tests: Add test for sample_c_lz instruction. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 312 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 312 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e23ffa5548ae6806fa21f…

1 0

Józef Kucia : wined3d: Use wined3d_insert_bits().
by Alexandre Julliard 06 Nov '17

06 Nov '17

Module: wine Branch: master Commit: 708c337f28430fe065886b9eebf8b9d3323398ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=708c337f28430fe065886b9ee… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Nov 6 10:55:24 2017 +0100 wined3d: Use wined3d_insert_bits(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/shader.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 215f83b..94ad145 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -692,14 +692,6 @@ static void shader_set_limits(struct wined3d_shader *shader) } } -static inline void set_bitmap_bit(DWORD *bitmap, DWORD bit) -{ - DWORD idx, shift; - idx = bit >> 5; - shift = bit & 0x1f; - bitmap[idx] |= (1u << shift); -} - static BOOL shader_record_register_usage(struct wined3d_shader *shader, struct wined3d_shader_reg_maps *reg_maps, const struct wined3d_shader_register *reg, enum wined3d_shader_type shader_type, unsigned int constf_size) { @@ -767,7 +759,7 @@ static BOOL shader_record_register_usage(struct wined3d_shader *shader, struct w } else { - set_bitmap_bit(reg_maps->constf, reg->idx[0].offset); + wined3d_insert_bits(reg_maps->constf, reg->idx[0].offset, 1, 0x1); } } break;

1 0

Józef Kucia : wined3d: Use wined3d_extract_bits().
by Alexandre Julliard 06 Nov '17

06 Nov '17

Module: wine Branch: master Commit: e15b5c06d38c22277b543c7f23003554e5486108 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e15b5c06d38c22277b543c7f2… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Nov 6 10:55:25 2017 +0100 wined3d: Use wined3d_extract_bits(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 80c7354..f4e23d0 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -877,7 +877,7 @@ static void shader_generate_arb_declarations(const struct wined3d_shader *shader /* After subtracting privately used constants from the hardware limit(they are loaded as * local constants), make sure the shader doesn't violate the env constant limit */ - if(pshader) + if (pshader) { max_constantsF = min(max_constantsF, gl_info->limits.arb_ps_float_constants); } @@ -905,10 +905,7 @@ static void shader_generate_arb_declarations(const struct wined3d_shader *shader { for (i = 0; i < max_constantsF; ++i) { - DWORD idx, mask; - idx = i >> 5; - mask = 1u << (i & 0x1fu); - if (!shader_constant_is_local(shader, i) && (reg_maps->constf[idx] & mask)) + if (!shader_constant_is_local(shader, i) && wined3d_extract_bits(reg_maps->constf, i, 1)) { shader_addline(buffer, "PARAM C%d = program.env[%d];\n",i, i); }

1 0

Józef Kucia : wined3d: Get rid of compute_shader_init ().
by Alexandre Julliard 06 Nov '17

06 Nov '17

Module: wine Branch: master Commit: a1e158971c16da318bfd890e2b9e3979a1cf1d8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1e158971c16da318bfd890e2… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Nov 6 10:55:26 2017 +0100 wined3d: Get rid of compute_shader_init(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/shader.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 94ad145..0bad4fa 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -4066,12 +4066,6 @@ void pixelshader_update_resource_types(struct wined3d_shader *shader, WORD tex_t } } -static HRESULT compute_shader_init(struct wined3d_shader *shader, struct wined3d_device *device, - const struct wined3d_shader_desc *desc, void *parent, const struct wined3d_parent_ops *parent_ops) -{ - return shader_init(shader, device, desc, 0, WINED3D_SHADER_TYPE_COMPUTE, parent, parent_ops); -} - HRESULT CDECL wined3d_shader_create_cs(struct wined3d_device *device, const struct wined3d_shader_desc *desc, void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_shader **shader) { @@ -4084,7 +4078,7 @@ HRESULT CDECL wined3d_shader_create_cs(struct wined3d_device *device, const stru if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) return E_OUTOFMEMORY; - if (FAILED(hr = compute_shader_init(object, device, desc, parent, parent_ops))) + if (FAILED(hr = shader_init(object, device, desc, 0, WINED3D_SHADER_TYPE_COMPUTE, parent, parent_ops))) { WARN("Failed to initialize compute shader, hr %#x.\n", hr); HeapFree(GetProcessHeap(), 0, object);

1 0

Józef Kucia : wined3d: Get rid of domain_shader_init( ).
by Alexandre Julliard 06 Nov '17

06 Nov '17

Module: wine Branch: master Commit: 86933f9d31b1a1e187dfb1c554124d6d49066660 URL: http://source.winehq.org/git/wine.git/?a=commit;h=86933f9d31b1a1e187dfb1c55… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Nov 6 10:55:27 2017 +0100 wined3d: Get rid of domain_shader_init(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/shader.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 0bad4fa..6ba0fc4 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -3674,12 +3674,6 @@ static HRESULT vertex_shader_init(struct wined3d_shader *shader, struct wined3d_ return WINED3D_OK; } -static HRESULT domain_shader_init(struct wined3d_shader *shader, struct wined3d_device *device, - const struct wined3d_shader_desc *desc, void *parent, const struct wined3d_parent_ops *parent_ops) -{ - return shader_init(shader, device, desc, 0, WINED3D_SHADER_TYPE_DOMAIN, parent, parent_ops); -} - static HRESULT hull_shader_init(struct wined3d_shader *shader, struct wined3d_device *device, const struct wined3d_shader_desc *desc, void *parent, const struct wined3d_parent_ops *parent_ops) { @@ -4103,7 +4097,7 @@ HRESULT CDECL wined3d_shader_create_ds(struct wined3d_device *device, const stru if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) return E_OUTOFMEMORY; - if (FAILED(hr = domain_shader_init(object, device, desc, parent, parent_ops))) + if (FAILED(hr = shader_init(object, device, desc, 0, WINED3D_SHADER_TYPE_DOMAIN, parent, parent_ops))) { WARN("Failed to initialize domain shader, hr %#x.\n", hr); HeapFree(GetProcessHeap(), 0, object);

1 0

Józef Kucia : wined3d: Get rid of hull_shader_init().
by Alexandre Julliard 06 Nov '17

06 Nov '17

Module: wine Branch: master Commit: a063ca2e5b88fdde27a23ee5c1fce01fd6f03b11 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a063ca2e5b88fdde27a23ee5c… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Nov 6 10:55:28 2017 +0100 wined3d: Get rid of hull_shader_init(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/shader.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 6ba0fc4..3707d15 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -3674,12 +3674,6 @@ static HRESULT vertex_shader_init(struct wined3d_shader *shader, struct wined3d_ return WINED3D_OK; } -static HRESULT hull_shader_init(struct wined3d_shader *shader, struct wined3d_device *device, - const struct wined3d_shader_desc *desc, void *parent, const struct wined3d_parent_ops *parent_ops) -{ - return shader_init(shader, device, desc, 0, WINED3D_SHADER_TYPE_HULL, parent, parent_ops); -} - static HRESULT geometry_shader_init(struct wined3d_shader *shader, struct wined3d_device *device, const struct wined3d_shader_desc *desc, const struct wined3d_stream_output_desc *so_desc, void *parent, const struct wined3d_parent_ops *parent_ops) @@ -4148,7 +4142,7 @@ HRESULT CDECL wined3d_shader_create_hs(struct wined3d_device *device, const stru if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) return E_OUTOFMEMORY; - if (FAILED(hr = hull_shader_init(object, device, desc, parent, parent_ops))) + if (FAILED(hr = shader_init(object, device, desc, 0, WINED3D_SHADER_TYPE_HULL, parent, parent_ops))) { WARN("Failed to initialize hull shader, hr %#x.\n", hr); HeapFree(GetProcessHeap(), 0, object);

1 0

Nikolay Sivov : gdiplus/metafile: Implement playback for EmfPlusRecordTypeDrawArc.
by Alexandre Julliard 06 Nov '17

06 Nov '17

Module: wine Branch: master Commit: 2f2cbd415079a44afcac3c7904c11462f2f20190 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f2cbd415079a44afcac3c790… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 6 13:32:08 2017 +0300 gdiplus/metafile: Implement playback for EmfPlusRecordTypeDrawArc. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/metafile.c | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index f923a9b..c40097e 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -432,6 +432,18 @@ typedef struct EmfPlusDrawPath DWORD PenId; } EmfPlusDrawPath; +typedef struct EmfPlusDrawArc +{ + EmfPlusRecordHeader Header; + float StartAngle; + float SweepAngle; + union + { + EmfPlusRect rect; + EmfPlusRectF rectF; + } RectData; +} EmfPlusDrawArc; + typedef struct EmfPlusDrawPie { EmfPlusRecordHeader Header; @@ -3058,6 +3070,27 @@ GpStatus WINGDIPAPI GdipPlayMetafileRecord(GDIPCONST GpMetafile *metafile, return GdipDrawPath(real_metafile->playback_graphics, real_metafile->objtable[draw->PenId].u.pen, real_metafile->objtable[path].u.path); } + case EmfPlusRecordTypeDrawArc: + { + EmfPlusDrawArc *draw = (EmfPlusDrawArc *)header; + BYTE pen = flags & 0xff; + + if (pen >= EmfPlusObjectTableSize || real_metafile->objtable[pen].type != ObjectTypePen) + return InvalidParameter; + + if (dataSize != FIELD_OFFSET(EmfPlusDrawArc, RectData) - sizeof(EmfPlusRecordHeader) + + (flags & 0x4000 ? sizeof(EmfPlusRect) : sizeof(EmfPlusRectF))) + return InvalidParameter; + + if (flags & 0x4000) /* C */ + return GdipDrawArcI(real_metafile->playback_graphics, real_metafile->objtable[pen].u.pen, + draw->RectData.rect.X, draw->RectData.rect.Y, draw->RectData.rect.Width, + draw->RectData.rect.Height, draw->StartAngle, draw->SweepAngle); + else + return GdipDrawArc(real_metafile->playback_graphics, real_metafile->objtable[pen].u.pen, + draw->RectData.rectF.X, draw->RectData.rectF.Y, draw->RectData.rectF.Width, + draw->RectData.rectF.Height, draw->StartAngle, draw->SweepAngle); + } case EmfPlusRecordTypeDrawPie: { EmfPlusDrawPie *draw = (EmfPlusDrawPie *)header;

1 0

Nikolay Sivov : gdiplus/metafile: Implement playback for EmfPlusRecordTypeDrawEllipse.
by Alexandre Julliard 06 Nov '17

06 Nov '17

Module: wine Branch: master Commit: 3186df2b024b02eec4715d3f932903728af47156 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3186df2b024b02eec4715d3f9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 6 13:32:09 2017 +0300 gdiplus/metafile: Implement playback for EmfPlusRecordTypeDrawEllipse. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/metafile.c | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index c40097e..989ecd0 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -444,6 +444,16 @@ typedef struct EmfPlusDrawArc } RectData; } EmfPlusDrawArc; +typedef struct EmfPlusDrawEllipse +{ + EmfPlusRecordHeader Header; + union + { + EmfPlusRect rect; + EmfPlusRectF rectF; + } RectData; +} EmfPlusDrawEllipse; + typedef struct EmfPlusDrawPie { EmfPlusRecordHeader Header; @@ -3091,6 +3101,26 @@ GpStatus WINGDIPAPI GdipPlayMetafileRecord(GDIPCONST GpMetafile *metafile, draw->RectData.rectF.X, draw->RectData.rectF.Y, draw->RectData.rectF.Width, draw->RectData.rectF.Height, draw->StartAngle, draw->SweepAngle); } + case EmfPlusRecordTypeDrawEllipse: + { + EmfPlusDrawEllipse *draw = (EmfPlusDrawEllipse *)header; + BYTE pen = flags & 0xff; + + if (pen >= EmfPlusObjectTableSize || real_metafile->objtable[pen].type != ObjectTypePen) + return InvalidParameter; + + if (dataSize != (flags & 0x4000 ? sizeof(EmfPlusRect) : sizeof(EmfPlusRectF))) + return InvalidParameter; + + if (flags & 0x4000) /* C */ + return GdipDrawEllipseI(real_metafile->playback_graphics, real_metafile->objtable[pen].u.pen, + draw->RectData.rect.X, draw->RectData.rect.Y, draw->RectData.rect.Width, + draw->RectData.rect.Height); + else + return GdipDrawEllipse(real_metafile->playback_graphics, real_metafile->objtable[pen].u.pen, + draw->RectData.rectF.X, draw->RectData.rectF.Y, draw->RectData.rectF.Width, + draw->RectData.rectF.Height); + } case EmfPlusRecordTypeDrawPie: { EmfPlusDrawPie *draw = (EmfPlusDrawPie *)header;

1 0