June 2018 - Wine-Devel - list.winehq.org

Re: [PATCH] gdi32/tests: Test writing to the default palette.

by Huw Davies

Signed-off-by: Huw Davies <huw(a)codeweavers.com>

June 22, 2018

Re: [PATCH] winex11.drv: Move condition to the proper place.

by Huw Davies

Signed-off-by: Huw Davies <huw(a)codeweavers.com>

June 22, 2018

Re: [PATCH 1/1] wsdapi/tests: Add tests for MatchProbeEx.

by Huw Davies

Signed-off-by: Huw Davies <huw(a)codeweavers.com>

June 22, 2018

Re: [PATCH] gdi32: Add a workaround for A->W text output with Symbol font encoding.

by Huw Davies

On Fri, Jun 22, 2018 at 12:55:06PM +0800, Dmitry Timoshkov wrote: > There are 2 ways to output Ansi text: > 1. Call DrawTextA/ExtTextOutA, it uses font codepage for unicode translation. > 2. hfont = CreateFont("Wingdings", SYMBOL_CHARSET); > SendMessageA(hwnd, WM_SETFONT, hfont); > SendMessageA(hwnd, WM_SETTEXT, textA); > It uses current ANSI codepage for unicode translation. > > Currently #1 works correctly for Symbol fonts but #2 does not. This patch > makes #2 work as well. Since this is a text drawing bug I don't see a way > of adding a test case for this behaviour. Looks good. I've sent in a new version with a re-worded commit message that hopefully makes it clear that this isn't a work-around in Wine, but a work-around in Windows. I also fixed a grammar issue in an existing comment and took the opportunity to make the formatting more consistent. Huw.

June 22, 2018

Re: [PATCH] msvcp120: Add test for Concurrent_vector_Internal_compact.

by Piotr Caban

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>

June 22, 2018

[PATCH] gdi32: For symbol fonts check whether the char has been converted to Unicode.

by Huw Davies

From: Dmitry Timoshkov <dmitry(a)baikal.ru> This means that Unicode versions of text functions can use the result of a A->W conversion under CP_ACP. It's required so that the following will work: hfont = CreateFont("Wingdings", SYMBOL_CHARSET); SendMessageA(hwnd, WM_SETFONT, hfont); SendMessageA(hwnd, WM_SETTEXT, textA); Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdi32/freetype.c | 57 ++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 41 insertions(+), 16 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 1293e08a73..b7e2413753 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -6303,24 +6303,47 @@ static FT_UInt get_GSUB_vert_glyph(const GdiFont *font, UINT glyph) return GSUB_apply_feature(header, feature, glyph); } +static FT_UInt get_glyph_index_symbol(const GdiFont *font, UINT glyph) +{ + FT_UInt ret; + + if (glyph < 0x100) glyph += 0xf000; + /* there are a number of old pre-Unicode "broken" TTFs, which + do have symbols at U+00XX instead of U+f0XX */ + if (!(ret = pFT_Get_Char_Index(font->ft_face, glyph))) + ret = pFT_Get_Char_Index(font->ft_face, glyph - 0xf000); + + return ret; +} + static FT_UInt get_glyph_index(const GdiFont *font, UINT glyph) { - FT_UInt glyphId; + FT_UInt ret; + WCHAR wc; + char buf; - if(font->ft_face->charmap->encoding == FT_ENCODING_NONE) { - WCHAR wc = (WCHAR)glyph; + if (font->ft_face->charmap->encoding == FT_ENCODING_NONE) + { BOOL default_used; BOOL *default_used_pointer; - FT_UInt ret; - char buf; + default_used_pointer = NULL; default_used = FALSE; if (codepage_sets_default_used(font->codepage)) default_used_pointer = &default_used; - if(!WideCharToMultiByte(font->codepage, 0, &wc, 1, &buf, sizeof(buf), NULL, default_used_pointer) || default_used) + wc = (WCHAR)glyph; + if (!WideCharToMultiByte(font->codepage, 0, &wc, 1, &buf, sizeof(buf), NULL, default_used_pointer) || + default_used) { - if (font->codepage == CP_SYMBOL && wc < 0x100) - ret = pFT_Get_Char_Index(font->ft_face, (unsigned char)wc); + if (font->codepage == CP_SYMBOL) + { + ret = get_glyph_index_symbol(font, glyph); + if (!ret) + { + if (WideCharToMultiByte(CP_ACP, 0, &wc, 1, &buf, 1, NULL, NULL)) + ret = get_glyph_index_symbol(font, buf); + } + } else ret = 0; } @@ -6330,17 +6353,19 @@ static FT_UInt get_glyph_index(const GdiFont *font, UINT glyph) return ret; } - if(font->ft_face->charmap->encoding == FT_ENCODING_MS_SYMBOL) + if (font->ft_face->charmap->encoding == FT_ENCODING_MS_SYMBOL) { - if (glyph < 0x100) glyph += 0xf000; - /* there is a number of old pre-Unicode "broken" TTFs, which - do have symbols at U+00XX instead of U+f0XX */ - if (!(glyphId = pFT_Get_Char_Index(font->ft_face, glyph))) - glyphId = pFT_Get_Char_Index(font->ft_face, glyph-0xf000); + ret = get_glyph_index_symbol(font, glyph); + if (!ret) + { + wc = (WCHAR)glyph; + if (WideCharToMultiByte(CP_ACP, 0, &wc, 1, &buf, 1, NULL, NULL)) + ret = get_glyph_index_symbol(font, (unsigned char)buf); + } + return ret; } - else glyphId = pFT_Get_Char_Index(font->ft_face, glyph); - return glyphId; + return pFT_Get_Char_Index(font->ft_face, glyph); } /* helper for freetype_GetGlyphIndices */ -- 2.16.2

June 22, 2018

[PATCH] msvcp120: Add test for Concurrent_vector_Internal_compact.

by Hua Meng

Signed-off-by: Hua meng <161220092(a)smail.nju.edu.cn> --- dlls/msvcp120/tests/msvcp120.c | 102 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 101 insertions(+), 1 deletion(-) diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c index aec66fb259..0ec9fbd3b1 100644 --- a/dlls/msvcp120/tests/msvcp120.c +++ b/dlls/msvcp120/tests/msvcp120.c @@ -27,6 +27,11 @@ DWORD expect_idx; static int vector_alloc_count; static int vector_elem_count; +typedef struct blocks_to_free{ + size_t first_block; + void *blocks[sizeof(void*)*8]; + int size_check; +}compact_block; #define DEFINE_EXPECT(func) \ BOOL expect_ ## func, called_ ## func @@ -115,6 +120,8 @@ static void * (WINAPI *call_thiscall_func3)( void *func, void *this, const void const void *b ); static void * (WINAPI *call_thiscall_func4)( void *func, void *this, const void *a, const void *b, const void *c ); +static void * (WINAPI *call_thiscall_func5)( void *func, void *this, const void *a, + const void *b, const void *c, const void *d ); static void * (WINAPI *call_thiscall_func6)( void *func, void *this, const void *a, const void *b, const void *c, const void *d, const void *e ); @@ -131,6 +138,7 @@ static void init_thiscall_thunk(void) call_thiscall_func2 = (void *)thunk; call_thiscall_func3 = (void *)thunk; call_thiscall_func4 = (void *)thunk; + call_thiscall_func5 = (void *)thunk; call_thiscall_func6 = (void *)thunk; } @@ -140,6 +148,8 @@ static void init_thiscall_thunk(void) (const void*)(b)) #define call_func4(func,_this,a,b,c) call_thiscall_func4(func,_this,(const void*)(a),\ (const void*)(b),(const void*)(c)) +#define call_func5(func,_this,a,b,c,d) call_thiscall_func5(func,_this,(const void*)(a),\ + (const void*)(b),(const void*)(c),(const void*)(d)) #define call_func6(func,_this,a,b,c,d,e) call_thiscall_func6(func,_this,(const void*)(a),\ (const void*)(b),(const void*)(c),(const void*)(d),(const void*)(e)) #else @@ -149,6 +159,7 @@ static void init_thiscall_thunk(void) #define call_func2(func,_this,a) func(_this,a) #define call_func3(func,_this,a,b) func(_this,a,b) #define call_func4(func,_this,a,b,c) func(_this,a,b,c) +#define call_func5(func,_this,a,b,c,d) func(_this,a,b,c,d) #define call_func6(func,_this,a,b,c,d,e) func(_this,a,b,c,d,e) #endif /* __i386__ */ @@ -404,6 +415,9 @@ static void (__thiscall *p_vector_base_v4__Internal_assign)( void (__cdecl*)(void*, const void*, size_t), void (__cdecl*)(void*, const void*, size_t)); static void (__thiscall *p_vector_base_v4__Internal_swap)( vector_base_v4*, const vector_base_v4*); +static void* (__thiscall *p_vector_base_v4__Internal_compact)( + vector_base_v4*, size_t, void*, void (__cdecl*)(void*, size_t), + void (__cdecl*)(void*, const void*, size_t)); static HMODULE msvcp; #define SETNOFAIL(x,y) x = (void*)GetProcAddress(msvcp,y) @@ -552,6 +566,8 @@ static BOOL init(void) "?_Internal_assign(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IEAAXAEBV123(a)_KP6AXPEAX1@ZP6AX2PEBX1(a)Z5@Z"); SET(p_vector_base_v4__Internal_swap, "?_Internal_swap(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IEAAXAEAV123@@Z"); + SET(p_vector_base_v4__Internal_compact, + "?_Internal_compact(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IEAAPEAX_KPEAXP6AX10(a)ZP6AX1PEBX0@Z(a)Z"); } else { SET(p_tr2_sys__File_size, "?_File_size(a)sys@tr2(a)std@@YA_KPBD(a)Z"); @@ -669,6 +685,8 @@ static BOOL init(void) "?_Internal_assign(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IAEXABV123(a)IP6AXPAXI@ZP6AX1PBXI(a)Z4@Z"); SET(p_vector_base_v4__Internal_swap, "?_Internal_swap(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IAEXAAV123@@Z"); + SET(p_vector_base_v4__Internal_compact, + "?_Internal_compact(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IAEPAXIPAXP6AX0I(a)ZP6AX0PBXI@Z(a)Z"); #else SET(p__Thrd_current, "_Thrd_current"); @@ -714,6 +732,9 @@ static BOOL init(void) "?_Internal_assign(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IAAXABV123(a)IP6AXPAXI@ZP6AX1PBXI(a)Z4@Z"); SET(p_vector_base_v4__Internal_swap, "?_Internal_swap(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IAAXAAV123@@Z"); + SET(p_vector_base_v4__Internal_compact, + "?_Internal_compact(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IAAPAXIPAXP6AX0I(a)ZP6AX0PBXI@Z(a)Z"); + #endif } SET(p__Thrd_equal, @@ -2734,7 +2755,8 @@ static void test_vector_base_v4(void) { vector_base_v4 vector, v2; size_t idx, size; - int *data; + compact_block b; + int i, *data; concurrent_vector_int_ctor(&vector); @@ -2892,6 +2914,84 @@ static void test_vector_base_v4(void) CHECK_CALLED(concurrent_vector_int_destroy); concurrent_vector_int_dtor(&v2); + /* test for _Internal_compact */ + concurrent_vector_int_ctor(&v2); + for(i=0; i<2; i++) { + SET_EXPECT(concurrent_vector_int_alloc); + data = call_func3(p_vector_base_v4__Internal_push_back, &v2, sizeof(int), &idx); + CHECK_CALLED(concurrent_vector_int_alloc); + ok(data != NULL, "_Internal_push_back returned NULL\n"); + data = call_func3(p_vector_base_v4__Internal_push_back, &v2, sizeof(int), &idx); + ok(data != NULL, "_Internal_push_back returned NULL\n"); + vector_elem_count += 2; + } + ok(v2.first_block == 1, "v2.first_block got %ld expected 1\n", (long)v2.first_block); + ok(v2.early_size == 4, "v2.early_size got %ld expected 4\n", (long)v2.early_size); + memset(&b, 0xff, sizeof(b)); + SET_EXPECT(concurrent_vector_int_alloc); + SET_EXPECT(concurrent_vector_int_copy); + SET_EXPECT(concurrent_vector_int_destroy); + data = call_func5(p_vector_base_v4__Internal_compact, + &v2, sizeof(int), &b, concurrent_vector_int_destroy, + concurrent_vector_int_copy); + CHECK_CALLED(concurrent_vector_int_alloc); + CHECK_CALLED(concurrent_vector_int_copy); + CHECK_CALLED(concurrent_vector_int_destroy); + ok(v2.first_block == 2, "v2.first_block got %ld expected 2\n", (long)v2.first_block); + ok(v2.early_size == 4,"v2.early_size got %ld expected 4\n", (long)v2.early_size); + ok(b.first_block == 1, "b.first_block got %ld expected 1\n", (long)b.first_block); + for(i=0; i<2; i++){ + ok(b.blocks[i] != NULL, "b.blocks[%d] got NULL\n", i); + free(b.blocks[i]); + vector_alloc_count--; + } + for(; i<ARRAY_SIZE(b.blocks); i++) + ok(!b.blocks[i], "b.blocks[%d] != NULL\n", i); + ok(b.size_check == -1, "b.size_check = %x\n", b.size_check); + + SET_EXPECT(concurrent_vector_int_alloc); + data = call_func3(p_vector_base_v4__Internal_push_back, &v2, sizeof(int), &idx); + CHECK_CALLED(concurrent_vector_int_alloc); + ok(data != NULL, "_Internal_push_back returned NULL\n"); + for(i=0; i<3; i++){ + data = call_func3(p_vector_base_v4__Internal_push_back, &v2, sizeof(int), &idx); + ok(data != NULL, "_Internal_push_back returned NULL\n"); + } + SET_EXPECT(concurrent_vector_int_alloc); + data = call_func3(p_vector_base_v4__Internal_push_back, &v2, sizeof(int), &idx); + CHECK_CALLED(concurrent_vector_int_alloc); + ok(data != NULL, "_Internal_push_back returned NULL\n"); + vector_elem_count += 5; + ok(v2.first_block == 2, "v2.first_block got %ld expected 2\n", (long)v2.first_block); + ok(v2.early_size == 9, "v2.early_size got %ld expected 9\n", (long)v2.early_size); + memset(&b, 0xff, sizeof(b)); + SET_EXPECT(concurrent_vector_int_alloc); + SET_EXPECT(concurrent_vector_int_copy); + SET_EXPECT(concurrent_vector_int_destroy); + data = call_func5(p_vector_base_v4__Internal_compact, + &v2, sizeof(int), &b, concurrent_vector_int_destroy, + concurrent_vector_int_copy); + CHECK_CALLED(concurrent_vector_int_alloc); + CHECK_CALLED(concurrent_vector_int_copy); + CHECK_CALLED(concurrent_vector_int_destroy); + ok(v2.first_block == 4, "v2.first_block got %ld expected 4\n", (long)v2.first_block); + ok(v2.early_size == 9, "v2.early_size got %ld expected 9\n", (long)v2.early_size); + ok(b.first_block == 2, "b.first_block got %ld expected 2\n", (long)b.first_block); + for(i=0; i<4; i++){ + ok(b.blocks[i] != NULL, "b.blocks[%d] got NULL\n", i); + /* only b.blocks[0] and b.blocks[>=b.first_block] are used */ + if(i == b.first_block-1) continue; + free(b.blocks[i]); + vector_alloc_count--; + } + for(; i<ARRAY_SIZE(b.blocks); i++) + ok(!b.blocks[i], "b.blocks[%d] != NULL\n", i); + SET_EXPECT(concurrent_vector_int_destroy); + size = (size_t)call_func2(p_vector_base_v4__Internal_clear, + &v2, concurrent_vector_int_destroy); + CHECK_CALLED(concurrent_vector_int_destroy); + concurrent_vector_int_dtor(&v2); + SET_EXPECT(concurrent_vector_int_destroy); size = (size_t)call_func2(p_vector_base_v4__Internal_clear, &vector, concurrent_vector_int_destroy); -- 2.11.0

June 22, 2018

Re: [PATCH] fonts: Add clock images to Wingdings font.

by Dmitry Timoshkov

Alexandre Julliard <julliard(a)winehq.org> wrote: > > Glyphs were copied from the Android Emoji font. > > As far as I can tell, this Android font is under the SIL Open Font > License, which is not LGPL-compatible. I had an impression that this font is part of the Android codebase which is under a BSD-like license. Perhaps you have a suggestion for the font with a compatible license? -- Dmitry.

June 22, 2018

Re: [PATCH] fonts: Add clock images to Wingdings font.

by Alexandre Julliard

Dmitry Timoshkov <dmitry(a)baikal.ru> writes: > Glyphs were copied from the Android Emoji font. As far as I can tell, this Android font is under the SIL Open Font License, which is not LGPL-compatible. -- Alexandre Julliard julliard(a)winehq.org

June 22, 2018

Re: [PATCH 2/2] msi: Add support for re-caching package

by Hans Leidekker

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com>

June 22, 2018

Re: [PATCH 1/2] msi: Report error when cached installer has different version

by Hans Leidekker

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com>

June 22, 2018

Re: [PATCH] d2d1: Stop redefination on older compilers

by Alistair Leslie-Hughes

https://bugs.winehq.org/show_bug.cgi?id=44052 Comment #25 Regards Alistair ________________________________ From: Henri Verbeet <hverbeet(a)gmail.com> Sent: Friday, June 22, 2018 6:23:48 PM To: Alistair Leslie-Hughes Cc: wine-devel(a)winehq.org Subject: Re: [PATCH] d2d1: Stop redefination on older compilers On 22 June 2018 at 06:30, Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> wrote: > Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> > --- > dlls/d2d1/d2d1_private.h | 3 ++- > dlls/d2d1/tests/d2d1.c | 7 ++++--- > 2 files changed, 6 insertions(+), 4 deletions(-) > What are you trying to fix exactly?

June 22, 2018

[PATCH] fonts: Add clock images to Wingdings font.

by Dmitry Timoshkov

