January 2021 - Wine-commits

Alexandre Julliard : include: Add a couple of dll characteristics.
by Alexandre Julliard 21 Jan '21

21 Jan '21

Module: wine Branch: master Commit: e137063394deba721f3a8a8ebd78961f39679ad2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e137063394deba721f3a8a8e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 21 20:39:11 2021 +0100 include: Add a couple of dll characteristics. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winnt.h | 3 +++ tools/winedump/pe.c | 5 ++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/include/winnt.h b/include/winnt.h index fba721f7f02..f5ef0c7bd52 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -3135,13 +3135,16 @@ typedef struct _IMAGE_VXD_HEADER { #define IMAGE_SUBSYSTEM_WINDOWS_BOOT_APPLICATION 16 /* DLL Characteristics */ +#define IMAGE_DLLCHARACTERISTICS_HIGH_ENTROPY_VA 0x0020 #define IMAGE_DLLCHARACTERISTICS_DYNAMIC_BASE 0x0040 #define IMAGE_DLLCHARACTERISTICS_FORCE_INTEGRITY 0x0080 #define IMAGE_DLLCHARACTERISTICS_NX_COMPAT 0x0100 #define IMAGE_DLLCHARACTERISTICS_NO_ISOLATION 0x0200 #define IMAGE_DLLCHARACTERISTICS_NO_SEH 0x0400 #define IMAGE_DLLCHARACTERISTICS_NO_BIND 0x0800 +#define IMAGE_DLLCHARACTERISTICS_APPCONTAINER 0x1000 #define IMAGE_DLLCHARACTERISTICS_WDM_DRIVER 0x2000 +#define IMAGE_DLLCHARACTERISTICS_GUARD_CF 0x4000 #define IMAGE_DLLCHARACTERISTICS_TERMINAL_SERVER_AWARE 0x8000 typedef struct _IMAGE_FILE_HEADER { diff --git a/tools/winedump/pe.c b/tools/winedump/pe.c index fef95c6bb67..19ccd172da2 100644 --- a/tools/winedump/pe.c +++ b/tools/winedump/pe.c @@ -213,15 +213,18 @@ static inline void print_subsys(const char *title, WORD value) static inline void print_dllflags(const char *title, WORD value) { - printf(" %-34s 0x%X\n", title, value); + printf(" %-34s 0x%04X\n", title, value); #define X(f,s) if (value & f) printf(" %s\n", s) + X(IMAGE_DLLCHARACTERISTICS_HIGH_ENTROPY_VA, "HIGH_ENTROPY_VA"); X(IMAGE_DLLCHARACTERISTICS_DYNAMIC_BASE, "DYNAMIC_BASE"); X(IMAGE_DLLCHARACTERISTICS_FORCE_INTEGRITY, "FORCE_INTEGRITY"); X(IMAGE_DLLCHARACTERISTICS_NX_COMPAT, "NX_COMPAT"); X(IMAGE_DLLCHARACTERISTICS_NO_ISOLATION, "NO_ISOLATION"); X(IMAGE_DLLCHARACTERISTICS_NO_SEH, "NO_SEH"); X(IMAGE_DLLCHARACTERISTICS_NO_BIND, "NO_BIND"); + X(IMAGE_DLLCHARACTERISTICS_APPCONTAINER, "APPCONTAINER"); X(IMAGE_DLLCHARACTERISTICS_WDM_DRIVER, "WDM_DRIVER"); + X(IMAGE_DLLCHARACTERISTICS_GUARD_CF, "GUARD_CF"); X(IMAGE_DLLCHARACTERISTICS_TERMINAL_SERVER_AWARE, "TERMINAL_SERVER_AWARE"); #undef X }

1 0

Dmitry Timoshkov : msi: Also set "MsiRunningElevated" installer property.
by Alexandre Julliard 21 Jan '21

21 Jan '21

Module: wine Branch: master Commit: dac655abce0397b3c1accec64039b8cd75beb561 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dac655abce0397b3c1accec6… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Dec 22 16:36:11 2020 +0300 msi: Also set "MsiRunningElevated" installer property. This property is supposed to be set starting from Windows Installer 4.0 targeting Windows Vista. This patch fixes the installer that checks this property in addition to VersionNT and ALLUSERS. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/package.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 2483d99e2b5..25e22f040a4 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -737,6 +737,7 @@ static VOID set_installer_properties(MSIPACKAGE *package) /* in a wine environment the user is always admin and privileged */ msi_set_property( package->db, L"AdminUser", L"1", -1 ); msi_set_property( package->db, L"Privileged", L"1", -1 ); + msi_set_property( package->db, L"MsiRunningElevated", L"1", -1 ); /* set the os things */ OSVersion.dwOSVersionInfoSize = sizeof(OSVersion); @@ -963,6 +964,8 @@ void msi_adjust_privilege_properties( MSIPACKAGE *package ) msi_set_property( package->db, L"ALLUSERS", L"1", -1 ); } msi_set_property( package->db, L"AdminUser", L"1", -1 ); + msi_set_property( package->db, L"Privileged", L"1", -1 ); + msi_set_property( package->db, L"MsiRunningElevated", L"1", -1 ); } MSIPACKAGE *MSI_CreatePackage( MSIDATABASE *db )

