wine-commits August 2015

wine-commits@winehq.org

2 participants
503 discussions

Henri Verbeet : d2d1: Only draw if the geometry has any faces in d2d_d3d_render_target_FillGeometry ().
by Alexandre Julliard 17 Aug '15

17 Aug '15

Module: wine Branch: master Commit: 4460006fbd1185d55567b5cd754a50bf2e9bed8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=4460006fbd1185d55567b5cd7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Aug 17 12:55:17 2015 +0200 d2d1: Only draw if the geometry has any faces in d2d_d3d_render_target_FillGeometry(). --- dlls/d2d1/render_target.c | 45 ++++++++++++++++++++++++--------------------- 1 file changed, 24 insertions(+), 21 deletions(-) diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index c6bce45..7d80ef5 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -713,32 +713,35 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_FillGeometry(ID2D1RenderTarg return; } - buffer_desc.ByteWidth = geometry_impl->face_count * sizeof(*geometry_impl->faces); - buffer_desc.BindFlags = D3D10_BIND_INDEX_BUFFER; - buffer_data.pSysMem = geometry_impl->faces; - - if (FAILED(hr = ID3D10Device_CreateBuffer(render_target->device, &buffer_desc, &buffer_data, &ib))) + if (geometry_impl->face_count) { - WARN("Failed to create index buffer, hr %#x.\n", hr); - goto done; - } + buffer_desc.ByteWidth = geometry_impl->face_count * sizeof(*geometry_impl->faces); + buffer_desc.BindFlags = D3D10_BIND_INDEX_BUFFER; + buffer_data.pSysMem = geometry_impl->faces; - buffer_desc.ByteWidth = geometry_impl->vertex_count * sizeof(*geometry_impl->vertices); - buffer_desc.BindFlags = D3D10_BIND_VERTEX_BUFFER; - buffer_data.pSysMem = geometry_impl->vertices; + if (FAILED(hr = ID3D10Device_CreateBuffer(render_target->device, &buffer_desc, &buffer_data, &ib))) + { + WARN("Failed to create index buffer, hr %#x.\n", hr); + goto done; + } - if (FAILED(hr = ID3D10Device_CreateBuffer(render_target->device, &buffer_desc, &buffer_data, &vb))) - { - ERR("Failed to create vertex buffer, hr %#x.\n", hr); - ID3D10Buffer_Release(ib); - goto done; - } + buffer_desc.ByteWidth = geometry_impl->vertex_count * sizeof(*geometry_impl->vertices); + buffer_desc.BindFlags = D3D10_BIND_VERTEX_BUFFER; + buffer_data.pSysMem = geometry_impl->vertices; - d2d_draw(render_target, D2D_SHAPE_TYPE_TRIANGLE, ib, 3 * geometry_impl->face_count, vb, - sizeof(*geometry_impl->vertices), vs_cb, ps_cb, brush_impl); + if (FAILED(hr = ID3D10Device_CreateBuffer(render_target->device, &buffer_desc, &buffer_data, &vb))) + { + ERR("Failed to create vertex buffer, hr %#x.\n", hr); + ID3D10Buffer_Release(ib); + goto done; + } - ID3D10Buffer_Release(vb); - ID3D10Buffer_Release(ib); + d2d_draw(render_target, D2D_SHAPE_TYPE_TRIANGLE, ib, 3 * geometry_impl->face_count, vb, + sizeof(*geometry_impl->vertices), vs_cb, ps_cb, brush_impl); + + ID3D10Buffer_Release(vb); + ID3D10Buffer_Release(ib); + } if (geometry_impl->bezier_count) {

1 0

Henri Verbeet : d2d1: Print a WARN instead of a FIXME for the glyph run description in d2d_text_renderer_DrawGlyphRun ().
by Alexandre Julliard 17 Aug '15

17 Aug '15

Module: wine Branch: master Commit: 20ad2e397fa12d13d9d296033adf0082f4fe8442 URL: http://source.winehq.org/git/wine.git/?a=commit;h=20ad2e397fa12d13d9d296033… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Aug 17 12:55:16 2015 +0200 d2d1: Print a WARN instead of a FIXME for the glyph run description in d2d_text_renderer_DrawGlyphRun(). The glyph run description seems to be mostly informational, there doesn't appear to be a lot we could do with it. --- dlls/d2d1/render_target.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index c45768f..c6bce45 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -1446,7 +1446,7 @@ static HRESULT STDMETHODCALLTYPE d2d_text_renderer_DrawGlyphRun(IDWriteTextRende measuring_mode, glyph_run, desc, effect); if (desc) - FIXME("Ignoring glyph run description %p.\n", desc); + WARN("Ignoring glyph run description %p.\n", desc); if (effect) FIXME("Ignoring effect %p.\n", effect); if (context->options & ~D2D1_DRAW_TEXT_OPTIONS_NO_SNAP)

1 0

Henri Verbeet : d2d1: Only print a FIXME/ WARN for specific properties in d2d_factory_init().
by Alexandre Julliard 17 Aug '15

17 Aug '15

Module: wine Branch: master Commit: d29af2e460756e5dbf9a3ef611dd04ffe82bd5eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=d29af2e460756e5dbf9a3ef61… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Aug 17 12:55:15 2015 +0200 d2d1: Only print a FIXME/WARN for specific properties in d2d_factory_init(). --- dlls/d2d1/factory.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/d2d1/factory.c b/dlls/d2d1/factory.c index 0d15548..4cf9da5 100644 --- a/dlls/d2d1/factory.c +++ b/dlls/d2d1/factory.c @@ -310,7 +310,10 @@ static const struct ID2D1FactoryVtbl d2d_factory_vtbl = static void d2d_factory_init(struct d2d_factory *factory, D2D1_FACTORY_TYPE factory_type, const D2D1_FACTORY_OPTIONS *factory_options) { - FIXME("Ignoring factory type and options.\n"); + if (factory_type != D2D1_FACTORY_TYPE_SINGLE_THREADED) + FIXME("Ignoring factory type %#x.\n", factory_type); + if (factory_options && factory_options->debugLevel != D2D1_DEBUG_LEVEL_NONE) + WARN("Ignoring debug level %#x.\n", factory_options->debugLevel); factory->ID2D1Factory_iface.lpVtbl = &d2d_factory_vtbl; factory->refcount = 1;

1 0

Henri Verbeet : d2d1: Only print a FIXME/ WARN for specific properties in d2d_d3d_render_target_init().
by Alexandre Julliard 17 Aug '15

17 Aug '15

Module: wine Branch: master Commit: 3e0af5f1e041c234d794ba281869a5fd97779152 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e0af5f1e041c234d794ba281… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Aug 17 12:55:14 2015 +0200 d2d1: Only print a FIXME/WARN for specific properties in d2d_d3d_render_target_init(). --- dlls/d2d1/render_target.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index 263cb91..c45768f 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -1668,7 +1668,12 @@ HRESULT d2d_d3d_render_target_init(struct d2d_d3d_render_target *render_target, 0.0f, 0.0f, }; - FIXME("Ignoring render target properties.\n"); + if (desc->type != D2D1_RENDER_TARGET_TYPE_DEFAULT && desc->type != D2D1_RENDER_TARGET_TYPE_HARDWARE) + WARN("Ignoring render target type %#x.\n", desc->type); + if (desc->usage != D2D1_RENDER_TARGET_USAGE_NONE) + FIXME("Ignoring render target usage %#x.\n", desc->usage); + if (desc->minLevel != D2D1_FEATURE_LEVEL_DEFAULT) + WARN("Ignoring feature level %#x.\n", desc->minLevel); render_target->ID2D1RenderTarget_iface.lpVtbl = &d2d_d3d_render_target_vtbl; render_target->IDWriteTextRenderer_iface.lpVtbl = &d2d_text_renderer_vtbl;

1 0

YongHao Hu : msvcp110: Add tr2_sys__Remove_dir_wchar implementation and test.
by Alexandre Julliard 17 Aug '15

17 Aug '15

Module: wine Branch: master Commit: 5b07326368816581c4adf478569f398366fc270a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b07326368816581c4adf4785… Author: YongHao Hu <christopherwuy(a)gmail.com> Date: Mon Aug 10 14:46:32 2015 +0800 msvcp110: Add tr2_sys__Remove_dir_wchar implementation and test. --- dlls/msvcp110/msvcp110.spec | 4 ++-- dlls/msvcp120/msvcp120.spec | 4 ++-- dlls/msvcp120/tests/msvcp120.c | 11 ++++++++--- dlls/msvcp120_app/msvcp120_app.spec | 4 ++-- dlls/msvcp90/ios.c | 8 ++++++++ 5 files changed, 22 insertions(+), 9 deletions(-) diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index c1c6212..fb22ca1 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -1720,8 +1720,8 @@ @ stub -arch=win64 ?_Release@_Pad@std@@QEAAXXZ @ cdecl -arch=win32 ?_Remove_dir@sys@tr2@std@@YA_NPBD@Z(str) tr2_sys__Remove_dir @ cdecl -arch=win64 ?_Remove_dir@sys@tr2@std@@YA_NPEBD@Z(str) tr2_sys__Remove_dir -@ stub -arch=win32 ?_Remove_dir@sys@tr2@std@@YA_NPB_W@Z -@ stub -arch=win64 ?_Remove_dir@sys@tr2@std@@YA_NPEB_W@Z +@ cdecl -arch=win32 ?_Remove_dir@sys@tr2@std@@YA_NPB_W@Z(wstr) tr2_sys__Remove_dir_wchar +@ cdecl -arch=win64 ?_Remove_dir@sys@tr2@std@@YA_NPEB_W@Z(wstr) tr2_sys__Remove_dir_wchar @ cdecl -arch=win32 ?_Rename@sys@tr2@std@@YAHPBD0@Z(str str) tr2_sys__Rename @ cdecl -arch=win64 ?_Rename@sys@tr2@std@@YAHPEBD0@Z(str str) tr2_sys__Rename @ stub -arch=win32 ?_Rename@sys@tr2@std@@YAHPB_W0@Z diff --git a/dlls/msvcp120/msvcp120.spec b/dlls/msvcp120/msvcp120.spec index e990eaf..8a7b6d7 100644 --- a/dlls/msvcp120/msvcp120.spec +++ b/dlls/msvcp120/msvcp120.spec @@ -1681,8 +1681,8 @@ @ stub -arch=win64 ?_Release@_Pad@std@@QEAAXXZ @ cdecl -arch=win32 ?_Remove_dir@sys@tr2@std@@YA_NPBD@Z(str) tr2_sys__Remove_dir @ cdecl -arch=win64 ?_Remove_dir@sys@tr2@std@@YA_NPEBD@Z(str) tr2_sys__Remove_dir -@ stub -arch=win32 ?_Remove_dir@sys@tr2@std@@YA_NPB_W@Z -@ stub -arch=win64 ?_Remove_dir@sys@tr2@std@@YA_NPEB_W@Z +@ cdecl -arch=win32 ?_Remove_dir@sys@tr2@std@@YA_NPB_W@Z(wstr) tr2_sys__Remove_dir_wchar +@ cdecl -arch=win64 ?_Remove_dir@sys@tr2@std@@YA_NPEB_W@Z(wstr) tr2_sys__Remove_dir_wchar @ cdecl -arch=win32 ?_Rename@sys@tr2@std@@YAHPBD0@Z(str str) tr2_sys__Rename @ cdecl -arch=win64 ?_Rename@sys@tr2@std@@YAHPEBD0@Z(str str) tr2_sys__Rename @ stub -arch=win32 ?_Rename@sys@tr2@std@@YAHPB_W0@Z diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c index 85e9354..6bbe11e 100644 --- a/dlls/msvcp120/tests/msvcp120.c +++ b/dlls/msvcp120/tests/msvcp120.c @@ -83,6 +83,7 @@ static MSVCP_bool (__cdecl *p_tr2_sys__Current_set_wchar)(WCHAR const*); static int (__cdecl *p_tr2_sys__Make_dir)(char const*); static int (__cdecl *p_tr2_sys__Make_dir_wchar)(WCHAR const*); static MSVCP_bool (__cdecl *p_tr2_sys__Remove_dir)(char const*); +static MSVCP_bool (__cdecl *p_tr2_sys__Remove_dir_wchar)(WCHAR const*); static int (__cdecl *p_tr2_sys__Copy_file)(char const*, char const*, MSVCP_bool); static int (__cdecl *p_tr2_sys__Rename)(char const*, char const*); static struct space_info (__cdecl *p_tr2_sys__Statvfs)(char const*); @@ -138,6 +139,8 @@ static BOOL init(void) "?_Make_dir@sys@tr2@std@@YAHPEB_W@Z"); SET(p_tr2_sys__Remove_dir, "?_Remove_dir@sys@tr2@std@@YA_NPEBD@Z"); + SET(p_tr2_sys__Remove_dir_wchar, + "?_Remove_dir@sys@tr2@std@@YA_NPEB_W@Z"); SET(p_tr2_sys__Copy_file, "?_Copy_file@sys@tr2@std@@YAHPEBD0_N@Z"); SET(p_tr2_sys__Rename, @@ -171,6 +174,8 @@ static BOOL init(void) "?_Make_dir@sys@tr2@std@@YAHPB_W@Z"); SET(p_tr2_sys__Remove_dir, "?_Remove_dir@sys@tr2@std@@YA_NPBD@Z"); + SET(p_tr2_sys__Remove_dir_wchar, + "?_Remove_dir@sys@tr2@std@@YA_NPB_W@Z"); SET(p_tr2_sys__Copy_file, "?_Copy_file@sys@tr2@std@@YAHPBD0_N@Z"); SET(p_tr2_sys__Rename, @@ -427,7 +432,7 @@ static void test_tr2_sys__File_size(void) ok(DeleteFileA("tr2_test_dir/f1"), "expect tr2_test_dir/f1 to exist\n"); ok(DeleteFileA("tr2_test_dir/f2"), "expect tr2_test_dir/f2 to exist\n"); - ok(RemoveDirectoryA("tr2_test_dir"), "expect tr2_test_dir to exist\n"); + ok(p_tr2_sys__Remove_dir("tr2_test_dir"), "expect tr2_test_dir to exist\n"); } static void test_tr2_sys__Equivalent(void) @@ -586,8 +591,8 @@ static void test_tr2_sys__Make_dir(void) ret = p_tr2_sys__Make_dir_wchar(testW); ok(ret == 1, "tr2_sys__Make_dir(): expect: 1, got %d\n", ret); - ok(RemoveDirectoryA("tr2_test_dir"), "expect tr2_test_dir to exist\n"); - ok(RemoveDirectoryW(testW), "expect wd to exist\n"); + ok(p_tr2_sys__Remove_dir("tr2_test_dir"), "expect tr2_test_dir to exist\n"); + ok(p_tr2_sys__Remove_dir_wchar(testW), "expect wd to exist\n"); } static void test_tr2_sys__Remove_dir(void) diff --git a/dlls/msvcp120_app/msvcp120_app.spec b/dlls/msvcp120_app/msvcp120_app.spec index b20d507..d05b3d4 100644 --- a/dlls/msvcp120_app/msvcp120_app.spec +++ b/dlls/msvcp120_app/msvcp120_app.spec @@ -1681,8 +1681,8 @@ @ stub -arch=win64 ?_Release@_Pad@std@@QEAAXXZ @ cdecl -arch=win32 ?_Remove_dir@sys@tr2@std@@YA_NPBD@Z(str) msvcp120.?_Remove_dir@sys@tr2@std@@YA_NPBD@Z @ cdecl -arch=win64 ?_Remove_dir@sys@tr2@std@@YA_NPEBD@Z(str) msvcp120.?_Remove_dir@sys@tr2@std@@YA_NPEBD@Z -@ stub -arch=win32 ?_Remove_dir@sys@tr2@std@@YA_NPB_W@Z -@ stub -arch=win64 ?_Remove_dir@sys@tr2@std@@YA_NPEB_W@Z +@ cdecl -arch=win32 ?_Remove_dir@sys@tr2@std@@YA_NPB_W@Z(wstr) msvcp120.?_Remove_dir@sys@tr2@std@@YA_NPB_W@Z +@ cdecl -arch=win64 ?_Remove_dir@sys@tr2@std@@YA_NPEB_W@Z(wstr) msvcp120.?_Remove_dir@sys@tr2@std@@YA_NPEB_W@Z @ cdecl -arch=win32 ?_Rename@sys@tr2@std@@YAHPBD0@Z(str str) msvcp120.?_Rename@sys@tr2@std@@YAHPBD0@Z @ cdecl -arch=win64 ?_Rename@sys@tr2@std@@YAHPEBD0@Z(str str) msvcp120.?_Rename@sys@tr2@std@@YAHPEBD0@Z @ stub -arch=win32 ?_Rename@sys@tr2@std@@YAHPB_W0@Z diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index c01d187..88d6453 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -14825,6 +14825,14 @@ int __cdecl tr2_sys__Make_dir_wchar(WCHAR const* path) return 1; } +/* ?_Remove_dir@sys@tr2@std@@YA_NPB_W@Z */ +/* ?_Remove_dir@sys@tr2@std@@YA_NPEB_W@Z */ +MSVCP_bool __cdecl tr2_sys__Remove_dir_wchar(WCHAR const* path) +{ + TRACE("(%s)\n", debugstr_w(path)); + return RemoveDirectoryW(path) != 0; +} + /* ??1_Winit@std@@QAE@XZ */ /* ??1_Winit@std@@QAE@XZ */ DEFINE_THISCALL_WRAPPER(_Winit_dtor, 4)

