December 2017 - Wine-devel - list.winehq.org

[PATCH 5/6] msvcrt/tests: Don't test function directly when reporting GetLastError()
by André Hentschel 02 Jan '18

02 Jan '18

Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- dlls/msvcrt/tests/time.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/tests/time.c b/dlls/msvcrt/tests/time.c index bc1c6c8..a5a2df1 100644 --- a/dlls/msvcrt/tests/time.c +++ b/dlls/msvcrt/tests/time.c @@ -878,9 +878,10 @@ static void test_clock(void) static const int THRESH = 100; FILETIME start, cur; int c, expect; + BOOL ret; - ok(GetProcessTimes(GetCurrentProcess(), &start, &cur, &cur, &cur), - "GetProcessTimes failed with error: %d\n", GetLastError()); + ret = GetProcessTimes(GetCurrentProcess(), &start, &cur, &cur, &cur); + ok(ret, "GetProcessTimes failed with error: %d\n", GetLastError()); GetSystemTimeAsFileTime(&cur); expect = (((LONGLONG)cur.dwHighDateTime<<32)+cur.dwLowDateTime - ((LONGLONG)start.dwHighDateTime<<32)-start.dwLowDateTime) / 10000; -- 2.7.4

2 1

[PATCH] v2 pt_PO.pt
by Fernando 31 Dec '17

31 Dec '17

This patch supersedes my previous patch sent to wine-patches on 2018-12-26, which was pending due to lack of "authorship", and can be discarded. I translated all the changes tagged "fuzzy", plus some empty translations, plus several corrections. I have added some comments at the top of the file to indicate some translations used to help with future consistency. I have filled in the field last-translator in pt_PT.po and added the header signed-off to the patch. I hope all is well. For feedback, it would be better if you address my email directly. Regards and best wishes to 2018. Fernando Martins

1 0

po: Update Swedish translation
by Anders Jonsson 31 Dec '17

31 Dec '17

1 0

[PATCH 1/6] shell32/tests: Don't test functions directly when reporting DdeGetLastError()
by André Hentschel 30 Dec '17

30 Dec '17

Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- dlls/shell32/tests/progman_dde.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/dlls/shell32/tests/progman_dde.c b/dlls/shell32/tests/progman_dde.c index bfa9f65..28dad2c 100644 --- a/dlls/shell32/tests/progman_dde.c +++ b/dlls/shell32/tests/progman_dde.c @@ -460,6 +460,7 @@ START_TEST(progman_dde) UINT err; HSZ hszProgman; HCONV hConv; + BOOL ret; init_function_pointers(); init_strings(); @@ -472,7 +473,8 @@ START_TEST(progman_dde) hszProgman = DdeCreateStringHandleA(instance, "PROGMAN", CP_WINANSI); ok(hszProgman != NULL, "DdeCreateStringHandle() failed: %u\n", DdeGetLastError(instance)); hConv = DdeConnect(instance, hszProgman, hszProgman, NULL); - ok(DdeFreeStringHandle(instance, hszProgman), "DdeFreeStringHandle() failed: %u\n", DdeGetLastError(instance)); + ret = DdeFreeStringHandle(instance, hszProgman); + ok(ret, "DdeFreeStringHandle() failed: %u\n", DdeGetLastError(instance)); /* Seeing failures on early versions of Windows Connecting to progman, exit if connection fails */ if (hConv == NULL) { @@ -485,8 +487,10 @@ START_TEST(progman_dde) test_request_groups(instance, hConv); /* Cleanup & Exit */ - ok(DdeDisconnect(hConv), "DdeDisonnect() failed: %u\n", DdeGetLastError(instance)); - ok(DdeUninitialize(instance), "DdeUninitialize() failed: %u\n", DdeGetLastError(instance)); + ret = DdeDisconnect(hConv); + ok(ret, "DdeDisonnect() failed: %u\n", DdeGetLastError(instance)); + ret = DdeUninitialize(instance); + ok(ret, "DdeUninitialize() failed: %u\n", DdeGetLastError(instance)); /* 2nd Instance (Followup Tests) */ /* Initialize DDE Instance */ @@ -499,12 +503,15 @@ START_TEST(progman_dde) ok(hszProgman != NULL, "DdeCreateStringHandle() failed: %u\n", DdeGetLastError(instance)); hConv = DdeConnect(instance, hszProgman, hszProgman, NULL); ok(hConv != NULL, "DdeConnect() failed: %u\n", DdeGetLastError(instance)); - ok(DdeFreeStringHandle(instance, hszProgman), "DdeFreeStringHandle() failed: %u\n", DdeGetLastError(instance)); + ret = DdeFreeStringHandle(instance, hszProgman); + ok(ret, "DdeFreeStringHandle() failed: %u\n", DdeGetLastError(instance)); /* Run Tests */ test_progman_dde2(instance, hConv); /* Cleanup & Exit */ - ok(DdeDisconnect(hConv), "DdeDisonnect() failed: %u\n", DdeGetLastError(instance)); - ok(DdeUninitialize(instance), "DdeUninitialize() failed: %u\n", DdeGetLastError(instance)); + ret = DdeDisconnect(hConv); + ok(ret, "DdeDisonnect() failed: %u\n", DdeGetLastError(instance)); + ret = DdeUninitialize(instance); + ok(ret, "DdeUninitialize() failed: %u\n", DdeGetLastError(instance)); } -- 2.7.4

