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

YongHao Hu : msvcp110: Add tr2_sys__Statvfs implementation and test.
by Alexandre Julliard July 7, 2015

July 7, 2015

Module: wine Branch: master Commit: 61beb57c944b4c563f7666482787903e1354bc90 URL: http://source.winehq.org/git/wine.git/?a=commit;h=61beb57c944b4c563f7666482… Author: YongHao Hu <christopherwuy(a)gmail.com> Date: Tue Jul 7 15:10:01 2015 +0800 msvcp110: Add tr2_sys__Statvfs implementation and test. --- dlls/msvcp110/msvcp110.spec | 4 ++-- dlls/msvcp120/msvcp120.spec | 4 ++-- dlls/msvcp120/tests/msvcp120.c | 40 +++++++++++++++++++++++++++++++++++++ dlls/msvcp120_app/msvcp120_app.spec | 4 ++-- dlls/msvcp90/ios.c | 24 ++++++++++++++++++++++ 5 files changed, 70 insertions(+), 6 deletions(-) diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index edc43a8..a8692ec 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -1761,8 +1761,8 @@ @ stub -arch=win64 ?_Stat(a)sys@tr2(a)std@@YA?AW4file_type(a)123@PEBDAEAH(a)Z @ stub -arch=win32 ?_Stat(a)sys@tr2(a)std@@YA?AW4file_type(a)123@PB_WAAH(a)Z @ stub -arch=win64 ?_Stat(a)sys@tr2(a)std@@YA?AW4file_type(a)123@PEB_WAEAH(a)Z -@ stub -arch=win32 ?_Statvfs(a)sys@tr2(a)std@@YA?AUspace_info(a)123@PBD(a)Z -@ stub -arch=win64 ?_Statvfs(a)sys@tr2(a)std@@YA?AUspace_info(a)123@PEBD(a)Z +@ cdecl -arch=win32 ?_Statvfs(a)sys@tr2(a)std@@YA?AUspace_info(a)123@PBD(a)Z(str) tr2_sys__Statvfs +@ cdecl -arch=win64 ?_Statvfs(a)sys@tr2(a)std@@YA?AUspace_info(a)123@PEBD(a)Z(str) tr2_sys__Statvfs @ stub -arch=win32 ?_Statvfs(a)sys@tr2(a)std@@YA?AUspace_info(a)123@PB_W(a)Z @ stub -arch=win64 ?_Statvfs(a)sys@tr2(a)std@@YA?AUspace_info(a)123@PEB_W(a)Z @ cdecl -arch=arm ?_Swap_all(a)_Container_base0@std@@QAAXAAU12@@Z(ptr ptr) Container_base0_Swap_all diff --git a/dlls/msvcp120/msvcp120.spec b/dlls/msvcp120/msvcp120.spec index 4993e01..b251ca3 100644 --- a/dlls/msvcp120/msvcp120.spec +++ b/dlls/msvcp120/msvcp120.spec @@ -1722,8 +1722,8 @@ @ stub -arch=win64 ?_Stat(a)sys@tr2(a)std@@YA?AW4file_type(a)123@PEBDAEAH(a)Z @ stub -arch=win32 ?_Stat(a)sys@tr2(a)std@@YA?AW4file_type(a)123@PB_WAAH(a)Z @ stub -arch=win64 ?_Stat(a)sys@tr2(a)std@@YA?AW4file_type(a)123@PEB_WAEAH(a)Z -@ stub -arch=win32 ?_Statvfs(a)sys@tr2(a)std@@YA?AUspace_info(a)123@PBD(a)Z -@ stub -arch=win64 ?_Statvfs(a)sys@tr2(a)std@@YA?AUspace_info(a)123@PEBD(a)Z +@ cdecl -arch=win32 ?_Statvfs(a)sys@tr2(a)std@@YA?AUspace_info(a)123@PBD(a)Z(str) tr2_sys__Statvfs +@ cdecl -arch=win64 ?_Statvfs(a)sys@tr2(a)std@@YA?AUspace_info(a)123@PEBD(a)Z(str) tr2_sys__Statvfs @ stub -arch=win32 ?_Statvfs(a)sys@tr2(a)std@@YA?AUspace_info(a)123@PB_W(a)Z @ stub -arch=win64 ?_Statvfs(a)sys@tr2(a)std@@YA?AUspace_info(a)123@PEB_W(a)Z @ cdecl -arch=arm ?_Swap_all(a)_Container_base0@std@@QAAXAAU12@@Z(ptr ptr) Container_base0_Swap_all diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c index 3b43c13..bc7c69b 100644 --- a/dlls/msvcp120/tests/msvcp120.c +++ b/dlls/msvcp120/tests/msvcp120.c @@ -38,6 +38,12 @@ typedef struct { BYTE isleadbyte[32]; } _Cvtvec; +struct space_info { + ULONGLONG capacity; + ULONGLONG free; + ULONGLONG available; +}; + static inline const char* debugstr_longlong(ULONGLONG ll) { static char string[17]; @@ -68,6 +74,7 @@ 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); static int (__cdecl *p_tr2_sys__Rename)(char const*, char const*); +static struct space_info (__cdecl *p_tr2_sys__Statvfs)(char const*); static HMODULE msvcp; #define SETNOFAIL(x,y) x = (void*)GetProcAddress(msvcp,y) @@ -112,6 +119,8 @@ static BOOL init(void) "?_Copy_file(a)sys@tr2(a)std@@YAHPEBD0_N(a)Z"); SET(p_tr2_sys__Rename, "?_Rename(a)sys@tr2(a)std@@YAHPEBD0(a)Z"); + SET(p_tr2_sys__Statvfs, + "?_Statvfs(a)sys@tr2(a)std@@YA?AUspace_info(a)123@PEBD(a)Z"); } else { SET(p_tr2_sys__File_size, "?_File_size(a)sys@tr2(a)std@@YA_KPBD(a)Z"); @@ -129,6 +138,8 @@ static BOOL init(void) "?_Copy_file(a)sys@tr2(a)std@@YAHPBD0_N(a)Z"); SET(p_tr2_sys__Rename, "?_Rename(a)sys@tr2(a)std@@YAHPBD0(a)Z"); + SET(p_tr2_sys__Statvfs, + "?_Statvfs(a)sys@tr2(a)std@@YA?AUspace_info(a)123@PBD(a)Z"); } msvcr = GetModuleHandleA("msvcr120.dll"); @@ -668,6 +679,34 @@ static void test_tr2_sys__Rename(void) ok(SetCurrentDirectoryA(current_path), "SetCurrentDirectoryA failed\n"); } +static void test_tr2_sys__Statvfs(void) +{ + struct space_info info; + char current_path[MAX_PATH]; + memset(current_path, 0, MAX_PATH); + p_tr2_sys__Current_get(current_path); + + info = p_tr2_sys__Statvfs(current_path); + ok(info.capacity >= info.free, "test_tr2_sys__Statvfs(): info.capacity < info.free\n"); + ok(info.free >= info.available, "test_tr2_sys__Statvfs(): info.free < info.available\n"); + + info = p_tr2_sys__Statvfs(NULL); + ok(info.available == 0, "test_tr2_sys__Statvfs(): info.available expect: %d, got %s\n", + 0, debugstr_longlong(info.available)); + ok(info.capacity == 0, "test_tr2_sys__Statvfs(): info.capacity expect: %d, got %s\n", + 0, debugstr_longlong(info.capacity)); + ok(info.free == 0, "test_tr2_sys__Statvfs(): info.free expect: %d, got %s\n", + 0, debugstr_longlong(info.free)); + + info = p_tr2_sys__Statvfs("not_exist"); + ok(info.available == 0, "test_tr2_sys__Statvfs(): info.available expect: %d, got %s\n", + 0, debugstr_longlong(info.available)); + ok(info.capacity == 0, "test_tr2_sys__Statvfs(): info.capacity expect: %d, got %s\n", + 0, debugstr_longlong(info.capacity)); + ok(info.free == 0, "test_tr2_sys__Statvfs(): info.free expect: %d, got %s\n", + 0, debugstr_longlong(info.free)); +} + START_TEST(msvcp120) { if(!init()) return; @@ -685,5 +724,6 @@ START_TEST(msvcp120) test_tr2_sys__Remove_dir(); test_tr2_sys__Copy_file(); test_tr2_sys__Rename(); + test_tr2_sys__Statvfs(); FreeLibrary(msvcp); } diff --git a/dlls/msvcp120_app/msvcp120_app.spec b/dlls/msvcp120_app/msvcp120_app.spec index fc7efa2..40db7e3 100644 --- a/dlls/msvcp120_app/msvcp120_app.spec +++ b/dlls/msvcp120_app/msvcp120_app.spec @@ -1722,8 +1722,8 @@ @ stub -arch=win64 ?_Stat(a)sys@tr2(a)std@@YA?AW4file_type(a)123@PEBDAEAH(a)Z @ stub -arch=win32 ?_Stat(a)sys@tr2(a)std@@YA?AW4file_type(a)123@PB_WAAH(a)Z @ stub -arch=win64 ?_Stat(a)sys@tr2(a)std@@YA?AW4file_type(a)123@PEB_WAEAH(a)Z -@ stub -arch=win32 ?_Statvfs(a)sys@tr2(a)std@@YA?AUspace_info(a)123@PBD(a)Z -@ stub -arch=win64 ?_Statvfs(a)sys@tr2(a)std@@YA?AUspace_info(a)123@PEBD(a)Z +@ cdecl -arch=win32 ?_Statvfs(a)sys@tr2(a)std@@YA?AUspace_info(a)123@PBD(a)Z(str) msvcp120.?_Statvfs(a)sys@tr2(a)std@@YA?AUspace_info(a)123@PBD(a)Z +@ cdecl -arch=win64 ?_Statvfs(a)sys@tr2(a)std@@YA?AUspace_info(a)123@PEBD(a)Z(str) msvcp120.?_Statvfs(a)sys@tr2(a)std@@YA?AUspace_info(a)123@PEBD(a)Z @ stub -arch=win32 ?_Statvfs(a)sys@tr2(a)std@@YA?AUspace_info(a)123@PB_W(a)Z @ stub -arch=win64 ?_Statvfs(a)sys@tr2(a)std@@YA?AUspace_info(a)123@PEB_W(a)Z @ cdecl -arch=arm ?_Swap_all(a)_Container_base0@std@@QAAXAAU12@@Z(ptr ptr) msvcp120.?_Swap_all(a)_Container_base0@std@@QAAXAAU12@@Z diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 2628855..2311c58 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -318,6 +318,12 @@ typedef struct { */ } strstream; +struct space_info { + ULONGLONG capacity; + ULONGLONG free; + ULONGLONG available; +}; + #if _MSVCP_VER >= 100 #define VBTABLE_ALIGN 8 #else @@ -14309,6 +14315,24 @@ int __cdecl tr2_sys__Rename(char const* old_path, char const* new_path) return GetLastError(); } +/* ?_Statvfs(a)sys@tr2(a)std@@YA?AUspace_info(a)123@PBD(a)Z */ +/* ?_Statvfs(a)sys@tr2(a)std@@YA?AUspace_info(a)123@PEBD(a)Z */ +struct space_info __cdecl tr2_sys__Statvfs(const char* path) +{ + ULARGE_INTEGER available, total, free; + struct space_info info; + TRACE("(%s)\n", debugstr_a(path)); + + if(!path || !GetDiskFreeSpaceExA(path, &available, &total, &free)) { + info.capacity = info.free = info.available = 0; + }else { + info.capacity = total.QuadPart; + info.free = free.QuadPart; + info.available = available.QuadPart; + } + return info; +} + /* ??0strstream(a)std@@QAE(a)PADHH@Z */ /* ??0strstream(a)std@@QEAA(a)PEAD_JH@Z */ #if STREAMSIZE_BITS == 64

