August 2015 - Wine-Commits - list.winehq.org

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

Aug. 17, 2015

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__Current_get_wchar implementation and test.
by Alexandre Julliard Aug. 17, 2015

Aug. 17, 2015

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(a)sys@tr2(a)std@@YAHPEB_W0_N(a)Z @ cdecl -arch=win32 ?_Current_get(a)sys@tr2(a)std@@YAPADPAD(a)Z(ptr) tr2_sys__Current_get @ cdecl -arch=win64 ?_Current_get(a)sys@tr2(a)std@@YAPEADPEAD(a)Z(ptr) tr2_sys__Current_get -@ stub -arch=win32 ?_Current_get(a)sys@tr2(a)std@@YAPA_WPA_W(a)Z -@ stub -arch=win64 ?_Current_get(a)sys@tr2(a)std@@YAPEA_WPEA_W(a)Z +@ cdecl -arch=win32 ?_Current_get(a)sys@tr2(a)std@@YAPA_WPA_W(a)Z(ptr) tr2_sys__Current_get_wchar +@ cdecl -arch=win64 ?_Current_get(a)sys@tr2(a)std@@YAPEA_WPEA_W(a)Z(ptr) tr2_sys__Current_get_wchar @ cdecl -arch=win32 ?_Current_set(a)sys@tr2(a)std@@YA_NPBD(a)Z(str) tr2_sys__Current_set @ cdecl -arch=win64 ?_Current_set(a)sys@tr2(a)std@@YA_NPEBD(a)Z(str) tr2_sys__Current_set @ stub -arch=win32 ?_Current_set(a)sys@tr2(a)std@@YA_NPB_W(a)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(a)sys@tr2(a)std@@YAHPEB_W0_N(a)Z @ cdecl -arch=win32 ?_Current_get(a)sys@tr2(a)std@@YAPADAAY0BAE(a)D@Z(ptr) tr2_sys__Current_get @ cdecl -arch=win64 ?_Current_get(a)sys@tr2(a)std@@YAPEADAEAY0BAE(a)D@Z(ptr) tr2_sys__Current_get -@ stub -arch=win32 ?_Current_get(a)sys@tr2(a)std@@YAPA_WAAY0BAE(a)_W@Z -@ stub -arch=win64 ?_Current_get(a)sys@tr2(a)std@@YAPEA_WAEAY0BAE(a)_W@Z +@ cdecl -arch=win32 ?_Current_get(a)sys@tr2(a)std@@YAPA_WAAY0BAE(a)_W@Z(ptr) tr2_sys__Current_get_wchar +@ cdecl -arch=win64 ?_Current_get(a)sys@tr2(a)std@@YAPEA_WAEAY0BAE(a)_W@Z(ptr) tr2_sys__Current_get_wchar @ cdecl -arch=win32 ?_Current_set(a)sys@tr2(a)std@@YA_NPBD(a)Z(str) tr2_sys__Current_set @ cdecl -arch=win64 ?_Current_set(a)sys@tr2(a)std@@YA_NPEBD(a)Z(str) tr2_sys__Current_set @ stub -arch=win32 ?_Current_set(a)sys@tr2(a)std@@YA_NPB_W(a)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(a)sys@tr2(a)std@@YAHPEB_W0(a)Z"); SET(p_tr2_sys__Current_get, "?_Current_get(a)sys@tr2(a)std@@YAPEADAEAY0BAE(a)D@Z"); + SET(p_tr2_sys__Current_get_wchar, + "?_Current_get(a)sys@tr2(a)std@@YAPEA_WAEAY0BAE(a)_W@Z"); SET(p_tr2_sys__Current_set, "?_Current_set(a)sys@tr2(a)std@@YA_NPEBD(a)Z"); SET(p_tr2_sys__Make_dir, @@ -150,6 +153,8 @@ static BOOL init(void) "?_Equivalent(a)sys@tr2(a)std@@YAHPB_W0(a)Z"); SET(p_tr2_sys__Current_get, "?_Current_get(a)sys@tr2(a)std@@YAPADAAY0BAE(a)D@Z"); + SET(p_tr2_sys__Current_get_wchar, + "?_Current_get(a)sys@tr2(a)std@@YAPA_WAAY0BAE(a)_W@Z"); SET(p_tr2_sys__Current_set, "?_Current_set(a)sys@tr2(a)std@@YA_NPBD(a)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(a)sys@tr2(a)std@@YAHPEB_W0_N(a)Z @ cdecl -arch=win32 ?_Current_get(a)sys@tr2(a)std@@YAPADAAY0BAE(a)D@Z(ptr) msvcp120.?_Current_get(a)sys@tr2(a)std@@YAPADAAY0BAE(a)D@Z @ cdecl -arch=win64 ?_Current_get(a)sys@tr2(a)std@@YAPEADAEAY0BAE(a)D@Z(ptr) msvcp120.?_Current_get(a)sys@tr2(a)std@@YAPEADAEAY0BAE(a)D@Z -@ stub -arch=win32 ?_Current_get(a)sys@tr2(a)std@@YAPA_WAAY0BAE(a)_W@Z -@ stub -arch=win64 ?_Current_get(a)sys@tr2(a)std@@YAPEA_WAEAY0BAE(a)_W@Z +@ cdecl -arch=win32 ?_Current_get(a)sys@tr2(a)std@@YAPA_WAAY0BAE(a)_W@Z(ptr) msvcp120.?_Current_get(a)sys@tr2(a)std@@YAPA_WAAY0BAE(a)_W@Z +@ cdecl -arch=win64 ?_Current_get(a)sys@tr2(a)std@@YAPEA_WAEAY0BAE(a)_W@Z(ptr) msvcp120.?_Current_get(a)sys@tr2(a)std@@YAPEA_WAEAY0BAE(a)_W@Z @ cdecl -arch=win32 ?_Current_set(a)sys@tr2(a)std@@YA_NPBD(a)Z(str) msvcp120.?_Current_set(a)sys@tr2(a)std@@YA_NPBD(a)Z @ cdecl -arch=win64 ?_Current_set(a)sys@tr2(a)std@@YA_NPEBD(a)Z(str) msvcp120.?_Current_set(a)sys@tr2(a)std@@YA_NPEBD(a)Z @ stub -arch=win32 ?_Current_set(a)sys@tr2(a)std@@YA_NPB_W(a)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(a)sys@tr2(a)std@@YAPA_WAAY0BAE(a)_W@Z */ +/* ?_Current_get(a)sys@tr2(a)std@@YAPEA_WAEAY0BAE(a)_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(a)std@@QAE(a)XZ */ /* ??1_Winit(a)std@@QAE(a)XZ */ DEFINE_THISCALL_WRAPPER(_Winit_dtor, 4)

