October 2008 - Wine-commits

Paul Vriens : version/tests: Use win_skip instead of trace.
by Alexandre Julliard 21 Oct '08

21 Oct '08

Module: wine Branch: master Commit: a7e13f565bcb31d160430a0599942423bebb2729 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7e13f565bcb31d160430a059… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Mon Oct 20 23:13:31 2008 +0200 version/tests: Use win_skip instead of trace. --- dlls/version/tests/info.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/version/tests/info.c b/dlls/version/tests/info.c index 56cc8a9..a64d911 100644 --- a/dlls/version/tests/info.c +++ b/dlls/version/tests/info.c @@ -324,7 +324,7 @@ static void test_32bit_win(void) GetModuleFileNameW(NULL, mypathW, MAX_PATH); if (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) { - trace("GetModuleFileNameW not existing on this platform, skipping comparison between A- and W-calls\n"); + win_skip("GetModuleFileNameW not existing on this platform, skipping comparison between A- and W-calls\n"); is_unicode_enabled = FALSE; }

1 0

Paul Vriens : comctl32/tests: Use win_skip instead of trace.
by Alexandre Julliard 21 Oct '08

21 Oct '08

Module: wine Branch: master Commit: 1b494e7f31ed0cf86214b5373ad9b47d52e927e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b494e7f31ed0cf86214b5373… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Mon Oct 20 22:10:15 2008 +0200 comctl32/tests: Use win_skip instead of trace. --- dlls/comctl32/tests/dpa.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/tests/dpa.c b/dlls/comctl32/tests/dpa.c index ae7fcb3..08a7b02 100644 --- a/dlls/comctl32/tests/dpa.c +++ b/dlls/comctl32/tests/dpa.c @@ -454,5 +454,5 @@ START_TEST(dpa) if(InitFunctionPtrs(hcomctl32)) test_dpa(); else - trace("skipping tests\n"); + win_skip("Needed functions are not available\n"); }

1 0

Paul Vriens : uxtheme/tests: Use skip instead of trace.
by Alexandre Julliard 21 Oct '08

21 Oct '08

Module: wine Branch: master Commit: 3f68d421289cec0ed16b32e5c9fb58f64f3fa713 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f68d421289cec0ed16b32e5c… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Mon Oct 20 23:03:05 2008 +0200 uxtheme/tests: Use skip instead of trace. --- dlls/uxtheme/tests/system.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c index cf66c94..b82472b 100644 --- a/dlls/uxtheme/tests/system.c +++ b/dlls/uxtheme/tests/system.c @@ -260,7 +260,7 @@ static void test_OpenThemeData(void) ok( GetLastError() == E_PROP_ID_UNSUPPORTED, "Expected GLE() to be E_PROP_ID_UNSUPPORTED, got 0x%08x\n", GetLastError()); - trace("No active theme, skipping rest of OpenThemeData tests\n"); + skip("No active theme, skipping rest of OpenThemeData tests\n"); return; }

1 0

Paul Vriens : psapi/tests: Use win_skip instead of trace.
by Alexandre Julliard 21 Oct '08

21 Oct '08

Module: wine Branch: master Commit: 2b83936b3ca86b4059e88ab7a06e037d7a2625ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b83936b3ca86b4059e88ab7a… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Mon Oct 20 22:44:09 2008 +0200 psapi/tests: Use win_skip instead of trace. --- dlls/psapi/tests/psapi_main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/psapi/tests/psapi_main.c b/dlls/psapi/tests/psapi_main.c index 1978fd4..4cee7c6 100644 --- a/dlls/psapi/tests/psapi_main.c +++ b/dlls/psapi/tests/psapi_main.c @@ -176,7 +176,7 @@ static void test_GetProcessImageFileName(void) if(!pGetProcessImageFileNameA(hpQI, szImgPath, sizeof(szImgPath))) { if(GetLastError() == ERROR_INVALID_FUNCTION) - trace("GetProcessImageFileName not implemented\n"); + win_skip("GetProcessImageFileName not implemented\n"); else if(GetLastError() == 0xdeadbeef) ok(0, "failed without error code\n"); else

1 0

Paul Vriens : setupapi/tests: Fix a failure on win98.
by Alexandre Julliard 21 Oct '08

21 Oct '08

Module: wine Branch: master Commit: 51763a10e403468d5abeae42789fdd0cacda02bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=51763a10e403468d5abeae427… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Mon Oct 20 22:58:18 2008 +0200 setupapi/tests: Fix a failure on win98. --- dlls/setupapi/tests/misc.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/setupapi/tests/misc.c b/dlls/setupapi/tests/misc.c index bd3f1ce..7164e7d 100644 --- a/dlls/setupapi/tests/misc.c +++ b/dlls/setupapi/tests/misc.c @@ -203,8 +203,9 @@ static void test_SetupCopyOEMInf(void) SetLastError(0xdeadbeef); res = pSetupCopyOEMInfA(tmpfile, NULL, 0, SP_COPY_NOOVERWRITE, NULL, 0, NULL, NULL); ok(res == FALSE, "Expected FALSE, got %d\n", res); - ok(GetLastError() == ERROR_FILE_NOT_FOUND, - "Expected ERROR_FILE_NOT_FOUND, got %d\n", GetLastError()); + ok(GetLastError() == ERROR_FILE_NOT_FOUND || + GetLastError() == ERROR_FILE_EXISTS, /* Win98 */ + "Expected ERROR_FILE_NOT_FOUND or ERROR_FILE_EXISTS, got %d\n", GetLastError()); ok(file_exists(tmpfile), "Expected tmpfile to exist\n"); /* try SP_COPY_REPLACEONLY, dest does not exist */

1 0

Paul Vriens : mscms/tests: Fix a typo.
by Alexandre Julliard 21 Oct '08

21 Oct '08

Module: wine Branch: master Commit: 2188248598684433fbc7f6144562ed2638c5be9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2188248598684433fbc7f6144… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Mon Oct 20 22:18:32 2008 +0200 mscms/tests: Fix a typo. --- dlls/mscms/tests/profile.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mscms/tests/profile.c b/dlls/mscms/tests/profile.c index 7d77baa..56d7732 100644 --- a/dlls/mscms/tests/profile.c +++ b/dlls/mscms/tests/profile.c @@ -1423,7 +1423,7 @@ static void test_AssociateColorProfileWithDeviceA(void) ok( ret, "DisassociateColorProfileFromDeviceA() failed (%u)\n", GetLastError() ); ret = pUninstallColorProfileA( NULL, profile, TRUE ); - ok( ret, "UninstallColorProfileW() failed (%d)\n", GetLastError() ); + ok( ret, "UninstallColorProfileA() failed (%d)\n", GetLastError() ); } }

