November 2017 - Wine-commits

Józef Kucia : wined3d: Require ARB_draw_indirect for SM5.
by Alexandre Julliard 03 Nov '17

03 Nov '17

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 : wined3d: Disable ARB_draw_indirect if ARB_base_instance is not available.
by Alexandre Julliard 03 Nov '17

03 Nov '17

Module: wine Branch: master Commit: 2c51fc1bfc1d551aebb47616c19d3329c5e0f7f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c51fc1bfc1d551aebb47616c… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Nov 3 14:35:20 2017 +0100 wined3d: Disable ARB_draw_indirect if ARB_base_instance is not available. Avoids undefined behavior. 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/directx.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index c89d556..ee04b12 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -4211,9 +4211,17 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, if (gl_info->supported[ARB_TEXTURE_STORAGE] && gl_info->supported[APPLE_YCBCR_422]) { /* AFAIK APPLE_ycbcr_422 is only available in legacy contexts so we shouldn't ever hit this. */ - FIXME("Disabling APPLE_ycbcr_422 because of ARB_texture_storage.\n"); + ERR("Disabling APPLE_ycbcr_422 because of ARB_texture_storage.\n"); gl_info->supported[APPLE_YCBCR_422] = FALSE; } + if (gl_info->supported[ARB_DRAW_INDIRECT] && !gl_info->supported[ARB_BASE_INSTANCE]) + { + /* If ARB_base_instance is not supported the baseInstance field + * in indirect draw parameters must be 0 or behavior is undefined. + */ + WARN("Disabling ARB_draw_indirect because ARB_base_instance is not supported.\n"); + gl_info->supported[ARB_DRAW_INDIRECT] = FALSE; + } wined3d_adapter_init_limits(gl_info);

1 0

Nikolay Sivov : advapi32/tests: Remove dynamic function binding from LSA tests.
by Alexandre Julliard 03 Nov '17

03 Nov '17

Module: wine Branch: master Commit: 90f94eae1d004550bdb1b39540f149976c847a2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=90f94eae1d004550bdb1b3954… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 2 23:56:17 2017 +0300 advapi32/tests: Remove dynamic function binding from LSA tests. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/lsa.c | 136 +++++++++++++++------------------------------- 1 file changed, 45 insertions(+), 91 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=90f94eae1d004550bdb1b…

1 0

Nikolay Sivov : advapi32/tests: Merge some test code.
by Alexandre Julliard 03 Nov '17

03 Nov '17

Module: wine Branch: master Commit: 7112b60c833391680e4f90f685ea90d322c4eeb4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7112b60c833391680e4f90f68… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 2 23:56:18 2017 +0300 advapi32/tests: Merge some test code. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/lsa.c | 22 +--------------------- 1 file changed, 1 insertion(+), 21 deletions(-) diff --git a/dlls/advapi32/tests/lsa.c b/dlls/advapi32/tests/lsa.c index 81bcf21..a06c8af 100644 --- a/dlls/advapi32/tests/lsa.c +++ b/dlls/advapi32/tests/lsa.c @@ -328,6 +328,7 @@ static void test_LsaLookupSids(void) HANDLE token; DWORD size; BOOL ret; + PSID sid; memset(&attrs, 0, sizeof(attrs)); attrs.Length = sizeof(attrs); @@ -364,26 +365,6 @@ static void test_LsaLookupSids(void) CloseHandle(token); - status = LsaClose(policy); - ok(status == STATUS_SUCCESS, "got 0x%08x\n", status); -} - -static void test_LsaLookupSids_NullBuffers(void) -{ - LSA_REFERENCED_DOMAIN_LIST *list; - LSA_OBJECT_ATTRIBUTES attrs; - LSA_TRANSLATED_NAME *names; - LSA_HANDLE policy; - NTSTATUS status; - BOOL ret; - PSID sid; - - memset(&attrs, 0, sizeof(attrs)); - attrs.Length = sizeof(attrs); - - status = LsaOpenPolicy(NULL, &attrs, POLICY_LOOKUP_NAMES, &policy); - ok(status == STATUS_SUCCESS, "got 0x%08x\n", status); - ret = ConvertStringSidToSidA("S-1-1-0", &sid); ok(ret == TRUE, "ConvertStringSidToSidA returned false\n"); @@ -415,5 +396,4 @@ START_TEST(lsa) test_lsa(); test_LsaLookupNames2(); test_LsaLookupSids(); - test_LsaLookupSids_NullBuffers(); }

