wine-commits October 2015

wine-commits@winehq.org

2 participants
749 discussions

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@sys@tr2@std@@YA?AW4file_type@123@PEBDAEAH@Z(str ptr) tr2_sys__Stat @ stub -arch=win32 ?_Stat@sys@tr2@std@@YA?AW4file_type@123@PB_WAAH@Z @ stub -arch=win64 ?_Stat@sys@tr2@std@@YA?AW4file_type@123@PEB_WAEAH@Z -@ cdecl -arch=win32 ?_Statvfs@sys@tr2@std@@YA?AUspace_info@123@PBD@Z(str) tr2_sys__Statvfs -@ cdecl -arch=win64 ?_Statvfs@sys@tr2@std@@YA?AUspace_info@123@PEBD@Z(str) tr2_sys__Statvfs -@ cdecl -arch=win32 ?_Statvfs@sys@tr2@std@@YA?AUspace_info@123@PB_W@Z(wstr) tr2_sys__Statvfs_wchar -@ cdecl -arch=win64 ?_Statvfs@sys@tr2@std@@YA?AUspace_info@123@PEB_W@Z(wstr) tr2_sys__Statvfs_wchar +@ cdecl -arch=win32 ?_Statvfs@sys@tr2@std@@YA?AUspace_info@123@PBD@Z(ptr str) tr2_sys__Statvfs +@ cdecl -arch=win64 ?_Statvfs@sys@tr2@std@@YA?AUspace_info@123@PEBD@Z(ptr str) tr2_sys__Statvfs +@ cdecl -arch=win32 ?_Statvfs@sys@tr2@std@@YA?AUspace_info@123@PB_W@Z(ptr wstr) tr2_sys__Statvfs_wchar +@ cdecl -arch=win64 ?_Statvfs@sys@tr2@std@@YA?AUspace_info@123@PEB_W@Z(ptr wstr) tr2_sys__Statvfs_wchar @ cdecl -arch=arm ?_Swap_all@_Container_base0@std@@QAAXAAU12@@Z(ptr ptr) Container_base0_Swap_all @ thiscall -arch=i386 ?_Swap_all@_Container_base0@std@@QAEXAAU12@@Z(ptr ptr) Container_base0_Swap_all @ cdecl -arch=win64 ?_Swap_all@_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@sys@tr2@std@@YA?AW4file_type@123@PEBDAEAH@Z(str ptr) tr2_sys__Stat @ stub -arch=win32 ?_Stat@sys@tr2@std@@YA?AW4file_type@123@PB_WAAH@Z @ stub -arch=win64 ?_Stat@sys@tr2@std@@YA?AW4file_type@123@PEB_WAEAH@Z -@ cdecl -arch=win32 ?_Statvfs@sys@tr2@std@@YA?AUspace_info@123@PBD@Z(str) tr2_sys__Statvfs -@ cdecl -arch=win64 ?_Statvfs@sys@tr2@std@@YA?AUspace_info@123@PEBD@Z(str) tr2_sys__Statvfs -@ cdecl -arch=win32 ?_Statvfs@sys@tr2@std@@YA?AUspace_info@123@PB_W@Z(wstr) tr2_sys__Statvfs_wchar -@ cdecl -arch=win64 ?_Statvfs@sys@tr2@std@@YA?AUspace_info@123@PEB_W@Z(wstr) tr2_sys__Statvfs_wchar +@ cdecl -arch=win32 ?_Statvfs@sys@tr2@std@@YA?AUspace_info@123@PBD@Z(ptr str) tr2_sys__Statvfs +@ cdecl -arch=win64 ?_Statvfs@sys@tr2@std@@YA?AUspace_info@123@PEBD@Z(ptr str) tr2_sys__Statvfs +@ cdecl -arch=win32 ?_Statvfs@sys@tr2@std@@YA?AUspace_info@123@PB_W@Z(ptr wstr) tr2_sys__Statvfs_wchar +@ cdecl -arch=win64 ?_Statvfs@sys@tr2@std@@YA?AUspace_info@123@PEB_W@Z(ptr wstr) tr2_sys__Statvfs_wchar @ cdecl -arch=arm ?_Swap_all@_Container_base0@std@@QAAXAAU12@@Z(ptr ptr) Container_base0_Swap_all @ thiscall -arch=i386 ?_Swap_all@_Container_base0@std@@QAEXAAU12@@Z(ptr ptr) Container_base0_Swap_all @ cdecl -arch=win64 ?_Swap_all@_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@sys@tr2@std@@YA?AW4file_type@123@PEBDAEAH@Z(str ptr) msvcp120.?_Stat@sys@tr2@std@@YA?AW4file_type@123@PEBDAEAH@Z @ stub -arch=win32 ?_Stat@sys@tr2@std@@YA?AW4file_type@123@PB_WAAH@Z @ stub -arch=win64 ?_Stat@sys@tr2@std@@YA?AW4file_type@123@PEB_WAEAH@Z -@ cdecl -arch=win32 ?_Statvfs@sys@tr2@std@@YA?AUspace_info@123@PBD@Z(str) msvcp120.?_Statvfs@sys@tr2@std@@YA?AUspace_info@123@PBD@Z -@ cdecl -arch=win64 ?_Statvfs@sys@tr2@std@@YA?AUspace_info@123@PEBD@Z(str) msvcp120.?_Statvfs@sys@tr2@std@@YA?AUspace_info@123@PEBD@Z -@ cdecl -arch=win32 ?_Statvfs@sys@tr2@std@@YA?AUspace_info@123@PB_W@Z(wstr) msvcp120.?_Statvfs@sys@tr2@std@@YA?AUspace_info@123@PB_W@Z -@ cdecl -arch=win64 ?_Statvfs@sys@tr2@std@@YA?AUspace_info@123@PEB_W@Z(wstr) msvcp120.?_Statvfs@sys@tr2@std@@YA?AUspace_info@123@PEB_W@Z +@ cdecl -arch=win32 ?_Statvfs@sys@tr2@std@@YA?AUspace_info@123@PBD@Z(ptr str) msvcp120.?_Statvfs@sys@tr2@std@@YA?AUspace_info@123@PBD@Z +@ cdecl -arch=win64 ?_Statvfs@sys@tr2@std@@YA?AUspace_info@123@PEBD@Z(ptr str) msvcp120.?_Statvfs@sys@tr2@std@@YA?AUspace_info@123@PEBD@Z +@ cdecl -arch=win32 ?_Statvfs@sys@tr2@std@@YA?AUspace_info@123@PB_W@Z(ptr wstr) msvcp120.?_Statvfs@sys@tr2@std@@YA?AUspace_info@123@PB_W@Z +@ cdecl -arch=win64 ?_Statvfs@sys@tr2@std@@YA?AUspace_info@123@PEB_W@Z(ptr wstr) msvcp120.?_Statvfs@sys@tr2@std@@YA?AUspace_info@123@PEB_W@Z @ cdecl -arch=arm ?_Swap_all@_Container_base0@std@@QAAXAAU12@@Z(ptr ptr) msvcp120.?_Swap_all@_Container_base0@std@@QAAXAAU12@@Z @ thiscall -arch=i386 ?_Swap_all@_Container_base0@std@@QAEXAAU12@@Z(ptr ptr) msvcp120.?_Swap_all@_Container_base0@std@@QAEXAAU12@@Z @ cdecl -arch=win64 ?_Swap_all@_Container_base0@std@@QEAAXAEAU12@@Z(ptr ptr) msvcp120.?_Swap_all@_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@sys@tr2@std@@YA?AUspace_info@123@PBD@Z */ /* ?_Statvfs@sys@tr2@std@@YA?AUspace_info@123@PEBD@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@sys@tr2@std@@YA?AW4file_type@123@PBDAAH@Z */ @@ -14919,20 +14919,20 @@ int __cdecl tr2_sys__Rename_wchar(WCHAR const* old_path, WCHAR const* new_path) /* ?_Statvfs@sys@tr2@std@@YA?AUspace_info@123@PB_W@Z */ /* ?_Statvfs@sys@tr2@std@@YA?AUspace_info@123@PEB_W@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@std@@QAE@XZ */

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

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: 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