1 0

YongHao Hu : msvcp110: Add tr2_sys__Equivalent_wchar implementation and test.
by Alexandre Julliard Aug. 17, 2015

Aug. 17, 2015

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(a)_W@std@@QEBA_NXZ(ptr) _Yarn_wchar__Empty @ cdecl -arch=win32 ?_Equivalent(a)sys@tr2(a)std@@YAHPBD0(a)Z(str str) tr2_sys__Equivalent @ cdecl -arch=win64 ?_Equivalent(a)sys@tr2(a)std@@YAHPEBD0(a)Z(str str) tr2_sys__Equivalent -@ stub -arch=win32 ?_Equivalent(a)sys@tr2(a)std@@YAHPB_W0(a)Z -@ stub -arch=win64 ?_Equivalent(a)sys@tr2(a)std@@YAHPEB_W0(a)Z +@ cdecl -arch=win32 ?_Equivalent(a)sys@tr2(a)std@@YAHPB_W0(a)Z(wstr wstr) tr2_sys__Equivalent_wchar +@ cdecl -arch=win64 ?_Equivalent(a)sys@tr2(a)std@@YAHPEB_W0(a)Z(wstr wstr) tr2_sys__Equivalent_wchar @ cdecl -arch=win32 ?_Ffmt@?$num_put(a)DV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@ABAPADPADDH(a)Z(ptr ptr long long) num_put_char__Ffmt @ cdecl -arch=win64 ?_Ffmt@?$num_put(a)DV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@AEBAPEADPEADDH(a)Z(ptr ptr long long) num_put_char__Ffmt @ cdecl -arch=win32 ?_Ffmt@?$num_put(a)GV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@std@@@std@@ABAPADPADDH(a)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(a)_W@std@@QEBA_NXZ(ptr) _Yarn_wchar__Empty @ cdecl -arch=win32 ?_Equivalent(a)sys@tr2(a)std@@YAHPBD0(a)Z(str str) tr2_sys__Equivalent @ cdecl -arch=win64 ?_Equivalent(a)sys@tr2(a)std@@YAHPEBD0(a)Z(str str) tr2_sys__Equivalent -@ stub -arch=win32 ?_Equivalent(a)sys@tr2(a)std@@YAHPB_W0(a)Z -@ stub -arch=win64 ?_Equivalent(a)sys@tr2(a)std@@YAHPEB_W0(a)Z +@ cdecl -arch=win32 ?_Equivalent(a)sys@tr2(a)std@@YAHPB_W0(a)Z(wstr wstr) tr2_sys__Equivalent_wchar +@ cdecl -arch=win64 ?_Equivalent(a)sys@tr2(a)std@@YAHPEB_W0(a)Z(wstr wstr) tr2_sys__Equivalent_wchar @ cdecl -arch=win32 ?_Ffmt@?$num_put(a)DV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@ABAPADPADDH(a)Z(ptr ptr long long) num_put_char__Ffmt @ cdecl -arch=win64 ?_Ffmt@?$num_put(a)DV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@AEBAPEADPEADDH(a)Z(ptr ptr long long) num_put_char__Ffmt @ cdecl -arch=win32 ?_Ffmt@?$num_put(a)GV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@std@@@std@@ABAPADPADDH(a)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(a)sys@tr2(a)std@@YA_KPEB_W(a)Z"); SET(p_tr2_sys__Equivalent, "?_Equivalent(a)sys@tr2(a)std@@YAHPEBD0(a)Z"); + SET(p_tr2_sys__Equivalent_wchar, + "?_Equivalent(a)sys@tr2(a)std@@YAHPEB_W0(a)Z"); SET(p_tr2_sys__Current_get, "?_Current_get(a)sys@tr2(a)std@@YAPEADAEAY0BAE(a)D@Z"); SET(p_tr2_sys__Current_set, @@ -143,6 +146,8 @@ static BOOL init(void) "?_File_size(a)sys@tr2(a)std@@YA_KPB_W(a)Z"); SET(p_tr2_sys__Equivalent, "?_Equivalent(a)sys@tr2(a)std@@YAHPBD0(a)Z"); + SET(p_tr2_sys__Equivalent_wchar, + "?_Equivalent(a)sys@tr2(a)std@@YAHPB_W0(a)Z"); SET(p_tr2_sys__Current_get, "?_Current_get(a)sys@tr2(a)std@@YAPADAAY0BAE(a)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(a)_W@std@@QEBA_NXZ(ptr) msvcp120.?_Empty@?$_Yarn(a)_W@std@@QEBA_NXZ @ cdecl -arch=win32 ?_Equivalent(a)sys@tr2(a)std@@YAHPBD0(a)Z(str str) msvcp120.?_Equivalent(a)sys@tr2(a)std@@YAHPBD0(a)Z @ cdecl -arch=win64 ?_Equivalent(a)sys@tr2(a)std@@YAHPEBD0(a)Z(str str) msvcp120.?_Equivalent(a)sys@tr2(a)std@@YAHPEBD0(a)Z -@ stub -arch=win32 ?_Equivalent(a)sys@tr2(a)std@@YAHPB_W0(a)Z -@ stub -arch=win64 ?_Equivalent(a)sys@tr2(a)std@@YAHPEB_W0(a)Z +@ cdecl -arch=win32 ?_Equivalent(a)sys@tr2(a)std@@YAHPB_W0(a)Z(wstr wstr) msvcp120.?_Equivalent(a)sys@tr2(a)std@@YAHPB_W0(a)Z +@ cdecl -arch=win64 ?_Equivalent(a)sys@tr2(a)std@@YAHPEB_W0(a)Z(wstr wstr) msvcp120.?_Equivalent(a)sys@tr2(a)std@@YAHPEB_W0(a)Z @ cdecl -arch=win32 ?_Ffmt@?$num_put(a)DV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@ABAPADPADDH(a)Z(ptr ptr long long) msvcp120.?_Ffmt@?$num_put(a)DV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@ABAPADPADDH(a)Z @ cdecl -arch=win64 ?_Ffmt@?$num_put(a)DV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@AEBAPEADPEADDH(a)Z(ptr ptr long long) msvcp120.?_Ffmt@?$num_put(a)DV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@AEBAPEADPEADDH(a)Z @ cdecl -arch=win32 ?_Ffmt@?$num_put(a)GV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@std@@@std@@ABAPADPADDH(a)Z(ptr ptr long long) msvcp120.?_Ffmt@?$num_put(a)GV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@std@@@std@@ABAPADPADDH(a)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(a)sys@tr2(a)std@@YAHPB_W0(a)Z */ +/* ?_Equivalent(a)sys@tr2(a)std@@YAHPEB_W0(a)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(a)std@@QAE(a)XZ */ /* ??1_Winit(a)std@@QAE(a)XZ */ DEFINE_THISCALL_WRAPPER(_Winit_dtor, 4)

