May 2020 - Wine-commits - list.winehq.org

Gijs Vermeulen : wtsapi32: Improve WTSQuerySessionInformationW stub.
by Alexandre Julliard 29 May '20

29 May '20

Module: wine Branch: master Commit: 116890da122da856c49dc66643bda5cd8360339b URL: https://source.winehq.org/git/wine.git/?a=commit;h=116890da122da856c49dc666… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Thu May 28 15:59:27 2020 +0200 wtsapi32: Improve WTSQuerySessionInformationW stub. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wtsapi32/tests/wtsapi.c | 19 +++++++++++++++++++ dlls/wtsapi32/wtsapi32.c | 11 +++++++++++ 2 files changed, 30 insertions(+) diff --git a/dlls/wtsapi32/tests/wtsapi.c b/dlls/wtsapi32/tests/wtsapi.c index f45598f548..c9312cd97c 100644 --- a/dlls/wtsapi32/tests/wtsapi.c +++ b/dlls/wtsapi32/tests/wtsapi.c @@ -97,6 +97,25 @@ static void test_WTSQuerySessionInformation(void) char *buf2; DWORD count; + SetLastError(0xdeadbeef); + count = 0; + ret = WTSQuerySessionInformationW(WTS_CURRENT_SERVER_HANDLE, WTS_CURRENT_SESSION, WTSUserName, NULL, &count); + ok(!ret, "got %u\n", GetLastError()); + ok(count == 0, "got %u\n", count); + ok(GetLastError() == ERROR_INVALID_USER_BUFFER, "got %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + count = 1; + ret = WTSQuerySessionInformationW(WTS_CURRENT_SERVER_HANDLE, WTS_CURRENT_SESSION, WTSUserName, NULL, &count); + ok(!ret, "got %u\n", GetLastError()); + ok(count == 1, "got %u\n", count); + ok(GetLastError() == ERROR_INVALID_USER_BUFFER, "got %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = WTSQuerySessionInformationW(WTS_CURRENT_SERVER_HANDLE, WTS_CURRENT_SESSION, WTSUserName, &buf1, NULL); + ok(!ret, "got %u\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_USER_BUFFER, "got %u\n", GetLastError()); + count = 0; buf1 = NULL; ret = WTSQuerySessionInformationW(WTS_CURRENT_SERVER_HANDLE, WTS_CURRENT_SESSION, WTSUserName, &buf1, &count); diff --git a/dlls/wtsapi32/wtsapi32.c b/dlls/wtsapi32/wtsapi32.c index 0ba05abf2c..ef3e0d10a0 100644 --- a/dlls/wtsapi32/wtsapi32.c +++ b/dlls/wtsapi32/wtsapi32.c @@ -341,6 +341,12 @@ BOOL WINAPI WTSQuerySessionInformationW( FIXME("Stub %p 0x%08x %d %p %p\n", hServer, SessionId, WTSInfoClass, Buffer, BytesReturned); + if (!Buffer || !BytesReturned) + { + SetLastError(ERROR_INVALID_USER_BUFFER); + return FALSE; + } + if (WTSInfoClass == WTSUserName) { WCHAR *username; @@ -354,6 +360,11 @@ BOOL WINAPI WTSQuerySessionInformationW( *BytesReturned = count * sizeof(WCHAR); return TRUE; } + else + { + *Buffer = NULL; + *BytesReturned = 0; + } return FALSE; }

1 0

Alexandre Julliard : ntdll: Don't call terminate_thread request if not necessary.
by Alexandre Julliard 29 May '20

29 May '20

