September 2011 - Wine-Commits

Frédéric Delanoy : cmd: Allow a batch file to delete itself.
by Alexandre Julliard Sept. 12, 2011

Sept. 12, 2011

Module: wine Branch: master Commit: a33bad1edd3c722810252d681a56e43391d3e1c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a33bad1edd3c722810252d681… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sun Sep 11 17:14:55 2011 +0200 cmd: Allow a batch file to delete itself. --- programs/cmd/batch.c | 2 +- programs/cmd/tests/test_builtins.cmd.exp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/cmd/batch.c b/programs/cmd/batch.c index 70886d1..881c7d1 100644 --- a/programs/cmd/batch.c +++ b/programs/cmd/batch.c @@ -51,7 +51,7 @@ void WCMD_batch (WCHAR *file, WCHAR *command, int called, WCHAR *startLabel, HAN BATCH_CONTEXT *prev_context; if (startLabel == NULL) { - h = CreateFileW (file, GENERIC_READ, FILE_SHARE_READ, + h = CreateFileW (file, GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); if (h == INVALID_HANDLE_VALUE) { SetLastError (ERROR_FILE_NOT_FOUND); diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 5c022ff..b9285b1 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -725,7 +725,7 @@ foo '' non-builtin dir ------------ Testing cmd invocation ------------ ... a batch file can delete itself ... -(a)todo_wine@file correctly deleted +file correctly deleted ... a batch file can alter itself ... @todo_wine(a)bar ------------ Testing setlocal/endlocal ------------

1 0

Frédéric Delanoy : cmd/tests: Add tests for combined CALLs/GOTOs.
by Alexandre Julliard Sept. 12, 2011

Sept. 12, 2011

Module: wine Branch: master Commit: 195ee2f3776681d4e4fb4f8a2fd0cdfd708c5dcf URL: http://source.winehq.org/git/wine.git/?a=commit;h=195ee2f3776681d4e4fb4f8a2… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sun Sep 11 17:14:56 2011 +0200 cmd/tests: Add tests for combined CALLs/GOTOs. --- programs/cmd/tests/test_builtins.cmd | 47 ++++++++++++++++++++++++++++++ programs/cmd/tests/test_builtins.cmd.exp | 10 ++++++- 2 files changed, 56 insertions(+), 1 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 88265f7..046e6e4 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -1353,6 +1353,53 @@ if d==d goto dest4 :dest4(a)space@ echo goto with a following space worked +echo ---------- Testing combined CALLs/GOTOs ----------- +echo @echo off>foo.cmd +echo goto :eof>>foot.cmd +echo :eof>>foot.cmd +echo echo world>>foo.cmd + +echo @echo off>foot.cmd +echo echo cheball>>foot.cmd +echo.>>foot.cmd +echo call :bar>>foot.cmd +echo if "%%1"=="deleteMe" (del foot.cmd)>>foot.cmd +echo goto :eof>>foot.cmd +echo.>>foot.cmd +echo :bar>>foot.cmd +echo echo barbare>>foot.cmd +echo goto :eof>>foot.cmd + +call foo.cmd +call foot +call :bar +del foo.cmd +rem Script execution stops after the following line +foot deleteMe +call :foo +call :foot +goto :endFuns + +:foot +echo foot + +:foo +echo foo +goto :eof + +:endFuns + +:bar +echo bar +call :foo + +:baz +echo baz +goto :eof + +echo Final message is not output since earlier 'foot' processing stops script execution +echo Do NOT add any tests below this line + echo -----------Done, jumping to EOF----------- goto :eof rem Subroutine to set errorlevel and return diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index b9285b1..1e2e3df 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -757,4 +757,12 @@ goto with no leading space worked goto with a leading space worked goto with a leading tab worked goto with a following space worked ------------Done, jumping to EOF----------- +---------- Testing combined CALLs/GOTOs ----------- +world +cheball +barbare +bar +foo +baz +cheball +barbare

1 0

Frédéric Delanoy : ntdll: Add NtCreateFile tests for invalid chars in file/dir name.
by Alexandre Julliard Sept. 12, 2011

Sept. 12, 2011

Module: wine Branch: master Commit: a5229fc51f805d86dccbcc99389093a6dedf9113 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5229fc51f805d86dccbcc993… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sun Sep 11 22:52:45 2011 +0200 ntdll: Add NtCreateFile tests for invalid chars in file/dir name. --- dlls/ntdll/tests/file.c | 33 ++++++++++++++++++++++++++++++++- 1 files changed, 32 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index ec62fe7..e299560 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -160,8 +160,10 @@ static void create_file_test(void) { static const WCHAR systemrootW[] = {'\\','S','y','s','t','e','m','R','o','o','t', '\\','f','a','i','l','i','n','g',0}; + static const WCHAR questionmarkInvalidNameW[] = {'a','f','i','l','e','?',0}; + static const WCHAR pipeInvalidNameW[] = {'a','|','b',0}; NTSTATUS status; - HANDLE dir; + HANDLE dir, file; WCHAR path[MAX_PATH]; OBJECT_ATTRIBUTES attr; IO_STATUS_BLOCK io; @@ -249,6 +251,35 @@ static void create_file_test(void) todo_wine ok( status == STATUS_INVALID_PARAMETER, "open %s failed %x\n", wine_dbgstr_w(nameW.Buffer), status ); + + /* Invalid chars in file/dirnames */ + pRtlDosPathNameToNtPathName_U(questionmarkInvalidNameW, &nameW, NULL, NULL); + attr.ObjectName = &nameW; + status = pNtCreateFile(&dir, GENERIC_READ|SYNCHRONIZE, &attr, &io, NULL, 0, + FILE_SHARE_READ, FILE_CREATE, + FILE_DIRECTORY_FILE|FILE_SYNCHRONOUS_IO_NONALERT, NULL, 0); + ok(status == STATUS_OBJECT_NAME_INVALID, + "open %s failed %x\n", wine_dbgstr_w(nameW.Buffer), status); + + status = pNtCreateFile(&file, GENERIC_WRITE|SYNCHRONIZE, &attr, &io, NULL, 0, + 0, FILE_CREATE, + FILE_NON_DIRECTORY_FILE|FILE_SYNCHRONOUS_IO_NONALERT, NULL, 0); + ok(status == STATUS_OBJECT_NAME_INVALID, + "open %s failed %x\n", wine_dbgstr_w(nameW.Buffer), status); + + pRtlDosPathNameToNtPathName_U(pipeInvalidNameW, &nameW, NULL, NULL); + attr.ObjectName = &nameW; + status = pNtCreateFile(&dir, GENERIC_READ|SYNCHRONIZE, &attr, &io, NULL, 0, + FILE_SHARE_READ, FILE_CREATE, + FILE_DIRECTORY_FILE|FILE_SYNCHRONOUS_IO_NONALERT, NULL, 0); + ok(status == STATUS_OBJECT_NAME_INVALID, + "open %s failed %x\n", wine_dbgstr_w(nameW.Buffer), status); + + status = pNtCreateFile(&file, GENERIC_WRITE|SYNCHRONIZE, &attr, &io, NULL, 0, + 0, FILE_CREATE, + FILE_NON_DIRECTORY_FILE|FILE_SYNCHRONOUS_IO_NONALERT, NULL, 0); + ok(status == STATUS_OBJECT_NAME_INVALID, + "open %s failed %x\n", wine_dbgstr_w(nameW.Buffer), status); } static void open_file_test(void)

1 0

Piotr Caban : msvcp90: Added basic_string<char>(allocator<char>) constructor implementation.
by Alexandre Julliard Sept. 12, 2011

Sept. 12, 2011

Module: wine Branch: master Commit: 6e4ad3394152077d630bac6cedfa47c81cecef4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e4ad3394152077d630bac6ce… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Sep 12 13:10:30 2011 +0200 msvcp90: Added basic_string<char>(allocator<char>) constructor implementation. --- dlls/msvcp90/memory.c | 4 ++-- dlls/msvcp90/msvcp90.spec | 8 ++++---- dlls/msvcp90/string.c | 24 ++++++++++++++++++++++++ 3 files changed, 30 insertions(+), 6 deletions(-) diff --git a/dlls/msvcp90/memory.c b/dlls/msvcp90/memory.c index 0941006..85d80ae 100644 --- a/dlls/msvcp90/memory.c +++ b/dlls/msvcp90/memory.c @@ -54,7 +54,7 @@ void* __thiscall MSVCP_allocator_char_ctor(void *this) /* ??0?$allocator(a)D@std@@QAE(a)ABV01@@Z */ /* ??0?$allocator(a)D@std@@QEAA(a)AEBV01@@Z */ DEFINE_THISCALL_WRAPPER(MSVCP_allocator_char_copy_ctor, 8) -void* __thiscall MSVCP_allocator_char_copy_ctor(void *this, void *copy) +void* __thiscall MSVCP_allocator_char_copy_ctor(void *this, const void *copy) { return this; } @@ -62,7 +62,7 @@ void* __thiscall MSVCP_allocator_char_copy_ctor(void *this, void *copy) /* ??4?$allocator(a)D@std@@QAEAAV01(a)ABV01@@Z */ /* ??4?$allocator(a)D@std@@QEAAAEAV01(a)AEBV01@@Z */ DEFINE_THISCALL_WRAPPER(MSVCP_allocator_char_assign, 8); -void* __thiscall MSVCP_allocator_char_assign(void *this, void *assign) +void* __thiscall MSVCP_allocator_char_assign(void *this, const void *assign) { return this; } diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index f3062cd..277ef26 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -738,8 +738,8 @@ @ cdecl -arch=win64 ??0?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAA(a)AEBV01@_K1(a)Z(ptr ptr long long) MSVCP_basic_string_char_ctor_substr @ stub -arch=win32 ??0?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAE(a)ABV01@IIABV?$allocator(a)D@1@@Z @ stub -arch=win64 ??0?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAA(a)AEBV01@_K1AEBV?$allocator(a)D@1@@Z -@ stub -arch=win32 ??0?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAE(a)ABV?$allocator(a)D@1@@Z -@ stub -arch=win64 ??0?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAA(a)AEBV?$allocator(a)D@1@@Z +@ thiscall -arch=win32 ??0?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAE(a)ABV?$allocator(a)D@1@@Z(ptr ptr) MSVCP_basic_string_char_ctor_alloc +@ cdecl -arch=win64 ??0?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAA(a)AEBV?$allocator(a)D@1@@Z(ptr ptr) MSVCP_basic_string_char_ctor_alloc @ stub -arch=win32 ??0?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAE(a)ID@Z @ stub -arch=win64 ??0?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAA(a)PEBD0@Z @ stub -arch=win32 ??0?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAE(a)IDABV?$allocator(a)D@1@@Z @@ -790,8 +790,8 @@ @ cdecl -arch=win64 ??0?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAA(a)AEBV01@_K1(a)Z(ptr ptr long long) MSVCP_basic_string_wchar_ctor_substr @ stub -arch=win32 ??0?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAE(a)ABV01@IIABV?$allocator(a)_W@1@@Z @ stub -arch=win64 ??0?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAA(a)AEBV01@_K1AEBV?$allocator(a)_W@1@@Z -@ stub -arch=win32 ??0?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAE(a)ABV?$allocator(a)_W@1@@Z -@ stub -arch=win64 ??0?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAA(a)AEBV?$allocator(a)_W@1@@Z +@ thiscall -arch=win32 ??0?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAE(a)ABV?$allocator(a)_W@1@@Z(ptr ptr) MSVCP_basic_string_wchar_ctor_alloc +@ cdecl -arch=win64 ??0?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAA(a)AEBV?$allocator(a)_W@1@@Z(ptr ptr) MSVCP_basic_string_wchar_ctor_alloc @ stub -arch=win32 ??0?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAE(a)I_W@Z @ stub -arch=win64 ??0?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAA(a)PEB_W0@Z @ stub -arch=win32 ??0?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAE(a)I_WABV?$allocator(a)_W@1@@Z diff --git a/dlls/msvcp90/string.c b/dlls/msvcp90/string.c index 049659e..dfc0af5 100644 --- a/dlls/msvcp90/string.c +++ b/dlls/msvcp90/string.c @@ -793,6 +793,18 @@ basic_string_char* __thiscall MSVCP_basic_string_char_ctor_substr( return this; } +/* ??0?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAE(a)ABV?$allocator(a)D@1@@Z */ +/* ??0?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAA(a)AEBV?$allocator(a)D@1@@Z */ +DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_char_ctor_alloc, 8) +basic_string_char* __thiscall MSVCP_basic_string_char_ctor_alloc( + basic_string_char *this, const void *alloc) +{ + TRACE("%p %p\n", this, alloc); + + basic_string_char_tidy(this, FALSE, 0); + return this; +} + /* ??1?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAE(a)XZ */ /* ??1?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAA(a)XZ */ DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_char_dtor, 4) @@ -1622,6 +1634,18 @@ basic_string_wchar* __thiscall MSVCP_basic_string_wchar_ctor_substr( return this; } +/* ??0?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAE(a)ABV?$allocator(a)_W@1@@Z */ +/* ??0?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAA(a)AEBV?$allocator(a)_W@1@@Z */ +DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_wchar_ctor_alloc, 8) + basic_string_wchar* __thiscall MSVCP_basic_string_wchar_ctor_alloc( + basic_string_wchar *this, const void *alloc) +{ + TRACE("%p %p\n", this, alloc); + + basic_string_wchar_tidy(this, FALSE, 0); + return this; +} + /* ??1?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAE(a)XZ */ /* ??1?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAA(a)XZ */ DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_wchar_dtor, 4)