Alistair Leslie-Hughes : dpnet: Don't leak entry name.
by Alexandre Julliard 29 Oct '15

29 Oct '15

Module: wine Branch: master Commit: 54633e3956e6b3c4d8ebbd5d721efa294e9602fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=54633e3956e6b3c4d8ebbd5d7… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Oct 29 19:21:23 2015 +1100 dpnet: Don't leak entry name. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dpnet/address.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/dpnet/address.c b/dlls/dpnet/address.c index 4f3a59b..d87d4e7 100644 --- a/dlls/dpnet/address.c +++ b/dlls/dpnet/address.c @@ -159,6 +159,7 @@ static ULONG WINAPI IDirectPlay8AddressImpl_Release(IDirectPlay8Address *iface) break; } + heap_free(entry->name); heap_free(entry); }

1 0

Stefan Dösinger : wined3d: Prepare GL resources before calling context_apply_fbo_state.
by Alexandre Julliard 29 Oct '15

29 Oct '15

Module: wine Branch: master Commit: 1ca9dfc8ee25f4ae188fdacd4d3d56046cef8003 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ca9dfc8ee25f4ae188fdacd4… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Oct 28 15:29:17 2015 +0100 wined3d: Prepare GL resources before calling context_apply_fbo_state. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 7 ------- dlls/wined3d/device.c | 13 ++++++++---- dlls/wined3d/drawprim.c | 20 ++++++++++++------ dlls/wined3d/surface.c | 46 ++++++++++++++++++++++++++---------------- dlls/wined3d/wined3d_private.h | 2 ++ 5 files changed, 54 insertions(+), 34 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1ca9dfc8ee25f4ae188fd…