1 0

YongHao Hu : msvcp110: Add tr2_sys__File_size_wchar implementation and test.
by Alexandre Julliard Aug. 17, 2015

Aug. 17, 2015

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(a)_WV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@AEBAPEADPEADDH(a)Z(ptr ptr long long) num_put_wchar__Ffmt @ cdecl -ret64 -arch=win32 ?_File_size(a)sys@tr2(a)std@@YA_KPBD(a)Z(str) tr2_sys__File_size @ cdecl -ret64 -arch=win64 ?_File_size(a)sys@tr2(a)std@@YA_KPEBD(a)Z(str) tr2_sys__File_size -@ stub -arch=win32 ?_File_size(a)sys@tr2(a)std@@YA_KPB_W(a)Z -@ stub -arch=win64 ?_File_size(a)sys@tr2(a)std@@YA_KPEB_W(a)Z +@ cdecl -arch=win32 ?_File_size(a)sys@tr2(a)std@@YA_KPB_W(a)Z(wstr) tr2_sys__File_size_wchar +@ cdecl -arch=win64 ?_File_size(a)sys@tr2(a)std@@YA_KPEB_W(a)Z(wstr) tr2_sys__File_size_wchar @ cdecl -arch=arm ?_Findarr(a)ios_base@std@@AAAAAU_Iosarray(a)12@H(a)Z(ptr long) ios_base_Findarr @ thiscall -arch=i386 ?_Findarr(a)ios_base@std@@AAEAAU_Iosarray(a)12@H(a)Z(ptr long) ios_base_Findarr @ cdecl -arch=win64 ?_Findarr(a)ios_base@std@@AEAAAEAU_Iosarray(a)12@H(a)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(a)_WV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@AEBAPEADPEADDH(a)Z(ptr ptr long long) num_put_wchar__Ffmt @ cdecl -ret64 -arch=win32 ?_File_size(a)sys@tr2(a)std@@YA_KPBD(a)Z(str) tr2_sys__File_size @ cdecl -ret64 -arch=win64 ?_File_size(a)sys@tr2(a)std@@YA_KPEBD(a)Z(str) tr2_sys__File_size -@ stub -arch=win32 ?_File_size(a)sys@tr2(a)std@@YA_KPB_W(a)Z -@ stub -arch=win64 ?_File_size(a)sys@tr2(a)std@@YA_KPEB_W(a)Z +@ cdecl -arch=win32 ?_File_size(a)sys@tr2(a)std@@YA_KPB_W(a)Z(wstr) tr2_sys__File_size_wchar +@ cdecl -arch=win64 ?_File_size(a)sys@tr2(a)std@@YA_KPEB_W(a)Z(wstr) tr2_sys__File_size_wchar @ cdecl -arch=arm ?_Findarr(a)ios_base@std@@AAAAAU_Iosarray(a)12@H(a)Z(ptr long) ios_base_Findarr @ thiscall -arch=i386 ?_Findarr(a)ios_base@std@@AAEAAU_Iosarray(a)12@H(a)Z(ptr long) ios_base_Findarr @ cdecl -arch=win64 ?_Findarr(a)ios_base@std@@AEAAAEAU_Iosarray(a)12@H(a)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(a)sys@tr2(a)std@@YA_KPEBD(a)Z"); + SET(p_tr2_sys__File_size_wchar, + "?_File_size(a)sys@tr2(a)std@@YA_KPEB_W(a)Z"); SET(p_tr2_sys__Equivalent, "?_Equivalent(a)sys@tr2(a)std@@YAHPEBD0(a)Z"); SET(p_tr2_sys__Current_get, @@ -136,6 +139,8 @@ static BOOL init(void) } else { SET(p_tr2_sys__File_size, "?_File_size(a)sys@tr2(a)std@@YA_KPBD(a)Z"); + SET(p_tr2_sys__File_size_wchar, + "?_File_size(a)sys@tr2(a)std@@YA_KPB_W(a)Z"); SET(p_tr2_sys__Equivalent, "?_Equivalent(a)sys@tr2(a)std@@YAHPBD0(a)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(a)_WV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@AEBAPEADPEADDH(a)Z(ptr ptr long long) msvcp120.?_Ffmt@?$num_put(a)_WV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@AEBAPEADPEADDH(a)Z @ cdecl -ret64 -arch=win32 ?_File_size(a)sys@tr2(a)std@@YA_KPBD(a)Z(str) msvcp120.?_File_size(a)sys@tr2(a)std@@YA_KPBD(a)Z @ cdecl -ret64 -arch=win64 ?_File_size(a)sys@tr2(a)std@@YA_KPEBD(a)Z(str) msvcp120.?_File_size(a)sys@tr2(a)std@@YA_KPEBD(a)Z -@ stub -arch=win32 ?_File_size(a)sys@tr2(a)std@@YA_KPB_W(a)Z -@ stub -arch=win64 ?_File_size(a)sys@tr2(a)std@@YA_KPEB_W(a)Z +@ cdecl -arch=win32 ?_File_size(a)sys@tr2(a)std@@YA_KPB_W(a)Z(wstr) msvcp120.?_File_size(a)sys@tr2(a)std@@YA_KPB_W(a)Z +@ cdecl -arch=win64 ?_File_size(a)sys@tr2(a)std@@YA_KPEB_W(a)Z(wstr) msvcp120.?_File_size(a)sys@tr2(a)std@@YA_KPEB_W(a)Z @ cdecl -arch=arm ?_Findarr(a)ios_base@std@@AAAAAU_Iosarray(a)12@H(a)Z(ptr long) msvcp120.?_Findarr(a)ios_base@std@@AAAAAU_Iosarray(a)12@H(a)Z @ thiscall -arch=i386 ?_Findarr(a)ios_base@std@@AAEAAU_Iosarray(a)12@H(a)Z(ptr long) msvcp120.?_Findarr(a)ios_base@std@@AAEAAU_Iosarray(a)12@H(a)Z @ cdecl -arch=win64 ?_Findarr(a)ios_base@std@@AEAAAEAU_Iosarray(a)12@H(a)Z(ptr long) msvcp120.?_Findarr(a)ios_base@std@@AEAAAEAU_Iosarray(a)12@H(a)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(a)sys@tr2(a)std@@YA_KPBD(a)Z */ /* ?_File_size(a)sys@tr2(a)std@@YA_KPEBD(a)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(a)sys@tr2(a)std@@YA_KPB_W(a)Z */ +/* ?_File_size(a)sys@tr2(a)std@@YA_KPEB_W(a)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(a)std@@QAE(a)XZ */ /* ??1_Winit(a)std@@QAE(a)XZ */ DEFINE_THISCALL_WRAPPER(_Winit_dtor, 4)

