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

Vincent Povirk : ole32: Use grfLocksSupported to decide when LockRegion is implemented.
by Alexandre Julliard 07 Jul '15

07 Jul '15

Module: wine Branch: master Commit: 9cf835a9478d23b5a59fd8764563474b94ac5538 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9cf835a9478d23b5a59fd8764… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Jul 6 15:11:16 2015 -0500 ole32: Use grfLocksSupported to decide when LockRegion is implemented. --- dlls/ole32/filelockbytes.c | 2 ++ dlls/ole32/storage32.c | 75 +++++++++++++++++++++++++++++--------------- dlls/ole32/storage32.h | 5 +++ dlls/ole32/tests/storage32.c | 34 ++++++++++++++++++-- 4 files changed, 88 insertions(+), 28 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9cf835a9478d23b5a59fd…

1 0

Damjan Jovanovic : ole32: Convey the Alt button state to the drop target.
by Alexandre Julliard 07 Jul '15

07 Jul '15

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

YongHao Hu : msvcp110: Add tr2_sys__Copy_file implementation and test.
by Alexandre Julliard 07 Jul '15

07 Jul '15

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

YongHao Hu : msvcp110: Add tr2_sys__Rename implementation and test.
by Alexandre Julliard 07 Jul '15

07 Jul '15

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__Statvfs implementation and test.
by Alexandre Julliard 07 Jul '15

07 Jul '15

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

Michael Stefaniuc : dmstyle: Remove an unused variable.
by Alexandre Julliard 07 Jul '15

07 Jul '15