1 0

Martin Storsjo : ucrtbase: Implement vsscanf.
by Alexandre Julliard 29 Oct '15

29 Oct '15

Module: wine Branch: master Commit: 436eb3639c34c93d55685396be0e1b7d50d76fd4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=436eb3639c34c93d55685396b… Author: Martin Storsjo <martin(a)martin.st> Date: Thu Oct 29 12:39:44 2015 +0200 ucrtbase: Implement vsscanf. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-crt-stdio-l1-1-0.spec | 2 +- dlls/msvcrt/scanf.c | 15 +++++++++++++++ dlls/ucrtbase/Makefile.in | 1 + dlls/ucrtbase/ucrtbase.spec | 2 +- 4 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-crt-stdio-l1-1-0/api-ms-win-crt-stdio-l1-1-0.spec b/dlls/api-ms-win-crt-stdio-l1-1-0/api-ms-win-crt-stdio-l1-1-0.spec index 75549a7..2db8222 100644 --- a/dlls/api-ms-win-crt-stdio-l1-1-0/api-ms-win-crt-stdio-l1-1-0.spec +++ b/dlls/api-ms-win-crt-stdio-l1-1-0/api-ms-win-crt-stdio-l1-1-0.spec @@ -14,7 +14,7 @@ @ cdecl __stdio_common_vsprintf(int64 ptr long ptr ptr ptr) ucrtbase.__stdio_common_vsprintf @ stub __stdio_common_vsprintf_p @ cdecl __stdio_common_vsprintf_s(int64 ptr long ptr ptr ptr) ucrtbase.__stdio_common_vsprintf_s -@ stub __stdio_common_vsscanf +@ cdecl __stdio_common_vsscanf(int64 ptr long ptr ptr ptr) ucrtbase.__stdio_common_vsscanf @ cdecl __stdio_common_vswprintf(int64 ptr long ptr ptr ptr) ucrtbase.__stdio_common_vswprintf @ stub __stdio_common_vswprintf_p @ stub __stdio_common_vswprintf_s diff --git a/dlls/msvcrt/scanf.c b/dlls/msvcrt/scanf.c index 5dc6915..9a0150f 100644 --- a/dlls/msvcrt/scanf.c +++ b/dlls/msvcrt/scanf.c @@ -661,6 +661,21 @@ int CDECL MSVCRT__snscanf_s_l(char *input, MSVCRT_size_t length, return res; } + +/********************************************************************* + * __stdio_common_vsscanf (MSVCRT.@) + */ +int CDECL MSVCRT__stdio_common_vsscanf(unsigned __int64 options, + const char *input, MSVCRT_size_t length, + const char *format, + MSVCRT__locale_t locale, + __ms_va_list valist) +{ + if (options != 2) + FIXME("options %s not handled\n", wine_dbgstr_longlong(options)); + return MSVCRT_vsnscanf_l(input, length, format, locale, valist); +} + /********************************************************************* * _snwscanf (MSVCRT.@) */ diff --git a/dlls/ucrtbase/Makefile.in b/dlls/ucrtbase/Makefile.in index 9e672f3..c1677ca 100644 --- a/dlls/ucrtbase/Makefile.in +++ b/dlls/ucrtbase/Makefile.in @@ -25,6 +25,7 @@ C_SRCS = \ mbcs.c \ misc.c \ process.c \ + scanf.c \ string.c \ thread.c \ time.c \ diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 067ab23..6877bef 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -159,7 +159,7 @@ @ cdecl __stdio_common_vsprintf(int64 ptr long ptr ptr ptr) MSVCRT__stdio_common_vsprintf @ stub __stdio_common_vsprintf_p @ cdecl __stdio_common_vsprintf_s(int64 ptr long ptr ptr ptr) MSVCRT__stdio_common_vsprintf_s -@ stub __stdio_common_vsscanf +@ cdecl __stdio_common_vsscanf(int64 ptr long ptr ptr ptr) MSVCRT__stdio_common_vsscanf @ cdecl __stdio_common_vswprintf(int64 ptr long ptr ptr ptr) MSVCRT__stdio_common_vswprintf @ stub __stdio_common_vswprintf_p @ stub __stdio_common_vswprintf_s

