October 2011 - Wine-Commits

Piotr Caban : msvcp90: Added basic_string::reserve implementation.
by Alexandre Julliard Oct. 13, 2011

Oct. 13, 2011

Module: wine Branch: master Commit: d7ff552b71cd7d2cd0f3cfa1db05a60af0a4164a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7ff552b71cd7d2cd0f3cfa1d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Oct 13 14:08:14 2011 +0200 msvcp90: Added basic_string::reserve implementation. --- dlls/msvcp90/msvcp90.spec | 8 ++++---- dlls/msvcp90/string.c | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index 25bb0b9..9ace7d7 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -5167,12 +5167,12 @@ @ stub -arch=win64 ?replace@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAAAEAV12(a)_K0PEB_W0@Z @ stub -arch=win32 ?replace@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAEAAV12(a)V?$_String_const_iterator(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@2(a)0PB_WI@Z @ stub -arch=win64 ?replace@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAAAEAV12(a)_K0PEB_W@Z -@ stub -arch=win32 ?reserve@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEXI(a)Z -@ stub -arch=win64 ?reserve@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAAX_K(a)Z +@ thiscall -arch=win32 ?reserve@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEXI(a)Z(ptr long) MSVCP_basic_string_char_reserve +@ cdecl -arch=win64 ?reserve@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAAX_K(a)Z(ptr long) MSVCP_basic_string_char_reserve @ stub -arch=win32 ?reserve@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QAEXI(a)Z @ stub -arch=win64 ?reserve@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QEAAX_K(a)Z -@ stub -arch=win32 ?reserve@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAEXI(a)Z -@ stub -arch=win64 ?reserve@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAAX_K(a)Z +@ thiscall -arch=win32 ?reserve@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAEXI(a)Z(ptr long) MSVCP_basic_string_wchar_reserve +@ cdecl -arch=win64 ?reserve@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAAX_K(a)Z(ptr long) MSVCP_basic_string_wchar_reserve @ stub ?resetiosflags(a)std@@YA?AU?$_Smanip(a)H@1(a)H@Z @ thiscall -arch=win32 ?resize@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEXI(a)Z(ptr long) MSVCP_basic_string_char_resize @ cdecl -arch=win64 ?resize@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAAX_K(a)Z(ptr long) MSVCP_basic_string_char_resize diff --git a/dlls/msvcp90/string.c b/dlls/msvcp90/string.c index 59bc270..ba10c20 100644 --- a/dlls/msvcp90/string.c +++ b/dlls/msvcp90/string.c @@ -780,6 +780,23 @@ MSVCP_size_t __thiscall MSVCP_basic_string_char_capacity(basic_string_char *this return this->res; } +/* ?reserve@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEXI(a)Z */ +/* ?reserve@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAAX_K(a)Z */ +DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_char_reserve, 8) +void __thiscall MSVCP_basic_string_char_reserve(basic_string_char *this, MSVCP_size_t size) +{ + MSVCP_size_t len; + + TRACE("%p %ld\n", this, size); + + len = this->size; + if(len > size) + return; + + basic_string_char_grow(this, size, FALSE); + basic_string_char_eos(this, len); +} + /* ??0?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAE(a)XZ */ /* ??0?$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_ctor, 4) @@ -1873,6 +1890,23 @@ MSVCP_size_t __thiscall MSVCP_basic_string_wchar_capacity(basic_string_wchar *th return this->res; } +/* ?reserve@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAEXI(a)Z */ +/* ?reserve@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAAX_K(a)Z */ +DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_wchar_reserve, 8) +void __thiscall MSVCP_basic_string_wchar_reserve(basic_string_wchar *this, MSVCP_size_t size) +{ + MSVCP_size_t len; + + TRACE("%p %ld\n", this, size); + + len = this->size; + if(len > size) + return; + + basic_string_wchar_grow(this, size, FALSE); + basic_string_wchar_eos(this, len); +} + /* ??0?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAE(a)XZ */ /* ??0?$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_ctor, 4)

1 0

Piotr Caban : msvcp90: Added operator+(basic_string, char) implementation.
by Alexandre Julliard Oct. 13, 2011

Oct. 13, 2011

Module: wine Branch: master Commit: 5d1af4b6f6bdcf3a8789a21bcdd26c82d8a4bb47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d1af4b6f6bdcf3a8789a21bc… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Oct 13 14:08:00 2011 +0200 msvcp90: Added operator+(basic_string, char) implementation. --- dlls/msvcp90/msvcp90.spec | 16 +++++++------- dlls/msvcp90/string.c | 52 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 60 insertions(+), 8 deletions(-) diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index ecde9b5..25bb0b9 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -202,12 +202,12 @@ @ stub -arch=win64 ??$?GO(a)std@@YA?AV?$complex(a)O@0(a)AEBV10@AEBO(a)Z @ cdecl -arch=win32 ??$?HDU?$char_traits(a)D@std@@V?$allocator(a)D@1@@std@@YA?AV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@0(a)ABV10@0(a)Z(ptr ptr ptr) MSVCP_basic_string_char_concatenate @ cdecl -arch=win64 ??$?HDU?$char_traits(a)D@std@@V?$allocator(a)D@1@@std@@YA?AV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@0(a)AEBV10@0(a)Z(ptr ptr ptr) MSVCP_basic_string_char_concatenate -@ stub -arch=win32 ??$?HDU?$char_traits(a)D@std@@V?$allocator(a)D@1@@std@@YA?AV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@0(a)ABV10@D(a)Z -@ stub -arch=win64 ??$?HDU?$char_traits(a)D@std@@V?$allocator(a)D@1@@std@@YA?AV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@0(a)AEBV10@D(a)Z +@ cdecl -arch=win32 ??$?HDU?$char_traits(a)D@std@@V?$allocator(a)D@1@@std@@YA?AV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@0(a)ABV10@D(a)Z(ptr ptr long) MSVCP_basic_string_char_concatenate_bstr_ch +@ cdecl -arch=win64 ??$?HDU?$char_traits(a)D@std@@V?$allocator(a)D@1@@std@@YA?AV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@0(a)AEBV10@D(a)Z(ptr ptr long) MSVCP_basic_string_char_concatenate_bstr_ch @ cdecl -arch=win32 ??$?HDU?$char_traits(a)D@std@@V?$allocator(a)D@1@@std@@YA?AV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@0(a)ABV10@PBD(a)Z(ptr ptr str) MSVCP_basic_string_char_concatenate_bstr_cstr @ cdecl -arch=win64 ??$?HDU?$char_traits(a)D@std@@V?$allocator(a)D@1@@std@@YA?AV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@0(a)AEBV10@PEBD(a)Z(ptr ptr str) MSVCP_basic_string_char_concatenate_bstr_cstr -@ stub -arch=win32 ??$?HDU?$char_traits(a)D@std@@V?$allocator(a)D@1@@std@@YA?AV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@0(a)DABV10@@Z -@ stub -arch=win64 ??$?HDU?$char_traits(a)D@std@@V?$allocator(a)D@1@@std@@YA?AV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@0(a)DAEBV10@@Z +@ cdecl -arch=win32 ??$?HDU?$char_traits(a)D@std@@V?$allocator(a)D@1@@std@@YA?AV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@0(a)DABV10@@Z(ptr long ptr) MSVCP_basic_string_char_concatenate_ch_bstr +@ cdecl -arch=win64 ??$?HDU?$char_traits(a)D@std@@V?$allocator(a)D@1@@std@@YA?AV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@0(a)DAEBV10@@Z(ptr long ptr) MSVCP_basic_string_char_concatenate_ch_bstr @ cdecl -arch=win32 ??$?HDU?$char_traits(a)D@std@@V?$allocator(a)D@1@@std@@YA?AV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@0(a)PBDABV10@@Z(ptr str ptr) MSVCP_basic_string_char_concatenate_cstr_bstr @ cdecl -arch=win64 ??$?HDU?$char_traits(a)D@std@@V?$allocator(a)D@1@@std@@YA?AV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@0(a)PEBDAEBV10@@Z(ptr str ptr) MSVCP_basic_string_char_concatenate_cstr_bstr @ stub -arch=win32 ??$?HGU?$char_traits(a)G@std@@V?$allocator(a)G@1@@std@@YA?AV?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@0(a)ABV10@0(a)Z @@ -248,12 +248,12 @@ @ cdecl -arch=win64 ??$?H_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@1@@std@@YA?AV?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@0(a)AEBV10@0(a)Z(ptr ptr ptr) MSVCP_basic_string_wchar_concatenate @ cdecl -arch=win32 ??$?H_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@1@@std@@YA?AV?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@0(a)ABV10@PB_W(a)Z(ptr ptr wstr) MSVCP_basic_string_wchar_concatenate_bstr_cstr @ cdecl -arch=win64 ??$?H_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@1@@std@@YA?AV?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@0(a)AEBV10@PEB_W(a)Z(ptr ptr wstr) MSVCP_basic_string_wchar_concatenate_bstr_cstr -@ stub -arch=win32 ??$?H_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@1@@std@@YA?AV?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@0(a)ABV10@_W(a)Z -@ stub -arch=win64 ??$?H_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@1@@std@@YA?AV?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@0(a)AEBV10@_W(a)Z +@ cdecl -arch=win32 ??$?H_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@1@@std@@YA?AV?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@0(a)ABV10@_W(a)Z(ptr ptr long) MSVCP_basic_string_wchar_concatenate_bstr_ch +@ cdecl -arch=win64 ??$?H_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@1@@std@@YA?AV?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@0(a)AEBV10@_W(a)Z(ptr ptr long) MSVCP_basic_string_wchar_concatenate_bstr_ch @ cdecl -arch=win32 ??$?H_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@1@@std@@YA?AV?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@0(a)PB_WABV10@@Z(ptr wstr ptr) MSVCP_basic_string_wchar_concatenate_cstr_bstr @ cdecl -arch=win64 ??$?H_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@1@@std@@YA?AV?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@0(a)PEB_WAEBV10@@Z(ptr wstr ptr) MSVCP_basic_string_wchar_concatenate_cstr_bstr -@ stub -arch=win32 ??$?H_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@1@@std@@YA?AV?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@0(a)_WABV10@@Z -@ stub -arch=win64 ??$?H_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@1@@std@@YA?AV?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@0(a)_WAEBV10@@Z +@ cdecl -arch=win32 ??$?H_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@1@@std@@YA?AV?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@0(a)_WABV10@@Z(ptr long ptr) MSVCP_basic_string_wchar_concatenate_ch_bstr +@ cdecl -arch=win64 ??$?H_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@1@@std@@YA?AV?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@0(a)_WAEBV10@@Z(ptr long ptr) MSVCP_basic_string_wchar_concatenate_ch_bstr @ stub -arch=win32 ??$?KM(a)std@@YA?AV?$complex(a)M@0(a)ABMABV10@@Z @ stub -arch=win64 ??$?KM(a)std@@YA?AV?$complex(a)M@0(a)AEBMAEBV10@@Z @ stub -arch=win32 ??$?KM(a)std@@YA?AV?$complex(a)M@0(a)ABV10@0(a)Z diff --git a/dlls/msvcp90/string.c b/dlls/msvcp90/string.c index c89b793..59bc270 100644 --- a/dlls/msvcp90/string.c +++ b/dlls/msvcp90/string.c @@ -1078,6 +1078,30 @@ basic_string_char* __cdecl MSVCP_basic_string_char_concatenate(basic_string_char return ret; } +/* ??$?HDU?$char_traits(a)D@std@@V?$allocator(a)D@1@@std@@YA?AV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@0(a)ABV10@D(a)Z */ +/* ??$?HDU?$char_traits(a)D@std@@V?$allocator(a)D@1@@std@@YA?AV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@0(a)AEBV10@D(a)Z */ +basic_string_char* __cdecl MSVCP_basic_string_char_concatenate_bstr_ch(basic_string_char *ret, + const basic_string_char *left, char right) +{ + TRACE("%p %c\n", left, right); + + MSVCP_basic_string_char_copy_ctor(ret, left); + MSVCP_basic_string_char_append_ch(ret, right); + return ret; +} + +/* ??$?HDU?$char_traits(a)D@std@@V?$allocator(a)D@1@@std@@YA?AV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@0(a)DABV10@@Z */ +/* ??$?HDU?$char_traits(a)D@std@@V?$allocator(a)D@1@@std@@YA?AV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@0(a)DAEBV10@@Z */ +basic_string_char* __cdecl MSVCP_basic_string_char_concatenate_ch_bstr(basic_string_char *ret, + char left, const basic_string_char *right) +{ + TRACE("%c %p\n", left, right); + + MSVCP_basic_string_char_ctor_cstr_len(ret, &left, 1); + MSVCP_basic_string_char_append(ret, right); + return ret; +} + /* ?compare@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBEHIIPBDI(a)Z */ /* ?compare@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEBAH_K0PEBD0(a)Z */ DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_char_compare_substr_cstr_len, 20) @@ -2147,6 +2171,34 @@ basic_string_wchar* __cdecl MSVCP_basic_string_wchar_concatenate(basic_string_wc return ret; } +/* ??$?H_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@1@@std@@YA?AV?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@0(a)ABV10@_W(a)Z */ +/* ??$?H_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@1@@std@@YA?AV?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@0(a)AEBV10@_W(a)Z */ +basic_string_wchar __cdecl MSVCP_basic_string_wchar_concatenate_bstr_ch( + const basic_string_wchar *left, wchar_t right) +{ + basic_string_wchar ret = { 0 }; + + TRACE("%p %c\n", left, right); + + MSVCP_basic_string_wchar_copy_ctor(&ret, left); + MSVCP_basic_string_wchar_append_ch(&ret, right); + return ret; +} + +/* ??$?H_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@1@@std@@YA?AV?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@0(a)_WABV10@@Z */ +/* ??$?H_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@1@@std@@YA?AV?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@0(a)_WAEBV10@@Z */ +basic_string_wchar __cdecl MSVCP_basic_string_wchar_concatenate_ch_bstr( + wchar_t left, const basic_string_wchar *right) +{ + basic_string_wchar ret = { 0 }; + + TRACE("%c %p\n", left, right); + + MSVCP_basic_string_wchar_ctor_cstr_len(&ret, &left, 1); + MSVCP_basic_string_wchar_append(&ret, right); + return ret; +} + /* ?compare@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QBEHIIPB_WI(a)Z */ /* ?compare@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEBAH_K0PEB_W0(a)Z */ DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_wchar_compare_substr_cstr_len, 20)

