December 2020 - Wine-Commits

Michael Stefaniuc : cryptui/tests: Use wide-char string literals.
by Alexandre Julliard Dec. 9, 2020

Dec. 9, 2020

Module: wine Branch: master Commit: 45b2bdc907960bc7e23319a75d777cf8413592ba URL: https://source.winehq.org/git/wine.git/?a=commit;h=45b2bdc907960bc7e23319a7… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Dec 9 00:33:56 2020 +0100 cryptui/tests: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/cryptui/tests/cryptui.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/dlls/cryptui/tests/cryptui.c b/dlls/cryptui/tests/cryptui.c index bb1db929ba5..ea43f01962b 100644 --- a/dlls/cryptui/tests/cryptui.c +++ b/dlls/cryptui/tests/cryptui.c @@ -398,9 +398,8 @@ static void test_crypt_ui_wiz_import(void) ok(ret, "CryptUIWizImport failed: %08x\n", GetLastError()); if (ret) { - static const WCHAR CA[] = { 'C','A',0 }; HCERTSTORE ca = CertOpenStore(CERT_STORE_PROV_SYSTEM_W, 0, 0, - CERT_SYSTEM_STORE_CURRENT_USER, CA); + CERT_SYSTEM_STORE_CURRENT_USER, L"CA"); if (ca) { @@ -422,10 +421,8 @@ static void test_crypt_ui_wiz_import(void) ok(ret, "CryptUIWizImport failed: %08x\n", GetLastError()); if (ret) { - static const WCHAR AddressBook[] = { 'A','d','d','r','e','s','s', - 'B','o','o','k',0 }; HCERTSTORE addressBook = CertOpenStore(CERT_STORE_PROV_SYSTEM_W, 0, 0, - CERT_SYSTEM_STORE_CURRENT_USER, AddressBook); + CERT_SYSTEM_STORE_CURRENT_USER, L"AddressBook"); if (addressBook) { @@ -476,10 +473,8 @@ static void test_crypt_ui_wiz_import(void) ok(ret, "CryptUIWizImport failed: %08x\n", GetLastError()); if (ret) { - static const WCHAR AddressBook[] = { 'A','d','d','r','e','s','s', - 'B','o','o','k',0 }; HCERTSTORE addressBook = CertOpenStore(CERT_STORE_PROV_SYSTEM_W, 0, 0, - CERT_SYSTEM_STORE_CURRENT_USER, AddressBook); + CERT_SYSTEM_STORE_CURRENT_USER, L"AddressBook"); if (addressBook) { @@ -499,9 +494,8 @@ static void test_crypt_ui_wiz_import(void) ok(ret, "CryptUIWizImport failed: %08x\n", GetLastError()); if (ret) { - static const WCHAR CA[] = { 'C','A',0 }; HCERTSTORE ca = CertOpenStore(CERT_STORE_PROV_SYSTEM_W, 0, 0, - CERT_SYSTEM_STORE_CURRENT_USER, CA); + CERT_SYSTEM_STORE_CURRENT_USER, L"CA"); if (ca) {

1 0

Alexandre Julliard : libwine: Add missing wine/asm.h include.
by Alexandre Julliard Dec. 9, 2020

Dec. 9, 2020

Module: wine Branch: master Commit: 28d2afc064e10bb791f2d62e3da19dfd810ad93d URL: https://source.winehq.org/git/wine.git/?a=commit;h=28d2afc064e10bb791f2d62e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 9 09:29:58 2020 +0100 libwine: Add missing wine/asm.h include. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50294 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/wine/mmap.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libs/wine/mmap.c b/libs/wine/mmap.c index fe0561c84b3..b72d2af20d3 100644 --- a/libs/wine/mmap.c +++ b/libs/wine/mmap.c @@ -43,6 +43,7 @@ #endif #include "wine/list.h" +#include "wine/asm.h" #ifndef MAP_NORESERVE #define MAP_NORESERVE 0

1 0

Zebediah Figura : vkd3d-shader: Implement an initial pass-through HLSL preprocessor.
by Alexandre Julliard Dec. 9, 2020

Dec. 9, 2020