1 0

YongHao Hu : msvcp110: Add tr2_sys__Rename implementation and test.
by Alexandre Julliard July 7, 2015

July 7, 2015

Module: wine Branch: master Commit: de571b8a74ac5ab9358a7e51d77dc882af524a91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de571b8a74ac5ab9358a7e51d… Author: YongHao Hu <christopherwuy(a)gmail.com> Date: Tue Jul 7 15:09:39 2015 +0800 msvcp110: Add tr2_sys__Rename implementation and test. --- dlls/msvcp110/msvcp110.spec | 4 +- dlls/msvcp120/msvcp120.spec | 4 +- dlls/msvcp120/tests/msvcp120.c | 83 +++++++++++++++++++++++++++++++++++++ dlls/msvcp120_app/msvcp120_app.spec | 4 +- dlls/msvcp90/ios.c | 14 +++++++ 5 files changed, 103 insertions(+), 6 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=de571b8a74ac5ab9358a7…

1 0

YongHao Hu : msvcp110: Add tr2_sys__Copy_file implementation and test.
by Alexandre Julliard July 7, 2015

July 7, 2015

Module: wine Branch: master Commit: 7692d400c90d4832c997903f07484b2e0859ea28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7692d400c90d4832c997903f0… Author: YongHao Hu <christopherwuy(a)gmail.com> Date: Tue Jul 7 15:07:23 2015 +0800 msvcp110: Add tr2_sys__Copy_file implementation and test. --- dlls/msvcp110/msvcp110.spec | 4 +-- dlls/msvcp120/msvcp120.spec | 4 +-- dlls/msvcp120/tests/msvcp120.c | 63 ++++++++++++++++++++++++++++++++++++- dlls/msvcp120_app/msvcp120_app.spec | 4 +-- dlls/msvcp90/ios.c | 11 +++++++ 5 files changed, 79 insertions(+), 7 deletions(-) diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index cc4d157..5054016 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -1163,8 +1163,8 @@ @ extern -arch=win64 ?_Clocptr(a)_Locimp@locale(a)std@@0PEAV123(a)EA locale__Locimp__Clocptr @ stub -arch=win32 ?_Close_dir(a)sys@tr2(a)std@@YAXPAX(a)Z @ stub -arch=win64 ?_Close_dir(a)sys@tr2(a)std@@YAXPEAX(a)Z -@ stub -arch=win32 ?_Copy_file(a)sys@tr2(a)std@@YAHPBD0_N(a)Z -@ stub -arch=win64 ?_Copy_file(a)sys@tr2(a)std@@YAHPEBD0_N(a)Z +@ cdecl -arch=win32 ?_Copy_file(a)sys@tr2(a)std@@YAHPBD0_N(a)Z(str str long) tr2_sys__Copy_file +@ cdecl -arch=win64 ?_Copy_file(a)sys@tr2(a)std@@YAHPEBD0_N(a)Z(str str long) tr2_sys__Copy_file @ stub -arch=win32 ?_Copy_file(a)sys@tr2(a)std@@YAHPB_W0_N(a)Z @ 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 diff --git a/dlls/msvcp120/msvcp120.spec b/dlls/msvcp120/msvcp120.spec index 488bb01..2305af4 100644 --- a/dlls/msvcp120/msvcp120.spec +++ b/dlls/msvcp120/msvcp120.spec @@ -1128,8 +1128,8 @@ @ extern -arch=win64 ?_Clocptr(a)_Locimp@locale(a)std@@0PEAV123(a)EA locale__Locimp__Clocptr @ stub -arch=win32 ?_Close_dir(a)sys@tr2(a)std@@YAXPAX(a)Z @ stub -arch=win64 ?_Close_dir(a)sys@tr2(a)std@@YAXPEAX(a)Z -@ stub -arch=win32 ?_Copy_file(a)sys@tr2(a)std@@YAHPBD0_N(a)Z -@ stub -arch=win64 ?_Copy_file(a)sys@tr2(a)std@@YAHPEBD0_N(a)Z +@ cdecl -arch=win32 ?_Copy_file(a)sys@tr2(a)std@@YAHPBD0_N(a)Z(str str long) tr2_sys__Copy_file +@ cdecl -arch=win64 ?_Copy_file(a)sys@tr2(a)std@@YAHPEBD0_N(a)Z(str str long) tr2_sys__Copy_file @ stub -arch=win32 ?_Copy_file(a)sys@tr2(a)std@@YAHPB_W0_N(a)Z @ 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 diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c index e97aa55..40c0117 100644 --- a/dlls/msvcp120/tests/msvcp120.c +++ b/dlls/msvcp120/tests/msvcp120.c @@ -66,6 +66,7 @@ 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*); 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 HMODULE msvcp; #define SETNOFAIL(x,y) x = (void*)GetProcAddress(msvcp,y) @@ -106,6 +107,8 @@ static BOOL init(void) "?_Make_dir(a)sys@tr2(a)std@@YAHPEBD(a)Z"); SET(p_tr2_sys__Remove_dir, "?_Remove_dir(a)sys@tr2(a)std@@YA_NPEBD(a)Z"); + SET(p_tr2_sys__Copy_file, + "?_Copy_file(a)sys@tr2(a)std@@YAHPEBD0_N(a)Z"); } else { SET(p_tr2_sys__File_size, "?_File_size(a)sys@tr2(a)std@@YA_KPBD(a)Z"); @@ -119,6 +122,8 @@ static BOOL init(void) "?_Make_dir(a)sys@tr2(a)std@@YAHPBD(a)Z"); SET(p_tr2_sys__Remove_dir, "?_Remove_dir(a)sys@tr2(a)std@@YA_NPBD(a)Z"); + SET(p_tr2_sys__Copy_file, + "?_Copy_file(a)sys@tr2(a)std@@YAHPBD0_N(a)Z"); } msvcr = GetModuleHandleA("msvcr120.dll"); @@ -329,11 +334,12 @@ static void test_tr2_sys__File_size(void) { ULONGLONG val; HANDLE file; - LARGE_INTEGER file_size = {{7, 0}}; + LARGE_INTEGER file_size; CreateDirectoryA("tr2_test_dir", NULL); file = CreateFileA("tr2_test_dir/f1", GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL); ok(file != INVALID_HANDLE_VALUE, "create file failed: INVALID_HANDLE_VALUE\n"); + file_size.QuadPart = 7; ok(SetFilePointerEx(file, file_size, NULL, FILE_BEGIN), "SetFilePointerEx failed\n"); ok(SetEndOfFile(file), "SetEndOfFile failed\n"); CloseHandle(file); @@ -526,6 +532,60 @@ static void test_tr2_sys__Remove_dir(void) } } +static void test_tr2_sys__Copy_file(void) +{ + HANDLE file; + int ret, i; + LARGE_INTEGER file_size; + struct { + char const *source; + char const *dest; + MSVCP_bool fail_if_exists; + int last_error; + MSVCP_bool is_todo; + } tests[] = { + { "f1", "f1_copy", TRUE, ERROR_SUCCESS, FALSE }, + { "f1", "tr2_test_dir\\f1_copy", TRUE, ERROR_SUCCESS, FALSE }, + { "f1", "tr2_test_dir\\f1_copy", TRUE, ERROR_FILE_EXISTS, FALSE }, + { "f1", "tr2_test_dir\\f1_copy", FALSE, ERROR_SUCCESS, FALSE }, + { "f1", "tr2_test_dir", TRUE, ERROR_ACCESS_DENIED, TRUE }, + { "tr2_test_dir", "f1", TRUE, ERROR_ACCESS_DENIED, FALSE }, + { "tr2_test_dir", "tr2_test_dir_copy", TRUE, ERROR_ACCESS_DENIED, FALSE }, + { NULL, "f1", TRUE, ERROR_INVALID_PARAMETER, TRUE }, + { "f1", NULL, TRUE, ERROR_INVALID_PARAMETER, TRUE }, + { "not_exist", "tr2_test_dir", TRUE, ERROR_FILE_NOT_FOUND, FALSE }, + { "f1", "not_exist_dir\\f1_copy", TRUE, ERROR_PATH_NOT_FOUND, FALSE } + }; + + ret = p_tr2_sys__Make_dir("tr2_test_dir"); + ok(ret == 1, "test_tr2_sys__Make_dir(): expect 1 got %d\n", ret); + file = CreateFileA("f1", GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL); + ok(file != INVALID_HANDLE_VALUE, "create file failed: INVALID_HANDLE_VALUE\n"); + file_size.QuadPart = 7; + ok(SetFilePointerEx(file, file_size, NULL, FILE_BEGIN), "SetFilePointerEx failed\n"); + ok(SetEndOfFile(file), "SetEndOfFile failed\n"); + CloseHandle(file); + + for(i=0; i<sizeof(tests)/sizeof(tests[0]); i++) { + errno = 0xdeadbeef; + ret = p_tr2_sys__Copy_file(tests[i].source, tests[i].dest, tests[i].fail_if_exists); + if(tests[i].is_todo) + todo_wine ok(ret == tests[i].last_error, "test_tr2_sys__Copy_file(): test %d expect: %d, got %d\n", i+1, tests[i].last_error, ret); + else + ok(ret == tests[i].last_error, "test_tr2_sys__Copy_file(): test %d expect: %d, got %d\n", i+1, tests[i].last_error, ret); + ok(errno == 0xdeadbeef, "test_tr2_sys__Copy_file(): test %d errno expect 0xdeadbeef, got %d\n", i+1, errno); + if(ret == ERROR_SUCCESS) + ok(p_tr2_sys__File_size(tests[i].source) == p_tr2_sys__File_size(tests[i].dest), + "test_tr2_sys__Copy_file(): test %d failed, two files' size are not equal\n", i+1); + } + + ok(DeleteFileA("f1"), "expect f1 to exist\n"); + ok(DeleteFileA("f1_copy"), "expect f1_copy to exist\n"); + ok(DeleteFileA("tr2_test_dir/f1_copy"), "expect tr2_test_dir/f1 to exist\n"); + ret = p_tr2_sys__Remove_dir("tr2_test_dir"); + ok(ret == 1, "test_tr2_sys__Remove_dir(): expect 1 got %d\n", ret); +} + START_TEST(msvcp120) { if(!init()) return; @@ -541,5 +601,6 @@ START_TEST(msvcp120) test_tr2_sys__Current_set(); test_tr2_sys__Make_dir(); test_tr2_sys__Remove_dir(); + test_tr2_sys__Copy_file(); FreeLibrary(msvcp); } diff --git a/dlls/msvcp120_app/msvcp120_app.spec b/dlls/msvcp120_app/msvcp120_app.spec index 3633567..36a66d4 100644 --- a/dlls/msvcp120_app/msvcp120_app.spec +++ b/dlls/msvcp120_app/msvcp120_app.spec @@ -1128,8 +1128,8 @@ @ extern -arch=win64 ?_Clocptr(a)_Locimp@locale(a)std@@0PEAV123(a)EA msvcp120.?_Clocptr(a)_Locimp@locale(a)std@@0PEAV123(a)EA @ stub -arch=win32 ?_Close_dir(a)sys@tr2(a)std@@YAXPAX(a)Z @ stub -arch=win64 ?_Close_dir(a)sys@tr2(a)std@@YAXPEAX(a)Z -@ stub -arch=win32 ?_Copy_file(a)sys@tr2(a)std@@YAHPBD0_N(a)Z -@ stub -arch=win64 ?_Copy_file(a)sys@tr2(a)std@@YAHPEBD0_N(a)Z +@ cdecl -arch=win32 ?_Copy_file(a)sys@tr2(a)std@@YAHPBD0_N(a)Z(str str long) msvcp120.?_Copy_file(a)sys@tr2(a)std@@YAHPBD0_N(a)Z +@ cdecl -arch=win64 ?_Copy_file(a)sys@tr2(a)std@@YAHPEBD0_N(a)Z(str str long) msvcp120.?_Copy_file(a)sys@tr2(a)std@@YAHPEBD0_N(a)Z @ stub -arch=win32 ?_Copy_file(a)sys@tr2(a)std@@YAHPB_W0_N(a)Z @ 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 diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 218c6c7..20804ec 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -14284,6 +14284,17 @@ MSVCP_bool __cdecl tr2_sys__Remove_dir(char const* path) return RemoveDirectoryA(path) != 0; } +/* ?_Copy_file(a)sys@tr2(a)std@@YAHPBD0_N(a)Z */ +/* ?_Copy_file(a)sys@tr2(a)std@@YAHPEBD0_N(a)Z */ +int __cdecl tr2_sys__Copy_file(char const* source, char const* dest, MSVCP_bool fail_if_exists) +{ + TRACE("(%s %s %x)\n", debugstr_a(source), debugstr_a(dest), fail_if_exists); + + if(CopyFileA(source, dest, fail_if_exists)) + return ERROR_SUCCESS; + return GetLastError(); +} + /* ??0strstream(a)std@@QAE(a)PADHH@Z */ /* ??0strstream(a)std@@QEAA(a)PEAD_JH@Z */ #if STREAMSIZE_BITS == 64