1 0

Paul Vriens : kernel32/tests: Free memory after use.
by Alexandre Julliard 21 Oct '08

21 Oct '08

Module: wine Branch: master Commit: 5b831964848b9568cc57a4c0c4237fdd35ab0524 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b831964848b9568cc57a4c0c… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Mon Oct 20 22:15:49 2008 +0200 kernel32/tests: Free memory after use. --- dlls/kernel32/tests/file.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 76665a8..3a7635d 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -1644,6 +1644,7 @@ static void test_async_file_errors(void) } ok(completion_count == 0, "completion routine should only be called when ReadFileEx succeeds (this rule was violated %d times)\n", completion_count); /*printf("Error = %ld\n", GetLastError());*/ + HeapFree(GetProcessHeap(), 0, lpBuffer); } static void test_read_write(void)

1 0

Paul Vriens : advpack/tests: Use win_skip instead of trace.
by Alexandre Julliard 21 Oct '08

21 Oct '08

Module: wine Branch: master Commit: 53f94c07f87788d6fd46d4f4d08386bcae72ed07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=53f94c07f87788d6fd46d4f4d… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Mon Oct 20 22:07:39 2008 +0200 advpack/tests: Use win_skip instead of trace. --- dlls/advpack/tests/advpack.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/advpack/tests/advpack.c b/dlls/advpack/tests/advpack.c index 58038f7..8615850 100644 --- a/dlls/advpack/tests/advpack.c +++ b/dlls/advpack/tests/advpack.c @@ -264,7 +264,7 @@ static void translateinfstring_test(void) if(hr == HRESULT_FROM_WIN32(ERROR_MOD_NOT_FOUND)) { - trace("WinNT 3.51 detected. Skipping tests for TranslateInfString()\n"); + win_skip("WinNT 3.51 detected. Skipping tests for TranslateInfString()\n"); return; }

1 0

Juan Lang : crypt32: Don't crash if adding to a provider store fails.
by Alexandre Julliard 21 Oct '08

21 Oct '08

Module: wine Branch: master Commit: 9686e7b2868b317c0ffab9916fb4ea9f47b61a8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=9686e7b2868b317c0ffab9916… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Oct 20 14:02:39 2008 -0700 crypt32: Don't crash if adding to a provider store fails. --- dlls/crypt32/provstore.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/crypt32/provstore.c b/dlls/crypt32/provstore.c index fba11eb..70dba64 100644 --- a/dlls/crypt32/provstore.c +++ b/dlls/crypt32/provstore.c @@ -78,7 +78,7 @@ static BOOL CRYPT_ProvAddCert(PWINECRYPT_CERTSTORE store, void *cert, /* dirty trick: replace the returned context's hCertStore with * store. */ - if (ppStoreContext) + if (ret && ppStoreContext) (*(PCERT_CONTEXT *)ppStoreContext)->hCertStore = store; return ret; } @@ -145,7 +145,7 @@ static BOOL CRYPT_ProvAddCRL(PWINECRYPT_CERTSTORE store, void *crl, /* dirty trick: replace the returned context's hCertStore with * store. */ - if (ppStoreContext) + if (ret && ppStoreContext) (*(PCRL_CONTEXT *)ppStoreContext)->hCertStore = store; return ret; } @@ -212,7 +212,7 @@ static BOOL CRYPT_ProvAddCTL(PWINECRYPT_CERTSTORE store, void *ctl, /* dirty trick: replace the returned context's hCertStore with * store. */ - if (ppStoreContext) + if (ret && ppStoreContext) (*(PCTL_CONTEXT *)ppStoreContext)->hCertStore = store; return ret; }

1 0

Jacek Caban : jscript: Treat function expressions with identifier as function declarations.
by Alexandre Julliard 21 Oct '08

21 Oct '08

Module: wine Branch: master Commit: 30de39b2a7395295e8195683f264611062882d9a URL: http://source.winehq.org/git/wine.git/?a=commit;h=30de39b2a7395295e8195683f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 20 13:12:42 2008 -0700 jscript: Treat function expressions with identifier as function declarations. --- dlls/jscript/dispex.c | 2 +- dlls/jscript/engine.c | 31 ++++++++++++------------- dlls/jscript/engine.h | 24 +++++++++---------- dlls/jscript/jscript.h | 1 + dlls/jscript/parser.y | 53 ++++++++++++------------------------------- dlls/jscript/tests/lang.js | 39 ++++++++++++++++++++++++++++++++ 6 files changed, 82 insertions(+), 68 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=30de39b2a7395295e8195…

1 0