1 0

Iván Matellanes : msvcirt: Implement filebuf::sync.
by Alexandre Julliard Aug. 17, 2015

Aug. 17, 2015

Module: wine Branch: master Commit: 5ebf8cfc40656b896a80310802373ffbf3d1ab38 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ebf8cfc40656b896a8031080… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Mon Aug 10 20:09:14 2015 +0200 msvcirt: Implement filebuf::sync. --- dlls/msvcirt/msvcirt.c | 35 ++++++++++++++++++++++- dlls/msvcirt/tests/msvcirt.c | 68 ++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 100 insertions(+), 3 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index 17525cf..9dc2c63 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -1035,7 +1035,40 @@ int __thiscall filebuf_setmode(filebuf *this, int mode) DEFINE_THISCALL_WRAPPER(filebuf_sync, 4) int __thiscall filebuf_sync(filebuf *this) { - FIXME("(%p) stub\n", this); + int count, mode; + char *ptr; + LONG offset; + + TRACE("(%p)\n", this); + if (this->fd == -1) + return EOF; + if (this->base.unbuffered) + return 0; + + /* flush output buffer */ + if (this->base.pptr != NULL) { + count = this->base.pptr - this->base.pbase; + if (count > 0 && _write(this->fd, this->base.pbase, count) != count) + return EOF; + this->base.pbase = this->base.pptr = this->base.epptr = NULL; + } + /* flush input buffer */ + if (this->base.egptr != NULL) { + offset = this->base.egptr - this->base.gptr; + if (offset > 0) { + mode = _setmode(this->fd, _O_TEXT); + _setmode(this->fd, mode); + if (mode & _O_TEXT) { + /* in text mode, '\n' in the buffer means '\r\n' in the file */ + for (ptr = this->base.gptr; ptr < this->base.egptr; ptr++) + if (*ptr == '\n') + offset++; + } + if (_lseek(this->fd, -offset, SEEK_CUR) < 0) + return EOF; + } + this->base.eback = this->base.gptr = this->base.egptr = NULL; + } return 0; } diff --git a/dlls/msvcirt/tests/msvcirt.c b/dlls/msvcirt/tests/msvcirt.c index 559bee0..3dccb67 100644 --- a/dlls/msvcirt/tests/msvcirt.c +++ b/dlls/msvcirt/tests/msvcirt.c @@ -159,6 +159,7 @@ static filebuf* (*__thiscall p_filebuf_open)(filebuf*, const char*, ios_open_mod static filebuf* (*__thiscall p_filebuf_close)(filebuf*); static int (*__thiscall p_filebuf_setmode)(filebuf*, int); static streambuf* (*__thiscall p_filebuf_setbuf)(filebuf*, char*, int); +static int (*__thiscall p_filebuf_sync)(filebuf*); /* ios */ static ios* (*__thiscall p_ios_copy_ctor)(ios*, const ios*); @@ -299,6 +300,7 @@ static BOOL init(void) SET(p_filebuf_close, "?close(a)filebuf@@QEAAPEAV1(a)XZ"); SET(p_filebuf_setmode, "?setmode(a)filebuf@@QEAAHH(a)Z"); SET(p_filebuf_setbuf, "?setbuf(a)filebuf@@UEAAPEAVstreambuf@@PEADH(a)Z"); + SET(p_filebuf_sync, "?sync(a)filebuf@@UEAAHXZ"); SET(p_ios_copy_ctor, "??0ios@@IEAA(a)AEBV0@@Z"); SET(p_ios_ctor, "??0ios@@IEAA(a)XZ"); @@ -359,6 +361,7 @@ static BOOL init(void) SET(p_filebuf_close, "?close(a)filebuf@@QAEPAV1(a)XZ"); SET(p_filebuf_setmode, "?setmode(a)filebuf@@QAEHH(a)Z"); SET(p_filebuf_setbuf, "?setbuf(a)filebuf@@UAEPAVstreambuf@@PADH(a)Z"); + SET(p_filebuf_sync, "?sync(a)filebuf@@UAEHXZ"); SET(p_ios_copy_ctor, "??0ios@@IAE(a)ABV0@@Z"); SET(p_ios_ctor, "??0ios@@IAE(a)XZ"); @@ -1127,8 +1130,9 @@ static void test_filebuf(void) /* open protection*/ fb3.fd = -1; fb3.base.do_lock = 0; - pret = (filebuf*) call_func4(p_filebuf_open, &fb3, filename3, OPENMODE_in, filebuf_openprot); + pret = (filebuf*) call_func4(p_filebuf_open, &fb3, filename3, OPENMODE_in|OPENMODE_out, filebuf_openprot); ok(pret == &fb3, "wrong return, expected %p got %p\n", &fb3, pret); + ok(_write(fb3.fd, "You wouldn't\nget this from\nany other guy", 40) == 40, "_write failed\n"); fb2.base.do_lock = 0; pret = (filebuf*) call_func4(p_filebuf_open, &fb2, filename3, OPENMODE_in|OPENMODE_out, filebuf_openprot); ok(pret == &fb2, "wrong return, expected %p got %p\n", &fb2, pret); @@ -1149,7 +1153,6 @@ static void test_filebuf(void) fb1.base.epptr = fb1.base.ebuf; ret = (int) call_func2(p_filebuf_setmode, &fb1, filebuf_binary); ok(ret == filebuf_text, "wrong return, expected %d got %d\n", filebuf_text, ret); -todo_wine ok(fb1.base.pptr == NULL, "wrong put pointer, expected %p got %p\n", NULL, fb1.base.pptr); ret = (int) call_func2(p_filebuf_setmode, &fb1, filebuf_binary); ok(ret == filebuf_binary, "wrong return, expected %d got %d\n", filebuf_binary, ret); @@ -1161,6 +1164,67 @@ todo_wine ok(ret == -1, "wrong return, expected -1 got %d\n", ret); fb2.base.do_lock = -1; + /* sync */ + ret = (int) call_func1(p_filebuf_sync, &fb1); + ok(ret == 0, "wrong return, expected 0 got %d\n", ret); + fb1.base.eback = fb1.base.gptr = fb1.base.base; + fb1.base.egptr = fb1.base.pbase = fb1.base.pptr = fb1.base.base + 256; + fb1.base.epptr = fb1.base.ebuf; + ret = (int) call_func3(p_streambuf_xsputn, &fb1.base, "We're no strangers to love\n", 27); + ok(ret == 27, "wrong return, expected 27 got %d\n", ret); + ret = (int) call_func1(p_filebuf_sync, &fb1); + ok(ret == -1, "wrong return, expected -1 got %d\n", ret); + ok(fb1.base.gptr == fb1.base.base, "wrong get pointer, expected %p got %p\n", fb1.base.base, fb1.base.gptr); + ok(fb1.base.pptr == NULL, "wrong put pointer, expected %p got %p\n", NULL, fb1.base.pptr); + fb1.base.eback = fb1.base.gptr = fb1.base.egptr = NULL; + fb1.base.pbase = fb1.base.pptr = fb1.base.base; + fb1.base.epptr = fb1.base.ebuf; + ret = (int) call_func3(p_streambuf_xsputn, &fb1.base, "You know the rules and so do I\n", 31); + ok(ret == 31, "wrong return, expected 31 got %d\n", ret); + ret = (int) call_func1(p_filebuf_sync, &fb1); + ok(ret == 0, "wrong return, expected 0 got %d\n", ret); + ok(fb1.base.gptr == NULL, "wrong get pointer, expected %p got %p\n", NULL, fb1.base.gptr); + ok(fb1.base.pptr == NULL, "wrong put pointer, expected %p got %p\n", NULL, fb1.base.pptr); + fb1.base.eback = fb1.base.base; + fb1.base.gptr = fb1.base.base + 190; + fb1.base.egptr = fb1.base.pbase = fb1.base.pptr = fb1.base.base + 256; + fb1.base.epptr = fb1.base.ebuf; + ret = (int) call_func1(p_filebuf_sync, &fb1); + ok(ret == 0, "wrong return, expected 0 got %d\n", ret); + ok(fb1.base.gptr == NULL, "wrong get pointer, expected %p got %p\n", NULL, fb1.base.gptr); + ok(fb1.base.pptr == NULL, "wrong put pointer, expected %p got %p\n", NULL, fb1.base.pptr); + ok(_tell(fb1.fd) == 0, "_tell failed\n"); + ret = (int) call_func1(p_filebuf_sync, &fb2); + ok(ret == -1, "wrong return, expected -1 got %d\n", ret); + fb3.base.eback = fb3.base.base; + fb3.base.gptr = fb3.base.egptr = fb3.base.pbase = fb3.base.pptr = fb3.base.base + 256; + fb3.base.epptr = fb3.base.ebuf; + ret = (int) call_func3(p_streambuf_xsputn, &fb3.base, "A full commitment's what I'm thinking of\n", 41); + ok(ret == 41, "wrong return, expected 41 got %d\n", ret); + ret = (int) call_func1(p_filebuf_sync, &fb3); + ok(ret == -1, "wrong return, expected -1 got %d\n", ret); + ok(fb3.base.gptr == fb3.base.base + 256, "wrong get pointer, expected %p got %p\n", fb3.base.base + 256, fb3.base.gptr); + ok(fb3.base.pptr == fb3.base.base + 297, "wrong put pointer, expected %p got %p\n", fb3.base.base + 297, fb3.base.pptr); + fb3.base.eback = fb3.base.base; + fb3.base.gptr = fb3.base.egptr = fb3.base.pbase = fb3.base.pptr = fb3.base.base + 256; + fb3.base.epptr = fb3.base.ebuf; + ret = (int) call_func1(p_filebuf_sync, &fb3); + ok(ret == 0, "wrong return, expected 0 got %d\n", ret); + ok(fb3.base.gptr == NULL, "wrong get pointer, expected %p got %p\n", NULL, fb3.base.gptr); + ok(fb3.base.pptr == NULL, "wrong put pointer, expected %p got %p\n", NULL, fb3.base.pptr); + fb3.base.eback = fb3.base.base; + fb3.base.gptr = fb3.base.base + 216; + fb3.base.egptr = fb3.base.pbase = fb3.base.pptr = fb3.base.base + 256; + fb3.base.epptr = fb3.base.ebuf; + ok(_read(fb3.fd, fb3.base.gptr, 42) == 40, "read failed\n"); + ret = (int) call_func1(p_filebuf_sync, &fb3); + ok(ret == 0, "wrong return, expected 0 got %d\n", ret); + ok(fb3.base.gptr == NULL, "wrong get pointer, expected %p got %p\n", NULL, fb3.base.gptr); + ok(fb3.base.pptr == NULL, "wrong put pointer, expected %p got %p\n", NULL, fb3.base.pptr); + ok(_tell(fb3.fd) == 0, "_tell failed\n"); + fb3.base.eback = fb3.base.gptr = fb3.base.egptr = NULL; + fb3.base.pbase = fb3.base.pptr = fb3.base.epptr = NULL; + /* close */ pret = (filebuf*) call_func1(p_filebuf_close, &fb2); ok(pret == NULL, "wrong return, expected %p got %p\n", NULL, pret);

1 0

Iván Matellanes : msvcirt: Allocate a buffer if necessary when a file is opened.
by Alexandre Julliard Aug. 17, 2015

Aug. 17, 2015

Module: wine Branch: master Commit: cac27a40d8197a514b59a8f850ce62340cec87a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cac27a40d8197a514b59a8f85… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Mon Aug 10 20:08:54 2015 +0200 msvcirt: Allocate a buffer if necessary when a file is opened. --- dlls/msvcirt/msvcirt.c | 1 + dlls/msvcirt/tests/msvcirt.c | 2 ++ 2 files changed, 3 insertions(+) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index bf89650..7caa05b 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -973,6 +973,7 @@ filebuf* __thiscall filebuf_open(filebuf *this, const char *name, ios_open_mode _close(fd); } else this->fd = fd; + streambuf_allocate(&this->base); streambuf_unlock(&this->base); return (this->fd == -1) ? NULL : this; } diff --git a/dlls/msvcirt/tests/msvcirt.c b/dlls/msvcirt/tests/msvcirt.c index e0bda56..0977173 100644 --- a/dlls/msvcirt/tests/msvcirt.c +++ b/dlls/msvcirt/tests/msvcirt.c @@ -1016,9 +1016,11 @@ static void test_filebuf(void) pret = (filebuf*) call_func4(p_filebuf_open, &fb1, filename1, OPENMODE_ate|OPENMODE_nocreate|OPENMODE_noreplace|OPENMODE_binary, filebuf_openprot); ok(pret == NULL, "wrong return, expected %p got %p\n", NULL, pret); + ok(fb1.base.allocated == 0, "wrong allocate value, expected 0 got %d\n", fb1.base.allocated); fb1.base.do_lock = 0; pret = (filebuf*) call_func4(p_filebuf_open, &fb1, filename1, OPENMODE_out, filebuf_openprot); ok(pret == &fb1, "wrong return, expected %p got %p\n", &fb1, pret); + ok(fb1.base.allocated == 1, "wrong allocate value, expected 1 got %d\n", fb1.base.allocated); ok(_write(fb1.fd, "testing", 7) == 7, "_write failed\n"); pret = (filebuf*) call_func1(p_filebuf_close, &fb1); ok(pret == &fb1, "wrong return, expected %p got %p\n", &fb1, pret);

