November 2017 - Wine-Commits

Józef Kucia : wined3d: Require ARB_draw_indirect for SM5.
by Alexandre Julliard Nov. 3, 2017

Nov. 3, 2017

Module: wine Branch: master Commit: dbea9b3ef499b27d36314eb17a67331db36fc85d URL: http://source.winehq.org/git/wine.git/?a=commit;h=dbea9b3ef499b27d36314eb17… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Nov 3 14:35:19 2017 +0100 wined3d: Require ARB_draw_indirect for SM5. In order to disable feature level 11_0 when indirect draws are not supported. 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/glsl_shader.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 108bd18..6f75a7a 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -10704,6 +10704,7 @@ static unsigned int shader_glsl_get_shader_model(const struct wined3d_gl_info *g if (shader_model_4 && gl_info->supported[ARB_COMPUTE_SHADER] && gl_info->supported[ARB_DERIVATIVE_CONTROL] + && gl_info->supported[ARB_DRAW_INDIRECT] && gl_info->supported[ARB_GPU_SHADER5] && gl_info->supported[ARB_SHADER_ATOMIC_COUNTERS] && gl_info->supported[ARB_SHADER_IMAGE_LOAD_STORE]

1 0

Józef Kucia : d3d11/tests: Add test for indirect draws with index buffer offset.
by Alexandre Julliard Nov. 3, 2017

Nov. 3, 2017

Module: wine Branch: master Commit: 6d624b3d0fb0a3c4e64caf216b683002cebd11eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d624b3d0fb0a3c4e64caf216… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Nov 3 14:35:15 2017 +0100 d3d11/tests: Add test for indirect draws with index buffer offset. 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 | 37 +++++++++++++++++++++++++++++++++++-- 1 file changed, 35 insertions(+), 2 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 0d16cc3..900f489 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -9737,7 +9737,7 @@ static void test_instance_id(void) ID3D11DeviceContext_DrawInstanced(context, 4, 4, 0, 4); args_buffer = create_buffer_misc(device, 0, D3D11_RESOURCE_MISC_DRAWINDIRECT_ARGS, - sizeof(argument_data), &argument_data); + sizeof(argument_data), argument_data); ID3D11DeviceContext_DrawInstancedIndirect(context, args_buffer, 0); ID3D11DeviceContext_DrawInstancedIndirect(context, args_buffer, sizeof(*argument_data)); @@ -14436,8 +14436,8 @@ static void test_uint_shader_instructions(void) static void test_index_buffer_offset(void) { + ID3D11Buffer *vb, *ib, *so_buffer, *args_buffer; struct d3d11_test_context test_context; - ID3D11Buffer *vb, *ib, *so_buffer; ID3D11InputLayout *input_layout; ID3D11DeviceContext *context; struct resource_readback rb; @@ -14547,6 +14547,10 @@ static void test_index_buffer_offset(void) {-1.0f, -1.0f, 0.0f, 1.0f}, {1.0f}, }; static const struct vec4 broken_result = {0.0f, 0.0f, 0.0f, 1.0f}; + static const D3D11_DRAW_INDEXED_INSTANCED_INDIRECT_ARGS argument_data[] = + { + {4, 1, 0, 0, 0}, + }; if (!init_test_context(&test_context, &feature_level)) return; @@ -14603,7 +14607,36 @@ static void test_index_buffer_offset(void) } release_resource_readback(&rb); + /* indirect draws */ + args_buffer = create_buffer_misc(device, 0, D3D11_RESOURCE_MISC_DRAWINDIRECT_ARGS, + sizeof(argument_data), argument_data); + + offset = 0; + ID3D11DeviceContext_SOSetTargets(context, 1, &so_buffer, &offset); + + ID3D11DeviceContext_IASetIndexBuffer(context, ib, DXGI_FORMAT_R32_UINT, 0); + ID3D11DeviceContext_DrawIndexedInstancedIndirect(context, args_buffer, 0); + + ID3D11DeviceContext_IASetIndexBuffer(context, ib, DXGI_FORMAT_R32_UINT, 4 * sizeof(*indices)); + ID3D11DeviceContext_DrawIndexedInstancedIndirect(context, args_buffer, 0); + + ID3D11DeviceContext_IASetIndexBuffer(context, ib, DXGI_FORMAT_R32_UINT, 8 * sizeof(*indices)); + ID3D11DeviceContext_DrawIndexedInstancedIndirect(context, args_buffer, 0); + + get_buffer_readback(so_buffer, &rb); + for (i = 0; i < ARRAY_SIZE(expected_data); ++i) + { + data = get_readback_vec4(&rb, i, 0); + todo_wine_if(i >= 8 && i != 20 && i != 21) + ok(compare_vec4(data, &expected_data[i], 0) + || broken(is_nvidia_device(device) && !(i % 2) && compare_vec4(data, &broken_result, 0)), + "Got unexpected result {%.8e, %.8e, %.8e, %.8e} at %u.\n", + data->x, data->y, data->z, data->w, i); + } + release_resource_readback(&rb); + ID3D11Buffer_Release(so_buffer); + ID3D11Buffer_Release(args_buffer); ID3D11Buffer_Release(ib); ID3D11Buffer_Release(vb); ID3D11VertexShader_Release(vs);