Glyphs were copied from the Android Emoji font. wingding.ttf should be rebuilt in maintainer mode after applying this patch. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- fonts/wingding.sfd | 1903 +++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 1900 insertions(+), 3 deletions(-) diff --git a/fonts/wingding.sfd b/fonts/wingding.sfd index c46152b077..940b1d686c 100644 --- a/fonts/wingding.sfd +++ b/fonts/wingding.sfd @@ -47,12 +47,12 @@ LangName: 1033 "" "" "" "" "" "" "" "" "" "" "" "http://www.winehq.org" "" "This Encoding: Symbol UnicodeInterp: none NameList: Adobe Glyph List -DisplaySize: -48 +DisplaySize: -72 AntiAlias: 1 FitToEm: 1 -WinInfo: 0 29 12 +WinInfo: 0 25 9 TeXData: 1 0 0 708670 354335 236222 1342177 -2147484 236222 783286 444596 497025 792723 393216 433062 380633 303038 157286 324010 404750 52429 2506097 1059062 262144 -BeginChars: 256 38 +BeginChars: 256 50 StartChar: f020 Encoding: 0 61472 0 @@ -788,5 +788,1902 @@ LayerCount: 2 Fore Refer: 34 63724 N 0 1 -1 0 1653 -173 2 EndChar + +StartChar: bullet +Encoding: 183 8226 38 +Width: 2048 +Flags: W +LayerCount: 2 +Fore +SplineSet +1024 1538 m 0,0,1 + 1239 1538 1239 1538 1427 1430 c 128,-1,2 + 1615 1322 1615 1322 1723 1133.5 c 128,-1,3 + 1831 945 1831 945 1831 731 c 0,4,5 + 1831 515 1831 515 1722 327.5 c 128,-1,6 + 1613 140 1613 140 1425.5 32.5 c 128,-1,7 + 1238 -75 1238 -75 1024 -75 c 0,8,9 + 808 -75 808 -75 621 33 c 128,-1,10 + 434 141 434 141 326 328 c 128,-1,11 + 218 515 218 515 218 731 c 0,12,13 + 218 945 218 945 325.5 1132.5 c 128,-1,14 + 433 1320 433 1320 620.5 1429 c 128,-1,15 + 808 1538 808 1538 1024 1538 c 0,0,1 +1024 3 m 0,16,17 + 1220 3 1220 3 1389 101 c 128,-1,18 + 1558 199 1558 199 1655.5 367.5 c 128,-1,19 + 1753 536 1753 536 1753 731 c 0,20,21 + 1753 927 1753 927 1655 1096 c 128,-1,22 + 1557 1265 1557 1265 1388.5 1362.5 c 128,-1,23 + 1220 1460 1220 1460 1024 1460 c 256,24,25 + 828 1460 828 1460 659.5 1362 c 128,-1,26 + 491 1264 491 1264 393.5 1095.5 c 128,-1,27 + 296 927 296 927 296 731 c 256,28,29 + 296 535 296 535 394 366.5 c 128,-1,30 + 492 198 492 198 660.5 100.5 c 128,-1,31 + 829 3 829 3 1024 3 c 0,16,17 +1285 1066 m 1,32,-1 + 1129 796 l 1,33,34 + 1148 766 1148 766 1148 731 c 0,35,36 + 1148 680 1148 680 1112 644 c 128,-1,37 + 1076 608 1076 608 1024 608 c 0,38,39 + 973 608 973 608 937 644 c 128,-1,40 + 901 680 901 680 901 731 c 0,41,42 + 901 766 901 766 919 794.5 c 128,-1,43 + 937 823 937 823 966 840 c 1,44,-1 + 966 1396 l 1,45,-1 + 1082 1396 l 1,46,-1 + 1082 948 l 1,47,-1 + 1184 1124 l 1,48,-1 + 1285 1066 l 1,32,-1 +978 731 m 0,49,50 + 978 716 978 716 990.5 700.5 c 128,-1,51 + 1003 685 1003 685 1024 685 c 0,52,53 + 1040 685 1040 685 1055.5 696.5 c 128,-1,54 + 1071 708 1071 708 1071 731 c 0,55,56 + 1071 751 1071 751 1057.5 764 c 128,-1,57 + 1044 777 1044 777 1024 777 c 0,58,59 + 1005 777 1005 777 991.5 764 c 128,-1,60 + 978 751 978 751 978 731 c 0,49,50 +1654 777 m 0,61,62 + 1674 777 1674 777 1687.5 764 c 128,-1,63 + 1701 751 1701 751 1701 731 c 0,64,65 + 1701 712 1701 712 1687.5 698.5 c 128,-1,66 + 1674 685 1674 685 1654 685 c 0,67,68 + 1635 685 1635 685 1621.5 698.5 c 128,-1,69 + 1608 712 1608 712 1608 731 c 0,70,71 + 1608 751 1608 751 1621.5 764 c 128,-1,72 + 1635 777 1635 777 1654 777 c 0,61,62 +1570 1000 m 0,73,74 + 1552 1000 1552 1000 1538 1013 c 128,-1,75 + 1524 1026 1524 1026 1524 1046 c 0,76,77 + 1524 1063 1524 1063 1536.5 1078 c 128,-1,78 + 1549 1093 1549 1093 1569 1093 c 0,79,80 + 1588 1093 1588 1093 1602 1080 c 128,-1,81 + 1616 1067 1616 1067 1616 1047 c 0,82,83 + 1616 1020 1616 1020 1594 1006 c 1,84,85 + 1582 1000 1582 1000 1570 1000 c 0,73,74 +1386 1277 m 0,86,87 + 1386 1256 1386 1256 1371.5 1243 c 128,-1,88 + 1357 1230 1357 1230 1340 1230 c 0,89,90 + 1319 1230 1319 1230 1306 1245 c 128,-1,91 + 1293 1260 1293 1260 1293 1277 c 0,92,93 + 1293 1297 1293 1297 1307.5 1310 c 128,-1,94 + 1322 1323 1322 1323 1339 1323 c 0,95,96 + 1358 1323 1358 1323 1372 1310 c 128,-1,97 + 1386 1297 1386 1297 1386 1277 c 0,86,87 +709 1323 m 256,98,99 + 727 1323 727 1323 741.5 1310.5 c 128,-1,100 + 756 1298 756 1298 756 1277 c 0,101,102 + 756 1259 756 1259 743 1244.5 c 128,-1,103 + 730 1230 730 1230 709 1230 c 0,104,105 + 692 1230 692 1230 677.5 1243 c 128,-1,106 + 663 1256 663 1256 663 1277 c 0,107,108 + 663 1297 663 1297 677 1310 c 128,-1,109 + 691 1323 691 1323 709 1323 c 256,98,99 +525 1046 m 0,110,111 + 525 1025 525 1025 510 1012.5 c 128,-1,112 + 495 1000 495 1000 478 1000 c 0,113,114 + 458 1000 458 1000 445 1014.5 c 128,-1,115 + 432 1029 432 1029 432 1046 c 0,116,117 + 432 1066 432 1066 446 1079.5 c 128,-1,118 + 460 1093 460 1093 479 1093 c 256,119,120 + 498 1093 498 1093 511.5 1079 c 128,-1,121 + 525 1065 525 1065 525 1046 c 0,110,111 +394 777 m 256,122,123 + 414 777 414 777 427.5 764 c 128,-1,124 + 441 751 441 751 441 731 c 0,125,126 + 441 712 441 712 427.5 698.5 c 128,-1,127 + 414 685 414 685 394 685 c 256,128,129 + 374 685 374 685 361 698.5 c 128,-1,130 + 348 712 348 712 348 731 c 0,131,132 + 348 751 348 751 361 764 c 128,-1,133 + 374 777 374 777 394 777 c 256,122,123 +477 462 m 256,134,135 + 496 462 496 462 510.5 449.5 c 128,-1,136 + 525 437 525 437 525 416 c 0,137,138 + 525 397 525 397 512 383.5 c 128,-1,139 + 499 370 499 370 478 370 c 0,140,141 + 460 370 460 370 446 383.5 c 128,-1,142 + 432 397 432 397 432 417 c 256,143,144 + 432 437 432 437 445 449.5 c 128,-1,145 + 458 462 458 462 477 462 c 256,134,135 +756 185 m 0,146,147 + 756 164 756 164 741.5 151.5 c 128,-1,148 + 727 139 727 139 709 139 c 0,149,150 + 689 139 689 139 676 153.5 c 128,-1,151 + 663 168 663 168 663 185 c 0,152,153 + 663 206 663 206 677.5 219 c 128,-1,154 + 692 232 692 232 709 232 c 0,155,156 + 721 232 721 232 733 226 c 1,157,158 + 756 211 756 211 756 185 c 0,146,147 +1024 147 m 256,159,160 + 1044 147 1044 147 1057.5 134 c 128,-1,161 + 1071 121 1071 121 1071 101 c 256,162,163 + 1071 81 1071 81 1057.5 67.5 c 128,-1,164 + 1044 54 1044 54 1024 54 c 0,165,166 + 1005 54 1005 54 991.5 67.5 c 128,-1,167 + 978 81 978 81 978 101 c 256,168,169 + 978 121 978 121 991 134 c 128,-1,170 + 1004 147 1004 147 1024 147 c 256,159,160 +1339 232 m 0,171,172 + 1357 232 1357 232 1371.5 219 c 128,-1,173 + 1386 206 1386 206 1386 185 c 0,174,175 + 1386 168 1386 168 1373 153.5 c 128,-1,176 + 1360 139 1360 139 1339 139 c 0,177,178 + 1322 139 1322 139 1307.5 152 c 128,-1,179 + 1293 165 1293 165 1293 185 c 0,180,181 + 1293 204 1293 204 1306.5 218 c 128,-1,182 + 1320 232 1320 232 1339 232 c 0,171,172 +1616 415 m 0,183,184 + 1616 394 1616 394 1601.5 382 c 128,-1,185 + 1587 370 1587 370 1570 370 c 0,186,187 + 1550 370 1550 370 1537 384.5 c 128,-1,188 + 1524 399 1524 399 1524 416 c 0,189,190 + 1524 436 1524 436 1537.5 449 c 128,-1,191 + 1551 462 1551 462 1571 462 c 256,192,193 + 1591 462 1591 462 1603.5 449.5 c 128,-1,194 + 1616 437 1616 437 1616 415 c 0,183,184 +EndSplineSet +EndChar + +StartChar: divide +Encoding: 184 247 39 +Width: 2048 +Flags: W +LayerCount: 2 +Fore +SplineSet +1024 1538 m 0,0,1 + 1238 1538 1238 1538 1425.5 1430.5 c 128,-1,2 + 1613 1323 1613 1323 1722 1135.5 c 128,-1,3 + 1831 948 1831 948 1831 732 c 0,4,5 + 1831 514 1831 514 1722 327 c 128,-1,6 + 1613 140 1613 140 1425 32.5 c 128,-1,7 + 1237 -75 1237 -75 1024 -75 c 0,8,9 + 808 -75 808 -75 621 33 c 128,-1,10 + 434 141 434 141 326 328 c 128,-1,11 + 218 515 218 515 218 732 c 0,12,13 + 218 948 218 948 326 1135 c 128,-1,14 + 434 1322 434 1322 621 1430 c 128,-1,15 + 808 1538 808 1538 1024 1538 c 0,0,1 +1024 2 m 0,16,17 + 1219 2 1219 2 1387 98.5 c 128,-1,18 + 1555 195 1555 195 1654 364.5 c 128,-1,19 + 1753 534 1753 534 1753 732 c 0,20,21 + 1753 928 1753 928 1655 1096.5 c 128,-1,22 + 1557 1265 1557 1265 1388.5 1362.5 c 128,-1,23 + 1220 1460 1220 1460 1024 1460 c 256,24,25 + 828 1460 828 1460 659.5 1362 c 128,-1,26 + 491 1264 491 1264 393.5 1095.5 c 128,-1,27 + 296 927 296 927 296 732 c 0,28,29 + 296 534 296 534 395.5 364.5 c 128,-1,30 + 495 195 495 195 663 98.5 c 128,-1,31 + 831 2 831 2 1024 2 c 0,16,17 +1359 992 m 1,32,-1 + 1417 891 l 1,33,-1 + 1147 735 l 1,34,-1 + 1148 732 l 1,35,36 + 1148 680 1148 680 1111.5 644 c 128,-1,37 + 1075 608 1075 608 1024 608 c 256,38,39 + 973 608 973 608 937 644 c 128,-1,40 + 901 680 901 680 901 732 c 0,41,42 + 901 767 901 767 919 795.5 c 128,-1,43 + 937 824 937 824 966 839 c 1,44,-1 + 966 1396 l 1,45,-1 + 1082 1396 l 1,46,-1 + 1082 839 l 1,47,-1 + 1089 836 l 1,48,-1 + 1359 992 l 1,32,-1 +1654 778 m 0,49,50 + 1674 778 1674 778 1687.5 764.5 c 128,-1,51 + 1701 751 1701 751 1701 732 c 0,52,53 + 1701 712 1701 712 1687.5 698 c 128,-1,54 + 1674 684 1674 684 1654 684 c 0,55,56 + 1635 684 1635 684 1621.5 698 c 128,-1,57 + 1608 712 1608 712 1608 732 c 0,58,59 + 1608 751 1608 751 1621.5 764.5 c 128,-1,60 + 1635 778 1635 778 1654 778 c 0,49,50 +756 185 m 0,61,62 + 756 164 756 164 741.5 151.5 c 128,-1,63 + 727 139 727 139 709 139 c 0,64,65 + 689 139 689 139 676 153.5 c 128,-1,66 + 663 168 663 168 663 186 c 0,67,68 + 663 206 663 206 677.5 219 c 128,-1,69 + 692 232 692 232 709 232 c 0,70,71 + 729 232 729 232 742.5 218.5 c 128,-1,72 + 756 205 756 205 756 185 c 0,61,62 +1024 684 m 0,73,74 + 1043 684 1043 684 1057 698 c 128,-1,75 + 1071 712 1071 712 1071 732 c 0,76,77 + 1071 751 1071 751 1057.5 764.5 c 128,-1,78 + 1044 778 1044 778 1024 778 c 0,79,80 + 1005 778 1005 778 991.5 764.5 c 128,-1,81 + 978 751 978 751 978 732 c 0,82,83 + 978 712 978 712 992.5 698 c 128,-1,84 + 1007 684 1007 684 1024 684 c 0,73,74 +394 778 m 256,85,86 + 414 778 414 778 427.5 764.5 c 128,-1,87 + 441 751 441 751 441 732 c 0,88,89 + 441 712 441 712 428 698.5 c 128,-1,90 + 415 685 415 685 396 685 c 0,91,92 + 376 685 376 685 362 698.5 c 128,-1,93 + 348 712 348 712 348 732 c 0,94,95 + 348 751 348 751 361 764.5 c 128,-1,96 + 374 778 374 778 394 778 c 256,85,86 +1339 232 m 0,97,98 + 1357 232 1357 232 1371.5 219 c 128,-1,99 + 1386 206 1386 206 1386 186 c 0,100,101 + 1386 168 1386 168 1373 153.5 c 128,-1,102 + 1360 139 1360 139 1339 139 c 0,103,104 + 1322 139 1322 139 1307.5 152 c 128,-1,105 + 1293 165 1293 165 1293 185 c 0,106,107 + 1293 206 1293 206 1306.5 219 c 128,-1,108 + 1320 232 1320 232 1339 232 c 0,97,98 +710 1323 m 0,109,110 + 727 1323 727 1323 741.5 1310.5 c 128,-1,111 + 756 1298 756 1298 756 1277 c 0,112,113 + 756 1259 756 1259 743 1244.5 c 128,-1,114 + 730 1230 730 1230 709 1230 c 0,115,116 + 692 1230 692 1230 677.5 1243 c 128,-1,117 + 663 1256 663 1256 663 1277 c 0,118,119 + 663 1297 663 1297 677 1310 c 128,-1,120 + 691 1323 691 1323 710 1323 c 0,109,110 +479 462 m 0,121,122 + 496 462 496 462 510.5 450 c 128,-1,123 + 525 438 525 438 525 417 c 0,124,125 + 525 399 525 399 512 384 c 128,-1,126 + 499 369 499 369 478 369 c 0,127,128 + 460 369 460 369 446 382.5 c 128,-1,129 + 432 396 432 396 432 417 c 0,130,131 + 432 437 432 437 446.5 449.5 c 128,-1,132 + 461 462 461 462 479 462 c 0,121,122 +1024 147 m 256,133,134 + 1044 147 1044 147 1057.5 134 c 128,-1,135 + 1071 121 1071 121 1071 101 c 0,136,137 + 1071 82 1071 82 1057.5 68 c 128,-1,138 + 1044 54 1044 54 1024 54 c 0,139,140 + 1005 54 1005 54 991.5 68 c 128,-1,141 + 978 82 978 82 978 101 c 0,142,143 + 978 121 978 121 991 134 c 128,-1,144 + 1004 147 1004 147 1024 147 c 256,133,134 +525 1046 m 256,145,146 + 525 1025 525 1025 510.5 1012.5 c 128,-1,147 + 496 1000 496 1000 478 1000 c 0,148,149 + 458 1000 458 1000 445 1014.5 c 128,-1,150 + 432 1029 432 1029 432 1046 c 0,151,152 + 432 1066 432 1066 446.5 1079.5 c 128,-1,153 + 461 1093 461 1093 479 1093 c 0,154,155 + 498 1093 498 1093 511.5 1080 c 128,-1,156 + 525 1067 525 1067 525 1046 c 256,145,146 +1293 1277 m 0,157,158 + 1293 1297 1293 1297 1307.5 1310 c 128,-1,159 + 1322 1323 1322 1323 1339 1323 c 0,160,161 + 1359 1323 1359 1323 1372.5 1308.5 c 128,-1,162 + 1386 1294 1386 1294 1386 1277 c 0,163,164 + 1386 1256 1386 1256 1371.5 1243 c 128,-1,165 + 1357 1230 1357 1230 1340 1230 c 0,166,167 + 1322 1230 1322 1230 1307.5 1243 c 128,-1,168 + 1293 1256 1293 1256 1293 1277 c 0,157,158 +1570 1000 m 0,169,170 + 1551 1000 1551 1000 1537.5 1013 c 128,-1,171 + 1524 1026 1524 1026 1524 1046 c 0,172,173 + 1524 1064 1524 1064 1537 1078.5 c 128,-1,174 + 1550 1093 1550 1093 1570 1093 c 0,175,176 + 1587 1093 1587 1093 1601.5 1080.5 c 128,-1,177 + 1616 1068 1616 1068 1616 1047 c 0,178,179 + 1616 1020 1616 1020 1594 1006 c 1,180,181 + 1582 1000 1582 1000 1570 1000 c 0,169,170 +1616 415 m 0,182,183 + 1616 394 1616 394 1602 381.5 c 128,-1,184 + 1588 369 1588 369 1571 369 c 0,185,186 + 1550 369 1550 369 1537 384 c 128,-1,187 + 1524 399 1524 399 1524 416 c 0,188,189 + 1524 436 1524 436 1538 449 c 128,-1,190 + 1552 462 1552 462 1570 462 c 0,191,192 + 1582 462 1582 462 1594 456 c 1,193,194 + 1616 442 1616 442 1616 415 c 0,182,183 +EndSplineSet +EndChar + +StartChar: notequal +Encoding: 185 8800 40 +Width: 2048 +Flags: W +LayerCount: 2 +Fore +SplineSet +1024 1538 m 0,0,1 + 1239 1538 1239 1538 1427 1430 c 128,-1,2 + 1615 1322 1615 1322 1723 1133.5 c 128,-1,3 + 1831 945 1831 945 1831 731 c 0,4,5 + 1831 515 1831 515 1722 327.5 c 128,-1,6 + 1613 140 1613 140 1425.5 32.5 c 128,-1,7 + 1238 -75 1238 -75 1024 -75 c 0,8,9 + 808 -75 808 -75 621 33 c 128,-1,10 + 434 141 434 141 326 328 c 128,-1,11 + 218 515 218 515 218 731 c 0,12,13 + 218 945 218 945 325.5 1132.5 c 128,-1,14 + 433 1320 433 1320 620.5 1429 c 128,-1,15 + 808 1538 808 1538 1024 1538 c 0,0,1 +1024 3 m 0,16,17 + 1220 3 1220 3 1388 100 c 128,-1,18 + 1556 197 1556 197 1654.5 365.5 c 128,-1,19 + 1753 534 1753 534 1753 731 c 0,20,21 + 1753 927 1753 927 1655 1096 c 128,-1,22 + 1557 1265 1557 1265 1388.5 1362.5 c 128,-1,23 + 1220 1460 1220 1460 1024 1460 c 256,24,25 + 828 1460 828 1460 659.5 1362 c 128,-1,26 + 491 1264 491 1264 393.5 1095.5 c 128,-1,27 + 296 927 296 927 296 731 c 0,28,29 + 296 533 296 533 394.5 365 c 128,-1,30 + 493 197 493 197 661 100 c 128,-1,31 + 829 3 829 3 1024 3 c 0,16,17 +1082 840 m 1,32,33 + 1115 822 1115 822 1133 789 c 1,34,-1 + 1445 789 l 1,35,-1 + 1445 673 l 1,36,-1 + 1133 673 l 1,37,38 + 1117 644 1117 644 1088 626 c 128,-1,39 + 1059 608 1059 608 1024 608 c 0,40,41 + 973 608 973 608 937 644 c 128,-1,42 + 901 680 901 680 901 731 c 0,43,44 + 901 767 901 767 919 795.5 c 128,-1,45 + 937 824 937 824 966 840 c 1,46,-1 + 966 1396 l 1,47,-1 + 1082 1396 l 1,48,-1 + 1082 840 l 1,32,33 +1024 685 m 0,49,50 + 1044 685 1044 685 1057.5 698 c 128,-1,51 + 1071 711 1071 711 1071 731 c 256,52,53 + 1071 751 1071 751 1057.5 764.5 c 128,-1,54 + 1044 778 1044 778 1024 778 c 256,55,56 + 1004 778 1004 778 991 764.5 c 128,-1,57 + 978 751 978 751 978 731 c 0,58,59 + 978 712 978 712 990 698.5 c 128,-1,60 + 1002 685 1002 685 1024 685 c 0,49,50 +1654 778 m 0,61,62 + 1674 778 1674 778 1687.5 764.5 c 128,-1,63 + 1701 751 1701 751 1701 731 c 256,64,65 + 1701 711 1701 711 1687.5 698 c 128,-1,66 + 1674 685 1674 685 1654 685 c 0,67,68 + 1635 685 1635 685 1621.5 698 c 128,-1,69 + 1608 711 1608 711 1608 731 c 256,70,71 + 1608 751 1608 751 1621.5 764.5 c 128,-1,72 + 1635 778 1635 778 1654 778 c 0,61,62 +1569 1000 m 0,73,74 + 1551 1000 1551 1000 1537.5 1013 c 128,-1,75 + 1524 1026 1524 1026 1524 1046 c 0,76,77 + 1524 1064 1524 1064 1536.5 1078.5 c 128,-1,78 + 1549 1093 1549 1093 1570 1093 c 0,79,80 + 1587 1093 1587 1093 1601.5 1081 c 128,-1,81 + 1616 1069 1616 1069 1616 1047 c 0,82,83 + 1616 1026 1616 1026 1602.5 1013 c 128,-1,84 + 1589 1000 1589 1000 1569 1000 c 0,73,74 +1293 1277 m 256,85,86 + 1293 1297 1293 1297 1307.5 1310 c 128,-1,87 + 1322 1323 1322 1323 1339 1323 c 0,88,89 + 1359 1323 1359 1323 1372.5 1309.5 c 128,-1,90 + 1386 1296 1386 1296 1386 1277 c 0,91,92 + 1386 1257 1386 1257 1371.5 1244 c 128,-1,93 + 1357 1231 1357 1231 1339 1231 c 0,94,95 + 1320 1231 1320 1231 1306.5 1244 c 128,-1,96 + 1293 1257 1293 1257 1293 1277 c 256,85,86 +710 1323 m 0,97,98 + 728 1323 728 1323 742 1310.5 c 128,-1,99 + 756 1298 756 1298 756 1277 c 0,100,101 + 756 1260 756 1260 743 1245.5 c 128,-1,102 + 730 1231 730 1231 709 1231 c 0,103,104 + 692 1231 692 1231 677.5 1244 c 128,-1,105 + 663 1257 663 1257 663 1277 c 0,106,107 + 663 1296 663 1296 676 1309.5 c 128,-1,108 + 689 1323 689 1323 710 1323 c 0,97,98 +525 1046 m 0,109,110 + 525 1025 525 1025 510.5 1012.5 c 128,-1,111 + 496 1000 496 1000 479 1000 c 0,112,113 + 459 1000 459 1000 445.5 1014.5 c 128,-1,114 + 432 1029 432 1029 432 1046 c 0,115,116 + 432 1066 432 1066 446 1079.5 c 128,-1,117 + 460 1093 460 1093 478 1093 c 0,118,119 + 490 1093 490 1093 502 1087 c 1,120,121 + 525 1072 525 1072 525 1046 c 0,109,110 +394 778 m 256,122,123 + 414 778 414 778 427.5 764.5 c 128,-1,124 + 441 751 441 751 441 731 c 256,125,126 + 441 711 441 711 427.5 698 c 128,-1,127 + 414 685 414 685 394 685 c 256,128,129 + 374 685 374 685 361 698 c 128,-1,130 + 348 711 348 711 348 731 c 256,131,132 + 348 751 348 751 361 764.5 c 128,-1,133 + 374 778 374 778 394 778 c 256,122,123 +479 462 m 0,134,135 + 496 462 496 462 510.5 449.5 c 128,-1,136 + 525 437 525 437 525 416 c 0,137,138 + 525 399 525 399 512 384.5 c 128,-1,139 + 499 370 499 370 478 370 c 0,140,141 + 460 370 460 370 446 383.5 c 128,-1,142 + 432 397 432 397 432 417 c 0,143,144 + 432 436 432 436 445 449 c 128,-1,145 + 458 462 458 462 479 462 c 0,134,135 +756 185 m 256,146,147 + 756 164 756 164 741.5 151.5 c 128,-1,148 + 727 139 727 139 709 139 c 0,149,150 + 688 139 688 139 675.5 153.5 c 128,-1,151 + 663 168 663 168 663 186 c 0,152,153 + 663 206 663 206 678 219 c 128,-1,154 + 693 232 693 232 710 232 c 0,155,156 + 729 232 729 232 742.5 219 c 128,-1,157 + 756 206 756 206 756 185 c 256,146,147 +1024 148 m 256,158,159 + 1044 148 1044 148 1057.5 134.5 c 128,-1,160 + 1071 121 1071 121 1071 101 c 256,161,162 + 1071 81 1071 81 1057.5 68 c 128,-1,163 + 1044 55 1044 55 1024 55 c 0,164,165 + 1005 55 1005 55 991.5 68 c 128,-1,166 + 978 81 978 81 978 101 c 256,167,168 + 978 121 978 121 991 134.5 c 128,-1,169 + 1004 148 1004 148 1024 148 c 256,158,159 +1339 232 m 0,170,171 + 1356 232 1356 232 1371 219 c 128,-1,172 + 1386 206 1386 206 1386 186 c 0,173,174 + 1386 168 1386 168 1373.5 153.5 c 128,-1,175 + 1361 139 1361 139 1339 139 c 0,176,177 + 1322 139 1322 139 1307.5 152 c 128,-1,178 + 1293 165 1293 165 1293 185 c 0,179,180 + 1293 206 1293 206 1306.5 219 c 128,-1,181 + 1320 232 1320 232 1339 232 c 0,170,171 +1616 415 m 0,182,183 + 1616 394 1616 394 1601.5 382 c 128,-1,184 + 1587 370 1587 370 1570 370 c 0,185,186 + 1550 370 1550 370 1537 384.5 c 128,-1,187 + 1524 399 1524 399 1524 416 c 0,188,189 + 1524 436 1524 436 1538 449 c 128,-1,190 + 1552 462 1552 462 1570 462 c 0,191,192 + 1589 462 1589 462 1602.5 449.5 c 128,-1,193 + 1616 437 1616 437 1616 415 c 0,182,183 +EndSplineSet +EndChar + +StartChar: equivalence +Encoding: 186 8801 41 +Width: 2048 +Flags: W +LayerCount: 2 +Fore +SplineSet +1024 1538 m 0,0,1 + 1239 1538 1239 1538 1427 1430 c 128,-1,2 + 1615 1322 1615 1322 1723 1133.5 c 128,-1,3 + 1831 945 1831 945 1831 731 c 0,4,5 + 1831 515 1831 515 1722 327.5 c 128,-1,6 + 1613 140 1613 140 1425.5 32.5 c 128,-1,7 + 1238 -75 1238 -75 1024 -75 c 0,8,9 + 808 -75 808 -75 621 33 c 128,-1,10 + 434 141 434 141 326 328 c 128,-1,11 + 218 515 218 515 218 731 c 0,12,13 + 218 945 218 945 325.5 1132.5 c 128,-1,14 + 433 1320 433 1320 620.5 1429 c 128,-1,15 + 808 1538 808 1538 1024 1538 c 0,0,1 +1024 3 m 0,16,17 + 1220 3 1220 3 1388 100 c 128,-1,18 + 1556 197 1556 197 1654.5 365.5 c 128,-1,19 + 1753 534 1753 534 1753 731 c 0,20,21 + 1753 927 1753 927 1655 1096 c 128,-1,22 + 1557 1265 1557 1265 1388.5 1362.5 c 128,-1,23 + 1220 1460 1220 1460 1024 1460 c 256,24,25 + 828 1460 828 1460 659.5 1362 c 128,-1,26 + 491 1264 491 1264 393.5 1095.5 c 128,-1,27 + 296 927 296 927 296 731 c 0,28,29 + 296 533 296 533 394.5 365 c 128,-1,30 + 493 197 493 197 661 100 c 128,-1,31 + 829 3 829 3 1024 3 c 0,16,17 +1082 840 m 1,32,33 + 1115 822 1115 822 1133 789 c 1,34,-1 + 1445 789 l 1,35,-1 + 1445 673 l 1,36,-1 + 1133 673 l 1,37,38 + 1117 644 1117 644 1088 626 c 128,-1,39 + 1059 608 1059 608 1024 608 c 0,40,41 + 973 608 973 608 937 644 c 128,-1,42 + 901 680 901 680 901 731 c 0,43,44 + 901 767 901 767 919 795.5 c 128,-1,45 + 937 824 937 824 966 840 c 1,46,-1 + 966 1396 l 1,47,-1 + 1082 1396 l 1,48,-1 + 1082 840 l 1,32,33 +1024 685 m 0,49,50 + 1044 685 1044 685 1057.5 698 c 128,-1,51 + 1071 711 1071 711 1071 731 c 256,52,53 + 1071 751 1071 751 1057.5 764.5 c 128,-1,54 + 1044 778 1044 778 1024 778 c 256,55,56 + 1004 778 1004 778 991 764.5 c 128,-1,57 + 978 751 978 751 978 731 c 0,58,59 + 978 712 978 712 990 698.5 c 128,-1,60 + 1002 685 1002 685 1024 685 c 0,49,50 +1654 778 m 0,61,62 + 1674 778 1674 778 1687.5 764.5 c 128,-1,63 + 1701 751 1701 751 1701 731 c 256,64,65 + 1701 711 1701 711 1687.5 698 c 128,-1,66 + 1674 685 1674 685 1654 685 c 0,67,68 + 1635 685 1635 685 1621.5 698 c 128,-1,69 + 1608 711 1608 711 1608 731 c 256,70,71 + 1608 751 1608 751 1621.5 764.5 c 128,-1,72 + 1635 778 1635 778 1654 778 c 0,61,62 +1569 1000 m 0,73,74 + 1551 1000 1551 1000 1537.5 1013 c 128,-1,75 + 1524 1026 1524 1026 1524 1046 c 0,76,77 + 1524 1064 1524 1064 1536.5 1078.5 c 128,-1,78 + 1549 1093 1549 1093 1570 1093 c 0,79,80 + 1587 1093 1587 1093 1601.5 1081 c 128,-1,81 + 1616 1069 1616 1069 1616 1047 c 0,82,83 + 1616 1026 1616 1026 1602.5 1013 c 128,-1,84 + 1589 1000 1589 1000 1569 1000 c 0,73,74 +1293 1277 m 256,85,86 + 1293 1297 1293 1297 1307.5 1310 c 128,-1,87 + 1322 1323 1322 1323 1339 1323 c 0,88,89 + 1359 1323 1359 1323 1372.5 1309.5 c 128,-1,90 + 1386 1296 1386 1296 1386 1277 c 0,91,92 + 1386 1257 1386 1257 1371.5 1244 c 128,-1,93 + 1357 1231 1357 1231 1339 1231 c 0,94,95 + 1320 1231 1320 1231 1306.5 1244 c 128,-1,96 + 1293 1257 1293 1257 1293 1277 c 256,85,86 +710 1323 m 0,97,98 + 728 1323 728 1323 742 1310.5 c 128,-1,99 + 756 1298 756 1298 756 1277 c 0,100,101 + 756 1260 756 1260 743 1245.5 c 128,-1,102 + 730 1231 730 1231 709 1231 c 0,103,104 + 692 1231 692 1231 677.5 1244 c 128,-1,105 + 663 1257 663 1257 663 1277 c 0,106,107 + 663 1296 663 1296 676 1309.5 c 128,-1,108 + 689 1323 689 1323 710 1323 c 0,97,98 +525 1046 m 0,109,110 + 525 1025 525 1025 510.5 1012.5 c 128,-1,111 + 496 1000 496 1000 479 1000 c 0,112,113 + 459 1000 459 1000 445.5 1014.5 c 128,-1,114 + 432 1029 432 1029 432 1046 c 0,115,116 + 432 1066 432 1066 446 1079.5 c 128,-1,117 + 460 1093 460 1093 478 1093 c 0,118,119 + 490 1093 490 1093 502 1087 c 1,120,121 + 525 1072 525 1072 525 1046 c 0,109,110 +394 778 m 256,122,123 + 414 778 414 778 427.5 764.5 c 128,-1,124 + 441 751 441 751 441 731 c 256,125,126 + 441 711 441 711 427.5 698 c 128,-1,127 + 414 685 414 685 394 685 c 256,128,129 + 374 685 374 685 361 698 c 128,-1,130 + 348 711 348 711 348 731 c 256,131,132 + 348 751 348 751 361 764.5 c 128,-1,133 + 374 778 374 778 394 778 c 256,122,123 +479 462 m 0,134,135 + 496 462 496 462 510.5 449.5 c 128,-1,136 + 525 437 525 437 525 416 c 0,137,138 + 525 399 525 399 512 384.5 c 128,-1,139 + 499 370 499 370 478 370 c 0,140,141 + 460 370 460 370 446 383.5 c 128,-1,142 + 432 397 432 397 432 417 c 0,143,144 + 432 436 432 436 445 449 c 128,-1,145 + 458 462 458 462 479 462 c 0,134,135 +756 185 m 256,146,147 + 756 164 756 164 741.5 151.5 c 128,-1,148 + 727 139 727 139 709 139 c 0,149,150 + 688 139 688 139 675.5 153.5 c 128,-1,151 + 663 168 663 168 663 186 c 0,152,153 + 663 206 663 206 678 219 c 128,-1,154 + 693 232 693 232 710 232 c 0,155,156 + 729 232 729 232 742.5 219 c 128,-1,157 + 756 206 756 206 756 185 c 256,146,147 +1024 148 m 256,158,159 + 1044 148 1044 148 1057.5 134.5 c 128,-1,160 + 1071 121 1071 121 1071 101 c 256,161,162 + 1071 81 1071 81 1057.5 68 c 128,-1,163 + 1044 55 1044 55 1024 55 c 0,164,165 + 1005 55 1005 55 991.5 68 c 128,-1,166 + 978 81 978 81 978 101 c 256,167,168 + 978 121 978 121 991 134.5 c 128,-1,169 + 1004 148 1004 148 1024 148 c 256,158,159 +1339 232 m 0,170,171 + 1356 232 1356 232 1371 219 c 128,-1,172 + 1386 206 1386 206 1386 186 c 0,173,174 + 1386 168 1386 168 1373.5 153.5 c 128,-1,175 + 1361 139 1361 139 1339 139 c 0,176,177 + 1322 139 1322 139 1307.5 152 c 128,-1,178 + 1293 165 1293 165 1293 185 c 0,179,180 + 1293 206 1293 206 1306.5 219 c 128,-1,181 + 1320 232 1320 232 1339 232 c 0,170,171 +1616 415 m 0,182,183 + 1616 394 1616 394 1601.5 382 c 128,-1,184 + 1587 370 1587 370 1570 370 c 0,185,186 + 1550 370 1550 370 1537 384.5 c 128,-1,187 + 1524 399 1524 399 1524 416 c 0,188,189 + 1524 436 1524 436 1538 449 c 128,-1,190 + 1552 462 1552 462 1570 462 c 0,191,192 + 1589 462 1589 462 1602.5 449.5 c 128,-1,193 + 1616 437 1616 437 1616 415 c 0,182,183 +EndSplineSet +EndChar + +StartChar: approxequal +Encoding: 187 8776 42 +Width: 2048 +Flags: W +LayerCount: 2 +Fore +SplineSet +1024 1538 m 256,0,1 + 1240 1538 1240 1538 1427.5 1429 c 128,-1,2 + 1615 1320 1615 1320 1722.5 1132.5 c 128,-1,3 + 1830 945 1830 945 1830 731 c 0,4,5 + 1830 515 1830 515 1722 328 c 128,-1,6 + 1614 141 1614 141 1427 33 c 128,-1,7 + 1240 -75 1240 -75 1024 -75 c 256,8,9 + 808 -75 808 -75 621 33 c 128,-1,10 + 434 141 434 141 326 328 c 128,-1,11 + 218 515 218 515 218 731 c 0,12,13 + 218 945 218 945 325.5 1132.5 c 128,-1,14 + 433 1320 433 1320 620.5 1429 c 128,-1,15 + 808 1538 808 1538 1024 1538 c 256,0,1 +1024 3 m 0,16,17 + 1220 3 1220 3 1388.5 100.5 c 128,-1,18 + 1557 198 1557 198 1654.5 367 c 128,-1,19 + 1752 536 1752 536 1752 731 c 0,20,21 + 1752 927 1752 927 1655 1095 c 128,-1,22 + 1558 1263 1558 1263 1389.5 1361.5 c 128,-1,23 + 1221 1460 1221 1460 1024 1460 c 0,24,25 + 826 1460 826 1460 658 1361.5 c 128,-1,26 + 490 1263 490 1263 393 1095 c 128,-1,27 + 296 927 296 927 296 731 c 256,28,29 + 296 535 296 535 393.5 366.5 c 128,-1,30 + 491 198 491 198 660 100.5 c 128,-1,31 + 829 3 829 3 1024 3 c 0,16,17 +1147 731 m 0,32,33 + 1147 695 1147 695 1128 666 c 1,34,-1 + 1285 397 l 1,35,-1 + 1184 338 l 1,36,-1 + 1028 608 l 1,37,38 + 974 608 974 608 937 643 c 128,-1,39 + 900 678 900 678 900 731 c 0,40,41 + 900 766 900 766 918.5 795 c 128,-1,42 + 937 824 937 824 966 840 c 1,43,-1 + 966 1396 l 1,44,-1 + 1082 1396 l 1,45,-1 + 1082 840 l 1,46,47 + 1111 824 1111 824 1129 795 c 128,-1,48 + 1147 766 1147 766 1147 731 c 0,32,33 +1024 685 m 256,49,50 + 1044 685 1044 685 1057 698.5 c 128,-1,51 + 1070 712 1070 712 1070 731 c 0,52,53 + 1070 751 1070 751 1057 764.5 c 128,-1,54 + 1044 778 1044 778 1024 778 c 256,55,56 + 1004 778 1004 778 991 764 c 128,-1,57 + 978 750 978 750 978 731 c 0,58,59 + 978 711 978 711 991 698 c 128,-1,60 + 1004 685 1004 685 1024 685 c 256,49,50 +1654 778 m 0,61,62 + 1674 778 1674 778 1687 764.5 c 128,-1,63 + 1700 751 1700 751 1700 731 c 256,64,65 + 1700 711 1700 711 1687 698 c 128,-1,66 + 1674 685 1674 685 1654 685 c 0,67,68 + 1635 685 1635 685 1621.5 698 c 128,-1,69 + 1608 711 1608 711 1608 731 c 256,70,71 + 1608 751 1608 751 1621.5 764.5 c 128,-1,72 + 1635 778 1635 778 1654 778 c 0,61,62 +1570 1000 m 0,73,74 + 1551 1000 1551 1000 1537 1013.5 c 128,-1,75 + 1523 1027 1523 1027 1523 1047 c 0,76,77 + 1523 1064 1523 1064 1535.5 1078.5 c 128,-1,78 + 1548 1093 1548 1093 1570 1093 c 0,79,80 + 1587 1093 1587 1093 1601.5 1080 c 128,-1,81 + 1616 1067 1616 1067 1616 1046 c 0,82,83 + 1616 1026 1616 1026 1602 1013 c 128,-1,84 + 1588 1000 1588 1000 1570 1000 c 0,73,74 +1385 1276 m 0,85,86 + 1385 1255 1385 1255 1370.5 1242.5 c 128,-1,87 + 1356 1230 1356 1230 1338 1230 c 0,88,89 + 1318 1230 1318 1230 1305.5 1244.5 c 128,-1,90 + 1293 1259 1293 1259 1293 1277 c 0,91,92 + 1293 1297 1293 1297 1306.5 1310 c 128,-1,93 + 1320 1323 1320 1323 1338 1323 c 0,94,95 + 1359 1323 1359 1323 1372 1310.5 c 128,-1,96 + 1385 1298 1385 1298 1385 1276 c 0,85,86 +709 1323 m 0,97,98 + 728 1323 728 1323 741.5 1310 c 128,-1,99 + 755 1297 755 1297 755 1277 c 0,100,101 + 755 1258 755 1258 742 1244.5 c 128,-1,102 + 729 1231 729 1231 709 1231 c 0,103,104 + 690 1231 690 1231 676 1244.5 c 128,-1,105 + 662 1258 662 1258 662 1278 c 0,106,107 + 662 1297 662 1297 675 1310 c 128,-1,108 + 688 1323 688 1323 709 1323 c 0,97,98 +524 1047 m 0,109,110 + 524 1027 524 1027 510.5 1013.5 c 128,-1,111 + 497 1000 497 1000 478 1000 c 0,112,113 + 458 1000 458 1000 445 1014.5 c 128,-1,114 + 432 1029 432 1029 432 1046 c 0,115,116 + 432 1067 432 1067 445.5 1080 c 128,-1,117 + 459 1093 459 1093 478 1093 c 0,118,119 + 490 1093 490 1093 502 1087 c 1,120,121 + 524 1073 524 1073 524 1047 c 0,109,110 +394 778 m 0,122,123 + 413 778 413 778 426.5 764.5 c 128,-1,124 + 440 751 440 751 440 731 c 256,125,126 + 440 711 440 711 426.5 698 c 128,-1,127 + 413 685 413 685 394 685 c 0,128,129 + 374 685 374 685 360.5 698 c 128,-1,130 + 347 711 347 711 347 731 c 256,131,132 + 347 751 347 751 360.5 764.5 c 128,-1,133 + 374 778 374 778 394 778 c 0,122,123 +479 462 m 0,134,135 + 497 462 497 462 510.5 449 c 128,-1,136 + 524 436 524 436 524 416 c 0,137,138 + 524 399 524 399 511 384.5 c 128,-1,139 + 498 370 498 370 478 370 c 0,140,141 + 460 370 460 370 446 383 c 128,-1,142 + 432 396 432 396 432 416 c 0,143,144 + 432 435 432 435 445 448.5 c 128,-1,145 + 458 462 458 462 479 462 c 0,134,135 +755 185 m 0,146,147 + 755 165 755 165 741 152 c 128,-1,148 + 727 139 727 139 709 139 c 0,149,150 + 687 139 687 139 674.5 153.5 c 128,-1,151 + 662 168 662 168 662 186 c 0,152,153 + 662 207 662 207 676 219 c 128,-1,154 + 690 231 690 231 708 231 c 0,155,156 + 727 231 727 231 741 219 c 128,-1,157 + 755 207 755 207 755 185 c 0,146,147 +1024 148 m 256,158,159 + 1044 148 1044 148 1057 134 c 128,-1,160 + 1070 120 1070 120 1070 101 c 0,161,162 + 1070 81 1070 81 1057 68 c 128,-1,163 + 1044 55 1044 55 1024 55 c 256,164,165 + 1004 55 1004 55 991 68 c 128,-1,166 + 978 81 978 81 978 101 c 0,167,168 + 978 120 978 120 991 134 c 128,-1,169 + 1004 148 1004 148 1024 148 c 256,158,159 +1340 231 m 0,170,171 + 1357 231 1357 231 1371 219 c 128,-1,172 + 1385 207 1385 207 1385 187 c 0,173,174 + 1385 168 1385 168 1372.5 153.5 c 128,-1,175 + 1360 139 1360 139 1339 139 c 0,176,177 + 1320 139 1320 139 1306.5 152 c 128,-1,178 + 1293 165 1293 165 1293 185 c 0,179,180 + 1293 207 1293 207 1306.5 219 c 128,-1,181 + 1320 231 1320 231 1340 231 c 0,170,171 +1616 416 m 0,182,183 + 1616 396 1616 396 1601.5 383 c 128,-1,184 + 1587 370 1587 370 1570 370 c 0,185,186 + 1549 370 1549 370 1536 384 c 128,-1,187 + 1523 398 1523 398 1523 415 c 0,188,189 + 1523 435 1523 435 1537.5 448.5 c 128,-1,190 + 1552 462 1552 462 1569 462 c 0,191,192 + 1590 462 1590 462 1603 448.5 c 128,-1,193 + 1616 435 1616 435 1616 416 c 0,182,183 +EndSplineSet +EndChar + +StartChar: ellipsis +Encoding: 188 8230 43 +Width: 2048 +Flags: W +LayerCount: 2 +Fore +SplineSet +1024 1538 m 256,0,1 + 1240 1538 1240 1538 1427.5 1429 c 128,-1,2 + 1615 1320 1615 1320 1722.5 1132.5 c 128,-1,3 + 1830 945 1830 945 1830 731 c 0,4,5 + 1830 515 1830 515 1722 328 c 128,-1,6 + 1614 141 1614 141 1427 33 c 128,-1,7 + 1240 -75 1240 -75 1024 -75 c 256,8,9 + 808 -75 808 -75 621 33 c 128,-1,10 + 434 141 434 141 326 328 c 128,-1,11 + 218 515 218 515 218 731 c 0,12,13 + 218 945 218 945 325.5 1132.5 c 128,-1,14 + 433 1320 433 1320 620.5 1429 c 128,-1,15 + 808 1538 808 1538 1024 1538 c 256,0,1 +1024 3 m 256,16,17 + 1222 3 1222 3 1390 101.5 c 128,-1,18 + 1558 200 1558 200 1655 368 c 128,-1,19 + 1752 536 1752 536 1752 731 c 0,20,21 + 1752 927 1752 927 1655 1095 c 128,-1,22 + 1558 1263 1558 1263 1389.5 1361.5 c 128,-1,23 + 1221 1460 1221 1460 1024 1460 c 0,24,25 + 826 1460 826 1460 658 1361.5 c 128,-1,26 + 490 1263 490 1263 393 1095 c 128,-1,27 + 296 927 296 927 296 731 c 0,28,29 + 296 536 296 536 393 368 c 128,-1,30 + 490 200 490 200 658 101.5 c 128,-1,31 + 826 3 826 3 1024 3 c 256,16,17 +1082 840 m 1,32,33 + 1111 824 1111 824 1129 795.5 c 128,-1,34 + 1147 767 1147 767 1147 732 c 256,35,36 + 1147 697 1147 697 1129 668 c 128,-1,37 + 1111 639 1111 639 1082 623 c 1,38,-1 + 1082 311 l 1,39,-1 + 966 311 l 1,40,-1 + 966 623 l 1,41,42 + 937 639 937 639 918.5 667.5 c 128,-1,43 + 900 696 900 696 900 732 c 0,44,45 + 900 767 900 767 918.5 795.5 c 128,-1,46 + 937 824 937 824 966 840 c 1,47,-1 + 966 1396 l 1,48,-1 + 1082 1396 l 1,49,-1 + 1082 840 l 1,32,33 +1024 685 m 0,50,51 + 1042 685 1042 685 1056 698 c 128,-1,52 + 1070 711 1070 711 1070 731 c 0,53,54 + 1070 750 1070 750 1056.5 764 c 128,-1,55 + 1043 778 1043 778 1024 778 c 256,56,57 + 1005 778 1005 778 991.5 764 c 128,-1,58 + 978 750 978 750 978 731 c 0,59,60 + 978 711 978 711 991.5 698 c 128,-1,61 + 1005 685 1005 685 1024 685 c 0,50,51 +1654 778 m 0,62,63 + 1674 778 1674 778 1687 764.5 c 128,-1,64 + 1700 751 1700 751 1700 731 c 0,65,66 + 1700 712 1700 712 1687 698.5 c 128,-1,67 + 1674 685 1674 685 1654 685 c 0,68,69 + 1635 685 1635 685 1621.5 698.5 c 128,-1,70 + 1608 712 1608 712 1608 731 c 0,71,72 + 1608 751 1608 751 1621.5 764.5 c 128,-1,73 + 1635 778 1635 778 1654 778 c 0,62,63 +1570 1000 m 0,74,75 + 1551 1000 1551 1000 1537 1013.5 c 128,-1,76 + 1523 1027 1523 1027 1523 1047 c 0,77,78 + 1523 1064 1523 1064 1536 1078.5 c 128,-1,79 + 1549 1093 1549 1093 1570 1093 c 0,80,81 + 1587 1093 1587 1093 1601.5 1080 c 128,-1,82 + 1616 1067 1616 1067 1616 1046 c 0,83,84 + 1616 1026 1616 1026 1602 1013 c 128,-1,85 + 1588 1000 1588 1000 1570 1000 c 0,74,75 +1385 1276 m 0,86,87 + 1385 1255 1385 1255 1370.5 1243 c 128,-1,88 + 1356 1231 1356 1231 1339 1231 c 0,89,90 + 1319 1231 1319 1231 1306 1245.5 c 128,-1,91 + 1293 1260 1293 1260 1293 1277 c 0,92,93 + 1293 1297 1293 1297 1306.5 1310.5 c 128,-1,94 + 1320 1324 1320 1324 1340 1324 c 0,95,96 + 1359 1324 1359 1324 1372 1311 c 128,-1,97 + 1385 1298 1385 1298 1385 1276 c 0,86,87 +708 1324 m 0,98,99 + 727 1324 727 1324 741 1310.5 c 128,-1,100 + 755 1297 755 1297 755 1277 c 0,101,102 + 755 1260 755 1260 742 1245.5 c 128,-1,103 + 729 1231 729 1231 709 1231 c 0,104,105 + 690 1231 690 1231 676 1244.5 c 128,-1,106 + 662 1258 662 1258 662 1278 c 256,107,108 + 662 1298 662 1298 676 1311 c 128,-1,109 + 690 1324 690 1324 708 1324 c 0,98,99 +524 1047 m 0,110,111 + 524 1027 524 1027 510.5 1013.5 c 128,-1,112 + 497 1000 497 1000 478 1000 c 0,113,114 + 458 1000 458 1000 445 1014.5 c 128,-1,115 + 432 1029 432 1029 432 1046 c 0,116,117 + 432 1066 432 1066 445.5 1079.5 c 128,-1,118 + 459 1093 459 1093 478 1093 c 0,119,120 + 490 1093 490 1093 502 1087 c 1,121,122 + 524 1073 524 1073 524 1047 c 0,110,111 +394 778 m 0,123,124 + 413 778 413 778 426.5 764.5 c 128,-1,125 + 440 751 440 751 440 731 c 0,126,127 + 440 712 440 712 426.5 698.5 c 128,-1,128 + 413 685 413 685 394 685 c 0,129,130 + 374 685 374 685 360.5 698.5 c 128,-1,131 + 347 712 347 712 347 731 c 0,132,133 + 347 751 347 751 360.5 764.5 c 128,-1,134 + 374 778 374 778 394 778 c 0,123,124 +478 463 m 256,135,136 + 497 463 497 463 510.5 449.5 c 128,-1,137 + 524 436 524 436 524 416 c 0,138,139 + 524 399 524 399 511 384.5 c 128,-1,140 + 498 370 498 370 478 370 c 0,141,142 + 460 370 460 370 446 383 c 128,-1,143 + 432 396 432 396 432 416 c 0,144,145 + 432 435 432 435 445.5 449 c 128,-1,146 + 459 463 459 463 478 463 c 256,135,136 +755 185 m 0,147,148 + 755 165 755 165 740.5 152 c 128,-1,149 + 726 139 726 139 708 139 c 0,150,151 + 688 139 688 139 675 153.5 c 128,-1,152 + 662 168 662 168 662 185 c 0,153,154 + 662 207 662 207 676.5 219.5 c 128,-1,155 + 691 232 691 232 709 232 c 0,156,157 + 728 232 728 232 741.5 218 c 128,-1,158 + 755 204 755 204 755 185 c 0,147,148 +1024 147 m 256,159,160 + 1044 147 1044 147 1057 134 c 128,-1,161 + 1070 121 1070 121 1070 101 c 0,162,163 + 1070 82 1070 82 1057 68.5 c 128,-1,164 + 1044 55 1044 55 1024 55 c 256,165,166 + 1004 55 1004 55 991 68.5 c 128,-1,167 + 978 82 978 82 978 101 c 0,168,169 + 978 121 978 121 991 134 c 128,-1,170 + 1004 147 1004 147 1024 147 c 256,159,160 +1339 232 m 0,171,172 + 1356 232 1356 232 1370.5 219.5 c 128,-1,173 + 1385 207 1385 207 1385 186 c 0,174,175 + 1385 167 1385 167 1372.5 153 c 128,-1,176 + 1360 139 1360 139 1339 139 c 0,177,178 + 1322 139 1322 139 1307.5 152 c 128,-1,179 + 1293 165 1293 165 1293 185 c 0,180,181 + 1293 204 1293 204 1306.5 218 c 128,-1,182 + 1320 232 1320 232 1339 232 c 0,171,172 +1616 416 m 0,183,184 + 1616 396 1616 396 1601.5 383 c 128,-1,185 + 1587 370 1587 370 1570 370 c 0,186,187 + 1549 370 1549 370 1536 384.5 c 128,-1,188 + 1523 399 1523 399 1523 416 c 0,189,190 + 1523 436 1523 436 1537 449.5 c 128,-1,191 + 1551 463 1551 463 1570 463 c 256,192,193 + 1589 463 1589 463 1602.5 449 c 128,-1,194 + 1616 435 1616 435 1616 416 c 0,183,184 +EndSplineSet +EndChar + +StartChar: uniF8E6 +Encoding: 189 63718 44 +Width: 2048 +Flags: W +LayerCount: 2 +Fore +SplineSet +1024 1538 m 0,0,1 + 1240 1538 1240 1538 1427 1430 c 128,-1,2 + 1614 1322 1614 1322 1722 1135 c 128,-1,3 + 1830 948 1830 948 1830 732 c 0,4,5 + 1830 518 1830 518 1722.5 330.5 c 128,-1,6 + 1615 143 1615 143 1427.5 34 c 128,-1,7 + 1240 -75 1240 -75 1024 -75 c 0,8,9 + 809 -75 809 -75 621 33 c 128,-1,10 + 433 141 433 141 325 329.5 c 128,-1,11 + 217 518 217 518 217 732 c 0,12,13 + 217 948 217 948 326 1135.5 c 128,-1,14 + 435 1323 435 1323 622.5 1430.5 c 128,-1,15 + 810 1538 810 1538 1024 1538 c 0,0,1 +1024 3 m 256,16,17 + 1220 3 1220 3 1389 101 c 128,-1,18 + 1558 199 1558 199 1655.5 367.5 c 128,-1,19 + 1753 536 1753 536 1753 732 c 256,20,21 + 1753 928 1753 928 1655 1096.5 c 128,-1,22 + 1557 1265 1557 1265 1388.5 1362.5 c 128,-1,23 + 1220 1460 1220 1460 1024 1460 c 256,24,25 + 828 1460 828 1460 659 1362 c 128,-1,26 + 490 1264 490 1264 392.5 1095.5 c 128,-1,27 + 295 927 295 927 295 732 c 0,28,29 + 295 536 295 536 393 367 c 128,-1,30 + 491 198 491 198 659.5 100.5 c 128,-1,31 + 828 3 828 3 1024 3 c 256,16,17 +1082 840 m 1,32,33 + 1111 824 1111 824 1129 795.5 c 128,-1,34 + 1147 767 1147 767 1147 732 c 0,35,36 + 1147 679 1147 679 1109.5 643.5 c 128,-1,37 + 1072 608 1072 608 1020 608 c 1,38,-1 + 864 339 l 1,39,-1 + 763 397 l 1,40,-1 + 919 666 l 1,41,42 + 901 698 901 698 901 732 c 0,43,44 + 901 767 901 767 919 795.5 c 128,-1,45 + 937 824 937 824 966 840 c 1,46,-1 + 966 1396 l 1,47,-1 + 1082 1396 l 1,48,-1 + 1082 840 l 1,32,33 +977 732 m 0,49,50 + 977 714 977 714 990.5 699.5 c 128,-1,51 + 1004 685 1004 685 1024 685 c 0,52,53 + 1042 685 1042 685 1056.5 698.5 c 128,-1,54 + 1071 712 1071 712 1071 732 c 0,55,56 + 1071 747 1071 747 1059 762.5 c 128,-1,57 + 1047 778 1047 778 1024 778 c 0,58,59 + 1007 778 1007 778 992 766.5 c 128,-1,60 + 977 755 977 755 977 732 c 0,49,50 +1654 778 m 256,61,62 + 1674 778 1674 778 1687.5 764.5 c 128,-1,63 + 1701 751 1701 751 1701 731 c 0,64,65 + 1701 712 1701 712 1687.5 698.5 c 128,-1,66 + 1674 685 1674 685 1654 685 c 256,67,68 + 1634 685 1634 685 1620.5 698.5 c 128,-1,69 + 1607 712 1607 712 1607 731 c 0,70,71 + 1607 751 1607 751 1620.5 764.5 c 128,-1,72 + 1634 778 1634 778 1654 778 c 256,61,62 +1569 1000 m 0,73,74 + 1552 1000 1552 1000 1537.5 1013 c 128,-1,75 + 1523 1026 1523 1026 1523 1046 c 0,76,77 + 1523 1064 1523 1064 1536 1078.5 c 128,-1,78 + 1549 1093 1549 1093 1569 1093 c 0,79,80 + 1587 1093 1587 1093 1601.5 1080 c 128,-1,81 + 1616 1067 1616 1067 1616 1047 c 0,82,83 + 1616 1021 1616 1021 1593 1006 c 1,84,85 + 1581 1000 1581 1000 1569 1000 c 0,73,74 +1385 1278 m 256,86,87 + 1385 1258 1385 1258 1370.5 1244.5 c 128,-1,88 + 1356 1231 1356 1231 1339 1231 c 0,89,90 + 1318 1231 1318 1231 1305 1245.5 c 128,-1,91 + 1292 1260 1292 1260 1292 1277 c 0,92,93 + 1292 1297 1292 1297 1307 1310.5 c 128,-1,94 + 1322 1324 1322 1324 1339 1324 c 0,95,96 + 1358 1324 1358 1324 1371.5 1311 c 128,-1,97 + 1385 1298 1385 1298 1385 1278 c 256,86,87 +708 1324 m 256,98,99 + 725 1324 725 1324 740 1311 c 128,-1,100 + 755 1298 755 1298 755 1278 c 0,101,102 + 755 1260 755 1260 742 1245.5 c 128,-1,103 + 729 1231 729 1231 709 1231 c 0,104,105 + 690 1231 690 1231 676 1244.5 c 128,-1,106 + 662 1258 662 1258 662 1278 c 256,107,108 + 662 1298 662 1298 676.5 1311 c 128,-1,109 + 691 1324 691 1324 708 1324 c 256,98,99 +524 1046 m 0,110,111 + 524 1026 524 1026 510 1013 c 128,-1,112 + 496 1000 496 1000 477 1000 c 0,113,114 + 457 1000 457 1000 444 1014.5 c 128,-1,115 + 431 1029 431 1029 431 1046 c 0,116,117 + 431 1066 431 1066 446 1079.5 c 128,-1,118 + 461 1093 461 1093 478 1093 c 0,119,120 + 497 1093 497 1093 510.5 1080 c 128,-1,121 + 524 1067 524 1067 524 1046 c 0,110,111 +393 778 m 0,122,123 + 413 778 413 778 426.5 764.5 c 128,-1,124 + 440 751 440 751 440 732 c 0,125,126 + 440 712 440 712 426.5 698.5 c 128,-1,127 + 413 685 413 685 393 685 c 0,128,129 + 374 685 374 685 360.5 698.5 c 128,-1,130 + 347 712 347 712 347 732 c 0,131,132 + 347 751 347 751 360.5 764.5 c 128,-1,133 + 374 778 374 778 393 778 c 0,122,123 +478 463 m 0,134,135 + 495 463 495 463 509.5 450 c 128,-1,136 + 524 437 524 437 524 416 c 0,137,138 + 524 399 524 399 511 384.5 c 128,-1,139 + 498 370 498 370 478 370 c 0,140,141 + 460 370 460 370 445.5 383.5 c 128,-1,142 + 431 397 431 397 431 417 c 256,143,144 + 431 437 431 437 445.5 450 c 128,-1,145 + 460 463 460 463 478 463 c 0,134,135 +755 185 m 0,146,147 + 755 164 755 164 740 151.5 c 128,-1,148 + 725 139 725 139 708 139 c 0,149,150 + 687 139 687 139 674.5 153.5 c 128,-1,151 + 662 168 662 168 662 185 c 0,152,153 + 662 206 662 206 676.5 219 c 128,-1,154 + 691 232 691 232 708 232 c 0,155,156 + 720 232 720 232 732 226 c 1,157,158 + 755 211 755 211 755 185 c 0,146,147 +1024 148 m 256,159,160 + 1044 148 1044 148 1057 134.5 c 128,-1,161 + 1070 121 1070 121 1070 101 c 0,162,163 + 1070 82 1070 82 1057 68.5 c 128,-1,164 + 1044 55 1044 55 1024 55 c 256,165,166 + 1004 55 1004 55 990.5 68.5 c 128,-1,167 + 977 82 977 82 977 101 c 0,168,169 + 977 121 977 121 990.5 134.5 c 128,-1,170 + 1004 148 1004 148 1024 148 c 256,159,160 +1339 232 m 0,171,172 + 1356 232 1356 232 1370.5 219.5 c 128,-1,173 + 1385 207 1385 207 1385 186 c 0,174,175 + 1385 168 1385 168 1372.5 153.5 c 128,-1,176 + 1360 139 1360 139 1339 139 c 0,177,178 + 1322 139 1322 139 1307 152 c 128,-1,179 + 1292 165 1292 165 1292 186 c 0,180,181 + 1292 206 1292 206 1306.5 219 c 128,-1,182 + 1321 232 1321 232 1339 232 c 0,171,172 +1616 416 m 0,183,184 + 1616 396 1616 396 1601.5 383 c 128,-1,185 + 1587 370 1587 370 1569 370 c 0,186,187 + 1549 370 1549 370 1536 384.5 c 128,-1,188 + 1523 399 1523 399 1523 416 c 0,189,190 + 1523 437 1523 437 1537.5 450 c 128,-1,191 + 1552 463 1552 463 1569 463 c 0,192,193 + 1581 463 1581 463 1593 457 c 1,194,195 + 1616 442 1616 442 1616 416 c 0,183,184 +EndSplineSet +EndChar + +StartChar: uniF8E7 +Encoding: 190 63719 45 +Width: 2048 +Flags: W +LayerCount: 2 +Fore +SplineSet +1024 1538 m 0,0,1 + 1240 1538 1240 1538 1427 1430 c 128,-1,2 + 1614 1322 1614 1322 1722 1135 c 128,-1,3 + 1830 948 1830 948 1830 732 c 256,4,5 + 1830 516 1830 516 1722 329 c 128,-1,6 + 1614 142 1614 142 1427 34 c 128,-1,7 + 1240 -74 1240 -74 1024 -74 c 0,8,9 + 810 -74 810 -74 622.5 33.5 c 128,-1,10 + 435 141 435 141 326 328.5 c 128,-1,11 + 217 516 217 516 217 732 c 256,12,13 + 217 948 217 948 326 1135.5 c 128,-1,14 + 435 1323 435 1323 622.5 1430.5 c 128,-1,15 + 810 1538 810 1538 1024 1538 c 0,0,1 +1024 4 m 256,16,17 + 1220 4 1220 4 1388 101 c 128,-1,18 + 1556 198 1556 198 1654.5 366.5 c 128,-1,19 + 1753 535 1753 535 1753 732 c 0,20,21 + 1753 930 1753 930 1654.5 1098 c 128,-1,22 + 1556 1266 1556 1266 1388 1363 c 128,-1,23 + 1220 1460 1220 1460 1024 1460 c 256,24,25 + 828 1460 828 1460 660 1363 c 128,-1,26 + 492 1266 492 1266 393.5 1097.5 c 128,-1,27 + 295 929 295 929 295 732 c 0,28,29 + 295 534 295 534 393.5 366.5 c 128,-1,30 + 492 199 492 199 660 101.5 c 128,-1,31 + 828 4 828 4 1024 4 c 256,16,17 +1082 841 m 1,32,33 + 1111 824 1111 824 1129 795.5 c 128,-1,34 + 1147 767 1147 767 1147 732 c 0,35,36 + 1147 681 1147 681 1111 645 c 128,-1,37 + 1075 609 1075 609 1024 609 c 0,38,39 + 989 609 989 609 959 628 c 1,40,-1 + 689 472 l 1,41,-1 + 631 572 l 1,42,-1 + 901 728 l 1,43,44 + 901 805 901 805 966 841 c 1,45,-1 + 966 1397 l 1,46,-1 + 1082 1397 l 1,47,-1 + 1082 841 l 1,32,33 +1071 732 m 256,48,49 + 1071 752 1071 752 1056.5 765 c 128,-1,50 + 1042 778 1042 778 1024 778 c 0,51,52 + 1004 778 1004 778 990.5 765 c 128,-1,53 + 977 752 977 752 977 732 c 256,54,55 + 977 712 977 712 990.5 699 c 128,-1,56 + 1004 686 1004 686 1024 686 c 0,57,58 + 1042 686 1042 686 1056.5 699 c 128,-1,59 + 1071 712 1071 712 1071 732 c 256,48,49 +1654 778 m 256,60,61 + 1674 778 1674 778 1687.5 765 c 128,-1,62 + 1701 752 1701 752 1701 732 c 256,63,64 + 1701 712 1701 712 1687.5 699 c 128,-1,65 + 1674 686 1674 686 1654 686 c 256,66,67 + 1634 686 1634 686 1620.5 699 c 128,-1,68 + 1607 712 1607 712 1607 732 c 256,69,70 + 1607 752 1607 752 1620.5 765 c 128,-1,71 + 1634 778 1634 778 1654 778 c 256,60,61 +1569 1001 m 0,72,73 + 1552 1001 1552 1001 1537.5 1014 c 128,-1,74 + 1523 1027 1523 1027 1523 1047 c 0,75,76 + 1523 1065 1523 1065 1535.5 1079.5 c 128,-1,77 + 1548 1094 1548 1094 1569 1094 c 0,78,79 + 1587 1094 1587 1094 1601.5 1081 c 128,-1,80 + 1616 1068 1616 1068 1616 1047 c 0,81,82 + 1616 1028 1616 1028 1603 1014.5 c 128,-1,83 + 1590 1001 1590 1001 1569 1001 c 0,72,73 +1385 1278 m 0,84,85 + 1385 1257 1385 1257 1370.5 1244 c 128,-1,86 + 1356 1231 1356 1231 1339 1231 c 0,87,88 + 1317 1231 1317 1231 1304.5 1245.5 c 128,-1,89 + 1292 1260 1292 1260 1292 1277 c 0,90,91 + 1292 1297 1292 1297 1307 1310.5 c 128,-1,92 + 1322 1324 1322 1324 1339 1324 c 0,93,94 + 1358 1324 1358 1324 1371.5 1311 c 128,-1,95 + 1385 1298 1385 1298 1385 1278 c 0,84,85 +708 1231 m 0,96,97 + 691 1231 691 1231 676.5 1244.5 c 128,-1,98 + 662 1258 662 1258 662 1279 c 0,99,100 + 662 1296 662 1296 675 1310 c 128,-1,101 + 688 1324 688 1324 708 1324 c 0,102,103 + 726 1324 726 1324 740.5 1311 c 128,-1,104 + 755 1298 755 1298 755 1278 c 0,105,106 + 755 1257 755 1257 740.5 1244 c 128,-1,107 + 726 1231 726 1231 708 1231 c 0,96,97 +524 1047 m 0,108,109 + 524 1027 524 1027 509.5 1014 c 128,-1,110 + 495 1001 495 1001 478 1001 c 0,111,112 + 458 1001 458 1001 444.5 1015 c 128,-1,113 + 431 1029 431 1029 431 1047 c 0,114,115 + 431 1068 431 1068 445.5 1081 c 128,-1,116 + 460 1094 460 1094 478 1094 c 0,117,118 + 497 1094 497 1094 510.5 1080 c 128,-1,119 + 524 1066 524 1066 524 1047 c 0,108,109 +393 778 m 0,120,121 + 413 778 413 778 426.5 765 c 128,-1,122 + 440 752 440 752 440 732 c 256,123,124 + 440 712 440 712 426.5 699 c 128,-1,125 + 413 686 413 686 393 686 c 0,126,127 + 374 686 374 686 360.5 699 c 128,-1,128 + 347 712 347 712 347 732 c 256,129,130 + 347 752 347 752 360.5 765 c 128,-1,131 + 374 778 374 778 393 778 c 0,120,121 +478 463 m 0,132,133 + 496 463 496 463 510 450 c 128,-1,134 + 524 437 524 437 524 417 c 0,135,136 + 524 400 524 400 511.5 385 c 128,-1,137 + 499 370 499 370 479 370 c 0,138,139 + 460 370 460 370 445.5 383.5 c 128,-1,140 + 431 397 431 397 431 417 c 0,141,142 + 431 436 431 436 444.5 449.5 c 128,-1,143 + 458 463 458 463 478 463 c 0,132,133 +755 186 m 0,144,145 + 755 166 755 166 740.5 153 c 128,-1,146 + 726 140 726 140 708 140 c 0,147,148 + 688 140 688 140 675 154.5 c 128,-1,149 + 662 169 662 169 662 186 c 0,150,151 + 662 206 662 206 676 219 c 128,-1,152 + 690 232 690 232 708 232 c 0,153,154 + 729 232 729 232 742 218.5 c 128,-1,155 + 755 205 755 205 755 186 c 0,144,145 +1024 148 m 256,156,157 + 1044 148 1044 148 1057 134.5 c 128,-1,158 + 1070 121 1070 121 1070 102 c 0,159,160 + 1070 82 1070 82 1057 69 c 128,-1,161 + 1044 56 1044 56 1024 56 c 256,162,163 + 1004 56 1004 56 990.5 69 c 128,-1,164 + 977 82 977 82 977 102 c 0,165,166 + 977 121 977 121 990.5 134.5 c 128,-1,167 + 1004 148 1004 148 1024 148 c 256,156,157 +1340 232 m 0,168,169 + 1357 232 1357 232 1371 219.5 c 128,-1,170 + 1385 207 1385 207 1385 186 c 0,171,172 + 1385 169 1385 169 1372 154.5 c 128,-1,173 + 1359 140 1359 140 1339 140 c 0,174,175 + 1322 140 1322 140 1307 153 c 128,-1,176 + 1292 166 1292 166 1292 187 c 0,177,178 + 1292 207 1292 207 1307 219.5 c 128,-1,179 + 1322 232 1322 232 1340 232 c 0,168,169 +1616 417 m 0,180,181 + 1616 396 1616 396 1601.5 383 c 128,-1,182 + 1587 370 1587 370 1568 370 c 0,183,184 + 1547 370 1547 370 1535 385 c 128,-1,185 + 1523 400 1523 400 1523 417 c 0,186,187 + 1523 437 1523 437 1537.5 450 c 128,-1,188 + 1552 463 1552 463 1569 463 c 0,189,190 + 1590 463 1590 463 1603 449.5 c 128,-1,191 + 1616 436 1616 436 1616 417 c 0,180,181 +EndSplineSet +EndChar + +StartChar: carriagereturn +Encoding: 191 8629 46 +Width: 2048 +Flags: W +LayerCount: 2 +Fore +SplineSet +1024 1538 m 0,0,1 + 1240 1538 1240 1538 1427.5 1429 c 128,-1,2 + 1615 1320 1615 1320 1722.5 1132.5 c 128,-1,3 + 1830 945 1830 945 1830 731 c 0,4,5 + 1830 515 1830 515 1722 328 c 128,-1,6 + 1614 141 1614 141 1427 33 c 128,-1,7 + 1240 -75 1240 -75 1024 -75 c 0,8,9 + 810 -75 810 -75 622.5 32.5 c 128,-1,10 + 435 140 435 140 326 327.5 c 128,-1,11 + 217 515 217 515 217 731 c 0,12,13 + 217 946 217 946 325 1134 c 128,-1,14 + 433 1322 433 1322 621.5 1430 c 128,-1,15 + 810 1538 810 1538 1024 1538 c 0,0,1 +1024 3 m 256,16,17 + 1220 3 1220 3 1389 101 c 128,-1,18 + 1558 199 1558 199 1655.5 367.5 c 128,-1,19 + 1753 536 1753 536 1753 731 c 0,20,21 + 1753 927 1753 927 1655 1096 c 128,-1,22 + 1557 1265 1557 1265 1388.5 1362.5 c 128,-1,23 + 1220 1460 1220 1460 1024 1460 c 256,24,25 + 828 1460 828 1460 659 1362 c 128,-1,26 + 490 1264 490 1264 392.5 1095.5 c 128,-1,27 + 295 927 295 927 295 731 c 256,28,29 + 295 535 295 535 393 366.5 c 128,-1,30 + 491 198 491 198 659.5 100.5 c 128,-1,31 + 828 3 828 3 1024 3 c 256,16,17 +1082 840 m 1,32,33 + 1111 824 1111 824 1129 795.5 c 128,-1,34 + 1147 767 1147 767 1147 732 c 0,35,36 + 1147 679 1147 679 1110 643.5 c 128,-1,37 + 1073 608 1073 608 1024 608 c 0,38,39 + 988 608 988 608 959.5 626.5 c 128,-1,40 + 931 645 931 645 916 674 c 1,41,-1 + 604 674 l 1,42,-1 + 604 790 l 1,43,-1 + 916 790 l 1,44,45 + 933 822 933 822 966 840 c 1,46,-1 + 966 1396 l 1,47,-1 + 1082 1396 l 1,48,-1 + 1082 840 l 1,32,33 +1024 685 m 0,49,50 + 1041 685 1041 685 1056 698.5 c 128,-1,51 + 1071 712 1071 712 1071 731 c 256,52,53 + 1071 750 1071 750 1057 764 c 128,-1,54 + 1043 778 1043 778 1024 778 c 0,55,56 + 1004 778 1004 778 990.5 764.5 c 128,-1,57 + 977 751 977 751 977 731 c 256,58,59 + 977 711 977 711 991 698 c 128,-1,60 + 1005 685 1005 685 1024 685 c 0,49,50 +1654 778 m 256,61,62 + 1674 778 1674 778 1687.5 764.5 c 128,-1,63 + 1701 751 1701 751 1701 731 c 0,64,65 + 1701 712 1701 712 1687.5 698.5 c 128,-1,66 + 1674 685 1674 685 1654 685 c 256,67,68 + 1634 685 1634 685 1620.5 698.5 c 128,-1,69 + 1607 712 1607 712 1607 731 c 0,70,71 + 1607 751 1607 751 1620.5 764.5 c 128,-1,72 + 1634 778 1634 778 1654 778 c 256,61,62 +1569 1000 m 0,73,74 + 1552 1000 1552 1000 1537.5 1013 c 128,-1,75 + 1523 1026 1523 1026 1523 1046 c 0,76,77 + 1523 1064 1523 1064 1536 1078.5 c 128,-1,78 + 1549 1093 1549 1093 1569 1093 c 0,79,80 + 1587 1093 1587 1093 1601.5 1080 c 128,-1,81 + 1616 1067 1616 1067 1616 1047 c 0,82,83 + 1616 1021 1616 1021 1593 1006 c 1,84,85 + 1581 1000 1581 1000 1569 1000 c 0,73,74 +1385 1278 m 256,86,87 + 1385 1258 1385 1258 1370.5 1244.5 c 128,-1,88 + 1356 1231 1356 1231 1339 1231 c 0,89,90 + 1318 1231 1318 1231 1305 1245.5 c 128,-1,91 + 1292 1260 1292 1260 1292 1277 c 0,92,93 + 1292 1297 1292 1297 1306.5 1310.5 c 128,-1,94 + 1321 1324 1321 1324 1339 1324 c 0,95,96 + 1358 1324 1358 1324 1371.5 1311 c 128,-1,97 + 1385 1298 1385 1298 1385 1278 c 256,86,87 +709 1231 m 0,98,99 + 690 1231 690 1231 676 1244.5 c 128,-1,100 + 662 1258 662 1258 662 1278 c 0,101,102 + 662 1295 662 1295 675 1309.5 c 128,-1,103 + 688 1324 688 1324 708 1324 c 0,104,105 + 726 1324 726 1324 740.5 1311 c 128,-1,106 + 755 1298 755 1298 755 1277 c 0,107,108 + 755 1257 755 1257 741 1244 c 128,-1,109 + 727 1231 727 1231 709 1231 c 0,98,99 +524 1046 m 0,110,111 + 524 1026 524 1026 510 1013 c 128,-1,112 + 496 1000 496 1000 477 1000 c 0,113,114 + 457 1000 457 1000 444 1014.5 c 128,-1,115 + 431 1029 431 1029 431 1046 c 0,116,117 + 431 1066 431 1066 446 1079.5 c 128,-1,118 + 461 1093 461 1093 478 1093 c 0,119,120 + 497 1093 497 1093 510.5 1080 c 128,-1,121 + 524 1067 524 1067 524 1046 c 0,110,111 +393 778 m 0,122,123 + 413 778 413 778 426.5 764.5 c 128,-1,124 + 440 751 440 751 440 732 c 0,125,126 + 440 712 440 712 426.5 698.5 c 128,-1,127 + 413 685 413 685 393 685 c 0,128,129 + 374 685 374 685 360.5 698.5 c 128,-1,130 + 347 712 347 712 347 732 c 0,131,132 + 347 751 347 751 360.5 764.5 c 128,-1,133 + 374 778 374 778 393 778 c 0,122,123 +478 463 m 0,134,135 + 495 463 495 463 509.5 450 c 128,-1,136 + 524 437 524 437 524 416 c 0,137,138 + 524 399 524 399 511 384.5 c 128,-1,139 + 498 370 498 370 478 370 c 0,140,141 + 461 370 461 370 446 383 c 128,-1,142 + 431 396 431 396 431 417 c 0,143,144 + 431 437 431 437 445.5 450 c 128,-1,145 + 460 463 460 463 478 463 c 0,134,135 +755 185 m 0,146,147 + 755 165 755 165 740.5 152 c 128,-1,148 + 726 139 726 139 709 139 c 0,149,150 + 689 139 689 139 675.5 153.5 c 128,-1,151 + 662 168 662 168 662 185 c 0,152,153 + 662 206 662 206 676.5 219 c 128,-1,154 + 691 232 691 232 708 232 c 0,155,156 + 720 232 720 232 732 226 c 1,157,158 + 755 211 755 211 755 185 c 0,146,147 +1024 148 m 256,159,160 + 1044 148 1044 148 1057 134.5 c 128,-1,161 + 1070 121 1070 121 1070 101 c 0,162,163 + 1070 82 1070 82 1057 68.5 c 128,-1,164 + 1044 55 1044 55 1024 55 c 256,165,166 + 1004 55 1004 55 990.5 68.5 c 128,-1,167 + 977 82 977 82 977 101 c 0,168,169 + 977 121 977 121 990.5 134.5 c 128,-1,170 + 1004 148 1004 148 1024 148 c 256,159,160 +1339 232 m 0,171,172 + 1356 232 1356 232 1370.5 219 c 128,-1,173 + 1385 206 1385 206 1385 185 c 0,174,175 + 1385 167 1385 167 1371.5 153 c 128,-1,176 + 1358 139 1358 139 1338 139 c 0,177,178 + 1321 139 1321 139 1306.5 152.5 c 128,-1,179 + 1292 166 1292 166 1292 186 c 256,180,181 + 1292 206 1292 206 1306.5 219 c 128,-1,182 + 1321 232 1321 232 1339 232 c 0,171,172 +1616 416 m 0,183,184 + 1616 396 1616 396 1601.5 383 c 128,-1,185 + 1587 370 1587 370 1569 370 c 0,186,187 + 1549 370 1549 370 1536 384.5 c 128,-1,188 + 1523 399 1523 399 1523 416 c 0,189,190 + 1523 437 1523 437 1537.5 450 c 128,-1,191 + 1552 463 1552 463 1569 463 c 0,192,193 + 1581 463 1581 463 1593 457 c 1,194,195 + 1616 442 1616 442 1616 416 c 0,183,184 +EndSplineSet +EndChar + +StartChar: aleph +Encoding: 192 8501 47 +Width: 2048 +Flags: W +LayerCount: 2 +Fore +SplineSet +1024 1538 m 0,0,1 + 1239 1538 1239 1538 1427 1430 c 128,-1,2 + 1615 1322 1615 1322 1723 1133.5 c 128,-1,3 + 1831 945 1831 945 1831 731 c 0,4,5 + 1831 515 1831 515 1722 327.5 c 128,-1,6 + 1613 140 1613 140 1425.5 32.5 c 128,-1,7 + 1238 -75 1238 -75 1024 -75 c 256,8,9 + 810 -75 810 -75 622.5 32.5 c 128,-1,10 + 435 140 435 140 326 327.5 c 128,-1,11 + 217 515 217 515 217 731 c 0,12,13 + 217 946 217 946 325 1134 c 128,-1,14 + 433 1322 433 1322 621.5 1430 c 128,-1,15 + 810 1538 810 1538 1024 1538 c 0,0,1 +1024 3 m 256,16,17 + 1220 3 1220 3 1389 101 c 128,-1,18 + 1558 199 1558 199 1655.5 367.5 c 128,-1,19 + 1753 536 1753 536 1753 731 c 0,20,21 + 1753 927 1753 927 1655 1096 c 128,-1,22 + 1557 1265 1557 1265 1388.5 1362.5 c 128,-1,23 + 1220 1460 1220 1460 1024 1460 c 256,24,25 + 828 1460 828 1460 659 1362 c 128,-1,26 + 490 1264 490 1264 392.5 1095.5 c 128,-1,27 + 295 927 295 927 295 731 c 256,28,29 + 295 535 295 535 393 366.5 c 128,-1,30 + 491 198 491 198 659.5 100.5 c 128,-1,31 + 828 3 828 3 1024 3 c 256,16,17 +1082 839 m 1,32,33 + 1111 824 1111 824 1129 795.5 c 128,-1,34 + 1147 767 1147 767 1147 732 c 0,35,36 + 1147 680 1147 680 1110.5 644 c 128,-1,37 + 1074 608 1074 608 1024 608 c 0,38,39 + 973 608 973 608 937 644 c 128,-1,40 + 901 680 901 680 901 735 c 1,41,-1 + 631 891 l 1,42,-1 + 689 992 l 1,43,-1 + 959 836 l 1,44,-1 + 966 839 l 1,45,-1 + 966 1396 l 1,46,-1 + 1082 1396 l 1,47,-1 + 1082 839 l 1,32,33 +1024 147 m 0,48,49 + 1044 147 1044 147 1057.5 134 c 128,-1,50 + 1071 121 1071 121 1071 101 c 0,51,52 + 1071 82 1071 82 1057.5 68 c 128,-1,53 + 1044 54 1044 54 1024 54 c 0,54,55 + 1005 54 1005 54 991 68 c 128,-1,56 + 977 82 977 82 977 101 c 0,57,58 + 977 121 977 121 991 134 c 128,-1,59 + 1005 147 1005 147 1024 147 c 0,48,49 +394 778 m 256,60,61 + 414 778 414 778 427 764.5 c 128,-1,62 + 440 751 440 751 440 731 c 0,63,64 + 440 712 440 712 427 698.5 c 128,-1,65 + 414 685 414 685 394 685 c 256,66,67 + 374 685 374 685 360.5 698.5 c 128,-1,68 + 347 712 347 712 347 731 c 0,69,70 + 347 751 347 751 360.5 764.5 c 128,-1,71 + 374 778 374 778 394 778 c 256,60,61 +525 1046 m 0,72,73 + 525 1025 525 1025 510.5 1012.5 c 128,-1,74 + 496 1000 496 1000 478 1000 c 0,75,76 + 458 1000 458 1000 445 1014.5 c 128,-1,77 + 432 1029 432 1029 432 1047 c 0,78,79 + 432 1067 432 1067 446.5 1080 c 128,-1,80 + 461 1093 461 1093 478 1093 c 0,81,82 + 498 1093 498 1093 511.5 1078 c 128,-1,83 + 525 1063 525 1063 525 1046 c 0,72,73 +478 463 m 0,84,85 + 495 463 495 463 510 450.5 c 128,-1,86 + 525 438 525 438 525 416 c 0,87,88 + 525 399 525 399 512 384.5 c 128,-1,89 + 499 370 499 370 478 370 c 0,90,91 + 461 370 461 370 446.5 383 c 128,-1,92 + 432 396 432 396 432 416 c 0,93,94 + 432 435 432 435 445.5 449 c 128,-1,95 + 459 463 459 463 478 463 c 0,84,85 +1024 685 m 0,96,97 + 1042 685 1042 685 1056.5 698 c 128,-1,98 + 1071 711 1071 711 1071 731 c 256,99,100 + 1071 751 1071 751 1057.5 764 c 128,-1,101 + 1044 777 1044 777 1024 777 c 256,102,103 + 1004 777 1004 777 990.5 764 c 128,-1,104 + 977 751 977 751 977 731 c 256,105,106 + 977 711 977 711 991 698 c 128,-1,107 + 1005 685 1005 685 1024 685 c 0,96,97 +755 186 m 0,108,109 + 755 165 755 165 740.5 152 c 128,-1,110 + 726 139 726 139 709 139 c 0,111,112 + 688 139 688 139 675 153.5 c 128,-1,113 + 662 168 662 168 662 185 c 0,114,115 + 662 205 662 205 676.5 218.5 c 128,-1,116 + 691 232 691 232 709 232 c 0,117,118 + 728 232 728 232 741.5 219 c 128,-1,119 + 755 206 755 206 755 186 c 0,108,109 +1570 1000 m 256,120,121 + 1552 1000 1552 1000 1537.5 1013.5 c 128,-1,122 + 1523 1027 1523 1027 1523 1047 c 0,123,124 + 1523 1064 1523 1064 1536 1078.5 c 128,-1,125 + 1549 1093 1549 1093 1570 1093 c 0,126,127 + 1587 1093 1587 1093 1601.5 1079.5 c 128,-1,128 + 1616 1066 1616 1066 1616 1046 c 256,129,130 + 1616 1026 1616 1026 1602 1013 c 128,-1,131 + 1588 1000 1588 1000 1570 1000 c 256,120,121 +1339 232 m 0,132,133 + 1356 232 1356 232 1370.5 218.5 c 128,-1,134 + 1385 205 1385 205 1385 185 c 0,135,136 + 1385 168 1385 168 1372 153.5 c 128,-1,137 + 1359 139 1359 139 1339 139 c 0,138,139 + 1322 139 1322 139 1307 152 c 128,-1,140 + 1292 165 1292 165 1292 186 c 0,141,142 + 1292 206 1292 206 1306.5 219 c 128,-1,143 + 1321 232 1321 232 1339 232 c 0,132,133 +708 1230 m 256,144,145 + 691 1230 691 1230 676.5 1243.5 c 128,-1,146 + 662 1257 662 1257 662 1277 c 0,147,148 + 662 1294 662 1294 675.5 1308.5 c 128,-1,149 + 689 1323 689 1323 709 1323 c 0,150,151 + 726 1323 726 1323 740.5 1310 c 128,-1,152 + 755 1297 755 1297 755 1276 c 0,153,154 + 755 1256 755 1256 740 1243 c 128,-1,155 + 725 1230 725 1230 708 1230 c 256,144,145 +1616 417 m 0,156,157 + 1616 396 1616 396 1601.5 383 c 128,-1,158 + 1587 370 1587 370 1570 370 c 0,159,160 + 1549 370 1549 370 1536 384 c 128,-1,161 + 1523 398 1523 398 1523 415 c 0,162,163 + 1523 436 1523 436 1538 449 c 128,-1,164 + 1553 462 1553 462 1571 462 c 0,165,166 + 1590 462 1590 462 1603 449.5 c 128,-1,167 + 1616 437 1616 437 1616 417 c 0,156,157 +1654 777 m 0,168,169 + 1674 777 1674 777 1687.5 764 c 128,-1,170 + 1701 751 1701 751 1701 731 c 0,171,172 + 1701 712 1701 712 1687.5 698.5 c 128,-1,173 + 1674 685 1674 685 1654 685 c 0,174,175 + 1635 685 1635 685 1621.5 698.5 c 128,-1,176 + 1608 712 1608 712 1608 731 c 0,177,178 + 1608 751 1608 751 1621.5 764 c 128,-1,179 + 1635 777 1635 777 1654 777 c 0,168,169 +1385 1277 m 256,180,181 + 1385 1257 1385 1257 1370.5 1243.5 c 128,-1,182 + 1356 1230 1356 1230 1339 1230 c 0,183,184 + 1319 1230 1319 1230 1306 1245 c 128,-1,185 + 1293 1260 1293 1260 1293 1277 c 0,186,187 + 1293 1297 1293 1297 1307 1310 c 128,-1,188 + 1321 1323 1321 1323 1338 1323 c 0,189,190 + 1357 1323 1357 1323 1371 1310 c 128,-1,191 + 1385 1297 1385 1297 1385 1277 c 256,180,181 +EndSplineSet +EndChar + +StartChar: Ifraktur +Encoding: 193 8465 48 +Width: 2048 +Flags: W +LayerCount: 2 +Fore +SplineSet +1024 1538 m 256,0,1 + 1238 1538 1238 1538 1425.5 1430.5 c 128,-1,2 + 1613 1323 1613 1323 1722 1135.5 c 128,-1,3 + 1831 948 1831 948 1831 732 c 256,4,5 + 1831 516 1831 516 1722 328.5 c 128,-1,6 + 1613 141 1613 141 1425.5 33.5 c 128,-1,7 + 1238 -74 1238 -74 1024 -74 c 256,8,9 + 810 -74 810 -74 622.5 33.5 c 128,-1,10 + 435 141 435 141 326 328.5 c 128,-1,11 + 217 516 217 516 217 732 c 256,12,13 + 217 948 217 948 326 1135.5 c 128,-1,14 + 435 1323 435 1323 622.5 1430.5 c 128,-1,15 + 810 1538 810 1538 1024 1538 c 256,0,1 +1024 3 m 256,16,17 + 1220 3 1220 3 1389 101 c 128,-1,18 + 1558 199 1558 199 1655.5 367.5 c 128,-1,19 + 1753 536 1753 536 1753 732 c 256,20,21 + 1753 928 1753 928 1655 1097 c 128,-1,22 + 1557 1266 1557 1266 1388.5 1363.5 c 128,-1,23 + 1220 1461 1220 1461 1024 1461 c 256,24,25 + 828 1461 828 1461 659 1363 c 128,-1,26 + 490 1265 490 1265 392.5 1096.5 c 128,-1,27 + 295 928 295 928 295 732 c 256,28,29 + 295 536 295 536 393 367 c 128,-1,30 + 491 198 491 198 659.5 100.5 c 128,-1,31 + 828 3 828 3 1024 3 c 256,16,17 +1082 841 m 1,32,33 + 1111 825 1111 825 1129 796 c 128,-1,34 + 1147 767 1147 767 1147 732 c 0,35,36 + 1147 681 1147 681 1111 645 c 128,-1,37 + 1075 609 1075 609 1024 609 c 256,38,39 + 973 609 973 609 937 645 c 128,-1,40 + 901 681 901 681 901 732 c 0,41,42 + 901 768 901 768 919 797 c 1,43,-1 + 764 1067 l 1,44,-1 + 865 1125 l 1,45,-1 + 966 949 l 1,46,-1 + 966 1397 l 1,47,-1 + 1082 1397 l 1,48,-1 + 1082 841 l 1,32,33 +1024 686 m 0,49,50 + 1047 686 1047 686 1059 701 c 128,-1,51 + 1071 716 1071 716 1071 732 c 0,52,53 + 1071 751 1071 751 1057.5 765 c 128,-1,54 + 1044 779 1044 779 1024 779 c 256,55,56 + 1004 779 1004 779 990.5 765 c 128,-1,57 + 977 751 977 751 977 732 c 0,58,59 + 977 711 977 711 991 698.5 c 128,-1,60 + 1005 686 1005 686 1024 686 c 0,49,50 +1654 779 m 0,61,62 + 1674 779 1674 779 1687.5 765 c 128,-1,63 + 1701 751 1701 751 1701 732 c 0,64,65 + 1701 712 1701 712 1687.5 699 c 128,-1,66 + 1674 686 1674 686 1654 686 c 0,67,68 + 1635 686 1635 686 1621.5 699 c 128,-1,69 + 1608 712 1608 712 1608 732 c 0,70,71 + 1608 751 1608 751 1621.5 765 c 128,-1,72 + 1635 779 1635 779 1654 779 c 0,61,62 +1570 1001 m 0,73,74 + 1553 1001 1553 1001 1538 1014 c 128,-1,75 + 1523 1027 1523 1027 1523 1048 c 0,76,77 + 1523 1065 1523 1065 1536.5 1079 c 128,-1,78 + 1550 1093 1550 1093 1571 1093 c 0,79,80 + 1588 1093 1588 1093 1602 1080 c 128,-1,81 + 1616 1067 1616 1067 1616 1047 c 256,82,83 + 1616 1027 1616 1027 1602 1014 c 128,-1,84 + 1588 1001 1588 1001 1570 1001 c 0,73,74 +1385 1278 m 256,85,86 + 1385 1258 1385 1258 1371 1244.5 c 128,-1,87 + 1357 1231 1357 1231 1338 1231 c 0,88,89 + 1318 1231 1318 1231 1305.5 1246 c 128,-1,90 + 1293 1261 1293 1261 1293 1278 c 0,91,92 + 1293 1298 1293 1298 1307.5 1311 c 128,-1,93 + 1322 1324 1322 1324 1339 1324 c 0,94,95 + 1358 1324 1358 1324 1371.5 1311 c 128,-1,96 + 1385 1298 1385 1298 1385 1278 c 256,85,86 +709 1324 m 0,97,98 + 726 1324 726 1324 740.5 1310.5 c 128,-1,99 + 755 1297 755 1297 755 1277 c 0,100,101 + 755 1260 755 1260 743 1245.5 c 128,-1,102 + 731 1231 731 1231 710 1231 c 0,103,104 + 691 1231 691 1231 676.5 1244.5 c 128,-1,105 + 662 1258 662 1258 662 1278 c 0,106,107 + 662 1297 662 1297 675.5 1310.5 c 128,-1,108 + 689 1324 689 1324 709 1324 c 0,97,98 +525 1047 m 0,109,110 + 525 1026 525 1026 510.5 1013.5 c 128,-1,111 + 496 1001 496 1001 478 1001 c 0,112,113 + 458 1001 458 1001 445 1015.5 c 128,-1,114 + 432 1030 432 1030 432 1047 c 0,115,116 + 432 1068 432 1068 446 1080.5 c 128,-1,117 + 460 1093 460 1093 477 1093 c 0,118,119 + 497 1093 497 1093 511 1079.5 c 128,-1,120 + 525 1066 525 1066 525 1047 c 0,109,110 +394 779 m 256,121,122 + 414 779 414 779 427 765.5 c 128,-1,123 + 440 752 440 752 440 732 c 256,124,125 + 440 712 440 712 427 699 c 128,-1,126 + 414 686 414 686 394 686 c 256,127,128 + 374 686 374 686 360.5 699 c 128,-1,129 + 347 712 347 712 347 732 c 256,130,131 + 347 752 347 752 360.5 765.5 c 128,-1,132 + 374 779 374 779 394 779 c 256,121,122 +478 463 m 256,133,134 + 496 463 496 463 510.5 450.5 c 128,-1,135 + 525 438 525 438 525 417 c 0,136,137 + 525 400 525 400 512.5 385 c 128,-1,138 + 500 370 500 370 479 370 c 0,139,140 + 462 370 462 370 447 383 c 128,-1,141 + 432 396 432 396 432 417 c 0,142,143 + 432 437 432 437 446 450 c 128,-1,144 + 460 463 460 463 478 463 c 256,133,134 +755 187 m 0,145,146 + 755 166 755 166 740.5 153 c 128,-1,147 + 726 140 726 140 709 140 c 0,148,149 + 688 140 688 140 675 154 c 128,-1,150 + 662 168 662 168 662 185 c 0,151,152 + 662 206 662 206 676.5 219 c 128,-1,153 + 691 232 691 232 708 232 c 0,154,155 + 728 232 728 232 741.5 219.5 c 128,-1,156 + 755 207 755 207 755 187 c 0,145,146 +1024 148 m 0,157,158 + 1044 148 1044 148 1057.5 134.5 c 128,-1,159 + 1071 121 1071 121 1071 102 c 0,160,161 + 1071 82 1071 82 1058 69 c 128,-1,162 + 1045 56 1045 56 1026 56 c 0,163,164 + 1006 56 1006 56 991.5 69 c 128,-1,165 + 977 82 977 82 977 102 c 0,166,167 + 977 121 977 121 991 134.5 c 128,-1,168 + 1005 148 1005 148 1024 148 c 0,157,158 +1339 232 m 0,169,170 + 1356 232 1356 232 1370.5 219 c 128,-1,171 + 1385 206 1385 206 1385 185 c 0,172,173 + 1385 168 1385 168 1372 154 c 128,-1,174 + 1359 140 1359 140 1339 140 c 0,175,176 + 1322 140 1322 140 1307 153 c 128,-1,177 + 1292 166 1292 166 1292 186 c 256,178,179 + 1292 206 1292 206 1306.5 219 c 128,-1,180 + 1321 232 1321 232 1339 232 c 0,169,170 +1616 417 m 256,181,182 + 1616 397 1616 397 1601 383.5 c 128,-1,183 + 1586 370 1586 370 1569 370 c 0,184,185 + 1548 370 1548 370 1535.5 384.5 c 128,-1,186 + 1523 399 1523 399 1523 416 c 0,187,188 + 1523 436 1523 436 1538 449.5 c 128,-1,189 + 1553 463 1553 463 1570 463 c 0,190,191 + 1589 463 1589 463 1602.5 450 c 128,-1,192 + 1616 437 1616 437 1616 417 c 256,181,182 +EndSplineSet +EndChar + +StartChar: Rfraktur +Encoding: 194 8476 49 +Width: 2048 +Flags: W +LayerCount: 2 +Fore +SplineSet +1024 1538 m 0,0,1 + 1239 1538 1239 1538 1427 1430 c 128,-1,2 + 1615 1322 1615 1322 1723 1133.5 c 128,-1,3 + 1831 945 1831 945 1831 731 c 0,4,5 + 1831 516 1831 516 1723 328 c 128,-1,6 + 1615 140 1615 140 1426.5 32 c 128,-1,7 + 1238 -76 1238 -76 1024 -76 c 0,8,9 + 809 -76 809 -76 621 32 c 128,-1,10 + 433 140 433 140 325 328.5 c 128,-1,11 + 217 517 217 517 217 731 c 0,12,13 + 217 946 217 946 325 1134 c 128,-1,14 + 433 1322 433 1322 621.5 1430 c 128,-1,15 + 810 1538 810 1538 1024 1538 c 0,0,1 +1024 2 m 256,16,17 + 1220 2 1220 2 1389 100 c 128,-1,18 + 1558 198 1558 198 1655.5 366.5 c 128,-1,19 + 1753 535 1753 535 1753 731 c 256,20,21 + 1753 927 1753 927 1655 1096 c 128,-1,22 + 1557 1265 1557 1265 1388.5 1362.5 c 128,-1,23 + 1220 1460 1220 1460 1024 1460 c 256,24,25 + 828 1460 828 1460 659 1362 c 128,-1,26 + 490 1264 490 1264 392.5 1095.5 c 128,-1,27 + 295 927 295 927 295 731 c 256,28,29 + 295 535 295 535 393 366 c 128,-1,30 + 491 197 491 197 659.5 99.5 c 128,-1,31 + 828 2 828 2 1024 2 c 256,16,17 +1099 828 m 1,32,33 + 1147 793 1147 793 1147 731 c 0,34,35 + 1147 680 1147 680 1111 644 c 128,-1,36 + 1075 608 1075 608 1024 608 c 256,37,38 + 973 608 973 608 937 644 c 128,-1,39 + 901 680 901 680 901 731 c 0,40,41 + 901 791 901 791 949 828 c 1,42,-1 + 949 1162 l 1,43,-1 + 966 1162 l 1,44,-1 + 966 1396 l 1,45,-1 + 1082 1396 l 1,46,-1 + 1082 1162 l 1,47,-1 + 1099 1162 l 1,48,-1 + 1099 828 l 1,32,33 +977 731 m 0,49,50 + 977 713 977 713 991 698.5 c 128,-1,51 + 1005 684 1005 684 1024 684 c 256,52,53 + 1043 684 1043 684 1057 697 c 128,-1,54 + 1071 710 1071 710 1071 731 c 0,55,56 + 1071 750 1071 750 1057.5 763.5 c 128,-1,57 + 1044 777 1044 777 1024 777 c 0,58,59 + 1005 777 1005 777 991 764 c 128,-1,60 + 977 751 977 751 977 731 c 0,49,50 +1654 777 m 0,61,62 + 1674 777 1674 777 1687.5 764 c 128,-1,63 + 1701 751 1701 751 1701 731 c 256,64,65 + 1701 711 1701 711 1687.5 697.5 c 128,-1,66 + 1674 684 1674 684 1654 684 c 0,67,68 + 1635 684 1635 684 1621.5 697.5 c 128,-1,69 + 1608 711 1608 711 1608 731 c 256,70,71 + 1608 751 1608 751 1621.5 764 c 128,-1,72 + 1635 777 1635 777 1654 777 c 0,61,62 +1569 999 m 256,73,74 + 1552 999 1552 999 1537.5 1012.5 c 128,-1,75 + 1523 1026 1523 1026 1523 1046 c 0,76,77 + 1523 1063 1523 1063 1536.5 1077.5 c 128,-1,78 + 1550 1092 1550 1092 1570 1092 c 0,79,80 + 1587 1092 1587 1092 1601.5 1079 c 128,-1,81 + 1616 1066 1616 1066 1616 1045 c 0,82,83 + 1616 1025 1616 1025 1601 1012 c 128,-1,84 + 1586 999 1586 999 1569 999 c 256,73,74 +1385 1277 m 0,85,86 + 1385 1256 1385 1256 1370.5 1243 c 128,-1,87 + 1356 1230 1356 1230 1339 1230 c 0,88,89 + 1319 1230 1319 1230 1306 1244 c 128,-1,90 + 1293 1258 1293 1258 1293 1276 c 0,91,92 + 1293 1297 1293 1297 1307 1310 c 128,-1,93 + 1321 1323 1321 1323 1338 1323 c 0,94,95 + 1357 1323 1357 1323 1371 1310 c 128,-1,96 + 1385 1297 1385 1297 1385 1277 c 0,85,86 +709 1323 m 0,97,98 + 726 1323 726 1323 740.5 1310 c 128,-1,99 + 755 1297 755 1297 755 1276 c 0,100,101 + 755 1259 755 1259 741.5 1244.5 c 128,-1,102 + 728 1230 728 1230 708 1230 c 0,103,104 + 691 1230 691 1230 676.5 1243 c 128,-1,105 + 662 1256 662 1256 662 1277 c 0,106,107 + 662 1297 662 1297 676.5 1310 c 128,-1,108 + 691 1323 691 1323 709 1323 c 0,97,98 +525 1045 m 0,109,110 + 525 1024 525 1024 510.5 1011.5 c 128,-1,111 + 496 999 496 999 479 999 c 0,112,113 + 459 999 459 999 445.5 1013.5 c 128,-1,114 + 432 1028 432 1028 432 1046 c 0,115,116 + 432 1066 432 1066 446 1079 c 128,-1,117 + 460 1092 460 1092 477 1092 c 0,118,119 + 489 1092 489 1092 501 1086 c 1,120,121 + 525 1071 525 1071 525 1045 c 0,109,110 +394 777 m 256,122,123 + 414 777 414 777 427 764 c 128,-1,124 + 440 751 440 751 440 731 c 256,125,126 + 440 711 440 711 427 697.5 c 128,-1,127 + 414 684 414 684 394 684 c 256,128,129 + 374 684 374 684 360.5 697.5 c 128,-1,130 + 347 711 347 711 347 731 c 256,131,132 + 347 751 347 751 360.5 764 c 128,-1,133 + 374 777 374 777 394 777 c 256,122,123 +478 462 m 256,134,135 + 496 462 496 462 510.5 449.5 c 128,-1,136 + 525 437 525 437 525 416 c 0,137,138 + 525 399 525 399 511.5 384 c 128,-1,139 + 498 369 498 369 477 369 c 0,140,141 + 460 369 460 369 446 382 c 128,-1,142 + 432 395 432 395 432 416 c 0,143,144 + 432 436 432 436 446 449 c 128,-1,145 + 460 462 460 462 478 462 c 256,134,135 +755 186 m 0,146,147 + 755 165 755 165 740.5 151.5 c 128,-1,148 + 726 138 726 138 709 138 c 0,149,150 + 689 138 689 138 675.5 152.5 c 128,-1,151 + 662 167 662 167 662 184 c 0,152,153 + 662 205 662 205 676.5 218 c 128,-1,154 + 691 231 691 231 708 231 c 0,155,156 + 728 231 728 231 741.5 218.5 c 128,-1,157 + 755 206 755 206 755 186 c 0,146,147 +1024 147 m 0,158,159 + 1044 147 1044 147 1057.5 134 c 128,-1,160 + 1071 121 1071 121 1071 101 c 256,161,162 + 1071 81 1071 81 1057.5 67.5 c 128,-1,163 + 1044 54 1044 54 1024 54 c 0,164,165 + 1005 54 1005 54 991 67.5 c 128,-1,166 + 977 81 977 81 977 101 c 256,167,168 + 977 121 977 121 991 134 c 128,-1,169 + 1005 147 1005 147 1024 147 c 0,158,159 +1339 231 m 256,170,171 + 1356 231 1356 231 1370.5 217.5 c 128,-1,172 + 1385 204 1385 204 1385 184 c 0,173,174 + 1385 167 1385 167 1372 152.5 c 128,-1,175 + 1359 138 1359 138 1338 138 c 0,176,177 + 1321 138 1321 138 1306.5 151.5 c 128,-1,178 + 1292 165 1292 165 1292 186 c 0,179,180 + 1292 206 1292 206 1307 218.5 c 128,-1,181 + 1322 231 1322 231 1339 231 c 256,170,171 +1616 416 m 256,182,183 + 1616 396 1616 396 1601.5 382.5 c 128,-1,184 + 1587 369 1587 369 1570 369 c 0,185,186 + 1550 369 1550 369 1536.5 383.5 c 128,-1,187 + 1523 398 1523 398 1523 415 c 0,188,189 + 1523 435 1523 435 1538 448.5 c 128,-1,190 + 1553 462 1553 462 1570 462 c 0,191,192 + 1589 462 1589 462 1602.5 449 c 128,-1,193 + 1616 436 1616 436 1616 416 c 256,182,183 +EndSplineSet +EndChar EndChars EndSplineFont -- 2.16.3

