August 2016 - Wine-commits - list.winehq.org

Henri Verbeet : wined3d: Use wined3d_texture_load_location() in draw_primitive().
by Alexandre Julliard 02 Aug '16

02 Aug '16

Module: wine Branch: master Commit: 4ff6946b61a0057a523dcd8c4298e19896dba357 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ff6946b61a0057a523dcd8c4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 2 12:26:32 2016 +0200 wined3d: Use wined3d_texture_load_location() in draw_primitive(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/drawprim.c | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 9f92851..e5b30db 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -438,21 +438,20 @@ void draw_primitive(struct wined3d_device *device, const struct wined3d_state *s for (i = 0; i < gl_info->limits.buffers; ++i) { struct wined3d_rendertarget_view *rtv = fb->render_targets[i]; - struct wined3d_surface *target = wined3d_rendertarget_view_get_surface(rtv); + struct wined3d_texture *rt; - if (target && rtv->format->id != WINED3DFMT_NULL) + if (!rtv || rtv->format->id == WINED3DFMT_NULL) + continue; + + rt = wined3d_texture_from_resource(rtv->resource); + if (state->render_states[WINED3D_RS_COLORWRITEENABLE]) { - if (state->render_states[WINED3D_RS_COLORWRITEENABLE]) - { - surface_load_location(target, context, rtv->resource->draw_binding); - wined3d_texture_invalidate_location(target->container, - rtv->sub_resource_idx, ~rtv->resource->draw_binding); - } - else - { - wined3d_texture_prepare_location(target->container, rtv->sub_resource_idx, - context, rtv->resource->draw_binding); - } + wined3d_texture_load_location(rt, rtv->sub_resource_idx, context, rtv->resource->draw_binding); + wined3d_texture_invalidate_location(rt, rtv->sub_resource_idx, ~rtv->resource->draw_binding); + } + else + { + wined3d_texture_prepare_location(rt, rtv->sub_resource_idx, context, rtv->resource->draw_binding); } } @@ -482,7 +481,7 @@ void draw_primitive(struct wined3d_device *device, const struct wined3d_state *s IntersectRect(&r, &draw_rect, &current_rect); if (!EqualRect(&r, &draw_rect)) - surface_load_location(ds, context, location); + wined3d_texture_load_location(ds->container, dsv->sub_resource_idx, context, location); else wined3d_texture_prepare_location(ds->container, dsv->sub_resource_idx, context, location); }

1 0

Henri Verbeet : wined3d: Use wined3d_texture_load_location() in surface_depth_blt_fbo().
by Alexandre Julliard 02 Aug '16

02 Aug '16

Module: wine Branch: master Commit: 6c7eeeee32cb06fd95196a6cb6e0693da9dcb9fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c7eeeee32cb06fd95196a6cb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 2 12:26:33 2016 +0200 wined3d: Use wined3d_texture_load_location() in surface_depth_blt_fbo(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index ab4ee17..8ae4b73 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -401,6 +401,7 @@ static void surface_depth_blt_fbo(const struct wined3d_device *device, struct wined3d_surface *dst_surface, DWORD dst_location, const RECT *dst_rect) { unsigned int dst_sub_resource_idx = surface_get_sub_resource_idx(dst_surface); + unsigned int src_sub_resource_idx = surface_get_sub_resource_idx(src_surface); struct wined3d_texture *dst_texture = dst_surface->container; struct wined3d_texture *src_texture = src_surface->container; const struct wined3d_gl_info *gl_info; @@ -448,9 +449,9 @@ static void surface_depth_blt_fbo(const struct wined3d_device *device, /* Make sure the locations are up-to-date. Loading the destination * surface isn't required if the entire surface is overwritten. */ - surface_load_location(src_surface, context, src_location); + wined3d_texture_load_location(src_texture, src_sub_resource_idx, context, src_location); if (!surface_is_full_rect(dst_surface, dst_rect)) - surface_load_location(dst_surface, context, dst_location); + wined3d_texture_load_location(dst_texture, dst_sub_resource_idx, context, dst_location); else wined3d_texture_prepare_location(dst_texture, dst_sub_resource_idx, context, dst_location);

1 0

Piotr Caban : msvcp120: Don't export structures as stubs.
by Alexandre Julliard 02 Aug '16

02 Aug '16

Module: wine Branch: master Commit: 287fb5a9bd8df800acd8dbc7c458481942d913ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=287fb5a9bd8df800acd8dbc7c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Aug 2 13:00:36 2016 +0200 msvcp120: Don't export structures as stubs. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp120/msvcp120.spec | 50 ++++++++++++++++++++++----------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/dlls/msvcp120/msvcp120.spec b/dlls/msvcp120/msvcp120.spec index 374a418..981bda3 100644 --- a/dlls/msvcp120/msvcp120.spec +++ b/dlls/msvcp120/msvcp120.spec @@ -949,7 +949,7 @@ @ extern ??_7?$time_put(a)DV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@6B@ MSVCP_time_put_char_vtable @ extern ??_7?$time_put(a)GV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@std@@@std@@6B@ MSVCP_time_put_short_vtable @ extern ??_7?$time_put(a)_WV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@6B@ MSVCP_time_put_wchar_vtable -@ stub ??_7_Facet_base(a)std@@6B@ +# extern ??_7_Facet_base(a)std@@6B@ @ extern ??_7_Locimp(a)locale@std@@6B@ MSVCP_locale__Locimp_vtable @ extern ??_7_Pad(a)std@@6B@ MSVCP__Pad_vtable @ extern ??_7codecvt_base(a)std@@6B@ MSVCP_codecvt_base_vtable @@ -1078,26 +1078,26 @@ @ stub -arch=win64 ?NFS_Free(a)details@Concurrency@@YAXPEAX(a)Z @ stub -arch=win32 ?NFS_GetLineSize(a)details@Concurrency@@YAIXZ @ stub -arch=win64 ?NFS_GetLineSize(a)details@Concurrency@@YA_KXZ -@ stub ?_10(a)placeholders@std@@3V?$_Ph@$09(a)2@A -@ stub ?_11(a)placeholders@std@@3V?$_Ph@$0L@@2(a)A -@ stub ?_12(a)placeholders@std@@3V?$_Ph@$0M@@2(a)A -@ stub ?_13(a)placeholders@std@@3V?$_Ph@$0N@@2(a)A -@ stub ?_14(a)placeholders@std@@3V?$_Ph@$0O@@2(a)A -@ stub ?_15(a)placeholders@std@@3V?$_Ph@$0P@@2(a)A -@ stub ?_16(a)placeholders@std@@3V?$_Ph@$0BA@@2(a)A -@ stub ?_17(a)placeholders@std@@3V?$_Ph@$0BB@@2(a)A -@ stub ?_18(a)placeholders@std@@3V?$_Ph@$0BC@@2(a)A -@ stub ?_19(a)placeholders@std@@3V?$_Ph@$0BD@@2(a)A -@ stub ?_1(a)placeholders@std@@3V?$_Ph@$00(a)2@A -@ stub ?_20(a)placeholders@std@@3V?$_Ph@$0BE@@2(a)A -@ stub ?_2(a)placeholders@std@@3V?$_Ph@$01(a)2@A -@ stub ?_3(a)placeholders@std@@3V?$_Ph@$02(a)2@A -@ stub ?_4(a)placeholders@std@@3V?$_Ph@$03(a)2@A -@ stub ?_5(a)placeholders@std@@3V?$_Ph@$04(a)2@A -@ stub ?_6(a)placeholders@std@@3V?$_Ph@$05(a)2@A -@ stub ?_7(a)placeholders@std@@3V?$_Ph@$06(a)2@A -@ stub ?_8(a)placeholders@std@@3V?$_Ph@$07(a)2@A -@ stub ?_9(a)placeholders@std@@3V?$_Ph@$08(a)2@A +# extern ?_10(a)placeholders@std@@3V?$_Ph@$09(a)2@A +# extern ?_11(a)placeholders@std@@3V?$_Ph@$0L@@2(a)A +# extern ?_12(a)placeholders@std@@3V?$_Ph@$0M@@2(a)A +# extern ?_13(a)placeholders@std@@3V?$_Ph@$0N@@2(a)A +# extern ?_14(a)placeholders@std@@3V?$_Ph@$0O@@2(a)A +# extern ?_15(a)placeholders@std@@3V?$_Ph@$0P@@2(a)A +# extern ?_16(a)placeholders@std@@3V?$_Ph@$0BA@@2(a)A +# extern ?_17(a)placeholders@std@@3V?$_Ph@$0BB@@2(a)A +# extern ?_18(a)placeholders@std@@3V?$_Ph@$0BC@@2(a)A +# extern ?_19(a)placeholders@std@@3V?$_Ph@$0BD@@2(a)A +# extern ?_1(a)placeholders@std@@3V?$_Ph@$00(a)2@A +# extern ?_20(a)placeholders@std@@3V?$_Ph@$0BE@@2(a)A +# extern ?_2(a)placeholders@std@@3V?$_Ph@$01(a)2@A +# extern ?_3(a)placeholders@std@@3V?$_Ph@$02(a)2@A +# extern ?_4(a)placeholders@std@@3V?$_Ph@$03(a)2@A +# extern ?_5(a)placeholders@std@@3V?$_Ph@$04(a)2@A +# extern ?_6(a)placeholders@std@@3V?$_Ph@$05(a)2@A +# extern ?_7(a)placeholders@std@@3V?$_Ph@$06(a)2@A +# extern ?_8(a)placeholders@std@@3V?$_Ph@$07(a)2@A +# extern ?_9(a)placeholders@std@@3V?$_Ph@$08(a)2@A @ cdecl -arch=arm ?_Addcats(a)_Locinfo@std@@QAAAAV12(a)HPBD@Z(ptr long str) _Locinfo__Addcats @ thiscall -arch=i386 ?_Addcats(a)_Locinfo@std@@QAEAAV12(a)HPBD@Z(ptr long str) _Locinfo__Addcats @ cdecl -arch=win64 ?_Addcats(a)_Locinfo@std@@QEAAAEAV12(a)HPEBD@Z(ptr long str) _Locinfo__Addcats @@ -1114,7 +1114,7 @@ @ stub -arch=win64 ?_Assign(a)_Concurrent_queue_iterator_base_v4@details(a)Concurrency@@IEAAXAEBV123@@Z @ stub ?_Atexit@@YAXP6AXXZ(a)Z @ extern ?_BADOFF(a)std@@3_JB std_BADOFF -@ stub ?_Byte_reverse_table(a)details@Concurrency@@3QBEB +# extern ?_Byte_reverse_table(a)details@Concurrency@@3QBEB @ cdecl -arch=arm ?_C_str@?$_Yarn(a)D@std@@QBAPBDXZ(ptr) _Yarn_char_c_str @ thiscall -arch=i386 ?_C_str@?$_Yarn(a)D@std@@QBEPBDXZ(ptr) _Yarn_char_c_str @ cdecl -arch=win64 ?_C_str@?$_Yarn(a)D@std@@QEBAPEBDXZ(ptr) _Yarn_char_c_str @@ -1806,7 +1806,7 @@ @ stub ?_Xregex_error(a)std@@YAXW4error_type(a)regex_constants@1@@Z @ cdecl -arch=win32 ?_Xruntime_error(a)std@@YAXPBD(a)Z(str) _Xruntime_error @ cdecl -arch=win64 ?_Xruntime_error(a)std@@YAXPEBD(a)Z(str) _Xruntime_error -@ stub ?adopt_lock(a)std@@3Uadopt_lock_t(a)1@B +# extern ?adopt_lock(a)std@@3Uadopt_lock_t(a)1@B @ cdecl -arch=arm ?always_noconv(a)codecvt_base@std@@QBA_NXZ(ptr) codecvt_base_always_noconv @ thiscall -arch=i386 ?always_noconv(a)codecvt_base@std@@QBE_NXZ(ptr) codecvt_base_always_noconv @ cdecl -arch=win64 ?always_noconv(a)codecvt_base@std@@QEBA_NXZ(ptr) codecvt_base_always_noconv @@ -1875,7 +1875,7 @@ @ stub -arch=arm ?date_order@?$time_get(a)_WV?$istreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@QBA?AW4dateorder(a)time_base@2(a)XZ @ stub -arch=i386 ?date_order@?$time_get(a)_WV?$istreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@QBE?AW4dateorder(a)time_base@2(a)XZ @ stub -arch=win64 ?date_order@?$time_get(a)_WV?$istreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@QEBA?AW4dateorder(a)time_base@2(a)XZ -@ stub ?defer_lock(a)std@@3Udefer_lock_t(a)1@B +# extern ?defer_lock(a)std@@3Udefer_lock_t(a)1@B @ stub -arch=arm ?do_always_noconv@?$codecvt(a)DDH@std@@MBA_NXZ @ stub -arch=i386 ?do_always_noconv@?$codecvt(a)DDH@std@@MBE_NXZ @ stub -arch=win64 ?do_always_noconv@?$codecvt(a)DDH@std@@MEBA_NXZ @@ -3546,7 +3546,7 @@ @ cdecl -arch=arm ?toupper@?$ctype(a)_W@std@@QBA_W_W(a)Z(ptr long) ctype_wchar_toupper_ch @ thiscall -arch=i386 ?toupper@?$ctype(a)_W@std@@QBE_W_W(a)Z(ptr long) ctype_wchar_toupper_ch @ cdecl -arch=win64 ?toupper@?$ctype(a)_W@std@@QEBA_W_W(a)Z(ptr long) ctype_wchar_toupper_ch -@ stub ?try_to_lock(a)std@@3Utry_to_lock_t(a)1@B +# extern ?try_to_lock(a)std@@3Utry_to_lock_t(a)1@B @ cdecl -arch=arm ?uflow@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@MAAHXZ(ptr) basic_streambuf_char_uflow @ thiscall -arch=i386 ?uflow@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@MAEHXZ(ptr) basic_streambuf_char_uflow @ cdecl -arch=win64 ?uflow@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@MEAAHXZ(ptr) basic_streambuf_char_uflow

1 0

Piotr Caban : msvcp120_app: Don't export structures as stubs.
by Alexandre Julliard 02 Aug '16

02 Aug '16

Module: wine Branch: master Commit: 96a89761c48f7915a19399f6b84e7d60e47f6ec3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=96a89761c48f7915a19399f6b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Aug 2 13:00:44 2016 +0200 msvcp120_app: Don't export structures as stubs. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp120_app/msvcp120_app.spec | 50 ++++++++++++++++++------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/dlls/msvcp120_app/msvcp120_app.spec b/dlls/msvcp120_app/msvcp120_app.spec index f16402d..f61a6ef 100644 --- a/dlls/msvcp120_app/msvcp120_app.spec +++ b/dlls/msvcp120_app/msvcp120_app.spec @@ -949,7 +949,7 @@ @ extern ??_7?$time_put(a)DV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@6B@ msvcp120.??_7?$time_put(a)DV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@6B@ @ extern ??_7?$time_put(a)GV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@std@@@std@@6B@ msvcp120.??_7?$time_put(a)GV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@std@@@std@@6B@ @ extern ??_7?$time_put(a)_WV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@6B@ msvcp120.??_7?$time_put(a)_WV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@6B@ -@ stub ??_7_Facet_base(a)std@@6B@ +# extern ??_7_Facet_base(a)std@@6B@ @ extern ??_7_Locimp(a)locale@std@@6B@ msvcp120.??_7_Locimp(a)locale@std@@6B@ @ extern ??_7_Pad(a)std@@6B@ msvcp120.??_7_Pad(a)std@@6B@ @ extern ??_7codecvt_base(a)std@@6B@ msvcp120.??_7codecvt_base(a)std@@6B@ @@ -1078,26 +1078,26 @@ @ stub -arch=win64 ?NFS_Free(a)details@Concurrency@@YAXPEAX(a)Z @ stub -arch=win32 ?NFS_GetLineSize(a)details@Concurrency@@YAIXZ @ stub -arch=win64 ?NFS_GetLineSize(a)details@Concurrency@@YA_KXZ -@ stub ?_10(a)placeholders@std@@3V?$_Ph@$09(a)2@A -@ stub ?_11(a)placeholders@std@@3V?$_Ph@$0L@@2(a)A -@ stub ?_12(a)placeholders@std@@3V?$_Ph@$0M@@2(a)A -@ stub ?_13(a)placeholders@std@@3V?$_Ph@$0N@@2(a)A -@ stub ?_14(a)placeholders@std@@3V?$_Ph@$0O@@2(a)A -@ stub ?_15(a)placeholders@std@@3V?$_Ph@$0P@@2(a)A -@ stub ?_16(a)placeholders@std@@3V?$_Ph@$0BA@@2(a)A -@ stub ?_17(a)placeholders@std@@3V?$_Ph@$0BB@@2(a)A -@ stub ?_18(a)placeholders@std@@3V?$_Ph@$0BC@@2(a)A -@ stub ?_19(a)placeholders@std@@3V?$_Ph@$0BD@@2(a)A -@ stub ?_1(a)placeholders@std@@3V?$_Ph@$00(a)2@A -@ stub ?_20(a)placeholders@std@@3V?$_Ph@$0BE@@2(a)A -@ stub ?_2(a)placeholders@std@@3V?$_Ph@$01(a)2@A -@ stub ?_3(a)placeholders@std@@3V?$_Ph@$02(a)2@A -@ stub ?_4(a)placeholders@std@@3V?$_Ph@$03(a)2@A -@ stub ?_5(a)placeholders@std@@3V?$_Ph@$04(a)2@A -@ stub ?_6(a)placeholders@std@@3V?$_Ph@$05(a)2@A -@ stub ?_7(a)placeholders@std@@3V?$_Ph@$06(a)2@A -@ stub ?_8(a)placeholders@std@@3V?$_Ph@$07(a)2@A -@ stub ?_9(a)placeholders@std@@3V?$_Ph@$08(a)2@A +# extern ?_10(a)placeholders@std@@3V?$_Ph@$09(a)2@A +# extern ?_11(a)placeholders@std@@3V?$_Ph@$0L@@2(a)A +# extern ?_12(a)placeholders@std@@3V?$_Ph@$0M@@2(a)A +# extern ?_13(a)placeholders@std@@3V?$_Ph@$0N@@2(a)A +# extern ?_14(a)placeholders@std@@3V?$_Ph@$0O@@2(a)A +# extern ?_15(a)placeholders@std@@3V?$_Ph@$0P@@2(a)A +# extern ?_16(a)placeholders@std@@3V?$_Ph@$0BA@@2(a)A +# extern ?_17(a)placeholders@std@@3V?$_Ph@$0BB@@2(a)A +# extern ?_18(a)placeholders@std@@3V?$_Ph@$0BC@@2(a)A +# extern ?_19(a)placeholders@std@@3V?$_Ph@$0BD@@2(a)A +# extern ?_1(a)placeholders@std@@3V?$_Ph@$00(a)2@A +# extern ?_20(a)placeholders@std@@3V?$_Ph@$0BE@@2(a)A +# extern ?_2(a)placeholders@std@@3V?$_Ph@$01(a)2@A +# extern ?_3(a)placeholders@std@@3V?$_Ph@$02(a)2@A +# extern ?_4(a)placeholders@std@@3V?$_Ph@$03(a)2@A +# extern ?_5(a)placeholders@std@@3V?$_Ph@$04(a)2@A +# extern ?_6(a)placeholders@std@@3V?$_Ph@$05(a)2@A +# extern ?_7(a)placeholders@std@@3V?$_Ph@$06(a)2@A +# extern ?_8(a)placeholders@std@@3V?$_Ph@$07(a)2@A +# extern ?_9(a)placeholders@std@@3V?$_Ph@$08(a)2@A @ cdecl -arch=arm ?_Addcats(a)_Locinfo@std@@QAAAAV12(a)HPBD@Z(ptr long str) msvcp120.?_Addcats(a)_Locinfo@std@@QAAAAV12(a)HPBD@Z @ thiscall -arch=i386 ?_Addcats(a)_Locinfo@std@@QAEAAV12(a)HPBD@Z(ptr long str) msvcp120.?_Addcats(a)_Locinfo@std@@QAEAAV12(a)HPBD@Z @ cdecl -arch=win64 ?_Addcats(a)_Locinfo@std@@QEAAAEAV12(a)HPEBD@Z(ptr long str) msvcp120.?_Addcats(a)_Locinfo@std@@QEAAAEAV12(a)HPEBD@Z @@ -1114,7 +1114,7 @@ @ stub -arch=win64 ?_Assign(a)_Concurrent_queue_iterator_base_v4@details(a)Concurrency@@IEAAXAEBV123@@Z @ stub ?_Atexit@@YAXP6AXXZ(a)Z @ extern ?_BADOFF(a)std@@3_JB msvcp120.?_BADOFF(a)std@@3_JB -@ stub ?_Byte_reverse_table(a)details@Concurrency@@3QBEB +# extern ?_Byte_reverse_table(a)details@Concurrency@@3QBEB @ cdecl -arch=arm ?_C_str@?$_Yarn(a)D@std@@QBAPBDXZ(ptr) msvcp120.?_C_str@?$_Yarn(a)D@std@@QBAPBDXZ @ thiscall -arch=i386 ?_C_str@?$_Yarn(a)D@std@@QBEPBDXZ(ptr) msvcp120.?_C_str@?$_Yarn(a)D@std@@QBEPBDXZ @ cdecl -arch=win64 ?_C_str@?$_Yarn(a)D@std@@QEBAPEBDXZ(ptr) msvcp120.?_C_str@?$_Yarn(a)D@std@@QEBAPEBDXZ @@ -1806,7 +1806,7 @@ @ stub ?_Xregex_error(a)std@@YAXW4error_type(a)regex_constants@1@@Z @ cdecl -arch=win32 ?_Xruntime_error(a)std@@YAXPBD(a)Z(str) msvcp120.?_Xruntime_error(a)std@@YAXPBD(a)Z @ cdecl -arch=win64 ?_Xruntime_error(a)std@@YAXPEBD(a)Z(str) msvcp120.?_Xruntime_error(a)std@@YAXPEBD(a)Z -@ stub ?adopt_lock(a)std@@3Uadopt_lock_t(a)1@B +# extern ?adopt_lock(a)std@@3Uadopt_lock_t(a)1@B @ cdecl -arch=arm ?always_noconv(a)codecvt_base@std@@QBA_NXZ(ptr) msvcp120.?always_noconv(a)codecvt_base@std@@QBA_NXZ @ thiscall -arch=i386 ?always_noconv(a)codecvt_base@std@@QBE_NXZ(ptr) msvcp120.?always_noconv(a)codecvt_base@std@@QBE_NXZ @ cdecl -arch=win64 ?always_noconv(a)codecvt_base@std@@QEBA_NXZ(ptr) msvcp120.?always_noconv(a)codecvt_base@std@@QEBA_NXZ @@ -1875,7 +1875,7 @@ @ stub -arch=arm ?date_order@?$time_get(a)_WV?$istreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@QBA?AW4dateorder(a)time_base@2(a)XZ @ stub -arch=i386 ?date_order@?$time_get(a)_WV?$istreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@QBE?AW4dateorder(a)time_base@2(a)XZ @ stub -arch=win64 ?date_order@?$time_get(a)_WV?$istreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@QEBA?AW4dateorder(a)time_base@2(a)XZ -@ stub ?defer_lock(a)std@@3Udefer_lock_t(a)1@B +# extern ?defer_lock(a)std@@3Udefer_lock_t(a)1@B @ stub -arch=arm ?do_always_noconv@?$codecvt(a)DDH@std@@MBA_NXZ @ stub -arch=i386 ?do_always_noconv@?$codecvt(a)DDH@std@@MBE_NXZ @ stub -arch=win64 ?do_always_noconv@?$codecvt(a)DDH@std@@MEBA_NXZ @@ -3546,7 +3546,7 @@ @ cdecl -arch=arm ?toupper@?$ctype(a)_W@std@@QBA_W_W(a)Z(ptr long) msvcp120.?toupper@?$ctype(a)_W@std@@QBA_W_W(a)Z @ thiscall -arch=i386 ?toupper@?$ctype(a)_W@std@@QBE_W_W(a)Z(ptr long) msvcp120.?toupper@?$ctype(a)_W@std@@QBE_W_W(a)Z @ cdecl -arch=win64 ?toupper@?$ctype(a)_W@std@@QEBA_W_W(a)Z(ptr long) msvcp120.?toupper@?$ctype(a)_W@std@@QEBA_W_W(a)Z -@ stub ?try_to_lock(a)std@@3Utry_to_lock_t(a)1@B +# extern ?try_to_lock(a)std@@3Utry_to_lock_t(a)1@B @ cdecl -arch=arm ?uflow@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@MAAHXZ(ptr) msvcp120.?uflow@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@MAAHXZ @ thiscall -arch=i386 ?uflow@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@MAEHXZ(ptr) msvcp120.?uflow@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@MAEHXZ @ cdecl -arch=win64 ?uflow@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@MEAAHXZ(ptr) msvcp120.?uflow@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@MEAAHXZ

1 0

Piotr Caban : msvcp110: Don't export structures as stubs.
by Alexandre Julliard 02 Aug '16

02 Aug '16

Module: wine Branch: master Commit: 657773a3671b753ebe1c446352681f3542aae9d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=657773a3671b753ebe1c44635… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Aug 2 13:00:49 2016 +0200 msvcp110: Don't export structures as stubs. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp110/msvcp110.spec | 50 ++++++++++++++++++++++----------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index ced9795..ff16de2 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -949,7 +949,7 @@ @ extern ??_7?$time_put(a)DV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@6B@ MSVCP_time_put_char_vtable @ extern ??_7?$time_put(a)GV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@std@@@std@@6B@ MSVCP_time_put_short_vtable @ extern ??_7?$time_put(a)_WV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@6B@ MSVCP_time_put_wchar_vtable -@ stub ??_7_Facet_base(a)std@@6B@ +# extern ??_7_Facet_base(a)std@@6B@ @ extern ??_7_Locimp(a)locale@std@@6B@ MSVCP_locale__Locimp_vtable @ extern ??_7_Pad(a)std@@6B@ MSVCP__Pad_vtable @ extern ??_7codecvt_base(a)std@@6B@ MSVCP_codecvt_base_vtable @@ -1077,26 +1077,26 @@ @ stub -arch=win64 ?NFS_Free(a)details@Concurrency@@YAXPEAX(a)Z @ stub -arch=win32 ?NFS_GetLineSize(a)details@Concurrency@@YAIXZ @ stub -arch=win64 ?NFS_GetLineSize(a)details@Concurrency@@YA_KXZ -@ stub ?_10(a)placeholders@std@@3V?$_Ph@$09(a)2@A -@ stub ?_11(a)placeholders@std@@3V?$_Ph@$0L@@2(a)A -@ stub ?_12(a)placeholders@std@@3V?$_Ph@$0M@@2(a)A -@ stub ?_13(a)placeholders@std@@3V?$_Ph@$0N@@2(a)A -@ stub ?_14(a)placeholders@std@@3V?$_Ph@$0O@@2(a)A -@ stub ?_15(a)placeholders@std@@3V?$_Ph@$0P@@2(a)A -@ stub ?_16(a)placeholders@std@@3V?$_Ph@$0BA@@2(a)A -@ stub ?_17(a)placeholders@std@@3V?$_Ph@$0BB@@2(a)A -@ stub ?_18(a)placeholders@std@@3V?$_Ph@$0BC@@2(a)A -@ stub ?_19(a)placeholders@std@@3V?$_Ph@$0BD@@2(a)A -@ stub ?_1(a)placeholders@std@@3V?$_Ph@$00(a)2@A -@ stub ?_20(a)placeholders@std@@3V?$_Ph@$0BE@@2(a)A -@ stub ?_2(a)placeholders@std@@3V?$_Ph@$01(a)2@A -@ stub ?_3(a)placeholders@std@@3V?$_Ph@$02(a)2@A -@ stub ?_4(a)placeholders@std@@3V?$_Ph@$03(a)2@A -@ stub ?_5(a)placeholders@std@@3V?$_Ph@$04(a)2@A -@ stub ?_6(a)placeholders@std@@3V?$_Ph@$05(a)2@A -@ stub ?_7(a)placeholders@std@@3V?$_Ph@$06(a)2@A -@ stub ?_8(a)placeholders@std@@3V?$_Ph@$07(a)2@A -@ stub ?_9(a)placeholders@std@@3V?$_Ph@$08(a)2@A +# extern ?_10(a)placeholders@std@@3V?$_Ph@$09(a)2@A +# extern ?_11(a)placeholders@std@@3V?$_Ph@$0L@@2(a)A +# extern ?_12(a)placeholders@std@@3V?$_Ph@$0M@@2(a)A +# extern ?_13(a)placeholders@std@@3V?$_Ph@$0N@@2(a)A +# extern ?_14(a)placeholders@std@@3V?$_Ph@$0O@@2(a)A +# extern ?_15(a)placeholders@std@@3V?$_Ph@$0P@@2(a)A +# extern ?_16(a)placeholders@std@@3V?$_Ph@$0BA@@2(a)A +# extern ?_17(a)placeholders@std@@3V?$_Ph@$0BB@@2(a)A +# extern ?_18(a)placeholders@std@@3V?$_Ph@$0BC@@2(a)A +# extern ?_19(a)placeholders@std@@3V?$_Ph@$0BD@@2(a)A +# extern ?_1(a)placeholders@std@@3V?$_Ph@$00(a)2@A +# extern ?_20(a)placeholders@std@@3V?$_Ph@$0BE@@2(a)A +# extern ?_2(a)placeholders@std@@3V?$_Ph@$01(a)2@A +# extern ?_3(a)placeholders@std@@3V?$_Ph@$02(a)2@A +# extern ?_4(a)placeholders@std@@3V?$_Ph@$03(a)2@A +# extern ?_5(a)placeholders@std@@3V?$_Ph@$04(a)2@A +# extern ?_6(a)placeholders@std@@3V?$_Ph@$05(a)2@A +# extern ?_7(a)placeholders@std@@3V?$_Ph@$06(a)2@A +# extern ?_8(a)placeholders@std@@3V?$_Ph@$07(a)2@A +# extern ?_9(a)placeholders@std@@3V?$_Ph@$08(a)2@A @ stub -arch=arm ?_Add_vtordisp1@?$basic_ios(a)DU?$char_traits(a)D@std@@@std@@UAAXXZ @ stub -arch=i386 ?_Add_vtordisp1@?$basic_ios(a)DU?$char_traits(a)D@std@@@std@@UAEXXZ @ stub -arch=win64 ?_Add_vtordisp1@?$basic_ios(a)DU?$char_traits(a)D@std@@@std@@UEAAXXZ @@ -1149,7 +1149,7 @@ @ stub -arch=win64 ?_Assign(a)_Concurrent_queue_iterator_base_v4@details(a)Concurrency@@IEAAXAEBV123@@Z @ stub ?_Atexit@@YAXP6AXXZ(a)Z @ extern ?_BADOFF(a)std@@3_JB std_BADOFF -@ stub ?_Byte_reverse_table(a)details@Concurrency@@3QBEB +# extern ?_Byte_reverse_table(a)details@Concurrency@@3QBEB @ cdecl -arch=arm ?_C_str@?$_Yarn(a)D@std@@QBAPBDXZ(ptr) _Yarn_char_c_str @ thiscall -arch=i386 ?_C_str@?$_Yarn(a)D@std@@QBEPBDXZ(ptr) _Yarn_char_c_str @ cdecl -arch=win64 ?_C_str@?$_Yarn(a)D@std@@QEBAPEBDXZ(ptr) _Yarn_char_c_str @@ -1845,7 +1845,7 @@ @ stub ?_Xregex_error(a)std@@YAXW4error_type(a)regex_constants@1@@Z @ cdecl -arch=win32 ?_Xruntime_error(a)std@@YAXPBD(a)Z(str) _Xruntime_error @ cdecl -arch=win64 ?_Xruntime_error(a)std@@YAXPEBD(a)Z(str) _Xruntime_error -@ stub ?adopt_lock(a)std@@3Uadopt_lock_t(a)1@B +# extern ?adopt_lock(a)std@@3Uadopt_lock_t(a)1@B @ cdecl -arch=arm ?always_noconv(a)codecvt_base@std@@QBA_NXZ(ptr) codecvt_base_always_noconv @ thiscall -arch=i386 ?always_noconv(a)codecvt_base@std@@QBE_NXZ(ptr) codecvt_base_always_noconv @ cdecl -arch=win64 ?always_noconv(a)codecvt_base@std@@QEBA_NXZ(ptr) codecvt_base_always_noconv @@ -1915,7 +1915,7 @@ @ stub -arch=arm ?date_order@?$time_get(a)_WV?$istreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@QBA?AW4dateorder(a)time_base@2(a)XZ @ stub -arch=i386 ?date_order@?$time_get(a)_WV?$istreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@QBE?AW4dateorder(a)time_base@2(a)XZ @ stub -arch=win64 ?date_order@?$time_get(a)_WV?$istreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@QEBA?AW4dateorder(a)time_base@2(a)XZ -@ stub ?defer_lock(a)std@@3Udefer_lock_t(a)1@B +# extern ?defer_lock(a)std@@3Udefer_lock_t(a)1@B @ stub -arch=arm ?do_always_noconv@?$codecvt(a)DDH@std@@MBA_NXZ @ stub -arch=i386 ?do_always_noconv@?$codecvt(a)DDH@std@@MBE_NXZ @ stub -arch=win64 ?do_always_noconv@?$codecvt(a)DDH@std@@MEBA_NXZ @@ -3605,7 +3605,7 @@ @ cdecl -arch=arm ?toupper@?$ctype(a)_W@std@@QBA_W_W(a)Z(ptr long) ctype_wchar_toupper_ch @ thiscall -arch=i386 ?toupper@?$ctype(a)_W@std@@QBE_W_W(a)Z(ptr long) ctype_wchar_toupper_ch @ cdecl -arch=win64 ?toupper@?$ctype(a)_W@std@@QEBA_W_W(a)Z(ptr long) ctype_wchar_toupper_ch -@ stub ?try_to_lock(a)std@@3Utry_to_lock_t(a)1@B +# extern ?try_to_lock(a)std@@3Utry_to_lock_t(a)1@B @ cdecl -arch=arm ?uflow@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@MAAHXZ(ptr) basic_streambuf_char_uflow @ thiscall -arch=i386 ?uflow@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@MAEHXZ(ptr) basic_streambuf_char_uflow @ cdecl -arch=win64 ?uflow@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@MEAAHXZ(ptr) basic_streambuf_char_uflow

1 0

Piotr Caban : msvcp100: Don't export structures as stubs.
by Alexandre Julliard 02 Aug '16

02 Aug '16

Module: wine Branch: master Commit: 0312726b46ab3be4d82e2660d0cb96146c1a465a URL: http://source.winehq.org/git/wine.git/?a=commit;h=0312726b46ab3be4d82e2660d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Aug 2 13:00:58 2016 +0200 msvcp100: Don't export structures as stubs. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp100/msvcp100.spec | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/dlls/msvcp100/msvcp100.spec b/dlls/msvcp100/msvcp100.spec index 663a8f6..239500f 100644 --- a/dlls/msvcp100/msvcp100.spec +++ b/dlls/msvcp100/msvcp100.spec @@ -2145,23 +2145,23 @@ @ cdecl -ret64 ?max@?$numeric_limits(a)_K@std@@SA_KXZ() std_numeric_limits_unsigned_int64_max @ cdecl ?max@?$numeric_limits(a)_N@std@@SA_NXZ() std_numeric_limits_bool_max @ cdecl ?max@?$numeric_limits(a)_W@std@@SA_WXZ() std_numeric_limits_wchar_t_max -@ stub ?max_digits10@?$numeric_limits(a)C@std@@2HB -@ stub ?max_digits10@?$numeric_limits(a)D@std@@2HB -@ stub ?max_digits10@?$numeric_limits(a)E@std@@2HB -@ stub ?max_digits10@?$numeric_limits(a)F@std@@2HB -@ stub ?max_digits10@?$numeric_limits(a)G@std@@2HB -@ stub ?max_digits10@?$numeric_limits(a)H@std@@2HB -@ stub ?max_digits10@?$numeric_limits(a)I@std@@2HB -@ stub ?max_digits10@?$numeric_limits(a)J@std@@2HB -@ stub ?max_digits10@?$numeric_limits(a)K@std@@2HB -@ stub ?max_digits10@?$numeric_limits(a)M@std@@2HB -@ stub ?max_digits10@?$numeric_limits(a)N@std@@2HB -@ stub ?max_digits10@?$numeric_limits(a)O@std@@2HB -@ stub ?max_digits10@?$numeric_limits(a)_J@std@@2HB -@ stub ?max_digits10@?$numeric_limits(a)_K@std@@2HB -@ stub ?max_digits10@?$numeric_limits(a)_N@std@@2HB -@ stub ?max_digits10@?$numeric_limits(a)_W@std@@2HB -@ stub ?max_digits10(a)_Num_base@std@@2HB +# extern ?max_digits10@?$numeric_limits(a)C@std@@2HB +# extern ?max_digits10@?$numeric_limits(a)D@std@@2HB +# extern ?max_digits10@?$numeric_limits(a)E@std@@2HB +# extern ?max_digits10@?$numeric_limits(a)F@std@@2HB +# extern ?max_digits10@?$numeric_limits(a)G@std@@2HB +# extern ?max_digits10@?$numeric_limits(a)H@std@@2HB +# extern ?max_digits10@?$numeric_limits(a)I@std@@2HB +# extern ?max_digits10@?$numeric_limits(a)J@std@@2HB +# extern ?max_digits10@?$numeric_limits(a)K@std@@2HB +# extern ?max_digits10@?$numeric_limits(a)M@std@@2HB +# extern ?max_digits10@?$numeric_limits(a)N@std@@2HB +# extern ?max_digits10@?$numeric_limits(a)O@std@@2HB +# extern ?max_digits10@?$numeric_limits(a)_J@std@@2HB +# extern ?max_digits10@?$numeric_limits(a)_K@std@@2HB +# extern ?max_digits10@?$numeric_limits(a)_N@std@@2HB +# extern ?max_digits10@?$numeric_limits(a)_W@std@@2HB +# extern ?max_digits10(a)_Num_base@std@@2HB @ extern ?max_exponent10@?$numeric_limits(a)M@std@@2HB std_numeric_limits_float_max_exponent10 @ extern ?max_exponent10@?$numeric_limits(a)N@std@@2HB std_numeric_limits_double_max_exponent10 @ extern ?max_exponent10@?$numeric_limits(a)O@std@@2HB std_numeric_limits_long_double_max_exponent10

1 0

Nikolay Sivov : ucrtbase: Added __stdio_common_vswprintf_s().
by Alexandre Julliard 02 Aug '16

02 Aug '16

Module: wine Branch: master Commit: b6fd195279d874fff9ba1f81658d0ea49b5d36e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6fd195279d874fff9ba1f816… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Aug 2 14:18:03 2016 +0300 ucrtbase: Added __stdio_common_vswprintf_s(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-crt-stdio-l1-1-0.spec | 2 +- dlls/msvcrt/wcs.c | 10 ++++++++++ dlls/ucrtbase/ucrtbase.spec | 2 +- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-crt-stdio-l1-1-0/api-ms-win-crt-stdio-l1-1-0.spec b/dlls/api-ms-win-crt-stdio-l1-1-0/api-ms-win-crt-stdio-l1-1-0.spec index 4dcc065..5acd7aa 100644 --- a/dlls/api-ms-win-crt-stdio-l1-1-0/api-ms-win-crt-stdio-l1-1-0.spec +++ b/dlls/api-ms-win-crt-stdio-l1-1-0/api-ms-win-crt-stdio-l1-1-0.spec @@ -17,7 +17,7 @@ @ cdecl __stdio_common_vsscanf(int64 ptr long ptr ptr ptr) ucrtbase.__stdio_common_vsscanf @ cdecl __stdio_common_vswprintf(int64 ptr long ptr ptr ptr) ucrtbase.__stdio_common_vswprintf @ stub __stdio_common_vswprintf_p -@ stub __stdio_common_vswprintf_s +@ cdecl __stdio_common_vswprintf_s(int64 ptr long wstr ptr ptr) ucrtbase.__stdio_common_vswprintf_s @ stub __stdio_common_vswscanf @ cdecl _chsize(long long) ucrtbase._chsize @ cdecl _chsize_s(long int64) ucrtbase._chsize_s diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 04a2f76..6fc642c 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -942,6 +942,16 @@ int CDECL MSVCRT__stdio_common_vsnwprintf_s( unsigned __int64 options, } /********************************************************************* + * __stdio_common_vswprintf_s (MSVCRT.@) + */ +int CDECL MSVCRT__stdio_common_vswprintf_s( unsigned __int64 options, + MSVCRT_wchar_t *str, MSVCRT_size_t count, const MSVCRT_wchar_t *format, + MSVCRT__locale_t locale, __ms_va_list valist ) +{ + return MSVCRT__stdio_common_vsnwprintf_s(options, str, INT_MAX, count, format, locale, valist); +} + +/********************************************************************* * __stdio_common_vsprintf_s (MSVCRT.@) */ int CDECL MSVCRT__stdio_common_vsprintf_s( unsigned __int64 options, diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 6d7e631..96c050a 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -162,7 +162,7 @@ @ cdecl __stdio_common_vsscanf(int64 ptr long ptr ptr ptr) MSVCRT__stdio_common_vsscanf @ cdecl __stdio_common_vswprintf(int64 ptr long ptr ptr ptr) MSVCRT__stdio_common_vswprintf @ stub __stdio_common_vswprintf_p -@ stub __stdio_common_vswprintf_s +@ cdecl __stdio_common_vswprintf_s(int64 ptr long wstr ptr ptr) MSVCRT__stdio_common_vswprintf_s @ stub __stdio_common_vswscanf @ stub __strncnt @ cdecl __sys_errlist()

1 0

Nikolay Sivov : ucrtbase: Fix some spec file entries.
by Alexandre Julliard 02 Aug '16

02 Aug '16

Module: wine Branch: master Commit: 0ca1093335dbe072e4ad52e3e39129b1213e0ff8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ca1093335dbe072e4ad52e3e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Aug 2 14:18:04 2016 +0300 ucrtbase: Fix some spec file entries. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-crt-stdio-l1-1-0.spec | 16 ++++++++-------- dlls/ucrtbase/ucrtbase.spec | 16 ++++++++-------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/api-ms-win-crt-stdio-l1-1-0/api-ms-win-crt-stdio-l1-1-0.spec b/dlls/api-ms-win-crt-stdio-l1-1-0/api-ms-win-crt-stdio-l1-1-0.spec index 5acd7aa..10a2ab7 100644 --- a/dlls/api-ms-win-crt-stdio-l1-1-0/api-ms-win-crt-stdio-l1-1-0.spec +++ b/dlls/api-ms-win-crt-stdio-l1-1-0/api-ms-win-crt-stdio-l1-1-0.spec @@ -1,21 +1,21 @@ @ cdecl __acrt_iob_func(long) ucrtbase.__acrt_iob_func @ cdecl __p__commode() ucrtbase.__p__commode @ cdecl __p__fmode() ucrtbase.__p__fmode -@ cdecl __stdio_common_vfprintf(int64 ptr ptr ptr ptr) ucrtbase.__stdio_common_vfprintf +@ cdecl __stdio_common_vfprintf(int64 ptr str ptr ptr) ucrtbase.__stdio_common_vfprintf @ stub __stdio_common_vfprintf_p @ stub __stdio_common_vfprintf_s @ stub __stdio_common_vfscanf -@ cdecl __stdio_common_vfwprintf(int64 ptr ptr ptr ptr) ucrtbase.__stdio_common_vfwprintf +@ cdecl __stdio_common_vfwprintf(int64 ptr wstr ptr ptr) ucrtbase.__stdio_common_vfwprintf @ stub __stdio_common_vfwprintf_p @ stub __stdio_common_vfwprintf_s @ stub __stdio_common_vfwscanf -@ cdecl __stdio_common_vsnprintf_s(int64 ptr long long ptr ptr ptr) ucrtbase.__stdio_common_vsnprintf_s -@ cdecl __stdio_common_vsnwprintf_s(int64 ptr long long ptr ptr ptr) ucrtbase.__stdio_common_vsnwprintf_s -@ cdecl __stdio_common_vsprintf(int64 ptr long ptr ptr ptr) ucrtbase.__stdio_common_vsprintf +@ cdecl __stdio_common_vsnprintf_s(int64 ptr long long str ptr ptr) ucrtbase.__stdio_common_vsnprintf_s +@ cdecl __stdio_common_vsnwprintf_s(int64 ptr long long wstr ptr ptr) ucrtbase.__stdio_common_vsnwprintf_s +@ cdecl __stdio_common_vsprintf(int64 ptr long str ptr ptr) ucrtbase.__stdio_common_vsprintf @ stub __stdio_common_vsprintf_p -@ cdecl __stdio_common_vsprintf_s(int64 ptr long ptr ptr ptr) ucrtbase.__stdio_common_vsprintf_s -@ cdecl __stdio_common_vsscanf(int64 ptr long ptr ptr ptr) ucrtbase.__stdio_common_vsscanf -@ cdecl __stdio_common_vswprintf(int64 ptr long ptr ptr ptr) ucrtbase.__stdio_common_vswprintf +@ cdecl __stdio_common_vsprintf_s(int64 ptr long str ptr ptr) ucrtbase.__stdio_common_vsprintf_s +@ cdecl __stdio_common_vsscanf(int64 ptr long str ptr ptr) ucrtbase.__stdio_common_vsscanf +@ cdecl __stdio_common_vswprintf(int64 ptr long wstr ptr ptr) ucrtbase.__stdio_common_vswprintf @ stub __stdio_common_vswprintf_p @ cdecl __stdio_common_vswprintf_s(int64 ptr long wstr ptr ptr) ucrtbase.__stdio_common_vswprintf_s @ stub __stdio_common_vswscanf diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 96c050a..f77cbe3 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -146,21 +146,21 @@ @ stub __std_type_info_destroy_list @ stub __std_type_info_hash @ stub __std_type_info_name -@ cdecl __stdio_common_vfprintf(int64 ptr ptr ptr ptr) MSVCRT__stdio_common_vfprintf +@ cdecl __stdio_common_vfprintf(int64 ptr str ptr ptr) MSVCRT__stdio_common_vfprintf @ stub __stdio_common_vfprintf_p @ stub __stdio_common_vfprintf_s @ stub __stdio_common_vfscanf -@ cdecl __stdio_common_vfwprintf(int64 ptr ptr ptr ptr) MSVCRT__stdio_common_vfwprintf +@ cdecl __stdio_common_vfwprintf(int64 ptr wstr ptr ptr) MSVCRT__stdio_common_vfwprintf @ stub __stdio_common_vfwprintf_p @ stub __stdio_common_vfwprintf_s @ stub __stdio_common_vfwscanf -@ cdecl __stdio_common_vsnprintf_s(int64 ptr long long ptr ptr ptr) MSVCRT__stdio_common_vsnprintf_s -@ cdecl __stdio_common_vsnwprintf_s(int64 ptr long long ptr ptr ptr) MSVCRT__stdio_common_vsnwprintf_s -@ cdecl __stdio_common_vsprintf(int64 ptr long ptr ptr ptr) MSVCRT__stdio_common_vsprintf +@ cdecl __stdio_common_vsnprintf_s(int64 ptr long long str ptr ptr) MSVCRT__stdio_common_vsnprintf_s +@ cdecl __stdio_common_vsnwprintf_s(int64 ptr long long wstr ptr ptr) MSVCRT__stdio_common_vsnwprintf_s +@ cdecl __stdio_common_vsprintf(int64 ptr long str ptr ptr) MSVCRT__stdio_common_vsprintf @ stub __stdio_common_vsprintf_p -@ cdecl __stdio_common_vsprintf_s(int64 ptr long ptr ptr ptr) MSVCRT__stdio_common_vsprintf_s -@ cdecl __stdio_common_vsscanf(int64 ptr long ptr ptr ptr) MSVCRT__stdio_common_vsscanf -@ cdecl __stdio_common_vswprintf(int64 ptr long ptr ptr ptr) MSVCRT__stdio_common_vswprintf +@ cdecl __stdio_common_vsprintf_s(int64 ptr long str ptr ptr) MSVCRT__stdio_common_vsprintf_s +@ cdecl __stdio_common_vsscanf(int64 ptr long str ptr ptr) MSVCRT__stdio_common_vsscanf +@ cdecl __stdio_common_vswprintf(int64 ptr long wstr ptr ptr) MSVCRT__stdio_common_vswprintf @ stub __stdio_common_vswprintf_p @ cdecl __stdio_common_vswprintf_s(int64 ptr long wstr ptr ptr) MSVCRT__stdio_common_vswprintf_s @ stub __stdio_common_vswscanf

1 0

Iván Matellanes : msvcirt: Add stubs for istream:: operator>>.
by Alexandre Julliard 02 Aug '16

02 Aug '16

Module: wine Branch: master Commit: 59f232e1c129f324cf50a25b81493f086ecedad1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=59f232e1c129f324cf50a25b8… Author: Iván Matellanes <matellanes.ivan(a)gmail.com> Date: Tue Aug 2 12:37:46 2016 +0100 msvcirt: Add stubs for istream::operator>>. Signed-off-by: Iván Matellanes <matellanesivan(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcirt/msvcirt.c | 135 ++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcirt/msvcirt.spec | 72 +++++++++++------------ dlls/msvcrt20/msvcrt20.spec | 72 +++++++++++------------ dlls/msvcrt40/msvcrt40.spec | 72 +++++++++++------------ 4 files changed, 243 insertions(+), 108 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=59f232e1c129f324cf50a…

1 0

Iván Matellanes : msvcirt: Implement istream:: operator>> for characters.
by Alexandre Julliard 02 Aug '16

02 Aug '16

Module: wine Branch: master Commit: 0aefe854d1a95e91a228e72543da790507fae064 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0aefe854d1a95e91a228e7254… Author: Iván Matellanes <matellanes.ivan(a)gmail.com> Date: Tue Aug 2 12:37:47 2016 +0100 msvcirt: Implement istream::operator>> for characters. Signed-off-by: Iván Matellanes <matellanesivan(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcirt/msvcirt.c | 13 +++++++- dlls/msvcirt/tests/msvcirt.c | 73 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 85 insertions(+), 1 deletion(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index 5d55b58..361285a 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -3490,7 +3490,18 @@ int __thiscall istream_getdouble(istream *this, char *str, int count) DEFINE_THISCALL_WRAPPER(istream_read_char, 8) istream* __thiscall istream_read_char(istream *this, char *ch) { - FIXME("(%p %p) stub\n", this, ch); + ios *base = istream_get_ios(this); + int ret; + + TRACE("(%p %p)\n", this, ch); + + if (istream_ipfx(this, 0)) { + if ((ret = streambuf_sbumpc(base->sb)) == EOF) + base->state |= IOSTATE_eofbit | IOSTATE_failbit; + else + *ch = ret; + istream_isfx(this); + } return this; } diff --git a/dlls/msvcirt/tests/msvcirt.c b/dlls/msvcirt/tests/msvcirt.c index a921b27..a706703 100644 --- a/dlls/msvcirt/tests/msvcirt.c +++ b/dlls/msvcirt/tests/msvcirt.c @@ -327,6 +327,7 @@ static int (*__thiscall p_istream_sync)(istream*); static streampos (*__thiscall p_istream_tellg)(istream*); static int (*__thiscall p_istream_getint)(istream*, char*); static int (*__thiscall p_istream_getdouble)(istream*, char*, int); +static istream* (*__thiscall p_istream_read_char)(istream*, char*); /* Emulate a __thiscall */ #ifdef __i386__ @@ -542,6 +543,7 @@ static BOOL init(void) SET(p_istream_tellg, "?tellg(a)istream@@QEAAJXZ"); SET(p_istream_getint, "?getint(a)istream@@AEAAHPEAD(a)Z"); SET(p_istream_getdouble, "?getdouble(a)istream@@AEAAHPEADH(a)Z"); + SET(p_istream_read_char, "??5istream@@QEAAAEAV0(a)AEAD@Z"); } else { p_operator_new = (void*)GetProcAddress(msvcrt, "??2(a)YAPAXI@Z"); p_operator_delete = (void*)GetProcAddress(msvcrt, "??3(a)YAXPAX@Z"); @@ -679,6 +681,7 @@ static BOOL init(void) SET(p_istream_tellg, "?tellg(a)istream@@QAEJXZ"); SET(p_istream_getint, "?getint(a)istream@@AAEHPAD(a)Z"); SET(p_istream_getdouble, "?getdouble(a)istream@@AAEHPADH(a)Z"); + SET(p_istream_read_char, "??5istream@@QAEAAV0(a)AAD@Z"); } SET(p_ios_static_lock, "?x_lockc(a)ios@@0U_CRT_CRITICAL_SECTION@@A"); SET(p_ios_lockc, "?lockc(a)ios@@KAXXZ"); @@ -4851,6 +4854,75 @@ static void test_istream_getdouble(void) call_func1(p_strstreambuf_dtor, &ssb); } +static void test_istream_read(void) +{ + istream is, *pis; + strstreambuf ssb, *pssb; + int len, ret, i; + + /* makes tables narrower */ + const ios_io_state IOSTATE_faileof = IOSTATE_failbit|IOSTATE_eofbit; + + char c, char_out[] = {-85, ' ', 'a', -50}; + struct istream_read_test { + enum { type_chr } type; + const char *stream_content; + ios_flags flags; + int width; + int expected_val; + ios_io_state expected_state; + int expected_width; + int expected_offset; + BOOL broken; + } tests[] = { + /* char */ + {type_chr, "", FLAGS_skipws, 6, /* -85 */ 0, IOSTATE_faileof, 6, 0, FALSE}, + {type_chr, " ", FLAGS_skipws, 6, /* -85 */ 0, IOSTATE_faileof, 6, 2, FALSE}, + {type_chr, " abc ", 0, 6, /* ' ' */ 1, IOSTATE_goodbit, 6, 1, FALSE}, + {type_chr, " abc ", FLAGS_skipws, 6, /* 'a' */ 2, IOSTATE_goodbit, 6, 2, FALSE}, + {type_chr, " a", FLAGS_skipws, 0, /* 'a' */ 2, IOSTATE_goodbit, 0, 2, FALSE}, + {type_chr, "\xce", 0, 6, /* -50 */ 3, IOSTATE_goodbit, 6, 1, FALSE}, + }; + + pssb = call_func2(p_strstreambuf_dynamic_ctor, &ssb, 64); + ok(pssb == &ssb, "wrong return, expected %p got %p\n", &ssb, pssb); + ret = (int) call_func1(p_streambuf_allocate, &ssb.base); + ok(ret == 1, "expected 1 got %d\n", ret); + pis = call_func3(p_istream_sb_ctor, &is, &ssb.base, TRUE); + ok(pis == &is, "wrong return, expected %p got %p\n", &is, pis); + + for (i = 0; i < sizeof(tests) / sizeof(tests[0]); i++) { + len = strlen(tests[i].stream_content); + is.base_ios.state = IOSTATE_goodbit; + is.base_ios.flags = tests[i].flags; + is.base_ios.width = tests[i].width; + ssb.base.eback = ssb.base.gptr = ssb.base.base; + ssb.base.egptr = ssb.base.base + len; + memcpy(ssb.base.base, tests[i].stream_content, len); + + switch (tests[i].type) { + case type_chr: + c = -85; + pis = call_func2(p_istream_read_char, &is, &c); + ok(c == char_out[tests[i].expected_val], "Test %d: expected %d got %d\n", i, + char_out[tests[i].expected_val], c); + break; + } + + ok(pis == &is, "Test %d: wrong return, expected %p got %p\n", i, &is, pis); + ok(is.base_ios.state == tests[i].expected_state || /* xp, 2k3 */ broken(tests[i].broken), + "Test %d: expected %d got %d\n", i, tests[i].expected_state, is.base_ios.state); + ok(is.base_ios.width == tests[i].expected_width, "Test %d: expected %d got %d\n", i, + tests[i].expected_width, is.base_ios.width); + ok(ssb.base.gptr == ssb.base.base + tests[i].expected_offset || + /* xp, 2k3 */ broken(tests[i].broken), "Test %d: expected %p got %p\n", i, + ssb.base.base + tests[i].expected_offset, ssb.base.gptr); + } + + call_func1(p_istream_vbase_dtor, &is); + call_func1(p_strstreambuf_dtor, &ssb); +} + START_TEST(msvcirt) { if(!init()) @@ -4866,6 +4938,7 @@ START_TEST(msvcirt) test_istream(); test_istream_getint(); test_istream_getdouble(); + test_istream_read(); FreeLibrary(msvcrt); FreeLibrary(msvcirt);

1 0