wine-commits September 2008

wine-commits@winehq.org

3 participants
1215 discussions

Paul Vriens : kernel32/tests: Make sure we can remove a test directory.
by Alexandre Julliard 22 Sep '08

22 Sep '08

Module: wine Branch: master Commit: 7cb7c144765b0684d8a28a9f1a72d462ac73c042 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7cb7c144765b0684d8a28a9f1… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Sat Sep 20 17:25:18 2008 +0200 kernel32/tests: Make sure we can remove a test directory. --- dlls/kernel32/tests/file.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 70b2c0b..76665a8 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -1512,6 +1512,8 @@ static void test_FindFirstFileExA(void) ok(FindNextFile(handle, &search_results) == FALSE, "Fetching sixth file should failed\n"); + FindClose( handle ); + cleanup: DeleteFileA("test-dir\\file1"); DeleteFileA("test-dir\\file2");

1 0

Paul Vriens : kernel32/tests: Fix tests on NT4.
by Alexandre Julliard 22 Sep '08

22 Sep '08

Module: wine Branch: master Commit: e23904ceb9fae21f7c6d4819be27dd52e90fa8bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=e23904ceb9fae21f7c6d4819b… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Sat Sep 20 16:49:32 2008 +0200 kernel32/tests: Fix tests on NT4. --- dlls/kernel32/tests/file.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 1686a4a..70b2c0b 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -1560,12 +1560,16 @@ static void test_MapFile(void) ok( GetLastError() == ERROR_FILE_INVALID, "not ERROR_FILE_INVALID\n"); hmap = CreateFileMapping( handle, NULL, PAGE_READWRITE, 0x80000000, 0, NULL ); - ok( hmap == NULL, "mapping should fail\n"); + ok( hmap == NULL || broken(hmap != NULL) /* NT4 */, "mapping should fail\n"); /* GetLastError() varies between win9x and WinNT and also depends on the filesystem */ + if ( hmap ) + CloseHandle( hmap ); hmap = CreateFileMapping( handle, NULL, PAGE_READWRITE, 0x80000000, 0x10000, NULL ); - ok( hmap == NULL, "mapping should fail\n"); + ok( hmap == NULL || broken(hmap != NULL) /* NT4 */, "mapping should fail\n"); /* GetLastError() varies between win9x and WinNT and also depends on the filesystem */ + if ( hmap ) + CloseHandle( hmap ); /* On XP you can now map again, on Win 95 you cannot. */

1 0

Paul Vriens : kernel32/tests: Skip some tests on win9x.
by Alexandre Julliard 22 Sep '08

22 Sep '08