1 0

Piotr Caban : msvcp90: Added basic_string::find(const char*, size_t) implementation.
by Alexandre Julliard Sept. 12, 2011

Sept. 12, 2011

Module: wine Branch: master Commit: 44f64f29b33c5e268dc312d50d3ca0b11b809e84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=44f64f29b33c5e268dc312d50… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Sep 12 13:10:40 2011 +0200 msvcp90: Added basic_string::find(const char*, size_t) implementation. --- dlls/msvcp90/msvcp90.spec | 8 ++++---- dlls/msvcp90/string.c | 20 ++++++++++++++++++++ 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index 277ef26..5518c06 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -3821,10 +3821,10 @@ @ stub -arch=win64 ?find@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEBA_KAEBV12(a)_K@Z @ thiscall -arch=win32 ?find@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBEIDI(a)Z(ptr long long) MSVCP_basic_string_char_find_ch @ cdecl -arch=win64 ?find@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEBA_KD_K(a)Z(ptr long long) MSVCP_basic_string_char_find_ch -@ stub -arch=win32 ?find@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBEIPBDI(a)Z +@ thiscall -arch=win32 ?find@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBEIPBDI(a)Z(ptr str long) MSVCP_basic_string_char_find_cstr_off @ cdecl -arch=win64 ?find@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEBA_KPEBD_K1(a)Z(ptr str long long) MSVCP_basic_string_char_find_cstr_substr @ thiscall -arch=win32 ?find@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBEIPBDII(a)Z(ptr str long long) MSVCP_basic_string_char_find_cstr_substr -@ stub -arch=win64 ?find@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEBA_KPEBD_K(a)Z +@ cdecl -arch=win64 ?find@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEBA_KPEBD_K(a)Z(ptr str long) MSVCP_basic_string_char_find_cstr_off @ stub -arch=win32 ?find@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QBEIABV12(a)I@Z @ stub -arch=win64 ?find@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QEBA_KAEBV12(a)_K@Z @ stub -arch=win32 ?find@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QBEIGI(a)Z @@ -3835,10 +3835,10 @@ @ stub -arch=win64 ?find@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QEBA_KPEBG_K(a)Z @ stub -arch=win32 ?find@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QBEIABV12(a)I@Z @ stub -arch=win64 ?find@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEBA_KAEBV12(a)_K@Z -@ stub -arch=win32 ?find@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QBEIPB_WI(a)Z +@ thiscall -arch=win32 ?find@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QBEIPB_WI(a)Z(ptr wstr long) MSVCP_basic_string_wchar_find_cstr_off @ cdecl -arch=win64 ?find@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEBA_KPEB_W_K1(a)Z(ptr wstr long long) MSVCP_basic_string_wchar_find_cstr_substr @ thiscall -arch=win32 ?find@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QBEIPB_WII(a)Z(ptr wstr long long) MSVCP_basic_string_wchar_find_cstr_substr -@ stub -arch=win64 ?find@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEBA_KPEB_W_K(a)Z +@ cdecl -arch=win64 ?find@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEBA_KPEB_W_K(a)Z(ptr wstr long) MSVCP_basic_string_wchar_find_cstr_off @ thiscall -arch=win32 ?find@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QBEI_WI(a)Z(ptr long long) MSVCP_basic_string_wchar_find_ch @ cdecl -arch=win64 ?find@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEBA_K_W_K(a)Z(ptr long long) MSVCP_basic_string_wchar_find_ch @ cdecl -arch=win32 ?find@?$char_traits(a)D@std@@SAPBDPBDIABD(a)Z(ptr long ptr) MSVCP_char_traits_char_find diff --git a/dlls/msvcp90/string.c b/dlls/msvcp90/string.c index dfc0af5..c25c7f1 100644 --- a/dlls/msvcp90/string.c +++ b/dlls/msvcp90/string.c @@ -1172,6 +1172,16 @@ MSVCP_size_t __thiscall MSVCP_basic_string_char_find_cstr_substr( return MSVCP_basic_string_char_npos; } +/* ?find@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBEIPBDI(a)Z */ +/* ?find@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEBA_KPEBD_K(a)Z */ +DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_char_find_cstr_off, 12) +MSVCP_size_t __thiscall MSVCP_basic_string_char_find_cstr_off( + const basic_string_char *this, const char *find, MSVCP_size_t pos) +{ + return MSVCP_basic_string_char_find_cstr_substr(this, find, pos, + MSVCP_char_traits_char_length(find)); +} + /* ?find@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBEIDI(a)Z */ /* ?find@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEBA_KD_K(a)Z */ DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_char_find_ch, 12) @@ -2013,6 +2023,16 @@ MSVCP_size_t __thiscall MSVCP_basic_string_wchar_find_cstr_substr( return MSVCP_basic_string_wchar_npos; } +/* ?find@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QBEIPB_WI(a)Z */ +/* ?find@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEBA_KPEB_W_K(a)Z */ +DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_wchar_find_cstr_off, 12) +MSVCP_size_t __thiscall MSVCP_basic_string_wchar_find_cstr_off( + const basic_string_wchar *this, const wchar_t *find, MSVCP_size_t pos) +{ + return MSVCP_basic_string_wchar_find_cstr_substr(this, find, pos, + MSVCP_char_traits_wchar_length(find)); +} + /* ?find@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QBEI_WI(a)Z */ /* ?find@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEBA_K_W_K(a)Z */ DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_wchar_find_ch, 12)