2 1

[PATCH 6/6] wsdapi/tests: Don't test function directly when reporting WSAGetLastError()
by André Hentschel 30 Dec '17

30 Dec '17

Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- dlls/wsdapi/tests/address.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/wsdapi/tests/address.c b/dlls/wsdapi/tests/address.c index 1dbe266..66293e7 100644 --- a/dlls/wsdapi/tests/address.c +++ b/dlls/wsdapi/tests/address.c @@ -246,6 +246,7 @@ static void GetSetSockaddr_udp_tests(void) IWSDUdpAddress *udpAddress = NULL; LPCWSTR returnedAddress = NULL; char addressBuffer[MAX_PATH]; + const char *cret; WSADATA wsaData; WORD port = 0; HRESULT rc; @@ -294,7 +295,8 @@ static void GetSetSockaddr_udp_tests(void) /* Windows however doesn't set the port number */ ok(sockAddr6Ptr->sin6_port == 0, "returnedStorage.sin6_port != 0 (%d)\n", sockAddr6Ptr->sin6_port); - ok(inet_ntop(returnedStorage.ss_family, &sockAddr6Ptr->sin6_addr, addressBuffer, MAX_PATH) != NULL, "inet_ntop failed (%d)\n", WSAGetLastError()); + cret = inet_ntop(returnedStorage.ss_family, &sockAddr6Ptr->sin6_addr, addressBuffer, MAX_PATH); + ok(cret != NULL, "inet_ntop failed (%d)\n", WSAGetLastError()); ok(strcmp(addressBuffer, ipv6Address) == 0, "returnedStorage.sin6_addr != '%s' ('%s')\n", ipv6Address, addressBuffer); /* Release the object and create a new one */ -- 2.7.4

1 0

[PATCH 4/6] inetcomm/tests: Don't test function directly when reporting GetLastError()
by André Hentschel 30 Dec '17

30 Dec '17

Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- 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 { -- 2.7.4

1 0

[PATCH 3/6] kernel32/tests: Don't test functions directly when reporting GetLastError()
by André Hentschel 30 Dec '17

30 Dec '17

Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- 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); -- 2.7.4

1 0

[PATCH 2/6] shell32/tests: Don't test functions directly when reporting GetLastError()
by André Hentschel 30 Dec '17

30 Dec '17

Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- dlls/shell32/tests/shelldispatch.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/shell32/tests/shelldispatch.c b/dlls/shell32/tests/shelldispatch.c index ce3b1a3..64a695d 100644 --- a/dlls/shell32/tests/shelldispatch.c +++ b/dlls/shell32/tests/shelldispatch.c @@ -387,6 +387,7 @@ static void test_items(void) HANDLE file; BSTR bstr; char cstr[64]; + BOOL ret; int i; r = CoCreateInstance(&CLSID_Shell, NULL, CLSCTX_INPROC_SERVER, &IID_IShellDispatch, (void**)&sd); @@ -397,7 +398,8 @@ static void test_items(void) GetTempPathW(MAX_PATH, path); GetCurrentDirectoryW(MAX_PATH, orig_dir); SetCurrentDirectoryW(path); - ok(CreateDirectoryW(winetestW, NULL), "CreateDirectory failed: %08x\n", GetLastError()); + ret = CreateDirectoryW(winetestW, NULL); + ok(ret, "CreateDirectory failed: %08x\n", GetLastError()); GetFullPathNameW(winetestW, MAX_PATH, path, NULL); V_VT(&var) = VT_BSTR; V_BSTR(&var) = SysAllocString(path); @@ -673,7 +675,8 @@ static void test_items(void) VariantClear(&str_index2); /* delete the file in the subdirectory */ - ok(DeleteFileA(cstr), "file_defs[%d]: DeleteFile failed: %08x\n", i, GetLastError()); + ret = DeleteFileA(cstr); + ok(ret, "file_defs[%d]: DeleteFile failed: %08x\n", i, GetLastError()); /* test that getting an item object via a relative path fails */ strcpy(cstr, file_defs[i].name); @@ -690,11 +693,13 @@ static void test_items(void) VariantClear(&str_index2); /* remove the directory */ - ok(RemoveDirectoryA(file_defs[i].name), "file_defs[%d]: RemoveDirectory failed: %08x\n", i, GetLastError()); + ret = RemoveDirectoryA(file_defs[i].name); + ok(ret, "file_defs[%d]: RemoveDirectory failed: %08x\n", i, GetLastError()); } else { - ok(DeleteFileA(file_defs[i].name), "file_defs[%d]: DeleteFile failed: %08x\n", i, GetLastError()); + ret = DeleteFileA(file_defs[i].name); + ok(ret, "file_defs[%d]: DeleteFile failed: %08x\n", i, GetLastError()); } /* test that the folder item is still accessible by integer index */ @@ -789,7 +794,8 @@ todo_wine /* remove the temporary directory and restore the original working directory */ GetTempPathW(MAX_PATH, path); SetCurrentDirectoryW(path); - ok(RemoveDirectoryW(winetestW), "RemoveDirectory failed: %08x\n", GetLastError()); + ret = RemoveDirectoryW(winetestW); + ok(ret, "RemoveDirectory failed: %08x\n", GetLastError()); SetCurrentDirectoryW(orig_dir); /* test that everything stops working after the directory has been removed */ -- 2.7.4