1 0

Damjan Jovanovic : ole32: Convey the Alt button state to the drop target.
by Alexandre Julliard July 7, 2015

July 7, 2015

Module: wine Branch: master Commit: 372b0e1e80be906a75c2fda3877703942d635de5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=372b0e1e80be906a75c2fda38… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Sat Jul 4 15:36:29 2015 +0200 ole32: Convey the Alt button state to the drop target. --- dlls/ole32/ole2.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c index b0a8c3b..09cbccf 100644 --- a/dlls/ole32/ole2.c +++ b/dlls/ole32/ole2.c @@ -2453,6 +2453,9 @@ static DWORD OLEDD_GetButtonState(void) if ( (keyboardState[VK_CONTROL] & 0x80) !=0) keyMask |= MK_CONTROL; + if ( (keyboardState[VK_MENU] & 0x80) !=0) + keyMask |= MK_ALT; + if ( (keyboardState[VK_LBUTTON] & 0x80) !=0) keyMask |= MK_LBUTTON;

1 0

Vincent Povirk : ole32: Add a storage test using a custom ILockBytes.
by Alexandre Julliard July 7, 2015

July 7, 2015

Module: wine Branch: master Commit: 8ff3783586814aa1a38fc46c41e8e0047455208e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ff3783586814aa1a38fc46c4… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Jul 6 14:17:17 2015 -0500 ole32: Add a storage test using a custom ILockBytes. --- dlls/ole32/tests/storage32.c | 214 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 214 insertions(+) diff --git a/dlls/ole32/tests/storage32.c b/dlls/ole32/tests/storage32.c index 0113d1b..63a803a 100644 --- a/dlls/ole32/tests/storage32.c +++ b/dlls/ole32/tests/storage32.c @@ -57,6 +57,194 @@ static int strcmp_ww(LPCWSTR strw1, LPCWSTR strw2) return lstrcmpA(stra1, stra2); } +typedef struct TestLockBytes { + ILockBytes ILockBytes_iface; + LONG ref; + BYTE* contents; + ULONG size; + ULONG buffer_size; +} TestLockBytes; + +static inline TestLockBytes *impl_from_ILockBytes(ILockBytes *iface) +{ + return CONTAINING_RECORD(iface, TestLockBytes, ILockBytes_iface); +} + +static HRESULT WINAPI TestLockBytes_QueryInterface(ILockBytes *iface, REFIID iid, + void **ppv) +{ + TestLockBytes *This = impl_from_ILockBytes(iface); + + if (!ppv) return E_INVALIDARG; + + if (IsEqualIID(&IID_IUnknown, iid) || + IsEqualIID(&IID_ILockBytes, iid)) + *ppv = &This->ILockBytes_iface; + else + return E_NOINTERFACE; + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI TestLockBytes_AddRef(ILockBytes *iface) +{ + TestLockBytes *This = impl_from_ILockBytes(iface); + ULONG ref = InterlockedIncrement(&This->ref); + return ref; +} + +static ULONG WINAPI TestLockBytes_Release(ILockBytes *iface) +{ + TestLockBytes *This = impl_from_ILockBytes(iface); + ULONG ref = InterlockedDecrement(&This->ref); + return ref; +} + +static HRESULT WINAPI TestLockBytes_ReadAt(ILockBytes *iface, + ULARGE_INTEGER ulOffset, void *pv, ULONG cb, ULONG *pcbRead) +{ + TestLockBytes *This = impl_from_ILockBytes(iface); + ULONG dummy; + + if (!pv) return E_INVALIDARG; + + if (!pcbRead) pcbRead = &dummy; + + if (ulOffset.QuadPart >= This->size) + { + *pcbRead = 0; + return S_OK; + } + + cb = min(cb, This->size - ulOffset.QuadPart); + + *pcbRead = cb; + memcpy(pv, &This->contents[ulOffset.QuadPart], cb); + + return S_OK; +} + +static HRESULT WINAPI TestLockBytes_WriteAt(ILockBytes *iface, + ULARGE_INTEGER ulOffset, const void *pv, ULONG cb, ULONG *pcbWritten) +{ + TestLockBytes *This = impl_from_ILockBytes(iface); + HRESULT hr; + ULONG dummy; + + if (!pv) return E_INVALIDARG; + + if (!pcbWritten) pcbWritten = &dummy; + + if (ulOffset.QuadPart + cb > This->size) + { + ULARGE_INTEGER new_size; + new_size.QuadPart = ulOffset.QuadPart + cb; + hr = ILockBytes_SetSize(iface, new_size); + if (FAILED(hr)) return hr; + } + + *pcbWritten = cb; + memcpy(&This->contents[ulOffset.QuadPart], pv, cb); + + return S_OK; +} + +static HRESULT WINAPI TestLockBytes_Flush(ILockBytes *iface) +{ + return S_OK; +} + +static HRESULT WINAPI TestLockBytes_SetSize(ILockBytes *iface, + ULARGE_INTEGER cb) +{ + TestLockBytes *This = impl_from_ILockBytes(iface); + + if (This->buffer_size < cb.QuadPart) + { + ULONG new_buffer_size = max(This->buffer_size * 2, cb.QuadPart); + BYTE* new_buffer = HeapAlloc(GetProcessHeap(), 0, new_buffer_size); + if (!new_buffer) return E_OUTOFMEMORY; + memcpy(new_buffer, This->contents, This->size); + HeapFree(GetProcessHeap(), 0, This->contents); + This->contents = new_buffer; + } + + if (cb.QuadPart > This->size) + memset(&This->contents[This->size], 0, cb.QuadPart - This->size); + + This->size = cb.QuadPart; + + return S_OK; +} + +static HRESULT WINAPI TestLockBytes_LockRegion(ILockBytes *iface, + ULARGE_INTEGER libOffset, ULARGE_INTEGER cb, DWORD dwLockType) +{ + return S_OK; +} + +static HRESULT WINAPI TestLockBytes_UnlockRegion(ILockBytes *iface, + ULARGE_INTEGER libOffset, ULARGE_INTEGER cb, DWORD dwLockType) +{ + return S_OK; +} + +static HRESULT WINAPI TestLockBytes_Stat(ILockBytes *iface, + STATSTG *pstatstg, DWORD grfStatFlag) +{ + TestLockBytes *This = impl_from_ILockBytes(iface); + static const WCHAR dummy_name[] = {'d','u','m','m','y',0}; + + if (!pstatstg) return E_INVALIDARG; + + memset(pstatstg, 0, sizeof(STATSTG)); + + if (!(grfStatFlag & STATFLAG_NONAME)) + { + pstatstg->pwcsName = CoTaskMemAlloc(sizeof(dummy_name)); + if (!pstatstg->pwcsName) return E_OUTOFMEMORY; + memcpy(pstatstg->pwcsName, dummy_name, sizeof(dummy_name)); + } + + pstatstg->type = STGTY_LOCKBYTES; + pstatstg->cbSize.QuadPart = This->size; + + return S_OK; +} + +static const ILockBytesVtbl TestLockBytes_Vtbl = { + TestLockBytes_QueryInterface, + TestLockBytes_AddRef, + TestLockBytes_Release, + TestLockBytes_ReadAt, + TestLockBytes_WriteAt, + TestLockBytes_Flush, + TestLockBytes_SetSize, + TestLockBytes_LockRegion, + TestLockBytes_UnlockRegion, + TestLockBytes_Stat +}; + +static void CreateTestLockBytes(TestLockBytes **This) +{ + *This = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(**This)); + + if (*This) + { + (*This)->ILockBytes_iface.lpVtbl = &TestLockBytes_Vtbl; + (*This)->ref = 1; + } +} + +static void DeleteTestLockBytes(TestLockBytes *This) +{ + ok(This->ILockBytes_iface.lpVtbl == &TestLockBytes_Vtbl, "test lock bytes %p deleted with incorrect vtable\n", This); + ok(This->ref == 1, "test lock bytes %p deleted with %i references instead of 1\n", This, This->ref); + HeapFree(GetProcessHeap(), 0, This->contents); + HeapFree(GetProcessHeap(), 0, This); +} + static void test_hglobal_storage_stat(void) { ILockBytes *ilb = NULL; @@ -3645,6 +3833,31 @@ static void test_overwrite(void) DeleteFileA(filenameA); } +static void test_custom_lockbytes(void) +{ + static const WCHAR stmname[] = { 'C','O','N','T','E','N','T','S',0 }; + TestLockBytes* lockbytes; + HRESULT hr; + IStorage* stg; + IStream* stm; + + CreateTestLockBytes(&lockbytes); + + hr = StgCreateDocfileOnILockBytes(&lockbytes->ILockBytes_iface, STGM_CREATE|STGM_READWRITE|STGM_TRANSACTED, 0, &stg); + ok(hr==S_OK, "StgCreateDocfileOnILockBytes failed %x\n", hr); + + hr = IStorage_CreateStream(stg, stmname, STGM_SHARE_EXCLUSIVE|STGM_READWRITE, 0, 0, &stm); + ok(hr==S_OK, "IStorage_CreateStream failed %x\n", hr); + + IStream_Release(stm); + + hr = IStorage_Commit(stg, 0); + + IStorage_Release(stg); + + DeleteTestLockBytes(lockbytes); +} + START_TEST(storage32) { CHAR temp[MAX_PATH]; @@ -3693,4 +3906,5 @@ START_TEST(storage32) test_locking(); test_transacted_shared(); test_overwrite(); + test_custom_lockbytes(); }

