wine-commits January 2018

2 participants
638 discussions

André Hentschel : wsdapi/tests: Don' t test function directly when reporting WSAGetLastError().

by Alexandre Julliard

Module: wine Branch: master Commit: 748c7b85931b365897667e0714b8c6e380e22e77 URL: https://source.winehq.org/git/wine.git/?a=commit;h=748c7b85931b365897667e07… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Dec 30 19:59:38 2017 +0100 wsdapi/tests: Don't test function directly when reporting WSAGetLastError(). Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 */

6 years, 4 months

André Hentschel : msvcrt/tests: Don' t test function directly when reporting GetLastError().

by Alexandre Julliard

Module: wine Branch: master Commit: 9f561f00896643b321a728470ca7b5ff3d9917c8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9f561f00896643b321a72847… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Dec 30 19:58:04 2017 +0100 msvcrt/tests: Don't test function directly when reporting GetLastError(). Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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;

6 years, 4 months

André Hentschel : inetcomm/tests: Don' t test function directly when reporting GetLastError().

by Alexandre Julliard

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 {

6 years, 4 months

André Hentschel : kernel32/tests: Don' t test functions directly when reporting GetLastError().

by Alexandre Julliard

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);

6 years, 4 months

André Hentschel : shell32/tests: Don' t test functions directly when reporting GetLastError().

by Alexandre Julliard

Module: wine Branch: master Commit: 063fd7a665c71145dcefdcfe99992d7f8ca0a119 URL: https://source.winehq.org/git/wine.git/?a=commit;h=063fd7a665c71145dcefdcfe… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Dec 30 19:57:54 2017 +0100 shell32/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/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 */

6 years, 4 months

Alexandre Julliard : Update copyright info for 2018.

by Alexandre Julliard

Module: wine Branch: master Commit: e4fc05a2f0d0fd56f2935e1bb8fbba98fbd0a40b URL: https://source.winehq.org/git/wine.git/?a=commit;h=e4fc05a2f0d0fd56f2935e1b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 2 10:12:12 2018 +0100 Update copyright info for 2018. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- LICENSE | 2 +- dlls/opengl32/version.rc | 2 +- include/wine/wine_common_ver.rc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/LICENSE b/LICENSE index 1065ca6..765b9c3 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 1993-2017 the Wine project authors (see the file AUTHORS +Copyright (c) 1993-2018 the Wine project authors (see the file AUTHORS for a complete list) Wine is free software; you can redistribute it and/or modify it under diff --git a/dlls/opengl32/version.rc b/dlls/opengl32/version.rc index eb36403..df4ff81 100644 --- a/dlls/opengl32/version.rc +++ b/dlls/opengl32/version.rc @@ -20,7 +20,7 @@ #define WINE_FILENAME_STR "opengl32.dll" #define WINE_FILEVERSION 5,1,2600,2082 #define WINE_FILEVERSION_STR "5.1.2600.2082" -#define WINE_LEGALCOPYRIGHT "Copyright (c) 1993-2017 the Wine project. Not Microsoft" /* CATIA needs 'Microsoft' in both CompanyName _and_ LegalCopyright */ +#define WINE_LEGALCOPYRIGHT "Copyright (c) 1993-2018 the Wine project. Not Microsoft" /* CATIA needs 'Microsoft' in both CompanyName _and_ LegalCopyright */ #define WINE_PRODUCTVERSION 5,1,2600,2082 #define WINE_PRODUCTVERSION_STR "5.1" diff --git a/include/wine/wine_common_ver.rc b/include/wine/wine_common_ver.rc index 39a17d6..b9d903d 100644 --- a/include/wine/wine_common_ver.rc +++ b/include/wine/wine_common_ver.rc @@ -76,7 +76,7 @@ never complain. #endif #ifndef WINE_LEGALCOPYRIGHT -#define WINE_LEGALCOPYRIGHT "Copyright (c) 1993-2017 the Wine project authors (see the file AUTHORS for a complete list)" +#define WINE_LEGALCOPYRIGHT "Copyright (c) 1993-2018 the Wine project authors (see the file AUTHORS for a complete list)" #endif #ifndef WINE_PRODUCTVERSION

6 years, 4 months

André Hentschel : shell32/tests: Don' t test functions directly when reporting DdeGetLastError().

by Alexandre Julliard

Module: wine Branch: master Commit: 5200f3472f5252fc73b32a3b640f84699059be8c URL: https://source.winehq.org/git/wine.git/?a=commit;h=5200f3472f5252fc73b32a3b… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Dec 30 19:57:47 2017 +0100 shell32/tests: Don't test functions directly when reporting DdeGetLastError(). Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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)); }

6 years, 4 months

André Hentschel : wsdapi: Fix WSDXMLGetValueFromAny spec file entry.

by Alexandre Julliard

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)

6 years, 4 months

Jump to page:

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