Module: wine Branch: master Commit: 40a94e04b4f52c881f2c855c674af1fe38905cd1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=40a94e04b4f52c881f2c855c6… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Sat Sep 20 12:49:41 2008 +0200 kernel32/tests: Skip some tests on win9x. --- dlls/kernel32/tests/process.c | 32 ++++++++++++++++++++++++++------ 1 files changed, 26 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 3e9e0e7..4531c9f 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -348,8 +348,18 @@ static void doChild(const char* file, const char* option) childPrintf(hFile, "OutputMode=%ld\n", modeOut); /* now that we have written all relevant information, let's change it */ - ok(SetConsoleCP(1252), "Setting CP\n"); - ok(SetConsoleOutputCP(1252), "Setting SB CP\n"); + SetLastError(0xdeadbeef); + ret = SetConsoleCP(1252); + if (!ret && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) + { + win_skip("Setting the codepage is not implemented"); + } + else + { + ok(ret, "Setting CP\n"); + ok(SetConsoleOutputCP(1252), "Setting SB CP\n"); + } + ret = SetConsoleMode(hConIn, modeIn ^ 1); ok( ret, "Setting mode (%d)\n", GetLastError()); ret = SetConsoleMode(hConOut, modeOut ^ 1); @@ -1125,6 +1135,7 @@ static void test_Console(void) HANDLE hChildIn, hChildInInh, hChildOut, hChildOutInh, hParentIn, hParentOut; const char* msg = "This is a std-handle inheritance test."; unsigned msg_len; + BOOL run_tests = TRUE; memset(&startup, 0, sizeof(startup)); startup.cb = sizeof(startup); @@ -1181,14 +1192,17 @@ static void test_Console(void) SetLastError(0xdeadbeef); ok(!SetConsoleCP(0), "Shouldn't succeed\n"); ok(GetLastError()==ERROR_INVALID_PARAMETER || - broken(GetLastError() == ERROR_CALL_NOT_IMPLEMENTED), /* win95 */ + broken(GetLastError() == ERROR_CALL_NOT_IMPLEMENTED), /* win9x */ "GetLastError: expecting %u got %u\n", ERROR_INVALID_PARAMETER, GetLastError()); + if (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) + run_tests = FALSE; + SetLastError(0xdeadbeef); ok(!SetConsoleOutputCP(0), "Shouldn't succeed\n"); ok(GetLastError()==ERROR_INVALID_PARAMETER || - broken(GetLastError() == ERROR_CALL_NOT_IMPLEMENTED), /* win95 */ + broken(GetLastError() == ERROR_CALL_NOT_IMPLEMENTED), /* win9x */ "GetLastError: expecting %u got %u\n", ERROR_INVALID_PARAMETER, GetLastError()); @@ -1231,8 +1245,14 @@ static void test_Console(void) okChildInt("Console", "InputMode", modeIn); okChildInt("Console", "OutputMode", modeOut); - ok(cpInC == 1252, "Wrong console CP (expected 1252 got %d/%d)\n", cpInC, cpIn); - ok(cpOutC == 1252, "Wrong console-SB CP (expected 1252 got %d/%d)\n", cpOutC, cpOut); + if (run_tests) + { + ok(cpInC == 1252, "Wrong console CP (expected 1252 got %d/%d)\n", cpInC, cpIn); + ok(cpOutC == 1252, "Wrong console-SB CP (expected 1252 got %d/%d)\n", cpOutC, cpOut); + } + else + win_skip("Setting the codepage is not implemented"); + ok(modeInC == (modeIn ^ 1), "Wrong console mode\n"); ok(modeOutC == (modeOut ^ 1), "Wrong console-SB mode\n"); trace("cursor position(X): %d/%d\n",sbi.dwCursorPosition.X, sbiC.dwCursorPosition.X);

1 0

Paul Vriens : kernel32/tests: Use skip instead of trace.
by Alexandre Julliard 22 Sep '08

22 Sep '08

Module: wine Branch: master Commit: ed552174448f893cf7c22e2933d9bacecaa93e36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed552174448f893cf7c22e293… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Sat Sep 20 11:55:16 2008 +0200 kernel32/tests: Use skip instead of trace. --- dlls/kernel32/tests/module.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/module.c b/dlls/kernel32/tests/module.c index b076a67..73d7946 100644 --- a/dlls/kernel32/tests/module.c +++ b/dlls/kernel32/tests/module.c @@ -343,7 +343,7 @@ START_TEST(module) GetModuleFileNameW(NULL, filenameW, MAX_PATH); if (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) { - trace("GetModuleFileNameW not existing on this platform, skipping W-calls\n"); + win_skip("GetModuleFileNameW not existing on this platform, skipping W-calls\n"); is_unicode_enabled = FALSE; }

1 0

Alexandre Julliard : comctl32/tests: Fix a couple of message test failures.
by Alexandre Julliard 22 Sep '08

22 Sep '08

