- Wine-Devel - list.winehq.org

[PATCH 1/7] gdi32/tests: Fix a compiler warning.
by Sven Baars Nov. 9, 2020

Nov. 9, 2020

Signed-off-by: Sven Baars <sbaars(a)codeweavers.com> --- ../dlls/gdi32/tests/font.c:1361:19: warning: ‘code’ may be used uninitialized in this function [-Wmaybe-uninitialized] 1361 | ret = GetCharABCWidthsA(hdc, code, code, abc); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ dlls/gdi32/tests/font.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 4c8b1cbb91b..d3ec971dce0 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -1330,17 +1330,16 @@ static void test_GetCharABCWidths(void) memset(&lf, 0, sizeof(lf)); lf.lfHeight = 20; - switch(i) + if (i == 1) { - case 1: strcpy(lf.lfFaceName, "Tahoma"); code = 'a'; - break; - case 2: + } + else + { strcpy(lf.lfFaceName, "Times New Roman"); lf.lfItalic = TRUE; code = 'f'; - break; } if (!is_truetype_font_installed(lf.lfFaceName)) { -- 2.25.1

2 10

[PATCH] gdi32: Merge in Uniscribe functionality.
by Nikolay Sivov Nov. 9, 2020

Nov. 9, 2020

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- MAINTAINERS | 2 +- dlls/gdi32/Makefile.in | 15 +- dlls/gdi32/gdi32.spec | 38 ++ dlls/{usp10 => gdi32/uniscribe}/bidi.c | 0 dlls/{usp10 => gdi32/uniscribe}/bracket.c | 0 dlls/{usp10 => gdi32/uniscribe}/breaking.c | 0 dlls/gdi32/{ => uniscribe}/direction.c | 0 dlls/{usp10 => gdi32/uniscribe}/indic.c | 0 .../uniscribe}/indicsyllable.c | 0 dlls/{usp10 => gdi32/uniscribe}/linebreak.c | 0 dlls/{usp10 => gdi32/uniscribe}/mirror.c | 0 dlls/{usp10 => gdi32/uniscribe}/opentype.c | 0 dlls/{usp10 => gdi32/uniscribe}/shape.c | 0 dlls/{usp10 => gdi32/uniscribe}/shaping.c | 0 dlls/{usp10 => gdi32/uniscribe}/usp10.c | 21 +- .../uniscribe}/usp10_internal.h | 0 dlls/usp10/Makefile.in | 17 - dlls/usp10/direction.c | 426 ------------------ dlls/usp10/usp10.spec | 76 ++-- tools/make_specfiles | 1 + tools/make_unicode | 13 +- 21 files changed, 114 insertions(+), 495 deletions(-) rename dlls/{usp10 => gdi32/uniscribe}/bidi.c (100%) rename dlls/{usp10 => gdi32/uniscribe}/bracket.c (100%) rename dlls/{usp10 => gdi32/uniscribe}/breaking.c (100%) rename dlls/gdi32/{ => uniscribe}/direction.c (100%) rename dlls/{usp10 => gdi32/uniscribe}/indic.c (100%) rename dlls/{usp10 => gdi32/uniscribe}/indicsyllable.c (100%) rename dlls/{usp10 => gdi32/uniscribe}/linebreak.c (100%) rename dlls/{usp10 => gdi32/uniscribe}/mirror.c (100%) rename dlls/{usp10 => gdi32/uniscribe}/opentype.c (100%) rename dlls/{usp10 => gdi32/uniscribe}/shape.c (100%) rename dlls/{usp10 => gdi32/uniscribe}/shaping.c (100%) rename dlls/{usp10 => gdi32/uniscribe}/usp10.c (99%) rename dlls/{usp10 => gdi32/uniscribe}/usp10_internal.h (100%) delete mode 100644 dlls/usp10/direction.c diff --git a/MAINTAINERS b/MAINTAINERS index b57eb5a5363..7c8cfee24ea 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -249,7 +249,7 @@ F: dlls/gphoto2.ds/ Uniscribe M: Aric Stewart <aric(a)codeweavers.com> -F: dlls/usp10/ +F: dlls/gdi32/uniscribe/ URL Moniker M: Jacek Caban <jacek(a)codeweavers.com> diff --git a/dlls/gdi32/Makefile.in b/dlls/gdi32/Makefile.in index c834c647f38..a965e80001c 100644 --- a/dlls/gdi32/Makefile.in +++ b/dlls/gdi32/Makefile.in @@ -4,7 +4,7 @@ IMPORTLIB = gdi32 IMPORTS = advapi32 EXTRAINCL = $(FREETYPE_CFLAGS) $(FONTCONFIG_CFLAGS) EXTRALIBS = $(CARBON_LIBS) $(APPKIT_LIBS) -DELAYIMPORTS = usp10 setupapi +DELAYIMPORTS = setupapi EXTRADLLFLAGS = -mno-cygwin @@ -22,7 +22,6 @@ C_SRCS = \ dibdrv/objects.c \ dibdrv/opengl.c \ dibdrv/primitives.c \ - direction.c \ driver.c \ enhmetafile.c \ enhmfdrv/bitblt.c \ @@ -49,6 +48,18 @@ C_SRCS = \ pen.c \ printdrv.c \ region.c \ + uniscribe/bidi.c \ + uniscribe/bracket.c \ + uniscribe/breaking.c \ + uniscribe/direction.c \ + uniscribe/indic.c \ + uniscribe/indicsyllable.c \ + uniscribe/linebreak.c \ + uniscribe/mirror.c \ + uniscribe/opentype.c \ + uniscribe/shape.c \ + uniscribe/shaping.c \ + uniscribe/usp10.c \ vertical.c \ vulkan.c diff --git a/dlls/gdi32/gdi32.spec b/dlls/gdi32/gdi32.spec index dc63dbcbf32..b21f22c3629 100644 --- a/dlls/gdi32/gdi32.spec +++ b/dlls/gdi32/gdi32.spec @@ -427,6 +427,44 @@ @ stdcall SaveDC(long) @ stdcall ScaleViewportExtEx(long long long long long ptr) @ stdcall ScaleWindowExtEx(long long long long long ptr) +@ stdcall ScriptApplyDigitSubstitution(ptr ptr ptr) +@ stdcall ScriptApplyLogicalWidth(ptr long long ptr ptr ptr ptr ptr ptr) +@ stdcall ScriptBreak(ptr long ptr ptr) +@ stdcall ScriptCacheGetHeight(ptr ptr ptr) +@ stdcall ScriptCPtoX(long long long long ptr ptr ptr ptr ptr) +@ stdcall ScriptFreeCache(ptr) +@ stdcall ScriptGetCMap(ptr ptr ptr long long ptr) +@ stdcall ScriptGetFontAlternateGlyphs(long ptr ptr long long long long long ptr ptr) +@ stdcall ScriptGetFontFeatureTags(long ptr ptr long long long ptr ptr) +@ stdcall ScriptGetFontLanguageTags(long ptr ptr long long ptr ptr) +@ stdcall ScriptGetFontProperties(long ptr ptr) +@ stdcall ScriptGetFontScriptTags(long ptr ptr long ptr ptr) +@ stdcall ScriptGetGlyphABCWidth(ptr ptr long ptr) +@ stdcall ScriptGetLogicalWidths(ptr long long ptr ptr ptr ptr) +@ stdcall ScriptGetProperties(ptr ptr) +@ stdcall ScriptIsComplex(wstr long long) +@ stdcall ScriptItemize(wstr long long ptr ptr ptr ptr) +@ stdcall ScriptItemizeOpenType(wstr long long ptr ptr ptr ptr ptr) +@ stdcall ScriptJustify(ptr ptr long long long ptr) +@ stdcall ScriptLayout(long ptr ptr ptr) +@ stdcall ScriptPlace(ptr ptr ptr long ptr ptr ptr ptr ptr) +@ stdcall ScriptPlaceOpenType(ptr ptr ptr long long ptr ptr long wstr ptr ptr long ptr ptr long ptr ptr ptr) +@ stdcall ScriptRecordDigitSubstitution(long ptr) +@ stdcall ScriptShape(ptr ptr ptr long long ptr ptr ptr ptr ptr) +@ stdcall ScriptShapeOpenType(ptr ptr ptr long long ptr ptr long wstr long long ptr ptr ptr ptr ptr) +@ stdcall ScriptStringAnalyse(ptr ptr long long long long long ptr ptr ptr ptr ptr ptr) +@ stdcall ScriptStringCPtoX(ptr long long ptr) +@ stdcall ScriptStringFree(ptr) +@ stdcall ScriptStringGetLogicalWidths(ptr ptr) +@ stdcall ScriptStringGetOrder(ptr ptr) +@ stdcall ScriptStringOut(ptr long long long ptr long long long) +@ stdcall ScriptStringValidate(ptr) +@ stdcall ScriptStringXtoCP(ptr long ptr ptr) +@ stdcall ScriptString_pLogAttr(ptr) +@ stdcall ScriptString_pSize(ptr) +@ stdcall ScriptString_pcOutChars(ptr) +@ stdcall ScriptTextOut(ptr ptr long long long ptr ptr ptr long ptr long ptr ptr ptr) +@ stdcall ScriptXtoCP(long long long ptr ptr ptr ptr ptr ptr) @ stub SelectBrushLocal @ stdcall SelectClipPath(long long) @ stdcall SelectClipRgn(long long) diff --git a/dlls/usp10/bidi.c b/dlls/gdi32/uniscribe/bidi.c similarity index 100% rename from dlls/usp10/bidi.c rename to dlls/gdi32/uniscribe/bidi.c diff --git a/dlls/usp10/bracket.c b/dlls/gdi32/uniscribe/bracket.c similarity index 100% rename from dlls/usp10/bracket.c rename to dlls/gdi32/uniscribe/bracket.c diff --git a/dlls/usp10/breaking.c b/dlls/gdi32/uniscribe/breaking.c similarity index 100% rename from dlls/usp10/breaking.c rename to dlls/gdi32/uniscribe/breaking.c diff --git a/dlls/gdi32/direction.c b/dlls/gdi32/uniscribe/direction.c similarity index 100% rename from dlls/gdi32/direction.c rename to dlls/gdi32/uniscribe/direction.c diff --git a/dlls/usp10/indic.c b/dlls/gdi32/uniscribe/indic.c similarity index 100% rename from dlls/usp10/indic.c rename to dlls/gdi32/uniscribe/indic.c diff --git a/dlls/usp10/indicsyllable.c b/dlls/gdi32/uniscribe/indicsyllable.c similarity index 100% rename from dlls/usp10/indicsyllable.c rename to dlls/gdi32/uniscribe/indicsyllable.c diff --git a/dlls/usp10/linebreak.c b/dlls/gdi32/uniscribe/linebreak.c similarity index 100% rename from dlls/usp10/linebreak.c rename to dlls/gdi32/uniscribe/linebreak.c diff --git a/dlls/usp10/mirror.c b/dlls/gdi32/uniscribe/mirror.c similarity index 100% rename from dlls/usp10/mirror.c rename to dlls/gdi32/uniscribe/mirror.c diff --git a/dlls/usp10/opentype.c b/dlls/gdi32/uniscribe/opentype.c similarity index 100% rename from dlls/usp10/opentype.c rename to dlls/gdi32/uniscribe/opentype.c diff --git a/dlls/usp10/shape.c b/dlls/gdi32/uniscribe/shape.c similarity index 100% rename from dlls/usp10/shape.c rename to dlls/gdi32/uniscribe/shape.c diff --git a/dlls/usp10/shaping.c b/dlls/gdi32/uniscribe/shaping.c similarity index 100% rename from dlls/usp10/shaping.c rename to dlls/gdi32/uniscribe/shaping.c diff --git a/dlls/usp10/usp10.c b/dlls/gdi32/uniscribe/usp10.c similarity index 99% rename from dlls/usp10/usp10.c rename to dlls/gdi32/uniscribe/usp10.c index 84cd6aa7091..7dbb513a47e 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/gdi32/uniscribe/usp10.c @@ -2194,6 +2194,18 @@ static inline BOOL does_glyph_start_cluster(const SCRIPT_VISATTR *pva, const WOR return FALSE; } +static DWORD get_sys_color(INT index) +{ + static DWORD (WINAPI *pGetSysColor)(INT index); + + if (!pGetSysColor) + { + HMODULE user = GetModuleHandleW( L"user32.dll" ); + if (user) pGetSysColor = (void *)GetProcAddress( user, "GetSysColor" ); + } + + return pGetSysColor(index); +} static HRESULT SS_ItemOut( SCRIPT_STRING_ANALYSIS ssa, int iX, @@ -2227,17 +2239,18 @@ static HRESULT SS_ItemOut( SCRIPT_STRING_ANALYSIS ssa, (cEnd >= 0 && analysis->pItem[iItem].iCharPos >= cEnd)) return S_OK; - CopyRect(&crc,prc); + if (prc) + memcpy(&crc, prc, sizeof(crc)); if (fSelected) { BkMode = GetBkMode(analysis->hdc); SetBkMode( analysis->hdc, OPAQUE); BkColor = GetBkColor(analysis->hdc); - SetBkColor(analysis->hdc, GetSysColor(COLOR_HIGHLIGHT)); + SetBkColor(analysis->hdc, get_sys_color(COLOR_HIGHLIGHT)); if (!fDisabled) { TextColor = GetTextColor(analysis->hdc); - SetTextColor(analysis->hdc, GetSysColor(COLOR_HIGHLIGHTTEXT)); + SetTextColor(analysis->hdc, get_sys_color(COLOR_HIGHLIGHTTEXT)); } } if (analysis->glyphs[iItem].fallbackFont) @@ -3449,7 +3462,7 @@ HRESULT WINAPI ScriptPlaceOpenType( HDC hdc, SCRIPT_CACHE *psc, SCRIPT_ANALYSIS else { INT width; - if (!GetCharWidthW(hdc, pwGlyphs[i], pwGlyphs[i], &width)) return S_FALSE; + if (!GetCharWidth32W(hdc, pwGlyphs[i], pwGlyphs[i], &width)) return S_FALSE; abc.abcB = width; abc.abcA = abc.abcC = 0; } diff --git a/dlls/usp10/usp10_internal.h b/dlls/gdi32/uniscribe/usp10_internal.h similarity index 100% rename from dlls/usp10/usp10_internal.h rename to dlls/gdi32/uniscribe/usp10_internal.h diff --git a/dlls/usp10/Makefile.in b/dlls/usp10/Makefile.in index 5b705e7fe4b..158b7f8d3c9 100644 --- a/dlls/usp10/Makefile.in +++ b/dlls/usp10/Makefile.in @@ -1,19 +1,2 @@ MODULE = usp10.dll IMPORTLIB = usp10 -IMPORTS = advapi32 user32 gdi32 - -EXTRADLLFLAGS = -mno-cygwin - -C_SRCS = \ - bidi.c \ - bracket.c \ - breaking.c \ - direction.c \ - indic.c \ - indicsyllable.c \ - linebreak.c \ - mirror.c \ - opentype.c \ - shape.c \ - shaping.c \ - usp10.c diff --git a/dlls/usp10/direction.c b/dlls/usp10/direction.c deleted file mode 100644 index 4c5c400762e..00000000000 --- a/dlls/usp10/direction.c +++ /dev/null @@ -1,426 +0,0 @@ -/* Unicode BiDi direction table */ -/* Automatically generated; DO NOT EDIT!! */ - -#include "windef.h" - -const unsigned short DECLSPEC_HIDDEN bidi_direction_table[3313] = -{ - /* level 1 offsets */ - 0x0100, 0x0110, 0x0115, 0x0125, 0x0135, 0x013e, 0x014e, 0x015e, - 0x016e, 0x017e, 0x018e, 0x019e, 0x01ae, 0x01be, 0x01cc, 0x01db, - 0x01e9, 0x0110, 0x0110, 0x01f4, 0x0204, 0x0110, 0x020c, 0x021b, - 0x022b, 0x0239, 0x0249, 0x0259, 0x0269, 0x0279, 0x0110, 0x0289, - 0x0299, 0x02a9, 0x02b8, 0x02c5, 0x02d3, 0x02e2, 0x02e8, 0x02e2, - 0x0110, 0x02e2, 0x02e2, 0x02f3, 0x0303, 0x0313, 0x0323, 0x0333, - 0x0343, 0x0353, 0x0362, 0x036f, 0x0110, 0x0110, 0x0110, 0x0110, - 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, - 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, - 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x037f, 0x0110, 0x0110, - 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, - 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, - 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, - 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, - 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, - 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, - 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, - 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, - 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, - 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, - 0x0110, 0x0110, 0x0110, 0x0110, 0x038f, 0x0110, 0x039f, 0x03af, - 0x03bf, 0x03cf, 0x03de, 0x03ee, 0x0110, 0x0110, 0x0110, 0x0110, - 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, - 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, - 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, - 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, - 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, - 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, - 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, - 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, - 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, - 0x0110, 0x0110, 0x0110, 0x03fd, 0x040b, 0x0418, 0x0428, 0x0438, - /* level 2 offsets */ - 0x0448, 0x0456, 0x0466, 0x0476, 0x0485, 0x048a, 0x0485, 0x049a, - 0x04a9, 0x04af, 0x04bf, 0x04cf, 0x04df, 0x04e8, 0x04df, 0x04e8, - 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, - 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, - 0x04f0, 0x04fe, 0x04fe, 0x050e, 0x051d, 0x052d, 0x052d, 0x052d, - 0x052d, 0x052d, 0x052d, 0x052d, 0x053d, 0x054c, 0x04df, 0x04df, - 0x04df, 0x04df, 0x04df, 0x04df, 0x04e9, 0x04df, 0x04df, 0x04df, - 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x0559, 0x04df, 0x04df, - 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x0563, 0x0573, - 0x052d, 0x0575, 0x0583, 0x0593, 0x0598, 0x05a7, 0x05b7, 0x05c7, - 0x05d5, 0x05d5, 0x05da, 0x052d, 0x05ea, 0x05fa, 0x05d5, 0x05d5, - 0x05d5, 0x05d5, 0x05d5, 0x0604, 0x0613, 0x0623, 0x062d, 0x05f9, - 0x05d5, 0x052d, 0x063d, 0x05d5, 0x05d5, 0x05d5, 0x05d5, 0x05d5, - 0x064a, 0x0659, 0x0593, 0x0593, 0x0669, 0x0675, 0x0593, 0x0683, - 0x068f, 0x0594, 0x0593, 0x069f, 0x06af, 0x04df, 0x04df, 0x04df, - 0x05d5, 0x06bf, 0x06c7, 0x06d4, 0x06e2, 0x052d, 0x06ef, 0x04df, - 0x04df, 0x06f5, 0x0704, 0x055b, 0x0712, 0x04df, 0x0721, 0x04df, - 0x04df, 0x0716, 0x0730, 0x04df, 0x0712, 0x073e, 0x074d, 0x04df, - 0x04df, 0x0716, 0x075c, 0x0721, 0x04df, 0x0768, 0x074d, 0x04df, - 0x04df, 0x0716, 0x0777, 0x04df, 0x0712, 0x0786, 0x0721, 0x04df, - 0x04df, 0x0796, 0x0730, 0x07a6, 0x0712, 0x04df, 0x0720, 0x04df, - 0x04df, 0x04df, 0x0715, 0x04df, 0x04df, 0x07b3, 0x07c3, 0x04df, - 0x04df, 0x0723, 0x07d3, 0x07a6, 0x0712, 0x07e1, 0x0721, 0x04df, - 0x04df, 0x0716, 0x0751, 0x04df, 0x0712, 0x04df, 0x07f1, 0x04df, - 0x04df, 0x0752, 0x0730, 0x04df, 0x0712, 0x04df, 0x0721, 0x04df, - 0x04df, 0x04df, 0x0718, 0x07ff, 0x04df, 0x04df, 0x04df, 0x080e, - 0x081e, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x082d, - 0x0788, 0x04df, 0x04df, 0x04df, 0x083a, 0x04df, 0x0845, 0x04df, - 0x04df, 0x04df, 0x0854, 0x085e, 0x086b, 0x052d, 0x0530, 0x071c, - 0x04df, 0x04df, 0x04df, 0x0724, 0x087a, 0x04df, 0x0755, 0x0888, - 0x0897, 0x08a5, 0x08b3, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, - 0x04df, 0x0724, 0x04df, 0x04df, 0x04df, 0x08c3, 0x04df, 0x04df, - 0x04df, 0x04df, 0x04df, 0x04df, 0x0485, 0x04df, 0x04df, 0x04df, - 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, - 0x04df, 0x04df, 0x04df, 0x04df, 0x08d3, 0x08d8, 0x04df, 0x04df, - 0x04df, 0x04df, 0x04df, 0x04df, 0x08e6, 0x04df, 0x08e6, 0x04df, - 0x0712, 0x04df, 0x0712, 0x04df, 0x04df, 0x04df, 0x08f2, 0x0809, - 0x08fc, 0x04df, 0x08c3, 0x090c, 0x04df, 0x04df, 0x04df, 0x04df, - 0x04df, 0x04df, 0x04df, 0x07a6, 0x04df, 0x0719, 0x04df, 0x04df, - 0x04df, 0x04df, 0x04df, 0x091c, 0x092a, 0x093a, 0x04df, 0x04df, - 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x0487, 0x051d, - 0x051d, 0x04df, 0x0943, 0x04df, 0x04df, 0x04df, 0x094f, 0x095d, - 0x096a, 0x04df, 0x04df, 0x04df, 0x052d, 0x0888, 0x04df, 0x04df, - 0x04df, 0x06ee, 0x04df, 0x04df, 0x097a, 0x0720, 0x04df, 0x0987, - 0x06ee, 0x07f1, 0x04df, 0x0997, 0x04df, 0x04df, 0x04df, 0x09a5, - 0x07f1, 0x04df, 0x04df, 0x0725, 0x09b4, 0x04df, 0x04df, 0x04df, - 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x09c4, 0x09d3, - 0x09dc, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, - 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x052d, 0x052d, 0x052d, - 0x09ca, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, - 0x04df, 0x04df, 0x04df, 0x04df, 0x09e6, 0x0498, 0x0488, 0x0488, - 0x08d6, 0x09f6, 0x051d, 0x0a06, 0x0a16, 0x0a22, 0x0a27, 0x0a37, - 0x0a47, 0x0a57, 0x04df, 0x0a67, 0x0a67, 0x04df, 0x052d, 0x052d, - 0x0888, 0x0a77, 0x0a83, 0x0a91, 0x0aa0, 0x0ab0, 0x051d, 0x04df, - 0x04df, 0x0abe, 0x051d, 0x051d, 0x051d, 0x051d, 0x051d, 0x051d, - 0x051d, 0x0ace, 0x051d, 0x051d, 0x051d, 0x051d, 0x051d, 0x051d, - 0x051d, 0x051d, 0x051d, 0x051d, 0x051d, 0x051d, 0x051d, 0x051d, - 0x0ad8, 0x04df, 0x04df, 0x04df, 0x048a, 0x051d, 0x0517, 0x051d, - 0x051d, 0x051d, 0x051d, 0x051d, 0x051d, 0x0ad7, 0x04df, 0x0503, - 0x04df, 0x051d, 0x051d, 0x0ae8, 0x0af0, 0x04df, 0x04df, 0x04df, - 0x04df, 0x0ade, 0x051d, 0x051d, 0x051d, 0x051d, 0x051d, 0x051d, - 0x051d, 0x051d, 0x051d, 0x051d, 0x051d, 0x051d, 0x051d, 0x051d, - 0x051d, 0x051d, 0x0b00, 0x051d, 0x051d, 0x051d, 0x051d, 0x051d, - 0x051d, 0x051d, 0x0b0d, 0x051d, 0x0516, 0x051d, 0x051d, 0x051d, - 0x051d, 0x051d, 0x051d, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, - 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, - 0x04df, 0x0b1d, 0x0b2c, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, - 0x04df, 0x04df, 0x0889, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, - 0x04df, 0x052d, 0x052d, 0x051d, 0x051d, 0x051d, 0x051d, 0x051d, - 0x0483, 0x04df, 0x04df, 0x051d, 0x0b35, 0x051d, 0x051d, 0x051d, - 0x051d, 0x051d, 0x0482, 0x051d, 0x051d, 0x051d, 0x051d, 0x051d, - 0x051d, 0x051d, 0x051d, 0x051d, 0x051d, 0x051d, 0x051d, 0x051d, - 0x0ad8, 0x04df, 0x0502, 0x0b45, 0x051d, 0x0b54, 0x0b64, 0x04df, - 0x04df, 0x04df, 0x04df, 0x04df, 0x0b74, 0x0485, 0x04df, 0x04df, - 0x04df, 0x04df, 0x04e4, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, - 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x051d, - 0x051d, 0x0482, 0x04df, 0x08d6, 0x04df, 0x04df, 0x04df, 0x051d, - 0x04df, 0x0b81, 0x04df, 0x04df, 0x04df, 0x051c, 0x0489, 0x04df, - 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x0b90, 0x04df, - 0x04df, 0x04df, 0x04df, 0x04df, 0x0487, 0x04df, 0x0486, 0x04df, - 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, - 0x04df, 0x04df, 0x04df, 0x051d, 0x051d, 0x051d, 0x051d, 0x04df, - 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, - 0x051d, 0x051d, 0x051d, 0x0ad7, 0x04df, 0x04df, 0x04df, 0x0488, - 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x0889, 0x0ba0, 0x04df, - 0x0723, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x07f1, 0x051d, - 0x051d, 0x0484, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x04e7, - 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x0bb0, - 0x04df, 0x0bbc, 0x0bc9, 0x04df, 0x04df, 0x04df, 0x0ab6, 0x04df, - 0x04df, 0x04df, 0x04df, 0x0bd5, 0x04df, 0x052d, 0x06f0, 0x04df, - 0x04df, 0x0bdf, 0x04df, 0x06d0, 0x07f1, 0x04df, 0x04df, 0x06ef, - 0x04df, 0x04df, 0x0bed, 0x04df, 0x04df, 0x071d, 0x04df, 0x04df, - 0x0bfb, 0x0882, 0x0c0a, 0x04df, 0x04df, 0x0716, 0x04df, 0x04df, - 0x04df, 0x0c1a, 0x0721, 0x04df, 0x0751, 0x071c, 0x04df, 0x04df, - 0x04df, 0x04df, 0x04df, 0x04df, 0x0aa0, 0x04df, 0x04df, 0x04df, - 0x04df, 0x04df, 0x04df, 0x04df, 0x0c2a, 0x04df, 0x0c38, 0x0c47, - 0x0c51, 0x0c61, 0x05d5, 0x05d5, 0x05d5, 0x05d5, 0x05d5, 0x05d5, - 0x05d5, 0x0c71, 0x0c7e, 0x05d5, 0x05d5, 0x05d5, 0x05d5, 0x05d5, - 0x05d5, 0x05d5, 0x05d5, 0x05d5, 0x05d5, 0x05d5, 0x05d5, 0x05d5, - 0x05d5, 0x05d5, 0x05d5, 0x0c81, 0x04df, 0x05d5, 0x05d5, 0x05d5, - 0x05d5, 0x0c7f, 0x05d5, 0x05d5, 0x06c7, 0x04df, 0x04df, 0x0c91, - 0x052d, 0x08c3, 0x052d, 0x051d, 0x051d, 0x0ca1, 0x0cb1, 0x06bf, - 0x05d5, 0x05d5, 0x05d5, 0x05d5, 0x05d5, 0x05d5, 0x05d5, 0x0cc1, - 0x0cd1, 0x0476, 0x0485, 0x048a, 0x0485, 0x048a, 0x0ad8, 0x04df, - 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x04df, 0x0ce1, 0x048c, - /* values */ - 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, - 0x000a, 0x000b, 0x000d, 0x000b, 0x000c, 0x000d, 0x000a, 0x000a, - 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, - 0x000a, 0x000a, 0x000d, 0x000d, 0x000d, 0x000b, 0x000c, 0x0000, - 0x0000, 0x0009, 0x0009, 0x0009, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0008, 0x0007, 0x0008, 0x0007, 0x0007, 0x0004, 0x0004, - 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, - 0x0007, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, 0x0001, - 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, - 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, - 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0000, 0x0000, 0x0000, - 0x0000, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000d, 0x000a, - 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, - 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x0007, - 0x0000, 0x0009, 0x0009, 0x0009, 0x0009, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0001, 0x0000, 0x0000, 0x000a, 0x0000, 0x0000, 0x0009, - 0x0009, 0x0004, 0x0004, 0x0000, 0x0001, 0x0000, 0x0000, 0x0000, - 0x0004, 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, - 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, - 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0000, - 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, - 0x0001, 0x0000, 0x0000, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, 0x0001, - 0x0001, 0x0001, 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0006, 0x0006, 0x0006, - 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, - 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0001, 0x0001, 0x0001, - 0x0001, 0x0000, 0x0000, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, - 0x0001, 0x0001, 0x0001, 0x0000, 0x0001, 0x0001, 0x0001, 0x0001, - 0x0000, 0x0000, 0x0001, 0x0000, 0x0001, 0x0001, 0x0001, 0x0001, - 0x0001, 0x0001, 0x0001, 0x0001, 0x0006, 0x0006, 0x0006, 0x0006, - 0x0006, 0x0006, 0x0006, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, - 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0000, 0x0001, 0x0001, - 0x0000, 0x0000, 0x0009, 0x0001, 0x0006, 0x0006, 0x0006, 0x0006, - 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, - 0x0006, 0x0006, 0x0006, 0x0002, 0x0006, 0x0006, 0x0002, 0x0006, - 0x0006, 0x0002, 0x0006, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, - 0x0001, 0x0001, 0x0001, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, - 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, - 0x0002, 0x0002, 0x0002, 0x0001, 0x0001, 0x0001, 0x0001, 0x0002, - 0x0002, 0x0002, 0x0002, 0x0002, 0x0001, 0x0001, 0x0001, 0x0001, - 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0003, - 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0000, 0x0000, 0x0005, - 0x0009, 0x0009, 0x0005, 0x0007, 0x0005, 0x0000, 0x0000, 0x0006, - 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, - 0x0006, 0x0006, 0x0005, 0x0005, 0x0001, 0x0005, 0x0005, 0x0005, - 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, - 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0006, 0x0006, 0x0006, - 0x0006, 0x0006, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, - 0x0003, 0x0003, 0x0003, 0x0003, 0x0009, 0x0003, 0x0003, 0x0005, - 0x0005, 0x0005, 0x0006, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, - 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, - 0x0005, 0x0005, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, - 0x0006, 0x0003, 0x0000, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, - 0x0005, 0x0005, 0x0006, 0x0006, 0x0000, 0x0006, 0x0006, 0x0006, - 0x0006, 0x0005, 0x0005, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, - 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0005, 0x0005, 0x0005, - 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, - 0x0005, 0x0005, 0x0005, 0x0001, 0x0005, 0x0006, 0x0006, 0x0006, - 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, - 0x0001, 0x0001, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, - 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, - 0x0006, 0x0006, 0x0005, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, - 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, - 0x0001, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, - 0x0002, 0x0002, 0x0002, 0x0002, 0x0006, 0x0006, 0x0006, 0x0006, - 0x0006, 0x0002, 0x0002, 0x0000, 0x0000, 0x0000, 0x0000, 0x0002, - 0x0001, 0x0001, 0x0006, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, - 0x0002, 0x0006, 0x0006, 0x0006, 0x0006, 0x0002, 0x0006, 0x0006, - 0x0006, 0x0006, 0x0006, 0x0002, 0x0006, 0x0006, 0x0006, 0x0002, - 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0001, 0x0001, 0x0002, - 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, - 0x0006, 0x0006, 0x0006, 0x0001, 0x0001, 0x0002, 0x0001, 0x0005, - 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, - 0x0005, 0x0005, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0005, - 0x0005, 0x0005, 0x0005, 0x0005, 0x0001, 0x0005, 0x0005, 0x0005, - 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0001, - 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0006, - 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, - 0x0006, 0x0006, 0x0006, 0x0006, 0x0003, 0x0006, 0x0006, 0x0006, - 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, - 0x0006, 0x0006, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, - 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0006, - 0x0001, 0x0006, 0x0001, 0x0001, 0x0001, 0x0006, 0x0006, 0x0006, - 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0001, 0x0001, 0x0001, - 0x0001, 0x0006, 0x0001, 0x0001, 0x0006, 0x0006, 0x0001, 0x0001, - 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, - 0x0001, 0x0001, 0x0006, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, - 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, - 0x0001, 0x0006, 0x0006, 0x0006, 0x0006, 0x0001, 0x0001, 0x0001, - 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0006, 0x0001, 0x0001, - 0x0009, 0x0009, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, - 0x0001, 0x0009, 0x0001, 0x0001, 0x0006, 0x0001, 0x0006, 0x0006, - 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, - 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0006, 0x0006, 0x0001, - 0x0001, 0x0001, 0x0001, 0x0006, 0x0006, 0x0001, 0x0001, 0x0006, - 0x0006, 0x0006, 0x0001, 0x0001, 0x0001, 0x0006, 0x0001, 0x0001, - 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, - 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0001, 0x0006, 0x0006, - 0x0001, 0x0001, 0x0001, 0x0001, 0x0006, 0x0001, 0x0001, 0x0009, - 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, - 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0001, 0x0001, - 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, - 0x0001, 0x0001, 0x0006, 0x0001, 0x0001, 0x0006, 0x0001, 0x0001, - 0x0001, 0x0001, 0x0001, 0x0006, 0x0006, 0x0001, 0x0001, 0x0001, - 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0009, 0x0000, 0x0001, 0x0001, - 0x0001, 0x0001, 0x0001, 0x0006, 0x0001, 0x0001, 0x0001, 0x0006, - 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, - 0x0001, 0x0001, 0x0001, 0x0006, 0x0001, 0x0001, 0x0001, 0x0001, - 0x0001, 0x0006, 0x0006, 0x0006, 0x0001, 0x0006, 0x0006, 0x0006, - 0x0006, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, - 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0001, 0x0006, 0x0006, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, - 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, - 0x0001, 0x0006, 0x0006, 0x0006, 0x0001, 0x0006, 0x0001, 0x0001, - 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0006, - 0x0001, 0x0001, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, - 0x0006, 0x0001, 0x0001, 0x0001, 0x0001, 0x0009, 0x0001, 0x0001, - 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0006, 0x0006, 0x0006, - 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0001, 0x0006, 0x0001, - 0x0001, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, - 0x0006, 0x0006, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, - 0x0001, 0x0001, 0x0006, 0x0006, 0x0001, 0x0001, 0x0001, 0x0001, - 0x0001, 0x0001, 0x0006, 0x0001, 0x0006, 0x0001, 0x0006, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0001, 0x0001, 0x0006, 0x0006, 0x0006, - 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, - 0x0006, 0x0006, 0x0006, 0x0001, 0x0006, 0x0006, 0x0001, 0x0001, - 0x0001, 0x0001, 0x0001, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, - 0x0006, 0x0006, 0x0006, 0x0001, 0x0006, 0x0006, 0x0006, 0x0006, - 0x0006, 0x0006, 0x0006, 0x0001, 0x0006, 0x0006, 0x0006, 0x0006, - 0x0006, 0x0006, 0x0001, 0x0006, 0x0006, 0x0001, 0x0001, 0x0006, - 0x0006, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, - 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, - 0x0006, 0x0006, 0x0006, 0x0006, 0x0001, 0x0001, 0x0001, 0x0001, - 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0006, - 0x0001, 0x0001, 0x0006, 0x0006, 0x0001, 0x0001, 0x0001, 0x0001, - 0x0001, 0x0001, 0x0006, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, - 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, - 0x0006, 0x0001, 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, 0x0001, 0x0001, - 0x0001, 0x0001, 0x0001, 0x000c, 0x0001, 0x0001, 0x0001, 0x0001, - 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, - 0x0001, 0x0001, 0x0001, 0x0000, 0x0000, 0x0001, 0x0001, 0x0001, - 0x0006, 0x0006, 0x0006, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, - 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0006, 0x0006, - 0x0001, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, - 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0009, - 0x0001, 0x0006, 0x0001, 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0006, - 0x0006, 0x0006, 0x000a, 0x0001, 0x0006, 0x0006, 0x0006, 0x0001, - 0x0001, 0x0001, 0x0001, 0x0006, 0x0006, 0x0001, 0x0001, 0x0001, - 0x0001, 0x0001, 0x0001, 0x0001, 0x0006, 0x0001, 0x0001, 0x0001, - 0x0001, 0x0001, 0x0001, 0x0006, 0x0006, 0x0006, 0x0001, 0x0001, - 0x0001, 0x0001, 0x0000, 0x0001, 0x0001, 0x0001, 0x0000, 0x0000, - 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, - 0x0001, 0x0001, 0x0006, 0x0006, 0x0001, 0x0001, 0x0006, 0x0001, - 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0006, 0x0001, 0x0006, - 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0001, 0x0006, - 0x0001, 0x0001, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, - 0x0006, 0x0006, 0x0001, 0x0001, 0x0001, 0x0006, 0x0006, 0x0006, - 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0001, - 0x0001, 0x0006, 0x0001, 0x0001, 0x0001, 0x0001, 0x0006, 0x0001, - 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0001, 0x0006, 0x0001, - 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, - 0x0001, 0x0001, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0001, - 0x0001, 0x0006, 0x0006, 0x0006, 0x0006, 0x0001, 0x0001, 0x0006, - 0x0006, 0x0001, 0x0006, 0x0006, 0x0006, 0x0001, 0x0001, 0x0001, - 0x0001, 0x0001, 0x0001, 0x0006, 0x0001, 0x0006, 0x0006, 0x0001, - 0x0001, 0x0001, 0x0006, 0x0001, 0x0006, 0x0006, 0x0006, 0x0006, - 0x0001, 0x0001, 0x0006, 0x0006, 0x0001, 0x0001, 0x0001, 0x0001, - 0x0001, 0x0001, 0x0001, 0x0001, 0x0006, 0x0006, 0x0006, 0x0001, - 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, - 0x0006, 0x0006, 0x0006, 0x0006, 0x0001, 0x0006, 0x0006, 0x0006, - 0x0006, 0x0006, 0x0006, 0x0006, 0x0001, 0x0001, 0x0001, 0x0001, - 0x0006, 0x0001, 0x0001, 0x0001, 0x0006, 0x0006, 0x0001, 0x0001, - 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, - 0x0001, 0x0001, 0x0001, 0x0000, 0x0001, 0x0000, 0x000c, 0x000c, - 0x000c, 0x000c, 0x000c, 0x000c, 0x000c, 0x000c, 0x000c, 0x000c, - 0x000c, 0x000a, 0x000a, 0x000a, 0x0001, 0x0002, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x000c, 0x000d, - 0x0011, 0x000f, 0x0012, 0x0010, 0x000e, 0x0007, 0x0009, 0x0009, - 0x0009, 0x0009, 0x0009, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0007, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x000c, 0x000a, - 0x000a, 0x000a, 0x000a, 0x000a, 0x0001, 0x0013, 0x0014, 0x0015, - 0x0016, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x0004, - 0x0001, 0x0001, 0x0001, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, - 0x0004, 0x0008, 0x0008, 0x0000, 0x0000, 0x0000, 0x0001, 0x0004, - 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, - 0x0004, 0x0008, 0x0008, 0x0000, 0x0000, 0x0000, 0x0001, 0x0009, - 0x0009, 0x0009, 0x0009, 0x0009, 0x0009, 0x0009, 0x0009, 0x0009, - 0x0009, 0x0009, 0x0009, 0x0009, 0x0009, 0x0009, 0x0009, 0x0000, - 0x0000, 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, 0x0000, - 0x0000, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0000, - 0x0001, 0x0000, 0x0000, 0x0000, 0x0001, 0x0001, 0x0001, 0x0001, - 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, 0x0000, 0x0001, - 0x0000, 0x0001, 0x0000, 0x0001, 0x0001, 0x0001, 0x0001, 0x0009, - 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, - 0x0001, 0x0001, 0x0000, 0x0000, 0x0001, 0x0001, 0x0001, 0x0001, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, 0x0001, 0x0001, - 0x0001, 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, 0x0001, - 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0000, - 0x0000, 0x0000, 0x0001, 0x0001, 0x0001, 0x0001, 0x0000, 0x0000, - 0x0008, 0x0009, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, 0x0001, - 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, - 0x0004, 0x0004, 0x0004, 0x0004, 0x0001, 0x0001, 0x0001, 0x0001, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0001, 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, 0x0001, 0x0001, - 0x0001, 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0001, 0x0001, 0x0001, 0x0001, 0x0006, 0x0006, 0x0001, 0x0001, - 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x000c, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0001, 0x0001, 0x0001, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, 0x0001, 0x0001, - 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0006, 0x0006, - 0x0006, 0x0006, 0x0001, 0x0001, 0x0000, 0x0001, 0x0001, 0x0001, - 0x0001, 0x0001, 0x0000, 0x0000, 0x0001, 0x0001, 0x0001, 0x0001, - 0x0001, 0x0000, 0x0000, 0x0000, 0x0001, 0x0001, 0x0001, 0x0001, - 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0006, 0x0006, 0x0000, - 0x0000, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, - 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0000, 0x0000, 0x0000, - 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, - 0x0006, 0x0006, 0x0006, 0x0000, 0x0006, 0x0006, 0x0006, 0x0006, - 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0000, 0x0000, - 0x0001, 0x0001, 0x0006, 0x0001, 0x0001, 0x0001, 0x0006, 0x0001, - 0x0001, 0x0001, 0x0001, 0x0006, 0x0001, 0x0001, 0x0001, 0x0001, - 0x0001, 0x0006, 0x0006, 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0006, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, - 0x0001, 0x0009, 0x0009, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, - 0x0001, 0x0006, 0x0006, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, - 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0006, 0x0006, 0x0006, - 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0001, 0x0001, 0x0001, - 0x0006, 0x0001, 0x0001, 0x0006, 0x0006, 0x0006, 0x0006, 0x0001, - 0x0001, 0x0006, 0x0006, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, - 0x0001, 0x0001, 0x0001, 0x0001, 0x0006, 0x0006, 0x0006, 0x0006, - 0x0006, 0x0006, 0x0001, 0x0001, 0x0001, 0x0006, 0x0001, 0x0001, - 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0006, 0x0001, - 0x0001, 0x0001, 0x0006, 0x0001, 0x0006, 0x0006, 0x0006, 0x0001, - 0x0001, 0x0006, 0x0006, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, - 0x0006, 0x0006, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0006, - 0x0001, 0x0001, 0x0006, 0x0001, 0x0001, 0x0001, 0x0001, 0x0006, - 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, - 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0002, 0x0006, 0x0002, - 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, - 0x0008, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, - 0x0001, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0001, 0x0002, - 0x0001, 0x0002, 0x0002, 0x0001, 0x0002, 0x0002, 0x0001, 0x0002, - 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, - 0x0002, 0x0005, 0x0005, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, - 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, - 0x0001, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, - 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0000, - 0x0000, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, - 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0000, 0x0001, - 0x0001, 0x0007, 0x0000, 0x0007, 0x0001, 0x0000, 0x0007, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0009, 0x0000, 0x0000, 0x0008, 0x0008, 0x0000, 0x0000, 0x0000, - 0x0001, 0x0000, 0x0009, 0x0009, 0x0000, 0x0001, 0x0001, 0x0001, - 0x0001, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, - 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0001, 0x0001, - 0x000a, 0x0001, 0x0000, 0x0000, 0x0009, 0x0009, 0x0009, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0008, 0x0007, 0x0008, 0x0007, - 0x0007, 0x0009, 0x0009, 0x0000, 0x0000, 0x0000, 0x0009, 0x0009, - 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0001 -}; diff --git a/dlls/usp10/usp10.spec b/dlls/usp10/usp10.spec index 96bf47147a7..5344d21075d 100644 --- a/dlls/usp10/usp10.spec +++ b/dlls/usp10/usp10.spec @@ -1,44 +1,44 @@ @ stub LpkPresent -@ stdcall ScriptApplyDigitSubstitution(ptr ptr ptr) -@ stdcall ScriptApplyLogicalWidth(ptr long long ptr ptr ptr ptr ptr ptr) -@ stdcall ScriptBreak(ptr long ptr ptr) -@ stdcall ScriptCPtoX(long long long long ptr ptr ptr ptr ptr) -@ stdcall ScriptCacheGetHeight(ptr ptr ptr) -@ stdcall ScriptFreeCache(ptr) -@ stdcall ScriptGetCMap(ptr ptr ptr long long ptr) -@ stdcall ScriptGetFontAlternateGlyphs(long ptr ptr long long long long long ptr ptr) -@ stdcall ScriptGetFontFeatureTags(long ptr ptr long long long ptr ptr) -@ stdcall ScriptGetFontLanguageTags(long ptr ptr long long ptr ptr) -@ stdcall ScriptGetFontProperties(long ptr ptr) -@ stdcall ScriptGetFontScriptTags(long ptr ptr long ptr ptr) -@ stdcall ScriptGetGlyphABCWidth(ptr ptr long ptr) -@ stdcall ScriptGetLogicalWidths(ptr long long ptr ptr ptr ptr) -@ stdcall ScriptGetProperties(ptr ptr) -@ stdcall ScriptIsComplex(wstr long long) -@ stdcall ScriptItemize(wstr long long ptr ptr ptr ptr) -@ stdcall ScriptItemizeOpenType(wstr long long ptr ptr ptr ptr ptr) -@ stdcall ScriptJustify(ptr ptr long long long ptr) -@ stdcall ScriptLayout(long ptr ptr ptr) -@ stdcall ScriptPlace(ptr ptr ptr long ptr ptr ptr ptr ptr) -@ stdcall ScriptPlaceOpenType(ptr ptr ptr long long ptr ptr long wstr ptr ptr long ptr ptr long ptr ptr ptr) +@ stdcall ScriptApplyDigitSubstitution(ptr ptr ptr) gdi32.ScriptApplyDigitSubstitution +@ stdcall ScriptApplyLogicalWidth(ptr long long ptr ptr ptr ptr ptr ptr) gdi32.ScriptApplyLogicalWidth +@ stdcall ScriptBreak(ptr long ptr ptr) gdi32.ScriptBreak +@ stdcall ScriptCPtoX(long long long long ptr ptr ptr ptr ptr) gdi32.ScriptCPtoX +@ stdcall ScriptCacheGetHeight(ptr ptr ptr) gdi32.ScriptCacheGetHeight +@ stdcall ScriptFreeCache(ptr) gdi32.ScriptFreeCache +@ stdcall ScriptGetCMap(ptr ptr ptr long long ptr) gdi32.ScriptGetCMap +@ stdcall ScriptGetFontAlternateGlyphs(long ptr ptr long long long long long ptr ptr) gdi32.ScriptGetFontAlternateGlyphs +@ stdcall ScriptGetFontFeatureTags(long ptr ptr long long long ptr ptr) gdi32.ScriptGetFontFeatureTags +@ stdcall ScriptGetFontLanguageTags(long ptr ptr long long ptr ptr) gdi32.ScriptGetFontLanguageTags +@ stdcall ScriptGetFontProperties(long ptr ptr) gdi32.ScriptGetFontProperties +@ stdcall ScriptGetFontScriptTags(long ptr ptr long ptr ptr) gdi32.ScriptGetFontScriptTags +@ stdcall ScriptGetGlyphABCWidth(ptr ptr long ptr) gdi32.ScriptGetGlyphABCWidth +@ stdcall ScriptGetLogicalWidths(ptr long long ptr ptr ptr ptr) gdi32.ScriptGetLogicalWidths +@ stdcall ScriptGetProperties(ptr ptr) gdi32.ScriptGetProperties +@ stdcall ScriptIsComplex(wstr long long) gdi32.ScriptIsComplex +@ stdcall ScriptItemize(wstr long long ptr ptr ptr ptr) gdi32.ScriptItemize +@ stdcall ScriptItemizeOpenType(wstr long long ptr ptr ptr ptr ptr) gdi32.ScriptItemizeOpenType +@ stdcall ScriptJustify(ptr ptr long long long ptr) gdi32.ScriptJustify +@ stdcall ScriptLayout(long ptr ptr ptr) gdi32.ScriptLayout +@ stdcall ScriptPlace(ptr ptr ptr long ptr ptr ptr ptr ptr) gdi32.ScriptPlace +@ stdcall ScriptPlaceOpenType(ptr ptr ptr long long ptr ptr long wstr ptr ptr long ptr ptr long ptr ptr ptr) gdi32.ScriptPlaceOpenType @ stub ScriptPositionSingleGlyph -@ stdcall ScriptRecordDigitSubstitution(long ptr) -@ stdcall ScriptShape(ptr ptr ptr long long ptr ptr ptr ptr ptr) -@ stdcall ScriptShapeOpenType(ptr ptr ptr long long ptr ptr long wstr long long ptr ptr ptr ptr ptr) -@ stdcall ScriptStringAnalyse(ptr ptr long long long long long ptr ptr ptr ptr ptr ptr) -@ stdcall ScriptStringCPtoX(ptr long long ptr) -@ stdcall ScriptStringFree(ptr) -@ stdcall ScriptStringGetLogicalWidths(ptr ptr) -@ stdcall ScriptStringGetOrder(ptr ptr) -@ stdcall ScriptStringOut(ptr long long long ptr long long long) -@ stdcall ScriptStringValidate(ptr) -@ stdcall ScriptStringXtoCP(ptr long ptr ptr) -@ stdcall ScriptString_pLogAttr(ptr) -@ stdcall ScriptString_pSize(ptr) -@ stdcall ScriptString_pcOutChars(ptr) +@ stdcall ScriptRecordDigitSubstitution(long ptr) gdi32.ScriptRecordDigitSubstitution +@ stdcall ScriptShape(ptr ptr ptr long long ptr ptr ptr ptr ptr) gdi32.ScriptShape +@ stdcall ScriptShapeOpenType(ptr ptr ptr long long ptr ptr long wstr long long ptr ptr ptr ptr ptr) gdi32.ScriptShapeOpenType +@ stdcall ScriptStringAnalyse(ptr ptr long long long long long ptr ptr ptr ptr ptr ptr) gdi32.ScriptStringAnalyse +@ stdcall ScriptStringCPtoX(ptr long long ptr) gdi32.ScriptStringCPtoX +@ stdcall ScriptStringFree(ptr) gdi32.ScriptStringFree +@ stdcall ScriptStringGetLogicalWidths(ptr ptr) gdi32.ScriptStringGetLogicalWidths +@ stdcall ScriptStringGetOrder(ptr ptr) gdi32.ScriptStringGetOrder +@ stdcall ScriptStringOut(ptr long long long ptr long long long) gdi32.ScriptStringOut +@ stdcall ScriptStringValidate(ptr) gdi32.ScriptStringValidate +@ stdcall ScriptStringXtoCP(ptr long ptr ptr) gdi32.ScriptStringXtoCP +@ stdcall ScriptString_pLogAttr(ptr) gdi32.ScriptString_pLogAttr +@ stdcall ScriptString_pSize(ptr) gdi32.ScriptString_pSize +@ stdcall ScriptString_pcOutChars(ptr) gdi32.ScriptString_pcOutChars @ stub ScriptSubstituteSingleGlyph -@ stdcall ScriptTextOut(ptr ptr long long long ptr ptr ptr long ptr long ptr ptr ptr) -@ stdcall ScriptXtoCP(long long long ptr ptr ptr ptr ptr ptr) +@ stdcall ScriptTextOut(ptr ptr long long long ptr ptr ptr long ptr long ptr ptr ptr) gdi32.ScriptTextOut +@ stdcall ScriptXtoCP(long long long ptr ptr ptr ptr ptr ptr) gdi32.ScriptXtoCP @ stub UspAllocCache @ stub UspAllocTemp @ stub UspFreeMem diff --git a/tools/make_specfiles b/tools/make_specfiles index e7a706dad42..11e806b8919 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -463,6 +463,7 @@ my @dll_groups = "ext-ms-win-rtcore-gdi-devcaps-l1-1-0", "ext-ms-win-rtcore-gdi-object-l1-1-0", "ext-ms-win-rtcore-gdi-rgn-l1-1-0", + "usp10" ], [ "combase", diff --git a/tools/make_unicode b/tools/make_unicode index 7aae54ccbb3..8d5747ce253 100755 --- a/tools/make_unicode +++ b/tools/make_unicode @@ -2787,19 +2787,18 @@ load_data(); dump_case_mappings( "libs/port/casemap.c" ); dump_sortkeys( "dlls/kernelbase/collation.c" ); dump_ctype_tables( "libs/port/wctype.c" ); -dump_bidi_dir_table( "dlls/gdi32/direction.c" ); -dump_bidi_dir_table( "dlls/usp10/direction.c" ); +dump_bidi_dir_table( "dlls/gdi32/uniscribe/direction.c" ); dump_bidi_dir_table( "dlls/dwrite/direction.c" ); dump_digit_folding( "dlls/kernelbase/digitmap.c" ); -dump_mirroring( "dlls/usp10/mirror.c" ); +dump_mirroring( "dlls/gdi32/uniscribe/mirror.c" ); dump_mirroring( "dlls/dwrite/mirror.c" ); -dump_bracket( "dlls/usp10/bracket.c" ); +dump_bracket( "dlls/gdi32/uniscribe/bracket.c" ); dump_bracket( "dlls/dwrite/bracket.c" ); -dump_shaping( "dlls/usp10/shaping.c" ); -dump_linebreak( "dlls/usp10/linebreak.c" ); +dump_shaping( "dlls/gdi32/uniscribe/shaping.c" ); +dump_linebreak( "dlls/gdi32/uniscribe/linebreak.c" ); dump_linebreak( "dlls/dwrite/linebreak.c" ); dump_scripts( "dlls/dwrite/scripts" ); -dump_indic( "dlls/usp10/indicsyllable.c" ); +dump_indic( "dlls/gdi32/uniscribe/indicsyllable.c" ); dump_vertical( "dlls/gdi32/vertical.c" ); dump_vertical( "dlls/wineps.drv/vertical.c" ); dump_intl_nls("nls/l_intl.nls"); -- 2.28.0

1 0

[PATCH v2 2/2] odbc32: Add initial tests
by Alistair Leslie-Hughes Nov. 9, 2020

Nov. 9, 2020

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- configure | 1 + configure.ac | 1 + dlls/odbc32/tests/Makefile.in | 4 + dlls/odbc32/tests/connection.c | 130 +++++++++++++++++++++++++++++++++ 4 files changed, 136 insertions(+) create mode 100644 dlls/odbc32/tests/Makefile.in create mode 100644 dlls/odbc32/tests/connection.c diff --git a/configure b/configure index 943d4c5d8f4..b6915d03fa0 100755 --- a/configure +++ b/configure @@ -20851,6 +20851,7 @@ wine_fn_config_makefile dlls/ntprint enable_ntprint wine_fn_config_makefile dlls/ntprint/tests enable_tests wine_fn_config_makefile dlls/objsel enable_objsel wine_fn_config_makefile dlls/odbc32 enable_odbc32 +wine_fn_config_makefile dlls/odbc32/tests enable_tests wine_fn_config_makefile dlls/odbcbcp enable_odbcbcp wine_fn_config_makefile dlls/odbccp32 enable_odbccp32 wine_fn_config_makefile dlls/odbccp32/tests enable_tests diff --git a/configure.ac b/configure.ac index 923d5e3b0f3..a7f2b876187 100644 --- a/configure.ac +++ b/configure.ac @@ -3592,6 +3592,7 @@ WINE_CONFIG_MAKEFILE(dlls/ntprint) WINE_CONFIG_MAKEFILE(dlls/ntprint/tests) WINE_CONFIG_MAKEFILE(dlls/objsel) WINE_CONFIG_MAKEFILE(dlls/odbc32) +WINE_CONFIG_MAKEFILE(dlls/odbc32/tests) WINE_CONFIG_MAKEFILE(dlls/odbcbcp) WINE_CONFIG_MAKEFILE(dlls/odbccp32) WINE_CONFIG_MAKEFILE(dlls/odbccp32/tests) diff --git a/dlls/odbc32/tests/Makefile.in b/dlls/odbc32/tests/Makefile.in new file mode 100644 index 00000000000..4d8716ed2ed --- /dev/null +++ b/dlls/odbc32/tests/Makefile.in @@ -0,0 +1,4 @@ +TESTDLL = odbc32.dll +IMPORTS = odbc32 + +C_SRCS = connection.c diff --git a/dlls/odbc32/tests/connection.c b/dlls/odbc32/tests/connection.c new file mode 100644 index 00000000000..e3e5dcfc012 --- /dev/null +++ b/dlls/odbc32/tests/connection.c @@ -0,0 +1,130 @@ +/* + * Copyright 2018 Alistair Leslie-Hughes + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <wine/test.h> +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "sqlext.h" +#include "odbcinst.h" + +static void test_SQLAllocEnv(void) +{ + SQLRETURN ret; + SQLHENV sqlenv, sqlenv2; + + ret = SQLAllocEnv(NULL); + ok(ret == SQL_ERROR, "got %d\n", ret); + + ret = SQLAllocEnv(&sqlenv); + ok(ret == SQL_SUCCESS, "got %d\n", ret); + + ret = SQLAllocEnv(&sqlenv2); + ok(ret == SQL_SUCCESS, "got %d\n", ret); + ok(sqlenv != sqlenv2, "got %d\n", ret); + + ret = SQLFreeEnv(sqlenv2); + ok(ret == SQL_SUCCESS, "got %d\n", ret); + + ret = SQLFreeEnv(sqlenv); + ok(ret == SQL_SUCCESS, "got %d\n", ret); + + ret = SQLFreeEnv(sqlenv); + ok(ret == SQL_INVALID_HANDLE, "got %d\n", ret); + + ret = SQLFreeEnv(SQL_NULL_HENV); + ok(ret == SQL_INVALID_HANDLE, "got %d\n", ret); +} + +void test_SQLGetEnvAttr(void) +{ + SQLRETURN ret; + SQLHENV sqlenv; + SQLINTEGER value, length; + + ret = SQLAllocEnv(&sqlenv); + ok(ret == SQL_SUCCESS, "got %d\n", ret); + + value = 5; + length = 12; + ret = SQLGetEnvAttr(SQL_NULL_HENV, SQL_ATTR_CONNECTION_POOLING, &value, sizeof(SQLINTEGER), &length); + todo_wine ok(ret == SQL_SUCCESS, "got %d\n", ret); + todo_wine ok(value == 0, "got %d\n", value); + ok(length == 12 || length == 0, "got %d\n", length); + + value = 5; + length = 13; + ret = SQLGetEnvAttr(SQL_NULL_HENV, SQL_ATTR_CONNECTION_POOLING, &value, 0, &length); + todo_wine ok(ret == SQL_SUCCESS, "got %d\n", ret); + todo_wine ok(value == 0, "got %d\n", value); + ok(length == 13 || length == 0, "got %d\n", length); + + value = 5; + length = 12; + ret = SQLGetEnvAttr(sqlenv, SQL_ATTR_CONNECTION_POOLING, &value, sizeof(SQLINTEGER), &length); + ok(ret == SQL_SUCCESS, "got %d\n", ret); + ok(value == 0, "got %d\n", value); + ok(length == 12, "got %d\n", length); + + value = 5; + length = 12; + ret = SQLGetEnvAttr(sqlenv, SQL_ATTR_CONNECTION_POOLING, &value, 2, &length); + ok(ret == SQL_SUCCESS, "got %d\n", ret); + ok(value == 0, "got %d\n", value); + ok(length == 12, "got %d\n", length); + + ret = SQLFreeEnv(sqlenv); + ok(ret == SQL_SUCCESS, "got %d\n", ret); +} + +static void test_SQLDriver(void) +{ + SQLHENV henv = SQL_NULL_HENV; + SQLRETURN ret; + SQLCHAR driver[256]; + SQLCHAR attr[256]; + SQLSMALLINT driver_ret; + SQLSMALLINT attr_ret; + SQLUSMALLINT direction; + + ret = SQLAllocEnv(&henv); + ok(ret == SQL_SUCCESS, "got %d\n", ret); + ok(henv != SQL_NULL_HENV, "NULL handle\n"); + + direction = SQL_FETCH_FIRST; + + while(SQL_SUCCEEDED(ret = SQLDrivers(henv, direction, driver, sizeof(driver), + &driver_ret, attr, sizeof(attr), &attr_ret))) + { + direction = SQL_FETCH_NEXT; + + trace("%s - %s\n", driver, attr); + } + todo_wine ok(ret == SQL_NO_DATA, "got %d\n", ret); + + ret = SQLFreeEnv(henv); + todo_wine ok(ret == SQL_SUCCESS, "got %d\n", ret); +} + +START_TEST(connection) +{ + test_SQLAllocEnv(); + test_SQLGetEnvAttr(); + test_SQLDriver(); +} -- 2.28.0

2 1

[PATCH v2 1/2] odbc32: SQLAllocEnv handle NULL parameter
by Alistair Leslie-Hughes Nov. 9, 2020

Nov. 9, 2020

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/odbc32/proxyodbc.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c index 0c0b30f0bef..d6e872aad48 100644 --- a/dlls/odbc32/proxyodbc.c +++ b/dlls/odbc32/proxyodbc.c @@ -55,7 +55,8 @@ static SQLRETURN WINAPI null_SQLAllocConnect(SQLHENV EnvironmentHandle, SQLHDBC static SQLRETURN WINAPI null_SQLAllocEnv(SQLHENV *EnvironmentHandle) { - *EnvironmentHandle = SQL_NULL_HENV; + if (EnvironmentHandle) + *EnvironmentHandle = SQL_NULL_HENV; TRACE("Not ready\n"); return SQL_ERROR; } @@ -1232,7 +1233,7 @@ SQLRETURN WINAPI SQLAllocEnv(SQLHENV *EnvironmentHandle) TRACE("(EnvironmentHandle %p)\n", EnvironmentHandle); ret = sql_funcs.pSQLAllocEnv(EnvironmentHandle); - TRACE("Returning %d, EnvironmentHandle %p\n", ret, *EnvironmentHandle); + TRACE("Returning %d, EnvironmentHandle %p\n", ret, EnvironmentHandle ? *EnvironmentHandle : NULL); return ret; } -- 2.28.0

1 0

[PATCH 2/2] odbc32: Add initial tests
by Alistair Leslie-Hughes Nov. 9, 2020

Nov. 9, 2020

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- configure | 1 + configure.ac | 1 + dlls/odbc32/tests/Makefile.in | 4 + dlls/odbc32/tests/connection.c | 130 +++++++++++++++++++++++++++++++++ 4 files changed, 136 insertions(+) create mode 100644 dlls/odbc32/tests/Makefile.in create mode 100644 dlls/odbc32/tests/connection.c diff --git a/configure b/configure index 943d4c5d8f4..b6915d03fa0 100755 --- a/configure +++ b/configure @@ -20851,6 +20851,7 @@ wine_fn_config_makefile dlls/ntprint enable_ntprint wine_fn_config_makefile dlls/ntprint/tests enable_tests wine_fn_config_makefile dlls/objsel enable_objsel wine_fn_config_makefile dlls/odbc32 enable_odbc32 +wine_fn_config_makefile dlls/odbc32/tests enable_tests wine_fn_config_makefile dlls/odbcbcp enable_odbcbcp wine_fn_config_makefile dlls/odbccp32 enable_odbccp32 wine_fn_config_makefile dlls/odbccp32/tests enable_tests diff --git a/configure.ac b/configure.ac index 923d5e3b0f3..a7f2b876187 100644 --- a/configure.ac +++ b/configure.ac @@ -3592,6 +3592,7 @@ WINE_CONFIG_MAKEFILE(dlls/ntprint) WINE_CONFIG_MAKEFILE(dlls/ntprint/tests) WINE_CONFIG_MAKEFILE(dlls/objsel) WINE_CONFIG_MAKEFILE(dlls/odbc32) +WINE_CONFIG_MAKEFILE(dlls/odbc32/tests) WINE_CONFIG_MAKEFILE(dlls/odbcbcp) WINE_CONFIG_MAKEFILE(dlls/odbccp32) WINE_CONFIG_MAKEFILE(dlls/odbccp32/tests) diff --git a/dlls/odbc32/tests/Makefile.in b/dlls/odbc32/tests/Makefile.in new file mode 100644 index 00000000000..4d8716ed2ed --- /dev/null +++ b/dlls/odbc32/tests/Makefile.in @@ -0,0 +1,4 @@ +TESTDLL = odbc32.dll +IMPORTS = odbc32 + +C_SRCS = connection.c diff --git a/dlls/odbc32/tests/connection.c b/dlls/odbc32/tests/connection.c new file mode 100644 index 00000000000..21bb609dd3c --- /dev/null +++ b/dlls/odbc32/tests/connection.c @@ -0,0 +1,130 @@ +/* + * Copyright 2020 Alistair Leslie-Hughes + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <wine/test.h> +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "sqlext.h" +#include "odbcinst.h" + +static void test_SQLAllocEnv(void) +{ + SQLRETURN ret; + SQLHENV sqlenv, sqlenv2; + + ret = SQLAllocEnv(NULL); + ok(ret == SQL_ERROR, "got %d\n", ret); + + ret = SQLAllocEnv(&sqlenv); + ok(ret == SQL_SUCCESS, "got %d\n", ret); + + ret = SQLAllocEnv(&sqlenv2); + ok(ret == SQL_SUCCESS, "got %d\n", ret); + ok(sqlenv != sqlenv2, "got %d\n", ret); + + ret = SQLFreeEnv(sqlenv2); + ok(ret == SQL_SUCCESS, "got %d\n", ret); + + ret = SQLFreeEnv(sqlenv); + ok(ret == SQL_SUCCESS, "got %d\n", ret); + + ret = SQLFreeEnv(sqlenv); + ok(ret == SQL_INVALID_HANDLE, "got %d\n", ret); + + ret = SQLFreeEnv(SQL_NULL_HENV); + ok(ret == SQL_INVALID_HANDLE, "got %d\n", ret); +} + +void test_SQLGetEnvAttr(void) +{ + SQLRETURN ret; + SQLHENV sqlenv; + SQLINTEGER value, length; + + ret = SQLAllocEnv(&sqlenv); + ok(ret == SQL_SUCCESS, "got %d\n", ret); + + value = 5; + length = 12; + ret = SQLGetEnvAttr(SQL_NULL_HENV, SQL_ATTR_CONNECTION_POOLING, &value, sizeof(SQLINTEGER), &length); + todo_wine ok(ret == SQL_SUCCESS, "got %d\n", ret); + todo_wine ok(value == 0, "got %d\n", value); + ok(length == 12, "got %d\n", length); + + value = 5; + length = 13; + ret = SQLGetEnvAttr(SQL_NULL_HENV, SQL_ATTR_CONNECTION_POOLING, &value, 0, &length); + todo_wine ok(ret == SQL_SUCCESS, "got %d\n", ret); + todo_wine ok(value == 0, "got %d\n", value); + ok(length == 13, "got %d\n", length); + + value = 5; + length = 12; + ret = SQLGetEnvAttr(sqlenv, SQL_ATTR_CONNECTION_POOLING, &value, sizeof(SQLINTEGER), &length); + ok(ret == SQL_SUCCESS, "got %d\n", ret); + ok(value == 0, "got %d\n", value); + ok(length == 12, "got %d\n", length); + + value = 5; + length = 12; + ret = SQLGetEnvAttr(sqlenv, SQL_ATTR_CONNECTION_POOLING, &value, 2, &length); + ok(ret == SQL_SUCCESS, "got %d\n", ret); + ok(value == 0, "got %d\n", value); + ok(length == 12, "got %d\n", length); + + ret = SQLFreeEnv(sqlenv); + ok(ret == SQL_SUCCESS, "got %d\n", ret); +} + +static void test_SQLDriver(void) +{ + SQLHENV henv = SQL_NULL_HENV; + SQLRETURN ret; + SQLCHAR driver[256]; + SQLCHAR attr[256]; + SQLSMALLINT driver_ret; + SQLSMALLINT attr_ret; + SQLUSMALLINT direction; + + ret = SQLAllocEnv(&henv); + ok(ret == SQL_SUCCESS, "got %d\n", ret); + ok(henv != SQL_NULL_HENV, "NULL handle\n"); + + direction = SQL_FETCH_FIRST; + + while(SQL_SUCCEEDED(ret = SQLDrivers(henv, direction, driver, sizeof(driver), + &driver_ret, attr, sizeof(attr), &attr_ret))) + { + direction = SQL_FETCH_NEXT; + + trace("%s - %s\n", driver, attr); + } + todo_wine ok(ret == SQL_NO_DATA, "got %d\n", ret); + + ret = SQLFreeEnv(henv); + todo_wine ok(ret == SQL_SUCCESS, "got %d\n", ret); +} + +START_TEST(connection) +{ + test_SQLAllocEnv(); + test_SQLGetEnvAttr(); + test_SQLDriver(); +} -- 2.28.0

2 1

[PATCH 1/2] odbc32: SQLAllocEnv handle NULL parameter
by Alistair Leslie-Hughes Nov. 9, 2020

Nov. 9, 2020

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/odbc32/proxyodbc.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c index 0c0b30f0bef..d6e872aad48 100644 --- a/dlls/odbc32/proxyodbc.c +++ b/dlls/odbc32/proxyodbc.c @@ -55,7 +55,8 @@ static SQLRETURN WINAPI null_SQLAllocConnect(SQLHENV EnvironmentHandle, SQLHDBC static SQLRETURN WINAPI null_SQLAllocEnv(SQLHENV *EnvironmentHandle) { - *EnvironmentHandle = SQL_NULL_HENV; + if (EnvironmentHandle) + *EnvironmentHandle = SQL_NULL_HENV; TRACE("Not ready\n"); return SQL_ERROR; } @@ -1232,7 +1233,7 @@ SQLRETURN WINAPI SQLAllocEnv(SQLHENV *EnvironmentHandle) TRACE("(EnvironmentHandle %p)\n", EnvironmentHandle); ret = sql_funcs.pSQLAllocEnv(EnvironmentHandle); - TRACE("Returning %d, EnvironmentHandle %p\n", ret, *EnvironmentHandle); + TRACE("Returning %d, EnvironmentHandle %p\n", ret, EnvironmentHandle ? *EnvironmentHandle : NULL); return ret; } -- 2.28.0

1 0

[PATCH 5/5] riched20: Move the code to clear the cell bottom out of the loop.
by Huw Davies Nov. 9, 2020

Nov. 9, 2020

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/paint.c | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index ad2ffb9abb9..ffb50d5ceff 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -1015,26 +1015,24 @@ static void draw_paragraph( ME_Context *c, ME_Paragraph *para ) ME_DebugWrite(c->hDC, &pt, buf); } break; - case diCell: - /* Clear any space at the bottom of the cell after the text. */ - if (para->nFlags & (MEPF_ROWSTART|MEPF_ROWEND)) - break; - y += height; - rc.top = c->pt.y + para->pt.y + para->nHeight; - rc.bottom = c->pt.y + p->member.cell.pt.y + p->member.cell.nHeight; - if (RectVisible(c->hDC, &rc)) - PatBlt(c->hDC, rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top, PATCOPY); - break; default: break; } no++; } - draw_table_borders( c, para ); - draw_para_number( c, para ); + if (para_cell( para )) + { + /* Clear any space at the bottom of the cell after the text. */ + rc.top = c->pt.y + para->pt.y + para->nHeight; + rc.bottom = c->pt.y + cell->pt.y + cell->nHeight; + PatBlt( c->hDC, rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top, PATCOPY ); + } + + draw_table_borders( c, para ); + draw_para_number( c, para ); - SetTextAlign(c->hDC, align); + SetTextAlign( c->hDC, align ); } void ME_ScrollAbs(ME_TextEditor *editor, int x, int y) -- 2.23.0