June 22, 2018

Re: [PATCH] d2d1: Stop redefination on older compilers

by Henri Verbeet

On 22 June 2018 at 06:30, Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> wrote: > Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> > --- > dlls/d2d1/d2d1_private.h | 3 ++- > dlls/d2d1/tests/d2d1.c | 7 ++++--- > 2 files changed, 6 insertions(+), 4 deletions(-) > What are you trying to fix exactly?

June 22, 2018

[PATCH] gdi32: Add a workaround for A->W text output with Symbol font encoding.

by Dmitry Timoshkov

There are 2 ways to output Ansi text: 1. Call DrawTextA/ExtTextOutA, it uses font codepage for unicode translation. 2. hfont = CreateFont("Wingdings", SYMBOL_CHARSET); SendMessageA(hwnd, WM_SETFONT, hfont); SendMessageA(hwnd, WM_SETTEXT, textA); It uses current ANSI codepage for unicode translation. Currently #1 works correctly for Symbol fonts but #2 does not. This patch makes #2 work as well. Since this is a text drawing bug I don't see a way of adding a test case for this behaviour. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/gdi32/freetype.c | 48 +++++++++++++++++++++++++++++++++++------------- 1 file changed, 35 insertions(+), 13 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 1293e08a73..ba1839af82 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -6303,24 +6303,44 @@ static FT_UInt get_GSUB_vert_glyph(const GdiFont *font, UINT glyph) return GSUB_apply_feature(header, feature, glyph); } +static FT_UInt get_glyph_index_symbol(const GdiFont *font, UINT glyph) +{ + FT_UInt ret; + + if (glyph < 0x100) glyph += 0xf000; + /* there is a number of old pre-Unicode "broken" TTFs, which + do have symbols at U+00XX instead of U+f0XX */ + if (!(ret = pFT_Get_Char_Index(font->ft_face, glyph))) + ret = pFT_Get_Char_Index(font->ft_face, glyph - 0xf000); + + return ret; +} + static FT_UInt get_glyph_index(const GdiFont *font, UINT glyph) { - FT_UInt glyphId; + FT_UInt ret; + WCHAR wc; + char buf; if(font->ft_face->charmap->encoding == FT_ENCODING_NONE) { - WCHAR wc = (WCHAR)glyph; BOOL default_used; BOOL *default_used_pointer; - FT_UInt ret; - char buf; default_used_pointer = NULL; default_used = FALSE; if (codepage_sets_default_used(font->codepage)) default_used_pointer = &default_used; + wc = (WCHAR)glyph; if(!WideCharToMultiByte(font->codepage, 0, &wc, 1, &buf, sizeof(buf), NULL, default_used_pointer) || default_used) { - if (font->codepage == CP_SYMBOL && wc < 0x100) - ret = pFT_Get_Char_Index(font->ft_face, (unsigned char)wc); + if (font->codepage == CP_SYMBOL) + { + ret = get_glyph_index_symbol(font, glyph); + if (!ret) + { + if (WideCharToMultiByte(CP_ACP, 0, &wc, 1, &buf, 1, NULL, NULL)) + ret = get_glyph_index_symbol(font, buf); + } + } else ret = 0; } @@ -6332,15 +6352,17 @@ static FT_UInt get_glyph_index(const GdiFont *font, UINT glyph) if(font->ft_face->charmap->encoding == FT_ENCODING_MS_SYMBOL) { - if (glyph < 0x100) glyph += 0xf000; - /* there is a number of old pre-Unicode "broken" TTFs, which - do have symbols at U+00XX instead of U+f0XX */ - if (!(glyphId = pFT_Get_Char_Index(font->ft_face, glyph))) - glyphId = pFT_Get_Char_Index(font->ft_face, glyph-0xf000); + ret = get_glyph_index_symbol(font, glyph); + if (!ret) + { + wc = (WCHAR)glyph; + if (WideCharToMultiByte(CP_ACP, 0, &wc, 1, &buf, 1, NULL, NULL)) + ret = get_glyph_index_symbol(font, (unsigned char)buf); + } + return ret; } - else glyphId = pFT_Get_Char_Index(font->ft_face, glyph); - return glyphId; + return pFT_Get_Char_Index(font->ft_face, glyph); } /* helper for freetype_GetGlyphIndices */ -- 2.16.3