1 0

Frédéric Delanoy : cmd: Show that windows doesn' t lock/prevent access to batch file during execution.
by Alexandre Julliard Sept. 12, 2011

Sept. 12, 2011

Module: wine Branch: master Commit: cb63445b5e0249b9bf31b9749b94cea76d78413e URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb63445b5e0249b9bf31b9749… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sun Sep 11 17:14:54 2011 +0200 cmd: Show that windows doesn't lock/prevent access to batch file during execution. --- programs/cmd/tests/test_builtins.cmd | 21 +++++++++++++++++++++ programs/cmd/tests/test_builtins.cmd.exp | 5 +++++ 2 files changed, 26 insertions(+), 0 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index c5f4bd9..88265f7 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -1256,6 +1256,27 @@ echo echo non-builtin dir> dir.cmd call dir /b cd .. & rd /s/q foobar +echo ------------ Testing cmd invocation ------------ +rem FIXME: only a stub ATM +echo ... a batch file can delete itself ... +echo del foo.cmd>foo.cmd +cmd /q /c foo.cmd +if not exist foo.cmd ( + echo file correctly deleted +) else ( + echo file should be deleted! + del foo.cmd +) +echo ... a batch file can alter itself ... +echo echo bar^>foo.cmd>foo.cmd +cmd /q /c foo.cmd > NUL 2>&1 +if exist foo.cmd ( + type foo.cmd + del foo.cmd +) else ( + echo file not created! +) + echo ------------ Testing setlocal/endlocal ------------ call :setError 0 rem Note: setlocal EnableDelayedExtension already tested in the variable delayed expansion test section diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 7dd6207..5c022ff 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -723,6 +723,11 @@ foo '' @todo_wine(a)1 @todo_wine(a)1 non-builtin dir +------------ Testing cmd invocation ------------ +... a batch file can delete itself ... +(a)todo_wine@file correctly deleted +... a batch file can alter itself ... +(a)todo_wine@bar ------------ Testing setlocal/endlocal ------------ ...enable/disable extensions @todo_wine(a)ErrLev:@space@

