wine-commits November 2013

wine-commits@winehq.org

2 participants
566 discussions

Francois Gouget : winhttp/tests: Fix the test failure messages.
by Alexandre Julliard 01 Nov '13

01 Nov '13

Module: wine Branch: master Commit: cd5d1e54e706b8cf08216039c9239ededd1aed53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd5d1e54e706b8cf08216039c… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Nov 1 10:39:24 2013 +0100 winhttp/tests: Fix the test failure messages. Don't claim the API failed when it succeeded, and show the unexpected data. --- dlls/winhttp/tests/url.c | 94 +++++++++++++++++++++++----------------------- 1 files changed, 47 insertions(+), 47 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cd5d1e54e706b8cf08216…

1 0

Francois Gouget : kernel32/tests: Check that WaitCommEvent() returns immediately in overlapped mode.
by Alexandre Julliard 01 Nov '13

01 Nov '13

Module: wine Branch: master Commit: c31280d6e14f19fed7db589891a1688b7a7a3fdb URL: http://source.winehq.org/git/wine.git/?a=commit;h=c31280d6e14f19fed7db58989… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Nov 1 10:37:41 2013 +0100 kernel32/tests: Check that WaitCommEvent() returns immediately in overlapped mode. --- dlls/kernel32/tests/comm.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/comm.c b/dlls/kernel32/tests/comm.c index 455ee89..db5a369 100644 --- a/dlls/kernel32/tests/comm.c +++ b/dlls/kernel32/tests/comm.c @@ -855,6 +855,8 @@ static void test_waittxempty(void) SetLastError(0xdeadbeef); res = WaitCommEvent(hcom, &evtmask, &ovl_wait); ok(!res && GetLastError() == ERROR_IO_PENDING, "WaitCommEvent error %d\n", GetLastError()); + after = GetTickCount(); + ok(after - before < 30, "WaitCommEvent should have returned immediately, took %d ms\n", after - before); res = WaitForSingleObject(ovl_wait.hEvent, 1500); ok(res == WAIT_OBJECT_0, "WaitCommEvent failed with a timeout\n"); if (res == WAIT_OBJECT_0)

1 0

Francois Gouget : kernel32/tests: Remove a couple of incorrect CreateFile() console tests.
by Alexandre Julliard 01 Nov '13

01 Nov '13

Module: wine Branch: master Commit: 7425d2cac2757b3310cfd67b782081a3cbc18cb0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7425d2cac2757b3310cfd67b7… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Nov 1 10:36:35 2013 +0100 kernel32/tests: Remove a couple of incorrect CreateFile() console tests. --- dlls/kernel32/tests/console.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 5cdfa62..d38315f 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -1160,14 +1160,13 @@ static void test_CreateFileW(void) {coninW, GENERIC_READ | GENERIC_WRITE, FALSE, CREATE_NEW, 0, FALSE}, {coninW, GENERIC_READ | GENERIC_WRITE, FALSE, CREATE_ALWAYS, 0, FALSE}, {coninW, GENERIC_READ | GENERIC_WRITE, FALSE, OPEN_ALWAYS, 0, FALSE}, - {coninW, GENERIC_READ | GENERIC_WRITE, FALSE, TRUNCATE_EXISTING, 0, FALSE}, {conoutW, 0, FALSE, 0, ERROR_INVALID_PARAMETER, TRUE}, {conoutW, 0, FALSE, OPEN_ALWAYS, 0, FALSE}, {conoutW, GENERIC_READ | GENERIC_WRITE, FALSE, 0, ERROR_INVALID_PARAMETER, TRUE}, {conoutW, GENERIC_READ | GENERIC_WRITE, FALSE, CREATE_NEW, 0, FALSE}, {conoutW, GENERIC_READ | GENERIC_WRITE, FALSE, CREATE_ALWAYS, 0, FALSE}, {conoutW, GENERIC_READ | GENERIC_WRITE, FALSE, OPEN_ALWAYS, 0, FALSE}, - {conoutW, GENERIC_READ | GENERIC_WRITE, FALSE, TRUNCATE_EXISTING, 0, FALSE}, + /* TRUNCATE_EXISTING is forbidden starting with Windows 8 */ }; int index;

1 0

Francois Gouget : shell32/tests: Disable a test that crashes on Windows 8.
by Alexandre Julliard 01 Nov '13

01 Nov '13

