January 2018 - Wine-Commits

André Hentschel : wsdapi: Fix WSDXMLGetValueFromAny spec file entry.
by Alexandre Julliard Jan. 2, 2018

Jan. 2, 2018

Module: wine Branch: master Commit: 6762fe855174c3b217421d5866ddd71be28b57a5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6762fe855174c3b217421d58… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Dec 30 19:20:05 2017 +0100 wsdapi: Fix WSDXMLGetValueFromAny spec file entry. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wsdapi/wsdapi.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wsdapi/wsdapi.spec b/dlls/wsdapi/wsdapi.spec index 22457c9..95ee072 100644 --- a/dlls/wsdapi/wsdapi.spec +++ b/dlls/wsdapi/wsdapi.spec @@ -42,4 +42,4 @@ @ stdcall WSDXMLCleanupElement(ptr) @ stdcall WSDXMLCreateContext(ptr) @ stub WSDXMLGetNameFromBuiltinNamespace -@ stdcall WSDXMLGetValueFromAny(wstr wstr ptr wstr) +@ stdcall WSDXMLGetValueFromAny(wstr wstr ptr ptr)

1 0

André Hentschel : kernel32/tests: Don' t test functions directly when reporting GetLastError().
by Alexandre Julliard Jan. 2, 2018

Jan. 2, 2018

Module: wine Branch: master Commit: a1da7dbd2b63321fa91546e64d6c24003eefe78b URL: https://source.winehq.org/git/wine.git/?a=commit;h=a1da7dbd2b63321fa91546e6… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Dec 30 19:57:58 2017 +0100 kernel32/tests: Don't test functions directly when reporting GetLastError(). Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/process.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 07067ab..d0d623f 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -3035,7 +3035,7 @@ static void test_SuspendProcessNewThread(void) PVOID exe_base, exit_thread_ptr; IMAGE_NT_HEADERS nt_header; HANDLE thread_handle = NULL; - DWORD exit_code = 0; + DWORD dret, exit_code = 0; CONTEXT ctx; exit_thread_ptr = GetProcAddress(hkernel32, "ExitThread"); @@ -3097,8 +3097,10 @@ static void test_SuspendProcessNewThread(void) #endif ResumeThread( thread_handle ); - ok(WaitForSingleObject(thread_handle, 60000) == WAIT_OBJECT_0, "Waiting for remote thread failed (%d)\n", GetLastError()); - ok(GetExitCodeThread(thread_handle, &exit_code), "Failed to retrieve remote thread exit code (%d)\n", GetLastError()); + dret = WaitForSingleObject(thread_handle, 60000); + ok(dret == WAIT_OBJECT_0, "Waiting for remote thread failed (%d)\n", GetLastError()); + ret = GetExitCodeThread(thread_handle, &exit_code); + ok(ret, "Failed to retrieve remote thread exit code (%d)\n", GetLastError()); ok(exit_code == 0x1234, "Invalid remote thread exit code\n"); ret = are_imports_resolved(pi.hProcess, exe_base, &nt_header);

1 0

Alexandre Julliard : ntdll: Don' t set floating point registers from initial context.
by Alexandre Julliard Jan. 2, 2018

Jan. 2, 2018

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

André Hentschel : inetcomm/tests: Don' t test function directly when reporting GetLastError().
by Alexandre Julliard Jan. 2, 2018

Jan. 2, 2018

Module: wine Branch: master Commit: ad40af14acb57380fea775ab35708cd0b28111c1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ad40af14acb57380fea775ab… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Dec 30 19:58:00 2017 +0100 inetcomm/tests: Don't test function directly when reporting GetLastError(). Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/inetcomm/tests/mimeole.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/inetcomm/tests/mimeole.c b/dlls/inetcomm/tests/mimeole.c index 4915f99..4c40c11 100644 --- a/dlls/inetcomm/tests/mimeole.c +++ b/dlls/inetcomm/tests/mimeole.c @@ -1416,6 +1416,7 @@ static void test_mhtml_protocol_binding(const mhtml_binding_test_t *test) HRESULT hres; HANDLE file; DWORD size; + BOOL ret; p = file_name + GetCurrentDirectoryA(sizeof(file_name), file_name); *p++ = '\\'; @@ -1454,7 +1455,8 @@ static void test_mhtml_protocol_binding(const mhtml_binding_test_t *test) CHECK_CALLED(ReportResult); IInternetProtocol_Release(protocol); - ok(DeleteFileA("winetest.mht"), "DeleteFile failed: %u\n", GetLastError()); + ret = DeleteFileA("winetest.mht"); + ok(ret, "DeleteFile failed: %u\n", GetLastError()); } static const struct {

1 0

Anders Jonsson : po: Update Swedish translation.
by Alexandre Julliard Jan. 2, 2018

Jan. 2, 2018

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

Nikolay Sivov : user32/tests: Add missing return value test (Coverity).
by Alexandre Julliard Jan. 2, 2018

Jan. 2, 2018

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 Jan. 2, 2018

Jan. 2, 2018

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 Jan. 2, 2018

Jan. 2, 2018

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