1 0

Jacek Caban : vbscript: Added assign statement tests.
by Alexandre Julliard Sept. 12, 2011

Sept. 12, 2011

Module: wine Branch: master Commit: d9659a6502ac6ff7f5de6bc3cf7f0adc204d4496 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9659a6502ac6ff7f5de6bc3c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 12 12:33:14 2011 +0200 vbscript: Added assign statement tests. --- dlls/vbscript/tests/run.c | 38 ++++++++++++++++++++++++++++++++++++++ 1 files changed, 38 insertions(+), 0 deletions(-) diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index dac8bec..e9beab9 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -58,12 +58,15 @@ extern const CLSID CLSID_VBScript; DEFINE_EXPECT(global_success_d); DEFINE_EXPECT(global_success_i); +DEFINE_EXPECT(global_vbvar_d); +DEFINE_EXPECT(global_vbvar_i); #define DISPID_GLOBAL_REPORTSUCCESS 1000 #define DISPID_GLOBAL_TRACE 1001 #define DISPID_GLOBAL_OK 1002 #define DISPID_GLOBAL_GETVT 1003 #define DISPID_GLOBAL_ISENGLOC 1004 +#define DISPID_GLOBAL_VBVAR 1005 static const WCHAR testW[] = {'t','e','s','t',0}; @@ -252,6 +255,12 @@ static HRESULT WINAPI Global_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD *pid = DISPID_GLOBAL_ISENGLOC; return S_OK; } + if(!strcmp_wa(bstrName, "vbvar")) { + CHECK_EXPECT(global_vbvar_d); + test_grfdex(grfdex, fdexNameCaseInsensitive); + *pid = DISPID_GLOBAL_VBVAR; + return S_OK; + } if(strict_dispid_check && strcmp_wa(bstrName, "x")) ok(0, "unexpected call %s %x\n", wine_dbgstr_w(bstrName), grfdex); @@ -350,6 +359,23 @@ static HRESULT WINAPI Global_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, } return S_OK; + case DISPID_GLOBAL_VBVAR: + CHECK_EXPECT(global_vbvar_i); + + ok(wFlags == DISPATCH_PROPERTYPUT, "wFlags = %x\n", wFlags); + ok(pdp != NULL, "pdp == NULL\n"); + ok(pdp->rgvarg != NULL, "rgvarg == NULL\n"); + ok(pdp->rgdispidNamedArgs != NULL, "rgdispidNamedArgs == NULL\n"); + ok(pdp->cArgs == 1, "cArgs = %d\n", pdp->cArgs); + ok(pdp->cNamedArgs == 1, "cNamedArgs = %d\n", pdp->cNamedArgs); + ok(pdp->rgdispidNamedArgs[0] == DISPID_PROPERTYPUT, "pdp->rgdispidNamedArgs[0] = %d\n", pdp->rgdispidNamedArgs[0]); + ok(!pvarRes, "pvarRes != NULL\n"); + ok(pei != NULL, "pei == NULL\n"); + + ok(V_VT(pdp->rgvarg) == VT_I2, "V_VT(psp->rgvargs) = %d\n", V_VT(pdp->rgvarg)); + ok(V_I2(pdp->rgvarg) == 3, "V_I2(psp->rgvargs) = %d\n", V_I2(pdp->rgvarg)); + + return S_OK; } ok(0, "unexpected call %d\n", id); @@ -652,6 +678,18 @@ static void run_tests(void) CHECK_CALLED(global_success_d); CHECK_CALLED(global_success_i); + SET_EXPECT(global_vbvar_d); + SET_EXPECT(global_vbvar_i); + parse_script_a("Option Explicit\nvbvar = 3"); + CHECK_CALLED(global_vbvar_d); + CHECK_CALLED(global_vbvar_i); + + SET_EXPECT(global_vbvar_d); + SET_EXPECT(global_vbvar_i); + parse_script_a("Option Explicit\nvbvar() = 3"); + CHECK_CALLED(global_vbvar_d); + CHECK_CALLED(global_vbvar_i); + run_from_res("lang.vbs"); }