Module: wine Branch: master Commit: 0a08c185180efb38150e4683a70d43885c68e1c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a08c185180efb38150e4683a… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Nov 1 10:35:08 2013 +0100 shell32/tests: Disable a test that crashes on Windows 8. --- dlls/shell32/tests/shlfolder.c | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index af34b8e..0992924 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -232,10 +232,13 @@ static void test_ParseDisplayName(void) /* Tests crash on W2K and below (SHCreateShellItem available as of XP) */ if (pSHCreateShellItem) { - /* null name and pidl */ - hr = IShellFolder_ParseDisplayName(IDesktopFolder, - NULL, NULL, NULL, NULL, NULL, 0); - ok(hr == E_INVALIDARG, "returned %08x, expected E_INVALIDARG\n", hr); + if (0) + { + /* null name and pidl, also crashes on Windows 8 */ + hr = IShellFolder_ParseDisplayName(IDesktopFolder, NULL, NULL, + NULL, NULL, NULL, 0); + ok(hr == E_INVALIDARG, "returned %08x, expected E_INVALIDARG\n", hr); + } /* null name */ newPIDL = (ITEMIDLIST*)0xdeadbeef;

1 0

Francois Gouget : kernel32/tests: On Windows 8 IdnToNameprepUnicode() returns a different error for invalid parameters.
by Alexandre Julliard 01 Nov '13

01 Nov '13

Module: wine Branch: master Commit: 62ddaf8f6a0bd9c283e232a1448ba12d9e0dc75c URL: http://source.winehq.org/git/wine.git/?a=commit;h=62ddaf8f6a0bd9c283e232a14… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Nov 1 10:34:01 2013 +0100 kernel32/tests: On Windows 8 IdnToNameprepUnicode() returns a different error for invalid parameters. --- dlls/kernel32/tests/locale.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 918a664..60dea78 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -3244,7 +3244,8 @@ static void test_IdnToNameprepUnicode(void) ret = pIdnToNameprepUnicode(4, NULL, 0, NULL, 0); err = GetLastError(); ok(ret == 0, "ret = %d\n", ret); - ok(err == ERROR_INVALID_FLAGS, "err = %d\n", err); + ok(err == ERROR_INVALID_FLAGS || err == ERROR_INVALID_PARAMETER /* Win8 */, + "err = %d\n", err); for (i=0; i<sizeof(test_data)/sizeof(*test_data); i++) {

1 0

Francois Gouget : crypt32: Remove WINAPI on static functions where not needed.
by Alexandre Julliard 01 Nov '13

01 Nov '13

Module: wine Branch: master Commit: 62122b660ff55df1a9db16c04ed51e9b40b11ea0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=62122b660ff55df1a9db16c04… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Nov 1 10:29:15 2013 +0100 crypt32: Remove WINAPI on static functions where not needed. --- dlls/crypt32/cert.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index bc0f26d..0f14ffb 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -162,7 +162,7 @@ static const context_vtbl_t cert_vtbl = { Cert_clone }; -static BOOL WINAPI add_cert_to_store(WINECRYPT_CERTSTORE *store, const CERT_CONTEXT *cert, +static BOOL add_cert_to_store(WINECRYPT_CERTSTORE *store, const CERT_CONTEXT *cert, DWORD add_disposition, BOOL use_link, PCCERT_CONTEXT *ret_context) { const CERT_CONTEXT *existing = NULL;

1 0

Francois Gouget : kernel32/tests: On Windows 8 DATE_LONGDATE does not output a leading 0 for the day.
by Alexandre Julliard 01 Nov '13

01 Nov '13

Module: wine Branch: master Commit: c0dbfebe04bc0c4d1739bea07756325dfcd87085 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0dbfebe04bc0c4d1739bea07… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Nov 1 10:21:15 2013 +0100 kernel32/tests: On Windows 8 DATE_LONGDATE does not output a leading 0 for the day. --- dlls/kernel32/tests/locale.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index bbb7d23..918a664 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -662,10 +662,12 @@ static void test_GetDateFormatA(void) if (strncmp(buffer, Expected, strlen(Expected)) && strncmp(buffer, "5/4/02", strlen(Expected)) != 0) ok (0, "Expected '%s' or '5/4/02', got '%s'\n", Expected, buffer); - STRINGSA("ddd',' MMM dd ''''yy", "Saturday, May 04, 2002"); /* DATE_LONGDATE */ + SetLastError(0xdeadbeef); buffer[0] = '\0'; /* DATE_LONGDATE */ ret = GetDateFormatA(lcid, NUO|DATE_LONGDATE, &curtime, NULL, buffer, COUNTOF(buffer)); ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); - EXPECT_LENA; EXPECT_EQA; + ok(strcmp(buffer, "Saturday, May 04, 2002") == 0 || + strcmp(buffer, "Saturday, May 4, 2002") == 0 /* Win 8 */, + "got an unexpected date string '%s'\n", buffer); /* test for expected DATE_YEARMONTH behavior with null format */ /* NT4 returns ERROR_INVALID_FLAGS for DATE_YEARMONTH */

1 0

Francois Gouget : Assorted spelling fixes.
by Alexandre Julliard 01 Nov '13

01 Nov '13

Module: wine Branch: master Commit: ee28dd80ea2ec52847f176519c2cc7f8dd08324e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee28dd80ea2ec52847f176519… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Nov 1 10:19:40 2013 +0100 Assorted spelling fixes. --- dlls/quartz/tests/filtergraph.c | 7 ++++--- dlls/xmllite/reader.c | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 68ac884..7a6dd5a 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -1559,9 +1559,10 @@ static void test_render_filter_priority(void) static const WCHAR wszFilterInstanceName4[] = {'T', 'e', 's', 't', 'f', 'i', 'l', 't', 'e', 'r', 'I', 'n', 's', 't', 'a', 'n', 'c', 'e', '4', 0 }; - /* Test which renderer of two already added to the graph will be chosen (one is "exact" match, other is - "wildcard" match. Seems to very by order in which filters are added to the graph, thus indicating - no preference given to exact match. */ + /* Test which renderer of two already added to the graph will be chosen + * (one is "exact" match, other is "wildcard" match. Seems to depend + * on the order in which filters are added to the graph, thus indicating + * no preference given to exact match. */ hr = CoCreateInstance(&CLSID_FilterGraph, NULL, CLSCTX_INPROC_SERVER, &IID_IFilterGraph2, (LPVOID*)&pgraph2); ok(hr == S_OK, "CoCreateInstance failed with %08x\n", hr); if (!pgraph2) return; diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index dffe226..9ca7370 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -421,7 +421,7 @@ static inline const char* debug_strval(const xmlreader *reader, const strval *v) return debugstr_wn(reader_get_strptr(reader, v), v->len); } -/* used to initalize from constant string */ +/* used to initialize from constant string */ static inline void reader_init_cstrvalue(WCHAR *str, UINT len, strval *v) { v->start = 0;

1 0

Francois Gouget : user32/tests: When EnumDisplaySettings() fails unexpectedly, trace how many calls were made.
by Alexandre Julliard 01 Nov '13

01 Nov '13

Module: wine Branch: master Commit: 790d2e8b21b0c5c97c010941f161d4b1f9b3b3fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=790d2e8b21b0c5c97c010941f… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Nov 1 10:19:16 2013 +0100 user32/tests: When EnumDisplaySettings() fails unexpectedly, trace how many calls were made. --- dlls/user32/tests/sysparams.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c index 32432f5..59225fe 100644 --- a/dlls/user32/tests/sysparams.c +++ b/dlls/user32/tests/sysparams.c @@ -2865,13 +2865,14 @@ static void test_EnumDisplaySettings(void) num = 1; while (1) { SetLastError (0xdeadbeef); - if (!EnumDisplaySettingsA(NULL, num++, &devmode)) { + if (!EnumDisplaySettingsA(NULL, num, &devmode)) { DWORD le = GetLastError(); ok(le == ERROR_NO_MORE_FILES || le == 0xdeadbeef, /* XP, 2003 */ - "Expected ERROR_NO_MORE_FILES or 0xdeadbeef, got %d\n", le); + "Expected ERROR_NO_MORE_FILES or 0xdeadbeef, got %d for %d\n", le, num); break; } + num++; } }

1 0

Francois Gouget : kernel32/tests: Windows 8 returns different error codes.
by Alexandre Julliard 01 Nov '13

01 Nov '13

Module: wine Branch: master Commit: 18a9aba058df1225ed8b88722ebecd8010348b1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=18a9aba058df1225ed8b88722… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Nov 1 10:17:16 2013 +0100 kernel32/tests: Windows 8 returns different error codes. --- dlls/kernel32/tests/console.c | 110 +++++++++++++++++++++-------------------- 1 files changed, 56 insertions(+), 54 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=18a9aba058df1225ed8b8…

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 November 2013