1 0

Hugh McMaster : kernel32: Reset insert key toggle when Insert Mode changes.
by Alexandre Julliard Aug. 17, 2015

Aug. 17, 2015

Module: wine Branch: master Commit: ac3a684d3b5b939772fb0a22d99e9a9c2d8201c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac3a684d3b5b939772fb0a22d… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Aug 13 15:22:17 2015 +1000 kernel32: Reset insert key toggle when Insert Mode changes. --- dlls/kernel32/editline.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/editline.c b/dlls/kernel32/editline.c index c0234d7..b330869 100644 --- a/dlls/kernel32/editline.c +++ b/dlls/kernel32/editline.c @@ -913,7 +913,7 @@ WCHAR* CONSOLE_Readline(HANDLE hConsoleIn, BOOL can_pos_cursor) const KeyEntry* ke; unsigned ofs; void (*func)(struct WCEL_Context* ctx); - DWORD mode, ks; + DWORD mode, input_mode, ks; int use_emacs; memset(&ctx, 0, sizeof(ctx)); @@ -928,6 +928,7 @@ WCHAR* CONSOLE_Readline(HANDLE hConsoleIn, BOOL can_pos_cursor) !GetConsoleScreenBufferInfo(ctx.hConOut, &ctx.csbi)) return NULL; if (!GetConsoleMode(hConsoleIn, &mode)) mode = 0; + input_mode = mode; ctx.shall_echo = (mode & ENABLE_ECHO_INPUT) ? 1 : 0; ctx.insert = (mode & (ENABLE_INSERT_MODE|ENABLE_EXTENDED_FLAGS)) == (ENABLE_INSERT_MODE|ENABLE_EXTENDED_FLAGS) ? 1 : 0; if (!GetConsoleMode(ctx.hConOut, &mode)) mode = 0; @@ -982,6 +983,11 @@ WCHAR* CONSOLE_Readline(HANDLE hConsoleIn, BOOL can_pos_cursor) } GetConsoleMode(hConsoleIn, &mode); + if (input_mode != mode) + { + input_mode = mode; + ctx.insertkey = 0; + } ctx.insert = (mode & (ENABLE_INSERT_MODE|ENABLE_EXTENDED_FLAGS)) == (ENABLE_INSERT_MODE|ENABLE_EXTENDED_FLAGS); if (ctx.insertkey)