Module: vkd3d Branch: master Commit: f544cb38e5184c8218a36629f59c64568e55e6f5 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=f544cb38e5184c8218a3662… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Dec 7 12:56:30 2020 -0600 vkd3d-shader: Implement an initial pass-through HLSL preprocessor. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .gitignore | 3 + Makefile.am | 31 +++++++++- configure.ac | 6 ++ libs/vkd3d-shader/preproc.h | 33 +++++++++++ libs/vkd3d-shader/preproc.l | 99 ++++++++++++++++++++++++++++++++ libs/vkd3d-shader/preproc.y | 60 +++++++++++++++++++ libs/vkd3d-shader/vkd3d_shader_main.c | 16 ++++-- libs/vkd3d-shader/vkd3d_shader_private.h | 8 +++ tests/hlsl_d3d12.c | 31 +++++----- 9 files changed, 265 insertions(+), 22 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=f544cb38e5184c8218a…

1 0

Zebediah Figura : vkd3d-shader: Parse comments in the preprocessor.
by Alexandre Julliard Dec. 9, 2020

Dec. 9, 2020

Module: vkd3d Branch: master Commit: 741c33265895e03457b8b9f651f3c6592a1104cd URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=741c33265895e03457b8b9f… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Dec 7 12:56:31 2020 -0600 vkd3d-shader: Parse comments in the preprocessor. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/preproc.l | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/preproc.l b/libs/vkd3d-shader/preproc.l index 656ad67..89a4f60 100644 --- a/libs/vkd3d-shader/preproc.l +++ b/libs/vkd3d-shader/preproc.l @@ -36,16 +36,33 @@ %option never-interactive %option noinput %option nounput +%option noyy_top_state %option noyywrap %option prefix="preproc_yy" %option reentrant +%option stack + + /* Because these can both be terminated by EOF, we need states for them. */ +%s C_COMMENT +%s CXX_COMMENT WS [ \t] %% -{WS}+ {} -. {return T_TEXT;} +<INITIAL>"//" {yy_push_state(CXX_COMMENT, yyscanner);} +<INITIAL>"/*" {yy_push_state(C_COMMENT, yyscanner);} +<CXX_COMMENT>\\\r?\n {} +<CXX_COMMENT>\n { + yy_pop_state(yyscanner); + return T_TEXT; + } +<C_COMMENT>"*/" {yy_pop_state(yyscanner);} +<C_COMMENT,CXX_COMMENT><<EOF>> {yy_pop_state(yyscanner);} +<C_COMMENT,CXX_COMMENT>. {} + +<INITIAL>{WS}+ {} +<INITIAL>. {return T_TEXT;} %%

1 0

Andrey Gusev : vkd3d: Fix misplaced parenthesis.
by Alexandre Julliard Dec. 9, 2020

Dec. 9, 2020