June 22, 2018

[PATCH] d2d1: Stop redefination on older compilers

by Alistair Leslie-Hughes

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/d2d1/d2d1_private.h | 3 ++- dlls/d2d1/tests/d2d1.c | 7 ++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index d754e85..2281eef 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -25,11 +25,12 @@ #include <assert.h> #include <limits.h> #define COBJMACROS -#include "d2d1_1.h" + #ifdef D2D1_INIT_GUID #include "initguid.h" #endif #include "dwrite_2.h" +#include "d2d1_1.h" #ifndef ARRAY_SIZE #define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0])) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 26c81e6..e89d0e9 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -19,12 +19,13 @@ #define COBJMACROS #include <limits.h> #include <math.h> -#include "d2d1_1.h" -#include "wincrypt.h" -#include "wine/test.h" #include "initguid.h" #include "dwrite.h" +#include "d2d1_1.h" #include "wincodec.h" +#include "wincrypt.h" + +#include "wine/test.h" struct resource_readback { -- 1.9.1

June 22, 2018

[v2 PATCH] ntdll: Implement LdrRegisterDllNotification and LdrUnregisterDllNotification.

by Alistair Leslie-Hughes

From: Michael Müller <michael(a)fds-team.de> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/ntdll/loader.c | 77 ++++++++++++++- dlls/ntdll/tests/rtl.c | 261 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 334 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 3e00ec6..df206e8 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -40,6 +40,7 @@ #include "wine/library.h" #include "wine/unicode.h" #include "wine/debug.h" +#include "wine/list.h" #include "wine/server.h" #include "ntdll_misc.h" #include "ddk/wdm.h" @@ -71,6 +72,15 @@ static BOOL imports_fixup_done = FALSE; /* set once the imports have been fixed static BOOL process_detaching = FALSE; /* set on process detach to avoid deadlocks with thread detach */ static int free_lib_count; /* recursion depth of LdrUnloadDll calls */ +struct ldr_notification +{ + struct list entry; + PLDR_DLL_NOTIFICATION_FUNCTION callback; + void *context; +}; + +static struct list ldr_notifications = LIST_INIT( ldr_notifications ); + static const char * const reason_names[] = { "PROCESS_DETACH", @@ -342,6 +352,29 @@ static ULONG_PTR allocate_stub( const char *dll, const char *name ) static inline ULONG_PTR allocate_stub( const char *dll, const char *name ) { return 0xdeadbeef; } #endif /* __i386__ */ +/* call ldr notifications */ +static void call_ldr_notifications( ULONG reason, LDR_MODULE *module ) +{ + struct ldr_notification *notify, *notify_next; + LDR_DLL_NOTIFICATION_DATA data; + + data.Loaded.Flags = 0; + data.Loaded.FullDllName = &module->FullDllName; + data.Loaded.BaseDllName = &module->BaseDllName; + data.Loaded.DllBase = module->BaseAddress; + data.Loaded.SizeOfImage = module->SizeOfImage; + + LIST_FOR_EACH_ENTRY_SAFE( notify, notify_next, &ldr_notifications, struct ldr_notification, entry ) + { + TRACE_(relay)("\1Call LDR notification callback (proc=%p,reason=%u,data=%p,context=%p)\n", + notify->callback, reason, &data, notify->context ); + + notify->callback(reason, &data, notify->context); + + TRACE_(relay)("\1Ret LDR notification callback (proc=%p,reason=%u,data=%p,context=%p)\n", + notify->callback, reason, &data, notify->context ); + } +} /************************************************************************* * get_modref @@ -1275,12 +1308,18 @@ static NTSTATUS process_attach( WINE_MODREF *wm, LPVOID lpReserved ) { WINE_MODREF *prev = current_modref; current_modref = wm; + + call_ldr_notifications( LDR_DLL_NOTIFICATION_REASON_LOADED, &wm->ldr ); status = MODULE_InitDLL( wm, DLL_PROCESS_ATTACH, lpReserved ); if (status == STATUS_SUCCESS) + { wm->ldr.Flags |= LDR_PROCESS_ATTACHED; + } else { MODULE_InitDLL( wm, DLL_PROCESS_DETACH, lpReserved ); + call_ldr_notifications( LDR_DLL_NOTIFICATION_REASON_UNLOADED, &wm->ldr ); + /* point to the name so LdrInitializeThunk can print it */ last_failed_modref = wm; WARN("Initialization of %s failed\n", debugstr_w(wm->ldr.BaseDllName.Buffer)); @@ -1353,6 +1392,7 @@ static void process_detach(void) mod->Flags &= ~LDR_PROCESS_ATTACHED; MODULE_InitDLL( CONTAINING_RECORD(mod, WINE_MODREF, ldr), DLL_PROCESS_DETACH, ULongToPtr(process_detaching) ); + call_ldr_notifications( LDR_DLL_NOTIFICATION_REASON_UNLOADED, mod ); /* Restart at head of WINE_MODREF list, as entries might have been added and/or removed while performing the call ... */ @@ -1467,8 +1507,27 @@ NTSTATUS WINAPI LdrEnumerateLoadedModules( void *unknown, LDRENUMPROC callback, NTSTATUS WINAPI LdrRegisterDllNotification(ULONG flags, PLDR_DLL_NOTIFICATION_FUNCTION callback, void *context, void **cookie) { - FIXME( "(%04x, %p, %p, %p) stub\n", flags, callback, context, cookie ); - return STATUS_NOT_IMPLEMENTED; + struct ldr_notification *notify; + + TRACE( "(%x, %p, %p, %p)\n", flags, callback, context, cookie ); + + if (!callback || !cookie) + return STATUS_INVALID_PARAMETER; + + if (flags) + FIXME( "ignoring flags %x\n", flags ); + + notify = RtlAllocateHeap( GetProcessHeap(), 0, sizeof(*notify) ); + if (!notify) return STATUS_NO_MEMORY; + notify->callback = callback; + notify->context = context; + + RtlEnterCriticalSection( &loader_section ); + list_add_tail( &ldr_notifications, &notify->entry ); + RtlLeaveCriticalSection( &loader_section ); + + *cookie = notify; + return STATUS_SUCCESS; } /****************************************************************** @@ -1476,8 +1535,18 @@ NTSTATUS WINAPI LdrRegisterDllNotification(ULONG flags, PLDR_DLL_NOTIFICATION_FU */ NTSTATUS WINAPI LdrUnregisterDllNotification( void *cookie ) { - FIXME( "(%p) stub\n", cookie ); - return STATUS_NOT_IMPLEMENTED; + struct ldr_notification *notify = cookie; + + TRACE( "(%p)\n", cookie ); + + if (!notify) return STATUS_INVALID_PARAMETER; + + RtlEnterCriticalSection( &loader_section ); + list_remove( &notify->entry ); + RtlLeaveCriticalSection( &loader_section ); + + RtlFreeHeap( GetProcessHeap(), 0, notify ); + return STATUS_SUCCESS; } /****************************************************************** diff --git a/dlls/ntdll/tests/rtl.c b/dlls/ntdll/tests/rtl.c index e202408..881bc1a 100644 --- a/dlls/ntdll/tests/rtl.c +++ b/dlls/ntdll/tests/rtl.c @@ -101,6 +101,8 @@ static NTSTATUS (WINAPI *pRtlInitializeCriticalSectionEx)(CRITICAL_SECTION *, U static NTSTATUS (WINAPI *pLdrEnumerateLoadedModules)(void *, void *, void *); static NTSTATUS (WINAPI *pRtlMakeSelfRelativeSD)(PSECURITY_DESCRIPTOR,PSECURITY_DESCRIPTOR,LPDWORD); static NTSTATUS (WINAPI *pRtlAbsoluteToSelfRelativeSD)(PSECURITY_DESCRIPTOR,PSECURITY_DESCRIPTOR,PULONG); +static NTSTATUS (WINAPI *pLdrRegisterDllNotification)(ULONG, PLDR_DLL_NOTIFICATION_FUNCTION, void *, void **); +static NTSTATUS (WINAPI *pLdrUnregisterDllNotification)(void *); static HMODULE hkernel32 = 0; static BOOL (WINAPI *pIsWow64Process)(HANDLE, PBOOL); @@ -108,10 +110,15 @@ static BOOL (WINAPI *pIsWow64Process)(HANDLE, PBOOL); #define LEN 16 static const char* src_src = "This is a test!"; /* 16 bytes long, incl NUL */ +static WCHAR ws2_32dllW[] = {'w','s','2','_','3','2','.','d','l','l',0}; +static WCHAR nsidllW[] = {'n','s','i','.','d','l','l',0}; +static WCHAR wintrustdllW[] = {'w','i','n','t','r','u','s','t','.','d','l','l',0}; +static WCHAR crypt32dllW[] = {'c','r','y','p','t','3','2','.','d','l','l',0}; static ULONG src_aligned_block[4]; static ULONG dest_aligned_block[32]; static const char *src = (const char*)src_aligned_block; static char* dest = (char*)dest_aligned_block; +const WCHAR *expected_dll = nsidllW; static void InitFunctionPtrs(void) { @@ -157,6 +164,8 @@ static void InitFunctionPtrs(void) pLdrEnumerateLoadedModules = (void *)GetProcAddress(hntdll, "LdrEnumerateLoadedModules"); pRtlMakeSelfRelativeSD = (void *)GetProcAddress(hntdll, "RtlMakeSelfRelativeSD"); pRtlAbsoluteToSelfRelativeSD = (void *)GetProcAddress(hntdll, "RtlAbsoluteToSelfRelativeSD"); + pLdrRegisterDllNotification = (void *)GetProcAddress(hntdll, "LdrRegisterDllNotification"); + pLdrUnregisterDllNotification = (void *)GetProcAddress(hntdll, "LdrUnregisterDllNotification"); } hkernel32 = LoadLibraryA("kernel32.dll"); ok(hkernel32 != 0, "LoadLibrary failed\n"); @@ -2257,6 +2266,257 @@ static void test_RtlMakeSelfRelativeSD(void) ok( status == STATUS_BAD_DESCRIPTOR_FORMAT, "got %08x\n", status ); } +static DWORD (CALLBACK *orig_entry)(HMODULE,DWORD,LPVOID); +static DWORD *dll_main_data; + +static inline void *get_rva( HMODULE module, DWORD va ) +{ + return (void *)((char *)module + va); +} + +static void CALLBACK ldr_notify_callback1(ULONG reason, LDR_DLL_NOTIFICATION_DATA *data, void *context) +{ + const IMAGE_IMPORT_DESCRIPTOR *imports; + const IMAGE_THUNK_DATA *import_list; + IMAGE_THUNK_DATA *thunk_list; + DWORD *calls = context; + LIST_ENTRY *mark; + LDR_MODULE *mod; + ULONG size; + int i, j; + + *calls <<= 4; + *calls |= reason; + + if (!lstrcmpiW(data->Loaded.BaseDllName->Buffer, expected_dll)) + return; + + ok(data->Loaded.Flags == 0, "Expected flags 0, got %x\n", data->Loaded.Flags); + ok(!lstrcmpiW(data->Loaded.BaseDllName->Buffer, expected_dll), "Expected %s, got %s\n", + wine_dbgstr_w(expected_dll), wine_dbgstr_w(data->Loaded.BaseDllName->Buffer)); + ok(!!data->Loaded.DllBase, "Expected non zero base address\n"); + ok(data->Loaded.SizeOfImage, "Expected non zero image size\n"); + + /* expect module to be last module listed in LdrData load order list */ + mark = &NtCurrentTeb()->Peb->LdrData->InMemoryOrderModuleList; + mod = CONTAINING_RECORD(mark->Blink, LDR_MODULE, InMemoryOrderModuleList); + ok(mod->BaseAddress == data->Loaded.DllBase, "Expected base address %p, got %p\n", + data->Loaded.DllBase, mod->BaseAddress); + ok(!lstrcmpiW(mod->BaseDllName.Buffer, expected_dll), "Expected %s, got %s\n", + wine_dbgstr_w(expected_dll), wine_dbgstr_w(mod->BaseDllName.Buffer)); + + /* show that imports have already been resolved */ + imports = RtlImageDirectoryEntryToData(data->Loaded.DllBase, TRUE, IMAGE_DIRECTORY_ENTRY_IMPORT, &size); + ok(!!imports, "Expected dll to have imports\n"); + + for (i = 0; imports[i].Name; i++) + { + thunk_list = get_rva(data->Loaded.DllBase, (DWORD)imports[i].FirstThunk); + if (imports[i].OriginalFirstThunk) + import_list = get_rva(data->Loaded.DllBase, (DWORD)imports[i].OriginalFirstThunk); + else + import_list = thunk_list; + + for (j = 0; import_list[j].u1.Ordinal; j++) + { + ok(thunk_list[j].u1.AddressOfData > data->Loaded.SizeOfImage, + "Import has not been resolved: %p\n", (void*)thunk_list[j].u1.Function); + } + } +} + +static void CALLBACK ldr_notify_callback2(ULONG reason, LDR_DLL_NOTIFICATION_DATA *data, void *context) +{ + DWORD *calls = context; + *calls <<= 4; + *calls |= reason + 2; +} + +static BOOL WINAPI fake_dll_main(HINSTANCE instance, DWORD reason, void* reserved) +{ + if (reason == DLL_PROCESS_ATTACH) + { + *dll_main_data <<= 4; + *dll_main_data |= 3; + } + else if (reason == DLL_PROCESS_DETACH) + { + *dll_main_data <<= 4; + *dll_main_data |= 4; + } + return orig_entry(instance, reason, reserved); +} + +static void CALLBACK ldr_notify_callback_dll_main(ULONG reason, LDR_DLL_NOTIFICATION_DATA *data, void *context) +{ + DWORD *calls = context; + LIST_ENTRY *mark; + LDR_MODULE *mod; + + *calls <<= 4; + *calls |= reason; + + if (reason != LDR_DLL_NOTIFICATION_REASON_LOADED) + return; + + mark = &NtCurrentTeb()->Peb->LdrData->InMemoryOrderModuleList; + mod = CONTAINING_RECORD(mark->Blink, LDR_MODULE, InMemoryOrderModuleList); + ok(mod->BaseAddress == data->Loaded.DllBase, "Expected base address %p, got %p\n", + data->Loaded.DllBase, mod->BaseAddress); + if (mod->BaseAddress != data->Loaded.DllBase) + return; + + orig_entry = mod->EntryPoint; + mod->EntryPoint = fake_dll_main; + dll_main_data = calls; +} + +static BOOL WINAPI fake_dll_main_fail(HINSTANCE instance, DWORD reason, void* reserved) +{ + if (reason == DLL_PROCESS_ATTACH) + { + *dll_main_data <<= 4; + *dll_main_data |= 3; + } + else if (reason == DLL_PROCESS_DETACH) + { + *dll_main_data <<= 4; + *dll_main_data |= 4; + } + return FALSE; +} + +static void CALLBACK ldr_notify_callback_fail(ULONG reason, LDR_DLL_NOTIFICATION_DATA *data, void *context) +{ + DWORD *calls = context; + LIST_ENTRY *mark; + LDR_MODULE *mod; + + *calls <<= 4; + *calls |= reason; + + if (reason != LDR_DLL_NOTIFICATION_REASON_LOADED) + return; + + mark = &NtCurrentTeb()->Peb->LdrData->InMemoryOrderModuleList; + mod = CONTAINING_RECORD(mark->Blink, LDR_MODULE, InMemoryOrderModuleList); + ok(mod->BaseAddress == data->Loaded.DllBase, "Expected base address %p, got %p\n", + data->Loaded.DllBase, mod->BaseAddress); + if (mod->BaseAddress != data->Loaded.DllBase) + return; + + orig_entry = mod->EntryPoint; + mod->EntryPoint = fake_dll_main_fail; + dll_main_data = calls; +} + +static void CALLBACK ldr_notify_callback_imports(ULONG reason, LDR_DLL_NOTIFICATION_DATA *data, void *context) +{ + DWORD *calls = context; + + if (reason != LDR_DLL_NOTIFICATION_REASON_LOADED) + return; + + if (!lstrcmpiW(data->Loaded.BaseDllName->Buffer, crypt32dllW)) + { + *calls <<= 4; + *calls |= 1; + } + + if (!lstrcmpiW(data->Loaded.BaseDllName->Buffer, wintrustdllW)) + { + *calls <<= 4; + *calls |= 2; + } +} + +static void test_LdrRegisterDllNotification(void) +{ + void *cookie, *cookie2; + NTSTATUS status; + HMODULE mod; + DWORD calls; + + if (!pLdrRegisterDllNotification || !pLdrUnregisterDllNotification) + { + win_skip("Ldr(Un)RegisterDllNotification not available\n"); + return; + } + + mod = LoadLibraryW(expected_dll); + if(mod) + FreeLibrary(mod); + else + expected_dll = ws2_32dllW; /* XP Default */ + + /* generic test */ + status = pLdrRegisterDllNotification(0, ldr_notify_callback1, &calls, &cookie); + ok(!status, "Expected STATUS_SUCCESS, got %08x\n", status); + + calls = 0; + mod = LoadLibraryW(expected_dll); + ok(!!mod, "Failed to load library: %d\n", GetLastError()); + ok(calls == LDR_DLL_NOTIFICATION_REASON_LOADED, "Expected LDR_DLL_NOTIFICATION_REASON_LOADED, got %x\n", calls); + + calls = 0; + FreeLibrary(mod); + ok(calls == LDR_DLL_NOTIFICATION_REASON_UNLOADED, "Expected LDR_DLL_NOTIFICATION_REASON_UNLOADED, got %x\n", calls); + + /* test order of callbacks */ + status = pLdrRegisterDllNotification(0, ldr_notify_callback2, &calls, &cookie2); + ok(!status, "Expected STATUS_SUCCESS, got %08x\n", status); + + calls = 0; + mod = LoadLibraryW(expected_dll); + ok(!!mod, "Failed to load library: %d\n", GetLastError()); + ok(calls == 0x13, "Expected order 0x13, got %x\n", calls); + + calls = 0; + FreeLibrary(mod); + ok(calls == 0x24, "Expected order 0x24, got %x\n", calls); + + pLdrUnregisterDllNotification(cookie2); + pLdrUnregisterDllNotification(cookie); + + /* test dll main order */ + status = pLdrRegisterDllNotification(0, ldr_notify_callback_dll_main, &calls, &cookie); + ok(!status, "Expected STATUS_SUCCESS, got %08x\n", status); + + calls = 0; + mod = LoadLibraryW(expected_dll); + ok(!!mod, "Failed to load library: %d\n", GetLastError()); + ok(calls == 0x13, "Expected order 0x13, got %x\n", calls); + + calls = 0; + FreeLibrary(mod); + ok(calls == 0x42, "Expected order 0x42, got %x\n", calls); + + pLdrUnregisterDllNotification(cookie); + + /* test dll main order */ + status = pLdrRegisterDllNotification(0, ldr_notify_callback_fail, &calls, &cookie); + ok(!status, "Expected STATUS_SUCCESS, got %08x\n", status); + + calls = 0; + mod = LoadLibraryW(expected_dll); + ok(!mod, "Expected library to fail loading\n"); + ok(calls == 0x1342, "Expected order 0x1342, got %x\n", calls); + + pLdrUnregisterDllNotification(cookie); + + /* test dll with dependencies */ + status = pLdrRegisterDllNotification(0, ldr_notify_callback_imports, &calls, &cookie); + ok(!status, "Expected STATUS_SUCCESS, got %08x\n", status); + + calls = 0; + mod = LoadLibraryW(wintrustdllW); + ok(!!mod, "Failed to load library: %d\n", GetLastError()); + ok(calls == 0x12 || calls == 0x21, "got %x\n", calls); + + FreeLibrary(mod); + pLdrUnregisterDllNotification(cookie); +} + START_TEST(rtl) { InitFunctionPtrs(); @@ -2291,4 +2551,5 @@ START_TEST(rtl) test_RtlLeaveCriticalSection(); test_LdrEnumerateLoadedModules(); test_RtlMakeSelfRelativeSD(); + test_LdrRegisterDllNotification(); } -- 1.9.1

