September 2013 - Wine-Commits

Andrew Eikum : oleaut32: Improve TYPEDESC encoding for unknown VARTYPEs.
by Alexandre Julliard Sept. 6, 2013

Sept. 6, 2013

Module: wine Branch: master Commit: 664e7938cbe9c5d945dd41b24ddf8c7acb2a4e9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=664e7938cbe9c5d945dd41b24… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Sep 6 07:13:11 2013 -0500 oleaut32: Improve TYPEDESC encoding for unknown VARTYPEs. It's not worth printing a FIXME for every VARTYPE we don't happen to list in the switch statement. --- dlls/oleaut32/typelib.c | 57 +++++++++++++++------------------------------- 1 files changed, 19 insertions(+), 38 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index a27f5f4..9c1127f 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -9142,41 +9142,6 @@ static DWORD WMSFT_append_typedesc(TYPEDESC *desc, WMSFT_TLBFile *file, DWORD *o out_size = &junk2; vt = desc->vt & VT_TYPEMASK; - switch(vt){ - case VT_INT: - subtype = VT_I4; - break; - case VT_UINT: - subtype = VT_UI4; - break; - case VT_VOID: - subtype = VT_EMPTY; - break; - default: - subtype = vt; - break; - } - - switch(vt){ - case VT_INT: - case VT_UINT: - case VT_I1: - case VT_UI1: - case VT_I2: - case VT_UI2: - case VT_I4: - case VT_UI4: - case VT_BOOL: - case VT_R4: - case VT_ERROR: - case VT_BSTR: - case VT_HRESULT: - case VT_CY: - case VT_VOID: - case VT_VARIANT: - *out_mix = subtype; - return 0x80000000 | (subtype << 16) | desc->vt; - } if(vt == VT_PTR || vt == VT_SAFEARRAY){ DWORD mix; @@ -9193,9 +9158,25 @@ static DWORD WMSFT_append_typedesc(TYPEDESC *desc, WMSFT_TLBFile *file, DWORD *o encoded[1] = desc->u.hreftype; *out_mix = 0x7FFF; /* FIXME: Should get TYPEKIND of the hreftype, e.g. TKIND_ENUM => VT_I4 */ }else{ - FIXME("Don't know what to do! VT: 0x%x\n", desc->vt); - *out_mix = desc->vt; - return 0x80000000 | (desc->vt << 16) | desc->vt; + TRACE("Mixing in-place, VT: 0x%x\n", desc->vt); + + switch(vt){ + case VT_INT: + subtype = VT_I4; + break; + case VT_UINT: + subtype = VT_UI4; + break; + case VT_VOID: + subtype = VT_EMPTY; + break; + default: + subtype = vt; + break; + } + + *out_mix = subtype; + return 0x80000000 | (subtype << 16) | desc->vt; } data = file->typdesc_seg.data;

1 0

Stefan Dösinger : d3d9/tests: Test blocked texture creation restrictions.
by Alexandre Julliard Sept. 6, 2013

Sept. 6, 2013

Module: wine Branch: master Commit: b7b028ca4be8562c6ad10ada23ae21ed75068556 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7b028ca4be8562c6ad10ada2… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Sep 6 00:11:13 2013 +0200 d3d9/tests: Test blocked texture creation restrictions. --- dlls/d3d9/device.c | 8 ++ dlls/d3d9/tests/device.c | 225 ++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 218 insertions(+), 15 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b7b028ca4be8562c6ad10…

1 0

Stefan Dösinger : wined3d: Enforce texturing capability format restrictions on resource creation.
by Alexandre Julliard Sept. 6, 2013

Sept. 6, 2013

Module: wine Branch: master Commit: 80638b6d2f2e9a6e71df59e2780ded768219739a URL: http://source.winehq.org/git/wine.git/?a=commit;h=80638b6d2f2e9a6e71df59e27… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Sep 6 00:11:11 2013 +0200 wined3d: Enforce texturing capability format restrictions on resource creation. --- dlls/d3d8/texture.c | 3 +++ dlls/d3d9/texture.c | 3 +++ dlls/ddraw/surface.c | 13 ++++++++++++- dlls/wined3d/resource.c | 5 ++++- include/wine/wined3d.h | 1 + 5 files changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/d3d8/texture.c b/dlls/d3d8/texture.c index c870612..2388267 100644 --- a/dlls/d3d8/texture.c +++ b/dlls/d3d8/texture.c @@ -1197,6 +1197,7 @@ HRESULT texture_init(struct d3d8_texture *texture, struct d3d8_device *device, desc.multisample_type = WINED3D_MULTISAMPLE_NONE; desc.multisample_quality = 0; desc.usage = usage & WINED3DUSAGE_MASK; + desc.usage |= WINED3DUSAGE_TEXTURE; desc.pool = pool; desc.width = width; desc.height = height; @@ -1237,6 +1238,7 @@ HRESULT cubetexture_init(struct d3d8_texture *texture, struct d3d8_device *devic desc.multisample_type = WINED3D_MULTISAMPLE_NONE; desc.multisample_quality = 0; desc.usage = usage & WINED3DUSAGE_MASK; + desc.usage |= WINED3DUSAGE_TEXTURE; desc.pool = pool; desc.width = edge_length; desc.height = edge_length; @@ -1276,6 +1278,7 @@ HRESULT volumetexture_init(struct d3d8_texture *texture, struct d3d8_device *dev desc.multisample_type = WINED3D_MULTISAMPLE_NONE; desc.multisample_quality = 0; desc.usage = usage & WINED3DUSAGE_MASK; + desc.usage |= WINED3DUSAGE_TEXTURE; desc.pool = pool; desc.width = width; desc.height = height; diff --git a/dlls/d3d9/texture.c b/dlls/d3d9/texture.c index 7b46e6f..ad48205 100644 --- a/dlls/d3d9/texture.c +++ b/dlls/d3d9/texture.c @@ -1321,6 +1321,7 @@ HRESULT texture_init(struct d3d9_texture *texture, struct d3d9_device *device, desc.multisample_type = WINED3D_MULTISAMPLE_NONE; desc.multisample_quality = 0; desc.usage = usage & WINED3DUSAGE_MASK; + desc.usage |= WINED3DUSAGE_TEXTURE; desc.pool = pool; desc.width = width; desc.height = height; @@ -1361,6 +1362,7 @@ HRESULT cubetexture_init(struct d3d9_texture *texture, struct d3d9_device *devic desc.multisample_type = WINED3D_MULTISAMPLE_NONE; desc.multisample_quality = 0; desc.usage = usage & WINED3DUSAGE_MASK; + desc.usage |= WINED3DUSAGE_TEXTURE; desc.pool = pool; desc.width = edge_length; desc.height = edge_length; @@ -1400,6 +1402,7 @@ HRESULT volumetexture_init(struct d3d9_texture *texture, struct d3d9_device *dev desc.multisample_type = WINED3D_MULTISAMPLE_NONE; desc.multisample_quality = 0; desc.usage = usage & WINED3DUSAGE_MASK; + desc.usage |= WINED3DUSAGE_TEXTURE; desc.pool = pool; desc.width = width; desc.height = height; diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index b7136e1..8627a84 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -5608,16 +5608,27 @@ HRESULT ddraw_surface_create_texture(struct ddraw_surface *surface, DWORD surfac layers = 1; if (desc->ddsCaps.dwCaps2 & DDSCAPS2_TEXTUREMANAGE) + { + wined3d_desc.usage = WINED3DUSAGE_TEXTURE; pool = WINED3D_POOL_MANAGED; + } else if (desc->ddsCaps.dwCaps & DDSCAPS_SYSTEMMEMORY) + { + /* ddraw does not enforce format support restrictions on system memory + * textures. Don't set the texture flag, the texture can't be used for + * texturing anyway. */ + wined3d_desc.usage = 0; pool = WINED3D_POOL_SYSTEM_MEM; + } else + { + wined3d_desc.usage = WINED3DUSAGE_TEXTURE; pool = WINED3D_POOL_DEFAULT; + } wined3d_desc.format = wined3dformat_from_ddrawformat(&surface->surface_desc.u4.ddpfPixelFormat); wined3d_desc.multisample_type = WINED3D_MULTISAMPLE_NONE; wined3d_desc.multisample_quality = 0; - wined3d_desc.usage = 0; wined3d_desc.pool = pool; wined3d_desc.width = desc->dwWidth; wined3d_desc.height = desc->dwHeight; diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index e97af48..a677d00 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -70,7 +70,8 @@ static void resource_check_usage(DWORD usage) | WINED3DUSAGE_DYNAMIC | WINED3DUSAGE_AUTOGENMIPMAP | WINED3DUSAGE_STATICDECL - | WINED3DUSAGE_OVERLAY; + | WINED3DUSAGE_OVERLAY + | WINED3DUSAGE_TEXTURE; if (usage & ~handled) FIXME("Unhandled usage flags %#x.\n", usage & ~handled); @@ -92,6 +93,8 @@ HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device * return WINED3DERR_INVALIDCALL; if ((usage & WINED3DUSAGE_DEPTHSTENCIL) && !(format->flags & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL))) return WINED3DERR_INVALIDCALL; + if ((usage & WINED3DUSAGE_TEXTURE) && !(format->flags & WINED3DFMT_FLAG_TEXTURE)) + return WINED3DERR_INVALIDCALL; } resource->ref = 1; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index bf4b392..423af91 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -824,6 +824,7 @@ enum wined3d_display_rotation #define WINED3DUSAGE_AUTOGENMIPMAP 0x00000400 #define WINED3DUSAGE_DMAP 0x00004000 #define WINED3DUSAGE_MASK 0x00004fff +#define WINED3DUSAGE_TEXTURE 0x10000000 #define WINED3DUSAGE_OWNDC 0x20000000 #define WINED3DUSAGE_STATICDECL 0x40000000 #define WINED3DUSAGE_OVERLAY 0x80000000

1 0

Stefan Dösinger : ddraw: Create a sysmem surface if the format is not supported.
by Alexandre Julliard Sept. 6, 2013

Sept. 6, 2013

Module: wine Branch: master Commit: b464067313bff1fd9a25b284b48a252025c4504f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b464067313bff1fd9a25b284b… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Sep 6 00:11:10 2013 +0200 ddraw: Create a sysmem surface if the format is not supported. --- dlls/ddraw/ddraw.c | 21 +++++++++++++++++++++ 1 files changed, 21 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 15ab187..df4dcd6 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -3000,6 +3000,27 @@ static HRESULT CreateSurface(struct ddraw *ddraw, DDSURFACEDESC2 *DDSD, ddrawformat_from_wined3dformat(&desc2.u4.ddpfPixelFormat, mode.format_id); } + if (!(desc2.ddsCaps.dwCaps & (DDSCAPS_VIDEOMEMORY | DDSCAPS_SYSTEMMEMORY)) + && !(desc2.ddsCaps.dwCaps2 & DDSCAPS2_TEXTUREMANAGE)) + { + enum wined3d_format_id format = wined3dformat_from_ddrawformat(&desc2.u4.ddpfPixelFormat); + enum wined3d_resource_type rtype; + + if (desc2.ddsCaps.dwCaps & DDSCAPS_TEXTURE) + rtype = WINED3D_RTYPE_TEXTURE; + else if (desc2.ddsCaps.dwCaps2 & DDSCAPS2_CUBEMAP) + rtype = WINED3D_RTYPE_CUBE_TEXTURE; + else + rtype = WINED3D_RTYPE_SURFACE; + + hr = wined3d_check_device_format(ddraw->wined3d, WINED3DADAPTER_DEFAULT, WINED3D_DEVICE_TYPE_HAL, + mode.format_id, 0, rtype, format); + if (SUCCEEDED(hr)) + desc2.ddsCaps.dwCaps |= DDSCAPS_VIDEOMEMORY; + else + desc2.ddsCaps.dwCaps |= DDSCAPS_SYSTEMMEMORY; + } + /* No Width or no Height? Use the original screen size */ if(!(desc2.dwFlags & DDSD_WIDTH) ||

1 0

Stefan Dösinger : wined3d: Check the format block size before creating textures.
by Alexandre Julliard Sept. 6, 2013

Sept. 6, 2013

Module: wine Branch: master Commit: df5a0976e9f28836489e8977122844fe053278b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df5a0976e9f28836489e89771… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Sep 6 00:11:12 2013 +0200 wined3d: Check the format block size before creating textures. Sizes of textures and stand-alone surfaces must be multiples of the format's block size for DXTN formats. Since we create a texture for everything (except in ddraw), this check also takes care of stand-alone surfaces. --- dlls/wined3d/texture.c | 8 ++++++++ dlls/wined3d/utils.c | 19 +++++++++++-------- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 20 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 75ae8af..e60a426 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -41,6 +41,14 @@ static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struc debug_d3dusage(desc->usage), debug_d3dpool(desc->pool), desc->width, desc->height, desc->depth, device, parent, parent_ops, resource_ops); + if ((format->flags & (WINED3DFMT_FLAG_BLOCKS | WINED3DFMT_FLAG_BLOCKS_NO_VERIFY)) == WINED3DFMT_FLAG_BLOCKS) + { + UINT width_mask = format->block_width - 1; + UINT height_mask = format->block_height - 1; + if (desc->width & width_mask || desc->height & height_mask) + return WINED3DERR_INVALIDCALL; + } + if (FAILED(hr = resource_init(&texture->resource, device, desc->resource_type, format, desc->multisample_type, desc->multisample_quality, desc->usage, desc->pool, desc->width, desc->height, desc->depth, 0, parent, parent_ops, resource_ops))) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 61f7df0..9a56031 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -191,18 +191,19 @@ struct wined3d_format_block_info UINT block_width; UINT block_height; UINT block_byte_count; + BOOL verify; }; static const struct wined3d_format_block_info format_block_info[] = { - {WINED3DFMT_DXT1, 4, 4, 8}, - {WINED3DFMT_DXT2, 4, 4, 16}, - {WINED3DFMT_DXT3, 4, 4, 16}, - {WINED3DFMT_DXT4, 4, 4, 16}, - {WINED3DFMT_DXT5, 4, 4, 16}, - {WINED3DFMT_ATI2N, 4, 4, 16}, - {WINED3DFMT_YUY2, 2, 1, 4}, - {WINED3DFMT_UYVY, 2, 1, 4}, + {WINED3DFMT_DXT1, 4, 4, 8, TRUE}, + {WINED3DFMT_DXT2, 4, 4, 16, TRUE}, + {WINED3DFMT_DXT3, 4, 4, 16, TRUE}, + {WINED3DFMT_DXT4, 4, 4, 16, TRUE}, + {WINED3DFMT_DXT5, 4, 4, 16, TRUE}, + {WINED3DFMT_ATI2N, 4, 4, 16, FALSE}, + {WINED3DFMT_YUY2, 2, 1, 4, FALSE}, + {WINED3DFMT_UYVY, 2, 1, 4, FALSE}, }; struct wined3d_format_vertex_info @@ -1023,6 +1024,8 @@ static BOOL init_format_block_info(struct wined3d_gl_info *gl_info) format->block_height = format_block_info[i].block_height; format->block_byte_count = format_block_info[i].block_byte_count; format->flags |= WINED3DFMT_FLAG_BLOCKS; + if (!format_block_info[i].verify) + format->flags |= WINED3DFMT_FLAG_BLOCKS_NO_VERIFY; } return TRUE; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 28df2c9..5a8ced0 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2916,6 +2916,7 @@ extern enum wined3d_format_id pixelformat_for_depth(DWORD depth) DECLSPEC_HIDDEN #define WINED3DFMT_FLAG_BLOCKS 0x00020000 #define WINED3DFMT_FLAG_HEIGHT_SCALE 0x00040000 #define WINED3DFMT_FLAG_TEXTURE 0x00080000 +#define WINED3DFMT_FLAG_BLOCKS_NO_VERIFY 0x00100000 struct wined3d_rational {

1 0

Francois Gouget : winegcc: Add a trailing '\n' to the try_link() test file.
by Alexandre Julliard Sept. 6, 2013

Sept. 6, 2013

Module: wine Branch: master Commit: 4343c9e1f70457e37f75ec06947854c455dc1b98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4343c9e1f70457e37f75ec069… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Sep 6 14:33:17 2013 +0200 winegcc: Add a trailing '\n' to the try_link() test file. This stops the tested gcc command from issuing a warning on Solaris. --- tools/winegcc/winegcc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 969da3e..5cac73d 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -337,7 +337,7 @@ static int try_link( const strarray *prefix, const strarray *link_tool, const ch strarray *link = strarray_dup( link_tool ); int ret; - create_file( in, 0644, "int main(void){return 1;}" ); + create_file( in, 0644, "int main(void){return 1;}\n" ); strarray_add( link, "-o" ); strarray_add( link, out );

1 0

Bruno Jesus : ws2_32: Add parameters TRACE for WS_EnumProtocols.
by Alexandre Julliard Sept. 6, 2013

Sept. 6, 2013

Module: wine Branch: master Commit: 0b03dc93e96edec9c5d0aad0e4f8344d084b5c9e URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b03dc93e96edec9c5d0aad0e… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Fri Sep 6 09:13:53 2013 -0300 ws2_32: Add parameters TRACE for WS_EnumProtocols. --- dlls/ws2_32/socket.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index a916772..38b47fc 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -1704,6 +1704,9 @@ static INT WS_EnumProtocols( BOOL unicode, const INT *protocols, LPWSAPROTOCOL_I size = items * (unicode ? sizeof(WSAPROTOCOL_INFOW) : sizeof(WSAPROTOCOL_INFOA)); + TRACE("unicode %d, protocols %p, buffer %p, length %p %d, items %d, required %d\n", + unicode, protocols, buffer, len, len ? *len : 0, items, size); + if (*len < size || !buffer) { *len = size;

1 0

Bruno Jesus : ws2_32: Remove a FIXME message.
by Alexandre Julliard Sept. 6, 2013

Sept. 6, 2013

Module: wine Branch: master Commit: 4981b5b4466bfba3364bb4af1bf054a5df8be2b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4981b5b4466bfba3364bb4af1… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Fri Sep 6 09:14:06 2013 -0300 ws2_32: Remove a FIXME message. --- dlls/ws2_32/socket.c | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index d1256c1..ed55b64 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -1649,11 +1649,7 @@ static INT WS_EnterSingleProtocolW( INT protocol, WSAPROTOCOL_INFOW* info ) break; default: - if ((protocol == ISOPROTO_TP4) || (protocol == NSPROTO_SPX)) - FIXME("Protocol <%s> not implemented\n", - (protocol == ISOPROTO_TP4) ? "ISOPROTO_TP4" : "NSPROTO_SPX"); - else - FIXME("unknown Protocol <0x%08x>\n", protocol); + FIXME("unknown Protocol <0x%08x>\n", protocol); return SOCKET_ERROR; } return 1;

1 0

Stefan Dösinger : ddraw/tests: Test unsupported texture formats.
by Alexandre Julliard Sept. 6, 2013

Sept. 6, 2013

Module: wine Branch: master Commit: b92928333b42d16667db9b0aa650fcba59a5f069 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b92928333b42d16667db9b0aa… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Sep 6 00:11:16 2013 +0200 ddraw/tests: Test unsupported texture formats. --- dlls/ddraw/tests/ddraw1.c | 126 ++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw2.c | 126 ++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 126 ++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 127 +++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 505 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b92928333b42d16667db9…

1 0

Stefan Dösinger : ddraw/tests: Test blocked texture creation restrictions.
by Alexandre Julliard Sept. 6, 2013

Sept. 6, 2013

Module: wine Branch: master Commit: f69ba15a92acc4165669e39826aed0398206544a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f69ba15a92acc4165669e3982… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Sep 6 00:11:15 2013 +0200 ddraw/tests: Test blocked texture creation restrictions. --- dlls/ddraw/ddraw.c | 20 ++++- dlls/ddraw/surface.c | 10 ++ dlls/ddraw/tests/ddraw4.c | 219 +++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 219 +++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 464 insertions(+), 4 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f69ba15a92acc4165669e…

1 0