1 0

Bruno Jesus : include: Add tcpestats.h.
by Alexandre Julliard Aug. 17, 2015

Aug. 17, 2015

Module: wine Branch: master Commit: 2eba32b93613a8c1c7e3dcff19e98979f193b4c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2eba32b93613a8c1c7e3dcff1… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sun Aug 9 00:11:29 2015 +0800 include: Add tcpestats.h. --- include/Makefile.in | 1 + include/tcpestats.h | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index b5229c6..1dc912b 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -580,6 +580,7 @@ SRCDIR_INCLUDES = \ t2embapi.h \ tapi.h \ tchar.h \ + tcpestats.h \ tcpmib.h \ textserv.h \ tlhelp32.h \ diff --git a/include/tcpestats.h b/include/tcpestats.h new file mode 100644 index 0000000..0e22ee6 --- /dev/null +++ b/include/tcpestats.h @@ -0,0 +1,37 @@ +/* + * Copyright (C) 2015 Bruno Jesus + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef _TCPESTATS_ +#define _TCPESTATS_ + +/* Values used in Get/SetPerTcpConnectionEStats */ +typedef enum +{ + TcpConnectionEstatsSynOpts, + TcpConnectionEstatsData, + TcpConnectionEstatsSndCong, + TcpConnectionEstatsPath, + TcpConnectionEstatsSendBuff, + TcpConnectionEstatsRec, + TcpConnectionEstatsObsRec, + TcpConnectionEstatsBandwidth, + TcpConnectionEstatsFineRtt, + TcpConnectionEstatsMaximum +} TCP_ESTATS_TYPE; + +#endif /* _TCPESTATS_ */

