January 2021 - Wine-Devel - list.winehq.org

[v2 PATCH] ntdll/tests: Remove skips on missing ntdll.dll.
by Nikolay Sivov Jan. 20, 2021

Jan. 20, 2021

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- v2: rebased dlls/ntdll/tests/change.c | 5 ----- dlls/ntdll/tests/path.c | 5 ----- 2 files changed, 10 deletions(-) diff --git a/dlls/ntdll/tests/change.c b/dlls/ntdll/tests/change.c index 0e76fb5635a..1e643fc3eee 100644 --- a/dlls/ntdll/tests/change.c +++ b/dlls/ntdll/tests/change.c @@ -313,11 +313,6 @@ static void test_ntncdf_async(void) START_TEST(change) { HMODULE hntdll = GetModuleHandleA("ntdll"); - if (!hntdll) - { - win_skip("not running on NT, skipping test\n"); - return; - } pNtNotifyChangeDirectoryFile = (void *)GetProcAddress(hntdll, "NtNotifyChangeDirectoryFile"); pNtCancelIoFile = (void *)GetProcAddress(hntdll, "NtCancelIoFile"); diff --git a/dlls/ntdll/tests/path.c b/dlls/ntdll/tests/path.c index e4adc992a28..a91038bab7b 100644 --- a/dlls/ntdll/tests/path.c +++ b/dlls/ntdll/tests/path.c @@ -603,11 +603,6 @@ static void test_RtlDosPathNameToNtPathName_U(void) START_TEST(path) { HMODULE mod = GetModuleHandleA("ntdll.dll"); - if (!mod) - { - win_skip("Not running on NT, skipping tests\n"); - return; - } pRtlMultiByteToUnicodeN = (void *)GetProcAddress(mod,"RtlMultiByteToUnicodeN"); pRtlUnicodeToMultiByteN = (void *)GetProcAddress(mod,"RtlUnicodeToMultiByteN"); -- 2.29.2

1 0

[PATCH 1/3] gdi32/uniscribe: Merge Arabic joining types C and D.
by Nikolay Sivov Jan. 20, 2021

Jan. 20, 2021

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- Types C and D are not distinguished by current implementation, HarfBuzz does the same with them. The point of values reassignment is to match values used in HarfBuzz, making it easier to reuse state handling logic. dlls/gdi32/uniscribe/shape.c | 21 ++- dlls/gdi32/uniscribe/shaping.c | 314 ++++++++++++++++----------------- tools/make_unicode | 14 +- 3 files changed, 177 insertions(+), 172 deletions(-) diff --git a/dlls/gdi32/uniscribe/shape.c b/dlls/gdi32/uniscribe/shape.c index 96e2ffce014..843d670f1e9 100644 --- a/dlls/gdi32/uniscribe/shape.c +++ b/dlls/gdi32/uniscribe/shape.c @@ -89,13 +89,16 @@ extern const unsigned short indic_syllabic_table[] DECLSPEC_HIDDEN; extern const unsigned short wine_shaping_table[] DECLSPEC_HIDDEN; extern const unsigned short wine_shaping_forms[LAST_ARABIC_CHAR - FIRST_ARABIC_CHAR + 1][4] DECLSPEC_HIDDEN; -enum joining_types { - jtU, - jtT, - jtR, - jtL, - jtD, - jtC +enum joining_types +{ + jtU = 0, + jtL = 1, + jtR = 2, + jtD = 3, + jtC = jtD, + jgALAPH = 4, + jgDALATH_RISH = 5, + jtT = 6, }; enum joined_forms { @@ -988,12 +991,12 @@ static CHAR neighbour_joining_type(int i, int delta, const CHAR* context_type, I static inline BOOL right_join_causing(CHAR joining_type) { - return (joining_type == jtL || joining_type == jtD || joining_type == jtC); + return joining_type == jtL || joining_type == jtD; } static inline BOOL left_join_causing(CHAR joining_type) { - return (joining_type == jtR || joining_type == jtD || joining_type == jtC); + return joining_type == jtR || joining_type == jtD; } static inline BOOL word_break_causing(WCHAR chr) diff --git a/dlls/gdi32/uniscribe/shaping.c b/dlls/gdi32/uniscribe/shaping.c index e6a9ea39979..9779eb606d2 100644 --- a/dlls/gdi32/uniscribe/shaping.c +++ b/dlls/gdi32/uniscribe/shaping.c @@ -110,175 +110,175 @@ const unsigned short DECLSPEC_HIDDEN wine_shaping_table[2161] = /* values */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0001, 0x0000, 0x0000, 0x0001, 0x0001, 0x0001, 0x0001, 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, 0x0000, 0x0000, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, - 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, - 0x0001, 0x0000, 0x0001, 0x0001, 0x0000, 0x0001, 0x0001, 0x0000, - 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, - 0x0001, 0x0001, 0x0001, 0x0001, 0x0000, 0x0001, 0x0000, 0x0000, - 0x0000, 0x0104, 0x0000, 0x0202, 0x0202, 0x0302, 0x0202, 0x0104, - 0x0202, 0x0404, 0x0502, 0x0404, 0x0404, 0x0604, 0x0604, 0x0604, - 0x0702, 0x0802, 0x0802, 0x0904, 0x0904, 0x0a04, 0x0a04, 0x0b04, - 0x0b04, 0x0c04, 0x0c04, 0x0d04, 0x0d04, 0x0e04, 0x0e04, 0x0e04, - 0x0005, 0x0f04, 0x1004, 0x1104, 0x1204, 0x1304, 0x1404, 0x1504, - 0x0302, 0x0104, 0x0104, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0006, 0x0000, 0x0000, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, + 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, + 0x0006, 0x0006, 0x0006, 0x0000, 0x0000, 0x0000, 0x0006, 0x0006, + 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, + 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, + 0x0006, 0x0000, 0x0006, 0x0006, 0x0000, 0x0006, 0x0006, 0x0000, + 0x0006, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, + 0x0006, 0x0006, 0x0006, 0x0006, 0x0000, 0x0006, 0x0000, 0x0000, + 0x0000, 0x0103, 0x0000, 0x0202, 0x0202, 0x0302, 0x0202, 0x0103, + 0x0202, 0x0403, 0x0502, 0x0403, 0x0403, 0x0603, 0x0603, 0x0603, + 0x0702, 0x0802, 0x0802, 0x0903, 0x0903, 0x0a03, 0x0a03, 0x0b03, + 0x0b03, 0x0c03, 0x0c03, 0x0d03, 0x0d03, 0x0e03, 0x0e03, 0x0e03, + 0x0003, 0x0f03, 0x1003, 0x1103, 0x1203, 0x1303, 0x1403, 0x1503, + 0x0302, 0x0103, 0x0103, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0404, 0x1004, - 0x0001, 0x0202, 0x0202, 0x0202, 0x0000, 0x0202, 0x0302, 0x0302, - 0x0104, 0x0404, 0x0404, 0x0404, 0x0404, 0x0404, 0x0404, 0x0404, - 0x0604, 0x0604, 0x0604, 0x0604, 0x0604, 0x0604, 0x0604, 0x0702, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0403, 0x1003, + 0x0006, 0x0202, 0x0202, 0x0202, 0x0000, 0x0202, 0x0302, 0x0302, + 0x0103, 0x0403, 0x0403, 0x0403, 0x0403, 0x0403, 0x0403, 0x0403, + 0x0603, 0x0603, 0x0603, 0x0603, 0x0603, 0x0603, 0x0603, 0x0702, 0x0702, 0x0702, 0x0702, 0x0702, 0x0702, 0x0702, 0x0702, 0x0802, 0x0802, 0x0802, 0x0802, 0x0802, 0x0802, 0x0802, 0x0802, 0x0802, - 0x0904, 0x0904, 0x0904, 0x0a04, 0x0a04, 0x0b04, 0x0c04, 0x0f04, - 0x0f04, 0x0f04, 0x0f04, 0x0f04, 0x0f04, 0x1004, 0x1004, 0x0d04, - 0x1604, 0x0d04, 0x1104, 0x1104, 0x1104, 0x0d04, 0x0d04, 0x0d04, - 0x0d04, 0x0d04, 0x1204, 0x1204, 0x1204, 0x1204, 0x1404, 0x1404, - 0x1404, 0x1404, 0x1704, 0x1804, 0x0604, 0x0502, 0x1504, 0x1504, + 0x0903, 0x0903, 0x0903, 0x0a03, 0x0a03, 0x0b03, 0x0c03, 0x0f03, + 0x0f03, 0x0f03, 0x0f03, 0x0f03, 0x0f03, 0x1003, 0x1003, 0x0d03, + 0x1603, 0x0d03, 0x1103, 0x1103, 0x1103, 0x0d03, 0x0d03, 0x0d03, + 0x0d03, 0x0d03, 0x1203, 0x1203, 0x1203, 0x1203, 0x1403, 0x1403, + 0x1403, 0x1403, 0x1703, 0x1803, 0x0603, 0x0502, 0x1503, 0x1503, 0x0502, 0x0302, 0x0302, 0x0302, 0x0302, 0x0302, 0x0302, 0x0302, - 0x0302, 0x0e04, 0x0102, 0x0e04, 0x0302, 0x0104, 0x0104, 0x0102, - 0x0102, 0x0000, 0x0502, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, - 0x0001, 0x0001, 0x0000, 0x0000, 0x0001, 0x0001, 0x0000, 0x0001, - 0x0001, 0x0001, 0x0001, 0x0702, 0x0802, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0904, - 0x0a04, 0x0c04, 0x0000, 0x0000, 0x1804, 0x1902, 0x0001, 0x1a04, - 0x1b04, 0x1b04, 0x1c02, 0x1c02, 0x1d02, 0x1e02, 0x1f02, 0x2004, - 0x2104, 0x2104, 0x2204, 0x2202, 0x2304, 0x2404, 0x2504, 0x2604, - 0x2704, 0x2804, 0x2904, 0x2a04, 0x2b04, 0x2c02, 0x2d04, 0x1c02, - 0x2e04, 0x2f02, 0x1a04, 0x1b04, 0x1c02, 0x0001, 0x0001, 0x0001, - 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, - 0x0000, 0x0000, 0x3002, 0x3104, 0x3204, 0x0404, 0x0404, 0x0404, - 0x0404, 0x0404, 0x0404, 0x0404, 0x0604, 0x0604, 0x0702, 0x0702, - 0x0802, 0x0904, 0x0c04, 0x0c04, 0x0c04, 0x0f04, 0x0f04, 0x0d04, - 0x0d04, 0x0d04, 0x1304, 0x1304, 0x1404, 0x1404, 0x1404, 0x1204, - 0x0802, 0x0802, 0x0904, 0x0604, 0x0604, 0x0904, 0x0802, 0x0604, - 0x0202, 0x0202, 0x0e04, 0x0e04, 0x0104, 0x0302, 0x0302, 0x3304, - 0x3304, 0x0604, 0x0904, 0x0904, 0x1104, 0x0001, 0x0000, 0x0000, + 0x0302, 0x0e03, 0x0102, 0x0e03, 0x0302, 0x0103, 0x0103, 0x0102, + 0x0102, 0x0000, 0x0502, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, + 0x0006, 0x0006, 0x0000, 0x0000, 0x0006, 0x0006, 0x0000, 0x0006, + 0x0006, 0x0006, 0x0006, 0x0702, 0x0802, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0903, + 0x0a03, 0x0c03, 0x0000, 0x0000, 0x1803, 0x1902, 0x0006, 0x1a03, + 0x1b03, 0x1b03, 0x1c02, 0x1c02, 0x1d02, 0x1e02, 0x1f02, 0x2003, + 0x2103, 0x2103, 0x2203, 0x2202, 0x2303, 0x2403, 0x2503, 0x2603, + 0x2703, 0x2803, 0x2903, 0x2a03, 0x2b03, 0x2c02, 0x2d03, 0x1c02, + 0x2e03, 0x2f02, 0x1a03, 0x1b03, 0x1c02, 0x0006, 0x0006, 0x0006, + 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, + 0x0000, 0x0000, 0x3002, 0x3103, 0x3203, 0x0403, 0x0403, 0x0403, + 0x0403, 0x0403, 0x0403, 0x0403, 0x0603, 0x0603, 0x0702, 0x0702, + 0x0802, 0x0903, 0x0c03, 0x0c03, 0x0c03, 0x0f03, 0x0f03, 0x0d03, + 0x0d03, 0x0d03, 0x1303, 0x1303, 0x1403, 0x1403, 0x1403, 0x1203, + 0x0802, 0x0802, 0x0903, 0x0603, 0x0603, 0x0903, 0x0802, 0x0603, + 0x0202, 0x0202, 0x0e03, 0x0e03, 0x0103, 0x0302, 0x0302, 0x3303, + 0x3303, 0x0603, 0x0903, 0x0903, 0x1103, 0x0006, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0004, 0x0004, 0x0004, - 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, - 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0001, 0x0001, 0x0001, - 0x0001, 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0005, 0x0000, 0x0000, 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0001, 0x0001, 0x0001, 0x0001, 0x0000, 0x0001, - 0x0001, 0x0001, 0x0001, 0x0001, 0x0000, 0x0001, 0x0001, 0x0001, - 0x0000, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0000, 0x0000, - 0x0002, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0002, 0x0002, - 0x0004, 0x0002, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, - 0x0002, 0x0004, 0x0002, 0x0002, 0x0002, 0x0001, 0x0001, 0x0001, - 0x0000, 0x0000, 0x0000, 0x0000, 0x3404, 0x3400, 0x3404, 0x3404, - 0x3404, 0x3404, 0x3400, 0x3402, 0x3404, 0x3402, 0x3402, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0404, 0x0404, 0x0604, 0x0b04, - 0x0f04, 0x1004, 0x1204, 0x1304, 0x0104, 0x0104, 0x0802, 0x0302, - 0x3502, 0x0000, 0x0702, 0x0a04, 0x0d04, 0x3602, 0x0802, 0x0c04, - 0x1104, 0x0000, 0x0404, 0x0404, 0x0404, 0x0802, 0x0104, 0x3704, - 0x3704, 0x3704, 0x0404, 0x0404, 0x0604, 0x0d04, 0x0c04, 0x3704, - 0x0604, 0x0604, 0x1204, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0001, 0x0001, 0x0000, 0x0001, 0x0001, - 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, - 0x0001, 0x0001, 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, 0x0000, 0x0001, - 0x0000, 0x0000, 0x0000, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, - 0x0001, 0x0001, 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, - 0x0000, 0x0000, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, - 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0001, 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0003, 0x0003, 0x0003, + 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, + 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0006, 0x0006, 0x0006, + 0x0006, 0x0006, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0003, 0x0000, 0x0000, 0x0006, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0006, 0x0006, 0x0006, 0x0006, 0x0000, 0x0006, + 0x0006, 0x0006, 0x0006, 0x0006, 0x0000, 0x0006, 0x0006, 0x0006, + 0x0000, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0000, 0x0000, + 0x0002, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0002, 0x0002, + 0x0003, 0x0002, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, + 0x0002, 0x0003, 0x0002, 0x0002, 0x0002, 0x0006, 0x0006, 0x0006, + 0x0000, 0x0000, 0x0000, 0x0000, 0x3403, 0x3400, 0x3403, 0x3403, + 0x3403, 0x3403, 0x3400, 0x3402, 0x3403, 0x3402, 0x3402, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0403, 0x0403, 0x0603, 0x0b03, + 0x0f03, 0x1003, 0x1203, 0x1303, 0x0103, 0x0103, 0x0802, 0x0302, + 0x3502, 0x0000, 0x0702, 0x0a03, 0x0d03, 0x3602, 0x0802, 0x0c03, + 0x1103, 0x0000, 0x0403, 0x0403, 0x0403, 0x0802, 0x0103, 0x3703, + 0x3703, 0x3703, 0x0403, 0x0403, 0x0603, 0x0d03, 0x0c03, 0x3703, + 0x0603, 0x0603, 0x1203, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0006, 0x0006, 0x0000, 0x0006, 0x0006, + 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, + 0x0006, 0x0006, 0x0006, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0006, 0x0000, 0x0006, + 0x0000, 0x0000, 0x0000, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, + 0x0006, 0x0006, 0x0006, 0x0000, 0x0000, 0x0000, 0x0000, 0x0006, + 0x0000, 0x0000, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, + 0x0006, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0006, 0x0006, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0006, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, 0x0001, - 0x0001, 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0001, 0x0000, 0x0000, 0x0001, 0x0001, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0006, 0x0006, + 0x0006, 0x0006, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0006, 0x0000, 0x0000, 0x0006, 0x0006, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, 0x0001, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0001, 0x0001, 0x0000, 0x0000, 0x0001, 0x0001, - 0x0001, 0x0000, 0x0000, 0x0000, 0x0001, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, - 0x0001, 0x0001, 0x0001, 0x0001, 0x0000, 0x0001, 0x0001, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, 0x0001, - 0x0001, 0x0001, 0x0001, 0x0001, 0x0000, 0x0000, 0x0000, 0x0001, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0006, 0x0006, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0006, 0x0006, 0x0000, 0x0000, 0x0006, 0x0006, + 0x0006, 0x0000, 0x0000, 0x0000, 0x0006, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0006, + 0x0006, 0x0006, 0x0006, 0x0006, 0x0000, 0x0006, 0x0006, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0006, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0006, 0x0006, + 0x0006, 0x0006, 0x0006, 0x0006, 0x0000, 0x0000, 0x0000, 0x0006, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0001, 0x0001, 0x0001, 0x0000, 0x0001, 0x0001, 0x0001, - 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, 0x0001, 0x0000, - 0x0000, 0x0001, 0x0001, 0x0001, 0x0000, 0x0001, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, - 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0000, - 0x0001, 0x0000, 0x0000, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, - 0x0001, 0x0001, 0x0001, 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, 0x0001, 0x0001, 0x0001, - 0x0001, 0x0000, 0x0001, 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, - 0x0001, 0x0000, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, - 0x0001, 0x0000, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, - 0x0000, 0x0001, 0x0001, 0x0000, 0x0000, 0x0001, 0x0001, 0x0000, - 0x0001, 0x0001, 0x0001, 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, - 0x0000, 0x0000, 0x0001, 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0001, 0x0000, 0x0000, 0x0001, 0x0001, 0x0001, + 0x0000, 0x0000, 0x0000, 0x0006, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0006, 0x0006, 0x0006, 0x0000, 0x0006, 0x0006, 0x0006, + 0x0006, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0006, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0006, 0x0006, 0x0000, + 0x0000, 0x0006, 0x0006, 0x0006, 0x0000, 0x0006, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0006, + 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0000, + 0x0006, 0x0000, 0x0000, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, + 0x0006, 0x0006, 0x0006, 0x0006, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0006, 0x0000, 0x0006, 0x0000, 0x0006, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0006, 0x0006, 0x0006, 0x0006, + 0x0006, 0x0000, 0x0006, 0x0006, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, + 0x0006, 0x0000, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, + 0x0006, 0x0000, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, + 0x0000, 0x0006, 0x0006, 0x0000, 0x0000, 0x0006, 0x0006, 0x0000, + 0x0006, 0x0006, 0x0006, 0x0006, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0006, + 0x0000, 0x0000, 0x0006, 0x0006, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0006, 0x0000, 0x0000, 0x0006, 0x0006, 0x0006, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0001, 0x0001, 0x0000, 0x0001, 0x0001, - 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0004, 0x0000, - 0x0000, 0x0005, 0x0001, 0x0001, 0x0001, 0x0000, 0x0000, 0x0004, - 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, - 0x0001, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, - 0x0004, 0x0004, 0x0001, 0x0004, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0001, 0x0001, 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0001, 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0001, 0x0001, 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0001, 0x0001, 0x0000, 0x0000, 0x0001, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, 0x0000, 0x0001, - 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0000, 0x0001, - 0x0000, 0x0000, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, - 0x0001, 0x0001, 0x0000, 0x0000, 0x0000, 0x0001, 0x0001, 0x0001, - 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0000, - 0x0000, 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, 0x0000, - 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0000, 0x0001, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0006, 0x0006, 0x0000, 0x0006, 0x0006, + 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0006, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0003, 0x0000, + 0x0000, 0x0003, 0x0006, 0x0006, 0x0006, 0x0000, 0x0000, 0x0003, + 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0006, + 0x0006, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, + 0x0003, 0x0003, 0x0006, 0x0003, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0006, 0x0006, 0x0006, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0006, 0x0006, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0006, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0006, 0x0006, 0x0006, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0006, 0x0006, 0x0000, 0x0000, 0x0006, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0006, 0x0000, 0x0006, + 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0000, 0x0006, + 0x0000, 0x0000, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, + 0x0006, 0x0006, 0x0000, 0x0000, 0x0000, 0x0006, 0x0006, 0x0006, + 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0000, + 0x0000, 0x0006, 0x0000, 0x0000, 0x0000, 0x0000, 0x0006, 0x0000, + 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0000, 0x0006, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0000, - 0x0000, 0x0001, 0x0001, 0x0001, 0x0001, 0x0000, 0x0000, 0x0001, - 0x0001, 0x0000, 0x0001, 0x0001, 0x0001, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0001, 0x0000, 0x0001, 0x0001, 0x0000, - 0x0000, 0x0000, 0x0001, 0x0000, 0x0001, 0x0001, 0x0001, 0x0001, - 0x0000, 0x0000, 0x0001, 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, 0x0001, 0x0001, 0x0000, - 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, - 0x0001, 0x0001, 0x0001, 0x0001, 0x0000, 0x0001, 0x0001, 0x0001, - 0x0001, 0x0001, 0x0001, 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0001, 0x0000, 0x0000, 0x0000, 0x0001, 0x0001, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0000, + 0x0000, 0x0006, 0x0006, 0x0006, 0x0006, 0x0000, 0x0000, 0x0006, + 0x0006, 0x0000, 0x0006, 0x0006, 0x0006, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0006, 0x0000, 0x0006, 0x0006, 0x0000, + 0x0000, 0x0000, 0x0006, 0x0000, 0x0006, 0x0006, 0x0006, 0x0006, + 0x0000, 0x0000, 0x0006, 0x0006, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0006, 0x0006, 0x0006, 0x0000, + 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, + 0x0006, 0x0006, 0x0006, 0x0006, 0x0000, 0x0006, 0x0006, 0x0006, + 0x0006, 0x0006, 0x0006, 0x0006, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0006, 0x0000, 0x0000, 0x0000, 0x0006, 0x0006, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0001, 0x0000, 0x0005, 0x0001, 0x0001, 0x0001, 0x0001, - 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, 0x0001, - 0x0001, 0x0001, 0x0001, 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, 0x0001, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, 0x0001, 0x0001, 0x0000, - 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, - 0x0001, 0x0001, 0x0000, 0x0000, 0x0001, 0x0000, 0x0000, 0x0000, - 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0001, 0x0001, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0001, 0x0000, 0x0000, 0x0000, 0x0004, 0x0004, - 0x0003, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, 0x0001, - 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0000, 0x0000, - 0x0000, 0x0001, 0x0000, 0x0000, 0x0001, 0x0001, 0x0001, 0x0001, - 0x0000, 0x0000, 0x0001, 0x0001, 0x0000, 0x0000, 0x0001, 0x0001, + 0x0000, 0x0006, 0x0000, 0x0003, 0x0006, 0x0006, 0x0006, 0x0006, + 0x0006, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0006, 0x0006, + 0x0006, 0x0006, 0x0006, 0x0006, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0006, 0x0006, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0006, 0x0006, 0x0006, 0x0000, + 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, + 0x0006, 0x0006, 0x0000, 0x0000, 0x0006, 0x0000, 0x0000, 0x0000, + 0x0006, 0x0000, 0x0000, 0x0000, 0x0000, 0x0006, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0006, 0x0006, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0006, 0x0000, 0x0000, 0x0000, 0x0003, 0x0003, + 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0006, 0x0006, + 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0000, 0x0000, + 0x0000, 0x0006, 0x0000, 0x0000, 0x0006, 0x0006, 0x0006, 0x0006, + 0x0000, 0x0000, 0x0006, 0x0006, 0x0000, 0x0000, 0x0006, 0x0006, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0001, 0x0000, 0x0000, 0x0000, 0x0001, 0x0000, - 0x0001, 0x0001, 0x0001, 0x0000, 0x0000, 0x0001, 0x0001, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, 0x0001, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0001, 0x0000, 0x0000, 0x0001, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, 0x0001, 0x0001, + 0x0000, 0x0006, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0006, 0x0000, 0x0000, 0x0000, 0x0006, 0x0000, + 0x0006, 0x0006, 0x0006, 0x0000, 0x0000, 0x0006, 0x0006, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0006, 0x0006, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0006, 0x0000, 0x0000, 0x0006, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0006, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0006, 0x0006, 0x0006, 0x0000, 0x0000, 0x0000, 0x0000 }; diff --git a/tools/make_unicode b/tools/make_unicode index 02bb0afdb66..ace19592a52 100755 --- a/tools/make_unicode +++ b/tools/make_unicode @@ -417,12 +417,14 @@ my %bidi_types = my %joining_types = ( - "U" => 0, # Non_Joining - "T" => 1, # Transparent - "R" => 2, # Right_Joining - "L" => 3, # Left_Joining - "D" => 4, # Dual_Joining - "C" => 5, # Join_Causing + "U" => 0, # Non_Joining + "L" => 1, # Left_Joining + "R" => 2, # Right_Joining + "D" => 3, # Dual_Joining + "C" => 3, # Join_Causing + "ALAPH" => 4, # Syriac ALAPH + "DALATH RISH" => 5, # Syriac DALATH RISH group + "T" => 6, # Transparent ); my @cp2uni = (); -- 2.29.2

1 2

[PATCH] ntdll/tests: Remove skips on missing ntdll.dll.
by Nikolay Sivov Jan. 20, 2021

Jan. 20, 2021

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/ntdll/tests/change.c | 5 ----- dlls/ntdll/tests/path.c | 5 ----- 2 files changed, 10 deletions(-) diff --git a/dlls/ntdll/tests/change.c b/dlls/ntdll/tests/change.c index 0e76fb5635a..1e643fc3eee 100644 --- a/dlls/ntdll/tests/change.c +++ b/dlls/ntdll/tests/change.c @@ -313,11 +313,6 @@ static void test_ntncdf_async(void) START_TEST(change) { HMODULE hntdll = GetModuleHandleA("ntdll"); - if (!hntdll) - { - win_skip("not running on NT, skipping test\n"); - return; - } pNtNotifyChangeDirectoryFile = (void *)GetProcAddress(hntdll, "NtNotifyChangeDirectoryFile"); pNtCancelIoFile = (void *)GetProcAddress(hntdll, "NtCancelIoFile"); diff --git a/dlls/ntdll/tests/path.c b/dlls/ntdll/tests/path.c index 42f9d796379..5621e9a4f83 100644 --- a/dlls/ntdll/tests/path.c +++ b/dlls/ntdll/tests/path.c @@ -601,11 +601,6 @@ static void test_RtlDosPathNameToNtPathName_U(void) START_TEST(path) { HMODULE mod = GetModuleHandleA("ntdll.dll"); - if (!mod) - { - win_skip("Not running on NT, skipping tests\n"); - return; - } pRtlUnicodeToMultiByteN = (void *)GetProcAddress(mod,"RtlUnicodeToMultiByteN"); pRtlDetermineDosPathNameType_U = (void *)GetProcAddress(mod,"RtlDetermineDosPathNameType_U"); -- 2.29.2

2 1

[PATCH v2 1/4] winmm/tests: Expect TIME_BYTES format for requesting TIME_MS.
by Akihiro Sagawa Jan. 20, 2021

Jan. 20, 2021

In v2, Update conformance tests to avoid redundant position tests which occasionally fail on some VMs. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/winmm/tests/wave.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-)

3 3

[PATCH] gdi32: Preserve the GGO_UNHINTED bits until used.
by Byeongsik Jeon Jan. 20, 2021

Jan. 20, 2021

1. Fixes a regression caused by 044315c0b3890676d9fd751d8191b0b7381e0b97. GGO_UNHINTED bit is used by freetype.c::get_load_flags(). 2. The pre-044315c0b38 code get/set the metrics cache, regardless of whether GGO_UNHINTED bit is turned on. The problem must be corrected because the metrics vary depending on the GGO_UNHINTED on/off. Since the structural change of 044315c0b38, this possibility is excluded naturally by this patch. Signed-off-by: Byeongsik Jeon <bsjeon(a)hanmail.net> --- dlls/gdi32/font.c | 3 +-- dlls/gdi32/freetype.c | 2 ++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 7f243192cc3..e1b26a8ee4d 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -2955,6 +2955,7 @@ static DWORD get_glyph_outline( struct gdi_font *font, UINT glyph, UINT format, /* Windows bitmap font, e.g. Small Fonts, uses ANSI character code as glyph index. "Treasure Adventure Game" depends on this. */ font_funcs->get_glyph_index( font, &index, FALSE ); + format &= ~GGO_GLYPH_INDEX; /* TODO: Window also turns off tategaki for glyphs passed in by index if their unicode code points fall outside of the range that is rotated. */ @@ -2970,8 +2971,6 @@ static DWORD get_glyph_outline( struct gdi_font *font, UINT glyph, UINT format, } } - format &= ~(GGO_GLYPH_INDEX | GGO_UNHINTED); - if (mat && !memcmp( mat, &identity, sizeof(*mat) )) mat = NULL; if (format == GGO_METRICS && !mat && get_gdi_font_glyph_metrics( font, index, &gm, &abc )) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index fffa3288503..b3fc565afe8 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -3515,6 +3515,8 @@ static DWORD CDECL freetype_get_glyph_outline( struct gdi_font *font, UINT glyph font->matrix.eM11, font->matrix.eM12, font->matrix.eM21, font->matrix.eM22); + format &= ~GGO_UNHINTED; + needsTransform = get_transform_matrices( font, tategaki, lpmat, matrices ); vertical_metrics = (tategaki && FT_HAS_VERTICAL(ft_face)); -- 2.30.0

2 1

[PATCH 1/2] gdi32: Avoid best fit chars when mapping unicode character to a glyph index.
by Dmitry Timoshkov Jan. 20, 2021

Jan. 20, 2021

This part fixes GetGlyphIndices. This is a resend, the patch was deferred due to code freeze. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/gdi32/font.c | 2 +- dlls/gdi32/tests/font.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 6f50cc92a8..6a18d568cf 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -3219,7 +3219,7 @@ static DWORD CDECL font_GetGlyphIndices( PHYSDEV dev, const WCHAR *str, INT coun if (str[i] >= 0xf020 && str[i] <= 0xf100) glyph = str[i] - 0xf000; else if (str[i] < 0x100) glyph = str[i]; } - else if (WideCharToMultiByte( physdev->font->codepage, 0, &str[i], 1, + else if (WideCharToMultiByte( physdev->font->codepage, WC_NO_BEST_FIT_CHARS, &str[i], 1, &ch, 1, NULL, &used ) && !used) glyph = (unsigned char)ch; } diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index da5fdf2238..461eecf803 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -1688,14 +1688,12 @@ static void test_GetGlyphIndices(void) charcount = GetGlyphIndicesW(hdc, c, ARRAY_SIZE(c), glyphs, GGI_MARK_NONEXISTING_GLYPHS); ok(charcount == ARRAY_SIZE(c), "got %u\n", charcount); ok(glyphs[0] == 0x001f || glyphs[0] == 0xffff /* Vista */, "got %#x\n", glyphs[0]); -todo_wine ok(glyphs[1] == 0x001f || glyphs[1] == 0xffff /* Vista */, "got %#x\n", glyphs[1]); glyphs[0] = glyphs[1] = 0; charcount = GetGlyphIndicesW(hdc, c, ARRAY_SIZE(c), glyphs, 0); ok(charcount == ARRAY_SIZE(c), "got %u\n", charcount); ok(glyphs[0] == textm.tmDefaultChar || glyphs[0] == 0x20 /* CJK Windows */, "got %#x\n", glyphs[0]); -todo_wine ok(glyphs[1] == textm.tmDefaultChar || glyphs[1] == 0x20 /* CJK Windows */, "got %#x\n", glyphs[1]); DeleteObject(SelectObject(hdc, hOldFont)); -- 2.29.2

2 1

[PATCH v2] gdi32: Avoid best fit chars when mapping unicode character to a glyph index.
by Huw Davies Jan. 20, 2021

Jan. 20, 2021

From: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdi32/font.c | 6 +++--- dlls/gdi32/tests/font.c | 2 -- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index badf9c5a6d0..74ca4825de4 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -2906,11 +2906,11 @@ static UINT get_glyph_index( struct gdi_font *font, UINT glyph ) glyph = get_glyph_index_symbol( font, wc ); if (!glyph) { - if (WideCharToMultiByte( CP_ACP, 0, &wc, 1, &ch, 1, NULL, NULL )) + if (WideCharToMultiByte( CP_ACP, WC_NO_BEST_FIT_CHARS, &wc, 1, &ch, 1, NULL, NULL )) glyph = get_glyph_index_symbol( font, (unsigned char)ch ); } } - else if (WideCharToMultiByte( font->codepage, 0, &wc, 1, &ch, 1, NULL, &used ) && !used) + else if (WideCharToMultiByte( font->codepage, WC_NO_BEST_FIT_CHARS, &wc, 1, &ch, 1, NULL, &used ) && !used) { glyph = (unsigned char)ch; font_funcs->get_glyph_index( font, &glyph, FALSE ); @@ -3218,7 +3218,7 @@ static DWORD CDECL font_GetGlyphIndices( PHYSDEV dev, const WCHAR *str, INT coun if (str[i] >= 0xf020 && str[i] <= 0xf100) glyph = str[i] - 0xf000; else if (str[i] < 0x100) glyph = str[i]; } - else if (WideCharToMultiByte( physdev->font->codepage, 0, &str[i], 1, + else if (WideCharToMultiByte( physdev->font->codepage, WC_NO_BEST_FIT_CHARS, &str[i], 1, &ch, 1, NULL, &used ) && !used) glyph = (unsigned char)ch; } diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index da5fdf2238e..461eecf8038 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -1688,14 +1688,12 @@ static void test_GetGlyphIndices(void) charcount = GetGlyphIndicesW(hdc, c, ARRAY_SIZE(c), glyphs, GGI_MARK_NONEXISTING_GLYPHS); ok(charcount == ARRAY_SIZE(c), "got %u\n", charcount); ok(glyphs[0] == 0x001f || glyphs[0] == 0xffff /* Vista */, "got %#x\n", glyphs[0]); -todo_wine ok(glyphs[1] == 0x001f || glyphs[1] == 0xffff /* Vista */, "got %#x\n", glyphs[1]); glyphs[0] = glyphs[1] = 0; charcount = GetGlyphIndicesW(hdc, c, ARRAY_SIZE(c), glyphs, 0); ok(charcount == ARRAY_SIZE(c), "got %u\n", charcount); ok(glyphs[0] == textm.tmDefaultChar || glyphs[0] == 0x20 /* CJK Windows */, "got %#x\n", glyphs[0]); -todo_wine ok(glyphs[1] == textm.tmDefaultChar || glyphs[1] == 0x20 /* CJK Windows */, "got %#x\n", glyphs[1]); DeleteObject(SelectObject(hdc, hOldFont)); -- 2.23.0

1 0

[PATCH 2/2] wbemprox: Flesh out a bit SystemRestore::Enable() implementation.
by Hans Leidekker Jan. 20, 2021

Jan. 20, 2021

From: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/wbemprox/sysrestore.c | 48 +++++++++++++++++++++++++++++++++++-- dlls/wbemprox/tests/query.c | 2 +- 2 files changed, 47 insertions(+), 3 deletions(-) diff --git a/dlls/wbemprox/sysrestore.c b/dlls/wbemprox/sysrestore.c index b840d220b5c..d59077381fb 100644 --- a/dlls/wbemprox/sysrestore.c +++ b/dlls/wbemprox/sysrestore.c @@ -45,8 +45,52 @@ HRESULT disable_restore( IWbemClassObject *obj, IWbemClassObject *in, IWbemClass HRESULT enable_restore( IWbemClassObject *obj, IWbemClassObject *in, IWbemClassObject **out ) { - FIXME("stub\n"); - return S_OK; + VARIANT drive, retval; + IWbemClassObject *sig, *out_params = NULL; + HRESULT hr; + + TRACE("%p, %p\n", in, out); + + hr = IWbemClassObject_Get( in, L"Drive", 0, &drive, NULL, NULL ); + if (hr != S_OK) return hr; + + hr = create_signature( L"SystemRestore", L"Enable", PARAM_OUT, &sig ); + if (hr != S_OK) + { + VariantClear( &drive ); + return hr; + } + + if (out) + { + hr = IWbemClassObject_SpawnInstance( sig, 0, &out_params ); + if (hr != S_OK) + { + VariantClear( &drive ); + IWbemClassObject_Release( sig ); + return hr; + } + } + + FIXME("%s: stub\n", wine_dbgstr_variant(&drive)); + + VariantClear( &drive ); + IWbemClassObject_Release( sig ); + + if (out_params) + { + set_variant( VT_UI4, ERROR_SUCCESS, NULL, &retval ); + hr = IWbemClassObject_Put( out_params, L"ReturnValue", 0, &retval, CIM_UINT32 ); + } + + if (hr == S_OK && out) + { + *out = out_params; + IWbemClassObject_AddRef( out_params ); + } + if (out_params) IWbemClassObject_Release( out_params ); + + return hr; } HRESULT get_last_restore_status( IWbemClassObject *obj, IWbemClassObject *in, IWbemClassObject **out ) diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 1c7a615dd4e..67c0b218ce1 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1805,7 +1805,7 @@ static void test_SystemRestore( IWbemServices *services ) out = NULL; hr = IWbemServices_ExecMethod( services, class, method, 0, NULL, in, &out, NULL ); ok( hr == S_OK || hr == WBEM_E_ACCESS_DENIED, "failed to execute method %08x\n", hr ); - if (hr == S_OK && out) + if (hr == S_OK) { VariantInit( &var ); hr = IWbemClassObject_Get( out, L"ReturnValue", 0, &var, NULL, NULL ); -- 2.29.2

1 0

[PATCH 1/2] wbemprox: Add class SystemRestore stub implementation.
by Hans Leidekker Jan. 20, 2021

Jan. 20, 2021

From: Dmitry Timoshkov <dmitry(a)baikal.ru> v2: Spelling fix. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50033 Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/wbemprox/Makefile.in | 1 + dlls/wbemprox/builtin.c | 38 ++++++++++++++++++++ dlls/wbemprox/sysrestore.c | 62 ++++++++++++++++++++++++++++++++ dlls/wbemprox/tests/query.c | 7 ++-- dlls/wbemprox/wbemprox_private.h | 5 +++ 5 files changed, 111 insertions(+), 2 deletions(-) create mode 100644 dlls/wbemprox/sysrestore.c diff --git a/dlls/wbemprox/Makefile.in b/dlls/wbemprox/Makefile.in index a26c833878f..ed2710f8855 100644 --- a/dlls/wbemprox/Makefile.in +++ b/dlls/wbemprox/Makefile.in @@ -14,6 +14,7 @@ C_SRCS = \ security.c \ service.c \ services.c \ + sysrestore.c \ table.c \ wbemlocator.c diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 9bd58ca77e6..39166a21171 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -406,6 +406,20 @@ static const struct column col_systemsecurity[] = { L"GetSD", CIM_FLAG_ARRAY|COL_FLAG_METHOD }, { L"SetSD", CIM_FLAG_ARRAY|COL_FLAG_METHOD }, }; +static const struct column col_sysrestore[] = +{ + { L"CreationTime", CIM_STRING }, + { L"Description", CIM_STRING }, + { L"EventType", CIM_UINT32 }, + { L"RestorePointType", CIM_UINT32 }, + { L"SequenceNumber", CIM_UINT32 }, + /* methods */ + { L"CreateRestorePoint", CIM_FLAG_ARRAY|COL_FLAG_METHOD }, + { L"Disable", CIM_FLAG_ARRAY|COL_FLAG_METHOD }, + { L"Enable", CIM_FLAG_ARRAY|COL_FLAG_METHOD }, + { L"GetLastRestoreStatus", CIM_FLAG_ARRAY|COL_FLAG_METHOD }, + { L"Restore", CIM_FLAG_ARRAY|COL_FLAG_METHOD }, +}; static const struct column col_videocontroller[] = { { L"AdapterCompatibility", CIM_STRING }, @@ -783,6 +797,19 @@ struct record_stdregprov class_method *enumvalues; class_method *getstringvalue; }; +struct record_sysrestore +{ + const WCHAR *creation_time; + const WCHAR *description; + UINT32 event_type; + UINT32 restore_point_type; + UINT32 sequence_number; + class_method *create_restore_point; + class_method *disable_restore; + class_method *enable_restore; + class_method *get_last_restore_status; + class_method *restore; +}; struct record_systemsecurity { class_method *getsd; @@ -865,6 +892,10 @@ static const struct record_param data_param[] = { L"StdRegProv", L"GetStringValue", 1, L"sValueName", CIM_STRING }, { L"StdRegProv", L"GetStringValue", -1, L"ReturnValue", CIM_UINT32 }, { L"StdRegProv", L"GetStringValue", -1, L"sValue", CIM_STRING }, + { L"SystemRestore", L"Disable", 1, L"Drive", CIM_STRING }, + { L"SystemRestore", L"Disable", -1, L"ReturnValue", CIM_UINT32 }, + { L"SystemRestore", L"Enable", 1, L"Drive", CIM_STRING }, + { L"SystemRestore", L"Enable", -1, L"ReturnValue", CIM_UINT32 }, { L"Win32_Process", L"GetOwner", -1, L"ReturnValue", CIM_UINT32 }, { L"Win32_Process", L"GetOwner", -1, L"User", CIM_STRING }, { L"Win32_Process", L"GetOwner", -1, L"Domain", CIM_STRING }, @@ -895,6 +926,12 @@ static const struct record_stdregprov data_stdregprov[] = { { reg_create_key, reg_enum_key, reg_enum_values, reg_get_stringvalue } }; + +static const struct record_sysrestore data_sysrestore[] = +{ + { NULL, NULL, 0, 0, 0, create_restore_point, disable_restore, enable_restore, get_last_restore_status, restore } +}; + static UINT16 systemenclosure_chassistypes[] = { 1, @@ -3981,6 +4018,7 @@ static struct table builtin_classes[] = { L"CIM_LogicalDisk", C(col_logicaldisk), 0, 0, NULL, fill_logicaldisk }, { L"CIM_Processor", C(col_processor), 0, 0, NULL, fill_processor }, { L"StdRegProv", C(col_stdregprov), D(data_stdregprov) }, + { L"SystemRestore", C(col_sysrestore), D(data_sysrestore) }, { L"Win32_BIOS", C(col_bios), 0, 0, NULL, fill_bios }, { L"Win32_BaseBoard", C(col_baseboard), 0, 0, NULL, fill_baseboard }, { L"Win32_CDROMDrive", C(col_cdromdrive), 0, 0, NULL, fill_cdromdrive }, diff --git a/dlls/wbemprox/sysrestore.c b/dlls/wbemprox/sysrestore.c new file mode 100644 index 00000000000..b840d220b5c --- /dev/null +++ b/dlls/wbemprox/sysrestore.c @@ -0,0 +1,62 @@ +/* + * SystemRestore implementation + * + * Copyright 2020 Dmitry Timoshkov + * + * 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 + */ + +#define COBJMACROS + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wbemcli.h" + +#include "wine/debug.h" +#include "wbemprox_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(wbemprox); + +HRESULT create_restore_point( IWbemClassObject *obj, IWbemClassObject *in, IWbemClassObject **out ) +{ + FIXME("stub\n"); + return S_OK; +} + +HRESULT disable_restore( IWbemClassObject *obj, IWbemClassObject *in, IWbemClassObject **out ) +{ + FIXME("stub\n"); + return S_OK; +} + +HRESULT enable_restore( IWbemClassObject *obj, IWbemClassObject *in, IWbemClassObject **out ) +{ + FIXME("stub\n"); + return S_OK; +} + +HRESULT get_last_restore_status( IWbemClassObject *obj, IWbemClassObject *in, IWbemClassObject **out ) +{ + FIXME("stub\n"); + return E_NOTIMPL; +} + +HRESULT restore( IWbemClassObject *obj, IWbemClassObject *in, IWbemClassObject **out ) +{ + FIXME("stub\n"); + return S_OK; +} diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 37b6fb4e8dc..1c7a615dd4e 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1772,16 +1772,19 @@ static void test_SystemRestore( IWbemServices *services ) hr = IWbemServices_GetObject( services, class, 0, NULL, &service, NULL ); if (hr != S_OK) { - skip( "SystemRestore not available\n" ); + win_skip( "SystemRestore not available\n" ); SysFreeString( class ); return; } check_property( service, L"CreationTime", VT_NULL, CIM_STRING ); check_property( service, L"Description", VT_NULL, CIM_STRING ); + if (0) /* FIXME */ + { check_property( service, L"EventType", VT_NULL, CIM_UINT32 ); check_property( service, L"RestorePointType", VT_NULL, CIM_UINT32 ); check_property( service, L"SequenceNumber", VT_NULL, CIM_UINT32 ); + } method = SysAllocString( L"Enable" ); sig_in = NULL; @@ -1802,7 +1805,7 @@ static void test_SystemRestore( IWbemServices *services ) out = NULL; hr = IWbemServices_ExecMethod( services, class, method, 0, NULL, in, &out, NULL ); ok( hr == S_OK || hr == WBEM_E_ACCESS_DENIED, "failed to execute method %08x\n", hr ); - if (hr == S_OK) + if (hr == S_OK && out) { VariantInit( &var ); hr = IWbemClassObject_Get( out, L"ReturnValue", 0, &var, NULL, NULL ); diff --git a/dlls/wbemprox/wbemprox_private.h b/dlls/wbemprox/wbemprox_private.h index 30649257641..ff9a7f6ff82 100644 --- a/dlls/wbemprox/wbemprox_private.h +++ b/dlls/wbemprox/wbemprox_private.h @@ -253,6 +253,11 @@ HRESULT service_start_service(IWbemClassObject *, IWbemClassObject *, IWbemClass HRESULT service_stop_service(IWbemClassObject *, IWbemClassObject *, IWbemClassObject **) DECLSPEC_HIDDEN; HRESULT security_get_sd(IWbemClassObject *, IWbemClassObject *, IWbemClassObject **) DECLSPEC_HIDDEN; HRESULT security_set_sd(IWbemClassObject *, IWbemClassObject *, IWbemClassObject **) DECLSPEC_HIDDEN; +HRESULT create_restore_point(IWbemClassObject *, IWbemClassObject *, IWbemClassObject **) DECLSPEC_HIDDEN; +HRESULT disable_restore(IWbemClassObject *, IWbemClassObject *, IWbemClassObject **) DECLSPEC_HIDDEN; +HRESULT enable_restore(IWbemClassObject *, IWbemClassObject *, IWbemClassObject **) DECLSPEC_HIDDEN; +HRESULT get_last_restore_status(IWbemClassObject *, IWbemClassObject *in, IWbemClassObject **) DECLSPEC_HIDDEN; +HRESULT restore(IWbemClassObject *, IWbemClassObject *, IWbemClassObject **) DECLSPEC_HIDDEN; static inline WCHAR *heap_strdupW( const WCHAR *src ) { -- 2.29.2

1 0

[PATCH 3/3] gdi32: Report real VREFRESH values for GetDeviceCaps() with display DCs.
by Zhiyi Zhang Jan. 20, 2021

Jan. 20, 2021

Even though MSDN says 0 and 1 are both valid and they represent the default refresh rate of display hardware. Some games rely on the value being the real refresh rate and use it to cap frame rates. Fix an issue that Sakuna: Of Rice and Ruin reports monitors of 1Hz and cap to 1fps. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/gdi32/driver.c | 25 ++++++++++++++++++++++++- dlls/gdi32/tests/dc.c | 4 ---- 2 files changed, 24 insertions(+), 5 deletions(-) diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index bb98c554238..e146a3a4f85 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -82,6 +82,7 @@ static CRITICAL_SECTION_DEBUG critsect_debug = static CRITICAL_SECTION driver_section = { &critsect_debug, -1, 0, 0, 0, 0 }; static BOOL (WINAPI *pEnumDisplayMonitors)(HDC, LPRECT, MONITORENUMPROC, LPARAM); +static BOOL (WINAPI *pEnumDisplaySettingsW)(LPCWSTR, DWORD, LPDEVMODEW); static HWND (WINAPI *pGetDesktopWindow)(void); static BOOL (WINAPI *pGetMonitorInfoW)(HMONITOR, LPMONITORINFO); static INT (WINAPI *pGetSystemMetrics)(INT); @@ -245,6 +246,7 @@ void CDECL __wine_set_display_driver( HMODULE module ) pGetMonitorInfoW = (void *)GetProcAddress( user32, "GetMonitorInfoW" ); pGetSystemMetrics = (void *)GetProcAddress( user32, "GetSystemMetrics" ); pEnumDisplayMonitors = (void *)GetProcAddress( user32, "EnumDisplayMonitors" ); + pEnumDisplaySettingsW = (void *)GetProcAddress( user32, "EnumDisplaySettingsW" ); pSetThreadDpiAwarenessContext = (void *)GetProcAddress( user32, "SetThreadDpiAwarenessContext" ); } @@ -471,7 +473,28 @@ static INT CDECL nulldrv_GetDeviceCaps( PHYSDEV dev, INT cap ) case PHYSICALOFFSETY: return 0; case SCALINGFACTORX: return 0; case SCALINGFACTORY: return 0; - case VREFRESH: return GetDeviceCaps( dev->hdc, TECHNOLOGY ) == DT_RASDISPLAY ? 1 : 0; + case VREFRESH: + { + DEVMODEW devmode; + WCHAR *display; + DC *dc; + + if (GetDeviceCaps( dev->hdc, TECHNOLOGY ) != DT_RASDISPLAY) + return 0; + + if (pEnumDisplaySettingsW) + { + dc = get_nulldrv_dc( dev ); + + memset( &devmode, 0, sizeof(devmode) ); + devmode.dmSize = sizeof(devmode); + display = dc->display[0] ? dc->display : NULL; + if (pEnumDisplaySettingsW( display, ENUM_CURRENT_SETTINGS, &devmode )) + return devmode.dmDisplayFrequency ? devmode.dmDisplayFrequency : 1; + } + + return 1; + } case DESKTOPHORZRES: if (GetDeviceCaps( dev->hdc, TECHNOLOGY ) == DT_RASDISPLAY && pGetSystemMetrics) { diff --git a/dlls/gdi32/tests/dc.c b/dlls/gdi32/tests/dc.c index 963b62f4e15..e3ac381964f 100644 --- a/dlls/gdi32/tests/dc.c +++ b/dlls/gdi32/tests/dc.c @@ -1708,7 +1708,6 @@ static void test_multi_monitor_dc(void) ok(value == dm.dmPelsHeight, "Expected %d, got %d.\n", dm.dmPelsHeight, value); value = GetDeviceCaps(hdc, VREFRESH); - todo_wine_if(value != dm.dmDisplayFrequency && value == 1) ok(value == dm.dmDisplayFrequency, "Expected %d, got %d.\n", dm.dmDisplayFrequency, value); /* Test GetDeviceCaps() values after mode changes */ @@ -1744,7 +1743,6 @@ static void test_multi_monitor_dc(void) ok(value == dm2.dmPelsHeight, "Expected %d, got %d.\n", dm2.dmPelsHeight, value); value = GetDeviceCaps(hdc, VREFRESH); - todo_wine_if(value != dm2.dmDisplayFrequency && value == 1) ok(value == dm2.dmDisplayFrequency, "Expected %d, got %d.\n", dm2.dmDisplayFrequency, value); res = ChangeDisplaySettingsExA(NULL, NULL, NULL, 0, NULL); @@ -1785,7 +1783,6 @@ static void test_multi_monitor_dc(void) ok(value == dm.dmPelsHeight, "Expected %d, got %d.\n", dm.dmPelsHeight, value); value = GetDeviceCaps(hdc, VREFRESH); - todo_wine_if(value != dm.dmDisplayFrequency && value == 1) ok(value == dm.dmDisplayFrequency, "Expected %d, got %d.\n", dm.dmDisplayFrequency, value); /* Test GetDeviceCaps() values after mode changes */ @@ -1827,7 +1824,6 @@ static void test_multi_monitor_dc(void) ok(value == dm2.dmPelsHeight, "Expected %d, got %d.\n", dm2.dmPelsHeight, value); value = GetDeviceCaps(hdc, VREFRESH); - todo_wine_if(value != dm2.dmDisplayFrequency && value == 1) ok(value == dm2.dmDisplayFrequency, "Expected %d, got %d.\n", dm2.dmDisplayFrequency, value); /* Test GetDeviceCaps() values after monitor detach */ -- 2.27.0

1 0