October 2015 - Wine-commits

Piotr Caban : msvcp110: Fix 64-bit _Getcoll implementation.
by Alexandre Julliard 30 Oct '15

30 Oct '15

Module: wine Branch: master Commit: ef9a3be8b00b5dd4385408e9c546982b089d3ccf URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef9a3be8b00b5dd4385408e9c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Oct 30 13:17:47 2015 +0100 msvcp110: Fix 64-bit _Getcoll implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/locale.c | 39 +++++++++++++++++++++++++-------------- 1 file changed, 25 insertions(+), 14 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 5bd10eb..f3ad140 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -20,6 +20,7 @@ #include <stdarg.h> +#include "assert.h" #include "locale.h" #include "errno.h" #include "limits.h" @@ -649,33 +650,43 @@ _Locinfo* __thiscall _Locinfo__Addcats(_Locinfo *this, int category, const char return _Locinfo__Locinfo_Addcats(this, category, locstr); } -/* _Getcoll */ -ULONGLONG __cdecl _Getcoll(void) +static _Collvec* getcoll(_Collvec *ret) { - union { - _Collvec collvec; - ULONGLONG ull; - } ret; - TRACE("\n"); - ret.collvec.page = ___lc_collate_cp_func(); + ret->page = ___lc_collate_cp_func(); #if _MSVCP_VER < 110 - ret.collvec.handle = ___lc_handle_func()[LC_COLLATE]; + ret->handle = ___lc_handle_func()[LC_COLLATE]; #else - ret.collvec.lc_name = ___lc_locale_name_func()[LC_COLLATE]; + ret->lc_name = ___lc_locale_name_func()[LC_COLLATE]; #endif - return ret.ull; + return ret; } +/* _Getcoll */ +#if defined(__i386__) || _MSVCP_VER<110 +ULONGLONG __cdecl _Getcoll(void) +{ + ULONGLONG ret; + + C_ASSERT(sizeof(_Collvec) <= sizeof(ULONGLONG)); + + getcoll((_Collvec*)&ret); + return ret; +} +#else +_Collvec* __cdecl _Getcoll(_Collvec *ret) +{ + return getcoll(ret); +} +#endif + /* ?_Getcoll(a)_Locinfo@std@@QBE?AU_Collvec@@XZ */ /* ?_Getcoll(a)_Locinfo@std@@QEBA?AU_Collvec@@XZ */ DEFINE_THISCALL_WRAPPER(_Locinfo__Getcoll, 8) _Collvec* __thiscall _Locinfo__Getcoll(const _Locinfo *this, _Collvec *ret) { - ULONGLONG ull = _Getcoll(); - memcpy(ret, &ull, sizeof(ull)); - return ret; + return getcoll(ret); } /* _Getctype */

1 0

Alexandre Julliard : Release 1.7.54.
by Alexandre Julliard 30 Oct '15

30 Oct '15

Module: wine Branch: master Commit: cbaab82d086e36dacaa22c6adf80f9114bb820fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=cbaab82d086e36dacaa22c6ad… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 30 22:20:44 2015 +0900 Release 1.7.54. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 921 +++++++++++++++++++++++++++++--------------------------------- AUTHORS | 4 + VERSION | 2 +- configure | 18 +- 4 files changed, 441 insertions(+), 504 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cbaab82d086e36dacaa22…

1 0

Tag wine-1.7.54 : Alexandre Julliard : Release 1.7.54
by Alexandre Julliard 30 Oct '15

30 Oct '15

Module: wine Branch: refs/tags/wine-1.7.54 Tag: a7bd88ddd1851e32359e9490d61faf93ac83c720 URL: http://source.winehq.org/git/wine.git/?a=tag;h=a7bd88ddd1851e32359e9490d61f… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 30 22:20:44 2015 +0900 Release 1.7.54

1 0

Alexandre Julliard : makefiles: Don't add source dependency for symlinks.
by Alexandre Julliard 30 Oct '15

30 Oct '15

