February 2015 - Wine-Commits

Piotr Caban : msvcp70: Export basic_ostream::operator<< functions family.
by Alexandre Julliard Feb. 9, 2015

Feb. 9, 2015

Module: wine Branch: master Commit: 7ac8ad4492eeaacca6909d2d96eb84aff05ca79c URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ac8ad4492eeaacca6909d2d9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Feb 9 13:12:46 2015 +0100 msvcp70: Export basic_ostream::operator<< functions family. --- dlls/msvcp70/msvcp70.spec | 58 +++++++++++++++++++++++------------------------ 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/dlls/msvcp70/msvcp70.spec b/dlls/msvcp70/msvcp70.spec index 053f5e7..00303e6 100644 --- a/dlls/msvcp70/msvcp70.spec +++ b/dlls/msvcp70/msvcp70.spec @@ -1062,44 +1062,44 @@ @ cdecl -arch=win64 ??6?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@std@@QEAAAEAV01(a)_K@Z(ptr int64) basic_ostream_wchar_print_uint64 @ thiscall -arch=i386 ??6?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@std@@QAEAAV01(a)_N@Z(ptr long) basic_ostream_wchar_print_bool @ cdecl -arch=win64 ??6?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@std@@QEAAAEAV01(a)_N@Z(ptr long) basic_ostream_wchar_print_bool -@ stub -arch=win32 ??6std@@YAAAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@0(a)AAV10@ABV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@0@@Z -@ stub -arch=win64 ??6std@@YAAEAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@0(a)AEAV10@AEBV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@0@@Z -@ stub -arch=win32 ??6std@@YAAAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@0(a)AAV10@ABV?$complex(a)M@0@@Z -@ stub -arch=win64 ??6std@@YAAEAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@0(a)AEAV10@AEBV?$complex(a)M@0@@Z -@ stub -arch=win32 ??6std@@YAAAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@0(a)AAV10@ABV?$complex(a)N@0@@Z -@ stub -arch=win64 ??6std@@YAAEAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@0(a)AEAV10@AEBV?$complex(a)N@0@@Z -@ stub -arch=win32 ??6std@@YAAAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@0(a)AAV10@ABV?$complex(a)O@0@@Z -@ stub -arch=win64 ??6std@@YAAEAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@0(a)AEAV10@AEBV?$complex(a)O@0@@Z -@ stub -arch=win32 ??6std@@YAAAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@0(a)AAV10@C(a)Z -@ stub -arch=win64 ??6std@@YAAEAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@0(a)AEAV10@C(a)Z -@ stub -arch=win32 ??6std@@YAAAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@0(a)AAV10@D(a)Z -@ stub -arch=win64 ??6std@@YAAEAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@0(a)AEAV10@D(a)Z -@ stub -arch=win32 ??6std@@YAAAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@0(a)AAV10@E(a)Z -@ stub -arch=win64 ??6std@@YAAEAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@0(a)AEAV10@E(a)Z -@ stub -arch=win32 ??6std@@YAAAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@0(a)AAV10@PBC(a)Z -@ stub -arch=win64 ??6std@@YAAEAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@0(a)AEAV10@PEBC(a)Z -@ stub -arch=win32 ??6std@@YAAAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@0(a)AAV10@PBD(a)Z -@ stub -arch=win64 ??6std@@YAAEAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@0(a)AEAV10@PEBD(a)Z -@ stub -arch=win32 ??6std@@YAAAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@0(a)AAV10@PBE(a)Z -@ stub -arch=win64 ??6std@@YAAEAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@0(a)AEAV10@PEBE(a)Z -@ stub -arch=win32 ??6std@@YAAAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@0(a)AAV10@ABV?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@0@@Z -@ stub -arch=win64 ??6std@@YAAEAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@0(a)AEAV10@AEBV?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@0@@Z +@ cdecl -arch=win32 ??6std@@YAAAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@0(a)AAV10@ABV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@0@@Z(ptr ptr) basic_ostream_char_print_bstr +@ cdecl -arch=win64 ??6std@@YAAEAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@0(a)AEAV10@AEBV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@0@@Z(ptr ptr) basic_ostream_char_print_bstr +@ cdecl -arch=win32 ??6std@@YAAAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@0(a)AAV10@ABV?$complex(a)M@0@@Z(ptr ptr) basic_ostream_char_print_complex_float +@ cdecl -arch=win64 ??6std@@YAAEAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@0(a)AEAV10@AEBV?$complex(a)M@0@@Z(ptr ptr) basic_ostream_char_print_complex_float +@ cdecl -arch=win32 ??6std@@YAAAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@0(a)AAV10@ABV?$complex(a)N@0@@Z(ptr ptr) basic_ostream_char_print_complex_double +@ cdecl -arch=win64 ??6std@@YAAEAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@0(a)AEAV10@AEBV?$complex(a)N@0@@Z(ptr ptr) basic_ostream_char_print_complex_double +@ cdecl -arch=win32 ??6std@@YAAAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@0(a)AAV10@ABV?$complex(a)O@0@@Z(ptr ptr) basic_ostream_char_print_complex_ldouble +@ cdecl -arch=win64 ??6std@@YAAEAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@0(a)AEAV10@AEBV?$complex(a)O@0@@Z(ptr ptr) basic_ostream_char_print_complex_ldouble +@ cdecl -arch=win32 ??6std@@YAAAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@0(a)AAV10@C(a)Z(ptr long) basic_ostream_char_print_ch +@ cdecl -arch=win64 ??6std@@YAAEAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@0(a)AEAV10@C(a)Z(ptr long) basic_ostream_char_print_ch +@ cdecl -arch=win32 ??6std@@YAAAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@0(a)AAV10@D(a)Z(ptr long) basic_ostream_char_print_ch +@ cdecl -arch=win64 ??6std@@YAAEAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@0(a)AEAV10@D(a)Z(ptr long) basic_ostream_char_print_ch +@ cdecl -arch=win32 ??6std@@YAAAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@0(a)AAV10@E(a)Z(ptr long) basic_ostream_char_print_ch +@ cdecl -arch=win64 ??6std@@YAAEAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@0(a)AEAV10@E(a)Z(ptr long) basic_ostream_char_print_ch +@ cdecl -arch=win32 ??6std@@YAAAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@0(a)AAV10@PBC(a)Z(ptr ptr) basic_ostream_char_print_str +@ cdecl -arch=win64 ??6std@@YAAEAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@0(a)AEAV10@PEBC(a)Z(ptr ptr) basic_ostream_char_print_str +@ cdecl -arch=win32 ??6std@@YAAAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@0(a)AAV10@PBD(a)Z(ptr ptr) basic_ostream_char_print_str +@ cdecl -arch=win64 ??6std@@YAAEAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@0(a)AEAV10@PEBD(a)Z(ptr ptr) basic_ostream_char_print_str +@ cdecl -arch=win32 ??6std@@YAAAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@0(a)AAV10@PBE(a)Z(ptr ptr) basic_ostream_char_print_str +@ cdecl -arch=win64 ??6std@@YAAEAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@0(a)AEAV10@PEBE(a)Z(ptr ptr) basic_ostream_char_print_str +@ cdecl -arch=win32 ??6std@@YAAAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@0(a)AAV10@ABV?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@0@@Z(ptr ptr) basic_ostream_wchar_print_bstr +@ cdecl -arch=win64 ??6std@@YAAEAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@0(a)AEAV10@AEBV?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@0@@Z(ptr ptr) basic_ostream_wchar_print_bstr @ stub -arch=win32 ??6std@@YAAAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@0(a)AAV10@ABV?$complex(a)M@0@@Z @ stub -arch=win64 ??6std@@YAAEAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@0(a)AEAV10@AEBV?$complex(a)M@0@@Z @ stub -arch=win32 ??6std@@YAAAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@0(a)AAV10@ABV?$complex(a)N@0@@Z @ stub -arch=win64 ??6std@@YAAEAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@0(a)AEAV10@AEBV?$complex(a)N@0@@Z @ stub -arch=win32 ??6std@@YAAAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@0(a)AAV10@ABV?$complex(a)O@0@@Z @ stub -arch=win64 ??6std@@YAAEAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@0(a)AEAV10@AEBV?$complex(a)O@0@@Z -@ stub -arch=win32 ??6std@@YAAAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@0(a)AAV10@G(a)Z -@ stub -arch=win64 ??6std@@YAAEAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@0(a)AEAV10@G(a)Z -@ stub -arch=win32 ??6std@@YAAAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@0(a)AAV10@PBG(a)Z -@ stub -arch=win64 ??6std@@YAAEAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@0(a)AEAV10@PEBG(a)Z -@ stub -arch=win32 ??6std@@YAAAV?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@0(a)AAV10@ABV?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@0@@Z +@ cdecl -arch=win32 ??6std@@YAAAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@0(a)AAV10@G(a)Z(ptr long) basic_ostream_short_print_ushort +@ cdecl -arch=win64 ??6std@@YAAEAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@0(a)AEAV10@G(a)Z(ptr long) basic_ostream_short_print_ushort +@ cdecl -arch=win32 ??6std@@YAAAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@0(a)AAV10@PBG(a)Z(ptr ptr) basic_ostream_wchar_print_str +@ cdecl -arch=win64 ??6std@@YAAEAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@0(a)AEAV10@PEBG(a)Z(ptr ptr) basic_ostream_wchar_print_str +@ cdecl -arch=win32 ??6std@@YAAAV?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@0(a)AAV10@ABV?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@0@@Z(ptr ptr) basic_ostream_wchar_print_bstr @ stub -arch=win32 ??6std@@YAAAV?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@0(a)AAV10@ABV?$complex(a)M@0@@Z @ stub -arch=win32 ??6std@@YAAAV?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@0(a)AAV10@ABV?$complex(a)N@0@@Z @ stub -arch=win32 ??6std@@YAAAV?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@0(a)AAV10@ABV?$complex(a)O@0@@Z -@ stub -arch=win32 ??6std@@YAAAV?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@0(a)AAV10@PB_W(a)Z -@ stub -arch=win32 ??6std@@YAAAV?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@0(a)AAV10@_W(a)Z +@ cdecl -arch=win32 ??6std@@YAAAV?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@0(a)AAV10@PB_W(a)Z(ptr ptr) basic_ostream_wchar_print_str +@ cdecl -arch=win32 ??6std@@YAAAV?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@0(a)AAV10@_W(a)Z(ptr ptr) basic_ostream_wchar_print_str @ thiscall -arch=i386 ??7ios_base(a)std@@QBE_NXZ(ptr) ios_base_op_succ @ cdecl -arch=win64 ??7ios_base(a)std@@QEBA_NXZ(ptr) ios_base_op_succ @ thiscall -arch=win32 ??8locale(a)std@@QBE_NABV01@@Z(ptr ptr) locale_operator_equal