1 0

Gerald Pfeifer : oleaut32: Use proper unsigned type in EXPECT_I8(high, low) .
by Alexandre Julliard Aug. 17, 2015

Aug. 17, 2015

Module: wine Branch: master Commit: a9363698d4f848365aa4e9ee3f1ad5153d8edf09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9363698d4f848365aa4e9ee3… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sun Aug 9 02:38:53 2015 +0200 oleaut32: Use proper unsigned type in EXPECT_I8(high,low). --- dlls/oleaut32/tests/vartest.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index cf9e101..9b05fe7 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -1618,7 +1618,7 @@ static const char *szFailOk = "Call failed, hres = %08x\n"; #define EXPECT_UI4(val) EXPECT_OK { EXPECT_TYPE(VT_UI4); \ ok(V_UI4(&vOut) == val, "Expected ui4 = %d, got %d\n", (ULONG)val, V_UI4(&vOut)); } #define EXPECT_I8(high,low) EXPECT_OK { EXPECT_TYPE(VT_I8); \ - ok(V_I8(&vOut) == ((((LONG64)(high))<<32)|(low)), "Expected i8 = %x%08x, got %x%08x\n", \ + ok(V_I8(&vOut) == ((((ULONG64)(high))<<32)|(low)), "Expected i8 = %x%08x, got %x%08x\n", \ (LONG)(high), (LONG)(low), (LONG)(V_I8(&vOut)>>32), (LONG)V_I8(&vOut) ); } #define EXPECT_UI8(val) EXPECT_OK { EXPECT_TYPE(VT_UI8); \ ok(V_UI8(&vOut) == val, "Expected ui8 = 0x%x%08x, got 0x%x%08x\n", \