1 0

Piotr Caban : msvcp60: Export more functions on win32.
by Alexandre Julliard Sept. 12, 2011

Sept. 12, 2011

Module: wine Branch: master Commit: eba2ca4a1e33c4c024edc0db0b40a39a4e34f611 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eba2ca4a1e33c4c024edc0db0… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Sep 12 13:10:20 2011 +0200 msvcp60: Export more functions on win32. --- dlls/msvcp60/msvcp60.spec | 112 ++++++++++++++++++++++---------------------- 1 files changed, 56 insertions(+), 56 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=eba2ca4a1e33c4c024edc…

1 0

Jacek Caban : vbscript: Added interp_add implementation.
by Alexandre Julliard Sept. 12, 2011

Sept. 12, 2011

Module: wine Branch: master Commit: 03c8284843cf4184e0646bde74c63d9d967b55f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=03c8284843cf4184e0646bde7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 12 12:32:07 2011 +0200 vbscript: Added interp_add implementation. --- dlls/vbscript/interp.c | 22 ++++++++++++++++++++-- dlls/vbscript/tests/lang.vbs | 5 +++++ 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index fb3adfe..f3e3f56 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -393,8 +393,26 @@ static HRESULT interp_concat(exec_ctx_t *ctx) static HRESULT interp_add(exec_ctx_t *ctx) { - FIXME("\n"); - return E_NOTIMPL; + variant_val_t r, l; + VARIANT v; + HRESULT hres; + + TRACE("\n"); + + hres = stack_pop_val(ctx, &r); + if(FAILED(hres)) + return hres; + + hres = stack_pop_val(ctx, &l); + if(SUCCEEDED(hres)) { + hres = VarAdd(l.v, r.v, &v); + release_val(&l); + } + release_val(&r); + if(FAILED(hres)) + return hres; + + return stack_push(ctx, &v); } static HRESULT interp_sub(exec_ctx_t *ctx) diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 9b1d771..06a3d07 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -70,4 +70,9 @@ Call ok(1 & 100000 = "1100000", "1 & 100000 = " & (1 & 100000)) ' Call ok(true & false = "TrueFalse", "true & false = " & (true & false)) 'end if +Call ok(2+2 = 4, "2+2 = " & (2+2)) +Call ok(false + 6 + true = 5, "false + 6 + true <> 5") +Call ok(getVT(2+null) = "VT_NULL", "getVT(2+null) = " & getVT(2+null)) +Call ok(2+empty = 2, "2+empty = " & (2+empty)) + reportSuccess()

