wine-commits March 2017

wine-commits@winehq.org

2 participants
717 discussions

Nikolay Sivov : wlanapi/tests: Always free interface list (Valgrind).
by Alexandre Julliard 13 Mar '17

13 Mar '17

Module: wine Branch: master Commit: 6e5a0777fd6a5a3d2115209cf71b3d770ec27b52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e5a0777fd6a5a3d2115209cf… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Mar 12 13:28:40 2017 +0300 wlanapi/tests: Always free interface list (Valgrind). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wlanapi/tests/wlanapi.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wlanapi/tests/wlanapi.c b/dlls/wlanapi/tests/wlanapi.c index 882aa82..cab5cf6 100644 --- a/dlls/wlanapi/tests/wlanapi.c +++ b/dlls/wlanapi/tests/wlanapi.c @@ -152,6 +152,7 @@ static void test_WlanEnumInterfaces(void) { skip("No wireless interfaces\n"); WlanCloseHandle(handle, NULL); + WlanFreeMemory(list); return; }

1 0

Francois Gouget : schedsvc/tests: Add the current process id to the test summary line.
by Alexandre Julliard 13 Mar '17

13 Mar '17

Module: wine Branch: master Commit: e5eba4b7d1b4991c65b143373800d7dc40461e6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5eba4b7d1b4991c65b143373… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sun Mar 12 20:45:33 2017 +0100 schedsvc/tests: Add the current process id to the test summary line. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/schedsvc/tests/rpcapi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/schedsvc/tests/rpcapi.c b/dlls/schedsvc/tests/rpcapi.c index 044118e..be1e5eb 100644 --- a/dlls/schedsvc/tests/rpcapi.c +++ b/dlls/schedsvc/tests/rpcapi.c @@ -33,7 +33,7 @@ static LONG CALLBACK rpc_exception_filter(EXCEPTION_POINTERS *ptrs) if (winetest_debug) { - fprintf(stdout, "rpcapi: 0 tests executed (0 marked as todo, 0 failures), 1 skipped.\n"); + fprintf(stdout, "%04x:rpcapi: 0 tests executed (0 marked as todo, 0 failures), 1 skipped.\n", GetCurrentProcessId()); fflush(stdout); } ExitProcess(0);

1 0

Francois Gouget : scrobj: Make scriptlet_typelib_CreateInstance() static.
by Alexandre Julliard 13 Mar '17

13 Mar '17