Module: vkd3d Branch: master Commit: a9abb0d7eb51fed9edb7be4fe251822269ad84eb URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=a9abb0d7eb51fed9edb7be4… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Tue Dec 8 00:27:50 2020 +0200 vkd3d: Fix misplaced parenthesis. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index bef6477..a63fc92 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -417,7 +417,7 @@ static void vkd3d_init_debug_report(struct vkd3d_instance *instance) callback_info.flags = VK_DEBUG_REPORT_ERROR_BIT_EXT | VK_DEBUG_REPORT_WARNING_BIT_EXT; callback_info.pfnCallback = vkd3d_debug_report_callback; callback_info.pUserData = NULL; - if ((vr = VK_CALL(vkCreateDebugReportCallbackEXT(vk_instance, &callback_info, NULL, &callback)) < 0)) + if ((vr = VK_CALL(vkCreateDebugReportCallbackEXT(vk_instance, &callback_info, NULL, &callback))) < 0) { WARN("Failed to create debug report callback, vr %d.\n", vr); return;

1 0

Zebediah Figura : vkd3d-shader: Preserve some tokens verbatim for HLSL.
by Alexandre Julliard Dec. 9, 2020

Dec. 9, 2020

Module: vkd3d Branch: master Commit: 12180a8e30bfd7771f49bc0b42793a2f4c159124 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=12180a8e30bfd7771f49bc0… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Dec 7 12:56:32 2020 -0600 vkd3d-shader: Preserve some tokens verbatim for HLSL. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/preproc.l | 22 ++++++++++++++++++++++ tests/hlsl_d3d12.c | 15 +++++++++------ 2 files changed, 31 insertions(+), 6 deletions(-) diff --git a/libs/vkd3d-shader/preproc.l b/libs/vkd3d-shader/preproc.l index 89a4f60..4d809b8 100644 --- a/libs/vkd3d-shader/preproc.l +++ b/libs/vkd3d-shader/preproc.l @@ -47,6 +47,7 @@ %s CXX_COMMENT WS [ \t] +IDENTIFIER [A-Za-z_][A-Za-z0-9_]* %% @@ -61,6 +62,27 @@ WS [ \t] <C_COMMENT,CXX_COMMENT><<EOF>> {yy_pop_state(yyscanner);} <C_COMMENT,CXX_COMMENT>. {} +<INITIAL>{IDENTIFIER} {return T_TEXT;} + +<INITIAL>[0-9]*\.[0-9]+([eE][+-]?[0-9]+)?[hHfF]? {return T_TEXT;} +<INITIAL>[0-9]+\.([eE][+-]?[0-9]+)?[hHfF]? {return T_TEXT;} +<INITIAL>[0-9]+([eE][+-]?[0-9]+)?[hHfF] {return T_TEXT;} +<INITIAL>[0-9]+[eE][+-]?[0-9]+ {return T_TEXT;} +<INITIAL>0[xX][0-9a-fA-f]+[ul]{0,2} {return T_TEXT;} +<INITIAL>0[0-7]*[ul]{0,2} {return T_TEXT;} +<INITIAL>[1-9][0-9]*[ul]{0,2} {return T_TEXT;} + +<INITIAL>"&&" {return T_TEXT;} +<INITIAL>"||" {return T_TEXT;} +<INITIAL>"++" {return T_TEXT;} +<INITIAL>"--" {return T_TEXT;} +<INITIAL>"<<"=? {return T_TEXT;} +<INITIAL>">>"=? {return T_TEXT;} +<INITIAL>[-+*/%&|^=><!]= {return T_TEXT;} + + /* C strings (including escaped quotes). */ +<INITIAL>\"([^"\\]|\\.)*\" {return T_TEXT;} + <INITIAL>{WS}+ {} <INITIAL>. {return T_TEXT;} diff --git a/tests/hlsl_d3d12.c b/tests/hlsl_d3d12.c index 787355b..61324fa 100644 --- a/tests/hlsl_d3d12.c +++ b/tests/hlsl_d3d12.c @@ -43,7 +43,7 @@ static void check_preprocess_(int line, const char *source, const D3D_SHADER_MAC ok_(line)(vkd3d_memmem(code, size, present, strlen(present)), "\"%s\" not found in preprocessed shader.\n", present); if (absent) - assert_that_(line)(!vkd3d_memmem(code, size, absent, strlen(absent)), + ok_(line)(!vkd3d_memmem(code, size, absent, strlen(absent)), "\"%s\" found in preprocessed shader.\n", absent); ID3D10Blob_Release(blob); } @@ -349,8 +349,10 @@ static void test_preprocess(void) for (i = 0; i < ARRAY_SIZE(tests); ++i) { + if (i == 43) + continue; vkd3d_test_set_context("Source \"%s\"", tests[i].source); - todo_if (i != 5 && i != 8 && i != 42) + todo_if (i <= 4 || (i >= 9 && i <= 14)) check_preprocess(tests[i].source, NULL, NULL, tests[i].present, tests[i].absent); } vkd3d_test_set_context(NULL); @@ -361,10 +363,10 @@ static void test_preprocess(void) macros[1].Definition = NULL; todo check_preprocess("KEY", macros, NULL, "value", "KEY"); - todo check_preprocess("#undef KEY\nKEY", macros, NULL, "KEY", "value"); + check_preprocess("#undef KEY\nKEY", macros, NULL, "KEY", "value"); macros[0].Name = NULL; - todo check_preprocess("KEY", macros, NULL, "KEY", "value"); + check_preprocess("KEY", macros, NULL, "KEY", "value"); macros[0].Name = "KEY"; macros[0].Definition = NULL; @@ -376,7 +378,7 @@ static void test_preprocess(void) macros[0].Name = "KEY(a)"; macros[0].Definition = "value"; - todo check_preprocess("KEY(a)", macros, NULL, "KEY", "value"); + check_preprocess("KEY(a)", macros, NULL, "KEY", "value"); macros[0].Name = "KEY"; macros[0].Definition = "value1"; @@ -398,7 +400,8 @@ static void test_preprocess(void) macros[1].Definition = "KEY2"; todo check_preprocess("KEY", macros, NULL, "value", NULL); - todo check_preprocess(test_include_top, NULL, &test_include, "pass", "fail"); + if (0) + todo check_preprocess(test_include_top, NULL, &test_include, "pass", "fail"); ok(!refcount_file1, "Got %d references to file1.\n", refcount_file1); ok(!refcount_file2, "Got %d references to file1.\n", refcount_file2); ok(!refcount_file3, "Got %d references to file1.\n", refcount_file3);