1 0

Byeongsik Jeon : gdi32: Preserve the GGO_UNHINTED bits until used.
by Alexandre Julliard 21 Jan '21

21 Jan '21

Module: wine Branch: master Commit: f0267395645eb8fc3b8409d7ae3b43e41929469a URL: https://source.winehq.org/git/wine.git/?a=commit;h=f0267395645eb8fc3b8409d7… Author: Byeongsik Jeon <bsjeon(a)hanmail.net> Date: Mon Jan 11 13:18:42 2021 +0900 gdi32: Preserve the GGO_UNHINTED bits until used. Fix a regression caused by 044315c0b3890676d9fd751d8191b0b7381e0b97. Signed-off-by: Byeongsik Jeon <bsjeon(a)hanmail.net> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 3 +-- dlls/gdi32/freetype.c | 2 ++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index afd41aeec31..74ca4825de4 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -2955,6 +2955,7 @@ static DWORD get_glyph_outline( struct gdi_font *font, UINT glyph, UINT format, /* Windows bitmap font, e.g. Small Fonts, uses ANSI character code as glyph index. "Treasure Adventure Game" depends on this. */ font_funcs->get_glyph_index( font, &index, FALSE ); + format &= ~GGO_GLYPH_INDEX; /* TODO: Window also turns off tategaki for glyphs passed in by index if their unicode code points fall outside of the range that is rotated. */ @@ -2970,8 +2971,6 @@ static DWORD get_glyph_outline( struct gdi_font *font, UINT glyph, UINT format, } } - format &= ~(GGO_GLYPH_INDEX | GGO_UNHINTED); - if (mat && !memcmp( mat, &identity, sizeof(*mat) )) mat = NULL; if (format == GGO_METRICS && !mat && get_gdi_font_glyph_metrics( font, index, &gm, &abc )) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index fffa3288503..b3fc565afe8 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -3515,6 +3515,8 @@ static DWORD CDECL freetype_get_glyph_outline( struct gdi_font *font, UINT glyph font->matrix.eM11, font->matrix.eM12, font->matrix.eM21, font->matrix.eM22); + format &= ~GGO_UNHINTED; + needsTransform = get_transform_matrices( font, tategaki, lpmat, matrices ); vertical_metrics = (tategaki && FT_HAS_VERTICAL(ft_face));

1 0

Henri Verbeet : wined3d: Properly convert Vulkan sample count format information.
by Alexandre Julliard 21 Jan '21

21 Jan '21