1 0

Matteo Bruni : d3d9/tests: Add a test for POSITIONi shader input/outputs.
by Alexandre Julliard Feb. 9, 2015

Feb. 9, 2015

Module: wine Branch: master Commit: 30f4d91906568a33ea629c2be59172c629ec0fa9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=30f4d91906568a33ea629c2be… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Feb 6 15:25:35 2015 +0100 d3d9/tests: Add a test for POSITIONi shader input/outputs. --- dlls/d3d9/tests/visual.c | 212 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 212 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=30f4d91906568a33ea629…

1 0

Matteo Bruni : wined3d: Refuse pixel shaders declaring POSITION0 inputs.
by Alexandre Julliard Feb. 9, 2015

Feb. 9, 2015

Module: wine Branch: master Commit: 1612dc4dc971324e73d8d6e8b6bf2e223580b13a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1612dc4dc971324e73d8d6e8b… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Feb 6 15:25:34 2015 +0100 wined3d: Refuse pixel shaders declaring POSITION0 inputs. --- dlls/wined3d/shader.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index e1164db..766e91f 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -690,6 +690,9 @@ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, const st ERR("Invalid input register index %u.\n", reg_idx); break; } + if (shader_version.type == WINED3D_SHADER_TYPE_PIXEL && shader_version.major == 3 + && semantic->usage == WINED3D_DECL_USAGE_POSITION && !semantic->usage_idx) + return WINED3DERR_INVALIDCALL; reg_maps->input_registers |= 1 << reg_idx; shader_signature_from_semantic(&input_signature[reg_idx], semantic); break;