1 0

YongHao Hu : msvcp110: Add tr2_sys__Make_dir_wchar implementation and test.
by Alexandre Julliard 17 Aug '15

17 Aug '15

Module: wine Branch: master Commit: 2b19569958f5b00fe3e60ccf29dfce88dc28033a URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b19569958f5b00fe3e60ccf2… Author: YongHao Hu <christopherwuy(a)gmail.com> Date: Mon Aug 10 14:45:57 2015 +0800 msvcp110: Add tr2_sys__Make_dir_wchar implementation and test. --- dlls/msvcp110/msvcp110.spec | 4 ++-- dlls/msvcp120/msvcp120.spec | 4 ++-- dlls/msvcp120/tests/msvcp120.c | 11 ++++++++++- dlls/msvcp120_app/msvcp120_app.spec | 4 ++-- dlls/msvcp90/ios.c | 16 ++++++++++++++++ 5 files changed, 32 insertions(+), 7 deletions(-) diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index ff513b3..c1c6212 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -1619,8 +1619,8 @@ @ stub -arch=win64 ?_MP_Rem@std@@YAXQEA_K_K@Z @ cdecl -arch=win32 ?_Make_dir@sys@tr2@std@@YAHPBD@Z(str) tr2_sys__Make_dir @ cdecl -arch=win64 ?_Make_dir@sys@tr2@std@@YAHPEBD@Z(str) tr2_sys__Make_dir -@ stub -arch=win32 ?_Make_dir@sys@tr2@std@@YAHPB_W@Z -@ stub -arch=win64 ?_Make_dir@sys@tr2@std@@YAHPEB_W@Z +@ cdecl -arch=win32 ?_Make_dir@sys@tr2@std@@YAHPB_W@Z(wstr) tr2_sys__Make_dir_wchar +@ cdecl -arch=win64 ?_Make_dir@sys@tr2@std@@YAHPEB_W@Z(wstr) tr2_sys__Make_dir_wchar @ cdecl -arch=win32 ?_Makeloc@_Locimp@locale@std@@CAPAV123@ABV_Locinfo@3@HPAV123@PBV23@@Z(ptr long ptr ptr) locale__Locimp__Makeloc @ cdecl -arch=win64 ?_Makeloc@_Locimp@locale@std@@CAPEAV123@AEBV_Locinfo@3@HPEAV123@PEBV23@@Z(ptr long ptr ptr) locale__Locimp__Makeloc @ cdecl -arch=win32 ?_Makeushloc@_Locimp@locale@std@@CAXABV_Locinfo@3@HPAV123@PBV23@@Z(ptr long ptr ptr) locale__Locimp__Makeushloc diff --git a/dlls/msvcp120/msvcp120.spec b/dlls/msvcp120/msvcp120.spec index 8348a3f..e990eaf 100644 --- a/dlls/msvcp120/msvcp120.spec +++ b/dlls/msvcp120/msvcp120.spec @@ -1580,8 +1580,8 @@ @ stub -arch=win64 ?_MP_Rem@std@@YAXQEA_K_K@Z @ cdecl -arch=win32 ?_Make_dir@sys@tr2@std@@YAHPBD@Z(str) tr2_sys__Make_dir @ cdecl -arch=win64 ?_Make_dir@sys@tr2@std@@YAHPEBD@Z(str) tr2_sys__Make_dir -@ stub -arch=win32 ?_Make_dir@sys@tr2@std@@YAHPB_W@Z -@ stub -arch=win64 ?_Make_dir@sys@tr2@std@@YAHPEB_W@Z +@ cdecl -arch=win32 ?_Make_dir@sys@tr2@std@@YAHPB_W@Z(wstr) tr2_sys__Make_dir_wchar +@ cdecl -arch=win64 ?_Make_dir@sys@tr2@std@@YAHPEB_W@Z(wstr) tr2_sys__Make_dir_wchar @ cdecl -arch=win32 ?_Makeloc@_Locimp@locale@std@@CAPAV123@ABV_Locinfo@3@HPAV123@PBV23@@Z(ptr long ptr ptr) locale__Locimp__Makeloc @ cdecl -arch=win64 ?_Makeloc@_Locimp@locale@std@@CAPEAV123@AEBV_Locinfo@3@HPEAV123@PEBV23@@Z(ptr long ptr ptr) locale__Locimp__Makeloc @ cdecl -arch=win32 ?_Makeushloc@_Locimp@locale@std@@CAXABV_Locinfo@3@HPAV123@PBV23@@Z(ptr long ptr ptr) locale__Locimp__Makeushloc diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c index 07277b3..85e9354 100644 --- a/dlls/msvcp120/tests/msvcp120.c +++ b/dlls/msvcp120/tests/msvcp120.c @@ -81,6 +81,7 @@ static WCHAR* (__cdecl *p_tr2_sys__Current_get_wchar)(WCHAR *); static MSVCP_bool (__cdecl *p_tr2_sys__Current_set)(char const*); static MSVCP_bool (__cdecl *p_tr2_sys__Current_set_wchar)(WCHAR const*); static int (__cdecl *p_tr2_sys__Make_dir)(char const*); +static int (__cdecl *p_tr2_sys__Make_dir_wchar)(WCHAR const*); static MSVCP_bool (__cdecl *p_tr2_sys__Remove_dir)(char const*); static int (__cdecl *p_tr2_sys__Copy_file)(char const*, char const*, MSVCP_bool); static int (__cdecl *p_tr2_sys__Rename)(char const*, char const*); @@ -133,6 +134,8 @@ static BOOL init(void) "?_Current_set@sys@tr2@std@@YA_NPEB_W@Z"); SET(p_tr2_sys__Make_dir, "?_Make_dir@sys@tr2@std@@YAHPEBD@Z"); + SET(p_tr2_sys__Make_dir_wchar, + "?_Make_dir@sys@tr2@std@@YAHPEB_W@Z"); SET(p_tr2_sys__Remove_dir, "?_Remove_dir@sys@tr2@std@@YA_NPEBD@Z"); SET(p_tr2_sys__Copy_file, @@ -164,6 +167,8 @@ static BOOL init(void) "?_Current_set@sys@tr2@std@@YA_NPB_W@Z"); SET(p_tr2_sys__Make_dir, "?_Make_dir@sys@tr2@std@@YAHPBD@Z"); + SET(p_tr2_sys__Make_dir_wchar, + "?_Make_dir@sys@tr2@std@@YAHPB_W@Z"); SET(p_tr2_sys__Remove_dir, "?_Remove_dir@sys@tr2@std@@YA_NPBD@Z"); SET(p_tr2_sys__Copy_file, @@ -561,6 +566,7 @@ static void test_tr2_sys__Current_set(void) static void test_tr2_sys__Make_dir(void) { int ret, i; + WCHAR testW[] = {'w','d',0}; struct { char const *path; int val; @@ -577,8 +583,11 @@ static void test_tr2_sys__Make_dir(void) ok(ret == tests[i].val, "tr2_sys__Make_dir(): test %d expect: %d, got %d\n", i+1, tests[i].val, ret); ok(errno == 0xdeadbeef, "tr2_sys__Make_dir(): test %d errno expect 0xdeadbeef, got %d\n", i+1, errno); } + ret = p_tr2_sys__Make_dir_wchar(testW); + ok(ret == 1, "tr2_sys__Make_dir(): expect: 1, got %d\n", ret); - ok(RemoveDirectoryA("tr2_test_dir"), "Expected tr2_test_dir to exist\n"); + ok(RemoveDirectoryA("tr2_test_dir"), "expect tr2_test_dir to exist\n"); + ok(RemoveDirectoryW(testW), "expect wd to exist\n"); } static void test_tr2_sys__Remove_dir(void) diff --git a/dlls/msvcp120_app/msvcp120_app.spec b/dlls/msvcp120_app/msvcp120_app.spec index 697c83c..b20d507 100644 --- a/dlls/msvcp120_app/msvcp120_app.spec +++ b/dlls/msvcp120_app/msvcp120_app.spec @@ -1580,8 +1580,8 @@ @ stub -arch=win64 ?_MP_Rem@std@@YAXQEA_K_K@Z @ cdecl -arch=win32 ?_Make_dir@sys@tr2@std@@YAHPBD@Z(str) msvcp120.?_Make_dir@sys@tr2@std@@YAHPBD@Z @ cdecl -arch=win64 ?_Make_dir@sys@tr2@std@@YAHPEBD@Z(str) msvcp120.?_Make_dir@sys@tr2@std@@YAHPEBD@Z -@ stub -arch=win32 ?_Make_dir@sys@tr2@std@@YAHPB_W@Z -@ stub -arch=win64 ?_Make_dir@sys@tr2@std@@YAHPEB_W@Z +@ cdecl -arch=win32 ?_Make_dir@sys@tr2@std@@YAHPB_W@Z(wstr) msvcp120.?_Make_dir@sys@tr2@std@@YAHPB_W@Z +@ cdecl -arch=win64 ?_Make_dir@sys@tr2@std@@YAHPEB_W@Z(wstr) msvcp120.?_Make_dir@sys@tr2@std@@YAHPEB_W@Z @ cdecl -arch=win32 ?_Makeloc@_Locimp@locale@std@@CAPAV123@ABV_Locinfo@3@HPAV123@PBV23@@Z(ptr long ptr ptr) msvcp120.?_Makeloc@_Locimp@locale@std@@CAPAV123@ABV_Locinfo@3@HPAV123@PBV23@@Z @ cdecl -arch=win64 ?_Makeloc@_Locimp@locale@std@@CAPEAV123@AEBV_Locinfo@3@HPEAV123@PEBV23@@Z(ptr long ptr ptr) msvcp120.?_Makeloc@_Locimp@locale@std@@CAPEAV123@AEBV_Locinfo@3@HPEAV123@PEBV23@@Z @ cdecl -arch=win32 ?_Makeushloc@_Locimp@locale@std@@CAXABV_Locinfo@3@HPAV123@PBV23@@Z(ptr long ptr ptr) msvcp120.?_Makeushloc@_Locimp@locale@std@@CAXABV_Locinfo@3@HPAV123@PBV23@@Z diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 458e6de..c01d187 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -14809,6 +14809,22 @@ MSVCP_bool __cdecl tr2_sys__Current_set_wchar(WCHAR const* path) return SetCurrentDirectoryW(path) != 0; } +/* ?_Make_dir@sys@tr2@std@@YAHPB_W@Z */ +/* ?_Make_dir@sys@tr2@std@@YAHPEB_W@Z */ +int __cdecl tr2_sys__Make_dir_wchar(WCHAR const* path) +{ + TRACE("(%s)\n", debugstr_w(path)); + + if(!CreateDirectoryW(path, NULL)) { + if(GetLastError() == ERROR_ALREADY_EXISTS) + return 0; + else + return -1; + } + + return 1; +} + /* ??1_Winit@std@@QAE@XZ */ /* ??1_Winit@std@@QAE@XZ */ DEFINE_THISCALL_WRAPPER(_Winit_dtor, 4)