1 0

Nikolay Sivov : gdiplus/metafile: Implement playback for EmfPlusRecordTypeFillEllipse.
by Alexandre Julliard Nov. 3, 2017

Nov. 3, 2017

Module: wine Branch: master Commit: f75b57ad81c4f352b68d2fc821383786d29f409c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f75b57ad81c4f352b68d2fc82… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Nov 3 09:49:13 2017 +0300 gdiplus/metafile: Implement playback for EmfPlusRecordTypeFillEllipse. 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 | 50 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index 614fc43..051f33e 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -465,6 +465,17 @@ typedef struct EmfPlusFillPath } data; } EmfPlusFillPath; +typedef struct EmfPlusFillEllipse +{ + EmfPlusRecordHeader Header; + DWORD BrushId; + union + { + EmfPlusRect rect; + EmfPlusRectF rectF; + } RectData; +} EmfPlusFillEllipse; + typedef struct EmfPlusFont { DWORD Version; @@ -2867,6 +2878,45 @@ GpStatus WINGDIPAPI GdipPlayMetafileRecord(GDIPCONST GpMetafile *metafile, GdipDeleteBrush((GpBrush *)solidfill); return stat; } + case EmfPlusRecordTypeFillEllipse: + { + EmfPlusFillEllipse *fill = (EmfPlusFillEllipse *)header; + GpSolidFill *solidfill = NULL; + GpBrush *brush; + + if (dataSize <= FIELD_OFFSET(EmfPlusFillEllipse, RectData) - sizeof(EmfPlusRecordHeader)) + return InvalidParameter; + dataSize -= FIELD_OFFSET(EmfPlusFillEllipse, RectData) - sizeof(EmfPlusRecordHeader); + + if (dataSize != (flags & 0x4000 ? sizeof(EmfPlusRect) : sizeof(EmfPlusRectF))) + return InvalidParameter; + + if (flags & 0x8000) + { + stat = GdipCreateSolidFill(fill->BrushId, (GpSolidFill **)&solidfill); + if (stat != Ok) + return stat; + brush = (GpBrush *)solidfill; + } + else + { + if (fill->BrushId >= EmfPlusObjectTableSize || + real_metafile->objtable[fill->BrushId].type != ObjectTypeBrush) + return InvalidParameter; + + brush = real_metafile->objtable[fill->BrushId].u.brush; + } + + if (flags & 0x4000) + stat = GdipFillEllipseI(real_metafile->playback_graphics, brush, fill->RectData.rect.X, + fill->RectData.rect.Y, fill->RectData.rect.Width, fill->RectData.rect.Height); + else + stat = GdipFillEllipse(real_metafile->playback_graphics, brush, fill->RectData.rectF.X, + fill->RectData.rectF.Y, fill->RectData.rectF.Width, fill->RectData.rectF.Height); + + GdipDeleteBrush((GpBrush *)solidfill); + return stat; + } case EmfPlusRecordTypeDrawPath: { EmfPlusDrawPath *draw = (EmfPlusDrawPath *)header;

1 0

Nikolay Sivov : gdiplus/metafile: Implement playback for EmfPlusRecordTypeDrawRects.
by Alexandre Julliard Nov. 3, 2017

Nov. 3, 2017

Module: wine Branch: master Commit: e934c4c06fee9de9cca8d053632cc5301e496f5a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e934c4c06fee9de9cca8d0536… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Nov 3 09:49:12 2017 +0300 gdiplus/metafile: Implement playback for EmfPlusRecordTypeDrawRects. 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 | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index c5c72e2..614fc43 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -444,6 +444,17 @@ typedef struct EmfPlusDrawPie } RectData; } EmfPlusDrawPie; +typedef struct EmfPlusDrawRects +{ + EmfPlusRecordHeader Header; + DWORD Count; + union + { + EmfPlusRect rect[1]; + EmfPlusRectF rectF[1]; + } RectData; +} EmfPlusDrawRects; + typedef struct EmfPlusFillPath { EmfPlusRecordHeader Header; @@ -2895,6 +2906,44 @@ 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 EmfPlusRecordTypeDrawRects: + { + EmfPlusDrawRects *draw = (EmfPlusDrawRects *)header; + BYTE pen = flags & 0xff; + GpRectF *rects = NULL; + + if (pen >= EmfPlusObjectTableSize || real_metafile->objtable[pen].type != ObjectTypePen) + return InvalidParameter; + + if (dataSize <= FIELD_OFFSET(EmfPlusDrawRects, RectData) - sizeof(EmfPlusRecordHeader)) + return InvalidParameter; + dataSize -= FIELD_OFFSET(EmfPlusDrawRects, RectData) - sizeof(EmfPlusRecordHeader); + + if (dataSize != draw->Count * (flags & 0x4000 ? sizeof(EmfPlusRect) : sizeof(EmfPlusRectF))) + return InvalidParameter; + + if (flags & 0x4000) + { + DWORD i; + + rects = GdipAlloc(draw->Count * sizeof(*rects)); + if (!rects) + return OutOfMemory; + + for (i = 0; i < draw->Count; i++) + { + rects[i].X = draw->RectData.rect[i].X; + rects[i].Y = draw->RectData.rect[i].Y; + rects[i].Width = draw->RectData.rect[i].Width; + rects[i].Height = draw->RectData.rect[i].Height; + } + } + + stat = GdipDrawRectangles(real_metafile->playback_graphics, real_metafile->objtable[pen].u.pen, + rects ? rects : (GpRectF *)draw->RectData.rectF, draw->Count); + GdipFree(rects); + return stat; + } default: FIXME("Not implemented for record type %x\n", recordType); return NotImplemented;

1 0

Michael Müller : advapi32: Added a stub for LsaLookupPrivilegeDisplayName().
by Alexandre Julliard Nov. 3, 2017

Nov. 3, 2017

Module: wine Branch: master Commit: badcabc18855efac19ad3a08d3b4fae22486bbee URL: http://source.winehq.org/git/wine.git/?a=commit;h=badcabc18855efac19ad3a08d… Author: Michael Müller <michael(a)fds-team.de> Date: Thu Nov 2 23:56:20 2017 +0300 advapi32: Added a stub for LsaLookupPrivilegeDisplayName(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/advapi32.spec | 2 +- dlls/advapi32/lsa.c | 18 ++++++++++++++++++ include/ntlsa.h | 2 ++ 3 files changed, 21 insertions(+), 1 deletion(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index 709a385..359efc9 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -468,7 +468,7 @@ # @ stub LsaICLookupSidsWithCreds @ stdcall LsaLookupNames(long long ptr ptr ptr) @ stdcall LsaLookupNames2(ptr long long ptr ptr ptr) -@ stub LsaLookupPrivilegeDisplayName +@ stdcall LsaLookupPrivilegeDisplayName(long ptr ptr ptr) @ stdcall LsaLookupPrivilegeName(long ptr ptr) # @ stub LsaLookupPrivilegeValue @ stdcall LsaLookupSids(ptr long ptr ptr ptr) diff --git a/dlls/advapi32/lsa.c b/dlls/advapi32/lsa.c index 42da4b4..bfd879b 100644 --- a/dlls/advapi32/lsa.c +++ b/dlls/advapi32/lsa.c @@ -44,6 +44,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(advapi); return FailureCode; \ } +static LPCSTR debugstr_us( const UNICODE_STRING *us ) +{ + if (!us) return "(null)"; + return debugstr_wn(us->Buffer, us->Length / sizeof(WCHAR)); +} + static void dumpLsaAttributes(const LSA_OBJECT_ATTRIBUTES *oa) { if (oa) @@ -1006,3 +1012,15 @@ NTSTATUS WINAPI LsaLookupPrivilegeName(LSA_HANDLE handle, LUID *luid, LSA_UNICOD return STATUS_SUCCESS; } + +/****************************************************************************** + * LsaLookupPrivilegeDisplayName [ADVAPI32.@] + * + */ +NTSTATUS WINAPI LsaLookupPrivilegeDisplayName(LSA_HANDLE handle, LSA_UNICODE_STRING *name, + LSA_UNICODE_STRING **display_name, SHORT *language) +{ + FIXME("(%p, %s, %p, %p)\n", handle, debugstr_us(name), display_name, language); + + return STATUS_NO_SUCH_PRIVILEGE; +} diff --git a/include/ntlsa.h b/include/ntlsa.h index 468c14e..ca864f6 100644 --- a/include/ntlsa.h +++ b/include/ntlsa.h @@ -16,4 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +NTSTATUS WINAPI LsaLookupPrivilegeDisplayName(LSA_HANDLE policy, LSA_UNICODE_STRING *name, + LSA_UNICODE_STRING **display_name, SHORT *language); NTSTATUS WINAPI LsaLookupPrivilegeName(LSA_HANDLE policy, LUID *value, LSA_UNICODE_STRING **name);

1 0

Nikolay Sivov : advapi32: Partially implement LsaLookupPrivilegeName().
by Alexandre Julliard Nov. 3, 2017

Nov. 3, 2017

Module: wine Branch: master Commit: 2c8427e0dc59edcbafc3d664d92f04063c69c30c URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c8427e0dc59edcbafc3d664d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 2 23:56:19 2017 +0300 advapi32: Partially implement LsaLookupPrivilegeName(). Based on patch by Michael Müller. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/advapi32_misc.h | 1 + dlls/advapi32/lsa.c | 32 ++++++++++++++++++++++++++------ dlls/advapi32/security.c | 9 +++++++++ dlls/advapi32/tests/lsa.c | 36 ++++++++++++++++++++++++++++++++++++ include/Makefile.in | 1 + include/ntlsa.h | 19 +++++++++++++++++++ 6 files changed, 92 insertions(+), 6 deletions(-) diff --git a/dlls/advapi32/advapi32_misc.h b/dlls/advapi32/advapi32_misc.h index d116ecb..7fc02a4 100644 --- a/dlls/advapi32/advapi32_misc.h +++ b/dlls/advapi32/advapi32_misc.h @@ -34,6 +34,7 @@ WCHAR *SERV_dup(const char *str) DECLSPEC_HIDDEN; DWORD SERV_OpenSCManagerW(LPCWSTR, LPCWSTR, DWORD, SC_HANDLE*) DECLSPEC_HIDDEN; DWORD SERV_OpenServiceW(SC_HANDLE, LPCWSTR, DWORD, SC_HANDLE*) DECLSPEC_HIDDEN; NTSTATUS SERV_QueryServiceObjectSecurity(SC_HANDLE, SECURITY_INFORMATION, PSECURITY_DESCRIPTOR, DWORD, LPDWORD) DECLSPEC_HIDDEN; +const WCHAR *get_wellknown_privilege_name(const LUID *) DECLSPEC_HIDDEN; /* memory allocation functions */ diff --git a/dlls/advapi32/lsa.c b/dlls/advapi32/lsa.c index a9ec9e4..42da4b4 100644 --- a/dlls/advapi32/lsa.c +++ b/dlls/advapi32/lsa.c @@ -978,11 +978,31 @@ NTSTATUS WINAPI LsaUnregisterPolicyChangeNotification( * LsaLookupPrivilegeName [ADVAPI32.@] * */ -NTSTATUS WINAPI LsaLookupPrivilegeName( - LSA_HANDLE handle, - LUID *luid, - UNICODE_STRING **name) +NTSTATUS WINAPI LsaLookupPrivilegeName(LSA_HANDLE handle, LUID *luid, LSA_UNICODE_STRING **name) { - FIXME("(%p,%p,%p) stub\n", handle, luid, name); - return STATUS_NO_SUCH_PRIVILEGE; + const WCHAR *privnameW; + DWORD length; + WCHAR *strW; + + TRACE("(%p,%p,%p)\n", handle, luid, name); + + if (!luid || !handle) + return STATUS_INVALID_PARAMETER; + + *name = NULL; + + if (!(privnameW = get_wellknown_privilege_name(luid))) + return STATUS_NO_SUCH_PRIVILEGE; + + length = strlenW(privnameW); + *name = heap_alloc(sizeof(**name) + (length + 1) * sizeof(WCHAR)); + if (!*name) + return STATUS_NO_MEMORY; + + strW = (WCHAR *)(*name + 1); + memcpy(strW, privnameW, length * sizeof(WCHAR)); + strW[length] = 0; + RtlInitUnicodeString(*name, strW); + + return STATUS_SUCCESS; } diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index e36792c..c9d5cfa 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -1875,6 +1875,15 @@ static const WCHAR * const WellKnownPrivNames[SE_MAX_WELL_KNOWN_PRIVILEGE + 1] = SE_CREATE_GLOBAL_NAME_W, }; +const WCHAR *get_wellknown_privilege_name(const LUID *luid) +{ + if (luid->HighPart || luid->LowPart < SE_MIN_WELL_KNOWN_PRIVILEGE || + luid->LowPart > SE_MAX_WELL_KNOWN_PRIVILEGE || !WellKnownPrivNames[luid->LowPart]) + return NULL; + + return WellKnownPrivNames[luid->LowPart]; +} + /****************************************************************************** * LookupPrivilegeValueW [ADVAPI32.@] * diff --git a/dlls/advapi32/tests/lsa.c b/dlls/advapi32/tests/lsa.c index a06c8af..861fea0 100644 --- a/dlls/advapi32/tests/lsa.c +++ b/dlls/advapi32/tests/lsa.c @@ -32,6 +32,8 @@ #include "objbase.h" #include "initguid.h" #include "wine/test.h" +#include "winternl.h" +#include "ntlsa.h" DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); @@ -391,9 +393,43 @@ static void test_LsaLookupSids(void) ok(status == STATUS_SUCCESS, "got 0x%08x\n", status); } +static void test_LsaLookupPrivilegeName(void) +{ + LSA_OBJECT_ATTRIBUTES attrs; + LSA_UNICODE_STRING *name; + LSA_HANDLE policy; + NTSTATUS status; + LUID luid; + + memset(&attrs, 0, sizeof(attrs)); + attrs.Length = sizeof(attrs); + + status = LsaOpenPolicy(NULL, &attrs, POLICY_LOOKUP_NAMES, &policy); + ok(status == STATUS_SUCCESS, "Failed to open policy, %#x.\n", status); + + name = (void *)0xdeadbeef; + status = LsaLookupPrivilegeName(policy, NULL, &name); + ok(status != STATUS_SUCCESS, "Unexpected status %#x.\n", status); + ok(name == (void *)0xdeadbeef, "Unexpected name pointer.\n"); + + name = (void *)0xdeadbeef; + luid.HighPart = 1; + luid.LowPart = SE_CREATE_TOKEN_PRIVILEGE; + status = LsaLookupPrivilegeName(policy, &luid, &name); + ok(status == STATUS_NO_SUCH_PRIVILEGE, "Unexpected status %#x.\n", status); + ok(name == NULL, "Unexpected name pointer.\n"); + + luid.HighPart = 0; + luid.LowPart = SE_CREATE_TOKEN_PRIVILEGE; + status = LsaLookupPrivilegeName(policy, &luid, &name); + ok(status == 0, "got %#x.\n", status); + LsaFreeMemory(name); +} + START_TEST(lsa) { test_lsa(); test_LsaLookupNames2(); test_LsaLookupSids(); + test_LsaLookupPrivilegeName(); } diff --git a/include/Makefile.in b/include/Makefile.in index 025fe77..cc42f66 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -550,6 +550,7 @@ HEADER_SRCS = \ ntddstor.h \ ntdef.h \ ntdsapi.h \ + ntlsa.h \ ntquery.h \ ntsecapi.h \ ntsecpkg.h \ diff --git a/include/ntlsa.h b/include/ntlsa.h new file mode 100644 index 0000000..468c14e --- /dev/null +++ b/include/ntlsa.h @@ -0,0 +1,19 @@ +/* + * Copyright 2017 Nikolay Sivov + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +NTSTATUS WINAPI LsaLookupPrivilegeName(LSA_HANDLE policy, LUID *value, LSA_UNICODE_STRING **name);

1 0

Andrey Gusev : usp10: Remove worthless check.
by Alexandre Julliard Nov. 3, 2017

Nov. 3, 2017

Module: wine Branch: master Commit: f6ad192cd220278a17fa840ba4e062ff1e39f02d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6ad192cd220278a17fa840ba… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Thu Nov 2 18:22:36 2017 +0200 usp10: Remove worthless check. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/usp10.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 59abbad..5d257b2 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -3028,9 +3028,6 @@ HRESULT WINAPI ScriptIsComplex(const WCHAR *chars, int len, DWORD flag) for (i = 0; i < len; i+=consumed) { - if (i >= len) - break; - if ((flag & SIC_ASCIIDIGIT) && chars[i] >= 0x30 && chars[i] <= 0x39) return S_OK;

1 0

Nikolay Sivov : gdiplus/metafile: Add brush object if needed in FillRectangles().
by Alexandre Julliard Nov. 3, 2017

Nov. 3, 2017

Module: wine Branch: master Commit: fd8185132ee15873bb15404d8fcfcc699dd32879 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd8185132ee15873bb15404d8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Nov 3 09:49:15 2017 +0300 gdiplus/metafile: Add brush object if needed in FillRectangles(). 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 | 141 ++++++++++++++++++++++++------------------------ 1 file changed, 71 insertions(+), 70 deletions(-) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index 3a9c8a8..f923a9b 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -931,6 +931,74 @@ static BOOL is_integer_rect(const GpRectF *rect) return TRUE; } +static GpStatus METAFILE_PrepareBrushData(GpBrush *brush, DWORD *size) +{ + switch (brush->bt) + { + case BrushTypeSolidColor: + *size = FIELD_OFFSET(EmfPlusBrush, BrushData) + sizeof(EmfPlusSolidBrushData); + break; + case BrushTypeHatchFill: + *size = FIELD_OFFSET(EmfPlusBrush, BrushData) + sizeof(EmfPlusHatchBrushData); + break; + default: + FIXME("unsupported brush type: %d\n", brush->bt); + return NotImplemented; + } + + return Ok; +} + +static void METAFILE_FillBrushData(GpBrush *brush, EmfPlusBrush *data) +{ + data->Version = VERSION_MAGIC2; + data->Type = brush->bt; + + switch (brush->bt) + { + case BrushTypeSolidColor: + { + GpSolidFill *solid = (GpSolidFill *)brush; + data->BrushData.solid.SolidColor = solid->color; + break; + } + case BrushTypeHatchFill: + { + GpHatch *hatch = (GpHatch *)brush; + data->BrushData.hatch.HatchStyle = hatch->hatchstyle; + data->BrushData.hatch.ForeColor = hatch->forecol; + data->BrushData.hatch.BackColor = hatch->backcol; + break; + } + default: + FIXME("unsupported brush type: %d\n", brush->bt); + } +} + +static GpStatus METAFILE_AddBrushObject(GpMetafile *metafile, GpBrush *brush, DWORD *id) +{ + EmfPlusObject *object_record; + GpStatus stat; + DWORD size; + + *id = -1; + if (metafile->metafile_type != MetafileTypeEmfPlusOnly && metafile->metafile_type != MetafileTypeEmfPlusDual) + return Ok; + + stat = METAFILE_PrepareBrushData(brush, &size); + if (stat != Ok) return stat; + + stat = METAFILE_AllocateRecord(metafile, + FIELD_OFFSET(EmfPlusObject, ObjectData) + size, (void**)&object_record); + if (stat != Ok) return stat; + + *id = METAFILE_AddObjectId(metafile); + object_record->Header.Type = EmfPlusRecordTypeObject; + object_record->Header.Flags = *id | ObjectTypeBrush << 8; + METAFILE_FillBrushData(brush, &object_record->ObjectData.brush); + return Ok; +} + GpStatus METAFILE_FillRectangles(GpMetafile* metafile, GpBrush* brush, GDIPCONST GpRectF* rects, INT count) { @@ -950,8 +1018,9 @@ GpStatus METAFILE_FillRectangles(GpMetafile* metafile, GpBrush* brush, } else { - FIXME("brush serialization not implemented\n"); - return NotImplemented; + stat = METAFILE_AddBrushObject(metafile, brush, &brushid); + if (stat != Ok) + return stat; } for (i=0; i<count; i++) @@ -3989,50 +4058,6 @@ static GpStatus METAFILE_AddPathObject(GpMetafile *metafile, GpPath *path, DWORD return Ok; } -static GpStatus METAFILE_PrepareBrushData(GpBrush *brush, DWORD *size) -{ - switch (brush->bt) - { - case BrushTypeSolidColor: - *size = FIELD_OFFSET(EmfPlusBrush, BrushData) + sizeof(EmfPlusSolidBrushData); - break; - case BrushTypeHatchFill: - *size = FIELD_OFFSET(EmfPlusBrush, BrushData) + sizeof(EmfPlusHatchBrushData); - break; - default: - FIXME("unsupported brush type: %d\n", brush->bt); - return NotImplemented; - } - - return Ok; -} - -static void METAFILE_FillBrushData(GpBrush *brush, EmfPlusBrush *data) -{ - data->Version = VERSION_MAGIC2; - data->Type = brush->bt; - - switch (brush->bt) - { - case BrushTypeSolidColor: - { - GpSolidFill *solid = (GpSolidFill *)brush; - data->BrushData.solid.SolidColor = solid->color; - break; - } - case BrushTypeHatchFill: - { - GpHatch *hatch = (GpHatch *)brush; - data->BrushData.hatch.HatchStyle = hatch->hatchstyle; - data->BrushData.hatch.ForeColor = hatch->forecol; - data->BrushData.hatch.BackColor = hatch->backcol; - break; - } - default: - FIXME("unsupported brush type: %d\n", brush->bt); - } -} - static GpStatus METAFILE_AddPenObject(GpMetafile *metafile, GpPen *pen, DWORD *id) { DWORD i, data_flags, pen_data_size, brush_size; @@ -4228,30 +4253,6 @@ GpStatus METAFILE_DrawPath(GpMetafile *metafile, GpPen *pen, GpPath *path) return Ok; } -static GpStatus METAFILE_AddBrushObject(GpMetafile *metafile, GpBrush *brush, DWORD *id) -{ - EmfPlusObject *object_record; - GpStatus stat; - DWORD size; - - *id = -1; - if (metafile->metafile_type != MetafileTypeEmfPlusOnly && metafile->metafile_type != MetafileTypeEmfPlusDual) - return Ok; - - stat = METAFILE_PrepareBrushData(brush, &size); - if (stat != Ok) return stat; - - stat = METAFILE_AllocateRecord(metafile, - FIELD_OFFSET(EmfPlusObject, ObjectData) + size, (void**)&object_record); - if (stat != Ok) return stat; - - *id = METAFILE_AddObjectId(metafile); - object_record->Header.Type = EmfPlusRecordTypeObject; - object_record->Header.Flags = *id | ObjectTypeBrush << 8; - METAFILE_FillBrushData(brush, &object_record->ObjectData.brush); - return Ok; -} - GpStatus METAFILE_FillPath(GpMetafile *metafile, GpBrush *brush, GpPath *path) { EmfPlusFillPath *fill_path_record;

1 0

Nikolay Sivov : gdiplus/metafile: Implement playback for EmfPlusRecordTypeFillPie.
by Alexandre Julliard Nov. 3, 2017

Nov. 3, 2017

Module: wine Branch: master Commit: 9c47baa3fcf132203eb87832cfe92cf48270ece1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c47baa3fcf132203eb87832c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Nov 3 09:49:14 2017 +0300 gdiplus/metafile: Implement playback for EmfPlusRecordTypeFillPie. 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 | 54 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index 051f33e..3a9c8a8 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -476,6 +476,19 @@ typedef struct EmfPlusFillEllipse } RectData; } EmfPlusFillEllipse; +typedef struct EmfPlusFillPie +{ + EmfPlusRecordHeader Header; + DWORD BrushId; + float StartAngle; + float SweepAngle; + union + { + EmfPlusRect rect; + EmfPlusRectF rectF; + } RectData; +} EmfPlusFillPie; + typedef struct EmfPlusFont { DWORD Version; @@ -2917,6 +2930,47 @@ GpStatus WINGDIPAPI GdipPlayMetafileRecord(GDIPCONST GpMetafile *metafile, GdipDeleteBrush((GpBrush *)solidfill); return stat; } + case EmfPlusRecordTypeFillPie: + { + EmfPlusFillPie *fill = (EmfPlusFillPie *)header; + GpSolidFill *solidfill = NULL; + GpBrush *brush; + + if (dataSize <= FIELD_OFFSET(EmfPlusFillPie, RectData) - sizeof(EmfPlusRecordHeader)) + return InvalidParameter; + dataSize -= FIELD_OFFSET(EmfPlusFillPie, RectData) - sizeof(EmfPlusRecordHeader); + + if (dataSize != (flags & 0x4000 ? sizeof(EmfPlusRect) : sizeof(EmfPlusRectF))) + return InvalidParameter; + + if (flags & 0x8000) /* S */ + { + stat = GdipCreateSolidFill(fill->BrushId, (GpSolidFill **)&solidfill); + if (stat != Ok) + return stat; + brush = (GpBrush *)solidfill; + } + else + { + if (fill->BrushId >= EmfPlusObjectTableSize || + real_metafile->objtable[fill->BrushId].type != ObjectTypeBrush) + return InvalidParameter; + + brush = real_metafile->objtable[fill->BrushId].u.brush; + } + + if (flags & 0x4000) /* C */ + stat = GdipFillPieI(real_metafile->playback_graphics, brush, fill->RectData.rect.X, + fill->RectData.rect.Y, fill->RectData.rect.Width, fill->RectData.rect.Height, + fill->StartAngle, fill->SweepAngle); + else + stat = GdipFillPie(real_metafile->playback_graphics, brush, fill->RectData.rectF.X, + fill->RectData.rectF.Y, fill->RectData.rectF.Width, fill->RectData.rectF.Height, + fill->StartAngle, fill->SweepAngle); + + GdipDeleteBrush((GpBrush *)solidfill); + return stat; + } case EmfPlusRecordTypeDrawPath: { EmfPlusDrawPath *draw = (EmfPlusDrawPath *)header;

1 0

Andrey Gusev : iphlpapi: Change variable type.
by Alexandre Julliard Nov. 3, 2017

Nov. 3, 2017

Module: wine Branch: master Commit: 62b5d6b110786aac2692fe096b8b995ecec29ce5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=62b5d6b110786aac2692fe096… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Thu Nov 2 19:34:48 2017 +0200 iphlpapi: Change variable type. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/ipstats.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/iphlpapi/ipstats.c b/dlls/iphlpapi/ipstats.c index 47df7eb..327a601 100644 --- a/dlls/iphlpapi/ipstats.c +++ b/dlls/iphlpapi/ipstats.c @@ -2051,11 +2051,11 @@ static unsigned int find_owning_pid( struct pid_map *map, unsigned int num_entri #elif defined(HAVE_PROC_PIDINFO) struct proc_fdinfo *fds; struct socket_fdinfo sock; - unsigned int i, j, n, fd_len; + unsigned int i, j, n; for (i = 0; i < num_entries; i++) { - fd_len = proc_pidinfo( map[i].unix_pid, PROC_PIDLISTFDS, 0, NULL, 0 ); + int fd_len = proc_pidinfo( map[i].unix_pid, PROC_PIDLISTFDS, 0, NULL, 0 ); if (fd_len <= 0) continue; fds = HeapAlloc( GetProcessHeap(), 0, fd_len );

1 0