Module: wine Branch: master Commit: 54b609ccc104b32cb4d172806494fd981dbdb5e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=54b609ccc104b32cb4d172806… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Mar 12 20:46:40 2017 +0100 scrobj: Make scriptlet_typelib_CreateInstance() static. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/scrobj/scrobj.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/scrobj/scrobj.c b/dlls/scrobj/scrobj.c index 38f1c65..3e6535a 100644 --- a/dlls/scrobj/scrobj.c +++ b/dlls/scrobj/scrobj.c @@ -445,7 +445,7 @@ HRESULT WINAPI DllUnregisterServer(void) return __wine_unregister_resources(scrobj_instance); } -HRESULT WINAPI scriptlet_typelib_CreateInstance(IClassFactory *factory, IUnknown *outer, REFIID riid, void **obj) +static HRESULT WINAPI scriptlet_typelib_CreateInstance(IClassFactory *factory, IUnknown *outer, REFIID riid, void **obj) { struct scriptlet_typelib *This; HRESULT hr;

1 0

Francois Gouget : ntdll/tests: A spelling fix in an ok() message.
by Alexandre Julliard 13 Mar '17

13 Mar '17

Module: wine Branch: master Commit: 5a2aa5e1d91b1053e5ac5c29e6ea98851bf6f4a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a2aa5e1d91b1053e5ac5c29e… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Mar 12 20:46:28 2017 +0100 ntdll/tests: A spelling fix in an ok() message. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 091142a..a228d50 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -4408,7 +4408,7 @@ static void test_ioctl(void) NTSTATUS status; file = create_temp_file(FILE_FLAG_OVERLAPPED); - ok(file != INVALID_HANDLE_VALUE, "coult not create temp file\n"); + ok(file != INVALID_HANDLE_VALUE, "could not create temp file\n"); SetEvent(event); status = pNtFsControlFile(file, event, NULL, NULL, &iosb, 0xdeadbeef, 0, 0, 0, 0);

1 0

Francois Gouget : ddraw/tests: Spelling fixes in comments and an ok() message.
by Alexandre Julliard 13 Mar '17

13 Mar '17

Module: wine Branch: master Commit: d489a6db6503c7514236184a503ffba8022f86b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d489a6db6503c7514236184a5… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Mar 12 20:46:13 2017 +0100 ddraw/tests: Spelling fixes in comments and an ok() message. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/d3d.c | 2 +- dlls/ddraw/tests/ddraw1.c | 2 +- dlls/ddraw/tests/ddraw2.c | 2 +- dlls/ddraw/tests/ddraw4.c | 2 +- dlls/ddraw/tests/ddraw7.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index b7d3b05..3780b46 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -1126,7 +1126,7 @@ static void Direct3D1Test(void) /* Interface consistency check. */ hr = IDirect3DDevice_GetDirect3D(Direct3DDevice1, &Direct3D_alt); ok(hr == D3D_OK, "IDirect3DDevice_GetDirect3D failed: %08x\n", hr); - ok(Direct3D_alt == Direct3D1, "Direct3D1 struct pointer missmatch: %p != %p\n", Direct3D_alt, Direct3D1); + ok(Direct3D_alt == Direct3D1, "Direct3D1 struct pointer mismatch: %p != %p\n", Direct3D_alt, Direct3D1); IDirect3D_Release(Direct3D_alt); memset(&desc, 0, sizeof(desc)); diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index da01bd2..4f53ee1 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -10487,7 +10487,7 @@ static void test_ck_operation(void) hr = IDirectDrawSurface_Lock(dst, NULL, &surface_desc, DDLOCK_WAIT, NULL); ok(SUCCEEDED(hr), "Failed to lock surface, hr %#x.\n", hr); color = surface_desc.lpSurface; - /* Ensure the desination was not changed. */ + /* Ensure the destination was not changed. */ ok(color[0] == 0x55555555 && color[1] == 0x55555555 && color[2] == 0x55555555 && color[3] == 0x55555555 && color[4] == 0x55555555 && color[5] == 0x55555555, "Got unexpected content %08x %08x %08x %08x %08x %08x.\n", diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 0c2c00f..be950d8 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -11825,7 +11825,7 @@ static void test_ck_operation(void) hr = IDirectDrawSurface2_Lock(dst, NULL, &surface_desc, DDLOCK_WAIT, NULL); ok(SUCCEEDED(hr), "Failed to lock surface, hr %#x.\n", hr); color = surface_desc.lpSurface; - /* Ensure the desination was not changed. */ + /* Ensure the destination was not changed. */ ok(color[0] == 0x55555555 && color[1] == 0x55555555 && color[2] == 0x55555555 && color[3] == 0x55555555 && color[4] == 0x55555555 && color[5] == 0x55555555, "Got unexpected content %08x %08x %08x %08x %08x %08x.\n", diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index dfdf4ce..e6248f0 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -13204,7 +13204,7 @@ static void test_ck_operation(void) hr = IDirectDrawSurface4_Lock(dst, NULL, &surface_desc, DDLOCK_WAIT, NULL); ok(SUCCEEDED(hr), "Failed to lock surface, hr %#x.\n", hr); color = surface_desc.lpSurface; - /* Ensure the desination was not changed. */ + /* Ensure the destination was not changed. */ ok(color[0] == 0x55555555 && color[1] == 0x55555555 && color[2] == 0x55555555 && color[3] == 0x55555555 && color[4] == 0x55555555 && color[5] == 0x55555555, "Got unexpected content %08x %08x %08x %08x %08x %08x.\n", diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 2068741..65ff2cc 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -12877,7 +12877,7 @@ static void test_ck_operation(void) hr = IDirectDrawSurface7_Lock(dst, NULL, &surface_desc, DDLOCK_WAIT, NULL); ok(SUCCEEDED(hr), "Failed to lock surface, hr %#x.\n", hr); color = surface_desc.lpSurface; - /* Ensure the desination was not changed. */ + /* Ensure the destination was not changed. */ ok(color[0] == 0x55555555 && color[1] == 0x55555555 && color[2] == 0x55555555 && color[3] == 0x55555555 && color[4] == 0x55555555 && color[5] == 0x55555555, "Got unexpected content %08x %08x %08x %08x %08x %08x.\n",

1 0

Ken Thomases : wineps.drv: Set the AP_D_InputSlot CUPS option if no input slot is specified.
by Alexandre Julliard 13 Mar '17

13 Mar '17

Module: wine Branch: master Commit: 485840bc2dfc6d510b22684764eaea3659af5063 URL: http://source.winehq.org/git/wine.git/?a=commit;h=485840bc2dfc6d510b2268476… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Mar 12 17:12:59 2017 -0500 wineps.drv: Set the AP_D_InputSlot CUPS option if no input slot is specified. This overrides a default InputSlot value specified or derived from the PPD and allows the tray to be auto-selected based on the media. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineps.drv/ps.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/wineps.drv/ps.c b/dlls/wineps.drv/ps.c index a01346e..972609d 100644 --- a/dlls/wineps.drv/ps.c +++ b/dlls/wineps.drv/ps.c @@ -50,6 +50,7 @@ static const char *cups_duplexes[3] = }; static const char cups_collate_false[] = "%cupsJobTicket: collate=false\n"; static const char cups_collate_true[] = "%cupsJobTicket: collate=true\n"; +static const char cups_ap_d_inputslot[] = "%cupsJobTicket: AP_D_InputSlot=\n"; /* intentionally empty value */ static const char psheader[] = /* title llx lly urx ury orientation */ "%%%%Creator: Wine PostScript Driver\n" @@ -375,6 +376,10 @@ static void write_cups_job_ticket( PHYSDEV dev, const struct ticket_info *info ) write_spool( dev, cups_collate_true, sizeof(cups_collate_true) - 1 ); } } + + if (!(physDev->Devmode->dmPublic.dmFields & DM_DEFAULTSOURCE) || + physDev->Devmode->dmPublic.u1.s1.dmDefaultSource == DMBIN_AUTO) + write_spool( dev, cups_ap_d_inputslot, sizeof(cups_ap_d_inputslot) - 1 ); } INT PSDRV_WriteHeader( PHYSDEV dev, LPCWSTR title )

1 0

Alex Henrie : crypt32/tests: Print an error if CertOpenStore fails.
by Alexandre Julliard 13 Mar '17

13 Mar '17

Module: wine Branch: master Commit: d7f68cb5f4d75d634730993a527d48d63069afaa URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7f68cb5f4d75d634730993a5… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Mar 9 23:03:50 2017 -0700 crypt32/tests: Print an error if CertOpenStore fails. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Erich E. Hoover <erich.e.hoover(a)wine-staging.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/tests/crl.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/crypt32/tests/crl.c b/dlls/crypt32/tests/crl.c index 9515c38..c350b20 100644 --- a/dlls/crypt32/tests/crl.c +++ b/dlls/crypt32/tests/crl.c @@ -148,6 +148,7 @@ static void testAddCRL(void) BOOL ret; DWORD GLE; + ok(store != NULL, "CertOpenStore failed: %08x\n", GetLastError()); if (!store) return; /* Bad CRL encoding type */ @@ -425,21 +426,24 @@ static const BYTE rootSignedCRL[] = { static void testFindCRL(void) { - HCERTSTORE store = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, 0, - CERT_STORE_CREATE_NEW_FLAG, NULL); + HCERTSTORE store; PCCRL_CONTEXT context; PCCERT_CONTEXT cert, endCert, rootCert; CRL_FIND_ISSUED_FOR_PARA issuedForPara = { NULL, NULL }; DWORD count, revoked_count; BOOL ret; - if (!store) return; if (!pCertFindCRLInStore || !pCertFindCertificateInCRL) { win_skip("CertFindCRLInStore or CertFindCertificateInCRL not available\n"); return; } + store = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, 0, + CERT_STORE_CREATE_NEW_FLAG, NULL); + ok(store != NULL, "CertOpenStore failed: %08x\n", GetLastError()); + if (!store) return; + ret = CertAddEncodedCRLToStore(store, X509_ASN_ENCODING, signedCRL, sizeof(signedCRL), CERT_STORE_ADD_ALWAYS, NULL); ok(ret, "CertAddEncodedCRLToStore failed: %08x\n", GetLastError()); @@ -783,6 +787,7 @@ static void testGetCRLFromStore(void) DWORD flags; BOOL ret; + ok(store != NULL, "CertOpenStore failed: %08x\n", GetLastError()); if (!store) return; /* Crash

1 0

Jacek Caban : wininet/tests: Added more HTTP read tests.
by Alexandre Julliard 10 Mar '17

10 Mar '17

Module: wine Branch: master Commit: 4b1445940d47870895b7fa87b7d69d12abe701ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b1445940d47870895b7fa87b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 10 14:17:33 2017 +0100 wininet/tests: Added more HTTP read tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/tests/http.c | 344 +++++++++++++++++++++++++++++++++++++++------- 1 file changed, 295 insertions(+), 49 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4b1445940d47870895b7f…

1 0

Sebastian Lackner : vcomp/tests: Use ULL macro to define 64-bit constants.
by Alexandre Julliard 10 Mar '17

10 Mar '17

Module: wine Branch: master Commit: 375e5f50a87454875a6120c461a481f4832b734e URL: http://source.winehq.org/git/wine.git/?a=commit;h=375e5f50a87454875a6120c46… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Mar 10 14:31:15 2017 +0100 vcomp/tests: Use ULL macro to define 64-bit constants. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vcomp/tests/vcomp.c | 100 ++++++++++++++++++++++++----------------------- 1 file changed, 51 insertions(+), 49 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=375e5f50a87454875a612…

1 0

Sebastian Lackner : bcrypt: Remove a FIXME which no longer applies.
by Alexandre Julliard 10 Mar '17

10 Mar '17

Module: wine Branch: master Commit: b26d89b54a8c42bc71cb2c9b968d15ef4073378e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b26d89b54a8c42bc71cb2c9b9… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Mar 10 15:36:31 2017 +0100 bcrypt: Remove a FIXME which no longer applies. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/bcrypt_main.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index b188479..80d7ddb 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -527,7 +527,6 @@ NTSTATUS WINAPI BCryptCreateHash( BCRYPT_ALG_HANDLE algorithm, BCRYPT_HASH_HANDL end: if (status != STATUS_SUCCESS) { - /* FIXME: call hash_finish to release resources */ HeapFree( GetProcessHeap(), 0, hash ); return status; }

1 0

← Newer
1
...
43
44
45
46
47
48
49
...
72
Older →

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 March 2017