April 2022 - Wine-commits - list.winehq.org

Francois Gouget : oleaut32/tests: The EUR abbreviation is not recognized as a currency.
by Alexandre Julliard 27 Apr '22

27 Apr '22

Module: wine Branch: master Commit: 7d2eecd341f54b016da67a37292960fabd3cef79 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7d2eecd341f54b016da67a37… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Apr 27 15:21:35 2022 +0200 oleaut32/tests: The EUR abbreviation is not recognized as a currency. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/vartest.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index 4fc0e4e0221..cdbb836b041 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -2151,6 +2151,12 @@ static void test_VarParseNumFromStrFr(void) EXPECT2(1,2); EXPECTRGB(2,FAILDIG); + /* The three-letter Euro abbreviation is not allowed */ + WCONVERT(L"12EUR", NUMPRS_CURRENCY); + EXPECT(2,NUMPRS_CURRENCY,0,2,0,0); + EXPECT2(1,2); + EXPECTRGB(2,FAILDIG); + /* With flag and decimal flag, consumes decimal point and following digits */ WCONVERT(L"12,1\x20ac", NUMPRS_CURRENCY|NUMPRS_DECIMAL|NUMPRS_USE_ALL); EXPECT(3,NUMPRS_CURRENCY|NUMPRS_DECIMAL|NUMPRS_USE_ALL,NUMPRS_CURRENCY|NUMPRS_DECIMAL,5,0,-1);

1 0

Francois Gouget : kernel32/tests: Fix the spelling of a comment.
by Alexandre Julliard 27 Apr '22

27 Apr '22

Module: wine Branch: master Commit: c6c3cdc6978d007df7355cb390b9fccef5923824 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c6c3cdc6978d007df7355cb3… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Apr 27 15:22:38 2022 +0200 kernel32/tests: Fix the spelling of a comment. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/heap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c index 36649e901a1..fded1c69f1e 100644 --- a/dlls/kernel32/tests/heap.c +++ b/dlls/kernel32/tests/heap.c @@ -338,7 +338,7 @@ static void test_HeapCreate(void) ok( !!heap, "HeapCreate failed, error %lu\n", GetLastError() ); ok( !((ULONG_PTR)heap & 0xffff), "wrong heap alignment\n" ); - /* theshold between failure and success varies, and w7pro64 has a much larger overhead. */ + /* threshold between failure and success varies, and w7pro64 has a much larger overhead. */ ptr = HeapAlloc( heap, 0, alloc_size - (0x400 + 0x100 * sizeof(void *)) ); ok( !!ptr, "HeapAlloc failed, error %lu\n", GetLastError() );

1 0

Francois Gouget : user32/tests: Trace monitor information with 'monitor info'.
by Alexandre Julliard 27 Apr '22

27 Apr '22