Module: wine Branch: master Commit: 42bd67b576027ea6e7c53bccbd9476a2a97472cb URL: https://source.winehq.org/git/wine.git/?a=commit;h=42bd67b576027ea6e7c53bcc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 29 12:25:16 2020 +0200 ntdll: Don't call terminate_thread request if not necessary. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/thread.c | 18 ++++++++++-------- include/wine/server_protocol.h | 4 ++-- server/protocol.def | 1 - server/request.h | 1 - server/thread.c | 8 +------- server/trace.c | 1 - 6 files changed, 13 insertions(+), 20 deletions(-) diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 3d370f7a98..52f8b6ec61 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -738,17 +738,19 @@ NTSTATUS WINAPI NtAlertThread( HANDLE handle ) NTSTATUS WINAPI NtTerminateThread( HANDLE handle, LONG exit_code ) { NTSTATUS ret; - BOOL self; + BOOL self = (handle == GetCurrentThread()); - SERVER_START_REQ( terminate_thread ) + if (!self || exit_code) { - req->handle = wine_server_obj_handle( handle ); - req->exit_code = exit_code; - ret = wine_server_call( req ); - self = !ret && reply->self; + SERVER_START_REQ( terminate_thread ) + { + req->handle = wine_server_obj_handle( handle ); + req->exit_code = exit_code; + ret = wine_server_call( req ); + self = !ret && reply->self; + } + SERVER_END_REQ; } - SERVER_END_REQ; - if (self) abort_thread( exit_code ); return ret; } diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 3e205d4165..1fb345bc5f 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -938,7 +938,7 @@ struct terminate_thread_reply { struct reply_header __header; int self; - int last; + char __pad_12[4]; }; @@ -6685,7 +6685,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 604 +#define SERVER_PROTOCOL_VERSION 605 /* ### protocol_version end ### */ diff --git a/server/protocol.def b/server/protocol.def index 86efb01cc3..600113ff02 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -896,7 +896,6 @@ struct rawinput_device int exit_code; /* thread exit code */ @REPLY int self; /* suicide? */ - int last; /* last thread in this process? */ @END diff --git a/server/request.h b/server/request.h index 7a7feb3cf9..4a65296eb5 100644 --- a/server/request.h +++ b/server/request.h @@ -814,7 +814,6 @@ C_ASSERT( FIELD_OFFSET(struct terminate_thread_request, handle) == 12 ); C_ASSERT( FIELD_OFFSET(struct terminate_thread_request, exit_code) == 16 ); C_ASSERT( sizeof(struct terminate_thread_request) == 24 ); C_ASSERT( FIELD_OFFSET(struct terminate_thread_reply, self) == 8 ); -C_ASSERT( FIELD_OFFSET(struct terminate_thread_reply, last) == 12 ); C_ASSERT( sizeof(struct terminate_thread_reply) == 16 ); C_ASSERT( FIELD_OFFSET(struct get_process_info_request, handle) == 12 ); C_ASSERT( sizeof(struct get_process_info_request) == 16 ); diff --git a/server/thread.c b/server/thread.c index ea545d5c30..e2bfa50c7b 100644 --- a/server/thread.c +++ b/server/thread.c @@ -1489,17 +1489,11 @@ DECL_HANDLER(terminate_thread) { struct thread *thread; - reply->self = 0; - reply->last = 0; if ((thread = get_thread_from_handle( req->handle, THREAD_TERMINATE ))) { thread->exit_code = req->exit_code; if (thread != current) kill_thread( thread, 1 ); - else - { - reply->self = 1; - reply->last = (thread->process->running_threads == 1); - } + else reply->self = 1; release_object( thread ); } } diff --git a/server/trace.c b/server/trace.c index c5c006ce41..1f0e71f1b6 100644 --- a/server/trace.c +++ b/server/trace.c @@ -1368,7 +1368,6 @@ static void dump_terminate_thread_request( const struct terminate_thread_request static void dump_terminate_thread_reply( const struct terminate_thread_reply *req ) { fprintf( stderr, " self=%d", req->self ); - fprintf( stderr, ", last=%d", req->last ); } static void dump_get_process_info_request( const struct get_process_info_request *req )

1 0

Alexandre Julliard : ntdll: Create user shared data section in the server, and initialize it in wineboot.
by Alexandre Julliard 29 May '20

29 May '20

Module: wine Branch: master Commit: e854ea34cc481658ec61f4603d0438e075608c98 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e854ea34cc481658ec61f460… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 29 12:26:57 2020 +0200 ntdll: Create user shared data section in the server, and initialize it in wineboot. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 1 + dlls/ntdll/ntdll_misc.h | 2 +- dlls/ntdll/server.c | 3 -- dlls/ntdll/thread.c | 92 ++---------------------------------------- include/wine/server_protocol.h | 4 +- programs/wineboot/wineboot.c | 88 ++++++++++++++++++++++++++++++++++++++++ server/directory.c | 10 ++++- server/file.h | 6 +-- server/mapping.c | 39 +++++++++--------- server/process.c | 8 ---- server/protocol.def | 1 - server/request.h | 3 +- server/trace.c | 1 - 13 files changed, 128 insertions(+), 130 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e854ea34cc481658ec61…