June 22, 2018

[PATCH 4/4] winemac.drv: Implement waking up the display when activity occurs.

by Zebediah Figura

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/winemac.drv/macdrv_main.c | 12 ++++++++++++ dlls/winemac.drv/winemac.drv.spec | 3 +++ 2 files changed, 15 insertions(+) diff --git a/dlls/winemac.drv/macdrv_main.c b/dlls/winemac.drv/macdrv_main.c index 491ab06..1e76d94 100644 --- a/dlls/winemac.drv/macdrv_main.c +++ b/dlls/winemac.drv/macdrv_main.c @@ -451,3 +451,15 @@ BOOL CDECL macdrv_SystemParametersInfo( UINT action, UINT int_param, void *ptr_p } return FALSE; } + +/*********************************************************************** + * wine_notify_activity (X11DRV.@) + * + * Notify the display server that activity has occurred, e.g. to wake up + * the display and reset any power management related timeouts. + */ +void CDECL macdrv_notify_activity(void) +{ + static IOPMAssertionID assertion; + IOPMAssertionDeclareUserActivity("Wine user input", kIOPMUserActiveLocal, &assertion); +} diff --git a/dlls/winemac.drv/winemac.drv.spec b/dlls/winemac.drv/winemac.drv.spec index 6fa723a..9658fad 100644 --- a/dlls/winemac.drv/winemac.drv.spec +++ b/dlls/winemac.drv/winemac.drv.spec @@ -45,6 +45,9 @@ @ cdecl WindowPosChanged(long long long ptr ptr ptr ptr ptr) macdrv_WindowPosChanged @ cdecl WindowPosChanging(long long long ptr ptr ptr ptr) macdrv_WindowPosChanging +# Desktop +@ cdecl wine_notify_activity() macdrv_notify_activity + # System tray @ cdecl wine_notify_icon(long ptr) -- 2.7.4

