September 2018 - Wine-Commits

Nikolay Sivov : opcservices: Partially implement content stream for package parts.
by Alexandre Julliard Sept. 12, 2018

Sept. 12, 2018

Module: wine Branch: master Commit: 9b11e371bb5a212c51b9e47772b6d3083be0c039 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9b11e371bb5a212c51b9e477… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Sep 12 16:26:14 2018 +0300 opcservices: Partially implement content stream for package parts. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opcservices/factory.c | 2 +- dlls/opcservices/package.c | 272 ++++++++++++++++++++++++++++++++++- dlls/opcservices/tests/opcservices.c | 35 +++++ 3 files changed, 306 insertions(+), 3 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9b11e371bb5a212c51b9…

1 0

Gijs Vermeulen : include: Add virtdisk.h.
by Alexandre Julliard Sept. 12, 2018

Sept. 12, 2018

Module: wine Branch: master Commit: c8389ae103cc5777de899b8ab289a169345d7e8e URL: https://source.winehq.org/git/wine.git/?a=commit;h=c8389ae103cc5777de899b8a… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Mon Sep 10 03:32:24 2018 +0200 include: Add virtdisk.h. Based on a patch by Louis Lenders. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/virtdisk.h | 205 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 206 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index ffecb98..74dc293 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -637,6 +637,7 @@ SOURCES = \ verrsrc.h \ vfw.h \ vfwmsgs.h \ + virtdisk.h \ vmr9.idl \ vmrender.idl \ vss.idl \ diff --git a/include/virtdisk.h b/include/virtdisk.h new file mode 100644 index 0000000..ebca703 --- /dev/null +++ b/include/virtdisk.h @@ -0,0 +1,205 @@ +/* + * Copyright 2017 Louis Lenders + * Copyright 2018 Gijs Vermeulen + * + * 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 + */ + +#ifndef __WINE_VIRTDISK_DLL_H +#define __WINE_VIRTDISK_DLL_H + +#include <windows.h> + +#ifdef __cplusplus +extern "C" { +#endif + +#define VIRTUAL_STORAGE_TYPE_DEVICE_UNKNOWN 0 +#define VIRTUAL_STORAGE_TYPE_DEVICE_ISO 1 +#define VIRTUAL_STORAGE_TYPE_DEVICE_VHD 2 + +typedef enum _ATTACH_VIRTUAL_DISK_FLAG { + ATTACH_VIRTUAL_DISK_FLAG_NONE = 0x00, + ATTACH_VIRTUAL_DISK_FLAG_READ_ONLY = 0x01, + ATTACH_VIRTUAL_DISK_FLAG_NO_DRIVE_LETTER = 0x02, + ATTACH_VIRTUAL_DISK_FLAG_PERMANENT_LIFETIME = 0x04, + ATTACH_VIRTUAL_DISK_FLAG_NO_LOCAL_HOST = 0x08, + ATTACH_VIRTUAL_DISK_FLAG_NO_SECURITY_DESCRIPTOR = 0x10 +} ATTACH_VIRTUAL_DISK_FLAG; + +typedef enum _ATTACH_VIRTUAL_DISK_VERSION { + ATTACH_VIRTUAL_DISK_VERSION_UNSPECIFIED, + ATTACH_VIRTUAL_DISK_VERSION_1 +} ATTACH_VIRTUAL_DISK_VERSION; + +typedef enum _COMPACT_VIRTUAL_DISK_FLAG { + COMPACT_VIRTUAL_DISK_FLAG_NONE = 0x00, + COMPACT_VIRTUAL_DISK_FLAG_NO_ZERO_SCAN = 0x01, + COMPACT_VIRTUAL_DISK_FLAG_NO_BLOCK_MOVES = 0x02 +} COMPACT_VIRTUAL_DISK_FLAG; + +typedef enum _COMPACT_VIRTUAL_DISK_VERSION { + COMPACT_VIRTUAL_DISK_VERSION_UNSPECIFIED, + COMPACT_VIRTUAL_DISK_VERSION_1 +} COMPACT_VIRTUAL_DISK_VERSION; + +typedef enum _DEPENDENT_DISK_FLAG +{ + DEPENDENT_DISK_FLAG_NONE = 0x00000000, + DEPENDENT_DISK_FLAG_MULT_BACKING_FILES = 0x00000001, + DEPENDENT_DISK_FLAG_FULLY_ALLOCATED = 0x00000002, + DEPENDENT_DISK_FLAG_READ_ONLY = 0x00000004, + DEPENDENT_DISK_FLAG_REMOTE = 0x00000008, + DEPENDENT_DISK_FLAG_SYSTEM_VOLUME = 0x00000010, + DEPENDENT_DISK_FLAG_SYSTEM_VOLUME_PARENT = 0x00000020, + DEPENDENT_DISK_FLAG_REMOVABLE = 0x00000040, + DEPENDENT_DISK_FLAG_NO_DRIVE_LETTER = 0x00000080, + DEPENDENT_DISK_FLAG_PARENT = 0x00000100, + DEPENDENT_DISK_FLAG_NO_HOST_DISK = 0x00000200, + DEPENDENT_DISK_FLAG_PERMANENT_LIFETIME = 0x00000400 +} DEPENDENT_DISK_FLAG; + +typedef enum _EXPAND_VIRTUAL_DISK_VERSION { + EXPAND_VIRTUAL_DISK_VERSION_UNSPECIFIED, + EXPAND_VIRTUAL_DISK_VERSION_1 +} EXPAND_VIRTUAL_DISK_VERSION; + +typedef enum _DETACH_VIRTUAL_DISK_FLAG { + DETACH_VIRTUAL_DISK_FLAG_NONE = 0x00000000 +} DETACH_VIRTUAL_DISK_FLAG; + +typedef enum _EXPAND_VIRTUAL_DISK_FLAG { + EXPAND_VIRTUAL_DISK_FLAG_NONE = 0x00000000 +} EXPAND_VIRTUAL_DISK_FLAG; + +typedef enum _GET_STORAGE_DEPENDENCY_FLAG +{ + GET_STORAGE_DEPENDENCY_FLAG_NONE = 0x00, + GET_STORAGE_DEPENDENCY_FLAG_HOST_VOLUMES = 0x01, + GET_STORAGE_DEPENDENCY_FLAG_DISK_HANDLE = 0x02 +} GET_STORAGE_DEPENDENCY_FLAG; + +typedef enum _MIRROR_VIRTUAL_DISK_FLAG { + MIRROR_VIRTUAL_DISK_FLAG_NONE = 0x00, + MIRROR_VIRTUAL_DISK_FLAG_EXISTING_FILE = 0x01 +} MIRROR_VIRTUAL_DISK_FLAG; + +typedef enum _MIRROR_VIRTUAL_DISK_VERSION { + MIRROR_VIRTUAL_DISK_VERSION_UNSPECIFIED, + MIRROR_VIRTUAL_DISK_VERSION_1 +} MIRROR_VIRTUAL_DISK_VERSION; + +typedef enum _MERGE_VIRTUAL_DISK_FLAG { + MERGE_VIRTUAL_DISK_FLAG_NONE = 0x00000000 +} MERGE_VIRTUAL_DISK_FLAG; + +typedef enum _STORAGE_DEPENDENCY_INFO_VERSION +{ + STORAGE_DEPENDENCY_INFO_VERSION_UNSPECIFIED = 0x0, + STORAGE_DEPENDENCY_INFO_VERSION_1 = 0x1, + STORAGE_DEPENDENCY_INFO_VERSION_2 = 0x2 +} STORAGE_DEPENDENCY_INFO_VERSION; + +typedef enum _VIRTUAL_DISK_ACCESS_MASK { + VIRTUAL_DISK_ACCESS_NONE = 0x00000000, + VIRTUAL_DISK_ACCESS_ATTACH_RO = 0x00010000, + VIRTUAL_DISK_ACCESS_ATTACH_RW = 0x00020000, + VIRTUAL_DISK_ACCESS_DETACH = 0x00040000, + VIRTUAL_DISK_ACCESS_GET_INFO = 0x00080000, + VIRTUAL_DISK_ACCESS_CREATE = 0x00100000, + VIRTUAL_DISK_ACCESS_METAOPS = 0x00200000, + VIRTUAL_DISK_ACCESS_READ = 0x000d0000, + VIRTUAL_DISK_ACCESS_ALL = 0x003f0000, + VIRTUAL_DISK_ACCESS_WRITABLE = 0x00320000 +} VIRTUAL_DISK_ACCESS_MASK; + +typedef struct _VIRTUAL_STORAGE_TYPE +{ + ULONG DeviceId; + GUID VendorId; +} VIRTUAL_STORAGE_TYPE, *PVIRTUAL_STORAGE_TYPE; + +typedef struct _ATTACH_VIRTUAL_DISK_PARAMETERS { + ATTACH_VIRTUAL_DISK_VERSION Version; + __C89_NAMELESS union { + struct { + ULONG Reserved; + } Version1; + } DUMMYUNIONNAME; +} ATTACH_VIRTUAL_DISK_PARAMETERS, *PATTACH_VIRTUAL_DISK_PARAMETERS; + +typedef struct _COMPACT_VIRTUAL_DISK_PARAMETERS { + COMPACT_VIRTUAL_DISK_VERSION Version; + __C89_NAMELESS union { + struct { + ULONG Reserved; + } Version1; + } DUMMYUNIONNAME; +} COMPACT_VIRTUAL_DISK_PARAMETERS, *PCOMPACT_VIRTUAL_DISK_PARAMETERS; + +typedef struct _EXPAND_VIRTUAL_DISK_PARAMETERS { + EXPAND_VIRTUAL_DISK_VERSION Version; + __C89_NAMELESS union { + struct { + ULONGLONG NewSize; + } Version1; + } DUMMYUNIONNAME; +} EXPAND_VIRTUAL_DISK_PARAMETERS, *PEXPAND_VIRTUAL_DISK_PARAMETERS; + +typedef struct _STORAGE_DEPENDENCY_INFO_TYPE_1 +{ + DEPENDENT_DISK_FLAG DependencyTypeFlags; + ULONG ProviderSpecificFlags; + VIRTUAL_STORAGE_TYPE VirtualStorageType; +} STORAGE_DEPENDENCY_INFO_TYPE_1, *PSTORAGE_DEPENDENCY_INFO_TYPE_1; + +typedef struct _STORAGE_DEPENDENCY_INFO_TYPE_2 +{ + DEPENDENT_DISK_FLAG DependencyTypeFlags; + ULONG ProviderSpecificFlags; + VIRTUAL_STORAGE_TYPE VirtualStorageType; + ULONG AncestorLevel; + PWSTR DependencyDeviceName; + PWSTR HostVolumeName; + PWSTR DependentVolumeName; + PWSTR DependentVolumeRelativePath; +} STORAGE_DEPENDENCY_INFO_TYPE_2, *PSTORAGE_DEPENDENCY_INFO_TYPE_2; + +typedef struct _STORAGE_DEPENDENCY_INFO +{ + STORAGE_DEPENDENCY_INFO_VERSION Version; + ULONG NumberEntries; +#if !defined(__WINESRC__) && (defined(_MSC_EXTENSIONS) || ((defined(__GNUC__) && __GNUC__ >= 3))) + __C89_NAMELESS union + { + STORAGE_DEPENDENCY_INFO_TYPE_1 Version1Entries[]; + STORAGE_DEPENDENCY_INFO_TYPE_2 Version2Entries[]; + } __C89_NAMELESSUNIONNAME; +#endif +} STORAGE_DEPENDENCY_INFO, *PSTORAGE_DEPENDENCY_INFO; + +typedef struct _VIRTUAL_DISK_PROGRESS { + DWORD OperationStatus; + ULONGLONG CurrentValue; + ULONGLONG CompletionValue; +} VIRTUAL_DISK_PROGRESS, *PVIRTUAL_DISK_PROGRESS; + +DWORD WINAPI GetStorageDependencyInformation(HANDLE obj, GET_STORAGE_DEPENDENCY_FLAG flags, ULONG size, STORAGE_DEPENDENCY_INFO *info, ULONG *used); + +#ifdef __cplusplus +} +#endif + +#endif /* __WINE_VIRTDISK_DLL_H */