Module: wine Branch: master Commit: cc5d07fc8a58f3f87137992247344cdbdad9ef8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc5d07fc8a58f3f8713799224… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 29 23:57:53 2015 +0900 makefiles: Don't add source dependency for symlinks. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/makedep.c b/tools/makedep.c index 30bbc3e..2c2a97d 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -1796,7 +1796,7 @@ static void output_install_rules( struct makefile *make, struct strarray files, if (!files.count) return; for (i = 0; i < files.count; i += 2) - if (files.str[i + 1][0] >= 'a' && files.str[i + 1][0] <= 'z') /* only for files in object dir */ + if (strchr( "dps", files.str[i + 1][0] )) /* only for files copied from object dir */ strarray_add_uniq( &targets, files.str[i] ); output( "install %s::", target );

1 0

Alexandre Julliard : makefiles: Fix the source path for ttf font installs.
by Alexandre Julliard 30 Oct '15

30 Oct '15

Module: wine Branch: master Commit: a748b7bc47345f9fd3b10377da6817c3e6e29fe2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a748b7bc47345f9fd3b10377d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 30 14:57:45 2015 +0900 makefiles: Fix the source path for ttf font installs. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/makedep.c b/tools/makedep.c index 2c2a97d..7af3bc9 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -2057,7 +2057,7 @@ static struct strarray output_sources( struct makefile *make, struct strarray *t } if (source->file->flags & FLAG_INSTALL) { - strarray_add( &make->install_lib_rules, ttf_file ); + strarray_add( &make->install_lib_rules, strmake( "%s.ttf", obj )); strarray_add( &make->install_lib_rules, strmake( "D$(fontdir)/%s.ttf", obj )); } if (source->file->flags & FLAG_SFD_FONTS)

1 0

Alexandre Julliard : makefiles: Specify whether to install program binaries in the individual makefiles.
by Alexandre Julliard 30 Oct '15

30 Oct '15

Module: wine Branch: master Commit: 17ac5ba7f9909bfbd3c80c87a077f72ef4c1d19b URL: http://source.winehq.org/git/wine.git/?a=commit;h=17ac5ba7f9909bfbd3c80c87a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 30 14:15:45 2015 +0900 makefiles: Specify whether to install program binaries in the individual makefiles. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/msiexec/Makefile.in | 2 ++ programs/notepad/Makefile.in | 2 ++ programs/regedit/Makefile.in | 2 ++ programs/regsvr32/Makefile.in | 2 ++ programs/wineboot/Makefile.in | 2 ++ programs/winecfg/Makefile.in | 2 ++ programs/wineconsole/Makefile.in | 2 ++ programs/winedbg/Makefile.in | 2 ++ programs/winefile/Makefile.in | 2 ++ programs/winemine/Makefile.in | 2 ++ programs/winepath/Makefile.in | 2 ++ programs/winetest/Makefile.in | 2 ++ tools/make_makefiles | 50 +++++++++++++++------------------------- tools/makedep.c | 19 +++++++++++++++ 14 files changed, 61 insertions(+), 32 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=17ac5ba7f9909bfbd3c80…

1 0

Piotr Caban : msvcp120: Fix tr2::sys::__Statvfs header for gcc.
by Alexandre Julliard 30 Oct '15

30 Oct '15