June 21, 2018

[PATCH 3/4] winex11.drv: Implement waking up the display when activity occurs.

by Zebediah Figura

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/winex11.drv/winex11.drv.spec | 1 + dlls/winex11.drv/x11drv_main.c | 12 ++++++++++++ 2 files changed, 13 insertions(+) diff --git a/dlls/winex11.drv/winex11.drv.spec b/dlls/winex11.drv/winex11.drv.spec index 614f0b9..c833edb 100644 --- a/dlls/winex11.drv/winex11.drv.spec +++ b/dlls/winex11.drv/winex11.drv.spec @@ -57,6 +57,7 @@ # Desktop @ cdecl wine_create_desktop(long long) X11DRV_create_desktop +@ cdecl wine_notify_activity() X11DRV_notify_activity # System tray @ cdecl wine_notify_icon(long ptr) diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index 4654556..0dbd4f6 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -739,3 +739,15 @@ BOOL CDECL X11DRV_SystemParametersInfo( UINT action, UINT int_param, void *ptr_p } return FALSE; /* let user32 handle it */ } + +/*********************************************************************** + * wine_notify_activity (X11DRV.@) + * + * Notify the display server that activity has occurred, e.g. to wake up + * the display and reset any power management related timeouts. + */ +void CDECL X11DRV_notify_activity(void) +{ + XResetScreenSaver( gdi_display ); + XFlush( gdi_display ); +} -- 2.7.4