1 0

André Hentschel : vcomp/tests: Comment out architecture dependent tests (shift count overflow).
by Alexandre Julliard Aug. 17, 2015

Aug. 17, 2015

Module: wine Branch: master Commit: f0b32b8d57d77cb86d5b403a9a0773ea729a9ddc URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0b32b8d57d77cb86d5b403a9… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Aug 9 14:05:40 2015 +0200 vcomp/tests: Comment out architecture dependent tests (shift count overflow). Shifting more than variable width adds zeros on ARM to fill up. --- dlls/vcomp/tests/vcomp.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/vcomp/tests/vcomp.c b/dlls/vcomp/tests/vcomp.c index f24c654..a111d16 100644 --- a/dlls/vcomp/tests/vcomp.c +++ b/dlls/vcomp/tests/vcomp.c @@ -1286,10 +1286,10 @@ static void test_atomic_integer32(void) { p_vcomp_atomic_mul_i4, 0x11223344, -0x77665544, 0xecccdf0 }, { p_vcomp_atomic_or_i4, 0x11223344, 0x77665544, 0x77667744 }, { p_vcomp_atomic_shl_i4, 0x11223344, 3, -0x76ee65e0 }, - { p_vcomp_atomic_shl_i4, 0x11223344, 35, -0x76ee65e0 }, + /* { p_vcomp_atomic_shl_i4, 0x11223344, 35, -0x76ee65e0 }, */ /* depends on Architecture */ { p_vcomp_atomic_shl_i4, -0x11223344, 3, 0x76ee65e0 }, { p_vcomp_atomic_shr_i4, 0x11223344, 3, 0x2244668 }, - { p_vcomp_atomic_shr_i4, 0x11223344, 35, 0x2244668 }, + /* { p_vcomp_atomic_shr_i4, 0x11223344, 35, 0x2244668 }, */ /* depends on Architecture */ { p_vcomp_atomic_shr_i4, -0x11223344, 3, -0x2244669 }, { p_vcomp_atomic_sub_i4, 0x11223344, 0x77665544, -0x66442200 }, { p_vcomp_atomic_xor_i4, 0x11223344, 0x77665544, 0x66446600 }, @@ -1304,7 +1304,7 @@ static void test_atomic_integer32(void) { p_vcomp_atomic_div_ui4, 0x77665544, 0x11223344, 6 }, { p_vcomp_atomic_div_ui4, 0x77665544, 0xeeddccbc, 0 }, { p_vcomp_atomic_shr_ui4, 0x11223344, 3, 0x2244668 }, - { p_vcomp_atomic_shr_ui4, 0x11223344, 35, 0x2244668 }, + /* { p_vcomp_atomic_shr_ui4, 0x11223344, 35, 0x2244668 }, */ /* depends on Architecture */ { p_vcomp_atomic_shr_ui4, 0xeeddccbc, 3, 0x1ddbb997 }, }; int i;

1 0