1 0

Alexandre Julliard : ntdll: Don't include ntdll_misc.h from the Unix library.
by Alexandre Julliard 29 May '20

29 May '20

Module: wine Branch: master Commit: e6e2f2325a0a4eb14f10dd6df319b068761e9600 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e6e2f2325a0a4eb14f10dd6d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 29 15:48:44 2020 +0200 ntdll: Don't include ntdll_misc.h from the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/debug.c | 5 ++++- dlls/ntdll/unix/unix_private.h | 27 +++++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/debug.c b/dlls/ntdll/unix/debug.c index 7bc7787c9d..12e9cdd36d 100644 --- a/dlls/ntdll/unix/debug.c +++ b/dlls/ntdll/unix/debug.c @@ -33,8 +33,11 @@ # include <unistd.h> #endif +#include "windef.h" +#include "winnt.h" +#include "winternl.h" +#include "unix_private.h" #include "wine/debug.h" -#include "ntdll_misc.h" WINE_DECLARE_DEBUG_CHANNEL(pid); WINE_DECLARE_DEBUG_CHANNEL(timestamp); diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index 663036a699..749f9add57 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -23,6 +23,33 @@ #include "unixlib.h" +struct debug_info +{ + unsigned int str_pos; /* current position in strings buffer */ + unsigned int out_pos; /* current position in output buffer */ + char strings[1024]; /* buffer for temporary strings */ + char output[1024]; /* current output line */ +}; + +/* thread private data, stored in NtCurrentTeb()->GdiTebBatch */ +struct ntdll_thread_data +{ + struct debug_info *debug_info; /* info for debugstr functions */ + void *start_stack; /* stack for thread startup */ + int request_fd; /* fd for sending server requests */ + int reply_fd; /* fd for receiving server replies */ + int wait_fd[2]; /* fd for sleeping server requests */ + BOOL wow64_redir; /* Wow64 filesystem redirection flag */ + pthread_t pthread_id; /* pthread thread id */ +}; + +C_ASSERT( sizeof(struct ntdll_thread_data) <= sizeof(((TEB *)0)->GdiTebBatch) ); + +static inline struct ntdll_thread_data *ntdll_get_thread_data(void) +{ + return (struct ntdll_thread_data *)&NtCurrentTeb()->GdiTebBatch; +} + void CDECL mmap_add_reserved_area( void *addr, SIZE_T size ) DECLSPEC_HIDDEN; void CDECL mmap_remove_reserved_area( void *addr, SIZE_T size ) DECLSPEC_HIDDEN; int CDECL mmap_is_in_reserved_area( void *addr, SIZE_T size ) DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : ntdll: Move server initialization functions to the Unix library.
by Alexandre Julliard 29 May '20

29 May '20

Module: wine Branch: master Commit: 8a63b688ac49f19c259066fd100407edf3747f95 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8a63b688ac49f19c259066fd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 29 14:17:55 2020 +0200 ntdll: Move server initialization functions to the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/Makefile.in | 1 + dlls/ntdll/loader.c | 3 +- dlls/ntdll/ntdll_misc.h | 2 - dlls/ntdll/server.c | 578 +------------------------------ dlls/ntdll/thread.c | 4 +- dlls/ntdll/unix/loader.c | 16 +- dlls/ntdll/unix/server.c | 748 +++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/unix/unix_private.h | 14 + dlls/ntdll/unixlib.h | 13 +- 9 files changed, 792 insertions(+), 587 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8a63b688ac49f19c2590…

1 0

Alexandre Julliard : ntdll: Move fd cache functions to the Unix library.
by Alexandre Julliard 29 May '20

29 May '20