1 0

Alistair Leslie-Hughes : vbscript/tests: Show IActiveScriptSite OnScriptError is called on error.
by Alexandre Julliard 29 Oct '15

29 Oct '15

Module: wine Branch: master Commit: ae119b4205121d3bdcfcfb270700093ac9a22deb URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae119b4205121d3bdcfcfb270… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Oct 29 19:11:47 2015 +1100 vbscript/tests: Show IActiveScriptSite OnScriptError is called on error. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/tests/run.c | 37 ++++++++++++++++++++++++++++++++++++- 1 file changed, 36 insertions(+), 1 deletion(-) diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index a86711a..d8c5467 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -100,6 +100,7 @@ DEFINE_EXPECT(Next); DEFINE_EXPECT(GetWindow); DEFINE_EXPECT(GetUIBehavior); DEFINE_EXPECT(EnableModeless); +DEFINE_EXPECT(OnScriptError); #define DISPID_GLOBAL_REPORTSUCCESS 1000 #define DISPID_GLOBAL_TRACE 1001 @@ -138,6 +139,7 @@ static const char *test_name = "(null)"; static int test_counter; static SCRIPTUICHANDLING uic_handling = SCRIPTUICHANDLING_NOUIERROR; static IDispatchEx testObj; +static HRESULT onerror_hres = E_NOTIMPL; static BSTR a2bstr(const char *str) { @@ -1623,7 +1625,12 @@ static HRESULT WINAPI ActiveScriptSite_OnStateChange(IActiveScriptSite *iface, S static HRESULT WINAPI ActiveScriptSite_OnScriptError(IActiveScriptSite *iface, IActiveScriptError *pscripterror) { - return E_NOTIMPL; + HRESULT hr = onerror_hres; + CHECK_EXPECT(OnScriptError); + + onerror_hres = E_NOTIMPL; + + return hr; } static HRESULT WINAPI ActiveScriptSite_OnEnterScript(IActiveScriptSite *iface) @@ -1927,18 +1934,22 @@ static void test_msgbox(void) SET_EXPECT(GetUIBehavior); SET_EXPECT(GetWindow); SET_EXPECT(EnableModeless); + SET_EXPECT(OnScriptError); hres = parse_script_ar("MsgBox \"testing...\""); ok(FAILED(hres), "script not failed\n"); CHECK_CALLED(GetUIBehavior); CHECK_CALLED(GetWindow); CHECK_CALLED(EnableModeless); + todo_wine CHECK_CALLED(OnScriptError); uic_handling = SCRIPTUICHANDLING_NOUIERROR; SET_EXPECT(GetUIBehavior); + SET_EXPECT(OnScriptError); hres = parse_script_ar("MsgBox \"testing...\""); ok(FAILED(hres), "script not failed\n"); CHECK_CALLED(GetUIBehavior); + todo_wine CHECK_CALLED(OnScriptError); } static HRESULT test_global_vars_ref(BOOL use_close) @@ -2184,8 +2195,10 @@ static void run_tests(void) parse_htmlscript_a("\n"); parse_htmlscript_a("\n\n"); + SET_EXPECT(OnScriptError); hres = parse_script_ar("<!--"); ok(FAILED(hres), "script didn't fail\n"); + todo_wine CHECK_CALLED(OnScriptError); SET_EXPECT(global_success_d); SET_EXPECT(global_success_i); @@ -2208,19 +2221,39 @@ static void run_tests(void) test_global_vars_ref(TRUE); test_global_vars_ref(FALSE); + SET_EXPECT(OnScriptError); hres = parse_script_ar("throwInt(&h80080008&)"); ok(hres == 0x80080008, "hres = %08x\n", hres); + todo_wine CHECK_CALLED(OnScriptError); /* DISP_E_BADINDEX */ + SET_EXPECT(OnScriptError); hres = parse_script_ar("throwInt(&h8002000b&)"); ok(hres == MAKE_VBSERROR(9), "hres = %08x\n", hres); + todo_wine CHECK_CALLED(OnScriptError); + SET_EXPECT(OnScriptError); hres = parse_script_ar("throwInt(&h800a0009&)"); ok(hres == MAKE_VBSERROR(9), "hres = %08x\n", hres); + todo_wine CHECK_CALLED(OnScriptError); + + onerror_hres = S_OK; + SET_EXPECT(OnScriptError); + hres = parse_script_ar("throwInt(&h800a0009&)"); + todo_wine ok(hres == SCRIPT_E_REPORTED, "hres = %08x\n", hres); + todo_wine CHECK_CALLED(OnScriptError); /* E_NOTIMPL */ + SET_EXPECT(OnScriptError); hres = parse_script_ar("throwInt(&h80004001&)"); ok(hres == MAKE_VBSERROR(445), "hres = %08x\n", hres); + todo_wine CHECK_CALLED(OnScriptError); + + onerror_hres = S_OK; + SET_EXPECT(OnScriptError); + hres = parse_script_ar("throwInt(&h80004001&)"); + todo_wine ok(hres == SCRIPT_E_REPORTED, "hres = %08x\n", hres); + todo_wine CHECK_CALLED(OnScriptError); SET_EXPECT(global_testoptionalarg_i); parse_script_a("call testOptionalArg(1,,2)"); @@ -2255,8 +2288,10 @@ static void run_tests(void) parse_script_a("x = y\n" "Call ok(getVT(x) = \"VT_EMPTY*\", \"getVT(x) = \" & getVT(x))\n" "Call ok(getVT(y) = \"VT_EMPTY*\", \"getVT(y) = \" & getVT(y))"); + SET_EXPECT(OnScriptError); hres = parse_script_ar("x = y(\"a\")"); ok(FAILED(hres), "script didn't fail\n"); + todo_wine CHECK_CALLED(OnScriptError); run_from_res("lang.vbs"); run_from_res("api.vbs");