1 0

Nikolay Sivov : dwrite: Implement GetPanose().
by Alexandre Julliard July 7, 2015

July 7, 2015

Module: wine Branch: master Commit: 50bf5fca3470396d8a490abc3d87ffa9c33167d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=50bf5fca3470396d8a490abc3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jul 6 23:08:37 2015 +0300 dwrite: Implement GetPanose(). --- dlls/dwrite/dwrite_private.h | 10 +++++++-- dlls/dwrite/font.c | 12 +++++++++-- dlls/dwrite/gdiinterop.c | 10 ++++----- dlls/dwrite/opentype.c | 19 ++++++++++------- dlls/dwrite/tests/font.c | 50 ++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 83 insertions(+), 18 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=50bf5fca3470396d8a490…

1 0

Nikolay Sivov : dwrite: Remove a couple of useless checks.
by Alexandre Julliard July 7, 2015

July 7, 2015

Module: wine Branch: master Commit: f039e15182785d36bc28463456ad197bd1558a9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f039e15182785d36bc2846345… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jul 6 23:07:39 2015 +0300 dwrite: Remove a couple of useless checks. --- dlls/dwrite/layout.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 1fb49c1..d91da0d 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -1389,16 +1389,12 @@ static HRESULT layout_compute_effective_runs(struct dwrite_textlayout *layout) while (erun && erun->line == line) { erun->origin_y = origin_y; erun = layout_get_next_erun(layout, erun); - if (!erun) - break; } /* Same for inline runs */ while (inrun && inrun->line == line) { inrun->origin_y = origin_y; inrun = layout_get_next_inline_run(layout, inrun); - if (!inrun) - break; } layout->metrics.height += layout->lines[line].height;

