January 2020 - Wine-Commits

Thomas Faber : setupapi/tests: Remove an unused variable.
by Alexandre Julliard Jan. 8, 2020

Jan. 8, 2020

Module: wine Branch: master Commit: dc968dae42e3b3162e2767ed32b0f91ae9b23ad3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dc968dae42e3b3162e2767ed… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Wed Jan 8 20:05:41 2020 +0100 setupapi/tests: Remove an unused variable. Signed-off-by: Thomas Faber <thomas.faber(a)reactos.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/tests/devinst.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index 68478b5d80..a02752d2de 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -1446,7 +1446,7 @@ static void test_register_device_iface(void) 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', 'E','n','u','m','\\','R','o','o','t','\\', 'L','E','G','A','C','Y','_','B','O','G','U','S',0}; - SP_DEVICE_INTERFACE_DATA iface = {sizeof(iface)}, ret_iface = {sizeof(ret_iface)}; + SP_DEVICE_INTERFACE_DATA iface = {sizeof(iface)}; SP_DEVINFO_DATA device = {sizeof(device)}; HDEVINFO set, set2; BOOL ret;

1 0

Piotr Caban : ucrtbase: Fix end pointer setting in parse_double on partial nan/infinity match.
by Alexandre Julliard Jan. 7, 2020

Jan. 7, 2020

Module: wine Branch: master Commit: 3fc3d24c3cfb411439bf5773067ce42aa09edb6b URL: https://source.winehq.org/git/wine.git/?a=commit;h=3fc3d24c3cfb411439bf5773… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jan 7 15:35:52 2020 +0100 ucrtbase: Fix end pointer setting in parse_double on partial nan/infinity match. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/string.c | 4 ++++ dlls/ucrtbase/tests/string.c | 2 ++ 2 files changed, 6 insertions(+) diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 78a115550c..c4bd8ab129 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -706,7 +706,11 @@ double parse_double(MSVCRT_wchar_t (*get)(void *ctx), void (*unget)(void *ctx), if(keep) { if (str_match == _infinity) return sign*INFINITY; if (str_match == _nan) return sign*NAN; + } else if(found_sign) { + unget(ctx); } + + return make_double(sign, exp, d, ROUND_ZERO, err); } if(nch == '0') { diff --git a/dlls/ucrtbase/tests/string.c b/dlls/ucrtbase/tests/string.c index 0bb3feaa2f..c18b5483aa 100644 --- a/dlls/ucrtbase/tests/string.c +++ b/dlls/ucrtbase/tests/string.c @@ -144,6 +144,8 @@ static void test_strtod(void) test_strtod_str("inf42", INFINITY, 3); test_strtod_str("inffoo", INFINITY, 3); test_strtod_str("infini", INFINITY, 3); + test_strtod_str("input", 0, 0); + test_strtod_str("-input", 0, 0); test_strtod_str("NAN", NAN, 3); test_strtod_str("nan", NAN, 3);

1 0

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

Jan. 7, 2020