Module: wine Branch: master Commit: 8552b50640811eebe792f1fda08e71192b6a70ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=8552b50640811eebe792f1fda… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 22 12:15:11 2008 +0200 comctl32/tests: Fix a couple of message test failures. --- dlls/comctl32/tests/monthcal.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/tests/monthcal.c b/dlls/comctl32/tests/monthcal.c index 26c1bc1..271dfd1 100644 --- a/dlls/comctl32/tests/monthcal.c +++ b/dlls/comctl32/tests/monthcal.c @@ -302,8 +302,10 @@ static const struct message destroy_parent_seq[] = { { 0x0090, sent|optional }, /* Vista */ { WM_WINDOWPOSCHANGING, sent|wparam, 0}, { WM_WINDOWPOSCHANGED, sent|wparam, 0}, - { WM_NCACTIVATE, sent|wparam|lparam, 0, 0}, - { WM_ACTIVATE, sent|wparam|lparam, 0, 0}, + { WM_NCACTIVATE, sent|wparam, 0}, + { WM_ACTIVATE, sent|wparam, 0}, + { WM_NCACTIVATE, sent|wparam|lparam|optional, 0, 0}, + { WM_ACTIVATE, sent|wparam|lparam|optional, 0, 0}, { WM_ACTIVATEAPP, sent|wparam, 0}, { WM_KILLFOCUS, sent|wparam|lparam, 0, 0}, { WM_IME_SETCONTEXT, sent|wparam|optional, 0},

1 0

Alexandre Julliard : user32/tests: Fix some more message test failures.
by Alexandre Julliard 22 Sep '08

22 Sep '08

Module: wine Branch: master Commit: 17c6542cfefc2efb6dfd73b619a84449607c398c URL: http://source.winehq.org/git/wine.git/?a=commit;h=17c6542cfefc2efb6dfd73b61… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 22 12:14:56 2008 +0200 user32/tests: Fix some more message test failures. --- dlls/user32/tests/msg.c | 57 ++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 47 insertions(+), 10 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=17c6542cfefc2efb6dfd7…

1 0

Alexandre Julliard : ntdll/tests: Fix a few test failures on NT4.
by Alexandre Julliard 22 Sep '08

22 Sep '08

Module: wine Branch: master Commit: 733693829a684900eadb40888e38a66d45dc9963 URL: http://source.winehq.org/git/wine.git/?a=commit;h=733693829a684900eadb40888… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 22 12:14:37 2008 +0200 ntdll/tests: Fix a few test failures on NT4. --- dlls/ntdll/tests/om.c | 45 +++++++++++++++++++++++++-------------------- 1 files changed, 25 insertions(+), 20 deletions(-) diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index 1999da6..46c9084 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -451,24 +451,16 @@ static void test_directory(void) pNtClose(dir); } -#define SYMLNK_TEST_CREATE_FAILURE(h,e) \ - status = pNtCreateSymbolicLinkObject(h, SYMBOLIC_LINK_QUERY, &attr, &target);\ - ok(status == e,"NtCreateSymbolicLinkObject should have failed with %s got(%08x)\n", #e, status); -#define SYMLNK_TEST_OPEN_FAILURE(h,e) \ - status = pNtOpenSymbolicLinkObject(h, SYMBOLIC_LINK_QUERY, &attr);\ - ok(status == e,"NtOpenSymbolicLinkObject should have failed with %s got(%08x)\n", #e, status); #define SYMLNK_TEST_CREATE_OPEN_FAILURE(h,n,t,e) \ pRtlCreateUnicodeStringFromAsciiz(&str, n);\ pRtlCreateUnicodeStringFromAsciiz(&target, t);\ - SYMLNK_TEST_CREATE_FAILURE(h,e)\ - SYMLNK_TEST_OPEN_FAILURE(h,e)\ + status = pNtCreateSymbolicLinkObject(h, SYMBOLIC_LINK_QUERY, &attr, &target);\ + ok(status == e,"NtCreateSymbolicLinkObject should have failed with %s got(%08x)\n", #e, status);\ + status = pNtOpenSymbolicLinkObject(h, SYMBOLIC_LINK_QUERY, &attr);\ + ok(status == e,"NtOpenSymbolicLinkObject should have failed with %s got(%08x)\n", #e, status);\ pRtlFreeUnicodeString(&target);\ pRtlFreeUnicodeString(&str); -#define SYMLNK_TEST_CREATE_SUCCESS(h) \ - status = pNtCreateSymbolicLinkObject(h, SYMBOLIC_LINK_QUERY, &attr, &target); \ - ok(status == STATUS_SUCCESS, "Failed to create SymbolicLink(%08x)\n", status); - static void test_symboliclink(void) { NTSTATUS status; @@ -490,26 +482,38 @@ static void test_symboliclink(void) /* No attributes */ pRtlCreateUnicodeStringFromAsciiz(&target, "\\DosDevices"); status = pNtCreateSymbolicLinkObject(&h, SYMBOLIC_LINK_QUERY, NULL, &target); - ok(status == STATUS_SUCCESS, "NtCreateSymbolicLinkObject failed(%08x)\n", status); + ok(status == STATUS_SUCCESS || status == STATUS_ACCESS_VIOLATION, /* nt4 */ + "NtCreateSymbolicLinkObject failed(%08x)\n", status); pRtlFreeUnicodeString(&target); - pNtClose(h); + if (!status) pNtClose(h); InitializeObjectAttributes(&attr, NULL, 0, 0, NULL); - SYMLNK_TEST_CREATE_FAILURE(&link, STATUS_INVALID_PARAMETER) - SYMLNK_TEST_OPEN_FAILURE(&h, STATUS_OBJECT_PATH_SYNTAX_BAD) + status = pNtCreateSymbolicLinkObject(&link, SYMBOLIC_LINK_QUERY, &attr, &target); + ok(status == STATUS_INVALID_PARAMETER || + broken(status == STATUS_SUCCESS), /* nt4 */ + "NtCreateSymbolicLinkObject should have failed with STATUS_INVALID_PARAMETER got(%08x)\n", status); + if (!status) pNtClose(h); + status = pNtOpenSymbolicLinkObject(&h, SYMBOLIC_LINK_QUERY, &attr); + ok(status == STATUS_OBJECT_PATH_SYNTAX_BAD, + "NtOpenSymbolicLinkObject should have failed with STATUS_OBJECT_PATH_SYNTAX_BAD got(%08x)\n", status); /* Bad name */ pRtlCreateUnicodeStringFromAsciiz(&target, "anywhere"); InitializeObjectAttributes(&attr, &str, 0, 0, NULL); pRtlCreateUnicodeStringFromAsciiz(&str, ""); - SYMLNK_TEST_CREATE_SUCCESS(&link) - SYMLNK_TEST_OPEN_FAILURE(&h, STATUS_OBJECT_PATH_SYNTAX_BAD) + status = pNtCreateSymbolicLinkObject(&link, SYMBOLIC_LINK_QUERY, &attr, &target); + ok(status == STATUS_SUCCESS, "Failed to create SymbolicLink(%08x)\n", status); + status = pNtOpenSymbolicLinkObject(&h, SYMBOLIC_LINK_QUERY, &attr); + ok(status == STATUS_OBJECT_PATH_SYNTAX_BAD, + "NtOpenSymbolicLinkObject should have failed with STATUS_OBJECT_PATH_SYNTAX_BAD got(%08x)\n", status); pNtClose(link); pRtlFreeUnicodeString(&str); pRtlCreateUnicodeStringFromAsciiz(&str, "\\"); - todo_wine {SYMLNK_TEST_CREATE_FAILURE(&h, STATUS_OBJECT_TYPE_MISMATCH)} + status = pNtCreateSymbolicLinkObject(&h, SYMBOLIC_LINK_QUERY, &attr, &target); + todo_wine ok(status == STATUS_OBJECT_TYPE_MISMATCH, + "NtCreateSymbolicLinkObject should have failed with STATUS_OBJECT_TYPE_MISMATCH got(%08x)\n", status); pRtlFreeUnicodeString(&str); pRtlFreeUnicodeString(&target); @@ -534,7 +538,8 @@ static void test_symboliclink(void) InitializeObjectAttributes(&attr, &str, 0, dir, NULL); pRtlCreateUnicodeStringFromAsciiz(&str, "test-link"); pRtlCreateUnicodeStringFromAsciiz(&target, "\\DosDevices"); - SYMLNK_TEST_CREATE_SUCCESS(&link) + status = pNtCreateSymbolicLinkObject(&link, SYMBOLIC_LINK_QUERY, &attr, &target); + ok(status == STATUS_SUCCESS, "Failed to create SymbolicLink(%08x)\n", status); pRtlFreeUnicodeString(&str); pRtlFreeUnicodeString(&target);

1 0

Jacek Caban : jscript: Added Function default value implementation.
by Alexandre Julliard 22 Sep '08

22 Sep '08

Module: wine Branch: master Commit: e806869d4e8b770ed63b94c22d703344f67e8ce2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e806869d4e8b770ed63b94c22… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Sep 21 15:48:11 2008 +0200 jscript: Added Function default value implementation. --- dlls/jscript/function.c | 13 +++++++++++++ dlls/jscript/tests/api.js | 4 ++++ 2 files changed, 17 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index c0ba1e2..96c41a9 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -364,6 +364,19 @@ static HRESULT Function_value(DispatchEx *dispex, LCID lcid, WORD flags, DISPPAR return invoke_function(function, lcid, dp, retv, ei, caller); + case DISPATCH_PROPERTYGET: { + HRESULT hres; + BSTR str; + + hres = function_to_string(function, &str); + if(FAILED(hres)) + return hres; + + V_VT(retv) = VT_BSTR; + V_BSTR(retv) = str; + break; + } + case DISPATCH_CONSTRUCT: if(function->value_proc) return invoke_value_proc(function, lcid, flags, dp, retv, ei, caller); diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 4084241..93f06b9 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -321,6 +321,8 @@ var func = function (a) { }.toString(); ok(func.toString() === "function (a) {\n var a = 1;\n if(a) return;\n }", "func.toString() = " + func.toString()); +ok("" + func === "function (a) {\n var a = 1;\n if(a) return;\n }", + "'' + func.toString() = " + func); function testFuncToString(x,y) { return x+y; @@ -328,5 +330,7 @@ function testFuncToString(x,y) { ok(testFuncToString.toString() === "function testFuncToString(x,y) {\n return x+y;\n}", "testFuncToString.toString() = " + testFuncToString.toString()); +ok("" + testFuncToString === "function testFuncToString(x,y) {\n return x+y;\n}", + "'' + testFuncToString = " + testFuncToString); reportSuccess();

1 0

Jacek Caban : jscript: Added Function.toString implementation.
by Alexandre Julliard 22 Sep '08

22 Sep '08

Module: wine Branch: master Commit: 5760eb808b17a8c80bbb42ea128499ace84b69af URL: http://source.winehq.org/git/wine.git/?a=commit;h=5760eb808b17a8c80bbb42ea1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Sep 21 15:47:47 2008 +0200 jscript: Added Function.toString implementation. --- dlls/jscript/engine.c | 6 +++- dlls/jscript/engine.h | 7 +++++- dlls/jscript/function.c | 50 ++++++++++++++++++++++++++++++++++++++++++-- dlls/jscript/jscript.c | 2 +- dlls/jscript/lex.c | 14 ++++++++---- dlls/jscript/parser.y | 23 ++++++++++++++------ dlls/jscript/tests/api.js | 14 ++++++++++++ 7 files changed, 97 insertions(+), 19 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5760eb808b17a8c80bbb4…

1 0

Jacek Caban : jscript: Don't call IDispatch as constructor.
by Alexandre Julliard 22 Sep '08

22 Sep '08

Module: wine Branch: master Commit: 68bd72c7cd28bf1f1f80eb2f3d4f0091a2b74dda URL: http://source.winehq.org/git/wine.git/?a=commit;h=68bd72c7cd28bf1f1f80eb2f3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Sep 21 15:47:05 2008 +0200 jscript: Don't call IDispatch as constructor. --- dlls/jscript/dispex.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 63f41fa..896af91 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -844,6 +844,11 @@ HRESULT disp_call(IDispatch *disp, DISPID id, LCID lcid, WORD flags, DISPPARAMS if(FAILED(hres)) { UINT err = 0; + if(flags == DISPATCH_CONSTRUCT) { + WARN("IDispatch cannot be constructor\n"); + return DISP_E_MEMBERNOTFOUND; + } + TRACE("using IDispatch\n"); return IDispatch_Invoke(disp, id, &IID_NULL, lcid, flags, dp, retv, &ei->ei, &err); }

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 September 2008