Module: wine Branch: master Commit: 0ab95a1ec432648b665630154e3f71289a7a2545 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ab95a1ec432648b665630154… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jul 7 10:11:48 2015 +0200 dmstyle: Remove an unused variable. --- dlls/dmstyle/style.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/dmstyle/style.c b/dlls/dmstyle/style.c index 515a8f3..4e09d0a 100644 --- a/dlls/dmstyle/style.c +++ b/dlls/dmstyle/style.c @@ -639,12 +639,9 @@ static HRESULT parse_pattern_list(IDirectMusicStyle8Impl *This, DMUS_PRIVATE_CHU DWORD ListSize[3], ListCount[3]; LARGE_INTEGER liMove; /* used when skipping chunks */ - DMUS_OBJECTDESC desc; IDirectMusicBand* pBand = NULL; LPDMUS_PRIVATE_STYLE_MOTIF pNewMotif = NULL; - DM_STRUCT_INIT(&desc); - if (pChunk->fccID != DMUS_FOURCC_PATTERN_LIST) { ERR_(dmfile)(": %s chunk should be a PATTERN list\n", debugstr_fourcc (pChunk->fccID)); return E_FAIL;

1 0

Michael Stefaniuc : dmstyle: Remove a not very useful macro.
by Alexandre Julliard 07 Jul '15

07 Jul '15

Module: wine Branch: master Commit: 4f2a92328e512b904c76a56cfc977f6ceeb5451f URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f2a92328e512b904c76a56cf… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jul 7 10:12:22 2015 +0200 dmstyle: Remove a not very useful macro. The memory is already zeroed on allocation. --- dlls/dmstyle/dmutils.h | 6 ------ dlls/dmstyle/style.c | 4 ++-- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/dlls/dmstyle/dmutils.h b/dlls/dmstyle/dmutils.h index 9fc2904..e290287 100644 --- a/dlls/dmstyle/dmutils.h +++ b/dlls/dmstyle/dmutils.h @@ -49,12 +49,6 @@ typedef struct { } guid_info; /* used for initialising structs */ -#define DM_STRUCT_INIT(x) \ - do { \ - memset((x), 0, sizeof(*(x))); \ - (x)->dwSize = sizeof(*x); \ - } while (0) - #define FE(x) { x, #x } #define GE(x) { &x, #x } diff --git a/dlls/dmstyle/style.c b/dlls/dmstyle/style.c index 4e09d0a..255c96a 100644 --- a/dlls/dmstyle/style.c +++ b/dlls/dmstyle/style.c @@ -440,7 +440,7 @@ static HRESULT parse_part_ref_list(DMUS_PRIVATE_CHUNK *pChunk, IStream *pStm, hr = IStream_Read (pStm, &pNewItem->part_ref, sizeof(DMUS_IO_PARTREF), NULL); /*TRACE_(dmfile)(" - sizeof %lu\n", sizeof(DMUS_IO_PARTREF));*/ list_add_tail (&pNewMotif->Items, &pNewItem->entry); - DM_STRUCT_INIT(&pNewItem->desc); + pNewItem->desc.dwSize = sizeof(pNewItem->desc); break; } case FOURCC_LIST: { @@ -669,7 +669,7 @@ static HRESULT parse_pattern_list(IDirectMusicStyle8Impl *This, DMUS_PRIVATE_CHU /** TODO trace pattern */ /** reset all data, as a new pattern begin */ - DM_STRUCT_INIT(&pNewMotif->desc); + pNewMotif->desc.dwSize = sizeof(pNewMotif->desc); list_init (&pNewMotif->Items); break; }

1 0

Alistair Leslie-Hughes : d3drm: Add DllCanUnloadNow, DllGetClassObject stubs.
by Alexandre Julliard 07 Jul '15

07 Jul '15

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

Jacek Caban : msscript.ocx: Added support for IDispatch functions.
by Alexandre Julliard 07 Jul '15

07 Jul '15

Module: wine Branch: master Commit: 7e83d413a27f34daca4b0b0543b6420f458feed2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e83d413a27f34daca4b0b054… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 7 12:35:44 2015 +0200 msscript.ocx: Added support for IDispatch functions. --- dlls/msscript.ocx/Makefile.in | 1 + dlls/msscript.ocx/msscript.c | 116 ++++++++++++++++++++++++++++++++++++++---- 2 files changed, 107 insertions(+), 10 deletions(-) diff --git a/dlls/msscript.ocx/Makefile.in b/dlls/msscript.ocx/Makefile.in index 0cbc964..959cd83 100644 --- a/dlls/msscript.ocx/Makefile.in +++ b/dlls/msscript.ocx/Makefile.in @@ -1,6 +1,7 @@ MODULE = msscript.ocx RC_SRCS = msscript.rc IDL_SRCS = msscript.idl +IMPORTS = oleaut32 C_SRCS = \ msscript.c diff --git a/dlls/msscript.ocx/msscript.c b/dlls/msscript.ocx/msscript.c index 178fdb3..b4e9331 100644 --- a/dlls/msscript.ocx/msscript.c +++ b/dlls/msscript.ocx/msscript.c @@ -45,6 +45,75 @@ static inline BOOL heap_free(void *mem) return HeapFree(GetProcessHeap(), 0, mem); } +typedef enum tid_t { + IScriptControl_tid, + LAST_tid +} tid_t; + +static ITypeLib *typelib; +static ITypeInfo *typeinfos[LAST_tid]; + +static REFIID tid_ids[] = { + &IID_IScriptControl +}; + +static HRESULT load_typelib(void) +{ + HRESULT hres; + ITypeLib *tl; + + hres = LoadRegTypeLib(&LIBID_MSScriptControl, 1, 0, LOCALE_SYSTEM_DEFAULT, &tl); + if(FAILED(hres)) { + ERR("LoadRegTypeLib failed: %08x\n", hres); + return hres; + } + + if(InterlockedCompareExchangePointer((void**)&typelib, tl, NULL)) + ITypeLib_Release(tl); + return hres; +} + +static HRESULT get_typeinfo(tid_t tid, ITypeInfo **typeinfo) +{ + HRESULT hres; + + if (!typelib) + hres = load_typelib(); + if (!typelib) + return hres; + + if(!typeinfos[tid]) { + ITypeInfo *ti; + + hres = ITypeLib_GetTypeInfoOfGuid(typelib, tid_ids[tid], &ti); + if(FAILED(hres)) { + ERR("GetTypeInfoOfGuid(%s) failed: %08x\n", debugstr_guid(tid_ids[tid]), hres); + return hres; + } + + if(InterlockedCompareExchangePointer((void**)(typeinfos+tid), ti, NULL)) + ITypeInfo_Release(ti); + } + + *typeinfo = typeinfos[tid]; + ITypeInfo_AddRef(typeinfos[tid]); + return S_OK; +} + +static void release_typelib(void) +{ + unsigned i; + + if(!typelib) + return; + + for(i=0; i < sizeof(typeinfos)/sizeof(*typeinfos); i++) + if(typeinfos[i]) + ITypeInfo_Release(typeinfos[i]); + + ITypeLib_Release(typelib); +} + static inline ScriptControl *impl_from_IScriptControl(IScriptControl *iface) { return CONTAINING_RECORD(iface, ScriptControl, IScriptControl_iface); @@ -99,24 +168,35 @@ static ULONG WINAPI ScriptControl_Release(IScriptControl *iface) static HRESULT WINAPI ScriptControl_GetTypeInfoCount(IScriptControl *iface, UINT *pctinfo) { ScriptControl *This = impl_from_IScriptControl(iface); - FIXME("(%p)\n", This); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, pctinfo); + *pctinfo = 1; + return S_OK; } static HRESULT WINAPI ScriptControl_GetTypeInfo(IScriptControl *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) { ScriptControl *This = impl_from_IScriptControl(iface); - FIXME("(%p)\n", This); - return E_NOTIMPL; + TRACE("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo); + return get_typeinfo(IScriptControl_tid, ppTInfo); } static HRESULT WINAPI ScriptControl_GetIDsOfNames(IScriptControl *iface, REFIID riid, LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) { ScriptControl *This = impl_from_IScriptControl(iface); - FIXME("(%p)\n", This); - return E_NOTIMPL; + ITypeInfo *typeinfo; + HRESULT hres; + + TRACE("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); + + hres = get_typeinfo(IScriptControl_tid, &typeinfo); + if(SUCCEEDED(hres)) { + hres = ITypeInfo_GetIDsOfNames(typeinfo, rgszNames, cNames, rgDispId); + ITypeInfo_Release(typeinfo); + } + + return hres; } static HRESULT WINAPI ScriptControl_Invoke(IScriptControl *iface, DISPID dispIdMember, @@ -124,8 +204,20 @@ static HRESULT WINAPI ScriptControl_Invoke(IScriptControl *iface, DISPID dispIdM EXCEPINFO *pExcepInfo, UINT *puArgErr) { ScriptControl *This = impl_from_IScriptControl(iface); - FIXME("(%p)\n", This); - return E_NOTIMPL; + ITypeInfo *typeinfo; + HRESULT hres; + + TRACE("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), + lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); + + hres = get_typeinfo(IScriptControl_tid, &typeinfo); + if(SUCCEEDED(hres)) { + hres = ITypeInfo_Invoke(typeinfo, iface, dispIdMember, wFlags, + pDispParams, pVarResult, pExcepInfo, puArgErr); + ITypeInfo_Release(typeinfo); + } + + return hres; } static HRESULT WINAPI ScriptControl_get_Language(IScriptControl *iface, BSTR *p) @@ -344,9 +436,9 @@ static HRESULT WINAPI ScriptControl_CreateInstance(IClassFactory *iface, IUnknow /****************************************************************** * DllMain (msscript.ocx.@) */ -BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID lpv) +BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) { - TRACE("(%p %d %p)\n", instance, reason, lpv); + TRACE("(%p %d %p)\n", instance, reason, reserved); switch(reason) { case DLL_WINE_PREATTACH: @@ -355,6 +447,10 @@ BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID lpv) msscript_instance = instance; DisableThreadLibraryCalls(instance); break; + case DLL_PROCESS_DETACH: + if(!reserved) + release_typelib(); + break; } return TRUE;

1 0

Matteo Bruni : wined3d: Use a lookup table to select the sampler function name.
by Alexandre Julliard 07 Jul '15

07 Jul '15

Module: wine Branch: master Commit: 8839e7fb94b93fe4d669f7ad8db6ae1439a9e7cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=8839e7fb94b93fe4d669f7ad8… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Jul 6 22:20:11 2015 +0200 wined3d: Use a lookup table to select the sampler function name. --- dlls/wined3d/glsl_shader.c | 67 ++++++++++++++++++++-------------------------- 1 file changed, 29 insertions(+), 38 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index b465c0f..2770ab9 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2516,18 +2516,23 @@ static const char *shader_glsl_get_rel_op(enum wined3d_shader_rel_op op) static void shader_glsl_get_sample_function(const struct wined3d_shader_context *ctx, DWORD resource_idx, DWORD flags, struct glsl_sample_function *sample_function) { - static const unsigned int type_coord_size[] = - { - 0, /* WINED3D_SHADER_RESOURCE_NONE */ - 1, /* WINED3D_SHADER_RESOURCE_BUFFER */ - 1, /* WINED3D_SHADER_RESOURCE_TEXTURE_1D */ - 2, /* WINED3D_SHADER_RESOURCE_TEXTURE_2D */ - 2, /* WINED3D_SHADER_RESOURCE_TEXTURE_2DMS */ - 3, /* WINED3D_SHADER_RESOURCE_TEXTURE_3D */ - 3, /* WINED3D_SHADER_RESOURCE_TEXTURE_CUBE */ - 2, /* WINED3D_SHADER_RESOURCE_TEXTURE_1DARRAY */ - 3, /* WINED3D_SHADER_RESOURCE_TEXTURE_2DARRAY */ - 3, /* WINED3D_SHADER_RESOURCE_TEXTURE_2DMSARRAY */ + static const struct + { + unsigned int coord_size; + const char *type_part; + } + resource_types[] = + { + {0, ""}, /* WINED3D_SHADER_RESOURCE_NONE */ + {1, ""}, /* WINED3D_SHADER_RESOURCE_BUFFER */ + {1, "1D"}, /* WINED3D_SHADER_RESOURCE_TEXTURE_1D */ + {2, "2D"}, /* WINED3D_SHADER_RESOURCE_TEXTURE_2D */ + {2, ""}, /* WINED3D_SHADER_RESOURCE_TEXTURE_2DMS */ + {3, "3D"}, /* WINED3D_SHADER_RESOURCE_TEXTURE_3D */ + {3, "Cube"}, /* WINED3D_SHADER_RESOURCE_TEXTURE_CUBE */ + {2, ""}, /* WINED3D_SHADER_RESOURCE_TEXTURE_1DARRAY */ + {3, ""}, /* WINED3D_SHADER_RESOURCE_TEXTURE_2DARRAY */ + {3, ""}, /* WINED3D_SHADER_RESOURCE_TEXTURE_2DMSARRAY */ }; struct shader_glsl_ctx_priv *priv = ctx->backend_data; enum wined3d_shader_resource_type resource_type = ctx->reg_maps->resource_info[resource_idx].type; @@ -2543,6 +2548,12 @@ static void shader_glsl_get_sample_function(const struct wined3d_shader_context sample_function->data_type = ctx->reg_maps->resource_info[resource_idx].data_type; + if (resource_type >= ARRAY_SIZE(resource_types)) + { + ERR("Unexpected resource type %#x.\n", resource_type); + resource_type = WINED3D_SHADER_RESOURCE_TEXTURE_2D; + } + /* Note that there's no such thing as a projected cube texture. */ if (resource_type == WINED3D_SHADER_RESOURCE_TEXTURE_CUBE) projected = FALSE; @@ -2550,26 +2561,11 @@ static void shader_glsl_get_sample_function(const struct wined3d_shader_context if (shadow) base = "shadow"; - switch (resource_type) - { - case WINED3D_SHADER_RESOURCE_TEXTURE_1D: - type_part = "1D"; - break; - case WINED3D_SHADER_RESOURCE_TEXTURE_2D: - if (texrect) - type_part = "2DRect"; - else - type_part = "2D"; - break; - case WINED3D_SHADER_RESOURCE_TEXTURE_3D: - type_part = "3D"; - break; - case WINED3D_SHADER_RESOURCE_TEXTURE_CUBE: - type_part = "Cube"; - break; - default: - FIXME("Unhandled resource type %#x.\n", resource_type); - } + type_part = resource_types[resource_type].type_part; + if (resource_type == WINED3D_SHADER_RESOURCE_TEXTURE_2D && texrect) + type_part = "2DRect"; + if (!type_part[0]) + FIXME("Unhandled resource type %#x.\n", resource_type); if (!lod && grad && !gl_info->supported[EXT_GPU_SHADER4]) { @@ -2583,12 +2579,7 @@ static void shader_glsl_get_sample_function(const struct wined3d_shader_context string_buffer_sprintf(sample_function->name, "%s%s%s%s%s", base, type_part, projected ? "Proj" : "", lod ? "Lod" : grad ? "Grad" : "", suffix); - if (resource_type >= ARRAY_SIZE(type_coord_size)) - { - ERR("Unexpected resource type %#x.\n", resource_type); - resource_type = WINED3D_SHADER_RESOURCE_TEXTURE_2D; - } - coord_size = type_coord_size[resource_type]; + coord_size = resource_types[resource_type].coord_size; if (shadow) ++coord_size; sample_function->coord_mask = (1 << coord_size) - 1;

1 0