1 0

Piotr Caban : msvcp: Fix basic_ostream<short>::operator<<(const short*) function export.
by Alexandre Julliard Feb. 9, 2015

Feb. 9, 2015

Module: wine Branch: master Commit: a8bac225615f11e02ff071179e11f5ffbb110aec URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8bac225615f11e02ff071179… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Feb 9 13:12:35 2015 +0100 msvcp: Fix basic_ostream<short>::operator<<(const short*) function export. --- dlls/msvcp60/msvcp60.spec | 4 ++-- dlls/msvcp71/msvcp71.spec | 4 ++-- dlls/msvcp80/msvcp80.spec | 4 ++-- dlls/msvcp90/msvcp90.spec | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/msvcp60/msvcp60.spec b/dlls/msvcp60/msvcp60.spec index b3c5604..99a7878 100644 --- a/dlls/msvcp60/msvcp60.spec +++ b/dlls/msvcp60/msvcp60.spec @@ -56,8 +56,8 @@ @ cdecl -arch=win64 ??$?6GU?$char_traits(a)G@std@@@std@@YAAEAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@0(a)AEAV10@G(a)Z(ptr long) basic_ostream_wchar_print_ch @ stub -arch=win32 ??$?6GU?$char_traits(a)G@std@@@std@@YAAAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@0(a)AAV10@PBF(a)Z @ stub -arch=win64 ??$?6GU?$char_traits(a)G@std@@@std@@YAAEAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@0(a)AEAV10@PEBF(a)Z -@ cdecl -arch=win32 ??$?6GU?$char_traits(a)G@std@@@std@@YAAAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@0(a)AAV10@PBG(a)Z(ptr ptr) basic_ostream_char_print_str -@ cdecl -arch=win64 ??$?6GU?$char_traits(a)G@std@@@std@@YAAEAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@0(a)AEAV10@PEBG(a)Z(ptr ptr) basic_ostream_char_print_str +@ cdecl -arch=win32 ??$?6GU?$char_traits(a)G@std@@@std@@YAAAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@0(a)AAV10@PBG(a)Z(ptr ptr) basic_ostream_wchar_print_str +@ cdecl -arch=win64 ??$?6GU?$char_traits(a)G@std@@@std@@YAAEAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@0(a)AEAV10@PEBG(a)Z(ptr ptr) basic_ostream_wchar_print_str @ stub -arch=win32 ??$?6GU?$char_traits(a)G@std@@M(a)std@@YAAAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@0(a)AAV10@ABV?$complex(a)M@0@@Z @ stub -arch=win64 ??$?6GU?$char_traits(a)G@std@@M(a)std@@YAAEAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@0(a)AEAV10@AEBV?$complex(a)M@0@@Z @ stub -arch=win32 ??$?6GU?$char_traits(a)G@std@@N(a)std@@YAAAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@0(a)AAV10@ABV?$complex(a)N@0@@Z diff --git a/dlls/msvcp71/msvcp71.spec b/dlls/msvcp71/msvcp71.spec index 6b62d5c..48bbd40 100644 --- a/dlls/msvcp71/msvcp71.spec +++ b/dlls/msvcp71/msvcp71.spec @@ -46,8 +46,8 @@ @ cdecl -arch=win64 ??$?6DU?$char_traits(a)D@std@@V?$allocator(a)D@1@@std@@YAAEAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@0(a)AEAV10@AEBV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@0@@Z(ptr ptr) basic_ostream_char_print_bstr @ cdecl -arch=win32 ??$?6GU?$char_traits(a)G@std@@@std@@YAAAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@0(a)AAV10@G(a)Z(ptr long) basic_ostream_wchar_print_ch @ cdecl -arch=win64 ??$?6GU?$char_traits(a)G@std@@@std@@YAAEAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@0(a)AEAV10@G(a)Z(ptr long) basic_ostream_wchar_print_ch -@ cdecl -arch=win32 ??$?6GU?$char_traits(a)G@std@@@std@@YAAAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@0(a)AAV10@PBG(a)Z(ptr ptr) basic_ostream_char_print_str -@ cdecl -arch=win64 ??$?6GU?$char_traits(a)G@std@@@std@@YAAEAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@0(a)AEAV10@PEBG(a)Z(ptr ptr) basic_ostream_char_print_str +@ cdecl -arch=win32 ??$?6GU?$char_traits(a)G@std@@@std@@YAAAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@0(a)AAV10@PBG(a)Z(ptr ptr) basic_ostream_wchar_print_str +@ cdecl -arch=win64 ??$?6GU?$char_traits(a)G@std@@@std@@YAAEAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@0(a)AEAV10@PEBG(a)Z(ptr ptr) basic_ostream_wchar_print_str @ cdecl -arch=win32 ??$?6GU?$char_traits(a)G@std@@V?$allocator(a)G@1@@std@@YAAAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@0(a)AAV10@ABV?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@0@@Z(ptr ptr) basic_ostream_wchar_print_bstr @ cdecl -arch=win64 ??$?6GU?$char_traits(a)G@std@@V?$allocator(a)G@1@@std@@YAAEAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@0(a)AEAV10@AEBV?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@0@@Z(ptr ptr) basic_ostream_wchar_print_bstr @ cdecl -arch=win32 ??$?6MDU?$char_traits(a)D@std@@@std@@YAAAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@0(a)AAV10@ABV?$complex(a)M@0@@Z(ptr ptr) basic_ostream_char_print_complex_float diff --git a/dlls/msvcp80/msvcp80.spec b/dlls/msvcp80/msvcp80.spec index 1165491..5d263fa 100644 --- a/dlls/msvcp80/msvcp80.spec +++ b/dlls/msvcp80/msvcp80.spec @@ -46,8 +46,8 @@ @ cdecl -arch=win64 ??$?6DU?$char_traits(a)D@std@@V?$allocator(a)D@1@@std@@YAAEAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@0(a)AEAV10@AEBV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@0@@Z(ptr ptr) basic_ostream_char_print_bstr @ cdecl -arch=win32 ??$?6GU?$char_traits(a)G@std@@@std@@YAAAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@0(a)AAV10@G(a)Z(ptr long) basic_ostream_wchar_print_ch @ cdecl -arch=win64 ??$?6GU?$char_traits(a)G@std@@@std@@YAAEAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@0(a)AEAV10@G(a)Z(ptr long) basic_ostream_wchar_print_ch -@ cdecl -arch=win32 ??$?6GU?$char_traits(a)G@std@@@std@@YAAAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@0(a)AAV10@PBG(a)Z(ptr ptr) basic_ostream_char_print_str -@ cdecl -arch=win64 ??$?6GU?$char_traits(a)G@std@@@std@@YAAEAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@0(a)AEAV10@PEBG(a)Z(ptr ptr) basic_ostream_char_print_str +@ cdecl -arch=win32 ??$?6GU?$char_traits(a)G@std@@@std@@YAAAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@0(a)AAV10@PBG(a)Z(ptr ptr) basic_ostream_wchar_print_str +@ cdecl -arch=win64 ??$?6GU?$char_traits(a)G@std@@@std@@YAAEAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@0(a)AEAV10@PEBG(a)Z(ptr ptr) basic_ostream_wchar_print_str @ cdecl -arch=win32 ??$?6GU?$char_traits(a)G@std@@V?$allocator(a)G@1@@std@@YAAAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@0(a)AAV10@ABV?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@0@@Z(ptr ptr) basic_ostream_wchar_print_bstr @ cdecl -arch=win64 ??$?6GU?$char_traits(a)G@std@@V?$allocator(a)G@1@@std@@YAAEAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@0(a)AEAV10@AEBV?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@0@@Z(ptr ptr) basic_ostream_wchar_print_bstr @ cdecl -arch=win32 ??$?6MDU?$char_traits(a)D@std@@@std@@YAAAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@0(a)AAV10@ABV?$complex(a)M@0@@Z(ptr ptr) basic_ostream_char_print_complex_float diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index edb984b..925a153 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -46,8 +46,8 @@ @ cdecl -arch=win64 ??$?6DU?$char_traits(a)D@std@@V?$allocator(a)D@1@@std@@YAAEAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@0(a)AEAV10@AEBV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@0@@Z(ptr ptr) basic_ostream_char_print_bstr @ cdecl -arch=win32 ??$?6GU?$char_traits(a)G@std@@@std@@YAAAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@0(a)AAV10@G(a)Z(ptr long) basic_ostream_wchar_print_ch @ cdecl -arch=win64 ??$?6GU?$char_traits(a)G@std@@@std@@YAAEAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@0(a)AEAV10@G(a)Z(ptr long) basic_ostream_wchar_print_ch -@ cdecl -arch=win32 ??$?6GU?$char_traits(a)G@std@@@std@@YAAAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@0(a)AAV10@PBG(a)Z(ptr ptr) basic_ostream_char_print_str -@ cdecl -arch=win64 ??$?6GU?$char_traits(a)G@std@@@std@@YAAEAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@0(a)AEAV10@PEBG(a)Z(ptr ptr) basic_ostream_char_print_str +@ cdecl -arch=win32 ??$?6GU?$char_traits(a)G@std@@@std@@YAAAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@0(a)AAV10@PBG(a)Z(ptr ptr) basic_ostream_wchar_print_str +@ cdecl -arch=win64 ??$?6GU?$char_traits(a)G@std@@@std@@YAAEAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@0(a)AEAV10@PEBG(a)Z(ptr ptr) basic_ostream_wchar_print_str @ cdecl -arch=win32 ??$?6GU?$char_traits(a)G@std@@V?$allocator(a)G@1@@std@@YAAAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@0(a)AAV10@ABV?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@0@@Z(ptr ptr) basic_ostream_wchar_print_bstr @ cdecl -arch=win64 ??$?6GU?$char_traits(a)G@std@@V?$allocator(a)G@1@@std@@YAAEAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@0(a)AEAV10@AEBV?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@0@@Z(ptr ptr) basic_ostream_wchar_print_bstr @ cdecl -arch=win32 ??$?6MDU?$char_traits(a)D@std@@@std@@YAAAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@0(a)AAV10@ABV?$complex(a)M@0@@Z(ptr ptr) basic_ostream_char_print_complex_float