1 0

YongHao Hu : msvcp110: Add tr2_sys__Current_set_wchar implementation and test.
by Alexandre Julliard 17 Aug '15

17 Aug '15

Module: wine Branch: master Commit: e55149f8ae6cec76bf910e9e3e37b0457357394a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e55149f8ae6cec76bf910e9e3… Author: YongHao Hu <christopherwuy(a)gmail.com> Date: Mon Aug 10 14:45:28 2015 +0800 msvcp110: Add tr2_sys__Current_set_wchar implementation and test. --- dlls/msvcp110/msvcp110.spec | 4 ++-- dlls/msvcp120/msvcp120.spec | 4 ++-- dlls/msvcp120/tests/msvcp120.c | 8 +++++++- dlls/msvcp120_app/msvcp120_app.spec | 4 ++-- dlls/msvcp90/ios.c | 8 ++++++++ 5 files changed, 21 insertions(+), 7 deletions(-) diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index 02d80f9..ff513b3 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -1173,8 +1173,8 @@ @ cdecl -arch=win64 ?_Current_get@sys@tr2@std@@YAPEA_WPEA_W@Z(ptr) tr2_sys__Current_get_wchar @ cdecl -arch=win32 ?_Current_set@sys@tr2@std@@YA_NPBD@Z(str) tr2_sys__Current_set @ cdecl -arch=win64 ?_Current_set@sys@tr2@std@@YA_NPEBD@Z(str) tr2_sys__Current_set -@ stub -arch=win32 ?_Current_set@sys@tr2@std@@YA_NPB_W@Z -@ stub -arch=win64 ?_Current_set@sys@tr2@std@@YA_NPEB_W@Z +@ cdecl -arch=win32 ?_Current_set@sys@tr2@std@@YA_NPB_W@Z(wstr) tr2_sys__Current_set_wchar +@ cdecl -arch=win64 ?_Current_set@sys@tr2@std@@YA_NPEB_W@Z(wstr) tr2_sys__Current_set_wchar @ cdecl -arch=arm ?_Decref@facet@locale@std@@UAAPAV_Facet_base@3@XZ(ptr) locale_facet__Decref @ thiscall -arch=i386 ?_Decref@facet@locale@std@@UAEPAV_Facet_base@3@XZ(ptr) locale_facet__Decref @ cdecl -arch=win64 ?_Decref@facet@locale@std@@UEAAPEAV_Facet_base@3@XZ(ptr) locale_facet__Decref diff --git a/dlls/msvcp120/msvcp120.spec b/dlls/msvcp120/msvcp120.spec index d431268..8348a3f 100644 --- a/dlls/msvcp120/msvcp120.spec +++ b/dlls/msvcp120/msvcp120.spec @@ -1138,8 +1138,8 @@ @ cdecl -arch=win64 ?_Current_get@sys@tr2@std@@YAPEA_WAEAY0BAE@_W@Z(ptr) tr2_sys__Current_get_wchar @ cdecl -arch=win32 ?_Current_set@sys@tr2@std@@YA_NPBD@Z(str) tr2_sys__Current_set @ cdecl -arch=win64 ?_Current_set@sys@tr2@std@@YA_NPEBD@Z(str) tr2_sys__Current_set -@ stub -arch=win32 ?_Current_set@sys@tr2@std@@YA_NPB_W@Z -@ stub -arch=win64 ?_Current_set@sys@tr2@std@@YA_NPEB_W@Z +@ cdecl -arch=win32 ?_Current_set@sys@tr2@std@@YA_NPB_W@Z(wstr) tr2_sys__Current_set_wchar +@ cdecl -arch=win64 ?_Current_set@sys@tr2@std@@YA_NPEB_W@Z(wstr) tr2_sys__Current_set_wchar @ cdecl -arch=arm ?_Decref@facet@locale@std@@UAAPAV_Facet_base@3@XZ(ptr) locale_facet__Decref @ thiscall -arch=i386 ?_Decref@facet@locale@std@@UAEPAV_Facet_base@3@XZ(ptr) locale_facet__Decref @ cdecl -arch=win64 ?_Decref@facet@locale@std@@UEAAPEAV_Facet_base@3@XZ(ptr) locale_facet__Decref diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c index a81c928..07277b3 100644 --- a/dlls/msvcp120/tests/msvcp120.c +++ b/dlls/msvcp120/tests/msvcp120.c @@ -79,6 +79,7 @@ static int (__cdecl *p_tr2_sys__Equivalent_wchar)(WCHAR const*, WCHAR const*); static char* (__cdecl *p_tr2_sys__Current_get)(char *); static WCHAR* (__cdecl *p_tr2_sys__Current_get_wchar)(WCHAR *); static MSVCP_bool (__cdecl *p_tr2_sys__Current_set)(char const*); +static MSVCP_bool (__cdecl *p_tr2_sys__Current_set_wchar)(WCHAR const*); static int (__cdecl *p_tr2_sys__Make_dir)(char const*); static MSVCP_bool (__cdecl *p_tr2_sys__Remove_dir)(char const*); static int (__cdecl *p_tr2_sys__Copy_file)(char const*, char const*, MSVCP_bool); @@ -128,6 +129,8 @@ static BOOL init(void) "?_Current_get@sys@tr2@std@@YAPEA_WAEAY0BAE@_W@Z"); SET(p_tr2_sys__Current_set, "?_Current_set@sys@tr2@std@@YA_NPEBD@Z"); + SET(p_tr2_sys__Current_set_wchar, + "?_Current_set@sys@tr2@std@@YA_NPEB_W@Z"); SET(p_tr2_sys__Make_dir, "?_Make_dir@sys@tr2@std@@YAHPEBD@Z"); SET(p_tr2_sys__Remove_dir, @@ -157,6 +160,8 @@ static BOOL init(void) "?_Current_get@sys@tr2@std@@YAPA_WAAY0BAE@_W@Z"); SET(p_tr2_sys__Current_set, "?_Current_set@sys@tr2@std@@YA_NPBD@Z"); + SET(p_tr2_sys__Current_set_wchar, + "?_Current_set@sys@tr2@std@@YA_NPB_W@Z"); SET(p_tr2_sys__Make_dir, "?_Make_dir@sys@tr2@std@@YAHPBD@Z"); SET(p_tr2_sys__Remove_dir, @@ -516,6 +521,7 @@ static void test_tr2_sys__Current_set(void) { char temp_path[MAX_PATH], current_path[MAX_PATH], origin_path[MAX_PATH]; char *temp; + WCHAR testW[] = {'.','/',0}; memset(temp_path, 0, MAX_PATH); GetTempPathA(MAX_PATH, temp_path); memset(origin_path, 0, MAX_PATH); @@ -530,7 +536,7 @@ static void test_tr2_sys__Current_set(void) temp[strlen(temp)] = '\\'; ok(!strcmp(temp_path, current_path), "test_tr2_sys__Current_get(): expect: %s, got %s\n", temp_path, current_path); - ok(p_tr2_sys__Current_set("./"), "p_tr2_sys__Current_set to temp_path failed\n"); + ok(p_tr2_sys__Current_set_wchar(testW), "p_tr2_sys__Current_set_wchar to temp_path failed\n"); memset(current_path, 0, MAX_PATH); temp = p_tr2_sys__Current_get(current_path); ok(temp == current_path, "p_tr2_sys__Current_get returned different buffer\n"); diff --git a/dlls/msvcp120_app/msvcp120_app.spec b/dlls/msvcp120_app/msvcp120_app.spec index 286b978..697c83c 100644 --- a/dlls/msvcp120_app/msvcp120_app.spec +++ b/dlls/msvcp120_app/msvcp120_app.spec @@ -1138,8 +1138,8 @@ @ cdecl -arch=win64 ?_Current_get@sys@tr2@std@@YAPEA_WAEAY0BAE@_W@Z(ptr) msvcp120.?_Current_get@sys@tr2@std@@YAPEA_WAEAY0BAE@_W@Z @ cdecl -arch=win32 ?_Current_set@sys@tr2@std@@YA_NPBD@Z(str) msvcp120.?_Current_set@sys@tr2@std@@YA_NPBD@Z @ cdecl -arch=win64 ?_Current_set@sys@tr2@std@@YA_NPEBD@Z(str) msvcp120.?_Current_set@sys@tr2@std@@YA_NPEBD@Z -@ stub -arch=win32 ?_Current_set@sys@tr2@std@@YA_NPB_W@Z -@ stub -arch=win64 ?_Current_set@sys@tr2@std@@YA_NPEB_W@Z +@ cdecl -arch=win32 ?_Current_set@sys@tr2@std@@YA_NPB_W@Z(wstr) msvcp120.?_Current_set@sys@tr2@std@@YA_NPB_W@Z +@ cdecl -arch=win64 ?_Current_set@sys@tr2@std@@YA_NPEB_W@Z(wstr) msvcp120.?_Current_set@sys@tr2@std@@YA_NPEB_W@Z @ cdecl -arch=arm ?_Decref@facet@locale@std@@UAAPAV_Facet_base@3@XZ(ptr) msvcp120.?_Decref@facet@locale@std@@UAAPAV_Facet_base@3@XZ @ thiscall -arch=i386 ?_Decref@facet@locale@std@@UAEPAV_Facet_base@3@XZ(ptr) msvcp120.?_Decref@facet@locale@std@@UAEPAV_Facet_base@3@XZ @ cdecl -arch=win64 ?_Decref@facet@locale@std@@UEAAPEAV_Facet_base@3@XZ(ptr) msvcp120.?_Decref@facet@locale@std@@UEAAPEAV_Facet_base@3@XZ diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 9056972..458e6de 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -14801,6 +14801,14 @@ WCHAR* __cdecl tr2_sys__Current_get_wchar(WCHAR *current_path) return current_path; } +/* ?_Current_set@sys@tr2@std@@YA_NPB_W@Z */ +/* ?_Current_set@sys@tr2@std@@YA_NPEB_W@Z */ +MSVCP_bool __cdecl tr2_sys__Current_set_wchar(WCHAR const* path) +{ + TRACE("(%s)\n", debugstr_w(path)); + return SetCurrentDirectoryW(path) != 0; +} + /* ??1_Winit@std@@QAE@XZ */ /* ??1_Winit@std@@QAE@XZ */ DEFINE_THISCALL_WRAPPER(_Winit_dtor, 4)

1 0

YongHao Hu : msvcp110: Add tr2_sys__Current_get_wchar implementation and test.
by Alexandre Julliard 17 Aug '15

17 Aug '15

Module: wine Branch: master Commit: ee77fc3b4ec9152698fbb6c0e4784c6e28dddea7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee77fc3b4ec9152698fbb6c0e… Author: YongHao Hu <christopherwuy(a)gmail.com> Date: Mon Aug 10 14:44:53 2015 +0800 msvcp110: Add tr2_sys__Current_get_wchar implementation and test. --- dlls/msvcp110/msvcp110.spec | 4 ++-- dlls/msvcp120/msvcp120.spec | 4 ++-- dlls/msvcp120/tests/msvcp120.c | 15 +++++++++++++++ dlls/msvcp120_app/msvcp120_app.spec | 4 ++-- dlls/msvcp90/ios.c | 11 +++++++++++ 5 files changed, 32 insertions(+), 6 deletions(-) diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index a245681..02d80f9 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -1169,8 +1169,8 @@ @ stub -arch=win64 ?_Copy_file@sys@tr2@std@@YAHPEB_W0_N@Z @ cdecl -arch=win32 ?_Current_get@sys@tr2@std@@YAPADPAD@Z(ptr) tr2_sys__Current_get @ cdecl -arch=win64 ?_Current_get@sys@tr2@std@@YAPEADPEAD@Z(ptr) tr2_sys__Current_get -@ stub -arch=win32 ?_Current_get@sys@tr2@std@@YAPA_WPA_W@Z -@ stub -arch=win64 ?_Current_get@sys@tr2@std@@YAPEA_WPEA_W@Z +@ cdecl -arch=win32 ?_Current_get@sys@tr2@std@@YAPA_WPA_W@Z(ptr) tr2_sys__Current_get_wchar +@ cdecl -arch=win64 ?_Current_get@sys@tr2@std@@YAPEA_WPEA_W@Z(ptr) tr2_sys__Current_get_wchar @ cdecl -arch=win32 ?_Current_set@sys@tr2@std@@YA_NPBD@Z(str) tr2_sys__Current_set @ cdecl -arch=win64 ?_Current_set@sys@tr2@std@@YA_NPEBD@Z(str) tr2_sys__Current_set @ stub -arch=win32 ?_Current_set@sys@tr2@std@@YA_NPB_W@Z diff --git a/dlls/msvcp120/msvcp120.spec b/dlls/msvcp120/msvcp120.spec index a0357de..d431268 100644 --- a/dlls/msvcp120/msvcp120.spec +++ b/dlls/msvcp120/msvcp120.spec @@ -1134,8 +1134,8 @@ @ stub -arch=win64 ?_Copy_file@sys@tr2@std@@YAHPEB_W0_N@Z @ cdecl -arch=win32 ?_Current_get@sys@tr2@std@@YAPADAAY0BAE@D@Z(ptr) tr2_sys__Current_get @ cdecl -arch=win64 ?_Current_get@sys@tr2@std@@YAPEADAEAY0BAE@D@Z(ptr) tr2_sys__Current_get -@ stub -arch=win32 ?_Current_get@sys@tr2@std@@YAPA_WAAY0BAE@_W@Z -@ stub -arch=win64 ?_Current_get@sys@tr2@std@@YAPEA_WAEAY0BAE@_W@Z +@ cdecl -arch=win32 ?_Current_get@sys@tr2@std@@YAPA_WAAY0BAE@_W@Z(ptr) tr2_sys__Current_get_wchar +@ cdecl -arch=win64 ?_Current_get@sys@tr2@std@@YAPEA_WAEAY0BAE@_W@Z(ptr) tr2_sys__Current_get_wchar @ cdecl -arch=win32 ?_Current_set@sys@tr2@std@@YA_NPBD@Z(str) tr2_sys__Current_set @ cdecl -arch=win64 ?_Current_set@sys@tr2@std@@YA_NPEBD@Z(str) tr2_sys__Current_set @ stub -arch=win32 ?_Current_set@sys@tr2@std@@YA_NPB_W@Z diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c index 9fca0c2..a81c928 100644 --- a/dlls/msvcp120/tests/msvcp120.c +++ b/dlls/msvcp120/tests/msvcp120.c @@ -77,6 +77,7 @@ static ULONGLONG(__cdecl *p_tr2_sys__File_size_wchar)(WCHAR const*); static int (__cdecl *p_tr2_sys__Equivalent)(char const*, char const*); static int (__cdecl *p_tr2_sys__Equivalent_wchar)(WCHAR const*, WCHAR const*); static char* (__cdecl *p_tr2_sys__Current_get)(char *); +static WCHAR* (__cdecl *p_tr2_sys__Current_get_wchar)(WCHAR *); static MSVCP_bool (__cdecl *p_tr2_sys__Current_set)(char const*); static int (__cdecl *p_tr2_sys__Make_dir)(char const*); static MSVCP_bool (__cdecl *p_tr2_sys__Remove_dir)(char const*); @@ -123,6 +124,8 @@ static BOOL init(void) "?_Equivalent@sys@tr2@std@@YAHPEB_W0@Z"); SET(p_tr2_sys__Current_get, "?_Current_get@sys@tr2@std@@YAPEADAEAY0BAE@D@Z"); + SET(p_tr2_sys__Current_get_wchar, + "?_Current_get@sys@tr2@std@@YAPEA_WAEAY0BAE@_W@Z"); SET(p_tr2_sys__Current_set, "?_Current_set@sys@tr2@std@@YA_NPEBD@Z"); SET(p_tr2_sys__Make_dir, @@ -150,6 +153,8 @@ static BOOL init(void) "?_Equivalent@sys@tr2@std@@YAHPB_W0@Z"); SET(p_tr2_sys__Current_get, "?_Current_get@sys@tr2@std@@YAPADAAY0BAE@D@Z"); + SET(p_tr2_sys__Current_get_wchar, + "?_Current_get@sys@tr2@std@@YAPA_WAAY0BAE@_W@Z"); SET(p_tr2_sys__Current_set, "?_Current_set@sys@tr2@std@@YA_NPBD@Z"); SET(p_tr2_sys__Make_dir, @@ -478,6 +483,8 @@ static void test_tr2_sys__Current_get(void) { char temp_path[MAX_PATH], current_path[MAX_PATH], origin_path[MAX_PATH]; char *temp; + WCHAR temp_path_wchar[MAX_PATH], current_path_wchar[MAX_PATH]; + WCHAR *temp_wchar; memset(origin_path, 0, MAX_PATH); GetCurrentDirectoryA(MAX_PATH, origin_path); memset(temp_path, 0, MAX_PATH); @@ -490,6 +497,14 @@ static void test_tr2_sys__Current_get(void) temp[strlen(temp)] = '\\'; ok(!strcmp(temp_path, current_path), "test_tr2_sys__Current_get(): expect: %s, got %s\n", temp_path, current_path); + GetTempPathW(MAX_PATH, temp_path_wchar); + ok(SetCurrentDirectoryW(temp_path_wchar), "SetCurrentDirectoryW to temp_path_wchar failed\n"); + memset(current_path_wchar, 0, MAX_PATH); + temp_wchar = p_tr2_sys__Current_get_wchar(current_path_wchar); + ok(temp_wchar == current_path_wchar, "p_tr2_sys__Current_get_wchar returned different buffer\n"); + temp_wchar[wcslen(temp_wchar)] = '\\'; + ok(!wcscmp(temp_path_wchar, current_path_wchar), "test_tr2_sys__Current_get(): expect: %s, got %s\n", wine_dbgstr_w(temp_path_wchar), wine_dbgstr_w(current_path_wchar)); + ok(SetCurrentDirectoryA(origin_path), "SetCurrentDirectoryA to origin_path failed\n"); memset(current_path, 0, MAX_PATH); temp = p_tr2_sys__Current_get(current_path); diff --git a/dlls/msvcp120_app/msvcp120_app.spec b/dlls/msvcp120_app/msvcp120_app.spec index 515ca2b..286b978 100644 --- a/dlls/msvcp120_app/msvcp120_app.spec +++ b/dlls/msvcp120_app/msvcp120_app.spec @@ -1134,8 +1134,8 @@ @ stub -arch=win64 ?_Copy_file@sys@tr2@std@@YAHPEB_W0_N@Z @ cdecl -arch=win32 ?_Current_get@sys@tr2@std@@YAPADAAY0BAE@D@Z(ptr) msvcp120.?_Current_get@sys@tr2@std@@YAPADAAY0BAE@D@Z @ cdecl -arch=win64 ?_Current_get@sys@tr2@std@@YAPEADAEAY0BAE@D@Z(ptr) msvcp120.?_Current_get@sys@tr2@std@@YAPEADAEAY0BAE@D@Z -@ stub -arch=win32 ?_Current_get@sys@tr2@std@@YAPA_WAAY0BAE@_W@Z -@ stub -arch=win64 ?_Current_get@sys@tr2@std@@YAPEA_WAEAY0BAE@_W@Z +@ cdecl -arch=win32 ?_Current_get@sys@tr2@std@@YAPA_WAAY0BAE@_W@Z(ptr) msvcp120.?_Current_get@sys@tr2@std@@YAPA_WAAY0BAE@_W@Z +@ cdecl -arch=win64 ?_Current_get@sys@tr2@std@@YAPEA_WAEAY0BAE@_W@Z(ptr) msvcp120.?_Current_get@sys@tr2@std@@YAPEA_WAEAY0BAE@_W@Z @ cdecl -arch=win32 ?_Current_set@sys@tr2@std@@YA_NPBD@Z(str) msvcp120.?_Current_set@sys@tr2@std@@YA_NPBD@Z @ cdecl -arch=win64 ?_Current_set@sys@tr2@std@@YA_NPEBD@Z(str) msvcp120.?_Current_set@sys@tr2@std@@YA_NPEBD@Z @ stub -arch=win32 ?_Current_set@sys@tr2@std@@YA_NPB_W@Z diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index af3f569..9056972 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -14790,6 +14790,17 @@ int __cdecl tr2_sys__Equivalent_wchar(WCHAR const* path1, WCHAR const* path2) ); } +/* ?_Current_get@sys@tr2@std@@YAPA_WAAY0BAE@_W@Z */ +/* ?_Current_get@sys@tr2@std@@YAPEA_WAEAY0BAE@_W@Z */ +WCHAR* __cdecl tr2_sys__Current_get_wchar(WCHAR *current_path) +{ + TRACE("(%s)\n", debugstr_w(current_path)); + + if(!GetCurrentDirectoryW(MAX_PATH, current_path)) + return NULL; + return current_path; +} + /* ??1_Winit@std@@QAE@XZ */ /* ??1_Winit@std@@QAE@XZ */ DEFINE_THISCALL_WRAPPER(_Winit_dtor, 4)