Module: wine Branch: master Commit: e796da7a5eda98f455fb02c7a1ca1e188c01faa0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e796da7a5eda98f455fb02c7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 21 10:55:49 2021 +0100 wined3d: Properly convert Vulkan sample count format information. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/utils.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 4ec6e4db42d..e7e04e81557 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -4133,6 +4133,7 @@ static void init_vulkan_format_info(struct wined3d_format_vk *format, unsigned int flags; const char *fixup; unsigned int i; + uint32_t mask; VkResult vr; for (i = 0; i < ARRAY_SIZE(vulkan_formats); ++i) @@ -4208,7 +4209,13 @@ static void init_vulkan_format_info(struct wined3d_format_vk *format, ERR("Failed to get image format properties, vr %s.\n", wined3d_debug_vkresult(vr)); return; } - format->f.multisample_types = image_properties.sampleCounts; + + mask = image_properties.sampleCounts & 0x3f; + while (mask) + { + i = (1u << wined3d_bit_scan(&mask)) - 1; + format->f.multisample_types |= 1u << i; + } } }

1 0

Henri Verbeet : wined3d: End the current render pass in wined3d_buffer_vk_barrier().
by Alexandre Julliard 21 Jan '21

21 Jan '21

Module: wine Branch: master Commit: c75bbc5c22b4b884a1fef2ffea1ca5cddc4d590a URL: https://source.winehq.org/git/wine.git/?a=commit;h=c75bbc5c22b4b884a1fef2ff… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 21 10:55:50 2021 +0100 wined3d: End the current render pass in wined3d_buffer_vk_barrier(). As we do for image barriers. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index ad5a7680457..4ab26c05040 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1575,6 +1575,8 @@ void wined3d_buffer_vk_barrier(struct wined3d_buffer_vk *buffer_vk, TRACE(" %s -> %s.\n", wined3d_debug_bind_flags(buffer_vk->bind_mask), wined3d_debug_bind_flags(bind_mask)); + wined3d_context_vk_end_current_render_pass(context_vk); + vk_barrier.sType = VK_STRUCTURE_TYPE_BUFFER_MEMORY_BARRIER; vk_barrier.pNext = NULL; vk_barrier.srcAccessMask = vk_access_mask_from_bind_flags(buffer_vk->bind_mask);

1 0

Henri Verbeet : wined3d: Always include any depth/stencil attachment in the Vulkan framebuffer.
by Alexandre Julliard 21 Jan '21

21 Jan '21

Module: wine Branch: master Commit: a3f829bbb8894410c7e2e5f909ef37415c33deac URL: https://source.winehq.org/git/wine.git/?a=commit;h=a3f829bbb8894410c7e2e5f9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 21 10:55:51 2021 +0100 wined3d: Always include any depth/stencil attachment in the Vulkan framebuffer. Analogous to the GL backend. The alternative would be to potentially invalidate STATE_FRAMEBUFFER when changing the depth/stencil state object, which doesn't seem worth it. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context_vk.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index 04d24ba163a..b8414155dc0 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -2174,7 +2174,7 @@ static bool wined3d_context_vk_begin_render_pass(struct wined3d_context_vk *cont ++attachment_count; } - if (wined3d_state_uses_depth_buffer(state) && (view = state->fb.depth_stencil)) + if ((view = state->fb.depth_stencil)) { rtv_vk = wined3d_rendertarget_view_vk(view); vk_views[attachment_count] = wined3d_rendertarget_view_vk_get_image_view(rtv_vk, context_vk); @@ -2191,7 +2191,7 @@ static bool wined3d_context_vk_begin_render_pass(struct wined3d_context_vk *cont } if (!(context_vk->vk_render_pass = wined3d_context_vk_get_render_pass(context_vk, &state->fb, - ARRAY_SIZE(state->fb.render_targets), wined3d_state_uses_depth_buffer(state), 0))) + ARRAY_SIZE(state->fb.render_targets), !!state->fb.depth_stencil, 0))) { ERR("Failed to get render pass.\n"); return false;

1 0

Henri Verbeet : wined3d: Stencil test also uses the depth/stencil buffer.
by Alexandre Julliard 21 Jan '21

21 Jan '21

