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

Daniel Lehman : wininet: Use stored server name in HTTP_ProcessCookies.
by Alexandre Julliard Aug. 24, 2015

Aug. 24, 2015

Module: wine Branch: master Commit: 1cab27e9608639b3ea982360425ac277d453660b URL: http://source.winehq.org/git/wine.git/?a=commit;h=1cab27e9608639b3ea9823604… Author: Daniel Lehman <dlehman(a)esri.com> Date: Fri Aug 21 14:20:54 2015 -0700 wininet: Use stored server name in HTTP_ProcessCookies. --- dlls/wininet/http.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index dc54820..5dd1b3b 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -771,7 +771,6 @@ static void HTTP_ProcessCookies( http_request_t *request ) while((HeaderIndex = HTTP_GetCustomHeaderIndex(request, szSet_Cookie, numCookies++, FALSE)) != -1) { - HTTPHEADERW *host; const WCHAR *data; WCHAR *name; @@ -780,10 +779,6 @@ static void HTTP_ProcessCookies( http_request_t *request ) if (!setCookieHeader->lpszValue) continue; - host = HTTP_GetHeader(request, hostW); - if(!host) - continue; - data = strchrW(setCookieHeader->lpszValue, '='); if(!data) continue; @@ -793,7 +788,7 @@ static void HTTP_ProcessCookies( http_request_t *request ) continue; data++; - set_cookie(host->lpszValue, request->path, name, data, INTERNET_COOKIE_HTTPONLY); + set_cookie(request->server->name, request->path, name, data, INTERNET_COOKIE_HTTPONLY); heap_free(name); }

1 0

Alexandre Julliard : Wine release 1.7.50
by Alexandre Julliard Aug. 21, 2015

Aug. 21, 2015

Module: website Branch: master Commit: 4c1a85c5117e8554d4f9e1980b345e85e434d76f URL: http://source.winehq.org/git/website.git/?a=commit;h=4c1a85c5117e8554d4f9e1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 21 23:07:28 2015 +0900 Wine release 1.7.50 --- news/en/2015082101.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/en/2015082101.xml b/news/en/2015082101.xml new file mode 100644 index 0000000..58755e4 --- /dev/null +++ b/news/en/2015082101.xml @@ -0,0 +1,16 @@ +<news> +<date>August 21, 2015</date> +<title>Wine 1.7.50 Released</title> +<body> + The Wine development release 1.7.50 is now available. + <a href="{$root}/announce/1.7.50">What's new</a> in this release: +<ul> + <li>New version of the Gecko engine based on Firefox 40.</li> + <li>First steps of the Direct3D 11 implementation.</li> + <li>Better font matching in DirectWrite.</li> + <li>Support for OpenMP on ARM platforms.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.50.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Aaryaman Vasishta : d3drm/tests: Add QueryInterface tests for IDirect3DRMDevice*.
by Alexandre Julliard Aug. 21, 2015

Aug. 21, 2015

Module: wine Branch: master Commit: 48891483f544f6e7fd8f8b23e1fb2d992996d909 URL: http://source.winehq.org/git/wine.git/?a=commit;h=48891483f544f6e7fd8f8b23e… Author: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Date: Thu Aug 20 20:34:44 2015 +0530 d3drm/tests: Add QueryInterface tests for IDirect3DRMDevice*. --- dlls/d3drm/tests/d3drm.c | 131 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 131 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=48891483f544f6e7fd8f8…

1 0

Tag wine-1.7.50 : Alexandre Julliard : Release 1.7.50
by Alexandre Julliard Aug. 21, 2015

Aug. 21, 2015

Module: wine Branch: refs/tags/wine-1.7.50 Tag: 05858f19782b4fc745cd296094b88606b005ea94 URL: http://source.winehq.org/git/wine.git/?a=tag;h=05858f19782b4fc745cd296094b8… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 21 23:05:30 2015 +0900 Release 1.7.50

1 0

Alexandre Julliard : Release 1.7.50.
by Alexandre Julliard Aug. 21, 2015

Aug. 21, 2015

Module: wine Branch: master Commit: 5ccc463a4e3ba181b96a161c3c8cd4bc0cb0e607 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ccc463a4e3ba181b96a161c3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 21 23:05:30 2015 +0900 Release 1.7.50. --- ANNOUNCE | 630 +++++++++++++++++++++++++++++++++----------------------------- AUTHORS | 1 + VERSION | 2 +- configure | 18 +- 4 files changed, 343 insertions(+), 308 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5ccc463a4e3ba181b96a1…