1 0

YongHao Hu : msvcp110: Add tr2_sys__Equivalent_wchar implementation and test.
by Alexandre Julliard 17 Aug '15

17 Aug '15

Module: wine Branch: master Commit: 70ac10affa98fcfd3a543abcf1c141c27e4fcff4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=70ac10affa98fcfd3a543abcf… Author: YongHao Hu <christopherwuy(a)gmail.com> Date: Mon Aug 10 14:38:34 2015 +0800 msvcp110: Add tr2_sys__Equivalent_wchar implementation and test. --- dlls/msvcp110/msvcp110.spec | 4 ++-- dlls/msvcp120/msvcp120.spec | 4 ++-- dlls/msvcp120/tests/msvcp120.c | 18 +++++++++++++++--- dlls/msvcp120_app/msvcp120_app.spec | 4 ++-- dlls/msvcp90/ios.c | 36 ++++++++++++++++++++++++++++++++++++ 5 files changed, 57 insertions(+), 9 deletions(-) diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index 858af32..a245681 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -1198,8 +1198,8 @@ @ cdecl -arch=win64 ?_Empty@?$_Yarn@_W@std@@QEBA_NXZ(ptr) _Yarn_wchar__Empty @ cdecl -arch=win32 ?_Equivalent@sys@tr2@std@@YAHPBD0@Z(str str) tr2_sys__Equivalent @ cdecl -arch=win64 ?_Equivalent@sys@tr2@std@@YAHPEBD0@Z(str str) tr2_sys__Equivalent -@ stub -arch=win32 ?_Equivalent@sys@tr2@std@@YAHPB_W0@Z -@ stub -arch=win64 ?_Equivalent@sys@tr2@std@@YAHPEB_W0@Z +@ cdecl -arch=win32 ?_Equivalent@sys@tr2@std@@YAHPB_W0@Z(wstr wstr) tr2_sys__Equivalent_wchar +@ cdecl -arch=win64 ?_Equivalent@sys@tr2@std@@YAHPEB_W0@Z(wstr wstr) tr2_sys__Equivalent_wchar @ cdecl -arch=win32 ?_Ffmt@?$num_put@DV?$ostreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@ABAPADPADDH@Z(ptr ptr long long) num_put_char__Ffmt @ cdecl -arch=win64 ?_Ffmt@?$num_put@DV?$ostreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@AEBAPEADPEADDH@Z(ptr ptr long long) num_put_char__Ffmt @ cdecl -arch=win32 ?_Ffmt@?$num_put@GV?$ostreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@ABAPADPADDH@Z(ptr ptr long long) num_put_wchar__Ffmt diff --git a/dlls/msvcp120/msvcp120.spec b/dlls/msvcp120/msvcp120.spec index 430690c..a0357de 100644 --- a/dlls/msvcp120/msvcp120.spec +++ b/dlls/msvcp120/msvcp120.spec @@ -1163,8 +1163,8 @@ @ cdecl -arch=win64 ?_Empty@?$_Yarn@_W@std@@QEBA_NXZ(ptr) _Yarn_wchar__Empty @ cdecl -arch=win32 ?_Equivalent@sys@tr2@std@@YAHPBD0@Z(str str) tr2_sys__Equivalent @ cdecl -arch=win64 ?_Equivalent@sys@tr2@std@@YAHPEBD0@Z(str str) tr2_sys__Equivalent -@ stub -arch=win32 ?_Equivalent@sys@tr2@std@@YAHPB_W0@Z -@ stub -arch=win64 ?_Equivalent@sys@tr2@std@@YAHPEB_W0@Z +@ cdecl -arch=win32 ?_Equivalent@sys@tr2@std@@YAHPB_W0@Z(wstr wstr) tr2_sys__Equivalent_wchar +@ cdecl -arch=win64 ?_Equivalent@sys@tr2@std@@YAHPEB_W0@Z(wstr wstr) tr2_sys__Equivalent_wchar @ cdecl -arch=win32 ?_Ffmt@?$num_put@DV?$ostreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@ABAPADPADDH@Z(ptr ptr long long) num_put_char__Ffmt @ cdecl -arch=win64 ?_Ffmt@?$num_put@DV?$ostreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@AEBAPEADPEADDH@Z(ptr ptr long long) num_put_char__Ffmt @ cdecl -arch=win32 ?_Ffmt@?$num_put@GV?$ostreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@ABAPADPADDH@Z(ptr ptr long long) num_put_wchar__Ffmt diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c index f2fdd92..9fca0c2 100644 --- a/dlls/msvcp120/tests/msvcp120.c +++ b/dlls/msvcp120/tests/msvcp120.c @@ -75,6 +75,7 @@ static void (CDECL *p__Do_call)(void *this); static ULONGLONG(__cdecl *p_tr2_sys__File_size)(char const*); static ULONGLONG(__cdecl *p_tr2_sys__File_size_wchar)(WCHAR const*); static int (__cdecl *p_tr2_sys__Equivalent)(char const*, char const*); +static int (__cdecl *p_tr2_sys__Equivalent_wchar)(WCHAR const*, WCHAR const*); static char* (__cdecl *p_tr2_sys__Current_get)(char *); static MSVCP_bool (__cdecl *p_tr2_sys__Current_set)(char const*); static int (__cdecl *p_tr2_sys__Make_dir)(char const*); @@ -118,6 +119,8 @@ static BOOL init(void) "?_File_size@sys@tr2@std@@YA_KPEB_W@Z"); SET(p_tr2_sys__Equivalent, "?_Equivalent@sys@tr2@std@@YAHPEBD0@Z"); + SET(p_tr2_sys__Equivalent_wchar, + "?_Equivalent@sys@tr2@std@@YAHPEB_W0@Z"); SET(p_tr2_sys__Current_get, "?_Current_get@sys@tr2@std@@YAPEADAEAY0BAE@D@Z"); SET(p_tr2_sys__Current_set, @@ -143,6 +146,8 @@ static BOOL init(void) "?_File_size@sys@tr2@std@@YA_KPB_W@Z"); SET(p_tr2_sys__Equivalent, "?_Equivalent@sys@tr2@std@@YAHPBD0@Z"); + SET(p_tr2_sys__Equivalent_wchar, + "?_Equivalent@sys@tr2@std@@YAHPB_W0@Z"); SET(p_tr2_sys__Current_get, "?_Current_get@sys@tr2@std@@YAPADAAY0BAE@D@Z"); SET(p_tr2_sys__Current_set, @@ -415,6 +420,8 @@ static void test_tr2_sys__Equivalent(void) int val, i; HANDLE file; char temp_path[MAX_PATH], current_path[MAX_PATH]; + WCHAR testW[] = {'t','r','2','_','t','e','s','t','_','d','i','r','/','f','1',0}; + WCHAR testW2[] = {'t','r','2','_','t','e','s','t','_','d','i','r','/','f','2',0}; struct { char const *path1; char const *path2; @@ -456,9 +463,14 @@ static void test_tr2_sys__Equivalent(void) ok(errno == 0xdeadbeef, "errno = %d\n", errno); } - ok(DeleteFileA("tr2_test_dir/f1"), "Expected tr2_test_dir/f1 to exist\n"); - ok(DeleteFileA("tr2_test_dir/f2"), "Expected tr2_test_dir/f2 to exist\n"); - ok(RemoveDirectoryA("tr2_test_dir"), "Expected tr2_test_dir to exist\n"); + val = p_tr2_sys__Equivalent_wchar(testW, testW); + ok(val == 1, "tr2_sys__Equivalent(): expect: 1, got %d\n", val); + val = p_tr2_sys__Equivalent_wchar(testW, testW2); + ok(val == 0, "tr2_sys__Equivalent(): expect: 0, got %d\n", val); + + ok(DeleteFileA("tr2_test_dir/f1"), "expect tr2_test_dir/f1 to exist\n"); + ok(DeleteFileA("tr2_test_dir/f2"), "expect tr2_test_dir/f2 to exist\n"); + ok(p_tr2_sys__Remove_dir("tr2_test_dir"), "expect tr2_test_dir to exist\n"); ok(SetCurrentDirectoryA(current_path), "SetCurrentDirectoryA failed\n"); } diff --git a/dlls/msvcp120_app/msvcp120_app.spec b/dlls/msvcp120_app/msvcp120_app.spec index 04585c1..515ca2b 100644 --- a/dlls/msvcp120_app/msvcp120_app.spec +++ b/dlls/msvcp120_app/msvcp120_app.spec @@ -1163,8 +1163,8 @@ @ cdecl -arch=win64 ?_Empty@?$_Yarn@_W@std@@QEBA_NXZ(ptr) msvcp120.?_Empty@?$_Yarn@_W@std@@QEBA_NXZ @ cdecl -arch=win32 ?_Equivalent@sys@tr2@std@@YAHPBD0@Z(str str) msvcp120.?_Equivalent@sys@tr2@std@@YAHPBD0@Z @ cdecl -arch=win64 ?_Equivalent@sys@tr2@std@@YAHPEBD0@Z(str str) msvcp120.?_Equivalent@sys@tr2@std@@YAHPEBD0@Z -@ stub -arch=win32 ?_Equivalent@sys@tr2@std@@YAHPB_W0@Z -@ stub -arch=win64 ?_Equivalent@sys@tr2@std@@YAHPEB_W0@Z +@ cdecl -arch=win32 ?_Equivalent@sys@tr2@std@@YAHPB_W0@Z(wstr wstr) msvcp120.?_Equivalent@sys@tr2@std@@YAHPB_W0@Z +@ cdecl -arch=win64 ?_Equivalent@sys@tr2@std@@YAHPEB_W0@Z(wstr wstr) msvcp120.?_Equivalent@sys@tr2@std@@YAHPEB_W0@Z @ cdecl -arch=win32 ?_Ffmt@?$num_put@DV?$ostreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@ABAPADPADDH@Z(ptr ptr long long) msvcp120.?_Ffmt@?$num_put@DV?$ostreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@ABAPADPADDH@Z @ cdecl -arch=win64 ?_Ffmt@?$num_put@DV?$ostreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@AEBAPEADPEADDH@Z(ptr ptr long long) msvcp120.?_Ffmt@?$num_put@DV?$ostreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@AEBAPEADPEADDH@Z @ cdecl -arch=win32 ?_Ffmt@?$num_put@GV?$ostreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@ABAPADPADDH@Z(ptr ptr long long) msvcp120.?_Ffmt@?$num_put@GV?$ostreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@ABAPADPADDH@Z diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 49a3e4b..af3f569 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -14754,6 +14754,42 @@ ULONGLONG __cdecl tr2_sys__File_size_wchar(WCHAR const* path) return ((ULONGLONG)(fad.nFileSizeHigh) << 32) + fad.nFileSizeLow; } +/* ?_Equivalent@sys@tr2@std@@YAHPB_W0@Z */ +/* ?_Equivalent@sys@tr2@std@@YAHPEB_W0@Z */ +int __cdecl tr2_sys__Equivalent_wchar(WCHAR const* path1, WCHAR const* path2) +{ + HANDLE h1, h2; + int ret; + BY_HANDLE_FILE_INFORMATION info1, info2; + TRACE("(%s %s)\n", debugstr_w(path1), debugstr_w(path2)); + + h1 = CreateFileW(path1, 0, FILE_SHARE_DELETE | FILE_SHARE_READ | FILE_SHARE_WRITE, + NULL, OPEN_EXISTING, 0, 0); + h2 = CreateFileW(path2, 0, FILE_SHARE_DELETE | FILE_SHARE_READ | FILE_SHARE_WRITE, + NULL, OPEN_EXISTING, 0, 0); + if(h1 == INVALID_HANDLE_VALUE) { + if(h2 == INVALID_HANDLE_VALUE) { + return -1; + }else { + CloseHandle(h2); + return 0; + } + }else if(h2 == INVALID_HANDLE_VALUE) { + CloseHandle(h1); + return 0; + } + + ret = GetFileInformationByHandle(h1, &info1) && GetFileInformationByHandle(h2, &info2); + CloseHandle(h1); + CloseHandle(h2); + if(!ret) + return -1; + return (info1.dwVolumeSerialNumber == info2.dwVolumeSerialNumber + && info1.nFileIndexHigh == info2.nFileIndexHigh + && info1.nFileIndexLow == info2.nFileIndexLow + ); +} + /* ??1_Winit@std@@QAE@XZ */ /* ??1_Winit@std@@QAE@XZ */ DEFINE_THISCALL_WRAPPER(_Winit_dtor, 4)