1 0

Jacek Caban : vbscript: Added '<>' expression implementation.
by Alexandre Julliard Sept. 12, 2011

Sept. 12, 2011

Module: wine Branch: master Commit: 43f6a6842acd0b1374a5b200427768f8f631502d URL: http://source.winehq.org/git/wine.git/?a=commit;h=43f6a6842acd0b1374a5b2004… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 12 12:32:27 2011 +0200 vbscript: Added '<>' expression implementation. --- dlls/vbscript/compile.c | 2 ++ dlls/vbscript/interp.c | 16 ++++++++++++++++ dlls/vbscript/parse.h | 1 + dlls/vbscript/parser.y | 1 + dlls/vbscript/tests/lang.vbs | 5 +++++ dlls/vbscript/vbscript.h | 1 + 6 files changed, 26 insertions(+), 0 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index 9e34c35..a91cb5d 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -250,6 +250,8 @@ static HRESULT compile_expression(compile_ctx_t *ctx, expression_t *expr) return compile_member_expression(ctx, (member_expression_t*)expr, TRUE); case EXPR_NEG: return compile_unary_expression(ctx, (unary_expression_t*)expr, OP_neg); + case EXPR_NEQUAL: + return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_nequal); case EXPR_NOT: return compile_unary_expression(ctx, (unary_expression_t*)expr, OP_not); case EXPR_NULL: diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 4585f88..51ec8e7 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -367,6 +367,22 @@ static HRESULT interp_equal(exec_ctx_t *ctx) return stack_push(ctx, &v); } +static HRESULT interp_nequal(exec_ctx_t *ctx) +{ + VARIANT v; + HRESULT hres; + + TRACE("\n"); + + hres = cmp_oper(ctx); + if(FAILED(hres)) + return hres; + + V_VT(&v) = VT_BOOL; + V_BOOL(&v) = hres != VARCMP_EQ ? VARIANT_TRUE : VARIANT_FALSE; + return stack_push(ctx, &v); +} + static HRESULT interp_concat(exec_ctx_t *ctx) { variant_val_t r, l; diff --git a/dlls/vbscript/parse.h b/dlls/vbscript/parse.h index 3d6d604..188b673 100644 --- a/dlls/vbscript/parse.h +++ b/dlls/vbscript/parse.h @@ -25,6 +25,7 @@ typedef enum { EXPR_EQUAL, EXPR_MEMBER, EXPR_NEG, + EXPR_NEQUAL, EXPR_NOT, EXPR_NULL, EXPR_STRING, diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index 2f42ab6..ebfbbbc 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -139,6 +139,7 @@ NotExpression EqualityExpression : ConcatExpression { $$ = $1; } | EqualityExpression '=' ConcatExpression { $$ = new_binary_expression(ctx, EXPR_EQUAL, $1, $3); CHECK_ERROR; } + | EqualityExpression tNEQ ConcatExpression { $$ = new_binary_expression(ctx, EXPR_NEQUAL, $1, $3); CHECK_ERROR; } ConcatExpression : AdditiveExpression { $$ = $1; } diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 9c37bb2..2e81643 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -40,6 +40,11 @@ Call ok(&hffFFffFF& = -1, "&hffFFffFF& <> -1") Call ok(--1 = 1, "--1 = " & --1) Call ok(-empty = 0, "-empty = " & (-empty)) +Call ok(true <> false, "true <> false is false") +Call ok(not (true <> true), "true <> true is true") +Call ok(not ("x" <> "x"), """x"" <> ""x"" is true") +Call ok(not (empty <> empty), "empty <> empty is true") + Call ok(getVT(false) = "VT_BOOL", "getVT(false) is not VT_BOOL") Call ok(getVT(true) = "VT_BOOL", "getVT(true) is not VT_BOOL") Call ok(getVT("") = "VT_BSTR", "getVT("""") is not VT_BSTR") diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index cf90b38..e2cfdea 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -98,6 +98,7 @@ typedef enum { X(icallv, 1, ARG_BSTR, ARG_UINT) \ X(long, 1, ARG_INT, 0) \ X(neg, 1, 0, 0) \ + X(nequal, 1, 0, 0) \ X(not, 1, 0, 0) \ X(null, 1, 0, 0) \ X(ret, 0, 0, 0) \

1 0