Module: wine Branch: master Commit: 6b839a0f85236aac2cc794d5d586f1ba371866b1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6b839a0f85236aac2cc794d5… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jan 6 14:47:44 2020 -0600 wininet/tests: Fix some test failures with Windows 10. Windows 10 1607+ no longer validates a NULL window handle, so remove that test. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/tests/internet.c | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index c7525f796b..e69b45a7e6 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -25,6 +25,7 @@ #include "winbase.h" #include "winuser.h" #include "wininet.h" +#include "winineti.h" #include "winerror.h" #include "winreg.h" @@ -1498,13 +1499,6 @@ static void test_InternetErrorDlg(void) req = HttpOpenRequestA(con, "GET", "/", NULL, NULL, NULL, 0, 0); ok(req != 0, "HttpOpenRequest failed: 0x%08x\n", GetLastError()); - /* NULL hwnd and FLAGS_ERROR_UI_FLAGS_NO_UI not set */ - for(i = INTERNET_ERROR_BASE; i < INTERNET_ERROR_LAST; i++) - { - res = InternetErrorDlg(NULL, req, i, 0, NULL); - ok(res == ERROR_INVALID_HANDLE, "Got %d (%d)\n", res, i); - } - hwnd = GetDesktopWindow(); ok(hwnd != NULL, "GetDesktopWindow failed (%d)\n", GetLastError()); @@ -1537,6 +1531,8 @@ static void test_InternetErrorDlg(void) if(i == ERROR_INTERNET_SEC_CERT_REVOKED) continue; /* Interactive (XP, Win7) */ + if (i == ERROR_INTERNET_PROXY_ALERT) + continue; /* Interactive (Win10 1607+) */ res = InternetErrorDlg(hwnd, req, i, FLAGS_ERROR_UI_FLAGS_NO_UI, NULL); @@ -1550,13 +1546,8 @@ static void test_InternetErrorDlg(void) expected = ERROR_CANCELLED; break; case ERROR_INTERNET_FORTEZZA_LOGIN_NEEDED: - if(res != expected) - { - /* Windows XP, W2K3 */ - ok(res == NTE_PROV_TYPE_NOT_DEF, "Got %d\n", res); - win_skip("Skipping some tests for %d\n", i); - continue; - } + if (res == NTE_PROV_TYPE_NOT_DEF) /* XP, 2003 */ + expected = NTE_PROV_TYPE_NOT_DEF; break; case ERROR_INTERNET_CHG_POST_IS_NON_SECURE: if(res == ERROR_SUCCESS) /* win10 returns ERROR_SUCCESS */ @@ -1565,6 +1556,9 @@ static void test_InternetErrorDlg(void) default: break; } + if (expected == ERROR_NOT_SUPPORTED && res == ERROR_CANCELLED) /* Win10 1607+ */ + expected = ERROR_CANCELLED; + todo_wine_if(test_flags & FLAG_TODO) ok(res == expected, "Got %d, expected %d (%d)\n", res, expected, i);

1 0

Nikolay Sivov : kernel32/tests: Remove GetLongPathName() workarounds.
by Alexandre Julliard Jan. 7, 2020

Jan. 7, 2020

Module: wine Branch: master Commit: 05061846c1f2fe0179cd12af8aa1f8986cad29d1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=05061846c1f2fe0179cd12af… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 7 12:48:28 2020 +0300 kernel32/tests: Remove GetLongPathName() workarounds. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/path.c | 363 +++++++++++++++++++-------------------------- 1 file changed, 152 insertions(+), 211 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=05061846c1f2fe0179cd…

1 0

Nikolay Sivov : ole32/tests: Link to CoInitializeEx() directly.
by Alexandre Julliard Jan. 7, 2020

Jan. 7, 2020

Module: wine Branch: master Commit: d65c9fc94f60fb3c3eea2fa56dfbb1f8bf97c476 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d65c9fc94f60fb3c3eea2fa5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 7 15:46:20 2020 +0300 ole32/tests: Link to CoInitializeEx() directly. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/compobj.c | 70 ++++++++++++++++++++-------------------------- dlls/ole32/tests/marshal.c | 26 ++++++++--------- 2 files changed, 43 insertions(+), 53 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d65c9fc94f60fb3c3eea…

1 0

Louis Lenders : combase: Add GetRestrictedErrorInfo and RoOriginateLanguageException stubs.
by Alexandre Julliard Jan. 7, 2020

Jan. 7, 2020