Module: wine Branch: master Commit: c47b28f5d4324ec77404319a1dc22584f006ed1f URL: https://source.winehq.org/git/wine.git/?a=commit;h=c47b28f5d4324ec77404319a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 21 10:55:52 2021 +0100 wined3d: Stencil test also uses the depth/stencil buffer. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/wined3d_private.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e010deb1264..07ddb57333c 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3709,7 +3709,8 @@ static inline bool wined3d_state_uses_depth_buffer(const struct wined3d_state *s { if (!state->depth_stencil_state) return true; - return state->depth_stencil_state->desc.depth || state->depth_stencil_state->desc.depth_write; + return state->depth_stencil_state->desc.depth || state->depth_stencil_state->desc.depth_write + || state->depth_stencil_state->desc.stencil; } struct wined3d_dummy_textures

1 0

Henri Verbeet : wined3d: Correct the argument order of a FIXME in wined3d_texture_vk_download_data().
by Alexandre Julliard 21 Jan '21

21 Jan '21

Module: wine Branch: master Commit: f0dae1d852a371293da00104ec861787f35865f9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f0dae1d852a371293da00104… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 21 10:55:53 2021 +0100 wined3d: Correct the argument order of a FIXME in wined3d_texture_vk_download_data(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 6f16868c5ad..5bb4de05d5c 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -4771,8 +4771,8 @@ static void wined3d_texture_vk_download_data(struct wined3d_context *context, if (dst_format->id != src_texture->resource.format->id) { FIXME("Unhandled format conversion (%s -> %s).\n", - debug_d3dformat(dst_format->id), - debug_d3dformat(src_texture->resource.format->id)); + debug_d3dformat(src_texture->resource.format->id), + debug_d3dformat(dst_format->id)); return; }

1 0

Nikolay Sivov : make_unicode: Remove unused variable.
by Alexandre Julliard 21 Jan '21

21 Jan '21

Module: wine Branch: master Commit: ea1afd6597a0868d2696864f94e9e664eb349a45 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ea1afd6597a0868d2696864f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jan 21 14:34:02 2021 +0300 make_unicode: Remove unused variable. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/make_unicode | 1 - 1 file changed, 1 deletion(-) diff --git a/tools/make_unicode b/tools/make_unicode index da4c732bc3e..5d180310b48 100755 --- a/tools/make_unicode +++ b/tools/make_unicode @@ -1235,7 +1235,6 @@ sub dump_linebreak($) { my $filename = shift; my @break_table; - my $next_group = 0; my $INPUT = open_data_file( $UNIDATA, "LineBreak.txt" ); while (<$INPUT>)

1 0

Hans Leidekker : wbemprox: Implement Win32_NetworkAdapter.GUID.
by Alexandre Julliard 21 Jan '21

21 Jan '21

Module: wine Branch: master Commit: ebff7de0c986f68b9c065e513c7a6bd125f3f616 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ebff7de0c986f68b9c065e51… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jan 21 12:36:39 2021 +0100 wbemprox: Implement Win32_NetworkAdapter.GUID. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50256 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/builtin.c | 27 ++++++++++++++++++++++----- dlls/wbemprox/tests/query.c | 27 +++++++++++++++++++++++++++ 2 files changed, 49 insertions(+), 5 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 39166a21171..d33cf1d03cc 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -197,6 +197,7 @@ static const struct column col_networkadapter[] = { L"AdapterTypeID", CIM_UINT16 }, { L"Description", CIM_STRING|COL_FLAG_DYNAMIC }, { L"DeviceId", CIM_STRING|COL_FLAG_DYNAMIC|COL_FLAG_KEY }, + { L"GUID", CIM_STRING|COL_FLAG_DYNAMIC }, { L"Index", CIM_UINT32 }, { L"InterfaceIndex", CIM_UINT32 }, { L"MACAddress", CIM_STRING|COL_FLAG_DYNAMIC }, @@ -603,6 +604,7 @@ struct record_networkadapter UINT16 adaptertypeid; const WCHAR *description; const WCHAR *device_id; + const WCHAR *guid; UINT32 index; UINT32 interface_index; const WCHAR *mac_address; @@ -2651,6 +2653,24 @@ static const WCHAR *get_adaptertype( DWORD type, int *id, int *physical ) } } +#define GUID_SIZE 39 +static WCHAR *guid_to_str( const GUID *ptr ) +{ + WCHAR *ret; + if (!(ret = heap_alloc( GUID_SIZE * sizeof(WCHAR) ))) return NULL; + swprintf( ret, GUID_SIZE, L"{%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}", + ptr->Data1, ptr->Data2, ptr->Data3, ptr->Data4[0], ptr->Data4[1], ptr->Data4[2], + ptr->Data4[3], ptr->Data4[4], ptr->Data4[5], ptr->Data4[6], ptr->Data4[7] ); + return ret; +} + +static WCHAR *get_networkadapter_guid( const IF_LUID *luid ) +{ + GUID guid; + if (ConvertInterfaceLuidToGuid( luid, &guid )) return NULL; + return guid_to_str( &guid ); +} + static enum fill_status fill_networkadapter( struct table *table, const struct expr *cond ) { WCHAR device_id[11]; @@ -2689,6 +2709,7 @@ static enum fill_status fill_networkadapter( struct table *table, const struct e rec->adaptertypeid = adaptertypeid; rec->description = heap_strdupW( aa->Description ); rec->device_id = heap_strdupW( device_id ); + rec->guid = get_networkadapter_guid( &aa->Luid ); rec->index = aa->u.s.IfIndex; rec->interface_index = aa->u.s.IfIndex; rec->mac_address = get_mac_address( aa->PhysicalAddress, aa->PhysicalAddressLength ); @@ -2877,13 +2898,9 @@ static struct array *get_ipsubnet( IP_ADAPTER_UNICAST_ADDRESS_LH *list ) static WCHAR *get_settingid( UINT32 index ) { GUID guid; - WCHAR *ret, *str; memset( &guid, 0, sizeof(guid) ); guid.Data1 = index; - UuidToStringW( &guid, &str ); - ret = heap_strdupW( str ); - RpcStringFreeW( &str ); - return ret; + return guid_to_str( &guid ); } static enum fill_status fill_networkadapterconfig( struct table *table, const struct expr *cond ) diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 67c0b218ce1..5a59f0a8f8f 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1144,6 +1144,32 @@ static void test_SystemSecurity( IWbemServices *services ) SysFreeString( class ); } +static void test_Win32_NetworkAdapter( IWbemServices *services ) +{ + BSTR wql = SysAllocString( L"wql" ), query = SysAllocString( L"SELECT * FROM Win32_NetworkAdapter" ); + IEnumWbemClassObject *result; + IWbemClassObject *obj; + HRESULT hr; + DWORD count; + + hr = IWbemServices_ExecQuery( services, wql, query, 0, NULL, &result ); + ok( hr == S_OK, "got %08x\n", hr ); + + for (;;) + { + hr = IEnumWbemClassObject_Next( result, 10000, 1, &obj, &count ); + if (hr != S_OK) break; + + check_property( obj, L"DeviceID", VT_BSTR, CIM_STRING ); + check_property( obj, L"Index", VT_I4, CIM_UINT32 ); + IWbemClassObject_Release( obj ); + } + + IEnumWbemClassObject_Release( result ); + SysFreeString( query ); + SysFreeString( wql ); +} + static void test_Win32_OperatingSystem( IWbemServices *services ) { BSTR wql = SysAllocString( L"wql" ), query = SysAllocString( L"SELECT * FROM Win32_OperatingSystem" ); @@ -1874,6 +1900,7 @@ START_TEST(query) test_Win32_DiskDrive( services ); test_Win32_DisplayControllerConfiguration( services ); test_Win32_IP4RouteTable( services ); + test_Win32_NetworkAdapter( services ); test_Win32_OperatingSystem( services ); test_Win32_PhysicalMemory( services ); test_Win32_PnPEntity( services );

1 0