June 21, 2018

[PATCH 2/4] dinput: Notify the desktop window when device input is received.

by Zebediah Figura

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- The overall goal of this patchset is to avoid letting the system go to sleep when a joystick is being used. On Windows, receiving input from a joystick which is currently being read by dinput can be easily shown to reset the system idle timer. dlls/dinput/device.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index 7b83a39..fc43fb5 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -39,6 +39,8 @@ #include "device_private.h" #include "dinput_private.h" +#define WM_WINE_NOTIFY_ACTIVITY WM_USER + WINE_DEFAULT_DEBUG_CHANNEL(dinput); static inline IDirectInputDeviceImpl *impl_from_IDirectInputDevice8A(IDirectInputDevice8A *iface) @@ -968,6 +970,8 @@ void queue_event(LPDIRECTINPUTDEVICE8A iface, int inst_id, DWORD data, DWORD tim } } + SendMessageW(GetDesktopWindow(), WM_WINE_NOTIFY_ACTIVITY, 0, 0); + This->queue_head = next_pos; /* Send event if asked */ } -- 2.7.4

June 21, 2018

[PATCH 1/4] explorer: Add a private message to notify the graphics driver when activity occurs.

by Zebediah Figura

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- programs/explorer/desktop.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c index a2d9e1a..f5a01c2 100644 --- a/programs/explorer/desktop.c +++ b/programs/explorer/desktop.c @@ -46,6 +46,10 @@ static const WCHAR default_driver[] = {'m','a','c',',','x','1','1',0}; static const WCHAR default_driver[] = {'x','1','1',0}; #endif +static void (CDECL *wine_notify_activity)(void); + +#define WM_WINE_NOTIFY_ACTIVITY WM_USER + static BOOL using_root; struct launcher @@ -661,6 +665,11 @@ static LRESULT WINAPI desktop_wnd_proc( HWND hwnd, UINT message, WPARAM wp, LPAR } return 0; + case WM_WINE_NOTIFY_ACTIVITY: + if (wine_notify_activity) + wine_notify_activity(); + return 0; + default: return DefWindowProcW( hwnd, message, wp, lp ); } @@ -1005,6 +1014,8 @@ void manage_desktop( WCHAR *arg ) { pShellDDEInit( TRUE ); } + + wine_notify_activity = (void *)GetProcAddress( graphics_driver, "wine_notify_activity" ); } } -- 2.7.4

June 21, 2018

[PATCH 1/1] wsdapi/tests: Add tests for MatchProbeEx.

by Owen Rudge

Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> --- dlls/wsdapi/tests/discovery.c | 194 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 193 insertions(+), 1 deletion(-)

June 21, 2018

Re: [PATCH 1/2] ntdll/tests: Use the available ARRAY_SIZE() macro

by Marvin

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=39291 Your paranoid android. === w2008s64 (32 bit threadpool) === TestBot process got stuck or died unexpectedly The previous 1 run(s) terminated abnormally === wvistau64 (32 bit info) === info.c:1792: Test failed: Expected STATUS_SUCCESS, got c0000022 0890:info: unhandled exception c0000005 at 00340000 === wvistau64_zh_CN (32 bit info) === info.c:1792: Test failed: Expected STATUS_SUCCESS, got c0000022 0bb8:info: unhandled exception c0000005 at 00370000 === wvistau64_fr (32 bit info) === info.c:1792: Test failed: Expected STATUS_SUCCESS, got c0000022 072c:info: unhandled exception c0000005 at 00340000 === wvistau64_he (32 bit info) === info.c:1792: Test failed: Expected STATUS_SUCCESS, got c0000022 0bd8:info: unhandled exception c0000005 at 002C0000 === w2008s64 (32 bit info) === info.c:1792: Test failed: Expected STATUS_SUCCESS, got c0000022 0870:info: unhandled exception c0000005 at 003D0000 === w7u (32 bit info) === info.c:1792: Test failed: Expected STATUS_SUCCESS, got c0000022 === w7pro64 (32 bit info) === info.c:1792: Test failed: Expected STATUS_SUCCESS, got c0000022 0af4:info: unhandled exception c0000005 at 00350000 === w8 (32 bit info) === info.c:1792: Test failed: Expected STATUS_SUCCESS, got c0000022 0f84:info: unhandled exception c0000005 at 00310000 === w864 (32 bit info) === info.c:1792: Test failed: Expected STATUS_SUCCESS, got c0000022 0d00:info: unhandled exception c0000005 at 00350000 === w1064 (32 bit info) === info.c:1792: Test failed: Expected STATUS_SUCCESS, got c0000022 0db8:info: unhandled exception c0000005 at 002D0000

June 21, 2018

[PATCH 2/2] ntdll/tests: Avoid ARRAY_SIZE-like macros

by Michael Stefaniuc

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntdll/tests/large_int.c | 8 +++----- dlls/ntdll/tests/rtl.c | 6 ++---- dlls/ntdll/tests/rtlstr.c | 31 +++++++++++-------------------- dlls/ntdll/tests/string.c | 24 ++++++++++-------------- 4 files changed, 26 insertions(+), 43 deletions(-) diff --git a/dlls/ntdll/tests/large_int.c b/dlls/ntdll/tests/large_int.c index da7afa4f25..c980aebe5d 100644 --- a/dlls/ntdll/tests/large_int.c +++ b/dlls/ntdll/tests/large_int.c @@ -102,7 +102,6 @@ static const magic_divide_t magic_divide[] = { { ULL(0x74ae3b5f,0x1558c800), ULL(0x2f1e28fd,0x1b5cca00), 41, 0xabcde}, }; -#define NB_MAGIC_DIVIDE (sizeof(magic_divide)/sizeof(*magic_divide)) static void test_RtlExtendedMagicDivide(void) @@ -110,7 +109,7 @@ static void test_RtlExtendedMagicDivide(void) int i; LONGLONG result; - for (i = 0; i < NB_MAGIC_DIVIDE; i++) { + for (i = 0; i < ARRAY_SIZE(magic_divide); i++) { result = pRtlExtendedMagicDivide(magic_divide[i].a, magic_divide[i].b, magic_divide[i].shift); ok(result == magic_divide[i].result, "call failed: RtlExtendedMagicDivide(0x%s, 0x%s, %d) has result 0x%s, expected 0x%s\n", @@ -271,7 +270,6 @@ static const largeint2str_t largeint2str[] = { {20, 0xdeadbeef, 0, 9, "-------------------------------------------------------------------", STATUS_INVALID_PARAMETER}, {-8, 07654321, 0, 12, "-------------------------------------------------------------------", STATUS_INVALID_PARAMETER}, }; -#define NB_LARGEINT2STR (sizeof(largeint2str)/sizeof(*largeint2str)) static void one_RtlInt64ToUnicodeString_test(int test_num, const largeint2str_t *largeint2str) @@ -360,7 +358,7 @@ static void test_RtlInt64ToUnicodeString(void) { int test_num; - for (test_num = 0; test_num < NB_LARGEINT2STR; test_num++) { + for (test_num = 0; test_num < ARRAY_SIZE(largeint2str); test_num++) { one_RtlInt64ToUnicodeString_test(test_num, &largeint2str[test_num]); } /* for */ } @@ -405,7 +403,7 @@ static void test_RtlLargeIntegerToChar(void) int test_num; ULONGLONG value; - for (test_num = 0; test_num < NB_LARGEINT2STR; test_num++) { + for (test_num = 0; test_num < ARRAY_SIZE(largeint2str); test_num++) { one_RtlLargeIntegerToChar_test(test_num, &largeint2str[test_num]); } /* for */ diff --git a/dlls/ntdll/tests/rtl.c b/dlls/ntdll/tests/rtl.c index db3dc9ff4e..e202408caa 100644 --- a/dlls/ntdll/tests/rtl.c +++ b/dlls/ntdll/tests/rtl.c @@ -708,7 +708,6 @@ static const all_accesses_t all_accesses[] = { {0xFEDCBA76, 0xC8C4B242, 1}, {0xC8C4B242, 0xFEDCBA76, 0}, }; -#define NB_ALL_ACCESSES (sizeof(all_accesses)/sizeof(*all_accesses)) static void test_RtlAreAllAccessesGranted(void) @@ -722,7 +721,7 @@ static void test_RtlAreAllAccessesGranted(void) return; } - for (test_num = 0; test_num < NB_ALL_ACCESSES; test_num++) { + for (test_num = 0; test_num < ARRAY_SIZE(all_accesses); test_num++) { result = pRtlAreAllAccessesGranted(all_accesses[test_num].GrantedAccess, all_accesses[test_num].DesiredAccess); ok(all_accesses[test_num].result == result, @@ -751,7 +750,6 @@ static const any_accesses_t any_accesses[] = { {0xFEDCBA76, 0x00040000, 1}, {0xFED8BA76, 0x00040000, 0}, }; -#define NB_ANY_ACCESSES (sizeof(any_accesses)/sizeof(*any_accesses)) static void test_RtlAreAnyAccessesGranted(void) @@ -765,7 +763,7 @@ static void test_RtlAreAnyAccessesGranted(void) return; } - for (test_num = 0; test_num < NB_ANY_ACCESSES; test_num++) { + for (test_num = 0; test_num < ARRAY_SIZE(any_accesses); test_num++) { result = pRtlAreAnyAccessesGranted(any_accesses[test_num].GrantedAccess, any_accesses[test_num].DesiredAccess); ok(any_accesses[test_num].result == result, diff --git a/dlls/ntdll/tests/rtlstr.c b/dlls/ntdll/tests/rtlstr.c index 53cc185939..8b948fa82a 100644 --- a/dlls/ntdll/tests/rtlstr.c +++ b/dlls/ntdll/tests/rtlstr.c @@ -406,7 +406,6 @@ static const dupl_ustr_t dupl_ustr[] = { { 3, 0, 2, 2, NULL, 40, 42, 42, NULL, 40, 42, 0, NULL, STATUS_INVALID_PARAMETER}, { 3, 0, 0, 0, NULL, 40, 42, 42, NULL, 0, 2, 2, "", STATUS_SUCCESS}, }; -#define NB_DUPL_USTR (sizeof(dupl_ustr)/sizeof(*dupl_ustr)) static void test_RtlDuplicateUnicodeString(void) @@ -429,7 +428,7 @@ static void test_RtlDuplicateUnicodeString(void) return; } - for (test_num = 0; test_num < NB_DUPL_USTR; test_num++) { + for (test_num = 0; test_num < ARRAY_SIZE(dupl_ustr); test_num++) { source_str.Length = dupl_ustr[test_num].source_Length; source_str.MaximumLength = dupl_ustr[test_num].source_MaximumLength; if (dupl_ustr[test_num].source_buf != NULL) { @@ -776,7 +775,6 @@ static const ustr2astr_t ustr2astr[] = { { 0, 0, 12, NULL, 10, 10, 12, NULL, FALSE, 5, 0, 0, NULL, STATUS_BUFFER_OVERFLOW}, #endif }; -#define NB_USTR2ASTR (sizeof(ustr2astr)/sizeof(*ustr2astr)) static void test_RtlUnicodeStringToAnsiString(void) @@ -789,7 +787,7 @@ static void test_RtlUnicodeStringToAnsiString(void) NTSTATUS result; unsigned int test_num; - for (test_num = 0; test_num < NB_USTR2ASTR; test_num++) { + for (test_num = 0; test_num < ARRAY_SIZE(ustr2astr); test_num++) { ansi_str.Length = ustr2astr[test_num].ansi_Length; ansi_str.MaximumLength = ustr2astr[test_num].ansi_MaximumLength; if (ustr2astr[test_num].ansi_buf != NULL) { @@ -852,7 +850,6 @@ static const app_asc2str_t app_asc2str[] = { { 5, 14, 15, NULL, NULL, 5, 14, 15, NULL, STATUS_SUCCESS}, { 5, 12, 15, "Tst\0S01234abcde", "tr\0i", 7, 12, 15, "Tst\0Str234abcde", STATUS_SUCCESS}, }; -#define NB_APP_ASC2STR (sizeof(app_asc2str)/sizeof(*app_asc2str)) static void test_RtlAppendAsciizToString(void) @@ -862,7 +859,7 @@ static void test_RtlAppendAsciizToString(void) NTSTATUS result; unsigned int test_num; - for (test_num = 0; test_num < NB_APP_ASC2STR; test_num++) { + for (test_num = 0; test_num < ARRAY_SIZE(app_asc2str); test_num++) { dest_str.Length = app_asc2str[test_num].dest_Length; dest_str.MaximumLength = app_asc2str[test_num].dest_MaximumLength; if (app_asc2str[test_num].dest_buf != NULL) { @@ -922,7 +919,6 @@ static const app_str2str_t app_str2str[] = { { 5, 14, 15, NULL, 0, 0, 7, NULL, 5, 14, 15, NULL, STATUS_SUCCESS}, { 5, 12, 15, "Tst\0S01234abcde", 4, 4, 7, "tr\0iZY", 9, 12, 15, "Tst\0Str\0i4abcde", STATUS_SUCCESS}, }; -#define NB_APP_STR2STR (sizeof(app_str2str)/sizeof(*app_str2str)) static void test_RtlAppendStringToString(void) @@ -934,7 +930,7 @@ static void test_RtlAppendStringToString(void) NTSTATUS result; unsigned int test_num; - for (test_num = 0; test_num < NB_APP_STR2STR; test_num++) { + for (test_num = 0; test_num < ARRAY_SIZE(app_str2str); test_num++) { dest_str.Length = app_str2str[test_num].dest_Length; dest_str.MaximumLength = app_str2str[test_num].dest_MaximumLength; if (app_str2str[test_num].dest_buf != NULL) { @@ -1005,7 +1001,6 @@ static const app_uni2str_t app_uni2str[] = { { 4, 14, 14, "Fake0123abcdef", "U\0stri\0", 10, 14, 14, "FakeU\0stri\0\0ef", STATUS_SUCCESS}, { 6, 14, 16, "Te\0\0stabcdefghij", "St\0\0ri", 8, 14, 16, "Te\0\0stSt\0\0efghij", STATUS_SUCCESS}, }; -#define NB_APP_UNI2STR (sizeof(app_uni2str)/sizeof(*app_uni2str)) static void test_RtlAppendUnicodeToString(void) @@ -1015,7 +1010,7 @@ static void test_RtlAppendUnicodeToString(void) NTSTATUS result; unsigned int test_num; - for (test_num = 0; test_num < NB_APP_UNI2STR; test_num++) { + for (test_num = 0; test_num < ARRAY_SIZE(app_uni2str); test_num++) { dest_str.Length = app_uni2str[test_num].dest_Length; dest_str.MaximumLength = app_uni2str[test_num].dest_MaximumLength; if (app_uni2str[test_num].dest_buf != NULL) { @@ -1079,7 +1074,6 @@ static const app_ustr2str_t app_ustr2str[] = { { 4, 14, 14, NULL, 0, 0, 8, NULL, 4, 14, 14, NULL, STATUS_SUCCESS}, { 6, 14, 16, "Te\0\0stabcdefghij", 6, 8, 8, "St\0\0riZY", 12, 14, 16, "Te\0\0stSt\0\0ri\0\0ij", STATUS_SUCCESS}, }; -#define NB_APP_USTR2STR (sizeof(app_ustr2str)/sizeof(*app_ustr2str)) static void test_RtlAppendUnicodeStringToString(void) @@ -1091,7 +1085,7 @@ static void test_RtlAppendUnicodeStringToString(void) NTSTATUS result; unsigned int test_num; - for (test_num = 0; test_num < NB_APP_USTR2STR; test_num++) { + for (test_num = 0; test_num < ARRAY_SIZE(app_ustr2str); test_num++) { dest_str.Length = app_ustr2str[test_num].dest_Length; dest_str.MaximumLength = app_ustr2str[test_num].dest_MaximumLength; if (app_ustr2str[test_num].dest_buf != NULL) { @@ -1189,7 +1183,6 @@ static const find_ch_in_ustr_t find_ch_in_ustr[] = { { 2, "abcdabcdabcdabcdabcdabcd", "abcd", 0, STATUS_NOT_FOUND}, { 3, "abcdabcdabcdabcdabcdabcd", "abcd", 0, STATUS_NOT_FOUND}, }; -#define NB_FIND_CH_IN_USTR (sizeof(find_ch_in_ustr)/sizeof(*find_ch_in_ustr)) static void test_RtlFindCharInUnicodeString(void) @@ -1209,7 +1202,7 @@ static void test_RtlFindCharInUnicodeString(void) return; } - for (test_num = 0; test_num < NB_FIND_CH_IN_USTR; test_num++) { + for (test_num = 0; test_num < ARRAY_SIZE(find_ch_in_ustr); test_num++) { if (find_ch_in_ustr[test_num].main_str != NULL) { main_str.Length = strlen(find_ch_in_ustr[test_num].main_str) * sizeof(WCHAR); main_str.MaximumLength = main_str.Length + sizeof(WCHAR); @@ -1371,7 +1364,6 @@ static const str2int_t str2int[] = { {-8, "0", 0, STATUS_INVALID_PARAMETER}, /* Negative base */ /* { 0, NULL, 0, STATUS_SUCCESS}, */ /* NULL as string */ }; -#define NB_STR2INT (sizeof(str2int)/sizeof(*str2int)) static void test_RtlUnicodeStringToInteger(void) @@ -1382,7 +1374,7 @@ static void test_RtlUnicodeStringToInteger(void) WCHAR *wstr; UNICODE_STRING uni; - for (test_num = 0; test_num < NB_STR2INT; test_num++) { + for (test_num = 0; test_num < ARRAY_SIZE(str2int); test_num++) { wstr = AtoW(str2int[test_num].str); value = 0xdeadbeef; pRtlInitUnicodeString(&uni, wstr); @@ -1451,7 +1443,7 @@ static void test_RtlCharToInteger(void) int value; NTSTATUS result; - for (test_num = 0; test_num < NB_STR2INT; test_num++) { + for (test_num = 0; test_num < ARRAY_SIZE(str2int); test_num++) { /* w2k skips a leading '\0' and processes the string after */ if (str2int[test_num].str[0] != '\0') { value = 0xdeadbeef; @@ -1600,7 +1592,6 @@ static const int2str_t int2str[] = { {20, 0xdeadbeef, 0, 9, "-----------------------------------", STATUS_INVALID_PARAMETER}, /* ill. base */ {-8, 07654321, 0, 12, "-----------------------------------", STATUS_INVALID_PARAMETER}, /* neg. base */ }; -#define NB_INT2STR (sizeof(int2str)/sizeof(*int2str)) static void one_RtlIntegerToUnicodeString_test(int test_num, const int2str_t *int2str) @@ -1673,7 +1664,7 @@ static void test_RtlIntegerToUnicodeString(void) { size_t test_num; - for (test_num = 0; test_num < NB_INT2STR; test_num++) + for (test_num = 0; test_num < ARRAY_SIZE(int2str); test_num++) one_RtlIntegerToUnicodeString_test(test_num, &int2str[test_num]); } @@ -1700,7 +1691,7 @@ static void test_RtlIntegerToChar(void) NTSTATUS result; size_t test_num; - for (test_num = 0; test_num < NB_INT2STR; test_num++) + for (test_num = 0; test_num < ARRAY_SIZE(int2str); test_num++) one_RtlIntegerToChar_test(test_num, &int2str[test_num]); result = pRtlIntegerToChar(int2str[0].value, 20, int2str[0].MaximumLength, NULL); diff --git a/dlls/ntdll/tests/string.c b/dlls/ntdll/tests/string.c index 407bc0ffec..708d6e7b65 100644 --- a/dlls/ntdll/tests/string.c +++ b/dlls/ntdll/tests/string.c @@ -212,7 +212,6 @@ static const ulong2str_t ulong2str[] = { {36, 62193781, "111111\0------------------------------------------------------------", 0x77}, {37, 71270178, "111111\0------------------------------------------------------------", 0x77}, }; -#define NB_ULONG2STR (sizeof(ulong2str)/sizeof(*ulong2str)) static void one_itoa_test(int test_num, const ulong2str_t *ulong2str) @@ -276,7 +275,7 @@ static void test_ulongtoa(void) { int test_num; - for (test_num = 0; test_num < NB_ULONG2STR; test_num++) { + for (test_num = 0; test_num < ARRAY_SIZE(ulong2str); test_num++) { if (ulong2str[test_num].mask & 0x01) { one_itoa_test(test_num, &ulong2str[test_num]); } /* if */ @@ -402,7 +401,7 @@ static void test_ulongtow(void) int test_num; LPWSTR result; - for (test_num = 0; test_num < NB_ULONG2STR; test_num++) { + for (test_num = 0; test_num < ARRAY_SIZE(ulong2str); test_num++) { if (ulong2str[test_num].mask & 0x10) { one_itow_test(test_num, &ulong2str[test_num]); } /* if */ @@ -588,7 +587,6 @@ static const ulonglong2str_t ulonglong2str[] = { {37, 71270178, "111111\0------------------------------------------------------------", 0x33}, {99, ULL(0x2,0x3c9e468c), "111111\0------------------------------------------------------------", 0x33}, }; -#define NB_ULONGLONG2STR (sizeof(ulonglong2str)/sizeof(*ulonglong2str)) static void one_i64toa_test(int test_num, const ulonglong2str_t *ulonglong2str) @@ -642,7 +640,7 @@ static void test_ulonglongtoa(void) { int test_num; - for (test_num = 0; test_num < NB_ULONGLONG2STR; test_num++) { + for (test_num = 0; test_num < ARRAY_SIZE(ulonglong2str); test_num++) { if (ulonglong2str[test_num].mask & 0x01) { one_i64toa_test(test_num, &ulonglong2str[test_num]); } /* if */ @@ -746,7 +744,7 @@ static void test_ulonglongtow(void) int test_num; LPWSTR result; - for (test_num = 0; test_num < NB_ULONGLONG2STR; test_num++) { + for (test_num = 0; test_num < ARRAY_SIZE(ulonglong2str); test_num++) { if (ulonglong2str[test_num].mask & 0x10) { one_i64tow_test(test_num, &ulonglong2str[test_num]); } /* if */ @@ -885,7 +883,6 @@ static const str2long_t str2long[] = { { "", 0 }, /* empty string */ /* { NULL, 0 }, */ /* NULL as string */ }; -#define NB_STR2LONG (sizeof(str2long)/sizeof(*str2long)) static void test_wtoi(void) @@ -894,7 +891,7 @@ static void test_wtoi(void) UNICODE_STRING uni; int result; - for (test_num = 0; test_num < NB_STR2LONG; test_num++) { + for (test_num = 0; test_num < ARRAY_SIZE(str2long); test_num++) { pRtlCreateUnicodeStringFromAsciiz(&uni, str2long[test_num].str); result = p_wtoi(uni.Buffer); ok(result == str2long[test_num].value, @@ -909,7 +906,7 @@ static void test_atoi(void) int test_num; int result; - for (test_num = 0; test_num < NB_STR2LONG; test_num++) { + for (test_num = 0; test_num < ARRAY_SIZE(str2long); test_num++) { result = patoi(str2long[test_num].str); ok(result == str2long[test_num].value, "(test %d): call failed: _atoi(\"%s\") has result %d, expected: %d\n", @@ -922,7 +919,7 @@ static void test_atol(void) int test_num; int result; - for (test_num = 0; test_num < NB_STR2LONG; test_num++) { + for (test_num = 0; test_num < ARRAY_SIZE(str2long); test_num++) { result = patol(str2long[test_num].str); ok(result == str2long[test_num].value, "(test %d): call failed: _atol(\"%s\") has result %d, expected: %d\n", @@ -936,7 +933,7 @@ static void test_wtol(void) UNICODE_STRING uni; LONG result; - for (test_num = 0; test_num < NB_STR2LONG; test_num++) { + for (test_num = 0; test_num < ARRAY_SIZE(str2long); test_num++) { pRtlCreateUnicodeStringFromAsciiz(&uni, str2long[test_num].str); result = p_wtol(uni.Buffer); ok(result == str2long[test_num].value, @@ -1068,7 +1065,6 @@ static const str2longlong_t str2longlong[] = { { "", 0 }, /* empty string */ /* { NULL, 0 }, */ /* NULL as string */ }; -#define NB_STR2LONGLONG (sizeof(str2longlong)/sizeof(*str2longlong)) static void test_atoi64(void) @@ -1076,7 +1072,7 @@ static void test_atoi64(void) int test_num; LONGLONG result; - for (test_num = 0; test_num < NB_STR2LONGLONG; test_num++) { + for (test_num = 0; test_num < ARRAY_SIZE(str2longlong); test_num++) { result = p_atoi64(str2longlong[test_num].str); if (str2longlong[test_num].overflow) ok(result == str2longlong[test_num].value || @@ -1100,7 +1096,7 @@ static void test_wtoi64(void) UNICODE_STRING uni; LONGLONG result; - for (test_num = 0; test_num < NB_STR2LONGLONG; test_num++) { + for (test_num = 0; test_num < ARRAY_SIZE(str2longlong); test_num++) { pRtlCreateUnicodeStringFromAsciiz(&uni, str2longlong[test_num].str); result = p_wtoi64(uni.Buffer); if (str2longlong[test_num].overflow) -- 2.14.4