Module: wine Branch: master Commit: 774aaa1d309dfc9eaa0cd6390890d88387fbae4b URL: https://source.winehq.org/git/wine.git/?a=commit;h=774aaa1d309dfc9eaa0cd639… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Tue Jan 7 20:45:32 2020 +0100 combase: Add GetRestrictedErrorInfo and RoOriginateLanguageException stubs. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46972 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-winrt-error-l1-1-0.spec | 2 +- .../api-ms-win-core-winrt-error-l1-1-1.spec | 4 ++-- dlls/combase/combase.spec | 4 ++-- dlls/combase/roapi.c | 19 +++++++++++++++++++ 4 files changed, 24 insertions(+), 5 deletions(-) diff --git a/dlls/api-ms-win-core-winrt-error-l1-1-0/api-ms-win-core-winrt-error-l1-1-0.spec b/dlls/api-ms-win-core-winrt-error-l1-1-0/api-ms-win-core-winrt-error-l1-1-0.spec index de0a6d8bd9..99f1ca357c 100644 --- a/dlls/api-ms-win-core-winrt-error-l1-1-0/api-ms-win-core-winrt-error-l1-1-0.spec +++ b/dlls/api-ms-win-core-winrt-error-l1-1-0/api-ms-win-core-winrt-error-l1-1-0.spec @@ -1,4 +1,4 @@ -@ stub GetRestrictedErrorInfo +@ stdcall GetRestrictedErrorInfo(ptr) combase.GetRestrictedErrorInfo @ stub RoCaptureErrorContext @ stub RoFailFastWithErrorContext @ stub RoGetErrorReportingFlags diff --git a/dlls/api-ms-win-core-winrt-error-l1-1-1/api-ms-win-core-winrt-error-l1-1-1.spec b/dlls/api-ms-win-core-winrt-error-l1-1-1/api-ms-win-core-winrt-error-l1-1-1.spec index b1ad813fcb..0b390f1f80 100644 --- a/dlls/api-ms-win-core-winrt-error-l1-1-1/api-ms-win-core-winrt-error-l1-1-1.spec +++ b/dlls/api-ms-win-core-winrt-error-l1-1-1/api-ms-win-core-winrt-error-l1-1-1.spec @@ -1,4 +1,4 @@ -@ stub GetRestrictedErrorInfo +@ stdcall GetRestrictedErrorInfo(ptr) combase.GetRestrictedErrorInfo @ stub IsErrorPropagationEnabled @ stub RoCaptureErrorContext @ stub RoClearError @@ -9,7 +9,7 @@ @ stub RoInspectThreadErrorInfo @ stub RoOriginateError @ stub RoOriginateErrorW -@ stub RoOriginateLanguageException +@ stdcall RoOriginateLanguageException(long ptr ptr) combase.RoOriginateLanguageException @ stub RoReportFailedDelegate @ stub RoReportUnhandledError @ stub RoResolveRestrictedErrorInfoReference diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index 93575d5684..f67527adf6 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -180,7 +180,7 @@ @ stub GetFuncDescs @ stdcall GetHGlobalFromStream(ptr ptr) ole32.GetHGlobalFromStream @ stub GetHookInterface -@ stub GetRestrictedErrorInfo +@ stdcall GetRestrictedErrorInfo(ptr) @ stub HSTRING_UserFree @ stub HSTRING_UserFree64 @ stub HSTRING_UserMarshal @@ -260,7 +260,7 @@ @ stub RoInspectThreadErrorInfo @ stub RoOriginateError @ stub RoOriginateErrorW -@ stub RoOriginateLanguageException +@ stdcall RoOriginateLanguageException(long ptr ptr) @ stub RoParameterizedTypeExtraGetTypeSignature @ stdcall RoRegisterActivationFactories(ptr ptr long ptr) @ stdcall RoRegisterForApartmentShutdown(ptr ptr ptr) diff --git a/dlls/combase/roapi.c b/dlls/combase/roapi.c index c9fe80f456..94b79ff3cf 100644 --- a/dlls/combase/roapi.c +++ b/dlls/combase/roapi.c @@ -21,6 +21,7 @@ #include "initguid.h" #include "roapi.h" #include "roparameterizediid.h" +#include "roerrorapi.h" #include "winstring.h" #include "wine/debug.h" @@ -275,6 +276,24 @@ HRESULT WINAPI RoRegisterActivationFactories(HSTRING *classes, PFNGETACTIVATIONF return S_OK; } +/*********************************************************************** + * GetRestrictedErrorInfo (combase.@) + */ +HRESULT WINAPI GetRestrictedErrorInfo(IRestrictedErrorInfo **info) +{ + FIXME( "(%p)\n", info ); + return E_NOTIMPL; +} + +/*********************************************************************** + * RoOriginateLanguageException (combase.@) + */ +BOOL WINAPI RoOriginateLanguageException(HRESULT error, HSTRING message, IUnknown *language_exception) +{ + FIXME("(%x %s %p) stub\n", error, debugstr_hstring(message), language_exception); + return FALSE; +} + /*********************************************************************** * CleanupTlsOleState (combase.@) */