1 0

Piotr Caban : msvcrt: Add _mbscat_s_l implementation.
by Alexandre Julliard July 7, 2015

July 7, 2015

Module: wine Branch: master Commit: cf2073144782a46c727837482ca4681727226606 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf2073144782a46c727837482… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jul 6 19:40:10 2015 +0200 msvcrt: Add _mbscat_s_l implementation. --- dlls/msvcr100/msvcr100.spec | 4 +-- dlls/msvcr110/msvcr110.spec | 4 +-- dlls/msvcr120/msvcr120.spec | 4 +-- dlls/msvcr80/msvcr80.spec | 4 +-- dlls/msvcr90/msvcr90.spec | 4 +-- dlls/msvcrt/mbcs.c | 50 +++++++++++++++++++++++++++ dlls/msvcrt/msvcrt.h | 1 + dlls/msvcrt/msvcrt.spec | 4 +-- dlls/msvcrt/tests/string.c | 83 +++++++++++++++++++++++++++++++++++++++++++++ 9 files changed, 146 insertions(+), 12 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 986e372..f9eae91 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1096,8 +1096,8 @@ @ stub _mblen_l @ cdecl _mbsbtype(str long) @ stub _mbsbtype_l -@ stub _mbscat_s -@ stub _mbscat_s_l +@ cdecl _mbscat_s(ptr long str) +@ cdecl _mbscat_s_l(ptr long str ptr) @ cdecl _mbschr(str long) @ stub _mbschr_l @ cdecl _mbscmp(str str) diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 78131aa..3faca07 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1454,8 +1454,8 @@ @ stub _mblen_l @ cdecl _mbsbtype(str long) @ stub _mbsbtype_l -@ stub _mbscat_s -@ stub _mbscat_s_l +@ cdecl _mbscat_s(ptr long str) +@ cdecl _mbscat_s_l(ptr long str ptr) @ cdecl _mbschr(str long) @ stub _mbschr_l @ cdecl _mbscmp(str str) diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 9fb8d93..5077a67 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1462,8 +1462,8 @@ @ stub _mblen_l @ cdecl _mbsbtype(str long) @ stub _mbsbtype_l -@ stub _mbscat_s -@ stub _mbscat_s_l +@ cdecl _mbscat_s(ptr long str) +@ cdecl _mbscat_s_l(ptr long str ptr) @ cdecl _mbschr(str long) @ stub _mbschr_l @ cdecl _mbscmp(str str) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index ef24b91..fac2446 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -769,8 +769,8 @@ @ stub _mblen_l @ cdecl _mbsbtype(str long) @ stub _mbsbtype_l -@ stub _mbscat_s -@ stub _mbscat_s_l +@ cdecl _mbscat_s(ptr long str) +@ cdecl _mbscat_s_l(ptr long str ptr) @ cdecl _mbschr(str long) @ stub _mbschr_l @ cdecl _mbscmp(str str) diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index e58b8f9..479b88b 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -746,8 +746,8 @@ @ stub _mblen_l @ cdecl _mbsbtype(str long) @ stub _mbsbtype_l -@ stub _mbscat_s -@ stub _mbscat_s_l +@ cdecl _mbscat_s(ptr long str) +@ cdecl _mbscat_s_l(ptr long str ptr) @ cdecl _mbschr(str long) @ stub _mbschr_l @ cdecl _mbscmp(str str) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index 8c4bc02..240ec2c 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -1053,6 +1053,56 @@ unsigned char * CDECL _mbscat( unsigned char *dst, const unsigned char *src ) } /********************************************************************* + * _mbscat_s_l (MSVCRT.@) + */ +int CDECL _mbscat_s_l( unsigned char *dst, MSVCRT_size_t size, + const unsigned char *src, MSVCRT__locale_t locale ) +{ + MSVCRT_size_t i, j; + int ret = 0; + + if(!MSVCRT_CHECK_PMT(dst != NULL)) return MSVCRT_EINVAL; + if(!MSVCRT_CHECK_PMT(src != NULL)) return MSVCRT_EINVAL; + + for(i=0; i<size; i++) + if(!dst[i]) break; + if(i == size) { + MSVCRT_INVALID_PMT("dst is not NULL-terminated", MSVCRT_EINVAL); + if(size) dst[0] = 0; + return MSVCRT_EINVAL; + } + + if(i && _ismbblead_l(dst[i-1], locale)) { + ret = MSVCRT_EILSEQ; + i--; + } + + for(j=0; src[j] && i+j<size; j++) + dst[i+j] = src[j]; + if(i+j == size) { + MSVCRT_INVALID_PMT("dst buffer is to small", MSVCRT_ERANGE); + dst[0] = 0; + return MSVCRT_ERANGE; + } + + if(j && _ismbblead_l(src[j-1], locale)) { + ret = MSVCRT_EILSEQ; + j--; + } + + dst[i+j] = 0; + return ret; +} + +/********************************************************************* + * _mbscat_s (MSVCRT.@) + */ +int CDECL _mbscat_s( unsigned char *dst, MSVCRT_size_t size, const unsigned char *src ) +{ + return _mbscat_s_l(dst, size, src, NULL); +} + +/********************************************************************* * _mbscpy (MSVCRT.@) */ unsigned char* CDECL _mbscpy( unsigned char *dst, const unsigned char *src ) diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 19f3c10..88f35b3 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -1009,6 +1009,7 @@ int _setmbcp_l(int, LCID, MSVCRT_pthreadmbcinfo) DECLSPEC_HIDDEN; int __cdecl MSVCRT__write(int,const void*,unsigned int); int __cdecl _getch(void); int __cdecl _ismbblead(unsigned int); +int __cdecl _ismbblead_l(unsigned int, MSVCRT__locale_t); int __cdecl _ismbclegal(unsigned int c); int __cdecl _ismbstrail(const unsigned char* start, const unsigned char* str); int __cdecl MSVCRT_mbtowc(MSVCRT_wchar_t*,const char*,MSVCRT_size_t); diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 7fb13a6..37b94e3 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -713,8 +713,8 @@ @ cdecl _mbsbtype(str long) # stub _mbsbtype_l(str long ptr) @ cdecl _mbscat(str str) -# stub _mbscat_s(str long str) -# stub _mbscat_s_l(str long str ptr) +@ cdecl _mbscat_s(ptr long str) +@ cdecl _mbscat_s_l(ptr long str ptr) @ cdecl _mbschr(str long) # stub _mbschr_l(str long ptr) @ cdecl _mbscmp(str str) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 5768c0f..476f762 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -58,6 +58,7 @@ static int (__cdecl *p_memmove_s)(void *, size_t, const void *, size_t); static int* (__cdecl *pmemcmp)(void *, const void *, size_t n); static int (__cdecl *pstrcpy_s)(char *dst, size_t len, const char *src); static int (__cdecl *pstrcat_s)(char *dst, size_t len, const char *src); +static int (__cdecl *p_mbscat_s)(unsigned char *dst, size_t size, const unsigned char *src); static int (__cdecl *p_mbsnbcat_s)(unsigned char *dst, size_t size, const unsigned char *src, size_t count); static int (__cdecl *p_mbsnbcpy_s)(unsigned char * dst, size_t size, const unsigned char * src, size_t count); static int (__cdecl *p__mbscpy_s)(unsigned char*, size_t, const unsigned char*); @@ -732,6 +733,86 @@ static void test_strcat_s(void) ok(ret == EINVAL, "strcat_s: Writing to a NULL string returned %d, expected EINVAL\n", ret); } +static void test__mbscat_s(void) +{ + unsigned char dst[8], src[4]; + int err; + int prev_cp = _getmbcp(); + + if(!p_mbscat_s) + { + win_skip("_mbscat_s not found\n"); + return; + } + + + src[0] = dst[0] = 0; + err = p_mbscat_s(NULL, sizeof(dst), src); + ok(err == EINVAL, "_mbscat_s returned %d\n", err); + + err = p_mbscat_s(dst, sizeof(dst), NULL); + ok(err == EINVAL, "_mbscat_s returned %d\n", err); + + dst[0] = 'a'; + err = p_mbscat_s(dst, 1, src); + ok(err == EINVAL, "_mbscat_s returned %d\n", err); + + memset(dst, 'a', sizeof(dst)); + dst[6] = 0; + src[0] = 'b'; + src[1] = 0; + + err = p_mbscat_s(dst, sizeof(dst), src); + ok(err == 0, "_mbscat_s returned %d\n", err); + ok(!memcmp(dst, "aaaaaab", 8), "dst = %s\n", dst); + + err = p_mbscat_s(dst, sizeof(dst), src); + ok(err == ERANGE, "_mbscat_s returned %d\n", err); + ok(!dst[0], "dst[0] = %c\n", dst[0]); + ok(dst[1] == 'a', "dst[1] = %c\n", dst[1]); + + _setmbcp(932); + /* test invalid str in dst */ + dst[0] = 0x81; + dst[1] = 0x81; + dst[2] = 0x52; + dst[3] = 0; + src[0] = 'a'; + src[1] = 0; + err = p_mbscat_s(dst, sizeof(dst), src); + ok(err == 0, "_mbscat_s returned %d\n", err); + + /* test invalid str in src */ + dst[0] = 0; + src[0] = 0x81; + src[1] = 0x81; + src[2] = 0x52; + src[3] = 0; + err = p_mbscat_s(dst, sizeof(dst), src); + ok(err == 0, "_mbscat_s returned %d\n", err); + + /* test dst with leading byte on the end of buffer */ + dst[0] = 'a'; + dst[1] = 0x81; + dst[2] = 0; + src[0] = 'R'; + src[1] = 0; + err = p_mbscat_s(dst, sizeof(dst), src); + ok(err == EILSEQ, "_mbscat_s returned %d\n", err); + ok(!memcmp(dst, "aR", 3), "dst = %s\n", dst); + + /* test src with leading byte on the end of buffer */ + dst[0] = 'a'; + dst[1] = 0; + src[0] = 'b'; + src[1] = 0x81; + src[2] = 0; + err = p_mbscat_s(dst, sizeof(dst), src); + ok(err == EILSEQ, "_mbscat_s returned %d\n", err); + ok(!memcmp(dst, "ab", 3), "dst = %s\n", dst); + _setmbcp(prev_cp); +} + static void test__mbsnbcpy_s(void) { unsigned char dest[8]; @@ -2984,6 +3065,7 @@ START_TEST(string) SET(p__mb_cur_max,"__mb_cur_max"); pstrcpy_s = (void *)GetProcAddress( hMsvcrt,"strcpy_s" ); pstrcat_s = (void *)GetProcAddress( hMsvcrt,"strcat_s" ); + p_mbscat_s = (void*)GetProcAddress( hMsvcrt, "_mbscat_s" ); p_mbsnbcat_s = (void *)GetProcAddress( hMsvcrt,"_mbsnbcat_s" ); p_mbsnbcpy_s = (void *)GetProcAddress( hMsvcrt,"_mbsnbcpy_s" ); p__mbscpy_s = (void *)GetProcAddress( hMsvcrt,"_mbscpy_s" ); @@ -3037,6 +3119,7 @@ START_TEST(string) test_memcpy_s(); test_memmove_s(); test_strcat_s(); + test__mbscat_s(); test__mbsnbcpy_s(); test__mbscpy_s(); test_mbcjisjms();