June 21, 2018

[PATCH 1/2] ntdll/tests: Use the available ARRAY_SIZE() macro

by Michael Stefaniuc

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntdll/tests/directory.c | 4 ++-- dlls/ntdll/tests/exception.c | 16 +++++++--------- dlls/ntdll/tests/file.c | 4 ++-- dlls/ntdll/tests/info.c | 2 +- dlls/ntdll/tests/om.c | 6 +++--- dlls/ntdll/tests/pipe.c | 4 ++-- dlls/ntdll/tests/rtl.c | 6 +++--- dlls/ntdll/tests/rtlstr.c | 10 +++++----- dlls/ntdll/tests/string.c | 2 +- dlls/ntdll/tests/threadpool.c | 14 +++++++------- 10 files changed, 33 insertions(+), 35 deletions(-) diff --git a/dlls/ntdll/tests/directory.c b/dlls/ntdll/tests/directory.c index f8f27f9d77..2c6170b8b4 100644 --- a/dlls/ntdll/tests/directory.c +++ b/dlls/ntdll/tests/directory.c @@ -74,8 +74,8 @@ static struct testfile_s { { 0, 0, FILE_ATTRIBUTE_DIRECTORY, {'.'}, ". directory" }, { 0, 0, FILE_ATTRIBUTE_DIRECTORY, {'.','.'}, ".. directory" } }; -static const int test_dir_count = sizeof(testfiles) / sizeof(testfiles[0]); -static const int max_test_dir_size = sizeof(testfiles) / sizeof(testfiles[0]) + 5; /* size of above plus some for .. etc */ +static const int test_dir_count = ARRAY_SIZE(testfiles); +static const int max_test_dir_size = ARRAY_SIZE(testfiles) + 5; /* size of above plus some for .. etc */ static const WCHAR dummyW[] = {'d','u','m','m','y',0}; static const WCHAR dotW[] = {'.',0}; diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index e30cd593d7..5998f54b04 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -643,7 +643,7 @@ static void test_prot_fault(void) { unsigned int i; - for (i = 0; i < sizeof(exceptions)/sizeof(exceptions[0]); i++) + for (i = 0; i < ARRAY_SIZE(exceptions); i++) { if (is_wow64 && exceptions[i].wow64_broken && !strcmp( winetest_platform, "windows" )) { @@ -1734,7 +1734,7 @@ static void call_virtual_unwind( int testnum, const struct unwind_test *test ) for (j = 0; j < 16; j++) { - static const UINT nb_regs = sizeof(test->results[i].regs) / sizeof(test->results[i].regs[0]); + static const UINT nb_regs = ARRAY_SIZE(test->results[i].regs); for (k = 0; k < nb_regs; k++) { @@ -1888,14 +1888,12 @@ static void test_virtual_unwind(void) static const struct unwind_test tests[] = { - { function_0, sizeof(function_0), unwind_info_0, - results_0, sizeof(results_0)/sizeof(results_0[0]) }, - { function_1, sizeof(function_1), unwind_info_1, - results_1, sizeof(results_1)/sizeof(results_1[0]) } + { function_0, sizeof(function_0), unwind_info_0, results_0, ARRAY_SIZE(results_0) }, + { function_1, sizeof(function_1), unwind_info_1, results_1, ARRAY_SIZE(results_1) } }; unsigned int i; - for (i = 0; i < sizeof(tests)/sizeof(tests[0]); i++) + for (i = 0; i < ARRAY_SIZE(tests); i++) call_virtual_unwind( i, &tests[i] ); } @@ -2429,7 +2427,7 @@ static void test_prot_fault(void) { unsigned int i; - for (i = 0; i < sizeof(exceptions)/sizeof(exceptions[0]); i++) + for (i = 0; i < ARRAY_SIZE(exceptions); i++) { got_exception = 0; run_exception_test(handler, &exceptions[i], &exceptions[i].code, @@ -2567,7 +2565,7 @@ static void test_debug_registers(void) HANDLE thread; int i; - for (i = 0; i < sizeof(tests)/sizeof(tests[0]); i++) + for (i = 0; i < ARRAY_SIZE(tests); i++) { memset(&ctx, 0, sizeof(ctx)); ctx.ContextFlags = CONTEXT_DEBUG_REGISTERS; diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index f88d16b449..d9d029b7f3 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -563,7 +563,7 @@ static void delete_file_test(void) ok(0, "couldn't get temp dir\n"); return; } - if (ret + sizeof(testdirW)/sizeof(WCHAR)-1 + sizeof(subdirW)/sizeof(WCHAR)-1 >= MAX_PATH) + if (ret + ARRAY_SIZE(testdirW)-1 + ARRAY_SIZE(subdirW)-1 >= MAX_PATH) { ok(0, "MAX_PATH exceeded in constructing paths\n"); return; @@ -3379,7 +3379,7 @@ static void test_NtCreateFile(void) attr.SecurityDescriptor = NULL; attr.SecurityQualityOfService = NULL; - for (i = 0; i < sizeof(td)/sizeof(td[0]); i++) + for (i = 0; i < ARRAY_SIZE(td); i++) { status = pNtCreateFile(&handle, GENERIC_READ, &attr, &io, NULL, td[i].attrib_in, FILE_SHARE_READ|FILE_SHARE_WRITE, diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 6c93c3cd58..4a2d9e6933 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -1613,7 +1613,7 @@ static void test_query_process_debug_flags(int argc, char **argv) ok(!status, "NtQueryInformationProcess failed, status %#x.\n", status); ok(debug_flags == TRUE, "Expected flag TRUE, got %x.\n", debug_flags); - for (i = 0; i < sizeof(test_flags)/sizeof(test_flags[0]); i++) + for (i = 0; i < ARRAY_SIZE(test_flags); i++) { DWORD expected_flags = !(test_flags[i] & DEBUG_ONLY_THIS_PROCESS); sprintf(cmdline, "%s %s %s", argv[0], argv[1], "debuggee"); diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index 43c5ee46d7..52b4a83968 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -650,7 +650,7 @@ static void test_name_limits(void) /* named pipes */ memcpy( str.Buffer, pipeW, sizeof(pipeW) ); - for (i = 0; i < 65536 / sizeof(WCHAR); i++) str.Buffer[i + sizeof(pipeW)/sizeof(WCHAR)] = 'a'; + for (i = 0; i < 65536 / sizeof(WCHAR); i++) str.Buffer[i + ARRAY_SIZE(pipeW)] = 'a'; str.Length = 0; attr.RootDirectory = 0; attr.Attributes = OBJ_CASE_INSENSITIVE; @@ -703,7 +703,7 @@ static void test_name_limits(void) /* mailslots */ memcpy( str.Buffer, mailslotW, sizeof(mailslotW) ); - for (i = 0; i < 65536 / sizeof(WCHAR); i++) str.Buffer[i + sizeof(mailslotW)/sizeof(WCHAR)] = 'a'; + for (i = 0; i < 65536 / sizeof(WCHAR); i++) str.Buffer[i + ARRAY_SIZE(mailslotW)] = 'a'; str.Length = 0; status = pNtCreateMailslotFile( &ret, GENERIC_ALL, &attr, &iosb, 0, 0, 0, NULL ); ok( status == STATUS_OBJECT_PATH_SYNTAX_BAD, "%u: NtCreateMailslotFile failed %x\n", str.Length, status ); @@ -744,7 +744,7 @@ static void test_name_limits(void) /* registry keys */ memcpy( str.Buffer, registryW, sizeof(registryW) ); - for (i = 0; i < 65536 / sizeof(WCHAR); i++) str.Buffer[i + sizeof(registryW)/sizeof(WCHAR)] = 'a'; + for (i = 0; i < 65536 / sizeof(WCHAR); i++) str.Buffer[i + ARRAY_SIZE(registryW)] = 'a'; str.Length = 0; status = pNtCreateKey( &ret, GENERIC_ALL, &attr, 0, NULL, 0, NULL ); todo_wine diff --git a/dlls/ntdll/tests/pipe.c b/dlls/ntdll/tests/pipe.c index 2978274715..c8e6809423 100644 --- a/dlls/ntdll/tests/pipe.c +++ b/dlls/ntdll/tests/pipe.c @@ -230,8 +230,8 @@ static void test_create(void) static const DWORD sharing[] = { FILE_SHARE_READ, FILE_SHARE_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE }; static const DWORD pipe_config[]= { 1, 0, 2 }; - for (j = 0; j < sizeof(sharing) / sizeof(DWORD); j++) { - for (k = 0; k < sizeof(access) / sizeof(DWORD); k++) { + for (j = 0; j < ARRAY_SIZE(sharing); j++) { + for (k = 0; k < ARRAY_SIZE(access); k++) { HANDLE hclient; BOOL should_succeed = TRUE; diff --git a/dlls/ntdll/tests/rtl.c b/dlls/ntdll/tests/rtl.c index 2e3a7de75d..db3dc9ff4e 100644 --- a/dlls/ntdll/tests/rtl.c +++ b/dlls/ntdll/tests/rtl.c @@ -680,7 +680,7 @@ static void test_RtlRandom(void) } seed = 0; - for (i = 0; i < sizeof(res) / sizeof(res[0]); i++) + for (i = 0; i < ARRAY_SIZE(res); i++) { res[i] = pRtlRandom(&seed); ok(seed != res[i], "%i: seed is same as res %x\n", i, seed); @@ -1226,7 +1226,7 @@ static void test_RtlIpv4StringToAddress(void) { "::1", STATUS_INVALID_PARAMETER, 0, { -1 } }, { ":1", STATUS_INVALID_PARAMETER, 0, { -1 } }, }; - const int testcount = sizeof(tests) / sizeof(tests[0]); + const int testcount = ARRAY_SIZE(tests); int i; if (!pRtlIpv4StringToAddressA) @@ -1787,7 +1787,7 @@ static void test_RtlDecompressBuffer(void) ok(final_size == 0xdeadbeef, "got wrong final_size %u\n", final_size); /* regular tests for RtlDecompressBuffer */ - for (i = 0; i < sizeof(test_lznt) / sizeof(test_lznt[0]); i++) + for (i = 0; i < ARRAY_SIZE(test_lznt); i++) { trace("Running test %d (compressed_size=%u, uncompressed_size=%u, status=0x%08x)\n", i, test_lznt[i].compressed_size, test_lznt[i].uncompressed_size, test_lznt[i].status); diff --git a/dlls/ntdll/tests/rtlstr.c b/dlls/ntdll/tests/rtlstr.c index 7f889dfa0d..53cc185939 100644 --- a/dlls/ntdll/tests/rtlstr.c +++ b/dlls/ntdll/tests/rtlstr.c @@ -1769,7 +1769,7 @@ static void test_RtlIsTextUnicode(void) be_unicode = HeapAlloc(GetProcessHeap(), 0, sizeof(unicode) + sizeof(WCHAR)); be_unicode[0] = 0xfffe; - for (i = 0; i < sizeof(unicode)/sizeof(unicode[0]); i++) + for (i = 0; i < ARRAY_SIZE(unicode); i++) { be_unicode[i + 1] = (unicode[i] >> 8) | ((unicode[i] & 0xff) << 8); } @@ -1791,7 +1791,7 @@ static void test_RtlIsTextUnicode(void) be_unicode_no_controls = HeapAlloc(GetProcessHeap(), 0, sizeof(unicode) + sizeof(WCHAR)); ok(be_unicode_no_controls != NULL, "Expected HeapAlloc to succeed.\n"); be_unicode_no_controls[0] = 0xfffe; - for (i = 0; i < sizeof(unicode_no_controls)/sizeof(unicode_no_controls[0]); i++) + for (i = 0; i < ARRAY_SIZE(unicode_no_controls); i++) be_unicode_no_controls[i + 1] = (unicode_no_controls[i] >> 8) | ((unicode_no_controls[i] & 0xff) << 8); @@ -2093,7 +2093,7 @@ static void test_RtlUnicodeToUTF8N(void) const WCHAR special_string[] = { 'X',0x80,0xd800,0 }; const unsigned char special_expected[] = { 'X',0xc2,0x80,0xef,0xbf,0xbd,0 }; unsigned int input_len; - const unsigned int test_count = sizeof(unicode_to_utf8) / sizeof(unicode_to_utf8[0]); + const unsigned int test_count = ARRAY_SIZE(unicode_to_utf8); unsigned int i; if (!pRtlUnicodeToUTF8N) @@ -2374,7 +2374,7 @@ static void unicode_expect_(const WCHAR *out_string, ULONG buflen, ULONG out_cha ok_(__FILE__, line)(buffer[i] == out_string[i], "buffer[%d] = 0x%x, expected 0x%x\n", i, buffer[i], out_string[i]); - for (; i < sizeof(buffer) / sizeof(WCHAR); i++) + for (; i < ARRAY_SIZE(buffer); i++) ok_(__FILE__, line)(buffer[i] == 0x5555, "buffer[%d] = 0x%x, expected 0x5555\n", i, buffer[i]); @@ -2396,7 +2396,7 @@ static void test_RtlUTF8ToUnicodeN(void) const char special_string[] = { 'X',0xc2,0x80,0xF0,0x90,0x80,0x80,0 }; const WCHAR special_expected[] = { 'X',0x80,0xd800,0xdc00,0 }; unsigned int input_len; - const unsigned int test_count = sizeof(utf8_to_unicode) / sizeof(utf8_to_unicode[0]); + const unsigned int test_count = ARRAY_SIZE(utf8_to_unicode); unsigned int i; if (!pRtlUTF8ToUnicodeN) diff --git a/dlls/ntdll/tests/string.c b/dlls/ntdll/tests/string.c index 8fca5d46d5..407bc0ffec 100644 --- a/dlls/ntdll/tests/string.c +++ b/dlls/ntdll/tests/string.c @@ -1258,7 +1258,7 @@ static void test_bsearch(void) int *x, l, i, j; /* just try all array sizes */ - for (j=1;j<sizeof(arr)/sizeof(arr[0]);j++) { + for (j=1;j<ARRAY_SIZE(arr);j++) { for (i=0;i<j;i++) { l = arr[i]; x = p_bsearch (&l, arr, j, sizeof(arr[0]), intcomparefunc); diff --git a/dlls/ntdll/tests/threadpool.c b/dlls/ntdll/tests/threadpool.c index af0b6673d3..3bd2d994ec 100644 --- a/dlls/ntdll/tests/threadpool.c +++ b/dlls/ntdll/tests/threadpool.c @@ -1824,7 +1824,7 @@ static void test_tp_multi_wait(void) environment.Pool = pool; /* create semaphores and corresponding wait objects */ - for (i = 0; i < sizeof(semaphores)/sizeof(semaphores[0]); i++) + for (i = 0; i < ARRAY_SIZE(semaphores); i++) { semaphores[i] = CreateSemaphoreW(NULL, 0, 1, NULL); ok(semaphores[i] != NULL, "failed to create semaphore %i\n", i); @@ -1838,7 +1838,7 @@ static void test_tp_multi_wait(void) } /* release all semaphores and wait for callback */ - for (i = 0; i < sizeof(semaphores)/sizeof(semaphores[0]); i++) + for (i = 0; i < ARRAY_SIZE(semaphores); i++) { multi_wait_info.result = 0; ReleaseSemaphore(semaphores[i], 1, NULL); @@ -1851,7 +1851,7 @@ static void test_tp_multi_wait(void) } /* repeat the same test in reverse order */ - for (i = sizeof(semaphores)/sizeof(semaphores[0]) - 1; i >= 0; i--) + for (i = ARRAY_SIZE(semaphores) - 1; i >= 0; i--) { multi_wait_info.result = 0; ReleaseSemaphore(semaphores[i], 1, NULL); @@ -1865,13 +1865,13 @@ static void test_tp_multi_wait(void) /* test timeout of wait objects */ multi_wait_info.result = 0; - for (i = 0; i < sizeof(semaphores)/sizeof(semaphores[0]); i++) + for (i = 0; i < ARRAY_SIZE(semaphores); i++) { when.QuadPart = (ULONGLONG)50 * -10000; pTpSetWait(waits[i], semaphores[i], &when); } - for (i = 0; i < sizeof(semaphores)/sizeof(semaphores[0]); i++) + for (i = 0; i < ARRAY_SIZE(semaphores); i++) { result = WaitForSingleObject(semaphore, 150); ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); @@ -1880,14 +1880,14 @@ static void test_tp_multi_wait(void) ok(multi_wait_info.result >> 16, "expected multi_wait_info.result >> 16 != 0\n"); /* destroy the wait objects and semaphores while waiting */ - for (i = 0; i < sizeof(semaphores)/sizeof(semaphores[0]); i++) + for (i = 0; i < ARRAY_SIZE(semaphores); i++) { pTpSetWait(waits[i], semaphores[i], NULL); } Sleep(50); - for (i = 0; i < sizeof(semaphores)/sizeof(semaphores[0]); i++) + for (i = 0; i < ARRAY_SIZE(semaphores); i++) { pTpReleaseWait(waits[i]); NtClose(semaphores[i]); -- 2.14.4

June 21, 2018