1 0

Alexandre Julliard : winegcc: Look for ntdll.so instead of libwine.so to find the library directory.
by Alexandre Julliard Dec. 8, 2020

Dec. 8, 2020

Module: wine Branch: master Commit: 4e9f855be55fadf42627cd303841462aa2d80824 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4e9f855be55fadf42627cd30… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 8 18:44:33 2020 +0100 winegcc: Look for ntdll.so instead of libwine.so to find the library directory. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/winegcc.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 6decb02ee04..0a45cb7a0d5 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -638,7 +638,7 @@ static const char *get_multiarch_dir( enum target_cpu cpu ) static char *get_lib_dir( struct options *opts ) { const char *stdlibpath[] = { libdir, LIBDIR, "/usr/lib", "/usr/local/lib", "/lib" }; - static const char libwine[] = "/libwine.so"; + static const char ntdll[] = "/wine/ntdll.so"; const char *bit_suffix, *other_bit_suffix, *build_multiarch, *target_multiarch; const char *root = opts->sysroot ? opts->sysroot : ""; unsigned int i; @@ -658,31 +658,31 @@ static char *get_lib_dir( struct options *opts ) if (!stdlibpath[i]) continue; buffer = xmalloc( strlen(root) + strlen(stdlibpath[i]) + - strlen("/arm-linux-gnueabi") + strlen(libwine) + 1 ); + strlen("/arm-linux-gnueabi") + strlen(ntdll) + 1 ); strcpy( buffer, root ); strcat( buffer, stdlibpath[i] ); p = buffer + strlen(buffer); while (p > buffer && p[-1] == '/') p--; - strcpy( p, libwine ); + strcpy( p, ntdll ); if (check_platform( opts, buffer )) goto found; if (p > buffer + 2 && (!memcmp( p - 2, "32", 2 ) || !memcmp( p - 2, "64", 2 ))) { p -= 2; - strcpy( p, libwine ); + strcpy( p, ntdll ); if (check_platform( opts, buffer )) goto found; } strcpy( p, bit_suffix ); - strcat( p, libwine ); + strcat( p, ntdll ); if (check_platform( opts, buffer )) goto found; strcpy( p, target_multiarch ); - strcat( p, libwine ); + strcat( p, ntdll ); if (check_platform( opts, buffer )) goto found; strcpy( buffer, root ); strcat( buffer, stdlibpath[i] ); p = buffer + strlen(buffer); while (p > buffer && p[-1] == '/') p--; - strcpy( p, libwine ); + strcpy( p, ntdll ); /* try to fixup each parent dirs named lib, lib32 or lib64 with target bitness suffix */ while (p > buffer) @@ -724,7 +724,7 @@ static char *get_lib_dir( struct options *opts ) continue; found: - buffer[strlen(buffer) - strlen(libwine)] = 0; + buffer[strlen(buffer) - strlen(ntdll)] = 0; return buffer; } return strmake( "%s%s", root, LIBDIR );

1 0

Zhiyi Zhang : user32/tests: Test that monitor enumeration is not affected by window stations and desktops.
by Alexandre Julliard Dec. 8, 2020

Dec. 8, 2020

