wine-commits January 2018

wine-commits@winehq.org

2 participants
638 discussions

Alexandre Julliard : regedit/tests: Get rid of version check.
by Alexandre Julliard 02 Jan '18

02 Jan '18

Module: wine Branch: master Commit: 6c5deaa4745e0fdf7cef46499a9593c17c946087 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6c5deaa4745e0fdf7cef4649… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 2 15:22:16 2018 +0100 regedit/tests: Get rid of version check. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/tests/regedit.c | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index d67c57b..3bab7e1 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -1647,7 +1647,7 @@ static void test_invalid_import_unicode(void) { LONG lr; HKEY hkey; - DWORD dword = 0x8, os_version, major_version, minor_version; + DWORD dword = 0x8; lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); ok(lr == ERROR_SUCCESS || lr == ERROR_FILE_NOT_FOUND, "RegDeleteKeyA failed: %d\n", lr); @@ -1740,19 +1740,10 @@ static void test_invalid_import_unicode(void) "\"Test10\"=\"Value\"\n"); verify_reg_nonexist(hkey, "Test10"); - os_version = GetVersion(); - major_version = LOBYTE(LOWORD(os_version)); - minor_version = HIBYTE(LOWORD(os_version)); - - if (major_version > 5 || (major_version == 5 && minor_version > 0)) - { - exec_import_wstr("\xef\xbb\xbfWindows Registry Editor version 5.00\n\n" - "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" - "\"Test11\"=\"Value\"\n"); - verify_reg_nonexist(hkey, "Test11"); - } - else /* Windows 2000 */ - win_skip("Skipping a non-standard header test\n"); + exec_import_wstr("\xef\xbb\xbfWindows Registry Editor version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Test11\"=\"Value\"\n"); + verify_reg_nonexist(hkey, "Test11"); /* Test multi-line import with incorrect comma placement */ exec_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n"

1 0

Alexandre Julliard : reg/tests: Get rid of version check.
by Alexandre Julliard 02 Jan '18

02 Jan '18

Module: wine Branch: master Commit: 59c47c9e2c08bd09288633317d1aa6d285532220 URL: https://source.winehq.org/git/wine.git/?a=commit;h=59c47c9e2c08bd0928863331… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 2 15:11:04 2018 +0100 reg/tests: Get rid of version check. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 50fae7f..b64defb 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -4328,7 +4328,7 @@ error: static void test_export(void) { LONG err; - DWORD r, os_version, major_version, minor_version, dword; + DWORD r, dword; HKEY hkey, subkey; BYTE hex[4]; @@ -4454,23 +4454,15 @@ static void test_export(void) run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - os_version = GetVersion(); - major_version = LOBYTE(LOWORD(os_version)); - minor_version = HIBYTE(LOWORD(os_version)); - - if (major_version > 5 || (major_version == 5 && minor_version == 2)) - { - run_reg_exe("reg export /y HKEY_CURRENT_USER\\" KEY_BASE " file.reg", &r); - ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + run_reg_exe("reg export /y HKEY_CURRENT_USER\\" KEY_BASE " file.reg", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); - run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " /y file.reg", &r); - ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " /y file.reg", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); - run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg /y", &r); - ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - } - else /* Windows XP (32-bit) and older */ - win_skip("File overwrite flag [/y] not supported; skipping position tests\n"); + run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg /y", &r); + ok(r == REG_EXIT_SUCCESS || broken(r == REG_EXIT_FAILURE), /* winxp */ + "got exit code %d, expected 0\n", r); ok(compare_export("file.reg", empty_key_test, 0), "compare_export() failed\n");

1 0

Alexandre Julliard : ntdll: Don' t set floating point registers from initial context.
by Alexandre Julliard 02 Jan '18

02 Jan '18

Module: wine Branch: master Commit: 5020fb7c478a080461df8655a3eac629648c4488 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5020fb7c478a080461df8655… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 2 13:25:50 2018 +0100 ntdll: Don't set floating point registers from initial context. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_i386.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 07425e2..dcca0f5 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -2897,6 +2897,7 @@ __ASM_GLOBAL_FUNC( start_thread, "call " __ASM_NAME("virtual_clear_thread_stack") "\n\t" /* switch to the initial context */ "movl %esi,(%esp)\n\t" + "movl $0x10007,(%esi)\n\t" /* context->ContextFlags = CONTEXT_FULL */ "call " __ASM_NAME("set_cpu_context") ) extern void DECLSPEC_NORETURN call_thread_exit_func( int status, void (*func)(int) );

1 0

Zebediah Figura : advapi32/tests: Skip tests modifying HKLM if limited.
by Alexandre Julliard 02 Jan '18

02 Jan '18