1 0

Nikolay Sivov : dwrite/tests: Extend GetGdiCompatibleMetrics() test to test DWRITE_FONT_METRICS1 as well.
by Alexandre Julliard July 7, 2015

July 7, 2015

Module: wine Branch: master Commit: 9375b06c3a2648677ebb66ebd9bcd477a2ddd9cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=9375b06c3a2648677ebb66ebd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jul 6 23:08:59 2015 +0300 dwrite/tests: Extend GetGdiCompatibleMetrics() test to test DWRITE_FONT_METRICS1 as well. --- dlls/dwrite/tests/font.c | 185 ++++++++++++++++++++++++++++++++++++----------- 1 file changed, 141 insertions(+), 44 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9375b06c3a2648677ebb6…

1 0

Alistair Leslie-Hughes : d3drm: Add DllCanUnloadNow, DllGetClassObject stubs.
by Alexandre Julliard July 7, 2015

July 7, 2015

Module: wine Branch: master Commit: 3981205c560e3119d19c8e078e95745e3fd78499 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3981205c560e3119d19c8e078… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Jul 7 10:15:55 2015 +1000 d3drm: Add DllCanUnloadNow, DllGetClassObject stubs. --- dlls/d3drm/d3drm.c | 15 +++++++++++++++ dlls/d3drm/d3drm.spec | 4 ++-- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index 70c2678..4a920fb 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -1528,3 +1528,18 @@ HRESULT WINAPI Direct3DRMCreate(IDirect3DRM **d3drm) return S_OK; } + +HRESULT WINAPI DllCanUnloadNow(void) +{ + return S_FALSE; +} + +HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **ppv) +{ + TRACE("(%s, %s, %p): stub\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); + + if(!ppv) + return E_INVALIDARG; + + return CLASS_E_CLASSNOTAVAILABLE; +} diff --git a/dlls/d3drm/d3drm.spec b/dlls/d3drm/d3drm.spec index 4108a72..2c7a1a9 100644 --- a/dlls/d3drm/d3drm.spec +++ b/dlls/d3drm/d3drm.spec @@ -19,5 +19,5 @@ @ stdcall D3DRMVectorScale(ptr ptr float) @ stdcall D3DRMVectorSubtract(ptr ptr ptr) @ stdcall Direct3DRMCreate(ptr) -@ stub DllCanUnloadNow -@ stub DllGetClassObject +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr)

1 0