1 0

Jacek Caban : kernel32: Pass SYNCHRONIZE access flag to NtCreateFile.
by Alexandre Julliard 29 Oct '15

29 Oct '15

Module: wine Branch: master Commit: 0c8edbcc80846f9523ac7164a78517c103edd43b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c8edbcc80846f9523ac7164a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 29 11:52:06 2015 +0100 kernel32: Pass SYNCHRONIZE access flag to NtCreateFile. Office clicktorun patched ntdll functions expect them to be set. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/file.c | 8 ++++---- dlls/kernel32/path.c | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c index ee43b10..5ea024f 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c @@ -1574,7 +1574,7 @@ HANDLE WINAPI CreateFileW( LPCWSTR filename, DWORD access, DWORD sharing, if (sa && sa->bInheritHandle) attr.Attributes |= OBJ_INHERIT; - status = NtCreateFile( &ret, access, &attr, &io, NULL, attributes, + status = NtCreateFile( &ret, access | SYNCHRONIZE, &attr, &io, NULL, attributes, sharing, nt_disposition[creation - CREATE_NEW], options, NULL, 0 ); if (status) @@ -1683,7 +1683,7 @@ BOOL WINAPI DeleteFileW( LPCWSTR path ) attr.SecurityDescriptor = NULL; attr.SecurityQualityOfService = NULL; - status = NtCreateFile(&hFile, GENERIC_READ | GENERIC_WRITE | DELETE, + status = NtCreateFile(&hFile, GENERIC_READ | GENERIC_WRITE | SYNCHRONIZE | DELETE, &attr, &io, NULL, 0, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, FILE_OPEN, FILE_DELETE_ON_CLOSE | FILE_NON_DIRECTORY_FILE, NULL, 0); @@ -1826,7 +1826,7 @@ BOOL WINAPI ReplaceFileW(LPCWSTR lpReplacedFileName, LPCWSTR lpReplacementFileNa } attr.ObjectName = &nt_backup_name; /* Open the backup with permissions to write over it */ - status = NtCreateFile(&hBackup, GENERIC_WRITE, + status = NtCreateFile(&hBackup, GENERIC_WRITE | SYNCHRONIZE, &attr, &io, NULL, replaced_info.FileAttributes, FILE_SHARE_WRITE, FILE_OPEN_IF, FILE_SYNCHRONOUS_IO_NONALERT|FILE_NON_DIRECTORY_FILE, @@ -2835,7 +2835,7 @@ HANDLE WINAPI OpenFileById( HANDLE handle, LPFILE_ID_DESCRIPTOR id, DWORD access attr.SecurityQualityOfService = NULL; if (sec_attr && sec_attr->bInheritHandle) attr.Attributes |= OBJ_INHERIT; - status = NtCreateFile( &result, access, &attr, &io, NULL, flags, + status = NtCreateFile( &result, access | SYNCHRONIZE, &attr, &io, NULL, flags, share, OPEN_EXISTING, options, NULL, 0 ); if (status != STATUS_SUCCESS) { diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index 09b8b7f..271bcf4 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -1562,7 +1562,7 @@ BOOL WINAPI CreateDirectoryW( LPCWSTR path, LPSECURITY_ATTRIBUTES sa ) attr.SecurityDescriptor = sa ? sa->lpSecurityDescriptor : NULL; attr.SecurityQualityOfService = NULL; - status = NtCreateFile( &handle, GENERIC_READ, &attr, &io, NULL, + status = NtCreateFile( &handle, GENERIC_READ | SYNCHRONIZE, &attr, &io, NULL, FILE_ATTRIBUTE_NORMAL, FILE_SHARE_READ, FILE_CREATE, FILE_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT, NULL, 0 );

1 0

Daniel Lehman : msvcp120: Implement _Thrd_equal/lt.
by Alexandre Julliard 29 Oct '15

29 Oct '15

Module: wine Branch: master Commit: 95cde2c8b8e1af1b58223a40e2dac9beb320183c URL: http://source.winehq.org/git/wine.git/?a=commit;h=95cde2c8b8e1af1b58223a40e… Author: Daniel Lehman <dlehman(a)esri.com> Date: Tue Oct 27 23:21:07 2015 -0700 msvcp120: Implement _Thrd_equal/lt. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp110/msvcp110.spec | 4 +-- dlls/msvcp120/msvcp120.spec | 4 +-- dlls/msvcp120/tests/msvcp120.c | 58 +++++++++++++++++++++++++++++++++++++ dlls/msvcp120_app/msvcp120_app.spec | 4 +-- dlls/msvcp90/misc.c | 20 +++++++++++++ 5 files changed, 84 insertions(+), 6 deletions(-) diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index b8d21eb..9fb938a 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -3859,10 +3859,10 @@ @ stub _Thrd_create @ stub _Thrd_current @ stub _Thrd_detach -@ stub _Thrd_equal +@ cdecl _Thrd_equal(ptr ptr) @ stub _Thrd_exit @ stub _Thrd_join -@ stub _Thrd_lt +@ cdecl _Thrd_lt(ptr ptr) @ stub _Thrd_sleep @ stub _Thrd_start @ stub _Thrd_yield diff --git a/dlls/msvcp120/msvcp120.spec b/dlls/msvcp120/msvcp120.spec index 0458b01..c25e2e4 100644 --- a/dlls/msvcp120/msvcp120.spec +++ b/dlls/msvcp120/msvcp120.spec @@ -3806,10 +3806,10 @@ @ stub _Thrd_create @ stub _Thrd_current @ stub _Thrd_detach -@ stub _Thrd_equal +@ cdecl _Thrd_equal(ptr ptr) @ stub _Thrd_exit @ stub _Thrd_join -@ stub _Thrd_lt +@ cdecl _Thrd_lt(ptr ptr) @ stub _Thrd_sleep @ stub _Thrd_start @ stub _Thrd_yield diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c index d754191..fc69fd0 100644 --- a/dlls/msvcp120/tests/msvcp120.c +++ b/dlls/msvcp120/tests/msvcp120.c @@ -130,6 +130,16 @@ static enum file_type (__cdecl *p_tr2_sys__Lstat)(char const*, int *); static __int64 (__cdecl *p_tr2_sys__Last_write_time)(char const*); static void (__cdecl *p_tr2_sys__Last_write_time_set)(char const*, __int64); +/* thrd */ +typedef struct +{ + HANDLE hnd; + DWORD id; +} _Thrd_t; + +static int (__cdecl *p__Thrd_equal)(_Thrd_t, _Thrd_t); +static int (__cdecl *p__Thrd_lt)(_Thrd_t, _Thrd_t); + static HMODULE msvcp; #define SETNOFAIL(x,y) x = (void*)GetProcAddress(msvcp,y) #define SET(x,y) do { SETNOFAIL(x,y); ok(x != NULL, "Export '%s' not found\n", y); } while(0) @@ -253,6 +263,10 @@ static BOOL init(void) SET(p_tr2_sys__Last_write_time_set, "?_Last_write_time@sys@tr2@std@@YAXPBD_J@Z"); } + SET(p__Thrd_equal, + "_Thrd_equal"); + SET(p__Thrd_lt, + "_Thrd_lt"); msvcr = GetModuleHandleA("msvcr120.dll"); p_setlocale = (void*)GetProcAddress(msvcr, "setlocale"); @@ -1120,6 +1134,47 @@ static void test_tr2_sys__Last_write_time(void) ok(ret == 1, "test_tr2_sys__Remove_dir(): expect 1 got %d\n", ret); } +static void test_thrd(void) +{ + int ret, i; + struct test { + _Thrd_t a; + _Thrd_t b; + int r; + }; + const HANDLE hnd1 = (HANDLE)0xcccccccc; + const HANDLE hnd2 = (HANDLE)0xdeadbeef; + + struct test testeq[] = { + { {0, 0}, {0, 0}, 1 }, + { {0, 1}, {0, 0}, 0 }, + { {hnd1, 0}, {hnd1, 1}, 0 }, + { {hnd1, 0}, {hnd2, 0}, 1 } + }; + + struct test testlt[] = { + { {0, 0}, {0, 0}, 0 }, + { {0, 0}, {0, 1}, 1 }, + { {0, 1}, {0, 0}, 0 }, + { {hnd1, 0}, {hnd2, 0}, 0 }, + { {hnd1, 0}, {hnd2, 1}, 1 } + }; + + /* test for equal */ + for(i=0; i<sizeof(testeq)/sizeof(testeq[0]); i++) { + ret = p__Thrd_equal(testeq[i].a, testeq[i].b); + ok(ret == testeq[i].r, "(%p %u) = (%p %u) expected %d, got %d\n", + testeq[i].a.hnd, testeq[i].a.id, testeq[i].b.hnd, testeq[i].b.id, testeq[i].r, ret); + } + + /* test for less than */ + for(i=0; i<sizeof(testlt)/sizeof(testlt[0]); i++) { + ret = p__Thrd_lt(testlt[i].a, testlt[i].b); + ok(ret == testlt[i].r, "(%p %u) < (%p %u) expected %d, got %d\n", + testlt[i].a.hnd, testlt[i].a.id, testlt[i].b.hnd, testlt[i].b.id, testlt[i].r, ret); + } +} + START_TEST(msvcp120) { if(!init()) return; @@ -1143,5 +1198,8 @@ START_TEST(msvcp120) test_tr2_sys__Statvfs(); test_tr2_sys__Stat(); test_tr2_sys__Last_write_time(); + + test_thrd(); + FreeLibrary(msvcp); } diff --git a/dlls/msvcp120_app/msvcp120_app.spec b/dlls/msvcp120_app/msvcp120_app.spec index 2598904..6fd94ae 100644 --- a/dlls/msvcp120_app/msvcp120_app.spec +++ b/dlls/msvcp120_app/msvcp120_app.spec @@ -3806,10 +3806,10 @@ @ stub _Thrd_create @ stub _Thrd_current @ stub _Thrd_detach -@ stub _Thrd_equal +@ cdecl _Thrd_equal(ptr ptr) msvcp120._Thrd_equal @ stub _Thrd_exit @ stub _Thrd_join -@ stub _Thrd_lt +@ cdecl _Thrd_lt(ptr ptr) msvcp120._Thrd_lt @ stub _Thrd_sleep @ stub _Thrd_start @ stub _Thrd_yield diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index 6501ff9..2ec34fe 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -683,3 +683,23 @@ void init_misc(void *base) iostream_category_ctor(&iostream_category); #endif } + +#if _MSVCP_VER >= 110 +typedef struct +{ + HANDLE hnd; + DWORD id; +} _Thrd_t; + +int __cdecl _Thrd_equal(_Thrd_t a, _Thrd_t b) +{ + TRACE("(%p %u %p %u)\n", a.hnd, a.id, b.hnd, b.id); + return a.id == b.id; +} + +int __cdecl _Thrd_lt(_Thrd_t a, _Thrd_t b) +{ + TRACE("(%p %u %p %u)\n", a.hnd, a.id, b.hnd, b.id); + return a.id < b.id; +} +#endif

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2015