1 0

Nikolay Sivov : advapi32: Partially implement LsaLookupPrivilegeName().
by Alexandre Julliard 03 Nov '17

03 Nov '17

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

Michael Müller : advapi32: Added a stub for LsaLookupPrivilegeDisplayName().
by Alexandre Julliard 03 Nov '17

03 Nov '17

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

Piotr Caban : hhctrl.ocx: Set window owner in HtmlHelp function if WS_CHILD flag is not specified.
by Alexandre Julliard 03 Nov '17

03 Nov '17

Module: wine Branch: master Commit: ace66d3540d7d3d93344545a91143e02fcbda91a URL: http://source.winehq.org/git/wine.git/?a=commit;h=ace66d3540d7d3d93344545a9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Nov 2 19:39:05 2017 +0100 hhctrl.ocx: Set window owner in HtmlHelp function if WS_CHILD flag is not specified. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hhctrl.ocx/help.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/hhctrl.ocx/help.c b/dlls/hhctrl.ocx/help.c index 5fd7634..c7a2a7a 100644 --- a/dlls/hhctrl.ocx/help.c +++ b/dlls/hhctrl.ocx/help.c @@ -1603,7 +1603,7 @@ static LRESULT CALLBACK Help_WndProc(HWND hWnd, UINT message, WPARAM wParam, LPA static BOOL HH_CreateHelpWindow(HHInfo *info) { - HWND hWnd, parent = 0; + HWND hWnd; RECT winPos = info->WinType.rcWindowPos; WNDCLASSEXW wcex; DWORD dwStyles, dwExStyles; @@ -1677,11 +1677,8 @@ static BOOL HH_CreateHelpWindow(HHInfo *info) caption = info->WinType.pszCaption; if (!*caption) caption = info->pCHMInfo->defTitle; - if (info->WinType.dwStyles & WS_CHILD) - parent = info->WinType.hwndCaller; - - hWnd = CreateWindowExW(dwExStyles, windowClassW, caption, - dwStyles, x, y, width, height, parent, NULL, hhctrl_hinstance, NULL); + hWnd = CreateWindowExW(dwExStyles, windowClassW, caption, dwStyles, x, y, width, height, + info->WinType.hwndCaller, NULL, hhctrl_hinstance, NULL); if (!hWnd) return FALSE;

1 0

Andrey Gusev : iphlpapi: Change variable type.
by Alexandre Julliard 03 Nov '17

03 Nov '17

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

Nikolay Sivov : gdiplus/metafile: Implement EmfPlusRecordTypeDrawPie playback.
by Alexandre Julliard 03 Nov '17

03 Nov '17

Module: wine Branch: master Commit: 6931e629cd0624daaa0a103307cd7390c1c95a63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6931e629cd0624daaa0a10330… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Nov 3 09:49:11 2017 +0300 gdiplus/metafile: Implement EmfPlusRecordTypeDrawPie playback. 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 9beb3a3..c5c72e2 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -432,6 +432,18 @@ typedef struct EmfPlusDrawPath DWORD PenId; } EmfPlusDrawPath; +typedef struct EmfPlusDrawPie +{ + EmfPlusRecordHeader Header; + float StartAngle; + float SweepAngle; + union + { + EmfPlusRect rect; + EmfPlusRectF rectF; + } RectData; +} EmfPlusDrawPie; + typedef struct EmfPlusFillPath { EmfPlusRecordHeader Header; @@ -2862,6 +2874,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 EmfPlusRecordTypeDrawPie: + { + EmfPlusDrawPie *draw = (EmfPlusDrawPie *)header; + BYTE pen = flags & 0xff; + + if (pen >= EmfPlusObjectTableSize || real_metafile->objtable[pen].type != ObjectTypePen) + return InvalidParameter; + + if (dataSize != FIELD_OFFSET(EmfPlusDrawPie, RectData) - sizeof(EmfPlusRecordHeader) + + (flags & 0x4000 ? sizeof(EmfPlusRect) : sizeof(EmfPlusRectF))) + return InvalidParameter; + + if (flags & 0x4000) /* C */ + return GdipDrawPieI(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 GdipDrawPie(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); + } default: FIXME("Not implemented for record type %x\n", recordType); return NotImplemented;

1 0

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

03 Nov '17

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