1 0

[PATCH] wsdapi: Fix WSDXMLGetValueFromAny spec file entry
by André Hentschel 30 Dec '17

30 Dec '17

Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- 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) -- 2.7.4

1 0

[PATCH] d3dx9/tests: Use the available ARRAY_SIZE() macro
by Michael Stefaniuc 29 Dec '17

29 Dec '17

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx9_36/tests/effect.c | 6 +++--- dlls/d3dx9_36/tests/mesh.c | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index 96b21f0..d65f072 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -1325,7 +1325,7 @@ static void test_effect_parameter_value_GetMatrix(const struct test_effect_param ok(hr == D3DERR_INVALIDCALL, "%u - %s: GetMatrix failed, got %#x, expected %#x\n", i, res_full_name, hr, D3DERR_INVALIDCALL); - for (l = 0; l < sizeof(fvalue) / sizeof(*fvalue); ++l) if (fvalue[l] != *(FLOAT *)&cmp) ++err; + for (l = 0; l < ARRAY_SIZE(fvalue); ++l) if (fvalue[l] != *(FLOAT *)&cmp) ++err; } ok(!err, "%u - %s: GetMatrix failed with %u errors\n", i, res_full_name, err); } @@ -1498,7 +1498,7 @@ static void test_effect_parameter_value_GetMatrixTranspose(const struct test_eff ok(hr == D3DERR_INVALIDCALL, "%u - %s: GetMatrixTranspose failed, got %#x, expected %#x\n", i, res_full_name, hr, D3DERR_INVALIDCALL); - for (l = 0; l < sizeof(fvalue) / sizeof(*fvalue); ++l) if (fvalue[l] != *(FLOAT *)&cmp) ++err; + for (l = 0; l < ARRAY_SIZE(fvalue); ++l) if (fvalue[l] != *(FLOAT *)&cmp) ++err; } ok(!err, "%u - %s: GetMatrixTranspose failed with %u errors\n", i, res_full_name, err); } @@ -1675,7 +1675,7 @@ static void test_effect_parameter_value_ResetValue(const struct test_effect_para static void test_effect_parameter_value(IDirect3DDevice9 *device) { UINT i; - UINT effect_count = sizeof(test_effect_parameter_value_data) / sizeof(*test_effect_parameter_value_data); + UINT effect_count = ARRAY_SIZE(test_effect_parameter_value_data); for (i = 0; i < effect_count; ++i) { diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index d0b1adb..a92b7ea 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -818,7 +818,7 @@ static void test_fvf_decl_conversion(void) }; unsigned int i; - for (i = 0; i < sizeof(test_data) / sizeof(*test_data); ++i) + for (i = 0; i < ARRAY_SIZE(test_data); ++i) { test_decl_to_fvf(test_data[i].decl, test_data[i].fvf, D3D_OK, __LINE__, i); test_fvf_to_decl(test_data[i].fvf, test_data[i].decl, D3D_OK, __LINE__, i); @@ -1268,7 +1268,7 @@ static void D3DXCreateMeshTest(void) if (hr == D3D_OK) { - size = sizeof(decl1) / sizeof(decl1[0]); + size = ARRAY_SIZE(decl1); for (i = 0; i < size - 1; i++) { ok(test_decl[i].Stream == decl1[i].Stream, "Returned stream %d, expected %d\n", test_decl[i].Stream, decl1[i].Stream); @@ -1329,7 +1329,7 @@ static void D3DXCreateMeshTest(void) if (hr == D3D_OK) { - size = sizeof(decl2) / sizeof(decl2[0]); + size = ARRAY_SIZE(decl2); for (i = 0; i < size - 1; i++) { ok(test_decl[i].Stream == decl2[i].Stream, "Returned stream %d, expected %d\n", test_decl[i].Stream, decl2[i].Stream); @@ -1453,7 +1453,7 @@ static void D3DXCreateMeshFVFTest(void) if (hr == D3D_OK) { - size = sizeof(decl) / sizeof(decl[0]); + size = ARRAY_SIZE(decl); for (i = 0; i < size - 1; i++) { ok(test_decl[i].Stream == decl[i].Stream, "Returned stream %d, expected %d\n", test_decl[i].Stream, decl[i].Stream); -- 2.9.5

2 1