Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-03 19:05:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of https://github.com/reactos/reactos

Browse source
This commit is contained in:
jimtabor 2019-12-09 11:19:18 -06:00
commit d447b41198
2 changed files with 8 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

10
modules/rostests/apitests/kernel32/ConsoleCP.c
View file

@ -23,7 +23,7 @@ static const WCHAR u9580[] = { 0x9580, 0 }; /* 門 */
static const WCHAR ideograph_space = (WCHAR)0x3000; /* fullwidth space */ static const WCHAR ideograph_space = (WCHAR)0x3000; /* fullwidth space */
static LCID lcidJapanese = MAKELCID(MAKELANGID(LANG_JAPANESE, SUBLANG_DEFAULT), SORT_DEFAULT); static LCID lcidJapanese = MAKELCID(MAKELANGID(LANG_JAPANESE, SUBLANG_DEFAULT), SORT_DEFAULT);
static LCID lcidRussian = MAKELCID(MAKELANGID(LANG_RUSSIAN , SUBLANG_DEFAULT), SORT_DEFAULT); static LCID lcidRussian = MAKELCID(MAKELANGID(LANG_RUSSIAN , SUBLANG_DEFAULT), SORT_DEFAULT);
static BOOL s_bIsVistaPlus; static BOOL s_bIs8Plus;
static BOOL IsCJKCodePage(void) static BOOL IsCJKCodePage(void)
{ {
@ -411,7 +411,7 @@ static void test_cp932(HANDLE hConOut)
c.X = c.Y = 0; c.X = c.Y = 0;
ret = FillConsoleOutputCharacterW(hConOut, ideograph_space, csbi.dwSize.X * csbi.dwSize.Y, c, &len); ret = FillConsoleOutputCharacterW(hConOut, ideograph_space, csbi.dwSize.X * csbi.dwSize.Y, c, &len);
ok(ret, "FillConsoleOutputCharacterW failed\n"); ok(ret, "FillConsoleOutputCharacterW failed\n");
if (s_bIsVistaPlus) if (s_bIs8Plus)
ok(len == csbi.dwSize.X * csbi.dwSize.Y / 2, "len was: %ld\n", len); ok(len == csbi.dwSize.X * csbi.dwSize.Y / 2, "len was: %ld\n", len);
else else
ok(len == csbi.dwSize.X * csbi.dwSize.Y, "len was: %ld\n", len); ok(len == csbi.dwSize.X * csbi.dwSize.Y, "len was: %ld\n", len);
@ -454,7 +454,7 @@ static void test_cp932(HANDLE hConOut)
c.X = c.Y = 0; c.X = c.Y = 0;
ret = ReadConsoleOutputCharacterW(hConOut, str, 3 * sizeof(WCHAR), c, &len); ret = ReadConsoleOutputCharacterW(hConOut, str, 3 * sizeof(WCHAR), c, &len);
ok(ret, "ReadConsoleOutputCharacterW failed\n"); ok(ret, "ReadConsoleOutputCharacterW failed\n");
if (s_bIsVistaPlus) if (s_bIs8Plus)
{ {
ok(len == 3, "len was: %ld\n", len); ok(len == 3, "len was: %ld\n", len);
ok(str[0] == 0x3000, "str[0] was: 0x%04X\n", str[0]); ok(str[0] == 0x3000, "str[0] was: 0x%04X\n", str[0]);
@ -479,8 +479,10 @@ START_TEST(ConsoleCP)
HANDLE hConIn, hConOut; HANDLE hConIn, hConOut;
OSVERSIONINFOA osver = { sizeof(osver) }; OSVERSIONINFOA osver = { sizeof(osver) };
// https://github.com/reactos/reactos/pull/2131#issuecomment-563189380
GetVersionExA(&osver); GetVersionExA(&osver);
s_bIsVistaPlus = (osver.dwMajorVersion >= 6); s_bIs8Plus = (osver.dwMajorVersion > 6) ||
(osver.dwMajorVersion == 6 && osver.dwMinorVersion >= 2);
FreeConsole(); FreeConsole();
ok(AllocConsole(), "Couldn't alloc console\n"); ok(AllocConsole(), "Couldn't alloc console\n");

14
win32ss/user/rtl/text.c
View file

@ -1263,18 +1263,8 @@ INT WINAPI DrawTextExWorker( HDC hdc,
if (flags & DT_SINGLELINE) if (flags & DT_SINGLELINE)
{ {
#ifdef __REACTOS__ #ifdef __REACTOS__
if (flags & DT_VCENTER) if (flags & DT_VCENTER) y = rect->top +
{ (rect->bottom - rect->top + (invert_y ? size.cy : -size.cy)) / 2;
if (flags & DT_CALCRECT)
{
if (rect->bottom - rect->top < size.cy / 2)
y = rect->top + (invert_y ? size.cy : -size.cy) / 2;
}
else
{
y = rect->top + (rect->bottom - rect->top + (invert_y ? size.cy : -size.cy)) / 2;
}
}
else if (flags & DT_BOTTOM) else if (flags & DT_BOTTOM)
y = rect->bottom + (invert_y ? 0 : -size.cy); y = rect->bottom + (invert_y ? 0 : -size.cy);
#else #else