Module: wine Branch: master Commit: 57b38565967510b8f43436613952a1c787b91fb1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=57b38565967510b8f4343661… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Apr 27 15:22:32 2022 +0200 user32/tests: Trace monitor information with 'monitor info'. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/monitor.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index 02bc6651dd3..94cb7e60382 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -2530,9 +2530,38 @@ static void test_display_dc(void) } } +BOOL CALLBACK MonitorEnumProc(HMONITOR hMonitor, HDC hdcMonitor, + LPRECT lprcMonitor, LPARAM dwData) +{ + MONITORINFOEXW info; + static int index; + + info.cbSize = sizeof(info); + if (GetMonitorInfoW(hMonitor, (MONITORINFO*)&info)) + { + printf("Monitor %d %7s [%02lx] %s %s\n", index, + (info.dwFlags & MONITORINFOF_PRIMARY) ? "primary" : "", + info.dwFlags, wine_dbgstr_rect(&info.rcMonitor), + wine_dbgstr_w(info.szDevice)); + } + index++; + return TRUE; +} + START_TEST(monitor) { + char** myARGV; + int myARGC = winetest_get_mainargs(&myARGV); + init_function_pointers(); + + if (myARGC >= 3 && strcmp(myARGV[2], "info") == 0) + { + printf("Monitor information:\n"); + EnumDisplayMonitors(NULL, NULL, MonitorEnumProc, 0); + return; + } + test_enumdisplaydevices(); test_ChangeDisplaySettingsEx(); test_DisplayConfigSetDeviceInfo();

1 0

Francois Gouget : po: Fix a typo in the Asturian translation.
by Alexandre Julliard 27 Apr '22

27 Apr '22

Module: wine Branch: master Commit: b13143d0fd6161d165ebdae8c1d9f276792d7421 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b13143d0fd6161d165ebdae8… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Apr 27 15:28:18 2022 +0200 po: Fix a typo in the Asturian translation. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ast.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/ast.po b/po/ast.po index 0fa3764c58c..dcc15692f70 100644 --- a/po/ast.po +++ b/po/ast.po @@ -18462,7 +18462,7 @@ msgid "" "The command is invalid.\n" msgstr "" "wineconsole: Falló l'aniciu del programa %s.\n" -"El comandu nun ye válidu.s\n" +"El comandu nun ye válidu.\n" #: programs/winedbg/winedbg.rc:50 programs/winedbg/winedbg.rc:38 msgid "Program Error"

1 0

Francois Gouget : po: Fix the indentation of a usage message in the Brazilian translation.
by Alexandre Julliard 27 Apr '22

27 Apr '22

Module: wine Branch: master Commit: 327e7e770cf50285e51c3f09c130d7ed91ba526e URL: https://source.winehq.org/git/wine.git/?a=commit;h=327e7e770cf50285e51c3f09… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Apr 27 15:32:55 2022 +0200 po: Fix the indentation of a usage message in the Brazilian translation. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/pt_BR.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/pt_BR.po b/po/pt_BR.po index a2e3bfb7e94..4d189662d18 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -16449,7 +16449,7 @@ msgid "" " Access the registry using the 64-bit view.\n" "\n" msgstr "" -" /reg:32\n" +" /reg:32\n" " Acessa o registro utilizando o modo 32-bits.\n" "\n" " /reg:64\n"

1 0

Francois Gouget : po: Fix a trailing full stop inconsistency in the Asturian translation.
by Alexandre Julliard 27 Apr '22

27 Apr '22

Module: wine Branch: master Commit: bfd82be0ffe699e809777c7e1750f6a63c3d7d07 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bfd82be0ffe699e809777c7e… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Apr 27 15:36:36 2022 +0200 po: Fix a trailing full stop inconsistency in the Asturian translation. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ast.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/ast.po b/po/ast.po index dcc15692f70..8e614d4a0ab 100644 --- a/po/ast.po +++ b/po/ast.po @@ -16954,7 +16954,7 @@ msgstr "Usu: taskkill [/?] [/f] [/im NomeProcesu | /pid IDProcesu]\n" msgid "Error: Unknown or invalid command line option specified.\n" msgstr "" "Fallu: Especificáronse na llinia de comandos opciones non\n" -"válides o desconocíes\n" +"válides o desconocíes.\n" #: programs/taskkill/taskkill.rc:32 msgid "Error: Invalid command line parameter specified.\n"

1 0

Francois Gouget : po: Fix trailing full stop inconsistencies in the Czech translation.
by Alexandre Julliard 27 Apr '22

27 Apr '22

Module: wine Branch: master Commit: 8c68e19364ebbcfedf1e16400ef98a6141e9135a URL: https://source.winehq.org/git/wine.git/?a=commit;h=8c68e19364ebbcfedf1e1640… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Apr 27 15:39:40 2022 +0200 po: Fix trailing full stop inconsistencies in the Czech translation. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/cs.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/po/cs.po b/po/cs.po index 25edfee3c2b..09d7730cff4 100644 --- a/po/cs.po +++ b/po/cs.po @@ -2951,7 +2951,7 @@ msgstr "" #: dlls/cryptui/cryptui.rc:125 msgid "Proves your identity to a remote computer" -msgstr "Je Vaším ověřením vůči vzdálenému počítači." +msgstr "Je Vaším ověřením vůči vzdálenému počítači" #: dlls/cryptui/cryptui.rc:126 msgid "" @@ -2977,7 +2977,7 @@ msgstr "" #: dlls/cryptui/cryptui.rc:131 msgid "Allows data on disk to be encrypted" -msgstr "Umožní, aby data na disku byla šifrována." +msgstr "Umožní, aby data na disku byla šifrována" #: dlls/cryptui/cryptui.rc:147 msgid "Private Key Archival" @@ -19707,7 +19707,7 @@ msgstr "Chyba: příkazová řádka není podporovaná\n" #: programs/wmic/wmic.rc:29 msgid "Error: Alias not found\n" -msgstr "Chyba: alternativní název nenalezen.\n" +msgstr "Chyba: alternativní název nenalezen\n" #: programs/wmic/wmic.rc:30 msgid "Error: Invalid query\n"

1 0

Francois Gouget : po: Fix trailing full stop inconsistencies in the Turkish translation.
by Alexandre Julliard 27 Apr '22

27 Apr '22

Module: wine Branch: master Commit: 89459ff147614eedd3e407981c75bf1e8e267812 URL: https://source.winehq.org/git/wine.git/?a=commit;h=89459ff147614eedd3e40798… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Apr 27 15:43:28 2022 +0200 po: Fix trailing full stop inconsistencies in the Turkish translation. The translation's trailing full stop use should match the English version. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/tr.po | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/po/tr.po b/po/tr.po index 840f61846cc..da6e89a5ce3 100644 --- a/po/tr.po +++ b/po/tr.po @@ -8306,7 +8306,7 @@ msgstr "Kısayol oluşturuluyor" #: dlls/msi/msi.rc:99 msgid "Deleting services" -msgstr "Hizmetler siliniyor." +msgstr "Hizmetler siliniyor" #: dlls/msi/msi.rc:100 msgid "Creating duplicate files" @@ -8330,7 +8330,7 @@ msgstr "ODBC bileşenleri yükleniyor" #: dlls/msi/msi.rc:106 msgid "Installing new services" -msgstr "Yeni hizmetler yükleniyor." +msgstr "Yeni hizmetler yükleniyor" #: dlls/msi/msi.rc:107 msgid "Installing system catalog" @@ -12643,11 +12643,11 @@ msgstr "Bu dizi sabit veya geçici olarak kilitli" #: dlls/vbscript/vbscript.rc:34 msgid "Type mismatch" -msgstr "Tür eşleşmiyor." +msgstr "Tür eşleşmiyor" #: dlls/vbscript/vbscript.rc:36 msgid "Device I/O error" -msgstr "Aygıt G/Ç hatası." +msgstr "Aygıt G/Ç hatası" #: dlls/vbscript/vbscript.rc:37 msgid "File already exists" @@ -12663,7 +12663,7 @@ msgstr "Çok fazla dosya" #: dlls/vbscript/vbscript.rc:40 msgid "Permission denied" -msgstr "İzin engellendi." +msgstr "İzin engellendi" #: dlls/vbscript/vbscript.rc:41 msgid "Path/File access error" @@ -17101,43 +17101,43 @@ msgstr "" #: programs/regsvr32/regsvr32.rc:43 msgid "regsvr32: Failed to load DLL '%1'\n" -msgstr "regsvr32: '%1' DLL dosyası yüklenemedi.\n" +msgstr "regsvr32: '%1' DLL dosyası yüklenemedi\n" #: programs/regsvr32/regsvr32.rc:44 msgid "regsvr32: '%1!S!' not implemented in DLL '%2'\n" -msgstr "regsvr32: '%1!S!', '%2% DLL dosyasında yok.\n" +msgstr "regsvr32: '%1!S!', '%2% DLL dosyasında yok\n" #: programs/regsvr32/regsvr32.rc:45 msgid "regsvr32: Failed to register DLL '%1'\n" -msgstr "regsvr32: '%1' DLL dosyası kaydedilemedi.\n" +msgstr "regsvr32: '%1' DLL dosyası kaydedilemedi\n" #: programs/regsvr32/regsvr32.rc:46 msgid "regsvr32: Successfully registered DLL '%1'\n" -msgstr "regsvr32: '%1' DLL dosyası başarıyla kaydedildi.\n" +msgstr "regsvr32: '%1' DLL dosyası başarıyla kaydedildi\n" #: programs/regsvr32/regsvr32.rc:47 msgid "regsvr32: Failed to unregister DLL '%1'\n" -msgstr "regsvr32: '%1' DLL dosyası kayıttan kaldırılamadı.\n" +msgstr "regsvr32: '%1' DLL dosyası kayıttan kaldırılamadı\n" #: programs/regsvr32/regsvr32.rc:48 msgid "regsvr32: Successfully unregistered DLL '%1'\n" -msgstr "regsvr32: '%1' DLL dosyası başarıyla kayıttan kaldırıldı.\n" +msgstr "regsvr32: '%1' DLL dosyası başarıyla kayıttan kaldırıldı\n" #: programs/regsvr32/regsvr32.rc:49 msgid "regsvr32: Failed to install DLL '%1'\n" -msgstr "regsvr32: '%1' DLL dosyası yüklenemedi.\n" +msgstr "regsvr32: '%1' DLL dosyası yüklenemedi\n" #: programs/regsvr32/regsvr32.rc:50 msgid "regsvr32: Successfully installed DLL '%1'\n" -msgstr "regsvr32: '%1' DLL dosyası başarıyla yüklendi.\n" +msgstr "regsvr32: '%1' DLL dosyası başarıyla yüklendi\n" #: programs/regsvr32/regsvr32.rc:51 msgid "regsvr32: Failed to uninstall DLL '%1'\n" -msgstr "regsvr32: '%1' DLL dosyası kaldırılamadı.\n" +msgstr "regsvr32: '%1' DLL dosyası kaldırılamadı\n" #: programs/regsvr32/regsvr32.rc:52 msgid "regsvr32: Successfully uninstalled DLL '%1'\n" -msgstr "regsvr32: '%1' DLL dosyası başarıyla kaldırıldı.\n" +msgstr "regsvr32: '%1' DLL dosyası başarıyla kaldırıldı\n" #: programs/start/start.rc:57 #, fuzzy @@ -18127,7 +18127,7 @@ msgstr "" #: programs/uninstaller/uninstaller.rc:33 msgid "uninstaller: Invalid option [%1]\n" -msgstr "uninstaller: '%1' geçersiz seçenek.\n" +msgstr "uninstaller: '%1' geçersiz seçenek\n" #: programs/uninstaller/uninstaller.rc:35 msgid ""

1 0

Floris Renaud : po: Add missing examples in Dutch translation.
by Alexandre Julliard 27 Apr '22

27 Apr '22

Module: wine Branch: master Commit: c68bd28981b5f3a389e64d7e718e6da944ba878f URL: https://source.winehq.org/git/wine.git/?a=commit;h=c68bd28981b5f3a389e64d7e… Author: Floris Renaud <jkfloris(a)dds.nl> Date: Wed Apr 27 16:46:04 2022 +0200 po: Add missing examples in Dutch translation. Signed-off-by: Floris Renaud <jkfloris(a)dds.nl> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/nl.po | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/po/nl.po b/po/nl.po index 8318d5fc54c..c1c3f35c650 100644 --- a/po/nl.po +++ b/po/nl.po @@ -16761,6 +16761,10 @@ msgstr "" " plek aan waar het register informatie wordt geëxporteerd.\n" " [sleutel] De te wijzigen registersleutel.\n" "\n" +"Bijvoorbeeld:\n" +" regedit \"import.reg\"\n" +" regedit /E \"export.reg\" \"HKEY_CURRENT_USER\\Console\"\n" +" regedit /D \"HKEY_LOCAL_MACHINE\\Sleutel\\Pad\"\n" #: programs/regedit/regedit.rc:409 msgid "regedit: Invalid or unrecognized switch [%1]\n"

1 0

Paul Gofman : msvcp140/tests: Add a broken last error result in test_Copy_file().
by Alexandre Julliard 27 Apr '22

27 Apr '22

Module: wine Branch: master Commit: ae48b2c9ee70df5b8cd765ab28845aa2581c8149 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ae48b2c9ee70df5b8cd765ab… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Apr 27 09:03:33 2022 -0500 msvcp140/tests: Add a broken last error result in test_Copy_file(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52857 Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp140/tests/msvcp140.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp140/tests/msvcp140.c b/dlls/msvcp140/tests/msvcp140.c index 1df2f058424..640e44e5b7c 100644 --- a/dlls/msvcp140/tests/msvcp140.c +++ b/dlls/msvcp140/tests/msvcp140.c @@ -1614,12 +1614,14 @@ static void test_Copy_file(void) SetLastError(0xdeadbeef); ret = p_Copy_file(L"wine_test_dir/f1", L"wine_test_dir/f3"); ok(ret == ERROR_SUCCESS, "Got unexpected ret %lu.\n", ret); - ok(GetLastError() == ret, "Got unexpected err %lu.\n", GetLastError()); + ok(GetLastError() == ret || broken(GetLastError() == ERROR_INVALID_PARAMETER) /* some win8 machines */, + "Got unexpected err %lu.\n", GetLastError()); SetLastError(0xdeadbeef); ret = p_Copy_file(L"wine_test_dir/f1", L"wine_test_dir/f3"); ok(ret == ERROR_SUCCESS, "Got unexpected ret %lu.\n", ret); - ok(GetLastError() == ret, "Got unexpected err %lu.\n", GetLastError()); + ok(GetLastError() == ret || broken(GetLastError() == ERROR_INVALID_PARAMETER) /* some win8 machines */, + "Got unexpected err %lu.\n", GetLastError()); SetLastError(0xdeadbeef); ret = p_Copy_file(L"wine_test_dir/missing", L"wine_test_dir/f3");

1 0