1 0

Paul Gofman : user32/tests: Handle results on Win10 in test_Image_StretchMode().
by Alexandre Julliard Jan. 7, 2020

Jan. 7, 2020

Module: wine Branch: master Commit: ade89071f0530e4eedfd0845b58a396610ed6474 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ade89071f0530e4eedfd0845… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Tue Jan 7 19:15:40 2020 +0300 user32/tests: Handle results on Win10 in test_Image_StretchMode(). Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/cursoricon.c | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c index 8ce1eb163e..6687ebc4a8 100644 --- a/dlls/user32/tests/cursoricon.c +++ b/dlls/user32/tests/cursoricon.c @@ -2813,7 +2813,8 @@ static COLORREF get_color_from_bits(const unsigned char *bits, const BITMAPINFO #define compare_bitmap_bits(a, b, c, d, e, f, g) compare_bitmap_bits_(__LINE__, a, b, c, d, e, f, g) static void compare_bitmap_bits_(unsigned int line, HDC hdc, HBITMAP bitmap, BITMAPINFO *bmi, - size_t result_bits_size, const unsigned char *expected_bits, unsigned int test_index, BOOL todo) + size_t result_bits_size, const unsigned char *expected_bits, unsigned int test_index, + const unsigned char *expected_broken_bits) { unsigned char *result_bits; unsigned int row, column; @@ -2832,9 +2833,9 @@ static void compare_bitmap_bits_(unsigned int line, HDC hdc, HBITMAP bitmap, BIT result = get_color_from_bits(result_bits, bmi, row, column); expected = get_color_from_bits(expected_bits, bmi, row, column); - todo_wine_if(todo) - ok_(__FILE__, line)(result == expected, "Colors do not match, " - "got 0x%06x, expected 0x%06x, test_index %u, row %u, column %u.\n", + ok_(__FILE__, line)(result == expected || broken(expected_broken_bits + && result == get_color_from_bits(expected_broken_bits, bmi, row, column)), + "Colors do not match, got 0x%06x, expected 0x%06x, test_index %u, row %u, column %u.\n", result, expected, test_index, row, column); } HeapFree(GetProcessHeap(), 0, result_bits); @@ -2849,11 +2850,16 @@ static void test_Image_StretchMode(void) 0x00, 0xff, 0xff, 0x00, 0xff, 0x00, 0x00, 0xff, 0xff, 0x00, 0xff, 0x00, 0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x00, 0xff, 0x00, 0x00, 0xff, 0x00, }; - static const unsigned char expected_bits_24[] = + static const unsigned char expected_broken_bits_24[] = { 0x3f, 0xff, 0x00, 0x3f, 0xff, 0x3f, 0x00, 0x00, 0x3f, 0xff, 0x7f, 0x00, 0xff, 0x3f, 0x00, 0x00, }; + static const unsigned char expected_bits_24[] = + { + 0x00, 0xff, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, + 0x00, 0xff, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, + }; #define rgb16(r, g, b) ((WORD)(((r >> 3) << 10) | ((g >> 3) << 5) | (b >> 3))) static const WORD test_bits_16[] = { @@ -2907,20 +2913,21 @@ static void test_Image_StretchMode(void) size_t test_bits_size, result_bits_size; const RGBQUAD *bmi_colors; size_t bmi_colors_size; - BOOL todo; + const unsigned char *expected_broken_bits; } tests[] = { {4, 4, 2, 2, 24, test_bits_24, expected_bits_24, - sizeof(test_bits_24), sizeof(expected_bits_24), NULL, 0, TRUE}, + sizeof(test_bits_24), sizeof(expected_bits_24), NULL, 0, + /* Broken on Windows before Win10 1607+ */ expected_broken_bits_24}, {4, 4, 2, 2, 1, test_bits_1, expected_bits_1, sizeof(test_bits_1), sizeof(expected_bits_1), colors_bits_1, - sizeof(colors_bits_1), FALSE}, + sizeof(colors_bits_1)}, {4, 4, 2, 2, 8, test_bits_8, expected_bits_8, sizeof(test_bits_8), sizeof(expected_bits_8), colors_bits_8, - sizeof(colors_bits_8), FALSE}, + sizeof(colors_bits_8)}, {4, 4, 2, 2, 16, (const unsigned char *)test_bits_16, (const unsigned char *)expected_bits_16, - sizeof(test_bits_16), sizeof(expected_bits_16), NULL, 0, FALSE}, + sizeof(test_bits_16), sizeof(expected_bits_16), NULL, 0}, }; static const char filename[] = "test.bmp"; BITMAPINFO *bmi, *bmi_output; @@ -2966,7 +2973,7 @@ static void test_Image_StretchMode(void) ok(!!bitmap_copy, "CopyImage() failed, result %u.\n", GetLastError()); compare_bitmap_bits(hdc, bitmap_copy, bmi_output, tests[test_index].result_bits_size, - tests[test_index].expected_bits, test_index, tests[test_index].todo); + tests[test_index].expected_bits, test_index, tests[test_index].expected_broken_bits); DeleteObject(bitmap); DeleteObject(bitmap_copy); @@ -2976,7 +2983,7 @@ static void test_Image_StretchMode(void) ok(!!bitmap, "LoadImageA() failed, result %u.\n", GetLastError()); DeleteFileA(filename); compare_bitmap_bits(hdc, bitmap, bmi_output, tests[test_index].result_bits_size, - tests[test_index].expected_bits, test_index, tests[test_index].todo); + tests[test_index].expected_bits, test_index, tests[test_index].expected_broken_bits); DeleteObject(bitmap); } ReleaseDC(0, hdc);

1 0

Zebediah Figura : user32/tests: Avoid testing that GDI handles are no longer valid.
by Alexandre Julliard Jan. 7, 2020

Jan. 7, 2020

Module: wine Branch: master Commit: 388dd4d890c45abb7bcdc0fe04ff38be8c0782c8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=388dd4d890c45abb7bcdc0fe… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jan 6 16:10:04 2020 -0600 user32/tests: Avoid testing that GDI handles are no longer valid. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/clipboard.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/dlls/user32/tests/clipboard.c b/dlls/user32/tests/clipboard.c index 4436ece70d..df23bb2894 100644 --- a/dlls/user32/tests/clipboard.c +++ b/dlls/user32/tests/clipboard.c @@ -1397,7 +1397,6 @@ static void test_handles( HWND hwnd ) h = SetClipboardData( CF_BITMAP, bitmap ); ok( h == bitmap, "got %p\n", h ); ok( GetObjectType( h ) == OBJ_BITMAP, "expected bitmap %p\n", h ); - ok( !GetObjectType( bitmap_temp ), "expected free object %p\n", bitmap_temp ); h = SetClipboardData( CF_DSPBITMAP, bitmap2 ); ok( h == bitmap2, "got %p\n", h ); ok( GetObjectType( h ) == OBJ_BITMAP, "expected bitmap %p\n", h ); @@ -1605,9 +1604,6 @@ static void test_handles( HWND hwnd ) ok( is_freed( hmoveable ) || broken( !is_freed( hmoveable )), "expected freed mem %p\n", hmoveable ); ok( is_fixed( empty_fixed ), "expected fixed mem %p\n", empty_fixed ); ok( is_fixed( hfixed ), "expected fixed mem %p\n", hfixed ); - ok( !GetObjectType( bitmap ), "expected freed handle %p\n", bitmap ); - ok( !GetObjectType( bitmap2 ), "expected freed handle %p\n", bitmap2 ); - ok( !GetObjectType( palette ), "expected freed handle %p\n", palette ); r = CloseClipboard(); ok( r, "gle %d\n", GetLastError() ); @@ -1896,7 +1892,6 @@ static void test_data_handles(void) ok( GetObjectType( bitmap ) == OBJ_BITMAP, "expected bitmap %p\n", bitmap ); r = EmptyClipboard(); ok( r, "gle %d\n", GetLastError() ); - ok( !GetObjectType( bitmap ), "expected deleted %p\n", bitmap ); r = CloseClipboard(); ok( r, "gle %d\n", GetLastError() );

1 0

Kim Malmo : po: Fix a typo in Norwegian translation.
by Alexandre Julliard Jan. 7, 2020

Jan. 7, 2020

Module: wine Branch: master Commit: c1192daa0a208f4f64bbc1395c627280f661472b URL: https://source.winehq.org/git/wine.git/?a=commit;h=c1192daa0a208f4f64bbc139… Author: Kim Malmo <berencamlost(a)msn.com> Date: Tue Jan 7 20:49:59 2020 +0100 po: Fix a typo in Norwegian translation. Signed-off-by: Kim Malmo <berencamlost(a)msn.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/nb_NO.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/po/nb_NO.po b/po/nb_NO.po index b4ebed3cf4..764f436c67 100644 --- a/po/nb_NO.po +++ b/po/nb_NO.po @@ -3285,7 +3285,7 @@ msgstr "Fram" #: iccvid.rc:28 iccvid.rc:29 msgid "Cinepak Video codec" -msgstr "Cinepak-videokodek" +msgstr "Cinepak videokodeks" #: ieframe.rc:28 shell32.rc:114 notepad.rc:29 oleview.rc:30 oleview.rc:80 #: progman.rc:32 taskmgr.rc:35 view.rc:31 winefile.rc:28 winhlp32.rc:31 @@ -7895,14 +7895,14 @@ msgstr "" #: msrle32.rc:31 msgid "Wine MS-RLE video codec" -msgstr "Wine MS-RLE-videokodek" +msgstr "Wine MS-RLE videokodeks" #: msrle32.rc:32 msgid "" "Wine MS-RLE video codec\n" "Copyright 2002 by Michael Guennewig" msgstr "" -"Wine MS-RLE-videokodek\n" +"Wine MS-RLE videokodeks\n" "Kopirett 2002 tilhører Michael Günnewig" #: msvfw32.rc:33 @@ -7943,7 +7943,7 @@ msgstr "Fulle bilder (ukomprimert)" #: msvidc32.rc:29 msgid "Wine Video 1 video codec" -msgstr "Wine Video 1-videokodek" +msgstr "Wine Video 1 videokodeks" #: oleacc.rc:31 msgid "unknown object"

1 0

Zebediah Figura : user32/tests: Fix a dialog test failure on Windows 10.
by Alexandre Julliard Jan. 7, 2020

Jan. 7, 2020

Module: wine Branch: master Commit: 83876059597a6e47a595084386f6d19b36a96e53 URL: https://source.winehq.org/git/wine.git/?a=commit;h=83876059597a6e47a5950843… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jan 6 20:01:57 2020 -0600 user32/tests: Fix a dialog test failure on Windows 10. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/dialog.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/user32/tests/dialog.c b/dlls/user32/tests/dialog.c index b72f08816d..2a7d71f67a 100644 --- a/dlls/user32/tests/dialog.c +++ b/dlls/user32/tests/dialog.c @@ -1984,6 +1984,8 @@ static void test_MessageBoxFontTest(void) ncMetrics.cbSize = FIELD_OFFSET(NONCLIENTMETRICSW, iPaddedBorderWidth); SystemParametersInfoW(SPI_GETNONCLIENTMETRICS, 0, &ncMetrics, 0); + /* The height doesn't match on Windows 10 1709+. */ + ncMetrics.lfMessageFont.lfHeight = lfStaticFont.lfHeight; ok( !memcmp(&lfStaticFont, &ncMetrics.lfMessageFont, FIELD_OFFSET(LOGFONTW, lfFaceName)) && !lstrcmpW(lfStaticFont.lfFaceName, ncMetrics.lfMessageFont.lfFaceName), "dialog doesn't use message box font\n");

1 0