Module: wine Branch: master Commit: 1a743c9af39d0224b65ae504ae7e24d9fad56c2b URL: https://source.winehq.org/git/wine.git/?a=commit;h=1a743c9af39d0224b65ae504… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 29 15:35:16 2020 +0200 ntdll: Move fd cache functions to the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/cdrom.c | 2 +- dlls/ntdll/directory.c | 10 +- dlls/ntdll/file.c | 46 +++---- dlls/ntdll/loader.c | 2 +- dlls/ntdll/ntdll_misc.h | 3 - dlls/ntdll/om.c | 4 +- dlls/ntdll/serial.c | 4 +- dlls/ntdll/server.c | 226 +--------------------------------- dlls/ntdll/tape.c | 2 +- dlls/ntdll/thread.c | 2 +- dlls/ntdll/unix/loader.c | 6 +- dlls/ntdll/unix/server.c | 271 ++++++++++++++++++++++++++++++++++++++++- dlls/ntdll/unix/unix_private.h | 10 +- dlls/ntdll/unixlib.h | 11 +- dlls/ntdll/virtual.c | 6 +- 15 files changed, 335 insertions(+), 270 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1a743c9af39d0224b65a…

1 0

Alexandre Julliard : ntdll: Move server call functions to the Unix library.
by Alexandre Julliard 29 May '20

29 May '20

Module: wine Branch: master Commit: 01150d7f8d27ad5efdb824da938c4a9fa562a036 URL: https://source.winehq.org/git/wine.git/?a=commit;h=01150d7f8d27ad5efdb824da… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 29 15:53:42 2020 +0200 ntdll: Move server call functions to the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll_misc.h | 1 - dlls/ntdll/server.c | 102 +------------------------------------- dlls/ntdll/unix/loader.c | 2 + dlls/ntdll/unix/server.c | 109 +++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/unix/unix_private.h | 1 + dlls/ntdll/unixlib.h | 4 +- dlls/ntdll/virtual.c | 2 +- 7 files changed, 118 insertions(+), 103 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=01150d7f8d27ad5efdb8…

1 0

Nikolay Sivov : dwrite: Simplify glyph properties helpers by using current glyph buffer.
by Alexandre Julliard 29 May '20

29 May '20