1 0

[PATCH 4/5] riched20: Simplify search for the cell to delete.
by Huw Davies Nov. 9, 2020

Nov. 9, 2020

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/para.c | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/dlls/riched20/para.c b/dlls/riched20/para.c index c0f2a7b5471..cb98218aeab 100644 --- a/dlls/riched20/para.c +++ b/dlls/riched20/para.c @@ -684,7 +684,6 @@ ME_Paragraph *para_split( ME_TextEditor *editor, ME_Run *run, ME_Style *style, specified in use_first_fmt */ ME_Paragraph *para_join( ME_TextEditor *editor, ME_Paragraph *para, BOOL use_first_fmt ) { - ME_DisplayItem *tmp; ME_Paragraph *next = para_next( para ); ME_Run *end_run, *next_first_run, *tmp_run; ME_Cell *cell = NULL; @@ -717,20 +716,13 @@ ME_Paragraph *para_join( ME_TextEditor *editor, ME_Paragraph *para, BOOL use_fir if (!editor->bEmulateVersion10) /* v4.1 */ { + /* Remove cell boundary if it is between the end paragraph run and the next + * paragraph display item. */ + if (para->cell != next->cell) cell = next->cell; + /* Table cell/row properties are always moved over from the removed para. */ para->nFlags = next->nFlags; para->cell = next->cell; - - /* Remove cell boundary if it is between the end paragraph run and the next - * paragraph display item. */ - for (tmp = run_get_di( end_run ); tmp != para_get_di( next ); tmp = tmp->next) - { - if (tmp->type == diCell) - { - cell = &tmp->member.cell; - break; - } - } } add_undo_split_para( editor, next, eol_str, cell ); -- 2.23.0

1 0

[PATCH 3/5] riched20: Use row and para ptrs in the cursor up/down handler.
by Huw Davies Nov. 9, 2020

Nov. 9, 2020

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/caret.c | 130 +++++++++++++++++++---------------------- dlls/riched20/editor.h | 1 - dlls/riched20/para.c | 4 -- 3 files changed, 60 insertions(+), 75 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index f36c00458b8..6417bbde442 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -1196,80 +1196,70 @@ static int ME_GetXForArrow(ME_TextEditor *editor, ME_Cursor *pCursor) } -static void -ME_MoveCursorLines(ME_TextEditor *editor, ME_Cursor *pCursor, int nRelOfs, BOOL extend) +static void cursor_move_line( ME_TextEditor *editor, ME_Cursor *cursor, BOOL up, BOOL extend ) { - ME_DisplayItem *pRun = run_get_di( pCursor->run ); - ME_Paragraph *old_para = pCursor->para, *new_para; - ME_DisplayItem *pItem; - int x = ME_GetXForArrow(editor, pCursor); + ME_Paragraph *old_para = cursor->para, *new_para; + ME_Row *row = row_from_cursor( cursor ); + int x = ME_GetXForArrow( editor, cursor ); - if (nRelOfs == -1) - { - /* start of this row */ - pItem = ME_FindItemBack(pRun, diStartRow); - assert(pItem); - /* start of the previous row */ - pItem = ME_FindItemBack(pItem, diStartRow); - if (!pItem) /* row not found */ - { - if (extend) - ME_SetCursorToStart(editor, pCursor); - return; - } - new_para = &ME_GetParagraph(pItem)->member.para; - if (old_para->nFlags & MEPF_ROWEND || - (para_cell( old_para ) && para_cell( old_para ) != para_cell( new_para ))) - { - /* Brought out of a cell */ - new_para = para_prev( table_row_start( old_para )); - if (!new_para) return; /* At the top, so don't go anywhere. */ - pItem = ME_FindItemFwd( para_get_di( new_para ), diStartRow); - } - if (new_para->nFlags & MEPF_ROWEND) - { - /* Brought into a table row */ - ME_Cell *cell = table_row_end_cell( new_para ); - while (x < cell->pt.x && cell_prev( cell )) - cell = cell_prev( cell ); - if (cell_next( cell )) /* else - we are still at the end of the row */ - pItem = ME_FindItemBack( cell_get_di( cell_next( cell ) ), diStartRow ); - } - } - else - { - /* start of the next row */ - pItem = ME_FindItemFwd(pRun, diStartRow); - if (!pItem) /* row not found */ - { - if (extend) - ME_SetCursorToEnd(editor, pCursor, TRUE); - return; - } - new_para = &ME_GetParagraph(pItem)->member.para; - if (old_para->nFlags & MEPF_ROWSTART || - (para_cell( old_para ) && para_cell( old_para ) != para_cell( new_para ))) + if (up) { - /* Brought out of a cell */ - new_para = para_next( table_row_end( old_para ) ); - if (!para_next( new_para )) return; /* At the bottom, so don't go anywhere. */ - pItem = ME_FindItemFwd( para_get_di( new_para ), diStartRow ); + /* start of the previous row */ + row = row_prev_all_paras( row ); + if (!row) + { + if (extend) ME_SetCursorToStart( editor, cursor ); + return; + } + new_para = row_para( row ); + if (old_para->nFlags & MEPF_ROWEND || + (para_cell( old_para ) && para_cell( old_para ) != para_cell( new_para ))) + { + /* Brought out of a cell */ + new_para = para_prev( table_row_start( old_para )); + if (!new_para) return; /* At the top, so don't go anywhere. */ + row = para_first_row( new_para ); + } + if (new_para->nFlags & MEPF_ROWEND) + { + /* Brought into a table row */ + ME_Cell *cell = table_row_end_cell( new_para ); + while (x < cell->pt.x && cell_prev( cell )) + cell = cell_prev( cell ); + if (cell_next( cell )) /* else - we are still at the end of the row */ + row = para_end_row( cell_end_para( cell ) ); + } } - if (new_para->nFlags & MEPF_ROWSTART) + else { - /* Brought into a table row */ - ME_Cell *cell = table_row_first_cell( new_para ); - while (cell_next( cell ) && x >= cell_next( cell )->pt.x) - cell = cell_next( cell ); - pItem = ME_FindItemFwd( cell_get_di( cell ), diStartRow ); + /* start of the next row */ + row = row_next_all_paras( row ); + if (!row) + { + if (extend) ME_SetCursorToEnd( editor, cursor, TRUE ); + return; + } + new_para = row_para( row ); + if (old_para->nFlags & MEPF_ROWSTART || + (para_cell( old_para ) && para_cell( old_para ) != para_cell( new_para ))) + { + /* Brought out of a cell */ + new_para = para_next( table_row_end( old_para ) ); + if (!para_next( new_para )) return; /* At the bottom, so don't go anywhere. */ + row = para_first_row( new_para ); + } + if (new_para->nFlags & MEPF_ROWSTART) + { + /* Brought into a table row */ + ME_Cell *cell = table_row_first_cell( new_para ); + while (cell_next( cell ) && x >= cell_next( cell )->pt.x) + cell = cell_next( cell ); + row = para_first_row( cell_first_para( cell ) ); + } } - } - if (!pItem) - { - /* row not found - ignore */ - return; - } - row_cursor( editor, &pItem->member.row, x, pCursor ); + if (!row) return; + + row_cursor( editor, row, x, cursor ); } static void ME_ArrowPageUp( ME_TextEditor *editor, ME_Cursor *cursor ) @@ -1434,10 +1424,10 @@ ME_ArrowKey(ME_TextEditor *editor, int nVKey, BOOL extend, BOOL ctrl) success = ME_MoveCursorChars(editor, &tmp_curs, +1, extend); break; case VK_UP: - ME_MoveCursorLines(editor, &tmp_curs, -1, extend); + cursor_move_line( editor, &tmp_curs, TRUE, extend ); break; case VK_DOWN: - ME_MoveCursorLines(editor, &tmp_curs, +1, extend); + cursor_move_line( editor, &tmp_curs, FALSE, extend ); break; case VK_PRIOR: ME_ArrowPageUp(editor, &tmp_curs); diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index e7ae7b806be..7a9d445f98f 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -208,7 +208,6 @@ void editor_get_selection_para_fmt( ME_TextEditor *editor, PARAFORMAT2 *fmt ) DE void editor_mark_rewrap_all( ME_TextEditor *editor ) DECLSPEC_HIDDEN; void editor_set_default_para_fmt(ME_TextEditor *editor, PARAFORMAT2 *pFmt) DECLSPEC_HIDDEN; BOOL editor_set_selection_para_fmt( ME_TextEditor *editor, const PARAFORMAT2 *fmt ) DECLSPEC_HIDDEN; -ME_DisplayItem *ME_GetParagraph(ME_DisplayItem *run) DECLSPEC_HIDDEN; void ME_MakeFirstParagraph(ME_TextEditor *editor) DECLSPEC_HIDDEN; void ME_DumpParaStyle(ME_Paragraph *s) DECLSPEC_HIDDEN; void ME_DumpParaStyleToBuf(const PARAFORMAT2 *pFmt, char buf[2048]) DECLSPEC_HIDDEN; diff --git a/dlls/riched20/para.c b/dlls/riched20/para.c index 1a53ba46a27..c0f2a7b5471 100644 --- a/dlls/riched20/para.c +++ b/dlls/riched20/para.c @@ -794,10 +794,6 @@ ME_Paragraph *para_join( ME_TextEditor *editor, ME_Paragraph *para, BOOL use_fir return para; } -ME_DisplayItem *ME_GetParagraph(ME_DisplayItem *item) { - return ME_FindItemBackOrHere(item, diParagraph); -} - void ME_DumpParaStyleToBuf(const PARAFORMAT2 *pFmt, char buf[2048]) { char *p; -- 2.23.0

1 0

[PATCH 2/5] riched20: Use row ptrs in the page up/down handlers.
by Huw Davies Nov. 9, 2020

Nov. 9, 2020

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/caret.c | 135 +++++++++++++++-------------------------- dlls/riched20/editor.h | 3 + dlls/riched20/row.c | 26 ++++++++ 3 files changed, 78 insertions(+), 86 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 2fa6842da13..f36c00458b8 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -1272,105 +1272,68 @@ ME_MoveCursorLines(ME_TextEditor *editor, ME_Cursor *pCursor, int nRelOfs, BOOL row_cursor( editor, &pItem->member.row, x, pCursor ); } -static void ME_ArrowPageUp(ME_TextEditor *editor, ME_Cursor *pCursor) +static void ME_ArrowPageUp( ME_TextEditor *editor, ME_Cursor *cursor ) { - ME_DisplayItem *p = ME_FindItemFwd(editor->pBuffer->pFirst, diStartRow); + ME_Row *row = para_first_row( editor_first_para( editor ) ), *last_row; + int x, yd, old_scroll_pos = editor->vert_si.nPos; - if (editor->vert_si.nPos < p->member.row.nHeight) - { - ME_SetCursorToStart(editor, pCursor); - /* Native clears seems to clear this x value on page up at the top - * of the text, but not on page down at the end of the text. - * Doesn't make sense, but we try to be bug for bug compatible. */ - editor->nUDArrowX = -1; - } else { - ME_DisplayItem *pRun = run_get_di( pCursor->run ); - ME_DisplayItem *pLast; - int x, y, yd, yp; - int yOldScrollPos = editor->vert_si.nPos; - - x = ME_GetXForArrow(editor, pCursor); - - p = ME_FindItemBack(pRun, diStartRowOrParagraph); - assert(p->type == diStartRow); - yp = ME_FindItemBack(p, diParagraph)->member.para.pt.y; - y = yp + p->member.row.pt.y; + if (editor->vert_si.nPos < row->nHeight) + { + ME_SetCursorToStart( editor, cursor ); + /* Native clears seems to clear this x value on page up at the top + * of the text, but not on page down at the end of the text. + * Doesn't make sense, but we try to be bug for bug compatible. */ + editor->nUDArrowX = -1; + } + else + { + x = ME_GetXForArrow( editor, cursor ); + row = row_from_cursor( cursor ); - ME_ScrollUp(editor, editor->sizeWindow.cy); - /* Only move the cursor by the amount scrolled. */ - yd = y + editor->vert_si.nPos - yOldScrollPos; - pLast = p; + ME_ScrollUp( editor, editor->sizeWindow.cy ); + /* Only move the cursor by the amount scrolled. */ + yd = cursor->para->pt.y + row->pt.y + editor->vert_si.nPos - old_scroll_pos; + last_row = row; - do { - p = ME_FindItemBack(p, diStartRowOrParagraph); - if (!p) - break; - if (p->type == diParagraph) { /* crossing paragraphs */ - if (p->member.para.prev_para == NULL) - break; - yp = p->member.para.prev_para->member.para.pt.y; - continue; - } - y = yp + p->member.row.pt.y; - if (y < yd) - break; - pLast = p; - } while(1); + while ((row = row_prev_all_paras( row ))) + { + if (row_para( row )->pt.y + row->pt.y < yd) break; + last_row = row; + } - row_cursor( editor, &pLast->member.row, x, pCursor ); - } + row_cursor( editor, last_row, x, cursor ); + } } -static void ME_ArrowPageDown(ME_TextEditor *editor, ME_Cursor *pCursor) +static void ME_ArrowPageDown( ME_TextEditor *editor, ME_Cursor *cursor ) { - ME_DisplayItem *pLast; - int x, y; + ME_Row *row = para_end_row( para_prev( editor_end_para( editor ) ) ), *last_row; + int x, yd, old_scroll_pos = editor->vert_si.nPos; - /* Find y position of the last row */ - pLast = editor->pBuffer->pLast; - y = pLast->member.para.prev_para->member.para.pt.y - + ME_FindItemBack(pLast, diStartRow)->member.row.pt.y; + x = ME_GetXForArrow( editor, cursor ); - x = ME_GetXForArrow(editor, pCursor); + if (editor->vert_si.nPos >= row_para( row )->pt.y + row->pt.y - editor->sizeWindow.cy) + ME_SetCursorToEnd( editor, cursor, FALSE ); + else + { + row = row_from_cursor( cursor ); - if (editor->vert_si.nPos >= y - editor->sizeWindow.cy) - { - ME_SetCursorToEnd(editor, pCursor, FALSE); - } else { - ME_DisplayItem *pRun = run_get_di( pCursor->run ); - ME_DisplayItem *p; - int yd, yp; - int yOldScrollPos = editor->vert_si.nPos; - - p = ME_FindItemBack(pRun, diStartRowOrParagraph); - assert(p->type == diStartRow); - yp = ME_FindItemBack(p, diParagraph)->member.para.pt.y; - y = yp + p->member.row.pt.y; - - /* For native richedit controls: - * v1.0 - v3.1 can only scroll down as far as the scrollbar lets us - * v4.1 can scroll past this position here. */ - ME_ScrollDown(editor, editor->sizeWindow.cy); - /* Only move the cursor by the amount scrolled. */ - yd = y + editor->vert_si.nPos - yOldScrollPos; - pLast = p; + /* For native richedit controls: + * v1.0 - v3.1 can only scroll down as far as the scrollbar lets us + * v4.1 can scroll past this position here. */ + ME_ScrollDown( editor, editor->sizeWindow.cy ); + /* Only move the cursor by the amount scrolled. */ + yd = cursor->para->pt.y + row->pt.y + editor->vert_si.nPos - old_scroll_pos; + last_row = row; - do { - p = ME_FindItemFwd(p, diStartRowOrParagraph); - if (!p) - break; - if (p->type == diParagraph) { - yp = p->member.para.pt.y; - continue; - } - y = yp + p->member.row.pt.y; - if (y >= yd) - break; - pLast = p; - } while(1); + while ((row = row_next_all_paras( row ))) + { + if (row_para( row )->pt.y + row->pt.y >= yd) break; + last_row = row; + } - row_cursor( editor, &pLast->member.row, x, pCursor ); - } + row_cursor( editor, last_row, x, cursor ); + } } static void ME_ArrowHome( ME_TextEditor *editor, ME_Cursor *cursor ) diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index c29619cc793..e7ae7b806be 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -115,8 +115,11 @@ ME_Run *row_first_run( ME_Row *row ) DECLSPEC_HIDDEN; ME_Row *row_from_cursor( ME_Cursor *cursor ) DECLSPEC_HIDDEN; ME_Row *row_from_row_number( ME_TextEditor *editor, int row_num ) DECLSPEC_HIDDEN; ME_Row *row_next( ME_Row *row ) DECLSPEC_HIDDEN; +ME_Row *row_next_all_paras( ME_Row *row ) DECLSPEC_HIDDEN; ME_Run *row_next_run( ME_Row *row, ME_Run *run ) DECLSPEC_HIDDEN; int row_number_from_char_ofs( ME_TextEditor *editor, int ofs ) DECLSPEC_HIDDEN; +ME_Paragraph *row_para( ME_Row *row ) DECLSPEC_HIDDEN; +ME_Row *row_prev_all_paras( ME_Row *row ) DECLSPEC_HIDDEN; static inline ME_DisplayItem *row_get_di( ME_Row *row ) { return (ME_DisplayItem *)((ptrdiff_t)row - offsetof(ME_DisplayItem, member)); diff --git a/dlls/riched20/row.c b/dlls/riched20/row.c index f5d3ad15701..715d2adbf62 100644 --- a/dlls/riched20/row.c +++ b/dlls/riched20/row.c @@ -33,6 +33,24 @@ ME_Row *row_next( ME_Row *row ) return &item->member.row; } +ME_Row *row_next_all_paras( ME_Row *row ) +{ + ME_DisplayItem *item; + + item = ME_FindItemFwd( row_get_di( row ), diStartRow ); + if (!item) return NULL; + return &item->member.row; +} + +ME_Row *row_prev_all_paras( ME_Row *row ) +{ + ME_DisplayItem *item; + + item = ME_FindItemBack( row_get_di( row ), diStartRow ); + if (!item) return NULL; + return &item->member.row; +} + ME_Run *row_first_run( ME_Row *row ) { ME_DisplayItem *item; @@ -82,6 +100,14 @@ void row_end_cursor( ME_Row *row, ME_Cursor *cursor, BOOL include_eop ) cursor->nOffset = (item->type == diStartRow || include_eop) ? cursor->run->len : 0; } +ME_Paragraph *row_para( ME_Row *row ) +{ + ME_Cursor cursor; + + row_first_cursor( row, &cursor ); + return cursor.para; +} + ME_Row *row_from_row_number( ME_TextEditor *editor, int row_num ) { ME_Paragraph *para = editor_first_para( editor ); -- 2.23.0

1 0