1 0

YongHao Hu : msvcp110: Add tr2_sys__Statvfs_wchar implementation and test.
by Alexandre Julliard Aug. 21, 2015

Aug. 21, 2015

Module: wine Branch: master Commit: a2245d51cf9162e5161fa705404094d2f0341a28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2245d51cf9162e5161fa7054… Author: YongHao Hu <christopherwuy(a)gmail.com> Date: Wed Aug 19 01:27:43 2015 +0800 msvcp110: Add tr2_sys__Statvfs_wchar implementation and test. --- dlls/msvcp110/msvcp110.spec | 4 ++-- dlls/msvcp120/msvcp120.spec | 4 ++-- dlls/msvcp120/tests/msvcp120.c | 12 ++++++++++++ dlls/msvcp120_app/msvcp120_app.spec | 4 ++-- dlls/msvcp90/ios.c | 18 ++++++++++++++++++ 5 files changed, 36 insertions(+), 6 deletions(-) diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index 91e1503..ff4facb 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -1763,8 +1763,8 @@ @ stub -arch=win64 ?_Stat(a)sys@tr2(a)std@@YA?AW4file_type(a)123@PEB_WAEAH(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=win32 ?_Statvfs(a)sys@tr2(a)std@@YA?AUspace_info(a)123@PB_W(a)Z(wstr) tr2_sys__Statvfs_wchar +@ cdecl -arch=win64 ?_Statvfs(a)sys@tr2(a)std@@YA?AUspace_info(a)123@PEB_W(a)Z(wstr) tr2_sys__Statvfs_wchar @ cdecl -arch=arm ?_Swap_all(a)_Container_base0@std@@QAAXAAU12@@Z(ptr ptr) Container_base0_Swap_all @ thiscall -arch=i386 ?_Swap_all(a)_Container_base0@std@@QAEXAAU12@@Z(ptr ptr) Container_base0_Swap_all @ cdecl -arch=win64 ?_Swap_all(a)_Container_base0@std@@QEAAXAEAU12@@Z(ptr ptr) Container_base0_Swap_all diff --git a/dlls/msvcp120/msvcp120.spec b/dlls/msvcp120/msvcp120.spec index 745fecb..715703e 100644 --- a/dlls/msvcp120/msvcp120.spec +++ b/dlls/msvcp120/msvcp120.spec @@ -1724,8 +1724,8 @@ @ stub -arch=win64 ?_Stat(a)sys@tr2(a)std@@YA?AW4file_type(a)123@PEB_WAEAH(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=win32 ?_Statvfs(a)sys@tr2(a)std@@YA?AUspace_info(a)123@PB_W(a)Z(wstr) tr2_sys__Statvfs_wchar +@ cdecl -arch=win64 ?_Statvfs(a)sys@tr2(a)std@@YA?AUspace_info(a)123@PEB_W(a)Z(wstr) tr2_sys__Statvfs_wchar @ cdecl -arch=arm ?_Swap_all(a)_Container_base0@std@@QAAXAAU12@@Z(ptr ptr) Container_base0_Swap_all @ thiscall -arch=i386 ?_Swap_all(a)_Container_base0@std@@QAEXAAU12@@Z(ptr ptr) Container_base0_Swap_all @ cdecl -arch=win64 ?_Swap_all(a)_Container_base0@std@@QEAAXAEAU12@@Z(ptr ptr) Container_base0_Swap_all diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c index dc833e9..10e0370 100644 --- a/dlls/msvcp120/tests/msvcp120.c +++ b/dlls/msvcp120/tests/msvcp120.c @@ -89,6 +89,7 @@ static int (__cdecl *p_tr2_sys__Copy_file_wchar)(WCHAR const*, WCHAR const*, MSV static int (__cdecl *p_tr2_sys__Rename)(char const*, char const*); static int (__cdecl *p_tr2_sys__Rename_wchar)(WCHAR const*, WCHAR const*); static struct space_info (__cdecl *p_tr2_sys__Statvfs)(char const*); +static struct space_info (__cdecl *p_tr2_sys__Statvfs_wchar)(WCHAR const*); static enum file_type (__cdecl *p_tr2_sys__Stat)(char const*, int *); static enum file_type (__cdecl *p_tr2_sys__Lstat)(char const*, int *); @@ -153,6 +154,8 @@ static BOOL init(void) "?_Rename(a)sys@tr2(a)std@@YAHPEB_W0(a)Z"); SET(p_tr2_sys__Statvfs, "?_Statvfs(a)sys@tr2(a)std@@YA?AUspace_info(a)123@PEBD(a)Z"); + SET(p_tr2_sys__Statvfs_wchar, + "?_Statvfs(a)sys@tr2(a)std@@YA?AUspace_info(a)123@PEB_W(a)Z"); SET(p_tr2_sys__Stat, "?_Stat(a)sys@tr2(a)std@@YA?AW4file_type(a)123@PEBDAEAH(a)Z"); SET(p_tr2_sys__Lstat, @@ -192,6 +195,8 @@ static BOOL init(void) "?_Rename(a)sys@tr2(a)std@@YAHPB_W0(a)Z"); SET(p_tr2_sys__Statvfs, "?_Statvfs(a)sys@tr2(a)std@@YA?AUspace_info(a)123@PBD(a)Z"); + SET(p_tr2_sys__Statvfs_wchar, + "?_Statvfs(a)sys@tr2(a)std@@YA?AUspace_info(a)123@PB_W(a)Z"); SET(p_tr2_sys__Stat, "?_Stat(a)sys@tr2(a)std@@YA?AW4file_type(a)123@PBDAAH(a)Z"); SET(p_tr2_sys__Lstat, @@ -777,13 +782,20 @@ static void test_tr2_sys__Statvfs(void) { struct space_info info; char current_path[MAX_PATH]; + WCHAR current_path_wchar[MAX_PATH]; memset(current_path, 0, MAX_PATH); p_tr2_sys__Current_get(current_path); + memset(current_path_wchar, 0, MAX_PATH); + p_tr2_sys__Current_get_wchar(current_path_wchar); 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_wchar(current_path_wchar); + ok(info.capacity >= info.free, "tr2_sys__Statvfs_wchar(): info.capacity < info.free\n"); + ok(info.free >= info.available, "tr2_sys__Statvfs_wchar(): 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)); diff --git a/dlls/msvcp120_app/msvcp120_app.spec b/dlls/msvcp120_app/msvcp120_app.spec index c5e4da0..1e04e77 100644 --- a/dlls/msvcp120_app/msvcp120_app.spec +++ b/dlls/msvcp120_app/msvcp120_app.spec @@ -1724,8 +1724,8 @@ @ stub -arch=win64 ?_Stat(a)sys@tr2(a)std@@YA?AW4file_type(a)123@PEB_WAEAH(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=win32 ?_Statvfs(a)sys@tr2(a)std@@YA?AUspace_info(a)123@PB_W(a)Z(wstr) msvcp120.?_Statvfs(a)sys@tr2(a)std@@YA?AUspace_info(a)123@PB_W(a)Z +@ cdecl -arch=win64 ?_Statvfs(a)sys@tr2(a)std@@YA?AUspace_info(a)123@PEB_W(a)Z(wstr) msvcp120.?_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 @ thiscall -arch=i386 ?_Swap_all(a)_Container_base0@std@@QAEXAAU12@@Z(ptr ptr) msvcp120.?_Swap_all(a)_Container_base0@std@@QAEXAAU12@@Z @ cdecl -arch=win64 ?_Swap_all(a)_Container_base0@std@@QEAAXAEAU12@@Z(ptr ptr) msvcp120.?_Swap_all(a)_Container_base0@std@@QEAAXAEAU12@@Z diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index c7a3be9..bae733b 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -14858,6 +14858,24 @@ int __cdecl tr2_sys__Rename_wchar(WCHAR const* old_path, WCHAR const* new_path) return GetLastError(); } +/* ?_Statvfs(a)sys@tr2(a)std@@YA?AUspace_info(a)123@PB_W(a)Z */ +/* ?_Statvfs(a)sys@tr2(a)std@@YA?AUspace_info(a)123@PEB_W(a)Z */ +struct space_info __cdecl tr2_sys__Statvfs_wchar(const WCHAR* path) +{ + ULARGE_INTEGER available, total, free; + struct space_info info; + TRACE("(%s)\n", debugstr_w(path)); + + if(!path || !GetDiskFreeSpaceExW(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; +} + /* ??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__Rename_wchar implementation and test.
by Alexandre Julliard Aug. 21, 2015

Aug. 21, 2015

Module: wine Branch: master Commit: 64eb3813c47c0db2b8bab39dc2ab3f93610d6ec7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=64eb3813c47c0db2b8bab39dc… Author: YongHao Hu <christopherwuy(a)gmail.com> Date: Wed Aug 19 01:27:27 2015 +0800 msvcp110: Add tr2_sys__Rename_wchar implementation and test. --- dlls/msvcp110/msvcp110.spec | 4 ++-- dlls/msvcp120/msvcp120.spec | 4 ++-- dlls/msvcp120/tests/msvcp120.c | 11 ++++++++++- dlls/msvcp120_app/msvcp120_app.spec | 4 ++-- dlls/msvcp90/ios.c | 14 ++++++++++++++ 5 files changed, 30 insertions(+), 7 deletions(-) diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index 49ff921..91e1503 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -1724,8 +1724,8 @@ @ cdecl -arch=win64 ?_Remove_dir(a)sys@tr2(a)std@@YA_NPEB_W(a)Z(wstr) tr2_sys__Remove_dir_wchar @ cdecl -arch=win32 ?_Rename(a)sys@tr2(a)std@@YAHPBD0(a)Z(str str) tr2_sys__Rename @ cdecl -arch=win64 ?_Rename(a)sys@tr2(a)std@@YAHPEBD0(a)Z(str str) tr2_sys__Rename -@ stub -arch=win32 ?_Rename(a)sys@tr2(a)std@@YAHPB_W0(a)Z -@ stub -arch=win64 ?_Rename(a)sys@tr2(a)std@@YAHPEB_W0(a)Z +@ cdecl -arch=win32 ?_Rename(a)sys@tr2(a)std@@YAHPB_W0(a)Z(wstr wstr) tr2_sys__Rename_wchar +@ cdecl -arch=win64 ?_Rename(a)sys@tr2(a)std@@YAHPEB_W0(a)Z(wstr wstr) tr2_sys__Rename_wchar @ cdecl -arch=win32 ?_Rep@?$num_put(a)DV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@ABA?AV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@2(a)V32@DI(a)Z(ptr ptr long ptr long long) num_put_char__Rep @ cdecl -arch=win64 ?_Rep@?$num_put(a)DV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@AEBA?AV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@2(a)V32@D_K(a)Z(ptr ptr ptr long long) num_put_char__Rep @ cdecl -arch=win32 ?_Rep@?$num_put(a)GV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@std@@@std@@ABA?AV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@2(a)V32@GI(a)Z(ptr ptr long ptr long long) num_put_wchar__Rep diff --git a/dlls/msvcp120/msvcp120.spec b/dlls/msvcp120/msvcp120.spec index 2a73662..745fecb 100644 --- a/dlls/msvcp120/msvcp120.spec +++ b/dlls/msvcp120/msvcp120.spec @@ -1685,8 +1685,8 @@ @ cdecl -arch=win64 ?_Remove_dir(a)sys@tr2(a)std@@YA_NPEB_W(a)Z(wstr) tr2_sys__Remove_dir_wchar @ cdecl -arch=win32 ?_Rename(a)sys@tr2(a)std@@YAHPBD0(a)Z(str str) tr2_sys__Rename @ cdecl -arch=win64 ?_Rename(a)sys@tr2(a)std@@YAHPEBD0(a)Z(str str) tr2_sys__Rename -@ stub -arch=win32 ?_Rename(a)sys@tr2(a)std@@YAHPB_W0(a)Z -@ stub -arch=win64 ?_Rename(a)sys@tr2(a)std@@YAHPEB_W0(a)Z +@ cdecl -arch=win32 ?_Rename(a)sys@tr2(a)std@@YAHPB_W0(a)Z(wstr wstr) tr2_sys__Rename_wchar +@ cdecl -arch=win64 ?_Rename(a)sys@tr2(a)std@@YAHPEB_W0(a)Z(wstr wstr) tr2_sys__Rename_wchar @ cdecl -arch=win32 ?_Rep@?$num_put(a)DV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@ABA?AV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@2(a)V32@DI(a)Z(ptr ptr long ptr long long) num_put_char__Rep @ cdecl -arch=win64 ?_Rep@?$num_put(a)DV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@AEBA?AV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@2(a)V32@D_K(a)Z(ptr ptr ptr long long) num_put_char__Rep @ cdecl -arch=win32 ?_Rep@?$num_put(a)GV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@std@@@std@@ABA?AV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@2(a)V32@GI(a)Z(ptr ptr long ptr long long) num_put_wchar__Rep diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c index 08effda..dc833e9 100644 --- a/dlls/msvcp120/tests/msvcp120.c +++ b/dlls/msvcp120/tests/msvcp120.c @@ -87,6 +87,7 @@ static MSVCP_bool (__cdecl *p_tr2_sys__Remove_dir_wchar)(WCHAR const*); static int (__cdecl *p_tr2_sys__Copy_file)(char const*, char const*, MSVCP_bool); static int (__cdecl *p_tr2_sys__Copy_file_wchar)(WCHAR const*, WCHAR const*, MSVCP_bool); static int (__cdecl *p_tr2_sys__Rename)(char const*, char const*); +static int (__cdecl *p_tr2_sys__Rename_wchar)(WCHAR const*, WCHAR const*); static struct space_info (__cdecl *p_tr2_sys__Statvfs)(char const*); static enum file_type (__cdecl *p_tr2_sys__Stat)(char const*, int *); static enum file_type (__cdecl *p_tr2_sys__Lstat)(char const*, int *); @@ -148,6 +149,8 @@ static BOOL init(void) "?_Copy_file(a)sys@tr2(a)std@@YAHPEB_W0_N(a)Z"); SET(p_tr2_sys__Rename, "?_Rename(a)sys@tr2(a)std@@YAHPEBD0(a)Z"); + SET(p_tr2_sys__Rename_wchar, + "?_Rename(a)sys@tr2(a)std@@YAHPEB_W0(a)Z"); SET(p_tr2_sys__Statvfs, "?_Statvfs(a)sys@tr2(a)std@@YA?AUspace_info(a)123@PEBD(a)Z"); SET(p_tr2_sys__Stat, @@ -185,6 +188,8 @@ static BOOL init(void) "?_Copy_file(a)sys@tr2(a)std@@YAHPB_W0_N(a)Z"); SET(p_tr2_sys__Rename, "?_Rename(a)sys@tr2(a)std@@YAHPBD0(a)Z"); + SET(p_tr2_sys__Rename_wchar, + "?_Rename(a)sys@tr2(a)std@@YAHPB_W0(a)Z"); SET(p_tr2_sys__Statvfs, "?_Statvfs(a)sys@tr2(a)std@@YA?AUspace_info(a)123@PBD(a)Z"); SET(p_tr2_sys__Stat, @@ -694,6 +699,8 @@ static void test_tr2_sys__Rename(void) BY_HANDLE_FILE_INFORMATION info1, info2; char temp_path[MAX_PATH], current_path[MAX_PATH]; LARGE_INTEGER file_size; + 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','w',0}; struct { char const *old_path; char const *new_path; @@ -756,8 +763,10 @@ static void test_tr2_sys__Rename(void) ok(ret == ERROR_ALREADY_EXISTS, "test_tr2_sys__Rename(): expect: ERROR_ALREADY_EXISTS, got %d\n", ret); ok(p_tr2_sys__File_size("tr2_test_dir\\f1") == 7, "test_tr2_sys__Rename(): expect: 7, got %s\n", debugstr_longlong(p_tr2_sys__File_size("tr2_test_dir\\f1"))); ok(p_tr2_sys__File_size("tr2_test_dir\\f1_rename") == 0, "test_tr2_sys__Rename(): expect: 0, got %s\n",debugstr_longlong(p_tr2_sys__File_size("tr2_test_dir\\f1_rename"))); + ret = p_tr2_sys__Rename_wchar(testW, testW2); + ok(ret == ERROR_SUCCESS, "tr2_sys__Rename_wchar(): expect: ERROR_SUCCESS, got %d\n", ret); - ok(DeleteFileA("tr2_test_dir\\f1"), "expect f1 to exist\n"); + ok(DeleteFileW(testW2), "expect fw to exist\n"); ok(DeleteFileA("tr2_test_dir\\f1_rename"), "expect f1_rename to exist\n"); ret = p_tr2_sys__Remove_dir("tr2_test_dir"); ok(ret == 1, "test_tr2_sys__Remove_dir(): expect %d got %d\n", 1, ret); diff --git a/dlls/msvcp120_app/msvcp120_app.spec b/dlls/msvcp120_app/msvcp120_app.spec index 06a2e2d..c5e4da0 100644 --- a/dlls/msvcp120_app/msvcp120_app.spec +++ b/dlls/msvcp120_app/msvcp120_app.spec @@ -1685,8 +1685,8 @@ @ cdecl -arch=win64 ?_Remove_dir(a)sys@tr2(a)std@@YA_NPEB_W(a)Z(wstr) msvcp120.?_Remove_dir(a)sys@tr2(a)std@@YA_NPEB_W(a)Z @ cdecl -arch=win32 ?_Rename(a)sys@tr2(a)std@@YAHPBD0(a)Z(str str) msvcp120.?_Rename(a)sys@tr2(a)std@@YAHPBD0(a)Z @ cdecl -arch=win64 ?_Rename(a)sys@tr2(a)std@@YAHPEBD0(a)Z(str str) msvcp120.?_Rename(a)sys@tr2(a)std@@YAHPEBD0(a)Z -@ stub -arch=win32 ?_Rename(a)sys@tr2(a)std@@YAHPB_W0(a)Z -@ stub -arch=win64 ?_Rename(a)sys@tr2(a)std@@YAHPEB_W0(a)Z +@ cdecl -arch=win32 ?_Rename(a)sys@tr2(a)std@@YAHPB_W0(a)Z(wstr wstr) msvcp120.?_Rename(a)sys@tr2(a)std@@YAHPB_W0(a)Z +@ cdecl -arch=win64 ?_Rename(a)sys@tr2(a)std@@YAHPEB_W0(a)Z(wstr wstr) msvcp120.?_Rename(a)sys@tr2(a)std@@YAHPEB_W0(a)Z @ cdecl -arch=win32 ?_Rep@?$num_put(a)DV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@ABA?AV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@2(a)V32@DI(a)Z(ptr ptr long ptr long long) msvcp120.?_Rep@?$num_put(a)DV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@ABA?AV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@2(a)V32@DI(a)Z @ cdecl -arch=win64 ?_Rep@?$num_put(a)DV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@AEBA?AV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@2(a)V32@D_K(a)Z(ptr ptr ptr long long) msvcp120.?_Rep@?$num_put(a)DV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@AEBA?AV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@2(a)V32@D_K(a)Z @ cdecl -arch=win32 ?_Rep@?$num_put(a)GV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@std@@@std@@ABA?AV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@2(a)V32@GI(a)Z(ptr ptr long ptr long long) msvcp120.?_Rep@?$num_put(a)GV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@std@@@std@@ABA?AV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@2(a)V32@GI(a)Z diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 532c7cf..c7a3be9 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -14844,6 +14844,20 @@ int __cdecl tr2_sys__Copy_file_wchar(WCHAR const* source, WCHAR const* dest, MSV return GetLastError(); } +/* ?_Rename(a)sys@tr2(a)std@@YAHPB_W0(a)Z */ +/* ?_Rename(a)sys@tr2(a)std@@YAHPEB_W0(a)Z */ +int __cdecl tr2_sys__Rename_wchar(WCHAR const* old_path, WCHAR const* new_path) +{ + TRACE("(%s %s)\n", debugstr_w(old_path), debugstr_w(new_path)); + + if(!old_path || !new_path) + return ERROR_INVALID_PARAMETER; + + if(MoveFileExW(old_path, new_path, MOVEFILE_COPY_ALLOWED)) + return ERROR_SUCCESS; + return GetLastError(); +} + /* ??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__Copy_file_wchar implementation and test.
by Alexandre Julliard Aug. 21, 2015

Aug. 21, 2015

Module: wine Branch: master Commit: 66f4281aa027fde77dd28ff262899780321f7685 URL: http://source.winehq.org/git/wine.git/?a=commit;h=66f4281aa027fde77dd28ff26… Author: YongHao Hu <christopherwuy(a)gmail.com> Date: Wed Aug 19 01:27:07 2015 +0800 msvcp110: Add tr2_sys__Copy_file_wchar implementation and test. --- dlls/msvcp110/msvcp110.spec | 4 ++-- dlls/msvcp120/msvcp120.spec | 4 ++-- dlls/msvcp120/tests/msvcp120.c | 9 +++++++++ dlls/msvcp120_app/msvcp120_app.spec | 4 ++-- dlls/msvcp90/ios.c | 11 +++++++++++ 5 files changed, 26 insertions(+), 6 deletions(-) diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index fb22ca1..49ff921 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -1165,8 +1165,8 @@ @ stub -arch=win64 ?_Close_dir(a)sys@tr2(a)std@@YAXPEAX(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 ?_Copy_file(a)sys@tr2(a)std@@YAHPB_W0_N(a)Z(wstr wstr long) tr2_sys__Copy_file_wchar +@ cdecl -arch=win64 ?_Copy_file(a)sys@tr2(a)std@@YAHPEB_W0_N(a)Z(wstr wstr long) tr2_sys__Copy_file_wchar @ 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 @ cdecl -arch=win32 ?_Current_get(a)sys@tr2(a)std@@YAPA_WPA_W(a)Z(ptr) tr2_sys__Current_get_wchar diff --git a/dlls/msvcp120/msvcp120.spec b/dlls/msvcp120/msvcp120.spec index 8a7b6d7..2a73662 100644 --- a/dlls/msvcp120/msvcp120.spec +++ b/dlls/msvcp120/msvcp120.spec @@ -1130,8 +1130,8 @@ @ stub -arch=win64 ?_Close_dir(a)sys@tr2(a)std@@YAXPEAX(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 ?_Copy_file(a)sys@tr2(a)std@@YAHPB_W0_N(a)Z(wstr wstr long) tr2_sys__Copy_file_wchar +@ cdecl -arch=win64 ?_Copy_file(a)sys@tr2(a)std@@YAHPEB_W0_N(a)Z(wstr wstr long) tr2_sys__Copy_file_wchar @ 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 @ cdecl -arch=win32 ?_Current_get(a)sys@tr2(a)std@@YAPA_WAAY0BAE(a)_W@Z(ptr) tr2_sys__Current_get_wchar diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c index 6bbe11e..08effda 100644 --- a/dlls/msvcp120/tests/msvcp120.c +++ b/dlls/msvcp120/tests/msvcp120.c @@ -85,6 +85,7 @@ static int (__cdecl *p_tr2_sys__Make_dir_wchar)(WCHAR const*); static MSVCP_bool (__cdecl *p_tr2_sys__Remove_dir)(char const*); static MSVCP_bool (__cdecl *p_tr2_sys__Remove_dir_wchar)(WCHAR const*); static int (__cdecl *p_tr2_sys__Copy_file)(char const*, char const*, MSVCP_bool); +static int (__cdecl *p_tr2_sys__Copy_file_wchar)(WCHAR const*, WCHAR 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 enum file_type (__cdecl *p_tr2_sys__Stat)(char const*, int *); @@ -143,6 +144,8 @@ static BOOL init(void) "?_Remove_dir(a)sys@tr2(a)std@@YA_NPEB_W(a)Z"); SET(p_tr2_sys__Copy_file, "?_Copy_file(a)sys@tr2(a)std@@YAHPEBD0_N(a)Z"); + SET(p_tr2_sys__Copy_file_wchar, + "?_Copy_file(a)sys@tr2(a)std@@YAHPEB_W0_N(a)Z"); SET(p_tr2_sys__Rename, "?_Rename(a)sys@tr2(a)std@@YAHPEBD0(a)Z"); SET(p_tr2_sys__Statvfs, @@ -178,6 +181,8 @@ static BOOL init(void) "?_Remove_dir(a)sys@tr2(a)std@@YA_NPB_W(a)Z"); SET(p_tr2_sys__Copy_file, "?_Copy_file(a)sys@tr2(a)std@@YAHPBD0_N(a)Z"); + SET(p_tr2_sys__Copy_file_wchar, + "?_Copy_file(a)sys@tr2(a)std@@YAHPB_W0_N(a)Z"); SET(p_tr2_sys__Rename, "?_Rename(a)sys@tr2(a)std@@YAHPBD0(a)Z"); SET(p_tr2_sys__Statvfs, @@ -624,6 +629,7 @@ static void test_tr2_sys__Copy_file(void) HANDLE file; int ret, i; LARGE_INTEGER file_size; + WCHAR testW[] = {'f','1',0}, testW2[] = {'f','w',0}; struct { char const *source; char const *dest; @@ -670,8 +676,11 @@ static void test_tr2_sys__Copy_file(void) 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); } + ret = p_tr2_sys__Copy_file_wchar(testW, testW2, TRUE); + ok(ret == ERROR_SUCCESS, "test_tr2_sys__Copy_file_wchar() expect ERROR_SUCCESS, got %d\n", ret); ok(DeleteFileA("f1"), "expect f1 to exist\n"); + ok(DeleteFileW(testW2), "expect fw 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"); diff --git a/dlls/msvcp120_app/msvcp120_app.spec b/dlls/msvcp120_app/msvcp120_app.spec index d05b3d4..06a2e2d 100644 --- a/dlls/msvcp120_app/msvcp120_app.spec +++ b/dlls/msvcp120_app/msvcp120_app.spec @@ -1130,8 +1130,8 @@ @ stub -arch=win64 ?_Close_dir(a)sys@tr2(a)std@@YAXPEAX(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 ?_Copy_file(a)sys@tr2(a)std@@YAHPB_W0_N(a)Z(wstr wstr long) msvcp120.?_Copy_file(a)sys@tr2(a)std@@YAHPB_W0_N(a)Z +@ cdecl -arch=win64 ?_Copy_file(a)sys@tr2(a)std@@YAHPEB_W0_N(a)Z(wstr wstr long) msvcp120.?_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 @ 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 diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 88d6453..532c7cf 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -14833,6 +14833,17 @@ MSVCP_bool __cdecl tr2_sys__Remove_dir_wchar(WCHAR const* path) return RemoveDirectoryW(path) != 0; } +/* ?_Copy_file(a)sys@tr2(a)std@@YAHPB_W0_N(a)Z */ +/* ?_Copy_file(a)sys@tr2(a)std@@YAHPEB_W0_N(a)Z */ +int __cdecl tr2_sys__Copy_file_wchar(WCHAR const* source, WCHAR const* dest, MSVCP_bool fail_if_exists) +{ + TRACE("(%s %s %x)\n", debugstr_w(source), debugstr_w(dest), fail_if_exists); + + if(CopyFileW(source, dest, fail_if_exists)) + return ERROR_SUCCESS; + return GetLastError(); +} + /* ??1_Winit(a)std@@QAE(a)XZ */ /* ??1_Winit(a)std@@QAE(a)XZ */ DEFINE_THISCALL_WRAPPER(_Winit_dtor, 4)

1 0

Jacek Caban : ieframe/tests: Added more test traces to diagnose some test failures.
by Alexandre Julliard Aug. 21, 2015

Aug. 21, 2015

Module: wine Branch: master Commit: 26bace5dd079e5480553b7448639946d79ea23f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=26bace5dd079e5480553b7448… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Aug 21 13:54:03 2015 +0200 ieframe/tests: Added more test traces to diagnose some test failures. --- dlls/ieframe/tests/webbrowser.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c index 4b65e18..d928135 100644 --- a/dlls/ieframe/tests/webbrowser.c +++ b/dlls/ieframe/tests/webbrowser.c @@ -2927,6 +2927,7 @@ static void test_download(DWORD flags) SET_EXPECT(Exec_UPDATECOMMANDS); SET_EXPECT(QueryStatus_STOP); + trace("Downloading...\n"); while(!*b && GetMessageW(&msg, NULL, 0, 0)) { TranslateMessage(&msg); DispatchMessageW(&msg);

1 0

Aaryaman Vasishta : d3drm: Fix IDirect3DRMDevice3_QueryInterface returning incorrect HRESULT on unsupported interfaces.
by Alexandre Julliard Aug. 21, 2015

Aug. 21, 2015

Module: wine Branch: master Commit: a9bde7f85b8f0fd8897170f5160473c576e51421 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9bde7f85b8f0fd8897170f51… Author: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Date: Thu Aug 20 20:34:43 2015 +0530 d3drm: Fix IDirect3DRMDevice3_QueryInterface returning incorrect HRESULT on unsupported interfaces. --- dlls/d3drm/device.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3drm/device.c b/dlls/d3drm/device.c index 5e62347..1dd108e 100644 --- a/dlls/d3drm/device.c +++ b/dlls/d3drm/device.c @@ -1017,8 +1017,8 @@ static HRESULT WINAPI d3drm_device3_QueryInterface(IDirect3DRMDevice3 *iface, RE else { *out = NULL; - WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); - return E_NOINTERFACE; + WARN("%s not implemented, returning CLASS_E_CLASSNOTAVAILABLE.\n", debugstr_guid(riid)); + return CLASS_E_CLASSNOTAVAILABLE; } IUnknown_AddRef((IUnknown *)*out);

1 0