1 0

Jacek Caban : wscript/tests: Fixed buffer handling and leaks.
by Alexandre Julliard Feb. 9, 2015

Feb. 9, 2015

Module: wine Branch: master Commit: 748788f33e228b98ea1616cbc5af1d84d5db4a19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=748788f33e228b98ea1616cbc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 9 13:59:29 2015 +0100 wscript/tests: Fixed buffer handling and leaks. --- programs/wscript/tests/run.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/programs/wscript/tests/run.c b/programs/wscript/tests/run.c index e74e3d8..e0a6932 100644 --- a/programs/wscript/tests/run.c +++ b/programs/wscript/tests/run.c @@ -254,10 +254,10 @@ static HRESULT WINAPI Dispatch_Invoke(IDispatch *iface, DISPID dispIdMember, REF ok(pdp->cArgs == 0, "cArgs = %d\n", pdp->cArgs); ok(!pdp->cNamedArgs, "cNamedArgs = %d\n", pdp->cNamedArgs); V_VT(pVarResult) = VT_BSTR; - res = GetFullPathNameA(script_name, sizeof(fullPath)/sizeof(WCHAR), fullPath, &pos); - if(!res || res > sizeof(fullPath)/sizeof(WCHAR)) + res = GetFullPathNameA(script_name, sizeof(fullPath), fullPath, &pos); + if(!res || res > sizeof(fullPath)) return E_FAIL; - if(!(V_BSTR(pVarResult) = SysAllocString(a2bstr(pos)))) + if(!(V_BSTR(pVarResult) = a2bstr(pos))) return E_OUTOFMEMORY; break; } @@ -270,10 +270,10 @@ static HRESULT WINAPI Dispatch_Invoke(IDispatch *iface, DISPID dispIdMember, REF ok(pdp->cArgs == 0, "cArgs = %d\n", pdp->cArgs); ok(!pdp->cNamedArgs, "cNamedArgs = %d\n", pdp->cNamedArgs); V_VT(pVarResult) = VT_BSTR; - res = GetFullPathNameA(script_name, sizeof(fullPath)/sizeof(WCHAR), fullPath, NULL); - if(!res || res > sizeof(fullPath)/sizeof(WCHAR)) + res = GetFullPathNameA(script_name, sizeof(fullPath), fullPath, NULL); + if(!res || res > sizeof(fullPath)) return E_FAIL; - if(!(V_BSTR(pVarResult) = SysAllocString(a2bstr(fullPath)))) + if(!(V_BSTR(pVarResult) = a2bstr(fullPath))) return E_OUTOFMEMORY; break; }