Module: wine Branch: master Commit: c84fd7cd861d83c9afe63a3255c90693b2ee2e66 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c84fd7cd861d83c9afe63a32… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Dec 8 16:12:26 2020 +0800 user32/tests: Test that monitor enumeration is not affected by window stations and desktops. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/monitor.c | 52 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 51 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index 2ca6e9ece84..5e4cc9d154f 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -1510,10 +1510,21 @@ static BOOL CALLBACK test_EnumDisplayMonitors_invalid_handle_cb(HMONITOR monitor return TRUE; } +static BOOL CALLBACK test_EnumDisplayMonitors_count(HMONITOR monitor, HDC hdc, LPRECT rect, + LPARAM lparam) +{ + INT *count = (INT *)lparam; + ++(*count); + return TRUE; +} + static void test_EnumDisplayMonitors(void) { + static const DWORD DESKTOP_ALL_ACCESS = 0x01ff; + HWINSTA winstation, old_winstation; + HDESK desktop, old_desktop; + INT count, old_count; DWORD error; - INT count; BOOL ret; ret = EnumDisplayMonitors(NULL, NULL, test_EnumDisplayMonitors_normal_cb, 0); @@ -1534,6 +1545,45 @@ static void test_EnumDisplayMonitors(void) else ok(ret, "EnumDisplayMonitors failed.\n"); ok(error == 0xdeadbeef, "Expected error %#x, got %#x.\n", 0xdeadbeef, error); + + /* Test that monitor enumeration is not affected by window stations and desktops */ + old_winstation = GetProcessWindowStation(); + old_desktop = GetThreadDesktop(GetCurrentThreadId()); + old_count = GetSystemMetrics(SM_CMONITORS); + + count = 0; + ret = EnumDisplayMonitors(NULL, NULL, test_EnumDisplayMonitors_count, (LPARAM)&count); + ok(ret, "EnumDisplayMonitors failed, error %#x.\n", GetLastError()); + ok(count == old_count, "Expected %d, got %d.\n", old_count, count); + + winstation = CreateWindowStationW(NULL, 0, WINSTA_ALL_ACCESS, NULL); + ok(!!winstation && winstation != old_winstation, "CreateWindowStationW failed, error %#x.\n", GetLastError()); + ret = SetProcessWindowStation(winstation); + ok(ret, "SetProcessWindowStation failed, error %#x.\n", GetLastError()); + ok(winstation == GetProcessWindowStation(), "Expected %p, got %p.\n", GetProcessWindowStation(), winstation); + + desktop = CreateDesktopW(L"test_desktop", NULL, NULL, 0, DESKTOP_ALL_ACCESS, NULL); + ok(!!desktop && desktop != old_desktop, "CreateDesktopW failed, error %#x.\n", GetLastError()); + ret = SetThreadDesktop(desktop); + ok(ret, "SetThreadDesktop failed, error %#x.\n", GetLastError()); + ok(desktop == GetThreadDesktop(GetCurrentThreadId()), "Expected %p, got %p.\n", + GetThreadDesktop(GetCurrentThreadId()), desktop); + + count = GetSystemMetrics(SM_CMONITORS); + ok(count == old_count, "Expected %d, got %d.\n", old_count, count); + count = 0; + ret = EnumDisplayMonitors(NULL, NULL, test_EnumDisplayMonitors_count, (LPARAM)&count); + ok(ret, "EnumDisplayMonitors failed, error %#x.\n", GetLastError()); + ok(count == old_count, "Expected %d, got %d.\n", old_count, count); + + ret = SetProcessWindowStation(old_winstation); + ok(ret, "SetProcessWindowStation failed, error %#x.\n", GetLastError()); + ret = SetThreadDesktop(old_desktop); + ok(ret, "SetThreadDesktop failed, error %#x.\n", GetLastError()); + ret = CloseDesktop(desktop); + ok(ret, "CloseDesktop failed, error %#x.\n", GetLastError()); + ret = CloseWindowStation(winstation); + ok(ret, "CloseWindowStation failed, error %#x.\n", GetLastError()); } static void test_QueryDisplayConfig_result(UINT32 flags,

1 0

Rémi Bernon : gdi32: Don't try to get glyph index when default char is 0.
by Alexandre Julliard Dec. 8, 2020

Dec. 8, 2020

Module: wine Branch: master Commit: 06206f1628be8e12164f097d985a7e20a3a3d0f1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=06206f1628be8e12164f097d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Dec 8 13:09:22 2020 +0100 gdi32: Don't try to get glyph index when default char is 0. Fixes a regression from 5bdc6e0fe64222d8d7d383616f5e230928af011a, this is what the code was originally doing. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50175 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/freetype.c | 2 +- dlls/gdi32/tests/font.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 09c8251de8f..fffa3288503 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -2601,7 +2601,7 @@ static UINT CDECL freetype_get_default_glyph( struct gdi_font *font ) if ((pOS2 = pFT_Get_Sfnt_Table( ft_face, ft_sfnt_os2 ))) { UINT glyph = pOS2->usDefaultChar; - freetype_get_glyph_index( font, &glyph, TRUE ); + if (glyph) freetype_get_glyph_index( font, &glyph, TRUE ); return glyph; } if (!pFT_Get_WinFNT_Header( ft_face, &winfnt )) return winfnt.default_char + winfnt.first_char; diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index cde83757c16..86ccddd05ea 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -1716,8 +1716,8 @@ static void test_GetGlyphIndices(void) testtext[0] = 'T'; charcount = pGetGlyphIndicesW(hdc, testtext, (sizeof(testtext)/2)-1, glyphs, flags); ok(charcount == 5, "GetGlyphIndicesW count of glyphs should = 5 not %d\n", charcount); - todo_wine ok(glyphs[0] == 0, "GetGlyphIndicesW for tmDefaultChar should be 0 not %04x\n", glyphs[0]); - todo_wine ok(glyphs[4] == 0, "GetGlyphIndicesW should have returned 0 not %04x\n", glyphs[4]); + ok(glyphs[0] == 0, "GetGlyphIndicesW for tmDefaultChar should be 0 not %04x\n", glyphs[0]); + ok(glyphs[4] == 0, "GetGlyphIndicesW should have returned 0 not %04x\n", glyphs[4]); DeleteObject(SelectObject(hdc, hOldFont)); ret = pRemoveFontMemResourceEx(rsrc);

1 0

Zebediah Figura : kernel32/tests: Add some more tests for FILE_ATTRIBUTE_REPARSE_POINT.
by Alexandre Julliard Dec. 8, 2020

Dec. 8, 2020

Module: wine Branch: master Commit: ea5249feae8233295f89fad75e081d9e9043735d URL: https://source.winehq.org/git/wine.git/?a=commit;h=ea5249feae8233295f89fad7… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Dec 8 10:20:01 2020 -0600 kernel32/tests: Add some more tests for FILE_ATTRIBUTE_REPARSE_POINT. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/volume.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/dlls/kernel32/tests/volume.c b/dlls/kernel32/tests/volume.c index ead06764a11..5199a4992d8 100644 --- a/dlls/kernel32/tests/volume.c +++ b/dlls/kernel32/tests/volume.c @@ -1268,6 +1268,33 @@ static void test_mounted_folder(void) HANDLE file; DWORD size; + file = CreateFileA( "C:\\", 0, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, + OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS | FILE_FLAG_OPEN_REPARSE_POINT, NULL ); + ok(file != INVALID_HANDLE_VALUE, "got error %u\n", GetLastError()); + + status = NtQueryInformationFile( file, &io, &info, sizeof(info), FileAttributeTagInformation ); + ok(!status, "got status %#x\n", status); + ok(!(info.FileAttributes & FILE_ATTRIBUTE_REPARSE_POINT) + && (info.FileAttributes & FILE_ATTRIBUTE_DIRECTORY), "got attributes %#x\n", info.FileAttributes); + ok(!info.ReparseTag, "got reparse tag %#x\n", info.ReparseTag); + + CloseHandle( file ); + + file = CreateFileA( "C:\\", 0, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, + OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, NULL ); + ok(file != INVALID_HANDLE_VALUE, "got error %u\n", GetLastError()); + + status = NtQueryInformationFile( file, &io, &info, sizeof(info), FileAttributeTagInformation ); + ok(!status, "got status %#x\n", status); + ok(!(info.FileAttributes & FILE_ATTRIBUTE_REPARSE_POINT) + && (info.FileAttributes & FILE_ATTRIBUTE_DIRECTORY), "got attributes %#x\n", info.FileAttributes); + ok(!info.ReparseTag, "got reparse tag %#x\n", info.ReparseTag); + + CloseHandle( file ); + + ret = GetFileAttributesA( "C:\\" ); + ok(!(ret & FILE_ATTRIBUTE_REPARSE_POINT) && (ret & FILE_ATTRIBUTE_DIRECTORY), "got attributes %#x\n", ret); + ret = CreateDirectoryA("C:\\winetest_mnt", NULL); if (!ret && GetLastError() == ERROR_ACCESS_DENIED) { @@ -1324,6 +1351,10 @@ static void test_mounted_folder(void) CloseHandle( file ); + ret = GetFileAttributesA( "C:\\winetest_mnt" ); + ok(ret != INVALID_FILE_ATTRIBUTES, "got error %u\n", GetLastError()); + ok((ret & FILE_ATTRIBUTE_REPARSE_POINT) && (ret & FILE_ATTRIBUTE_DIRECTORY), "got attributes %#x\n", ret); + file = CreateFileA( "C:\\winetest_mnt\\windows", 0, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, NULL ); ok(file != INVALID_HANDLE_VALUE, "got error %u\n", GetLastError());

1 0