1 0

Bernhard Loos : server: PIPE_TYPE_BYTE | PIPE_READMODE_MESSAGE is invalid for named pipes.
by Alexandre Julliard Oct. 13, 2011

Oct. 13, 2011

Module: wine Branch: master Commit: c368df486565a83f7f0268a260306b0825e9a0bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=c368df486565a83f7f0268a26… Author: Bernhard Loos <bernhardloos(a)googlemail.com> Date: Wed Oct 12 14:50:40 2011 +0200 server: PIPE_TYPE_BYTE | PIPE_READMODE_MESSAGE is invalid for named pipes. --- dlls/kernel32/tests/pipe.c | 13 +++++++++++++ server/named_pipe.c | 3 ++- 2 files changed, 15 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index ab85ad5..3484c62 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -71,6 +71,19 @@ static void test_CreateNamedPipe(int pipemode) ok(hnp == INVALID_HANDLE_VALUE && GetLastError() == ERROR_INVALID_NAME, "CreateNamedPipe should fail if name doesn't start with \\\\.\\pipe\n"); + if (pipemode == PIPE_TYPE_BYTE) + { + /* Bad parameter checks */ + hnp = CreateNamedPipe(PIPENAME, PIPE_ACCESS_DUPLEX, PIPE_TYPE_BYTE | PIPE_READMODE_MESSAGE, + /* nMaxInstances */ 1, + /* nOutBufSize */ 1024, + /* nInBufSize */ 1024, + /* nDefaultWait */ NMPWAIT_USE_DEFAULT_WAIT, + /* lpSecurityAttrib */ NULL); + ok(hnp == INVALID_HANDLE_VALUE && GetLastError() == ERROR_INVALID_PARAMETER, + "CreateNamedPipe should fail with PIPE_TYPE_BYTE | PIPE_READMODE_MESSAGE\n"); + } + hnp = CreateNamedPipe(NULL, PIPE_ACCESS_DUPLEX, pipemode | PIPE_WAIT, 1, 1024, 1024, NMPWAIT_USE_DEFAULT_WAIT, NULL); diff --git a/server/named_pipe.c b/server/named_pipe.c index d720b17..590adca 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -950,7 +950,8 @@ DECL_HANDLER(create_named_pipe) struct unicode_str name; struct directory *root = NULL; - if (!req->sharing || (req->sharing & ~(FILE_SHARE_READ | FILE_SHARE_WRITE))) + if (!req->sharing || (req->sharing & ~(FILE_SHARE_READ | FILE_SHARE_WRITE)) || + (!(req->flags & NAMED_PIPE_MESSAGE_STREAM_WRITE) && (req->flags & NAMED_PIPE_MESSAGE_STREAM_READ))) { set_error( STATUS_INVALID_PARAMETER ); return;

1 0

Piotr Caban : msvcrt: Don' t duplicate _setmbcp functionality inside _create_locale function.
by Alexandre Julliard Oct. 13, 2011

Oct. 13, 2011

Module: wine Branch: master Commit: fea69b230546cd8145c67e9f94b3e8f0fa2bea2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=fea69b230546cd8145c67e9f9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Oct 13 12:24:59 2011 +0200 msvcrt: Don't duplicate _setmbcp functionality inside _create_locale function. --- dlls/msvcrt/locale.c | 14 +----------- dlls/msvcrt/mbcs.c | 57 +++++++++++++++++++++++++++++++++++++------------ dlls/msvcrt/msvcrt.h | 1 + 3 files changed, 45 insertions(+), 27 deletions(-) diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index 7e9cebe..0fbc0fe 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -747,7 +747,6 @@ MSVCRT__locale_t MSVCRT__create_locale(int category, const char *locale) } memset(loc->locinfo, 0, sizeof(MSVCRT_threadlocinfo)); - memset(loc->mbcinfo, 0, sizeof(MSVCRT_threadmbcinfo)); loc->locinfo->lconv = MSVCRT_malloc(sizeof(struct MSVCRT_lconv)); if(!loc->locinfo->lconv) { @@ -840,18 +839,7 @@ MSVCRT__locale_t MSVCRT__create_locale(int category, const char *locale) } } - loc->mbcinfo->refcount = 1; - loc->mbcinfo->mbcodepage = loc->locinfo->lc_id[MSVCRT_LC_CTYPE].wCodePage; - - for(i=0; i<256; i++) { - if(loc->locinfo->pclmap[i] != i) { - loc->mbcinfo->mbctype[i+1] |= 0x10; - loc->mbcinfo->mbcasemap[i] = loc->locinfo->pclmap[i]; - } else if(loc->locinfo->pcumap[i] != i) { - loc->mbcinfo->mbctype[i+1] |= 0x20; - loc->mbcinfo->mbcasemap[i] = loc->locinfo->pcumap[i]; - } - } + _setmbcp_l(loc->locinfo->lc_id[MSVCRT_LC_CTYPE].wCodePage, loc->mbcinfo); if(lcid[MSVCRT_LC_MONETARY] && (category==MSVCRT_LC_ALL || category==MSVCRT_LC_MONETARY)) { if(update_threadlocinfo_category(lcid[MSVCRT_LC_MONETARY], loc, MSVCRT_LC_MONETARY)) { diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index 96cea86..737f690 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -182,25 +182,25 @@ int* CDECL ___mb_cur_max_l_func(MSVCRT__locale_t locale) } /********************************************************************* - * _setmbcp (MSVCRT.@) + * INTERNAL: _setmbcp_l */ -int CDECL _setmbcp(int cp) +int _setmbcp_l(int cp, MSVCRT_pthreadmbcinfo mbcinfo) { const char format[] = ".%d"; - MSVCRT_pthreadmbcinfo mbcinfo = get_mbcinfo(); - char buf[32]; int newcp; CPINFO cpi; BYTE *bytes; WORD chartypes[256]; - WORD *curr_type; char bufA[256]; WCHAR bufW[256]; int charcount; int ret; int i; + if(!mbcinfo) + mbcinfo = get_mbcinfo(); + switch (cp) { case _MB_CP_ANSI: @@ -222,8 +222,8 @@ int CDECL _setmbcp(int cp) break; } - sprintf(buf, format, newcp); - mbcinfo->mblcid = MSVCRT_locale_to_LCID(buf); + sprintf(bufA, format, newcp); + mbcinfo->mblcid = MSVCRT_locale_to_LCID(bufA); if(mbcinfo->mblcid == -1) { WARN("Can't assign LCID to codepage (%d)\n", mbcinfo->mblcid); @@ -290,16 +290,37 @@ int CDECL _setmbcp(int cp) GetStringTypeW(CT_CTYPE1, bufW, charcount, chartypes); - curr_type = chartypes; + charcount = 0; for (i = 0; i < 256; i++) if (!(mbcinfo->mbctype[i + 1] & _M1)) { - if ((*curr_type) & C1_UPPER) - mbcinfo->mbctype[i + 1] |= _SBUP; - if ((*curr_type) & C1_LOWER) - mbcinfo->mbctype[i + 1] |= _SBLOW; - curr_type++; + if (chartypes[charcount] & C1_UPPER) + { + mbcinfo->mbctype[i + 1] |= _SBUP; + bufW[charcount] = tolowerW(bufW[charcount]); + } + else if (chartypes[charcount] & C1_LOWER) + { + mbcinfo->mbctype[i + 1] |= _SBLOW; + bufW[charcount] = toupperW(bufW[charcount]); + } + charcount++; + } + + ret = WideCharToMultiByte(newcp, 0, bufW, charcount, bufA, charcount, NULL, NULL); + if (ret != charcount) + ERR("WideCharToMultiByte failed for cp %d, ret=%d (exp %d), error=%d\n", newcp, ret, charcount, GetLastError()); + + charcount = 0; + for (i = 0; i < 256; i++) + { + if(!(mbcinfo->mbctype[i + 1] & _M1)) + { + if(mbcinfo->mbctype[i] & (C1_UPPER|C1_LOWER)) + mbcinfo->mbcasemap[i] = bufA[charcount]; + charcount++; } + } if (newcp == 932) /* CP932 only - set _MP and _MS */ { @@ -315,13 +336,21 @@ int CDECL _setmbcp(int cp) } mbcinfo->mbcodepage = newcp; - if(mbcinfo == MSVCRT_locale->mbcinfo) + if(MSVCRT_locale && mbcinfo == MSVCRT_locale->mbcinfo) memcpy(MSVCRT_mbctype, MSVCRT_locale->mbcinfo->mbctype, sizeof(MSVCRT_mbctype)); return 0; } /********************************************************************* + * _setmbcp (MSVCRT.@) + */ +int CDECL _setmbcp(int cp) +{ + return _setmbcp_l(cp, NULL); +} + +/********************************************************************* * _getmbcp (MSVCRT.@) */ int CDECL _getmbcp(void) diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 65e00a1..14bf972 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -888,6 +888,7 @@ MSVCRT_pthreadmbcinfo get_mbcinfo(void); void __cdecl MSVCRT__free_locale(MSVCRT__locale_t); void free_locinfo(MSVCRT_pthreadlocinfo); void free_mbcinfo(MSVCRT_pthreadmbcinfo); +int _setmbcp_l(int, MSVCRT_pthreadmbcinfo); #ifndef __WINE_MSVCRT_TEST int __cdecl MSVCRT__write(int,const void*,unsigned int);

1 0

Austin English : wined3d: Recognize "Brian Paul" as a mesa card vendor.
by Alexandre Julliard Oct. 13, 2011

Oct. 13, 2011

Module: wine Branch: master Commit: aacbc7e2b7f711cb508c2b21cebafd40017e7ea3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aacbc7e2b7f711cb508c2b21c… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Oct 12 19:23:46 2011 -0500 wined3d: Recognize "Brian Paul" as a mesa card vendor. --- dlls/wined3d/directx.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index b393c69..7e63add 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1471,6 +1471,7 @@ static enum wined3d_pci_vendor wined3d_guess_card_vendor(const char *gl_vendor_s return HW_VENDOR_INTEL; if (strstr(gl_vendor_string, "Mesa") + || strstr(gl_vendor_string, "Brian Paul") || strstr(gl_vendor_string, "Tungsten Graphics, Inc") || strstr(gl_vendor_string, "VMware, Inc.")) return HW_VENDOR_SOFTWARE;

1 0

Francois Gouget : po: Fix translations with a mismatched '\n' ending or mark them as fuzzy.
by Alexandre Julliard Oct. 13, 2011

Oct. 13, 2011

Module: wine Branch: master Commit: 76ef1877008250ae6d479ad790f30b1ba2183f61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=76ef1877008250ae6d479ad79… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Oct 13 12:19:42 2011 +0200 po: Fix translations with a mismatched '\n' ending or mark them as fuzzy. --- po/fr.po | 2 +- po/it.po | 2 +- po/ko.po | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/po/fr.po b/po/fr.po index 9583c10..7de4dc6 100644 --- a/po/fr.po +++ b/po/fr.po @@ -10525,7 +10525,7 @@ msgstr "(Aucun)" #: winecfg.rc:89 msgid "Audio test failed!" -msgstr "Échec du test audio !\n" +msgstr "Échec du test audio !" #: winecfg.rc:91 msgid "(System default)" diff --git a/po/it.po b/po/it.po index 68f9c48..7e5e78f 100644 --- a/po/it.po +++ b/po/it.po @@ -3627,7 +3627,7 @@ msgstr "Impossibile spostare il file di sostituzione nella posizione\n" #: winerror.mc:1606 msgid "Moving the replacement file failed\n" -msgstr "Spostamento del file di sostituzione fallito" +msgstr "Spostamento del file di sostituzione fallito\n" #: winerror.mc:1611 msgid "The journal is being deleted\n" diff --git a/po/ko.po b/po/ko.po index ffa5952..63c76b5 100644 --- a/po/ko.po +++ b/po/ko.po @@ -7935,7 +7935,7 @@ msgstr "" "PAUSE 는 사용자가 아무 키나 누르라는 메세지를 화면에 보여줍니다.\n" "\n" "사용자가 화면에서 스크롤 하기 전에 이전 명령의 결과를 읽을 수 있도록\n" -"배치파일에서 주로 유용하게 사용합니다." +"배치파일에서 주로 유용하게 사용합니다.\n" #: cmd.rc:149 msgid "" @@ -10346,6 +10346,7 @@ msgid "(None)" msgstr "(없음)" #: winecfg.rc:89 +#, fuzzy msgid "Audio test failed!" msgstr "오디오 테스트 실패\n"

1 0

Bernhard Loos : ntdll/tests: FILE_OVERWRITE and FILE_OVERWRITE_IF aren' t legal for NtCreateNamedPipeFile.
by Alexandre Julliard Oct. 13, 2011

Oct. 13, 2011

Module: wine Branch: master Commit: cf14ccc88634dd14a73ea1f51550e4360d707c0a URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf14ccc88634dd14a73ea1f51… Author: Bernhard Loos <bernhardloos(a)googlemail.com> Date: Wed Oct 12 14:50:43 2011 +0200 ntdll/tests: FILE_OVERWRITE and FILE_OVERWRITE_IF aren't legal for NtCreateNamedPipeFile. --- dlls/ntdll/tests/pipe.c | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/tests/pipe.c b/dlls/ntdll/tests/pipe.c index 29bb6da..d9f566b 100644 --- a/dlls/ntdll/tests/pipe.c +++ b/dlls/ntdll/tests/pipe.c @@ -147,6 +147,20 @@ static void test_create_invalid(void) timeout.QuadPart = -100000000000ll; +/* create a pipe with FILE_OVERWRITE */ + res = pNtCreateNamedPipeFile(&handle, FILE_READ_ATTRIBUTES | SYNCHRONIZE, &attr, &iosb, FILE_SHARE_READ, 4 /*FILE_OVERWRITE*/, + 0, 1, 0, 0, 0xFFFFFFFF, 500, 500, &timeout); + todo_wine ok(res == STATUS_INVALID_PARAMETER, "NtCreateNamedPipeFile returned %x\n", res); + if (!res) + CloseHandle(handle); + +/* create a pipe with FILE_OVERWRITE_IF */ + res = pNtCreateNamedPipeFile(&handle, FILE_READ_ATTRIBUTES | SYNCHRONIZE, &attr, &iosb, FILE_SHARE_READ, 5 /*FILE_OVERWRITE_IF*/, + 0, 1, 0, 0, 0xFFFFFFFF, 500, 500, &timeout); + todo_wine ok(res == STATUS_INVALID_PARAMETER, "NtCreateNamedPipeFile returned %x\n", res); + if (!res) + CloseHandle(handle); + /* create a pipe with sharing = 0 */ res = pNtCreateNamedPipeFile(&handle, FILE_READ_ATTRIBUTES | SYNCHRONIZE, &attr, &iosb, 0, 2 /*FILE_CREATE*/, 0, 1, 0, 0, 0xFFFFFFFF, 500, 500, &timeout);

1 0

Andrew Eikum : winealsa.drv: Fix invalid pointer dereference on error path.
by Alexandre Julliard Oct. 13, 2011

Oct. 13, 2011

Module: wine Branch: master Commit: f2c33ae17ab5138fe47e3926be27b7e5fbaf0a18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2c33ae17ab5138fe47e3926b… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Oct 12 15:10:20 2011 -0500 winealsa.drv: Fix invalid pointer dereference on error path. --- dlls/winealsa.drv/mmdevdrv.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index ea5da17..640b191 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -580,8 +580,8 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(const char *key, IMMDevice *dev, This->hw_params = HeapAlloc(GetProcessHeap(), 0, snd_pcm_hw_params_sizeof()); if(!This->hw_params){ - HeapFree(GetProcessHeap(), 0, This); snd_pcm_close(This->pcm_handle); + HeapFree(GetProcessHeap(), 0, This); return E_OUTOFMEMORY; }

1 0

Andrew Eikum : winecoreaudio.drv: Don't fail if setting volume fails.
by Alexandre Julliard Oct. 13, 2011

Oct. 13, 2011

Module: wine Branch: master Commit: ad009330f5e88a6b439a38537899921a1b79172f URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad009330f5e88a6b439a38537… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Oct 12 15:10:12 2011 -0500 winecoreaudio.drv: Don't fail if setting volume fails. Some audio input devices don't support setting the device volume, while others do. So attempt to set the volume, but don't return an error code if it fails. --- dlls/winecoreaudio.drv/mmdevdrv.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index 26c154f..4421967 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -2360,10 +2360,8 @@ static HRESULT ca_setvol(ACImpl *This, UINT32 index) This->session->channel_vols[index] * This->vols[index]; sc = AudioQueueSetParameter(This->aqueue, kAudioQueueParam_Volume, level); - if(sc != noErr){ + if(sc != noErr) WARN("Setting _Volume property failed: %lx\n", sc); - return E_FAIL; - } return S_OK; }

1 0

Louis Lenders : kernel32: Add stubs for several SRW lock functions.
by Alexandre Julliard Oct. 13, 2011

Oct. 13, 2011

Module: wine Branch: master Commit: 3f1b41ebb20ccde589e16ef72f2f31283eced2d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f1b41ebb20ccde589e16ef72… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Wed Oct 12 23:13:51 2011 +0200 kernel32: Add stubs for several SRW lock functions. --- dlls/kernel32/kernel32.spec | 5 +++++ dlls/kernel32/thread.c | 40 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 96b43b3..8e0981d 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -133,6 +133,8 @@ # functions exported by name, ordinal doesn't matter +@ stdcall AcquireSRWLockExclusive(ptr) +@ stdcall AcquireSRWLockShared(ptr) @ stdcall ActivateActCtx(ptr ptr) @ stdcall AddAtomA(str) @ stdcall AddAtomW(wstr) @@ -733,6 +735,7 @@ @ stdcall IdnToNameprepUnicode(long wstr long ptr long) @ stdcall IdnToUnicode(long wstr long ptr long) @ stdcall InitAtomTable(long) +@ stdcall InitializeSRWLock(ptr) @ stdcall InitializeCriticalSection(ptr) @ stdcall InitializeCriticalSectionAndSpinCount(ptr long) @ stdcall InitializeCriticalSectionEx(ptr long long) @@ -995,6 +998,8 @@ @ stdcall ReleaseActCtx(ptr) @ stdcall ReleaseMutex(long) @ stdcall ReleaseSemaphore(long long ptr) +@ stdcall ReleaseSRWLockExclusive(ptr) +@ stdcall ReleaseSRWLockShared(ptr) @ stdcall RemoveDirectoryA(str) @ stdcall RemoveDirectoryW(wstr) # @ stub RemoveLocalAlternateComputerNameA diff --git a/dlls/kernel32/thread.c b/dlls/kernel32/thread.c index 67277ea..f990af8 100644 --- a/dlls/kernel32/thread.c +++ b/dlls/kernel32/thread.c @@ -825,3 +825,43 @@ BOOL WINAPI GetThreadPreferredUILanguages( DWORD flags, PULONG count, PCZZWSTR b *buffersize = 0; return TRUE; } + +/*********************************************************************** + * InitializeSRWLock (KERNEL32.@) + */ +VOID WINAPI InitializeSRWLock( PSRWLOCK srwlock ) +{ + FIXME( "(%p): stub\n", srwlock ); +} + +/*********************************************************************** + * AcquireSRWLockExclusive (KERNEL32.@) + */ +VOID WINAPI AcquireSRWLockExclusive( PSRWLOCK srwlock ) +{ + FIXME( "(%p): stub\n", srwlock ); +} + +/*********************************************************************** + * ReleaseSRWLockExclusive (KERNEL32.@) + */ +VOID WINAPI ReleaseSRWLockExclusive( PSRWLOCK srwlock ) +{ + FIXME( "(%p): stub\n", srwlock ); +} + +/*********************************************************************** + * AcquireSRWLockShared (KERNEL32.@) + */ +VOID WINAPI AcquireSRWLockShared( PSRWLOCK srwlock ) +{ + FIXME( "(%p): stub\n", srwlock ); +} + +/*********************************************************************** + * ReleaseSRWLockShared (KERNEL32.@) + */ +VOID WINAPI ReleaseSRWLockShared( PSRWLOCK srwlock ) +{ + FIXME( "(%p): stub\n", srwlock ); +}

1 0