1 0

YongHao Hu : msvcp110: Add tr2_sys__File_size_wchar implementation and test.
by Alexandre Julliard 17 Aug '15

17 Aug '15

Module: wine Branch: master Commit: 589a54bb8488b80f517168503d3c5d0ecd033445 URL: http://source.winehq.org/git/wine.git/?a=commit;h=589a54bb8488b80f517168503… Author: YongHao Hu <christopherwuy(a)gmail.com> Date: Mon Aug 10 14:37:25 2015 +0800 msvcp110: Add tr2_sys__File_size_wchar implementation and test. --- dlls/msvcp110/msvcp110.spec | 4 ++-- dlls/msvcp120/msvcp120.spec | 4 ++-- dlls/msvcp120/tests/msvcp120.c | 14 +++++++++++--- dlls/msvcp120_app/msvcp120_app.spec | 4 ++-- dlls/msvcp90/ios.c | 17 ++++++++++++++++- 5 files changed, 33 insertions(+), 10 deletions(-) diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index c5d438a..858af32 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -1208,8 +1208,8 @@ @ cdecl -arch=win64 ?_Ffmt@?$num_put@_WV?$ostreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@AEBAPEADPEADDH@Z(ptr ptr long long) num_put_wchar__Ffmt @ cdecl -ret64 -arch=win32 ?_File_size@sys@tr2@std@@YA_KPBD@Z(str) tr2_sys__File_size @ cdecl -ret64 -arch=win64 ?_File_size@sys@tr2@std@@YA_KPEBD@Z(str) tr2_sys__File_size -@ stub -arch=win32 ?_File_size@sys@tr2@std@@YA_KPB_W@Z -@ stub -arch=win64 ?_File_size@sys@tr2@std@@YA_KPEB_W@Z +@ cdecl -arch=win32 ?_File_size@sys@tr2@std@@YA_KPB_W@Z(wstr) tr2_sys__File_size_wchar +@ cdecl -arch=win64 ?_File_size@sys@tr2@std@@YA_KPEB_W@Z(wstr) tr2_sys__File_size_wchar @ cdecl -arch=arm ?_Findarr@ios_base@std@@AAAAAU_Iosarray@12@H@Z(ptr long) ios_base_Findarr @ thiscall -arch=i386 ?_Findarr@ios_base@std@@AAEAAU_Iosarray@12@H@Z(ptr long) ios_base_Findarr @ cdecl -arch=win64 ?_Findarr@ios_base@std@@AEAAAEAU_Iosarray@12@H@Z(ptr long) ios_base_Findarr diff --git a/dlls/msvcp120/msvcp120.spec b/dlls/msvcp120/msvcp120.spec index e9a7217..430690c 100644 --- a/dlls/msvcp120/msvcp120.spec +++ b/dlls/msvcp120/msvcp120.spec @@ -1173,8 +1173,8 @@ @ cdecl -arch=win64 ?_Ffmt@?$num_put@_WV?$ostreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@AEBAPEADPEADDH@Z(ptr ptr long long) num_put_wchar__Ffmt @ cdecl -ret64 -arch=win32 ?_File_size@sys@tr2@std@@YA_KPBD@Z(str) tr2_sys__File_size @ cdecl -ret64 -arch=win64 ?_File_size@sys@tr2@std@@YA_KPEBD@Z(str) tr2_sys__File_size -@ stub -arch=win32 ?_File_size@sys@tr2@std@@YA_KPB_W@Z -@ stub -arch=win64 ?_File_size@sys@tr2@std@@YA_KPEB_W@Z +@ cdecl -arch=win32 ?_File_size@sys@tr2@std@@YA_KPB_W@Z(wstr) tr2_sys__File_size_wchar +@ cdecl -arch=win64 ?_File_size@sys@tr2@std@@YA_KPEB_W@Z(wstr) tr2_sys__File_size_wchar @ cdecl -arch=arm ?_Findarr@ios_base@std@@AAAAAU_Iosarray@12@H@Z(ptr long) ios_base_Findarr @ thiscall -arch=i386 ?_Findarr@ios_base@std@@AAEAAU_Iosarray@12@H@Z(ptr long) ios_base_Findarr @ cdecl -arch=win64 ?_Findarr@ios_base@std@@AEAAAEAU_Iosarray@12@H@Z(ptr long) ios_base_Findarr diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c index 1a53bee..f2fdd92 100644 --- a/dlls/msvcp120/tests/msvcp120.c +++ b/dlls/msvcp120/tests/msvcp120.c @@ -73,6 +73,7 @@ static void (CDECL *p__Do_call)(void *this); /* filesystem */ static ULONGLONG(__cdecl *p_tr2_sys__File_size)(char const*); +static ULONGLONG(__cdecl *p_tr2_sys__File_size_wchar)(WCHAR const*); static int (__cdecl *p_tr2_sys__Equivalent)(char const*, char const*); static char* (__cdecl *p_tr2_sys__Current_get)(char *); static MSVCP_bool (__cdecl *p_tr2_sys__Current_set)(char const*); @@ -113,6 +114,8 @@ static BOOL init(void) if(sizeof(void*) == 8) { /* 64-bit initialization */ SET(p_tr2_sys__File_size, "?_File_size@sys@tr2@std@@YA_KPEBD@Z"); + SET(p_tr2_sys__File_size_wchar, + "?_File_size@sys@tr2@std@@YA_KPEB_W@Z"); SET(p_tr2_sys__Equivalent, "?_Equivalent@sys@tr2@std@@YAHPEBD0@Z"); SET(p_tr2_sys__Current_get, @@ -136,6 +139,8 @@ static BOOL init(void) } else { SET(p_tr2_sys__File_size, "?_File_size@sys@tr2@std@@YA_KPBD@Z"); + SET(p_tr2_sys__File_size_wchar, + "?_File_size@sys@tr2@std@@YA_KPB_W@Z"); SET(p_tr2_sys__Equivalent, "?_Equivalent@sys@tr2@std@@YAHPBD0@Z"); SET(p_tr2_sys__Current_get, @@ -367,6 +372,7 @@ static void test_tr2_sys__File_size(void) ULONGLONG val; HANDLE file; LARGE_INTEGER file_size; + WCHAR testW[] = {'t','r','2','_','t','e','s','t','_','d','i','r','/','f','1',0}; CreateDirectoryA("tr2_test_dir", NULL); file = CreateFileA("tr2_test_dir/f1", GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL); @@ -377,6 +383,8 @@ static void test_tr2_sys__File_size(void) CloseHandle(file); val = p_tr2_sys__File_size("tr2_test_dir/f1"); ok(val == 7, "file_size is %s\n", debugstr_longlong(val)); + val = p_tr2_sys__File_size_wchar(testW); + ok(val == 7, "file_size is %s\n", debugstr_longlong(val)); file = CreateFileA("tr2_test_dir/f2", GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL); ok(file != INVALID_HANDLE_VALUE, "create file failed: INVALID_HANDLE_VALUE\n"); @@ -397,9 +405,9 @@ static void test_tr2_sys__File_size(void) ok(val == 0, "file_size is %s\n", debugstr_longlong(val)); ok(errno == 0xdeadbeef, "errno = %d\n", errno); - ok(DeleteFileA("tr2_test_dir/f1"), "Expected tr2_test_dir/f1 to exist\n"); - ok(DeleteFileA("tr2_test_dir/f2"), "Expected tr2_test_dir/f2 to exist\n"); - ok(RemoveDirectoryA("tr2_test_dir"), "Expected tr2_test_dir to exist\n"); + ok(DeleteFileA("tr2_test_dir/f1"), "expect tr2_test_dir/f1 to exist\n"); + ok(DeleteFileA("tr2_test_dir/f2"), "expect tr2_test_dir/f2 to exist\n"); + ok(RemoveDirectoryA("tr2_test_dir"), "expect tr2_test_dir to exist\n"); } static void test_tr2_sys__Equivalent(void) diff --git a/dlls/msvcp120_app/msvcp120_app.spec b/dlls/msvcp120_app/msvcp120_app.spec index 53dd548..04585c1 100644 --- a/dlls/msvcp120_app/msvcp120_app.spec +++ b/dlls/msvcp120_app/msvcp120_app.spec @@ -1173,8 +1173,8 @@ @ cdecl -arch=win64 ?_Ffmt@?$num_put@_WV?$ostreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@AEBAPEADPEADDH@Z(ptr ptr long long) msvcp120.?_Ffmt@?$num_put@_WV?$ostreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@AEBAPEADPEADDH@Z @ cdecl -ret64 -arch=win32 ?_File_size@sys@tr2@std@@YA_KPBD@Z(str) msvcp120.?_File_size@sys@tr2@std@@YA_KPBD@Z @ cdecl -ret64 -arch=win64 ?_File_size@sys@tr2@std@@YA_KPEBD@Z(str) msvcp120.?_File_size@sys@tr2@std@@YA_KPEBD@Z -@ stub -arch=win32 ?_File_size@sys@tr2@std@@YA_KPB_W@Z -@ stub -arch=win64 ?_File_size@sys@tr2@std@@YA_KPEB_W@Z +@ cdecl -arch=win32 ?_File_size@sys@tr2@std@@YA_KPB_W@Z(wstr) msvcp120.?_File_size@sys@tr2@std@@YA_KPB_W@Z +@ cdecl -arch=win64 ?_File_size@sys@tr2@std@@YA_KPEB_W@Z(wstr) msvcp120.?_File_size@sys@tr2@std@@YA_KPEB_W@Z @ cdecl -arch=arm ?_Findarr@ios_base@std@@AAAAAU_Iosarray@12@H@Z(ptr long) msvcp120.?_Findarr@ios_base@std@@AAAAAU_Iosarray@12@H@Z @ thiscall -arch=i386 ?_Findarr@ios_base@std@@AAEAAU_Iosarray@12@H@Z(ptr long) msvcp120.?_Findarr@ios_base@std@@AAEAAU_Iosarray@12@H@Z @ cdecl -arch=win64 ?_Findarr@ios_base@std@@AEAAAEAU_Iosarray@12@H@Z(ptr long) msvcp120.?_Findarr@ios_base@std@@AEAAAEAU_Iosarray@12@H@Z diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 006b787..49a3e4b 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -14204,7 +14204,7 @@ basic_ostream_char* __cdecl basic_ostream_char_print_complex_ldouble(basic_ostre /* ?_File_size@sys@tr2@std@@YA_KPBD@Z */ /* ?_File_size@sys@tr2@std@@YA_KPEBD@Z */ -ULONGLONG __cdecl tr2_sys__File_size(const char* path) +ULONGLONG __cdecl tr2_sys__File_size(char const* path) { WIN32_FILE_ATTRIBUTE_DATA fad; @@ -14739,6 +14739,21 @@ void* __thiscall _Winit_ctor(void *this) return this; } +/* ?_File_size@sys@tr2@std@@YA_KPB_W@Z */ +/* ?_File_size@sys@tr2@std@@YA_KPEB_W@Z */ +ULONGLONG __cdecl tr2_sys__File_size_wchar(WCHAR const* path) +{ + WIN32_FILE_ATTRIBUTE_DATA fad; + + TRACE("(%s)\n", debugstr_w(path)); + if(!GetFileAttributesExW(path, GetFileExInfoStandard, &fad)) + return 0; + if(fad.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) + return 0; + + return ((ULONGLONG)(fad.nFileSizeHigh) << 32) + fad.nFileSizeLow; +} + /* ??1_Winit@std@@QAE@XZ */ /* ??1_Winit@std@@QAE@XZ */ DEFINE_THISCALL_WRAPPER(_Winit_dtor, 4)

1 0

← Newer
1
...
26
27
28
29
30
31
32
...
51
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits August 2015