Module: wine Branch: master Commit: d9f8bd9505fe4a55ae94fca14dc8f8fbf1bcbdf2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9f8bd9505fe4a55ae94fca14… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Oct 29 17:58:12 2015 +0100 msvcp120: Fix tr2::sys::__Statvfs header for gcc. __cdecl calling convention is not compatible between Visual C++ and GCC when return is made in memory. In GCC callee pops the hidden argument while in Visual C++ it's done by caller. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp110/msvcp110.spec | 8 ++++---- dlls/msvcp120/msvcp120.spec | 8 ++++---- dlls/msvcp120/tests/msvcp120.c | 12 ++++++------ dlls/msvcp120_app/msvcp120_app.spec | 8 ++++---- dlls/msvcp90/ios.c | 28 ++++++++++++++-------------- 5 files changed, 32 insertions(+), 32 deletions(-) diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index 9fb938a..02ccf44 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -1761,10 +1761,10 @@ @ cdecl -arch=win64 ?_Stat(a)sys@tr2(a)std@@YA?AW4file_type(a)123@PEBDAEAH(a)Z(str ptr) tr2_sys__Stat @ 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 -@ 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 -@ 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=win32 ?_Statvfs(a)sys@tr2(a)std@@YA?AUspace_info(a)123@PBD(a)Z(ptr str) tr2_sys__Statvfs +@ cdecl -arch=win64 ?_Statvfs(a)sys@tr2(a)std@@YA?AUspace_info(a)123@PEBD(a)Z(ptr str) tr2_sys__Statvfs +@ cdecl -arch=win32 ?_Statvfs(a)sys@tr2(a)std@@YA?AUspace_info(a)123@PB_W(a)Z(ptr wstr) tr2_sys__Statvfs_wchar +@ cdecl -arch=win64 ?_Statvfs(a)sys@tr2(a)std@@YA?AUspace_info(a)123@PEB_W(a)Z(ptr 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 c25e2e4..5b7ac61 100644 --- a/dlls/msvcp120/msvcp120.spec +++ b/dlls/msvcp120/msvcp120.spec @@ -1722,10 +1722,10 @@ @ cdecl -arch=win64 ?_Stat(a)sys@tr2(a)std@@YA?AW4file_type(a)123@PEBDAEAH(a)Z(str ptr) tr2_sys__Stat @ 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 -@ 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 -@ 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=win32 ?_Statvfs(a)sys@tr2(a)std@@YA?AUspace_info(a)123@PBD(a)Z(ptr str) tr2_sys__Statvfs +@ cdecl -arch=win64 ?_Statvfs(a)sys@tr2(a)std@@YA?AUspace_info(a)123@PEBD(a)Z(ptr str) tr2_sys__Statvfs +@ cdecl -arch=win32 ?_Statvfs(a)sys@tr2(a)std@@YA?AUspace_info(a)123@PB_W(a)Z(ptr wstr) tr2_sys__Statvfs_wchar +@ cdecl -arch=win64 ?_Statvfs(a)sys@tr2(a)std@@YA?AUspace_info(a)123@PEB_W(a)Z(ptr 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 fc69fd0..3f24d05 100644 --- a/dlls/msvcp120/tests/msvcp120.c +++ b/dlls/msvcp120/tests/msvcp120.c @@ -123,8 +123,8 @@ 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 struct space_info (__cdecl *p_tr2_sys__Statvfs_wchar)(WCHAR const*); +static struct space_info* (__cdecl *p_tr2_sys__Statvfs)(struct space_info*, char const*); +static struct space_info* (__cdecl *p_tr2_sys__Statvfs_wchar)(struct space_info*, 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 *); static __int64 (__cdecl *p_tr2_sys__Last_write_time)(char const*); @@ -984,15 +984,15 @@ static void test_tr2_sys__Statvfs(void) memset(current_path_wchar, 0, MAX_PATH); p_tr2_sys__Current_get_wchar(current_path_wchar); - info = p_tr2_sys__Statvfs(current_path); + p_tr2_sys__Statvfs(&info, 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); + p_tr2_sys__Statvfs_wchar(&info, 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); + p_tr2_sys__Statvfs(&info, 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", @@ -1000,7 +1000,7 @@ static void test_tr2_sys__Statvfs(void) 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"); + p_tr2_sys__Statvfs(&info, "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", diff --git a/dlls/msvcp120_app/msvcp120_app.spec b/dlls/msvcp120_app/msvcp120_app.spec index 6fd94ae..2701eee 100644 --- a/dlls/msvcp120_app/msvcp120_app.spec +++ b/dlls/msvcp120_app/msvcp120_app.spec @@ -1722,10 +1722,10 @@ @ cdecl -arch=win64 ?_Stat(a)sys@tr2(a)std@@YA?AW4file_type(a)123@PEBDAEAH(a)Z(str ptr) msvcp120.?_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 -@ 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 -@ 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=win32 ?_Statvfs(a)sys@tr2(a)std@@YA?AUspace_info(a)123@PBD(a)Z(ptr 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(ptr str) msvcp120.?_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@PB_W(a)Z(ptr 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(ptr 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 cabeaee..4005290 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -14329,20 +14329,20 @@ int __cdecl tr2_sys__Rename(char const* old_path, char const* new_path) /* ?_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) +struct space_info* __cdecl tr2_sys__Statvfs(struct space_info *ret, 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; + ret->capacity = ret->free = ret->available = 0; }else { - info.capacity = total.QuadPart; - info.free = free.QuadPart; - info.available = available.QuadPart; + ret->capacity = total.QuadPart; + ret->free = free.QuadPart; + ret->available = available.QuadPart; } - return info; + return ret; } /* ?_Stat(a)sys@tr2(a)std@@YA?AW4file_type(a)123@PBDAAH(a)Z */ @@ -14919,20 +14919,20 @@ int __cdecl tr2_sys__Rename_wchar(WCHAR const* old_path, WCHAR const* new_path) /* ?_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) +struct space_info* __cdecl tr2_sys__Statvfs_wchar(struct space_info *ret, 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; + ret->capacity = ret->free = ret->available = 0; }else { - info.capacity = total.QuadPart; - info.free = free.QuadPart; - info.available = available.QuadPart; + ret->capacity = total.QuadPart; + ret->free = free.QuadPart; + ret->available = available.QuadPart; } - return info; + return ret; } /* ??1_Winit(a)std@@QAE(a)XZ */