Module: wine Branch: master Commit: 2e79405eec7f4e1a60e76e3ad49f401ae9e6e0a6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2e79405eec7f4e1a60e76e3a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 29 19:01:03 2020 +0300 dwrite: Simplify glyph properties helpers by using current glyph buffer. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/opentype.c | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index c6cfdb6133..8ed52d3be4 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -3167,14 +3167,15 @@ static unsigned int opentype_layout_get_glyph_class(const struct dwrite_fonttabl return glyph_class; } -static unsigned int opentype_set_glyph_props(struct scriptshaping_context *context, unsigned int g, UINT16 glyph) +static unsigned int opentype_set_glyph_props(struct scriptshaping_context *context, unsigned int idx) { struct scriptshaping_cache *cache = context->cache; unsigned int glyph_class = 0, props; if (cache->gdef.classdef) { - glyph_class = opentype_layout_get_glyph_class(&cache->gdef.table, cache->gdef.classdef, glyph); + glyph_class = opentype_layout_get_glyph_class(&cache->gdef.table, cache->gdef.classdef, + context->u.buffer.glyphs[idx]); } switch (glyph_class) @@ -3192,16 +3193,16 @@ static unsigned int opentype_set_glyph_props(struct scriptshaping_context *conte props = 0; } - context->glyph_infos[g].props = props; + context->glyph_infos[idx].props = props; return props; } -static void opentype_set_subst_glyph_props(struct scriptshaping_context *context, unsigned int g, UINT16 glyph) +static void opentype_set_subst_glyph_props(struct scriptshaping_context *context, unsigned int idx) { - unsigned int glyph_props = opentype_set_glyph_props(context, g, glyph); - context->u.subst.glyph_props[g].isDiacritic = !!(glyph_props == GLYPH_PROP_MARK); - context->u.subst.glyph_props[g].isZeroWidthSpace = !!(glyph_props == GLYPH_PROP_MARK); + unsigned int glyph_props = opentype_set_glyph_props(context, idx); + context->u.subst.glyph_props[idx].isDiacritic = !!(glyph_props == GLYPH_PROP_MARK); + context->u.subst.glyph_props[idx].isZeroWidthSpace = !!(glyph_props == GLYPH_PROP_MARK); } struct coverage_compare_format1_context @@ -4459,7 +4460,7 @@ void opentype_layout_apply_gpos_features(struct scriptshaping_context *context, opentype_layout_collect_lookups(context, script_index, language_index, features, &context->cache->gpos, &lookups); for (i = 0; i < context->glyph_count; ++i) - opentype_set_glyph_props(context, i, context->u.pos.glyphs[i]); + opentype_set_glyph_props(context, i); opentype_layout_set_glyph_masks(context, features); for (i = 0; i < lookups.count; ++i) @@ -4491,7 +4492,7 @@ static void opentype_layout_replace_glyph(struct scriptshaping_context *context, if (glyph != orig_glyph) { context->u.subst.glyphs[context->cur] = glyph; - opentype_set_subst_glyph_props(context, context->cur, glyph); + opentype_set_subst_glyph_props(context, context->cur); } context->cur++; } @@ -4673,7 +4674,7 @@ static BOOL opentype_layout_apply_gsub_mult_substitution(struct scriptshaping_co context->u.subst.glyph_props[idx + i].isClusterStart = 0; context->u.buffer.glyph_props[idx + i].components = 0; } - opentype_set_subst_glyph_props(context, idx + i, glyph); + opentype_set_subst_glyph_props(context, idx + i); /* Inherit feature mask from original matched glyph. */ context->glyph_infos[idx + i].mask = mask; } @@ -5181,10 +5182,10 @@ static void opentype_get_nominal_glyphs(struct scriptshaping_context *context, c if (*context->u.subst.digits && codepoint >= '0' && codepoint <= '9') codepoint = context->u.subst.digits[codepoint - '0']; - context->u.subst.glyphs[g] = font->get_glyph(context->cache->context, codepoint); + context->u.buffer.glyphs[g] = font->get_glyph(context->cache->context, codepoint); context->u.buffer.glyph_props[g].justification = SCRIPT_JUSTIFY_CHARACTER; context->u.buffer.glyph_props[g].isClusterStart = 1; - opentype_set_subst_glyph_props(context, g, context->u.subst.glyphs[g]); + opentype_set_subst_glyph_props(context, g); if (opentype_is_default_ignorable(codepoint)) context->u.buffer.glyph_props[g].isZeroWidthSpace = 1; context->u.buffer.glyph_props[g].components = 1;

1 0

Nikolay Sivov : dwrite: Implement mark glyph filtering.
by Alexandre Julliard 29 May '20

29 May '20

Module: wine Branch: master Commit: 5c9129723cabef5fa268b7af2383b4486bd9d492 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5c9129723cabef5fa268b7af… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 29 19:01:04 2020 +0300 dwrite: Implement mark glyph filtering. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/dwrite_private.h | 2 + dlls/dwrite/opentype.c | 214 ++++++++++++++++++++++++++++--------------- 2 files changed, 140 insertions(+), 76 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5c9129723cabef5fa268…

1 0

Nikolay Sivov : dwrite/tests: Enable glyph class tests on Wine.
by Alexandre Julliard 29 May '20

29 May '20

Module: wine Branch: master Commit: d7d276c34b160d927b4c87acc50c5982d34197ce URL: https://source.winehq.org/git/wine.git/?a=commit;h=d7d276c34b160d927b4c87ac… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 29 19:01:05 2020 +0300 dwrite/tests: Enable glyph class tests on Wine. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/analyzer.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dlls/dwrite/tests/analyzer.c b/dlls/dwrite/tests/analyzer.c index 38d6a68ef8..c5cf0954fe 100644 --- a/dlls/dwrite/tests/analyzer.c +++ b/dlls/dwrite/tests/analyzer.c @@ -1748,9 +1748,6 @@ if (0) { IDWriteFontFace_Release(fontface); /* Test setting glyph properties from GDEF. */ -if (strcmp(winetest_platform, "wine")) -{ - hr = IDWriteFactory_GetSystemFontCollection(factory, &syscoll, FALSE); ok(hr == S_OK, "Failed to get system collection, hr %#x.\n", hr); @@ -1794,7 +1791,6 @@ if (strcmp(winetest_platform, "wine")) } IDWriteFontCollection_Release(syscoll); -} IDWriteTextAnalyzer_Release(analyzer); }

1 0