January 2020 - Wine-Commits

Tag wine-5.0-rc6 : Alexandre Julliard : Release 5.0-rc6
by Alexandre Julliard Jan. 17, 2020

Jan. 17, 2020

Module: wine Branch: refs/tags/wine-5.0-rc6 Tag: 61806a10221cb1d15bb0690121896f488827fca8 URL: https://source.winehq.org/git/wine.git/?a=tag;h=61806a10221cb1d15bb06901218… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 17 23:02:41 2020 +0100 Release 5.0-rc6

1 0

Alexandre Julliard : msvcrt: Use unsigned comparisons in strcmp and strncmp.
by Alexandre Julliard Jan. 16, 2020

Jan. 16, 2020

Module: wine Branch: master Commit: 4e2da207d70e5b052253311896a00f377a635804 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4e2da207d70e5b0522533118… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 16 11:37:03 2020 +0100 msvcrt: Use unsigned comparisons in strcmp and strncmp. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48454 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/string.c | 8 +++----- dlls/msvcrt/tests/string.c | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 5 deletions(-) diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index c4bd8ab129..e091ef5f46 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -2289,8 +2289,8 @@ void* __cdecl MSVCRT_memchr(const void *ptr, int c, MSVCRT_size_t n) int __cdecl MSVCRT_strcmp(const char *str1, const char *str2) { while (*str1 && *str1 == *str2) { str1++; str2++; } - if (*str1 > *str2) return 1; - if (*str1 < *str2) return -1; + if ((unsigned char)*str1 > (unsigned char)*str2) return 1; + if ((unsigned char)*str1 < (unsigned char)*str2) return -1; return 0; } @@ -2301,9 +2301,7 @@ int __cdecl MSVCRT_strncmp(const char *str1, const char *str2, MSVCRT_size_t len { if (!len) return 0; while (--len && *str1 && *str1 == *str2) { str1++; str2++; } - if (*str1 > *str2) return 1; - if (*str1 < *str2) return -1; - return 0; + return (unsigned char)*str1 - (unsigned char)*str2; } /********************************************************************* diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 08bc0781e1..440bed348a 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -57,6 +57,8 @@ static void* (__cdecl *pmemcpy)(void *, const void *, size_t n); static int (__cdecl *p_memcpy_s)(void *, size_t, const void *, size_t); static int (__cdecl *p_memmove_s)(void *, size_t, const void *, size_t); static int* (__cdecl *pmemcmp)(void *, const void *, size_t n); +static int (__cdecl *p_strcmp)(const char *, const char *); +static int (__cdecl *p_strncmp)(const char *, const char *, size_t); static int (__cdecl *p_strcpy)(char *dst, const char *src); static int (__cdecl *pstrcpy_s)(char *dst, size_t len, const char *src); static int (__cdecl *pstrcat_s)(char *dst, size_t len, const char *src); @@ -630,6 +632,37 @@ static void test_strdup(void) free( str ); } +static void test_strcmp(void) +{ + int ret = p_strcmp( "abc", "abcd" ); + ok( ret == -1, "wrong ret %d\n", ret ); + ret = p_strcmp( "", "abc" ); + ok( ret == -1, "wrong ret %d\n", ret ); + ret = p_strcmp( "abc", "ab\xa0" ); + ok( ret == -1, "wrong ret %d\n", ret ); + ret = p_strcmp( "ab\xb0", "ab\xa0" ); + ok( ret == 1, "wrong ret %d\n", ret ); + ret = p_strcmp( "ab\xc2", "ab\xc2" ); + ok( ret == 0, "wrong ret %d\n", ret ); + + ret = p_strncmp( "abc", "abcd", 3 ); + ok( ret == 0, "wrong ret %d\n", ret ); + ret = p_strncmp( "", "abc", 3 ); + ok( ret == 0 - 'a', "wrong ret %d\n", ret ); + ret = p_strncmp( "abc", "ab\xa0", 4 ); + ok( ret == 'c' - 0xa0, "wrong ret %d\n", ret ); + ret = p_strncmp( "ab\xb0", "ab\xa0", 3 ); + ok( ret == 0xb0 - 0xa0, "wrong ret %d\n", ret ); + ret = p_strncmp( "ab\xb0", "ab\xa0", 2 ); + ok( ret == 0, "wrong ret %d\n", ret ); + ret = p_strncmp( "ab\xc2", "ab\xc2", 3 ); + ok( ret == 0, "wrong ret %d\n", ret ); + ret = p_strncmp( "abc", "abd", 0 ); + ok( ret == 0, "wrong ret %d\n", ret ); + ret = p_strncmp( "abc", "abc", 12 ); + ok( ret == 0, "wrong ret %d\n", ret ); +} + static void test_strcpy_s(void) { char dest[8]; @@ -4067,6 +4100,8 @@ START_TEST(string) SET(p_mbctype,"_mbctype"); SET(p__mb_cur_max,"__mb_cur_max"); SET(p_strcpy, "strcpy"); + SET(p_strcmp, "strcmp"); + SET(p_strncmp, "strncmp"); pstrcpy_s = (void *)GetProcAddress( hMsvcrt,"strcpy_s" ); pstrcat_s = (void *)GetProcAddress( hMsvcrt,"strcat_s" ); p_mbscat_s = (void*)GetProcAddress( hMsvcrt, "_mbscat_s" ); @@ -4134,6 +4169,7 @@ START_TEST(string) test_mbsspn(); test_mbsspnp(); test_strdup(); + test_strcmp(); test_strcpy_s(); test_memcpy_s(); test_memmove_s();

1 0

Zebediah Figura : user32/tests: Fix some test failures with Windows 10.
by Alexandre Julliard Jan. 16, 2020

Jan. 16, 2020

Module: wine Branch: master Commit: 0cbadb716ddaeb016ffe14deae2aaced59951064 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0cbadb716ddaeb016ffe14de… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jan 16 12:10:15 2020 -0600 user32/tests: Fix some test failures with Windows 10. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/sysparams.c | 55 ++++++++++++++++++++++++++++++------------- 1 file changed, 38 insertions(+), 17 deletions(-) diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c index e40d49e8f8..431b87cde1 100644 --- a/dlls/user32/tests/sysparams.c +++ b/dlls/user32/tests/sysparams.c @@ -664,19 +664,17 @@ static BOOL run_spi_setmouse_test( int curr_val[], POINT *req_change, POINT *pro rc=SystemParametersInfoA( SPI_GETMOUSE, 0, mi, 0 ); ok(rc, "SystemParametersInfoA: rc=%d err=%d\n", rc, GetLastError()); - for (i = 0; i < 3; i++) - { - ok(mi[i] == curr_val[i], - "incorrect value for %d: %d != %d\n", i, mi[i], curr_val[i]); - } + ok(mi[0] == curr_val[0], "expected X threshold %d, got %d\n", curr_val[0], mi[0]); + ok(mi[1] == curr_val[1], "expected Y threshold %d, got %d\n", curr_val[1], mi[1]); + ok(mi[2] == curr_val[2] || broken(mi[2] == 1) /* Win10 1709+ */, + "expected acceleration %d, got %d\n", curr_val[2], mi[2]); rc=SystemParametersInfoW( SPI_GETMOUSE, 0, mi, 0 ); ok(rc, "SystemParametersInfoW: rc=%d err=%d\n", rc, GetLastError()); - for (i = 0; i < 3; i++) - { - ok(mi[i] == curr_val[i], - "incorrect value for %d: %d != %d\n", i, mi[i], curr_val[i]); - } + ok(mi[0] == curr_val[0], "expected X threshold %d, got %d\n", curr_val[0], mi[0]); + ok(mi[1] == curr_val[1], "expected Y threshold %d, got %d\n", curr_val[1], mi[1]); + ok(mi[2] == curr_val[2] || broken(mi[2] == 1) /* Win10 1709+ */, + "expected acceleration %d, got %d\n", curr_val[2], mi[2]); if (0) { @@ -2921,7 +2919,7 @@ static void test_GetSystemMetrics( void) static void compare_font( const LOGFONTW *lf1, const LOGFONTW *lf2, int dpi, int custom_dpi, int line ) { - ok_(__FILE__,line)( lf1->lfHeight == MulDiv( lf2->lfHeight, dpi, custom_dpi ), + ok_(__FILE__,line)( lf2->lfHeight == (dpi == custom_dpi) ? lf1->lfHeight : MulDiv( lf1->lfHeight, custom_dpi, 2 * dpi ), "wrong lfHeight %d vs %d\n", lf1->lfHeight, lf2->lfHeight ); ok_(__FILE__,line)( abs( lf1->lfWidth - MulDiv( lf2->lfWidth, dpi, custom_dpi )) <= 1, "wrong lfWidth %d vs %d\n", lf1->lfWidth, lf2->lfWidth ); @@ -3015,6 +3013,13 @@ static void test_metrics_for_dpi( int custom_dpi ) "%u: wrong value %u vs %u font %u vs %u\n", i, ret1, ret2, get_tmheightW( &ncm1.lfMenuFont, 1 ), get_tmheightW( &ncm2.lfMenuFont, 1 )); break; + case SM_CYMIN: + case SM_CYMINTRACK: + val = pGetSystemMetricsForDpi( SM_CYCAPTION, custom_dpi ); + val += 2 * pGetSystemMetricsForDpi( SM_CYFRAME, custom_dpi ); + val += 2 * ncm2.iPaddedBorderWidth; + ok( ret1 == ret2 || ret2 == val /* Win10 1709+ */, "%u: expected %u or %u, got %u\n", i, ret1, val, ret2 ); + break; default: ok( ret1 == ret2, "%u: wrong value %u vs %u\n", i, ret1, ret2 ); break; @@ -3684,32 +3689,48 @@ static void test_dpi_context(void) switch (i) { case 0x10: + ok( awareness == DPI_AWARENESS_UNAWARE || awareness == DPI_AWARENESS_INVALID /* Win10 1709+ */, + "%lx: wrong value %u\n", i, awareness ); + break; case 0x11: case 0x12: ok( awareness == (i & ~0x10), "%lx: wrong value %u\n", i, awareness ); - ok( pIsValidDpiAwarenessContext( (DPI_AWARENESS_CONTEXT)i ), "%lx: not valid\n", i ); + break; + case 0x22: + ok( awareness == DPI_AWARENESS_INVALID || awareness == DPI_AWARENESS_PER_MONITOR_AWARE /* Win10 1709+ */, + "%lx: wrong value %u\n", i, awareness ); break; default: ok( awareness == DPI_AWARENESS_INVALID, "%lx: wrong value %u\n", i, awareness ); - ok( !pIsValidDpiAwarenessContext( (DPI_AWARENESS_CONTEXT)i ), "%lx: valid\n", i ); break; } + ret = pIsValidDpiAwarenessContext( (DPI_AWARENESS_CONTEXT)i ); + ok( ret == (awareness != DPI_AWARENESS_INVALID), "%lx: expected %d, got %d\n", + i, (awareness != DPI_AWARENESS_INVALID), ret ); + awareness = pGetAwarenessFromDpiAwarenessContext( (DPI_AWARENESS_CONTEXT)(i | 0x80000000) ); switch (i) { case 0x10: + ok( awareness == DPI_AWARENESS_UNAWARE || awareness == DPI_AWARENESS_INVALID /* Win10 1709+ */, + "%lx: wrong value %u\n", i | 0x80000000, awareness ); + break; case 0x11: case 0x12: ok( awareness == (i & ~0x10), "%lx: wrong value %u\n", i | 0x80000000, awareness ); - ok( pIsValidDpiAwarenessContext( (DPI_AWARENESS_CONTEXT)(i | 0x80000000) ), - "%lx: not valid\n", i | 0x80000000 ); + break; + case 0x22: + ok( awareness == DPI_AWARENESS_INVALID || awareness == DPI_AWARENESS_PER_MONITOR_AWARE /* Win10 1709+ */, + "%lx: wrong value %u\n", i, awareness ); break; default: ok( awareness == DPI_AWARENESS_INVALID, "%lx: wrong value %u\n", i | 0x80000000, awareness ); - ok( !pIsValidDpiAwarenessContext( (DPI_AWARENESS_CONTEXT)(i | 0x80000000) ), - "%lx: valid\n", i | 0x80000000 ); break; } + ret = pIsValidDpiAwarenessContext( (DPI_AWARENESS_CONTEXT)(i | 0x80000000) ); + ok( ret == (awareness != DPI_AWARENESS_INVALID), "%lx: expected %d, got %d\n", + (i | 0x80000000), (awareness != DPI_AWARENESS_INVALID), ret ); + awareness = pGetAwarenessFromDpiAwarenessContext( (DPI_AWARENESS_CONTEXT)~i ); switch (~i) {

1 0

Alexandre Julliard : wine.inf: Remove the winebus service also for ARM64.
by Alexandre Julliard Jan. 16, 2020

Jan. 16, 2020

Module: wine Branch: master Commit: b6fb468b9a24ef530f7eb650536ece791a25ac29 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b6fb468b9a24ef530f7eb650… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 16 19:10:44 2020 +0100 wine.inf: Remove the winebus service also for ARM64. It was done in 57ca71fece4a37bde8200250d10d350f20224cf8 for the other platforms. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/wine.inf.in | 1 - 1 file changed, 1 deletion(-) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index d62fd5065b..5f9f61e253 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -212,7 +212,6 @@ AddService=FontCache3.0.0.0,0,WPFFontCacheService AddService=LanmanServer,0,LanmanServerService AddService=FontCache,0,FontCacheService AddService=Schedule,0,TaskSchedulerService -AddService=WineBus,0,WineBusService AddService=Winmgmt,0,WinmgmtService AddService=wuauserv,0,wuauService

1 0

Zhiyi Zhang : ntdll: Fix some Rtl* functions having wrong calling convention.
by Alexandre Julliard Jan. 16, 2020

Jan. 16, 2020

Module: wine Branch: master Commit: e41547c548c597a78614c5872f50d0d1900e0193 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e41547c548c597a78614c587… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Jan 16 16:22:49 2020 +0800 ntdll: Fix some Rtl* functions having wrong calling convention. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-rtlsupport-l1-1-0.spec | 2 +- dlls/kernel32/kernel32.spec | 2 +- dlls/ntdll/ntdll.spec | 6 +++--- dlls/ntdll/signal_x86_64.c | 2 +- dlls/ntdll/tests/exception.c | 8 ++++---- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/api-ms-win-core-rtlsupport-l1-1-0/api-ms-win-core-rtlsupport-l1-1-0.spec b/dlls/api-ms-win-core-rtlsupport-l1-1-0/api-ms-win-core-rtlsupport-l1-1-0.spec index 030506858b..0554127929 100644 --- a/dlls/api-ms-win-core-rtlsupport-l1-1-0/api-ms-win-core-rtlsupport-l1-1-0.spec +++ b/dlls/api-ms-win-core-rtlsupport-l1-1-0/api-ms-win-core-rtlsupport-l1-1-0.spec @@ -9,7 +9,7 @@ @ stdcall -arch=arm,arm64,x86_64 RtlLookupFunctionEntry(long ptr ptr) ntdll.RtlLookupFunctionEntry @ stdcall RtlPcToFileHeader(ptr ptr) ntdll.RtlPcToFileHeader @ stdcall -norelay RtlRaiseException(ptr) ntdll.RtlRaiseException -@ stdcall -arch=x86_64 RtlRestoreContext(ptr ptr) ntdll.RtlRestoreContext +@ cdecl -arch=x86_64 RtlRestoreContext(ptr ptr) ntdll.RtlRestoreContext @ stdcall -norelay RtlUnwind(ptr ptr ptr ptr) ntdll.RtlUnwind @ stdcall -arch=arm64,x86_64 RtlUnwindEx(ptr ptr ptr ptr ptr ptr) ntdll.RtlUnwindEx @ stdcall -arch=arm64,x86_64 RtlVirtualUnwind(long long long ptr ptr ptr ptr ptr) ntdll.RtlVirtualUnwind diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index a14bed04be..be48ef1694 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1299,7 +1299,7 @@ @ stdcall RtlMoveMemory(ptr ptr long) ntdll.RtlMoveMemory @ stdcall -arch=x86_64,arm,arm64 RtlPcToFileHeader(ptr ptr) ntdll.RtlPcToFileHeader @ stdcall -arch=arm -norelay RtlRaiseException(ptr) ntdll.RtlRaiseException -@ stdcall -arch=x86_64 RtlRestoreContext(ptr ptr) ntdll.RtlRestoreContext +@ cdecl -arch=x86_64 RtlRestoreContext(ptr ptr) ntdll.RtlRestoreContext @ stdcall RtlUnwind(ptr ptr ptr long) ntdll.RtlUnwind @ stdcall -arch=arm64,x86_64 RtlUnwindEx(long long ptr long ptr) ntdll.RtlUnwindEx @ stdcall -arch=arm64,x86_64 RtlVirtualUnwind(long long long ptr ptr ptr ptr ptr) ntdll.RtlVirtualUnwind diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 415a43ab53..fe36235bda 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -463,7 +463,7 @@ @ stdcall RtlAddMandatoryAce(ptr long long long long ptr) # @ stub RtlAddRange @ cdecl -arch=arm,arm64,x86_64 RtlAddFunctionTable(ptr long long) -@ cdecl -arch=arm,arm64,x86_64 RtlAddGrowableFunctionTable(ptr ptr long long long long) +@ stdcall -arch=arm,arm64,x86_64 RtlAddGrowableFunctionTable(ptr ptr long long long long) @ stdcall RtlAddRefActivationContext(ptr) # @ stub RtlAddRefMemoryStream @ stdcall RtlAddVectoredContinueHandler(long ptr) @@ -572,7 +572,7 @@ @ stdcall RtlDeleteAce(ptr long) @ stdcall RtlDeleteAtomFromAtomTable(ptr long) @ stdcall RtlDeleteCriticalSection(ptr) -@ cdecl -arch=arm,arm64,x86_64 RtlDeleteGrowableFunctionTable(ptr) +@ stdcall -arch=arm,arm64,x86_64 RtlDeleteGrowableFunctionTable(ptr) @ stub RtlDeleteElementGenericTable @ stub RtlDeleteElementGenericTableAvl @ cdecl -arch=arm,arm64,x86_64 RtlDeleteFunctionTable(ptr) @@ -902,7 +902,7 @@ @ stdcall RtlRemoveVectoredContinueHandler(ptr) @ stdcall RtlRemoveVectoredExceptionHandler(ptr) @ stdcall RtlResetRtlTranslations(ptr) -@ stdcall -arch=x86_64 RtlRestoreContext(ptr ptr) +@ cdecl -arch=x86_64 RtlRestoreContext(ptr ptr) @ stdcall RtlRestoreLastWin32Error(long) RtlSetLastWin32Error @ stub RtlRevertMemoryStream @ stub RtlRunDecodeUnicodeString diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index c372f65b34..04f3854388 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -3747,7 +3747,7 @@ __ASM_GLOBAL_FUNC( call_consolidate_callback, /******************************************************************* * RtlRestoreContext (NTDLL.@) */ -void WINAPI RtlRestoreContext( CONTEXT *context, EXCEPTION_RECORD *rec ) +void CDECL RtlRestoreContext( CONTEXT *context, EXCEPTION_RECORD *rec ) { EXCEPTION_REGISTRATION_RECORD *teb_frame = NtCurrentTeb()->Tib.ExceptionList; diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 7b77cbb795..e8b481e703 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -150,15 +150,15 @@ static BOOLEAN (CDECL *pRtlAddFunctionTable)(RUNTIME_FUNCTION*, DWORD, DWORD64 static BOOLEAN (CDECL *pRtlDeleteFunctionTable)(RUNTIME_FUNCTION*); static BOOLEAN (CDECL *pRtlInstallFunctionTableCallback)(DWORD64, DWORD64, DWORD, PGET_RUNTIME_FUNCTION_CALLBACK, PVOID, PCWSTR); static PRUNTIME_FUNCTION (WINAPI *pRtlLookupFunctionEntry)(ULONG64, ULONG64*, UNWIND_HISTORY_TABLE*); -static DWORD (CDECL *pRtlAddGrowableFunctionTable)(void**, RUNTIME_FUNCTION*, DWORD, DWORD, ULONG_PTR, ULONG_PTR); -static void (CDECL *pRtlGrowFunctionTable)(void*, DWORD); -static void (CDECL *pRtlDeleteGrowableFunctionTable)(void*); +static DWORD (WINAPI *pRtlAddGrowableFunctionTable)(void**, RUNTIME_FUNCTION*, DWORD, DWORD, ULONG_PTR, ULONG_PTR); +static void (WINAPI *pRtlGrowFunctionTable)(void*, DWORD); +static void (WINAPI *pRtlDeleteGrowableFunctionTable)(void*); static EXCEPTION_DISPOSITION (WINAPI *p__C_specific_handler)(EXCEPTION_RECORD*, ULONG64, CONTEXT*, DISPATCHER_CONTEXT*); static VOID (WINAPI *pRtlCaptureContext)(CONTEXT*); static VOID (CDECL *pRtlRestoreContext)(CONTEXT*, EXCEPTION_RECORD*); static NTSTATUS (WINAPI *pRtlWow64GetThreadContext)(HANDLE, WOW64_CONTEXT *); static NTSTATUS (WINAPI *pRtlWow64SetThreadContext)(HANDLE, const WOW64_CONTEXT *); -static VOID (CDECL *pRtlUnwindEx)(VOID*, VOID*, EXCEPTION_RECORD*, VOID*, CONTEXT*, UNWIND_HISTORY_TABLE*); +static VOID (WINAPI *pRtlUnwindEx)(VOID*, VOID*, EXCEPTION_RECORD*, VOID*, CONTEXT*, UNWIND_HISTORY_TABLE*); static int (CDECL *p_setjmp)(_JUMP_BUFFER*); #endif

1 0

Gabriel Ivăncescu : msctf: Clear the corresponding DocumentMgr pointers for Associated Focus Windows on destruction.
by Alexandre Julliard Jan. 16, 2020

Jan. 16, 2020

Module: wine Branch: master Commit: 6393edb71425283c23eea59c71ecad3f153f5ede URL: https://source.winehq.org/git/wine.git/?a=commit;h=6393edb71425283c23eea59c… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Jan 15 18:02:03 2020 +0200 msctf: Clear the corresponding DocumentMgr pointers for Associated Focus Windows on destruction. Fixes a regression introduced by d541087079a8770bb02bae830c56a6d3c0b6424e. AssociateFocus does not grab ownership of the Document Manager, but it does return it in the "prev" output parameter with an increased refcount. So, if the docmgr gets destroyed and AssociateFocus is called again, its "prev" parameter will refer to freed memory. Windows sets it to NULL in such case. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48469 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msctf/tests/inputprocessor.c | 15 +++++++++++++-- dlls/msctf/threadmgr.c | 14 ++++++++++++-- 2 files changed, 25 insertions(+), 4 deletions(-) diff --git a/dlls/msctf/tests/inputprocessor.c b/dlls/msctf/tests/inputprocessor.c index 38c591ea40..f8ec492f7f 100644 --- a/dlls/msctf/tests/inputprocessor.c +++ b/dlls/msctf/tests/inputprocessor.c @@ -2287,6 +2287,7 @@ static void test_AssociateFocus(void) ITfDocumentMgr *dm1, *dm2, *olddm, *dmcheck, *dmorig; HWND wnd1, wnd2, wnd3; HRESULT hr; + ULONG ref; ITfThreadMgr_GetFocus(g_tm, &dmorig); test_CurrentFocus = NULL; @@ -2428,10 +2429,20 @@ static void test_AssociateFocus(void) processPendingMessages(); SetFocus(wnd1); processPendingMessages(); - test_OnSetFocus = SINK_UNEXPECTED; + + hr = ITfThreadMgr_AssociateFocus(g_tm,wnd2,dm2,&olddm); + ok(SUCCEEDED(hr),"AssociateFocus failed\n"); + + /* Vista doesn't return NULL */ + if (olddm) ITfDocumentMgr_Release(olddm); + ref = ITfDocumentMgr_Release(dm2); + ok(ref == 0, "incorrect DocumentMgr ref %d\n", ref); + + hr = ITfThreadMgr_AssociateFocus(g_tm,wnd2,NULL,&olddm); + ok(SUCCEEDED(hr),"AssociateFocus failed\n"); + ok(olddm == NULL, "incorrect old DocumentMgr returned\n"); ITfDocumentMgr_Release(dm1); - ITfDocumentMgr_Release(dm2); test_CurrentFocus = dmorig; test_PrevFocus = FOCUS_IGNORE; diff --git a/dlls/msctf/threadmgr.c b/dlls/msctf/threadmgr.c index 2c208fbc04..77cf47ca4f 100644 --- a/dlls/msctf/threadmgr.c +++ b/dlls/msctf/threadmgr.c @@ -1530,6 +1530,8 @@ void ThreadMgr_OnDocumentMgrDestruction(ITfThreadMgr *iface, ITfDocumentMgr *mgr { ThreadMgr *This = impl_from_ITfThreadMgrEx((ITfThreadMgrEx *)iface); struct list *cursor; + BOOL found = FALSE; + LIST_FOR_EACH(cursor, &This->CreatedDocumentMgrs) { DocumentMgrEntry *mgrentry = LIST_ENTRY(cursor,DocumentMgrEntry,entry); @@ -1537,8 +1539,16 @@ void ThreadMgr_OnDocumentMgrDestruction(ITfThreadMgr *iface, ITfDocumentMgr *mgr { list_remove(cursor); HeapFree(GetProcessHeap(),0,mgrentry); - return; + found = TRUE; + break; } } - FIXME("ITfDocumentMgr %p not found in this thread\n",mgr); + if (!found) FIXME("ITfDocumentMgr %p not found in this thread\n",mgr); + + LIST_FOR_EACH(cursor, &This->AssociatedFocusWindows) + { + AssociatedWindow *wnd = LIST_ENTRY(cursor,AssociatedWindow,entry); + if (wnd->docmgr == mgr) + wnd->docmgr = NULL; + } }

1 0

Nikolay Sivov : dwrite/tests: Improve DrawUnderline() test reliability by using text tested font actually supports.
by Alexandre Julliard Jan. 16, 2020

Jan. 16, 2020

Module: wine Branch: master Commit: bccac4d2a1c06a2ea824fdda0b20d033b13f9c3b URL: https://source.winehq.org/git/wine.git/?a=commit;h=bccac4d2a1c06a2ea824fdda… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jan 16 13:14:38 2020 +0300 dwrite/tests: Improve DrawUnderline() test reliability by using text tested font actually supports. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/layout.c | 34 ++++++++++++++++++++++++++++------ 1 file changed, 28 insertions(+), 6 deletions(-) diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index 8532555e06..48b2880079 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -5346,14 +5346,17 @@ todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); count = IDWriteFontCollection_GetFontFamilyCount(syscollection); - for (i = 0; i < count; i++) { + for (i = 0; i < count; ++i) + { DWRITE_FONT_METRICS fontmetrics; IDWriteLocalizedStrings *names; struct renderer_context ctxt; IDWriteFontFamily *family; IDWriteFontFace *fontface; + WCHAR nameW[256], str[1]; IDWriteFont *font; - WCHAR nameW[256]; + UINT32 codepoint; + UINT16 glyph; BOOL exists; format = NULL; @@ -5414,19 +5417,38 @@ todo_wine DWRITE_FONT_STRETCH_NORMAL, fontmetrics.designUnitsPerEm, enusW, &format); ok(hr == S_OK, "got 0x%08x\n", hr); - hr = IDWriteFactory_CreateTextLayout(factory, strW, 2, format, 30000.0f, 100.0f, &layout); - ok(hr == S_OK, "got 0x%08x\n", hr); + /* Look for first supported character to avoid triggering fallback path. With fallback it's harder to test + DrawUnderline() metrics, because actual resolved fontface is not passed to it. Grabbing fontface instance + from corresponding DrawGlyphRun() call is not straightforward. */ + for (codepoint = ' '; codepoint < 0xffff; ++codepoint) + { + glyph = 0; + hr = IDWriteFontFace_GetGlyphIndices(fontface, &codepoint, 1, &glyph); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + if (glyph) + break; + } + + if (!glyph) + { + skip("Couldn't find reasonable test string.\n"); + goto cleanup; + } + + str[0] = codepoint; + hr = IDWriteFactory_CreateTextLayout(factory, str, 1, format, 30000.0f, 100.0f, &layout); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); range.startPosition = 0; range.length = 2; hr = IDWriteTextLayout_SetUnderline(layout, TRUE, range); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); memset(&ctxt, 0, sizeof(ctxt)); ctxt.format = format; ctxt.familyW = nameW; hr = IDWriteTextLayout_Draw(layout, &ctxt, &testrenderer, 0.0f, 0.0f); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); cleanup: if (layout)

1 0

Zhiyi Zhang : api-ms-win-core-rtlsupport-l1-2-0: Add missing spec file entries.
by Alexandre Julliard Jan. 16, 2020

Jan. 16, 2020

Module: wine Branch: master Commit: 54fb785c6aaad4bf83ff9750bd278f9c4e903bf0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=54fb785c6aaad4bf83ff9750… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Jan 16 16:23:48 2020 +0800 api-ms-win-core-rtlsupport-l1-2-0: Add missing spec file entries. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48416 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-rtlsupport-l1-2-0.spec | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/api-ms-win-core-rtlsupport-l1-2-0/api-ms-win-core-rtlsupport-l1-2-0.spec b/dlls/api-ms-win-core-rtlsupport-l1-2-0/api-ms-win-core-rtlsupport-l1-2-0.spec index a037b0d260..35f7dbba72 100644 --- a/dlls/api-ms-win-core-rtlsupport-l1-2-0/api-ms-win-core-rtlsupport-l1-2-0.spec +++ b/dlls/api-ms-win-core-rtlsupport-l1-2-0/api-ms-win-core-rtlsupport-l1-2-0.spec @@ -1,6 +1,16 @@ +@ cdecl -arch=arm,arm64,x86_64 RtlAddFunctionTable(ptr long long) ntdll.RtlAddFunctionTable +@ stdcall -arch=arm,arm64,x86_64 RtlAddGrowableFunctionTable(ptr ptr long long long long) ntdll.RtlAddGrowableFunctionTable @ stdcall -norelay RtlCaptureContext(ptr) ntdll.RtlCaptureContext @ stdcall RtlCaptureStackBackTrace(long long ptr ptr) ntdll.RtlCaptureStackBackTrace @ stdcall RtlCompareMemory(ptr ptr long) ntdll.RtlCompareMemory +@ cdecl -arch=arm,arm64,x86_64 RtlDeleteFunctionTable(ptr) ntdll.RtlDeleteFunctionTable +@ stdcall -arch=arm,arm64,x86_64 RtlDeleteGrowableFunctionTable(ptr) ntdll.RtlDeleteGrowableFunctionTable +@ stdcall -arch=arm,arm64,x86_64 RtlGrowFunctionTable(ptr long) ntdll.RtlGrowFunctionTable +@ cdecl -arch=arm,arm64,x86_64 RtlInstallFunctionTableCallback(long long long ptr ptr wstr) ntdll.RtlInstallFunctionTableCallback +@ stdcall -arch=arm,arm64,x86_64 RtlLookupFunctionEntry(long ptr ptr) ntdll.RtlLookupFunctionEntry @ stdcall RtlPcToFileHeader(ptr ptr) ntdll.RtlPcToFileHeader @ stdcall -norelay RtlRaiseException(ptr) ntdll.RtlRaiseException +@ cdecl -arch=x86_64 RtlRestoreContext(ptr ptr) ntdll.RtlRestoreContext @ stdcall -norelay RtlUnwind(ptr ptr ptr ptr) ntdll.RtlUnwind +@ stdcall -arch=arm64,x86_64 RtlUnwindEx(ptr ptr ptr ptr ptr ptr) ntdll.RtlUnwindEx +@ stdcall -arch=arm64,x86_64 RtlVirtualUnwind(long long long ptr ptr ptr ptr ptr) ntdll.RtlVirtualUnwind

1 0

Francois Gouget : testbot/Janitor: There should be no *_work file in staging/.
by Alexandre Julliard Jan. 16, 2020

Jan. 16, 2020

Module: tools Branch: master Commit: 48f5d08f456471cbcafd28adf3140d999971b958 URL: https://source.winehq.org/git/tools.git/?a=commit;h=48f5d08f456471cbcafd28a… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Jan 16 14:33:55 2020 +0100 testbot/Janitor: There should be no *_work file in staging/. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/Janitor.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/bin/Janitor.pl b/testbot/bin/Janitor.pl index 579a432..f78c75d 100755 --- a/testbot/bin/Janitor.pl +++ b/testbot/bin/Janitor.pl @@ -276,7 +276,7 @@ if (opendir(my $dh, "$DataDir/staging")) # These files always expire after one day $TTL = 1 - $Age; } - elsif ($Entry !~ /^[0-9a-f]{32}_(?:patch|patch\.diff|wine-patches|winetest(?:64)?-latest\.exe|work)$/) + elsif ($Entry !~ /^[0-9a-f]{32}_(?:patch|patch\.diff|wine-patches|winetest(?:64)?-latest\.exe)$/) { my $Deletion = defined $TTL ? " (deletion in $TTL days)" : ""; Error "Found a suspicious file$Deletion: staging/$Entry\n";

1 0

Francois Gouget : testbot/LogUtils: Return the log errors as a single object.
by Alexandre Julliard Jan. 16, 2020

Jan. 16, 2020

Module: tools Branch: master Commit: b399f285bacbda8838c18211ad143650a37f7032 URL: https://source.winehq.org/git/tools.git/?a=commit;h=b399f285bacbda8838c1821… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Jan 16 15:43:21 2020 +0100 testbot/LogUtils: Return the log errors as a single object. The $LogInfo structure is more extensible and can carry additional information such as the total number of errors (ErrCount) and the total number of new errors (NewCount). Adjust _AddErrorGroup(), TagNewErrors() and _DumpErrors() to take the new $LogInfo structure returned by GetLogErrors() instead of the ($Groups, $Errors) tuple. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineSendLog.pl | 26 ++++---- testbot/lib/WineTestBot/LogUtils.pm | 129 ++++++++++++++++++++++-------------- testbot/web/JobDetails.pl | 21 +++--- 3 files changed, 103 insertions(+), 73 deletions(-) Diff: https://source.winehq.org/git/tools.git/?a=commitdiff;h=b399f285bacbda8838c…

1 0