1 0

Matteo Bruni : wined3d: Only consider POSITION0 PS inputs as vpos.
by Alexandre Julliard Feb. 9, 2015

Feb. 9, 2015

Module: wine Branch: master Commit: 74b4516bfac41b35a2e68ee5bf5680a4b529fd53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=74b4516bfac41b35a2e68ee5b… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Feb 6 15:25:33 2015 +0100 wined3d: Only consider POSITION0 PS inputs as vpos. --- dlls/wined3d/glsl_shader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index adb9f13..b02cbff 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -4151,7 +4151,7 @@ static void shader_glsl_input_pack(const struct wined3d_shader *shader, struct w if (vertexprocessing == vertexshader) { - if (!strcmp(semantic_name, "SV_POSITION")) + if (!strcmp(semantic_name, "SV_POSITION") && !semantic_idx) shader_addline(buffer, "ps_in[%u]%s = vpos%s;\n", shader->u.ps.input_reg_map[i], reg_mask, reg_mask); else

1 0

Jacek Caban : d3dcompiler.h: Added a few missing D3DCOMPILE_* flags.
by Alexandre Julliard Feb. 9, 2015

Feb. 9, 2015

Module: wine Branch: master Commit: 90aab41ce2e5bed7c14e708c361e6e45588b669a URL: http://source.winehq.org/git/wine.git/?a=commit;h=90aab41ce2e5bed7c14e708c3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Feb 8 19:28:26 2015 +0100 d3dcompiler.h: Added a few missing D3DCOMPILE_* flags. --- include/d3dcompiler.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/d3dcompiler.h b/include/d3dcompiler.h index 4bbf53f..b5e79e6 100644 --- a/include/d3dcompiler.h +++ b/include/d3dcompiler.h @@ -54,7 +54,10 @@ static const WCHAR D3DCOMPILER_DLL_W[] = {'d','3','d','c','o','m','p','i','l','e #define D3DCOMPILE_OPTIMIZATION_LEVEL1 0x00000000 #define D3DCOMPILE_OPTIMIZATION_LEVEL2 0x0000c000 #define D3DCOMPILE_OPTIMIZATION_LEVEL3 0x00008000 +#define D3DCOMPILE_RESERVED16 0x00010000 +#define D3DCOMPILE_RESERVED17 0x00020000 #define D3DCOMPILE_WARNINGS_ARE_ERRORS 0x00040000 +#define D3DCOMPILE_RESOURCES_MAY_ALIAS 0x00080000 #define D3D_DISASM_ENABLE_COLOR_CODE 0x00000001 #define D3D_DISASM_ENABLE_DEFAULT_VALUE_PRINTS 0x00000002

1 0

Marcus Meissner : mshtml: Initialize use_new_window (Coverity).
by Alexandre Julliard Feb. 9, 2015

Feb. 9, 2015

Module: wine Branch: master Commit: e5a653a5949bce4c123b1680badec8640f757b61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5a653a5949bce4c123b1680b… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Feb 7 09:50:58 2015 +0100 mshtml: Initialize use_new_window (Coverity). --- dlls/mshtml/htmlform.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mshtml/htmlform.c b/dlls/mshtml/htmlform.c index ac6eb93..a9ba11b 100644 --- a/dlls/mshtml/htmlform.c +++ b/dlls/mshtml/htmlform.c @@ -390,7 +390,7 @@ static HRESULT WINAPI HTMLFormElement_submit(IHTMLFormElement *iface) IUri *uri; nsresult nsres; HRESULT hres; - BOOL use_new_window; + BOOL use_new_window = FALSE; TRACE("(%p)\n", This);

1 0

Pierre Schweitzer : setupapi: Fix string conversion in SetupGetInfInformationA().
by Alexandre Julliard Feb. 9, 2015

Feb. 9, 2015

Module: wine Branch: master Commit: fe41140664ab43ccced49b45831324635db03d43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe41140664ab43ccced49b458… Author: Pierre Schweitzer <pierre(a)reactos.org> Date: Sun Feb 8 19:57:18 2015 +0100 setupapi: Fix string conversion in SetupGetInfInformationA(). --- dlls/setupapi/query.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/setupapi/query.c b/dlls/setupapi/query.c index f21bc36..eaeadc0 100644 --- a/dlls/setupapi/query.c +++ b/dlls/setupapi/query.c @@ -125,8 +125,13 @@ BOOL WINAPI SetupGetInfInformationA(LPCVOID InfSpec, DWORD SearchControl, if (InfSpec && SearchControl >= INFINFO_INF_NAME_IS_ABSOLUTE) { - len = lstrlenA(InfSpec) + 1; + len = MultiByteToWideChar(CP_ACP, 0, InfSpec, -1, NULL, 0); inf = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + if (!inf) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } MultiByteToWideChar(CP_ACP, 0, InfSpec, -1, inf, len); }

1 0

Alex Henrie : kernel32: Support UTF-7 in WideCharToMultiByte.
by Alexandre Julliard Feb. 9, 2015

Feb. 9, 2015

Module: wine Branch: master Commit: 054fa77de0d48e9eebbed1854abcfb52a6258bfd URL: http://source.winehq.org/git/wine.git/?a=commit;h=054fa77de0d48e9eebbed1854… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Feb 2 12:58:53 2015 -0700 kernel32: Support UTF-7 in WideCharToMultiByte. Portions of utf7_wcstombs were written by Sebastian Lackner. --- dlls/kernel32/locale.c | 126 ++++++++++++++++++++++++++++++++++++++++- dlls/kernel32/tests/codepage.c | 7 --- 2 files changed, 123 insertions(+), 10 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 1460f7a..39f4546 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -2050,6 +2050,127 @@ INT WINAPI MultiByteToWideChar( UINT page, DWORD flags, LPCSTR src, INT srclen, /*********************************************************************** + * utf7_can_directly_encode + * + * Helper for utf7_wcstombs + */ +static inline BOOL utf7_can_directly_encode(WCHAR codepoint) +{ + static const BOOL directly_encodable_table[] = + { + 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 1, 0, 0, /* 0x00 - 0x0F */ + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0x10 - 0x1F */ + 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 1, 1, 1, 1, 1, /* 0x20 - 0x2F */ + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 1, /* 0x30 - 0x3F */ + 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* 0x40 - 0x4F */ + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, /* 0x50 - 0x5F */ + 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* 0x60 - 0x6F */ + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 /* 0x70 - 0x7A */ + }; + + return codepoint <= 0x7A ? directly_encodable_table[codepoint] : FALSE; +} + +/*********************************************************************** + * utf7_write_c + * + * Helper for utf7_wcstombs + * + * RETURNS + * TRUE on success, FALSE on error + */ +static inline BOOL utf7_write_c(char *dst, int dstlen, int *index, char character) +{ + if (dstlen > 0) + { + if (*index >= dstlen) + return FALSE; + + dst[*index] = character; + } + + (*index)++; + + return TRUE; +} + +/*********************************************************************** + * utf7_wcstombs + * + * UTF-16 to UTF-7 string conversion, helper for WideCharToMultiByte + * + * RETURNS + * On success, the number of characters written + * On dst buffer overflow, -1 + */ +static int utf7_wcstombs(const WCHAR *src, int srclen, char *dst, int dstlen) +{ + static const char base64_encoding_table[] = + "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; + + const WCHAR *source_end = src + srclen; + int dest_index = 0; + + while (src < source_end) + { + if (*src == '+') + { + if (!utf7_write_c(dst, dstlen, &dest_index, '+')) + return -1; + if (!utf7_write_c(dst, dstlen, &dest_index, '-')) + return -1; + src++; + } + else if (utf7_can_directly_encode(*src)) + { + if (!utf7_write_c(dst, dstlen, &dest_index, *src)) + return -1; + src++; + } + else + { + unsigned int offset = 0; + DWORD byte_pair = 0; + + if (!utf7_write_c(dst, dstlen, &dest_index, '+')) + return -1; + + while (src < source_end && !utf7_can_directly_encode(*src)) + { + byte_pair = (byte_pair << 16) | *src; + offset += 16; + while (offset >= 6) + { + if (!utf7_write_c(dst, dstlen, &dest_index, base64_encoding_table[(byte_pair >> (offset - 6)) & 0x3F])) + return -1; + offset -= 6; + } + src++; + } + + if (offset) + { + /* Windows won't create a padded base64 character if there's not room for the - sign too + * this is probably a bug in Windows */ + if (dstlen > 0 && dest_index + 1 >= dstlen) + return -1; + + byte_pair <<= (6 - offset); + if (!utf7_write_c(dst, dstlen, &dest_index, base64_encoding_table[byte_pair & 0x3F])) + return -1; + } + + /* Windows always explicitly terminates the base64 sequence + even though RFC 2152 (page 3, rule 2) does not require this */ + if (!utf7_write_c(dst, dstlen, &dest_index, '-')) + return -1; + } + } + + return dest_index; +} + +/*********************************************************************** * WideCharToMultiByte (KERNEL32.@) * * Convert a Unicode character string into a multibyte string. @@ -2116,9 +2237,8 @@ INT WINAPI WideCharToMultiByte( UINT page, DWORD flags, LPCWSTR src, INT srclen, SetLastError( ERROR_INVALID_FLAGS ); return 0; } - FIXME("UTF-7 not supported\n"); - SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); - return 0; + ret = utf7_wcstombs( src, srclen, dst, dstlen ); + break; case CP_UNIXCP: if (unix_cptable) { diff --git a/dlls/kernel32/tests/codepage.c b/dlls/kernel32/tests/codepage.c index cab9019..3849156 100644 --- a/dlls/kernel32/tests/codepage.c +++ b/dlls/kernel32/tests/codepage.c @@ -541,13 +541,6 @@ static void test_utf7_encoding(void) } }; - if (WideCharToMultiByte(CP_UTF7, 0, foobarW, -1, NULL, 0, NULL, NULL) == 0 && - GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) - { - skip("UTF-7 encoding not implemented\n"); - return; - } - /* test which characters are encoded if surrounded by non-encoded characters */ for (i = 0; i <= 0xFFFF; i++) {

1 0