1 0

Michael Stefaniuc : ws2_32: Use the ARRAY_SIZE() macro.
by Alexandre Julliard Sept. 12, 2018

Sept. 12, 2018

Module: wine Branch: master Commit: d58163b26d5198a9c8be300094b7a870a52e55c9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d58163b26d5198a9c8be3000… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Sep 12 21:03:54 2018 +0200 ws2_32: Use the ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 914df17..164a48c 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -1341,7 +1341,7 @@ static int convert_flags(int flags) int i, out; if (!flags) return 0; - for (out = i = 0; flags && i < sizeof(ws_flags_map) / sizeof(ws_flags_map[0]); i++) + for (out = i = 0; flags && i < ARRAY_SIZE(ws_flags_map); i++) { if (ws_flags_map[i][0] & flags) { @@ -1370,7 +1370,7 @@ static int convert_sockopt(INT *level, INT *optname) { case WS_SOL_SOCKET: *level = SOL_SOCKET; - for(i=0; i<sizeof(ws_sock_map)/sizeof(ws_sock_map[0]); i++) { + for(i = 0; i < ARRAY_SIZE(ws_sock_map); i++) { if( ws_sock_map[i][0] == *optname ) { *optname = ws_sock_map[i][1]; @@ -1381,7 +1381,7 @@ static int convert_sockopt(INT *level, INT *optname) break; case WS_IPPROTO_TCP: *level = IPPROTO_TCP; - for(i=0; i<sizeof(ws_tcp_map)/sizeof(ws_tcp_map[0]); i++) { + for(i = 0; i < ARRAY_SIZE(ws_tcp_map); i++) { if ( ws_tcp_map[i][0] == *optname ) { *optname = ws_tcp_map[i][1]; @@ -1392,7 +1392,7 @@ static int convert_sockopt(INT *level, INT *optname) break; case WS_IPPROTO_IP: *level = IPPROTO_IP; - for(i=0; i<sizeof(ws_ip_map)/sizeof(ws_ip_map[0]); i++) { + for(i = 0; i < ARRAY_SIZE(ws_ip_map); i++) { if (ws_ip_map[i][0] == *optname ) { *optname = ws_ip_map[i][1]; @@ -1403,7 +1403,7 @@ static int convert_sockopt(INT *level, INT *optname) break; case WS_IPPROTO_IPV6: *level = IPPROTO_IPV6; - for(i=0; i<sizeof(ws_ipv6_map)/sizeof(ws_ipv6_map[0]); i++) { + for(i = 0; i < ARRAY_SIZE(ws_ipv6_map); i++) { if (ws_ipv6_map[i][0] == *optname ) { *optname = ws_ipv6_map[i][1]; @@ -1484,7 +1484,7 @@ static int convert_af_w2u(int windowsaf) { unsigned int i; - for (i=0;i<sizeof(ws_af_map)/sizeof(ws_af_map[0]);i++) + for (i = 0; i < ARRAY_SIZE(ws_af_map); i++) if (ws_af_map[i][0] == windowsaf) return ws_af_map[i][1]; FIXME("unhandled Windows address family %d\n", windowsaf); @@ -1495,7 +1495,7 @@ static int convert_af_u2w(int unixaf) { unsigned int i; - for (i=0;i<sizeof(ws_af_map)/sizeof(ws_af_map[0]);i++) + for (i = 0; i < ARRAY_SIZE(ws_af_map); i++) if (ws_af_map[i][1] == unixaf) return ws_af_map[i][0]; FIXME("unhandled UNIX address family %d\n", unixaf); @@ -1506,7 +1506,7 @@ static int convert_proto_w2u(int windowsproto) { unsigned int i; - for (i=0;i<sizeof(ws_proto_map)/sizeof(ws_proto_map[0]);i++) + for (i = 0; i < ARRAY_SIZE(ws_proto_map); i++) if (ws_proto_map[i][0] == windowsproto) return ws_proto_map[i][1]; @@ -1522,7 +1522,7 @@ static int convert_proto_u2w(int unixproto) { unsigned int i; - for (i=0;i<sizeof(ws_proto_map)/sizeof(ws_proto_map[0]);i++) + for (i = 0; i < ARRAY_SIZE(ws_proto_map); i++) if (ws_proto_map[i][1] == unixproto) return ws_proto_map[i][0]; @@ -1539,7 +1539,7 @@ static int convert_socktype_w2u(int windowssocktype) { unsigned int i; - for (i=0;i<sizeof(ws_socktype_map)/sizeof(ws_socktype_map[0]);i++) + for (i = 0; i < ARRAY_SIZE(ws_socktype_map); i++) if (ws_socktype_map[i][0] == windowssocktype) return ws_socktype_map[i][1]; FIXME("unhandled Windows socket type %d\n", windowssocktype); @@ -1550,7 +1550,7 @@ static int convert_socktype_u2w(int unixsocktype) { unsigned int i; - for (i=0;i<sizeof(ws_socktype_map)/sizeof(ws_socktype_map[0]);i++) + for (i = 0; i < ARRAY_SIZE(ws_socktype_map); i++) if (ws_socktype_map[i][1] == unixsocktype) return ws_socktype_map[i][0]; FIXME("unhandled UNIX socket type %d\n", unixsocktype); @@ -1560,7 +1560,7 @@ convert_socktype_u2w(int unixsocktype) { static int convert_poll_w2u(int events) { int i, ret; - for (i = ret = 0; events && i < sizeof(ws_poll_map) / sizeof(ws_poll_map[0]); i++) + for (i = ret = 0; events && i < ARRAY_SIZE(ws_poll_map); i++) { if (ws_poll_map[i][0] & events) { @@ -1577,7 +1577,7 @@ static int convert_poll_w2u(int events) static int convert_poll_u2w(int events) { int i, ret; - for (i = ret = 0; events && i < sizeof(ws_poll_map) / sizeof(ws_poll_map[0]); i++) + for (i = ret = 0; events && i < ARRAY_SIZE(ws_poll_map); i++) { if (ws_poll_map[i][1] & events) { @@ -1752,7 +1752,7 @@ static inline BOOL supported_pf(int pf) static inline BOOL supported_protocol(int protocol) { int i; - for (i = 0; i < sizeof(valid_protocols) / sizeof(valid_protocols[0]); i++) + for (i = 0; i < ARRAY_SIZE(valid_protocols); i++) if (protocol == valid_protocols[i]) return TRUE; return FALSE; @@ -4914,7 +4914,7 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID BOOL found = FALSE; unsigned int i; - for (i = 0; i < sizeof(guid_funcs) / sizeof(guid_funcs[0]); i++) + for (i = 0; i < ARRAY_SIZE(guid_funcs); i++) { if (IsEqualGUID(&guid_funcs[i].guid, in_buff)) { @@ -6478,7 +6478,7 @@ struct WS_protoent* WINAPI WS_getprotobyname(const char* name) if (!retval) { unsigned int i; - for (i = 0; i < sizeof(protocols) / sizeof(protocols[0]); i++) + for (i = 0; i < ARRAY_SIZE(protocols); i++) { if (strcasecmp( protocols[i].names[0], name )) continue; retval = WS_create_pe( protocols[i].names[0], (char **)protocols[i].names + 1, @@ -6512,7 +6512,7 @@ struct WS_protoent* WINAPI WS_getprotobynumber(int number) if (!retval) { unsigned int i; - for (i = 0; i < sizeof(protocols) / sizeof(protocols[0]); i++) + for (i = 0; i < ARRAY_SIZE(protocols); i++) { if (protocols[i].prot != number) continue; retval = WS_create_pe( protocols[i].names[0], (char **)protocols[i].names + 1, @@ -6586,7 +6586,7 @@ static int convert_aiflag_w2u(int winflags) { unsigned int i; int unixflags = 0; - for (i=0;i<sizeof(ws_aiflag_map)/sizeof(ws_aiflag_map[0]);i++) + for (i = 0; i < ARRAY_SIZE(ws_aiflag_map); i++) if (ws_aiflag_map[i][0] & winflags) { unixflags |= ws_aiflag_map[i][1]; winflags &= ~ws_aiflag_map[i][0]; @@ -6600,7 +6600,7 @@ static int convert_niflag_w2u(int winflags) { unsigned int i; int unixflags = 0; - for (i=0;i<sizeof(ws_niflag_map)/sizeof(ws_niflag_map[0]);i++) + for (i = 0; i < ARRAY_SIZE(ws_niflag_map); i++) if (ws_niflag_map[i][0] & winflags) { unixflags |= ws_niflag_map[i][1]; winflags &= ~ws_niflag_map[i][0]; @@ -6614,7 +6614,7 @@ static int convert_aiflag_u2w(int unixflags) { unsigned int i; int winflags = 0; - for (i=0;i<sizeof(ws_aiflag_map)/sizeof(ws_aiflag_map[0]);i++) + for (i = 0; i < ARRAY_SIZE(ws_aiflag_map); i++) if (ws_aiflag_map[i][1] & unixflags) { winflags |= ws_aiflag_map[i][0]; unixflags &= ~ws_aiflag_map[i][1]; @@ -8718,7 +8718,7 @@ INT WINAPI WSAAddressToStringW( LPSOCKADDR sockaddr, DWORD len, if (ret) return ret; - MultiByteToWideChar( CP_ACP, 0, bufAddr, size, buffer, sizeof( buffer )/sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, bufAddr, size, buffer, ARRAY_SIZE(buffer)); if (*lenstr < size) {

1 0

Henri Verbeet : d2d1: Simplify the WIC render target implementation.
by Alexandre Julliard Sept. 12, 2018

Sept. 12, 2018

Module: wine Branch: master Commit: 364e11b0ec77af0b5538258591bacaedb89c33a5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=364e11b0ec77af0b55382585… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 12 20:47:52 2018 +0430 d2d1: Simplify the WIC render target implementation. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/d2d1_private.h | 2 +- dlls/d2d1/factory.c | 2 +- dlls/d2d1/wic_render_target.c | 654 +----------------------------------------- 3 files changed, 12 insertions(+), 646 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=364e11b0ec77af0b5538…

1 0

Jacek Caban : mshtml: Use dispex_compat_mode in update_filter.
by Alexandre Julliard Sept. 12, 2018

Sept. 12, 2018

Module: wine Branch: master Commit: d35e6feafa39ddbad097fe138f09350c19b7c5e1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d35e6feafa39ddbad097fe13… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 12 21:15:42 2018 +0200 mshtml: Use dispex_compat_mode in update_filter. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlstyle.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 282dd58..0c95951 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -449,11 +449,6 @@ static const style_tbl_entry_t *lookup_style_tbl(const WCHAR *name) return NULL; } -static inline compat_mode_t get_style_compat_mode(HTMLStyle *style) -{ - return style->elem && style->elem->node.doc ? style->elem->node.doc->document_mode : COMPAT_MODE_QUIRKS; -} - static LPWSTR fix_px_value(LPCWSTR val) { LPCWSTR ptr = val; @@ -2704,7 +2699,7 @@ static void update_filter(HTMLStyle *This) static const WCHAR alphaW[] = {'a','l','p','h','a'}; - if(get_style_compat_mode(This) >= COMPAT_MODE_IE10) + if(dispex_compat_mode(&This->dispex) >= COMPAT_MODE_IE10) return; ptr = This->elem->filter;

1 0

Jacek Caban : mshtml: Expose CSS properties names from style object via IHTMLCSSStyleDeclaration dispids.
by Alexandre Julliard Sept. 12, 2018

Sept. 12, 2018

Module: wine Branch: master Commit: f274a198d21e5c89ea1dc6abdb5de5ad730c1233 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f274a198d21e5c89ea1dc6ab… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 12 21:16:04 2018 +0200 mshtml: Expose CSS properties names from style object via IHTMLCSSStyleDeclaration dispids. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlstyle.c | 584 ++++++++++++++++++++++++++++++++------ dlls/mshtml/tests/documentmode.js | 1 + 2 files changed, 494 insertions(+), 91 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f274a198d21e5c89ea1d…

1 0

Piotr Caban : vcruntime140: Add __uncaught_exceptions implementation.
by Alexandre Julliard Sept. 12, 2018

Sept. 12, 2018

Module: wine Branch: master Commit: 7090d74750dc32064557e09421a468145049691f URL: https://source.winehq.org/git/wine.git/?a=commit;h=7090d74750dc32064557e094… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Sep 12 14:45:56 2018 +0200 vcruntime140: Add __uncaught_exceptions implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vcruntime140/Makefile.in | 1 + dlls/vcruntime140/misc.c | 7 +++++++ dlls/vcruntime140/vcruntime140.spec | 2 +- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/vcruntime140/Makefile.in b/dlls/vcruntime140/Makefile.in index 2b4d6af..828330a 100644 --- a/dlls/vcruntime140/Makefile.in +++ b/dlls/vcruntime140/Makefile.in @@ -1,4 +1,5 @@ MODULE = vcruntime140.dll +IMPORTS = ucrtbase C_SRCS = \ misc.c diff --git a/dlls/vcruntime140/misc.c b/dlls/vcruntime140/misc.c index 86101a9..cc64175 100644 --- a/dlls/vcruntime140/misc.c +++ b/dlls/vcruntime140/misc.c @@ -22,6 +22,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(vcruntime); +int* CDECL __processing_throw(void); + /********************************************************************* * __telemetry_main_invoke_trigger */ @@ -47,3 +49,8 @@ BOOL CDECL __vcrt_InitializeCriticalSectionEx( TRACE("(%p %x %x)\n", cs, spin_count, flags); return InitializeCriticalSectionEx(cs, spin_count, flags); } + +int __cdecl __uncaught_exceptions(void) +{ + return *__processing_throw(); +} diff --git a/dlls/vcruntime140/vcruntime140.spec b/dlls/vcruntime140/vcruntime140.spec index bca405e..45d9370 100644 --- a/dlls/vcruntime140/vcruntime140.spec +++ b/dlls/vcruntime140/vcruntime140.spec @@ -48,7 +48,7 @@ @ cdecl __unDName(ptr str long ptr ptr long) ucrtbase.__unDName @ cdecl __unDNameEx(ptr str long ptr ptr ptr long) ucrtbase.__unDNameEx @ cdecl __uncaught_exception() ucrtbase.__uncaught_exception -@ stub __uncaught_exceptions +@ cdecl __uncaught_exceptions() @ stub __vcrt_GetModuleFileNameW @ stub __vcrt_GetModuleHandleW @ cdecl __vcrt_InitializeCriticalSectionEx(ptr long long)

1 0

Nikolay Sivov : xmllite/tests: Add another test for WriteAttributeString() .
by Alexandre Julliard Sept. 12, 2018

Sept. 12, 2018

Module: wine Branch: master Commit: 9730971e8eca05edff23d8268d65e2bf8c360cd6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9730971e8eca05edff23d826… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Sep 12 16:25:51 2018 +0300 xmllite/tests: Add another test for WriteAttributeString(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/tests/writer.c | 62 ++++++++++++++++++++++++--------------------- 1 file changed, 33 insertions(+), 29 deletions(-) diff --git a/dlls/xmllite/tests/writer.c b/dlls/xmllite/tests/writer.c index 87cdaab..972eb96 100644 --- a/dlls/xmllite/tests/writer.c +++ b/dlls/xmllite/tests/writer.c @@ -1572,6 +1572,27 @@ static void test_indentation(void) IXmlWriter_Release(writer); } +static HRESULT write_attribute_string(IXmlWriter *writer, const char *prefix, const char *local, + const char *uri, const char *value) +{ + WCHAR *prefixW, *localW, *uriW, *valueW; + HRESULT hr; + + prefixW = strdupAtoW(prefix); + localW = strdupAtoW(local); + uriW = strdupAtoW(uri); + valueW = strdupAtoW(value); + + hr = IXmlWriter_WriteAttributeString(writer, prefixW, localW, uriW, valueW); + + heap_free(prefixW); + heap_free(localW); + heap_free(uriW); + heap_free(valueW); + + return hr; +} + static void test_WriteAttributeString(void) { static const struct @@ -1589,6 +1610,7 @@ static void test_WriteAttributeString(void) { NULL, "a", NULL, "b", "<e a=\"b\" />", "<e a=\"b\"" }, { "prefix", "local", "uri", "b", "<e prefix:local=\"b\" xmlns:prefix=\"uri\" />", "<e prefix:local=\"b\"" }, { NULL, "a", "http://www.w3.org/2000/xmlns/", "defuri", "<e xmlns:a=\"defuri\" />", "<e xmlns:a=\"defuri\"" }, + { "xmlns", "a", NULL, "uri", "<e xmlns:a=\"uri\" />", "<e xmlns:a=\"uri\"" }, /* Autogenerated prefix names. */ { NULL, "a", "defuri", NULL, "<e p1:a=\"\" xmlns:p1=\"defuri\" />", "<e p1:a=\"\"" }, @@ -1606,12 +1628,6 @@ static void test_WriteAttributeString(void) { "prefix", "a", "http://www.w3.org/2000/xmlns/", "defuri", "<e />", "<e", WR_E_XMLNSURIDECLARATION }, }; - static const WCHAR prefixW[] = {'p','r','e','f','i','x',0}; - static const WCHAR localW[] = {'l','o','c','a','l',0}; - static const WCHAR uriW[] = {'u','r','i',0}; - static const WCHAR elementW[] = {'e',0}; - static const WCHAR aW[] = {'a',0}; - static const WCHAR bW[] = {'b',0}; IXmlWriter *writer; IStream *stream; unsigned int i; @@ -1624,22 +1640,16 @@ static void test_WriteAttributeString(void) for (i = 0; i < ARRAY_SIZE(attribute_tests); ++i) { - WCHAR *prefixW, *localW, *uriW, *valueW; - stream = writer_set_output(writer); hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Omit); ok(hr == S_OK, "Failed to start document, hr %#x.\n", hr); - hr = IXmlWriter_WriteStartElement(writer, NULL, elementW, NULL); + hr = write_start_element(writer, NULL, "e", NULL); ok(hr == S_OK, "Failed to start element, hr %#x.\n", hr); - prefixW = strdupAtoW(attribute_tests[i].prefix); - localW = strdupAtoW(attribute_tests[i].local); - uriW = strdupAtoW(attribute_tests[i].uri); - valueW = strdupAtoW(attribute_tests[i].value); - - hr = IXmlWriter_WriteAttributeString(writer, prefixW, localW, uriW, valueW); + hr = write_attribute_string(writer, attribute_tests[i].prefix, attribute_tests[i].local, + attribute_tests[i].uri, attribute_tests[i].value); todo_wine_if(i != 0) ok(hr == attribute_tests[i].hr, "%u: unexpected hr %#x.\n", i, hr); @@ -1654,11 +1664,6 @@ static void test_WriteAttributeString(void) hr = IXmlWriter_Flush(writer); ok(hr == S_OK, "Failed to flush, hr %#x.\n", hr); - heap_free(prefixW); - heap_free(localW); - heap_free(uriW); - heap_free(valueW); - check_output(stream, attribute_tests[i].output, i == 1 || i == 2 || i == 3 || i == 4, __LINE__); IStream_Release(stream); } @@ -1669,21 +1674,20 @@ static void test_WriteAttributeString(void) hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Omit); ok(hr == S_OK, "got 0x%08x\n", hr); - hr = IXmlWriter_WriteStartElement(writer, NULL, aW, NULL); + hr = write_start_element(writer, "p", "a", "outeruri"); ok(hr == S_OK, "got 0x%08x\n", hr); - hr = IXmlWriter_WriteAttributeString(writer, aW, NULL, NULL, bW); -todo_wine - ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); - - hr = IXmlWriter_WriteAttributeString(writer, prefixW, localW, uriW, bW); + hr = write_attribute_string(writer, "prefix", "local", "uri", "b"); todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); - hr = IXmlWriter_WriteAttributeString(writer, NULL, aW, NULL, bW); + hr = write_attribute_string(writer, NULL, "a", NULL, "b"); ok(hr == S_OK, "got 0x%08x\n", hr); - hr = IXmlWriter_WriteAttributeString(writer, prefixW, localW, NULL, bW); + hr = write_attribute_string(writer, "p", "attr", NULL, "value"); + ok(hr == S_OK, "Failed to write attribute string, hr %#x.\n", hr); + + hr = write_attribute_string(writer, "prefix", "local", NULL, "b"); todo_wine ok(hr == WR_E_DUPLICATEATTRIBUTE, "got 0x%08x\n", hr); @@ -1694,7 +1698,7 @@ todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); CHECK_OUTPUT_TODO(stream, - "<a prefix:local=\"b\" a=\"b\" xmlns:prefix=\"uri\" />"); + "<p:a prefix:local=\"b\" a=\"b\" p:attr=\"value\" xmlns:prefix=\"uri\" xmlns:p=\"outeruri\" />"); IXmlWriter_Release(writer); IStream_Release(stream);

1 0

Jacek Caban : mshtml: Expose IHTMLCSSStyleDeclaration interface to scripts.
by Alexandre Julliard Sept. 12, 2018

Sept. 12, 2018

Module: wine Branch: master Commit: 2e6598dc39d7f94e394598f6ceebe07f02e65e6d URL: https://source.winehq.org/git/wine.git/?a=commit;h=2e6598dc39d7f94e394598f6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 12 21:15:53 2018 +0200 mshtml: Expose IHTMLCSSStyleDeclaration interface to scripts. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlstyle.c | 9 ++++++++- dlls/mshtml/tests/documentmode.js | 27 +++++++++++++++++++++++++++ dlls/mshtml/tests/elements.js | 37 ++++++++++++++++++++++++++++++++++++- 3 files changed, 71 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 0c95951..bb62aec 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -9668,6 +9668,12 @@ static HRESULT HTMLStyle_get_dispid(DispatchEx *dispex, BSTR name, DWORD flags, return DISP_E_UNKNOWNNAME; } +void HTMLStyle_init_dispex_info(dispex_data_t *info, compat_mode_t mode) +{ + if(mode >= COMPAT_MODE_IE9) + dispex_info_add_interface(info, IHTMLCSSStyleDeclaration_tid, NULL); +} + static const dispex_static_data_vtbl_t HTMLStyle_dispex_vtbl = { NULL, HTMLStyle_get_dispid, @@ -9687,7 +9693,8 @@ static const tid_t HTMLStyle_iface_tids[] = { static dispex_static_data_t HTMLStyle_dispex = { &HTMLStyle_dispex_vtbl, DispHTMLStyle_tid, - HTMLStyle_iface_tids + HTMLStyle_iface_tids, + HTMLStyle_init_dispex_info }; static HRESULT get_style_from_elem(HTMLElement *elem, nsIDOMCSSStyleDeclaration **ret) diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index 6ab301f..e8db6c2 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -128,6 +128,32 @@ function test_xhr_props() { next_test(); } +function test_style_props() { + var style = document.body.style; + + function test_exposed(prop, expect) { + if(expect) + ok(prop in style, prop + " not found in style object."); + else + ok(!(prop in style), prop + " found in style object."); + } + + var v = document.documentMode; + + test_exposed("removeAttribute", true); + test_exposed("zIndex", true); + test_exposed("z-index", true); + test_exposed("filter", true); + test_exposed("pixelTop", true); + test_exposed("float", true); + test_exposed("css-float", false); + test_exposed("style-float", false); + test_exposed("setProperty", v >= 9); + test_exposed("removeProperty", v >= 9); + + next_test(); +} + function test_javascript() { var g = window; @@ -270,6 +296,7 @@ var tests = [ test_window_props, test_javascript, test_xhr_props, + test_style_props, test_elem_by_id, test_conditional_comments ]; diff --git a/dlls/mshtml/tests/elements.js b/dlls/mshtml/tests/elements.js index 53fdeab..50f19e5 100644 --- a/dlls/mshtml/tests/elements.js +++ b/dlls/mshtml/tests/elements.js @@ -208,6 +208,40 @@ function test_document_owner() { next_test(); } +function test_style_properties() { + var style = document.body.style; + var val; + + style.cssFloat = "left"; + ok(style.cssFloat === "left", "cssFloat = " + style.cssFloat); + + val = style.removeProperty("float"); + ok(val === "left", "removeProperty() returned " + val); + ok(style.cssFloat === "", "cssFloat = " + style.cssFloat); + + style.cssFloat = "left"; + val = style.removeProperty("FloaT"); + ok(val === "left", "removeProperty() returned " + val); + ok(style.cssFloat === "", "cssFloat = " + style.cssFloat); + + style.cssFloat = "left"; + val = style.removeProperty("cssFloat"); + ok(val === "", "removeProperty() returned " + val); + ok(style.cssFloat === "left", "cssFloat = " + style.cssFloat); + ok(style["float"] === "left", "float = " + style["float"]); + + style.testVal = "test"; + val = style.removeProperty("testVal"); + ok(val === "", "removeProperty() returned " + val); + ok(style.testVal === "test", "testVal = " + style.testVal); + + style["z-index"] = 1; + ok(style.zIndex === 1, "zIndex = " + style.zIndex); + ok(style["z-index"] === 1, "z-index = " + style["z-index"]); + + next_test(); +} + var tests = [ test_input_selection, test_textContent, @@ -217,5 +251,6 @@ var tests = [ test_iframe, test_query_selector, test_compare_position, - test_document_owner + test_document_owner, + test_style_properties ];

1 0

Józef Kucia : vkd3d: Reuse descriptor pools.
by Alexandre Julliard Sept. 12, 2018

Sept. 12, 2018

Module: vkd3d Branch: master Commit: b0bfe90c9e5d86c66da058a135446b96c705ab37 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=b0bfe90c9e5d86c66da058a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Sep 12 15:19:55 2018 +0200 vkd3d: Reuse descriptor pools. 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> --- libs/vkd3d/command.c | 68 ++++++++++++++++++++++++++++++++++++---------- libs/vkd3d/vkd3d_private.h | 4 +++ 2 files changed, 58 insertions(+), 14 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 609edea..0940269 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -806,16 +806,25 @@ static VkDescriptorPool d3d12_command_allocator_allocate_descriptor_pool( VkDescriptorPool vk_pool; VkResult vr; - pool_desc.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_CREATE_INFO; - pool_desc.pNext = NULL; - pool_desc.flags = 0; - pool_desc.maxSets = 512; - pool_desc.poolSizeCount = ARRAY_SIZE(pool_sizes); - pool_desc.pPoolSizes = pool_sizes; - if ((vr = VK_CALL(vkCreateDescriptorPool(vk_device, &pool_desc, NULL, &vk_pool))) < 0) - { - ERR("Failed to create descriptor pool, vr %d.\n", vr); - return VK_NULL_HANDLE; + if (allocator->free_descriptor_pool_count > 0) + { + vk_pool = allocator->free_descriptor_pools[allocator->free_descriptor_pool_count - 1]; + allocator->free_descriptor_pools[allocator->free_descriptor_pool_count - 1] = VK_NULL_HANDLE; + --allocator->free_descriptor_pool_count; + } + else + { + pool_desc.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_CREATE_INFO; + pool_desc.pNext = NULL; + pool_desc.flags = 0; + pool_desc.maxSets = 512; + pool_desc.poolSizeCount = ARRAY_SIZE(pool_sizes); + pool_desc.pPoolSizes = pool_sizes; + if ((vr = VK_CALL(vkCreateDescriptorPool(vk_device, &pool_desc, NULL, &vk_pool))) < 0) + { + ERR("Failed to create descriptor pool, vr %d.\n", vr); + return VK_NULL_HANDLE; + } } if (!(d3d12_command_allocator_add_descriptor_pool(allocator, vk_pool))) @@ -886,14 +895,40 @@ static void vkd3d_buffer_destroy(struct vkd3d_buffer *buffer, struct d3d12_devic VK_CALL(vkDestroyBuffer(device->vk_device, buffer->vk_buffer, NULL)); } -static void d3d12_command_allocator_free_resources(struct d3d12_command_allocator *allocator) +static void d3d12_command_allocator_free_resources(struct d3d12_command_allocator *allocator, + bool keep_reusable_resources) { struct d3d12_device *device = allocator->device; const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; - unsigned int i; + unsigned int i, j; allocator->vk_descriptor_pool = VK_NULL_HANDLE; + if (keep_reusable_resources) + { + if (vkd3d_array_reserve((void **)&allocator->free_descriptor_pools, + &allocator->free_descriptor_pools_size, + allocator->free_descriptor_pool_count + allocator->descriptor_pool_count, + sizeof(*allocator->free_descriptor_pools))) + { + for (i = 0, j = allocator->free_descriptor_pool_count; i < allocator->descriptor_pool_count; ++i, ++j) + { + VK_CALL(vkResetDescriptorPool(device->vk_device, allocator->descriptor_pools[i], 0)); + allocator->free_descriptor_pools[j] = allocator->descriptor_pools[i]; + } + allocator->free_descriptor_pool_count += allocator->descriptor_pool_count; + allocator->descriptor_pool_count = 0; + } + } + else + { + for (i = 0; i < allocator->free_descriptor_pool_count; ++i) + { + VK_CALL(vkDestroyDescriptorPool(device->vk_device, allocator->free_descriptor_pools[i], NULL)); + } + allocator->free_descriptor_pool_count = 0; + } + for (i = 0; i < allocator->transfer_buffer_count; ++i) { vkd3d_buffer_destroy(&allocator->transfer_buffers[i], device); @@ -990,11 +1025,12 @@ static ULONG STDMETHODCALLTYPE d3d12_command_allocator_Release(ID3D12CommandAllo if (allocator->current_command_list) d3d12_command_list_allocator_destroyed(allocator->current_command_list); - d3d12_command_allocator_free_resources(allocator); + d3d12_command_allocator_free_resources(allocator, false); vkd3d_free(allocator->transfer_buffers); vkd3d_free(allocator->buffer_views); vkd3d_free(allocator->views); vkd3d_free(allocator->descriptor_pools); + vkd3d_free(allocator->free_descriptor_pools); vkd3d_free(allocator->pipelines); vkd3d_free(allocator->framebuffers); vkd3d_free(allocator->passes); @@ -1078,7 +1114,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_command_allocator_Reset(ID3D12CommandAllo device = allocator->device; vk_procs = &device->vk_procs; - d3d12_command_allocator_free_resources(allocator); + d3d12_command_allocator_free_resources(allocator, true); if (allocator->command_buffer_count) { VK_CALL(vkFreeCommandBuffers(device->vk_device, allocator->vk_command_pool, @@ -1168,6 +1204,10 @@ static HRESULT d3d12_command_allocator_init(struct d3d12_command_allocator *allo allocator->vk_descriptor_pool = VK_NULL_HANDLE; + allocator->free_descriptor_pools = NULL; + allocator->free_descriptor_pools_size = 0; + allocator->free_descriptor_pool_count = 0; + allocator->passes = NULL; allocator->passes_size = 0; allocator->pass_count = 0; diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 286186b..cb11866 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -550,6 +550,10 @@ struct d3d12_command_allocator VkDescriptorPool vk_descriptor_pool; + VkDescriptorPool *free_descriptor_pools; + size_t free_descriptor_pools_size; + size_t free_descriptor_pool_count; + VkRenderPass *passes; size_t passes_size; size_t pass_count;

1 0