1 0

Martin Storsjo : vcruntime140: Add the new MSVC 2015 compiler specific DLL.
by Alexandre Julliard 30 Oct '15

30 Oct '15

Module: wine Branch: master Commit: 4e4f0f295b008712f9d5ef541d8667589c9d89e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e4f0f295b008712f9d5ef541… Author: Martin Storsjo <martin(a)martin.st> Date: Thu Oct 29 14:30:08 2015 +0200 vcruntime140: Add the new MSVC 2015 compiler specific DLL. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 + configure.ac | 1 + dlls/vcruntime140/Makefile.in | 4 ++ dlls/vcruntime140/misc.c | 39 +++++++++++++++++ dlls/vcruntime140/vcruntime140.spec | 87 +++++++++++++++++++++++++++++++++++++ tools/make_specfiles | 1 + 6 files changed, 134 insertions(+) diff --git a/configure b/configure index b3a1f26..da56b10 100755 --- a/configure +++ b/configure @@ -1318,6 +1318,7 @@ enable_vcomp100 enable_vcomp110 enable_vcomp120 enable_vcomp90 +enable_vcruntime140 enable_vdmdbg enable_version enable_vssapi @@ -17907,6 +17908,7 @@ wine_fn_config_dll vcomp100 enable_vcomp100 wine_fn_config_dll vcomp110 enable_vcomp110 wine_fn_config_dll vcomp120 enable_vcomp120 wine_fn_config_dll vcomp90 enable_vcomp90 +wine_fn_config_dll vcruntime140 enable_vcruntime140 wine_fn_config_dll vdhcp.vxd enable_win16 wine_fn_config_dll vdmdbg enable_vdmdbg implib wine_fn_config_dll ver.dll16 enable_win16 diff --git a/configure.ac b/configure.ac index 3d48b67..bb879b0 100644 --- a/configure.ac +++ b/configure.ac @@ -3356,6 +3356,7 @@ WINE_CONFIG_DLL(vcomp100) WINE_CONFIG_DLL(vcomp110) WINE_CONFIG_DLL(vcomp120) WINE_CONFIG_DLL(vcomp90) +WINE_CONFIG_DLL(vcruntime140) WINE_CONFIG_DLL(vdhcp.vxd,enable_win16) WINE_CONFIG_DLL(vdmdbg,,[implib]) WINE_CONFIG_DLL(ver.dll16,enable_win16) diff --git a/dlls/vcruntime140/Makefile.in b/dlls/vcruntime140/Makefile.in new file mode 100644 index 0000000..2b4d6af --- /dev/null +++ b/dlls/vcruntime140/Makefile.in @@ -0,0 +1,4 @@ +MODULE = vcruntime140.dll + +C_SRCS = \ + misc.c diff --git a/dlls/vcruntime140/misc.c b/dlls/vcruntime140/misc.c new file mode 100644 index 0000000..887c1b0 --- /dev/null +++ b/dlls/vcruntime140/misc.c @@ -0,0 +1,39 @@ +/* + * Copyright 2015 Martin Storsjo + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "windows.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(vcruntime); + +/********************************************************************* + * __telemetry_main_invoke_trigger + */ +void CDECL __telemetry_main_invoke_trigger(HINSTANCE hinst) +{ + FIXME("(%p)\n", hinst); +} + +/********************************************************************* + * __telemetry_main_return_trigger + */ +void CDECL __telemetry_main_return_trigger(HINSTANCE hinst) +{ + FIXME("(%p)\n", hinst); +} diff --git a/dlls/vcruntime140/vcruntime140.spec b/dlls/vcruntime140/vcruntime140.spec new file mode 100644 index 0000000..0c5ecc9 --- /dev/null +++ b/dlls/vcruntime140/vcruntime140.spec @@ -0,0 +1,87 @@ +@ stub _CreateFrameInfo +@ stdcall _CxxThrowException(long long) ucrtbase._CxxThrowException +@ cdecl -arch=i386 -norelay _EH_prolog() ucrtbase._EH_prolog +@ stub _FindAndUnlinkFrame +@ stub _IsExceptionObjectToBeDestroyed +@ stub _NLG_Dispatch2 +@ stub _NLG_Return +@ stub _NLG_Return2 +@ stub _SetWinRTOutOfMemoryExceptionCallback +@ cdecl __AdjustPointer(ptr ptr) ucrtbase.__AdjustPointer +@ stub __BuildCatchObject +@ stub __BuildCatchObjectHelper +@ stdcall -arch=x86_64 __C_specific_handler(ptr long ptr ptr) ucrtbase.__C_specific_handler +@ stub __C_specific_handler_noexcept +@ cdecl -arch=i386,x86_64,arm __CxxDetectRethrow(ptr) ucrtbase.__CxxDetectRethrow +@ cdecl -arch=i386,x86_64,arm __CxxExceptionFilter(ptr ptr long ptr) ucrtbase.__CxxExceptionFilter +@ cdecl -arch=i386,x86_64,arm -norelay __CxxFrameHandler(ptr ptr ptr ptr) ucrtbase.__CxxFrameHandler +@ cdecl -arch=i386,x86_64,arm -norelay __CxxFrameHandler2(ptr ptr ptr ptr) ucrtbase.__CxxFrameHandler2 +@ cdecl -arch=i386,x86_64,arm -norelay __CxxFrameHandler3(ptr ptr ptr ptr) ucrtbase.__CxxFrameHandler3 +@ stdcall -arch=i386 __CxxLongjmpUnwind(ptr) ucrtbase.__CxxLongjmpUnwind +@ cdecl -arch=i386,x86_64,arm __CxxQueryExceptionSize() ucrtbase.__CxxQueryExceptionSize +@ stub __CxxRegisterExceptionObject +@ stub __CxxUnregisterExceptionObject +@ stub __DestructExceptionObject +@ stub __FrameUnwindFilter +@ stub __GetPlatformExceptionInfo +@ stub __NLG_Dispatch2 +@ stub __NLG_Return2 +@ cdecl __RTCastToVoid(ptr) ucrtbase.__RTCastToVoid +@ cdecl __RTDynamicCast(ptr long ptr ptr long) ucrtbase.__RTDynamicCast +@ cdecl __RTtypeid(ptr) ucrtbase.__RTtypeid +@ stub __TypeMatch +@ stub __current_exception +@ stub __current_exception_context +@ stub __intrinsic_setjmp +@ stub __intrinsic_setjmpex +@ stub __processing_throw +@ stub __report_gsfailure +@ stub __std_exception_copy +@ stub __std_exception_destroy +@ stub __std_terminate +@ stub __std_type_info_compare +@ stub __std_type_info_destroy_list +@ stub __std_type_info_hash +@ stub __std_type_info_name +@ cdecl __telemetry_main_invoke_trigger(ptr) +@ cdecl __telemetry_main_return_trigger(ptr) +@ cdecl __unDName(ptr str long ptr ptr long) ucrtbase.__unDName +@ cdecl __unDNameEx(ptr str long ptr ptr ptr long) ucrtbase.__unDNameEx +@ cdecl __uncaught_exception() ucrtbase.__uncaught_exception +@ stub __uncaught_exceptions +@ stub __vcrt_GetModuleFileNameW +@ stub __vcrt_GetModuleHandleW +@ stub __vcrt_InitializeCriticalSectionEx +@ stub __vcrt_LoadLibraryExW +@ cdecl -arch=i386 -norelay _chkesp() ucrtbase._chkesp +@ cdecl -arch=i386 _except_handler2(ptr ptr ptr ptr) ucrtbase._except_handler2 +@ cdecl -arch=i386 _except_handler3(ptr ptr ptr ptr) ucrtbase._except_handler3 +@ cdecl -arch=i386 _except_handler4_common(ptr ptr ptr ptr ptr ptr) ucrtbase._except_handler4_common +@ stub _get_purecall_handler +@ cdecl _get_unexpected() ucrtbase._get_unexpected +@ cdecl -arch=i386 _global_unwind2(ptr) ucrtbase._global_unwind2 +@ stub _is_exception_typeof +@ cdecl -arch=i386 _local_unwind2(ptr long) ucrtbase._local_unwind2 +@ cdecl -arch=i386 _local_unwind4(ptr ptr long) ucrtbase._local_unwind4 +@ cdecl -arch=i386 _longjmpex(ptr long) ucrtbase._longjmpex +@ cdecl -arch=x86_64 _local_unwind(ptr ptr) ucrtbase._local_unwind +@ cdecl _purecall() ucrtbase._purecall +@ stdcall -arch=i386 _seh_longjmp_unwind4(ptr) ucrtbase._seh_longjmp_unwind4 +@ stdcall -arch=i386 _seh_longjmp_unwind(ptr) ucrtbase._seh_longjmp_unwind +@ cdecl _set_purecall_handler(ptr) ucrtbase._set_purecall_handler +@ stub _set_se_translator +@ cdecl -arch=i386 -norelay _setjmp3(ptr long) ucrtbase._setjmp3 +@ cdecl -arch=i386,x86_64,arm longjmp(ptr long) ucrtbase.longjmp +@ cdecl memchr(ptr long long) ucrtbase.memchr +@ cdecl memcmp(ptr ptr long) ucrtbase.memcmp +@ cdecl memcpy(ptr ptr long) ucrtbase.memcpy +@ cdecl memmove(ptr ptr long) ucrtbase.memmove +@ cdecl memset(ptr long long) ucrtbase.memset +@ stub set_unexpected +@ cdecl strchr(str long) ucrtbase.strchr +@ cdecl strrchr(str long) ucrtbase.strrchr +@ cdecl strstr(str str) ucrtbase.strstr +@ stub unexpected +@ cdecl wcschr(wstr long) ucrtbase.wcschr +@ cdecl wcsrchr(wstr long) ucrtbase.wcsrchr +@ cdecl wcsstr(wstr wstr) ucrtbase.wcsstr diff --git a/tools/make_specfiles b/tools/make_specfiles index 7511ab7..986070f 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -66,6 +66,7 @@ my @dll_groups = "api-ms-win-crt-string-l1-1-0", "api-ms-win-crt-time-l1-1-0", "api-ms-win-crt-utility-l1-1-0", + "vcruntime140", ], [ "msvcp120",

1 0

Aric Stewart : hid: Implement HidD_GetSerialNumberString.
by Alexandre Julliard 30 Oct '15

30 Oct '15

Module: wine Branch: master Commit: af3406ec610fcbada9aa0c7fd1c31ac9eb02c7eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=af3406ec610fcbada9aa0c7fd… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Oct 29 14:23:06 2015 -0500 hid: Implement HidD_GetSerialNumberString. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hid/hid.spec | 2 +- dlls/hid/hidd.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/hid/hid.spec b/dlls/hid/hid.spec index c7b056d..e416762 100644 --- a/dlls/hid/hid.spec +++ b/dlls/hid/hid.spec @@ -12,7 +12,7 @@ @ stub HidD_GetPhysicalDescriptor @ stdcall HidD_GetPreparsedData(ptr ptr) @ stdcall HidD_GetProductString(long ptr long) -@ stub HidD_GetSerialNumberString +@ stdcall HidD_GetSerialNumberString(long ptr long) @ stub HidD_Hello @ stub HidD_SetConfiguration @ stdcall HidD_SetFeature(long ptr long) diff --git a/dlls/hid/hidd.c b/dlls/hid/hidd.c index 1cb88d6..c6bdd85 100644 --- a/dlls/hid/hidd.c +++ b/dlls/hid/hidd.c @@ -99,6 +99,12 @@ BOOLEAN WINAPI HidD_GetProductString(HANDLE HidDeviceObject, PVOID Buffer, ULONG return DeviceIoControl(HidDeviceObject, IOCTL_HID_GET_PRODUCT_STRING, NULL, 0, Buffer, BufferLength, NULL, NULL); } +BOOLEAN WINAPI HidD_GetSerialNumberString(HANDLE HidDeviceObject, PVOID Buffer, ULONG BufferLength) +{ + TRACE("(%p %p %u)\n", HidDeviceObject, Buffer, BufferLength); + return DeviceIoControl(HidDeviceObject, IOCTL_HID_GET_SERIALNUMBER_STRING, NULL, 0, Buffer, BufferLength, NULL, NULL); +} + BOOLEAN WINAPI HidD_GetPreparsedData(HANDLE HidDeviceObject, PHIDP_PREPARSED_DATA *PreparsedData) { HID_COLLECTION_INFORMATION info;

1 0

Aric Stewart : hidclass.sys: Implement IOCTL_HID_GET_SERIALNUMBER_STRING.
by Alexandre Julliard 30 Oct '15

30 Oct '15

Module: wine Branch: master Commit: b70069a58eeb8e5e1d36e05e0ffbfe0887ef4a30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b70069a58eeb8e5e1d36e05e0… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Oct 29 14:59:17 2015 -0500 hidclass.sys: Implement IOCTL_HID_GET_SERIALNUMBER_STRING. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/device.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/hidclass.sys/device.c b/dlls/hidclass.sys/device.c index e3c7121..53ec569 100644 --- a/dlls/hidclass.sys/device.c +++ b/dlls/hidclass.sys/device.c @@ -480,6 +480,11 @@ NTSTATUS WINAPI HID_Device_ioctl(DEVICE_OBJECT *device, IRP *irp) rc = handle_minidriver_string(device, irp, HID_STRING_ID_IPRODUCT); break; } + case IOCTL_HID_GET_SERIALNUMBER_STRING: + { + rc = handle_minidriver_string(device, irp, HID_STRING_ID_ISERIALNUMBER); + break; + } case IOCTL_HID_GET_MANUFACTURER_STRING: { rc = handle_minidriver_string(device, irp, HID_STRING_ID_IMANUFACTURER);

1 0