Module: wine Branch: master Commit: 0c5381c6ce10e4baac2a863c39c884f7b85d228e URL: https://source.winehq.org/git/wine.git/?a=commit;h=0c5381c6ce10e4baac2a863c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jan 2 00:34:35 2018 -0600 advapi32/tests: Skip tests modifying HKLM if limited. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/registry.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 4ea0f68..f669728 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -2507,6 +2507,12 @@ static void test_redirection(void) } } + if (limited_user) + { + skip("not enough privileges to modify HKLM\n"); + return; + } + err = RegCreateKeyExA( HKEY_LOCAL_MACHINE, "Software\\Wine", 0, NULL, 0, KEY_WOW64_64KEY | KEY_ALL_ACCESS, NULL, &root64, NULL ); ok( err == ERROR_SUCCESS, "RegCreateKeyExA failed: %u\n", err );

1 0

Zebediah Figura : kernel32/tests: Update product type test.
by Alexandre Julliard 02 Jan '18

02 Jan '18

Module: wine Branch: master Commit: e87ced67c8b15a0d78e0142fac68af56bc4bf544 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e87ced67c8b15a0d78e0142f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jan 2 00:34:11 2018 -0600 kernel32/tests: Update product type test. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/version.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/version.c b/dlls/kernel32/tests/version.c index 4182c06..7b13598 100644 --- a/dlls/kernel32/tests/version.c +++ b/dlls/kernel32/tests/version.c @@ -87,7 +87,7 @@ static void test_GetProductInfo(void) res = pGetProductInfo(entry[0], entry[1], entry[2], entry[3], &product); if (entry[0] >= 6) - ok(res && (product > PRODUCT_UNDEFINED) && (product <= PRODUCT_PROFESSIONAL_WMC), + ok(res && (product > PRODUCT_UNDEFINED) && (product <= PRODUCT_ENTERPRISE_S_N_EVALUATION), "got %d and 0x%x (expected TRUE and a valid PRODUCT_* value)\n", res, product); else ok(!res && !product && (GetLastError() == 0xdeadbeef),

1 0

Zebediah Figura : mpr/tests: Fix drive search loop.
by Alexandre Julliard 02 Jan '18

02 Jan '18

Module: wine Branch: master Commit: 84b0ed91610d43cedfe4803d6e93511a3afe6528 URL: https://source.winehq.org/git/wine.git/?a=commit;h=84b0ed91610d43cedfe4803d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jan 2 00:33:48 2018 -0600 mpr/tests: Fix drive search loop. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mpr/tests/mpr.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/mpr/tests/mpr.c b/dlls/mpr/tests/mpr.c index a6af1b5..330e66b 100644 --- a/dlls/mpr/tests/mpr.c +++ b/dlls/mpr/tests/mpr.c @@ -284,8 +284,9 @@ static void test_WNetUseConnection(void) strcpy(netRes->lpRemoteName, "\\\\127.0.0.1\\c$"); bufSize = 0; ret = pWNetUseConnectionA(NULL, netRes, NULL, NULL, 0, NULL, &bufSize, &outRes); - if (ret == ERROR_ALREADY_ASSIGNED) continue; + if (ret != ERROR_ALREADY_ASSIGNED) break; } + if (ret == ERROR_ALREADY_ASSIGNED) goto end; /* no drives available */ todo_wine ok(ret == WN_SUCCESS, "Unexpected return: %u\n", ret); ok(bufSize == 0, "Unexpected buffer size: %u\n", bufSize); if (ret == WN_SUCCESS) WNetCancelConnectionA(drive, TRUE); @@ -310,6 +311,7 @@ static void test_WNetUseConnection(void) ok(bufSize == 4, "Unexpected buffer size: %u\n", bufSize); if (ret == WN_SUCCESS) WNetCancelConnectionA(drive, TRUE); +end: HeapFree(GetProcessHeap(), 0, netRes); }

1 0

Nikolay Sivov : user32/tests: Add missing return value test (Coverity).
by Alexandre Julliard 02 Jan '18

02 Jan '18

Module: wine Branch: master Commit: 7fad896f2943c0a0c896a57fa06b2f68955203ac URL: https://source.winehq.org/git/wine.git/?a=commit;h=7fad896f2943c0a0c896a57f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jan 1 17:56:41 2018 +0300 user32/tests: Add missing return value test (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/dialog.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/dialog.c b/dlls/user32/tests/dialog.c index f7aae80..afc3473 100644 --- a/dlls/user32/tests/dialog.c +++ b/dlls/user32/tests/dialog.c @@ -1476,7 +1476,8 @@ static void test_DialogBoxParam(void) ret = DialogBoxParamA(GetModuleHandleA(NULL), "TEST_EMPTY_DIALOG", 0, TestDefButtonDlgProc, 0); ok(ret == IDOK, "Expected IDOK\n"); - DialogBoxParamA(GetModuleHandleA(NULL), "TEST_EMPTY_DIALOG", 0, TestReturnKeyDlgProc, 0); + ret = DialogBoxParamA(GetModuleHandleA(NULL), "TEST_EMPTY_DIALOG", 0, TestReturnKeyDlgProc, 0); + ok(ret == 0, "Unexpected ret value %ld.\n", ret); /* WM_SETTEXT handling in case of A/W dialog procedures vs A/W dialog window. */ ret = DialogBoxParamW(GetModuleHandleA(NULL), nameW, 0, test_aw_conversion_dlgproc, 0);

1 0

Alex Henrie : psapi/tests: Increase GetPerformanceInfo error margins for Windows 8.
by Alexandre Julliard 02 Jan '18

02 Jan '18

Module: wine Branch: master Commit: 4f5342f26b037faa24a210750e4a25116a8ddd46 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4f5342f26b037faa24a21075… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Dec 31 19:21:15 2017 -0700 psapi/tests: Increase GetPerformanceInfo error margins for Windows 8. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/psapi/tests/psapi_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/psapi/tests/psapi_main.c b/dlls/psapi/tests/psapi_main.c index 50dfdd9..cd07ce7 100644 --- a/dlls/psapi/tests/psapi_main.c +++ b/dlls/psapi/tests/psapi_main.c @@ -230,11 +230,11 @@ static void test_GetPerformanceInfo(void) /* TODO: info.SystemCache not checked yet - to which field(s) does this value correspond to? */ - ok(check_with_margin(info.KernelTotal, sys_performance_info->PagedPoolUsage + sys_performance_info->NonPagedPoolUsage, 64), + ok(check_with_margin(info.KernelTotal, sys_performance_info->PagedPoolUsage + sys_performance_info->NonPagedPoolUsage, 256), "expected approximately %ld but got %d\n", info.KernelTotal, sys_performance_info->PagedPoolUsage + sys_performance_info->NonPagedPoolUsage); - ok(check_with_margin(info.KernelPaged, sys_performance_info->PagedPoolUsage, 64), + ok(check_with_margin(info.KernelPaged, sys_performance_info->PagedPoolUsage, 256), "expected approximately %ld but got %d\n", info.KernelPaged, sys_performance_info->PagedPoolUsage); ok(check_with_margin(info.KernelNonpaged, sys_performance_info->NonPagedPoolUsage, 16),

1 0

Alex Henrie : po: Fix Catalan spelling and grammar ( Softcatalà quality check).
by Alexandre Julliard 02 Jan '18

02 Jan '18

Module: wine Branch: master Commit: 3a7597aa61c06c61bdb3cbd4918a192dbd53a7b4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3a7597aa61c06c61bdb3cbd4… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Dec 31 19:20:08 2017 -0700 po: Fix Catalan spelling and grammar (Softcatalà quality check). Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ca.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/po/ca.po b/po/ca.po index 0fdec04..ce96015 100644 --- a/po/ca.po +++ b/po/ca.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2017-12-17 18:14-0700\n" +"PO-Revision-Date: 2017-12-31 19:18-0700\n" "Last-Translator: Alex Henrie <alexhenrie24(a)gmail.com>\n" "Language-Team: Catalan\n" "Language: ca\n" @@ -6913,7 +6913,7 @@ msgstr "S'està assignant espai en el registre" #: msi.rc:91 msgid "Searching for installed applications" -msgstr "S'estan cercant aplicacions instalades" +msgstr "S'estan cercant aplicacions instal·lades" #: msi.rc:92 msgid "Binding executables" @@ -6969,7 +6969,7 @@ msgstr "S'està instal·lant el catàleg de sistema" #: msi.rc:107 msgid "Validating install" -msgstr "S'està validant l'instalació" +msgstr "S'està validant l'instal·lació" #: msi.rc:108 msgid "Evaluating launch conditions" @@ -6987,7 +6987,7 @@ msgstr "S'estan movent fixters" #: msi.rc:111 msgid "Publishing assembly information" -msgstr "S'està publicant informació de assemblatge" +msgstr "S'està publicant informació d'assemblatge" #: msi.rc:112 msgid "Unpublishing assembly information" @@ -10640,7 +10640,7 @@ msgid "" "Specifying no open command after the equal sign removes the command string\n" "associated to the specified file type.\n" msgstr "" -"FTYPE mostra o modifica les ordres d'obertura associats amb els tipus de\n" +"FTYPE mostra o modifica les ordres d'obertura associades amb els tipus de\n" "fitxers.\n" "\n" "Sintaxi: FTYPE [tipusDeFitxer[=[ordreDeObertura]]]\n"

1 0

Anders Jonsson : po: Update Swedish translation.
by Alexandre Julliard 02 Jan '18

02 Jan '18

Module: wine Branch: master Commit: b074af7828fb13d03bd94a78a7723263fd5bc488 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b074af7828fb13d03bd94a78… Author: Anders Jonsson <anders.jonsson(a)norsjovallen.se> Date: Sun Dec 31 01:33:41 2017 +0100 po: Update Swedish translation. Signed-off-by: Anders Jonsson <anders.jonsson(a)norsjovallen.se> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/sv.po | 1274 ++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 622 insertions(+), 652 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b074af7828fb13d03bd9…

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits January 2018