October 2015 - Wine-Commits

Sebastian Lackner : server: Add a missing grab_object in cgwe_enum.
by Alexandre Julliard Oct. 30, 2015

Oct. 30, 2015

Module: wine Branch: master Commit: 9e66d845853fdcae352c22432540b8d7ffc7f850 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e66d845853fdcae352c22432… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Oct 30 08:26:07 2015 +0100 server: Add a missing grab_object in cgwe_enum. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/console.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/console.c b/server/console.c index 78e91d6..389547d 100644 --- a/server/console.c +++ b/server/console.c @@ -1781,7 +1781,7 @@ static int cgwe_enum( struct process* process, void* user) { if (process->console && process->console->renderer == current) { - *(struct console_input**)user = process->console; + *(struct console_input**)user = (struct console_input *)grab_object( process->console ); return 1; } return 0;

1 0

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

Oct. 30, 2015

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

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

Oct. 30, 2015

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

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

Oct. 30, 2015

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

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

Oct. 29, 2015

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

Alexandre Julliard : makefiles: Generate rules for installing symlinks.
by Alexandre Julliard Oct. 29, 2015

Oct. 29, 2015

Module: wine Branch: master Commit: 356e46a1ef9f866f4a548674b4811a98d1b1847c URL: http://source.winehq.org/git/wine.git/?a=commit;h=356e46a1ef9f866f4a548674b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 29 18:06:35 2015 +0900 makefiles: Generate rules for installing symlinks. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 23 ++++++++++++++++++++++- tools/winegcc/Makefile.in | 21 +++------------------ 2 files changed, 25 insertions(+), 19 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index ffd286f..30bbc3e 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -1831,6 +1831,9 @@ static void output_install_rules( struct makefile *make, struct strarray files, output( "\t%s $(INSTALL_SCRIPT_FLAGS) %s $(DESTDIR)%s\n", install_sh, src_dir_path( make, file ), dest + 1 ); break; + case 'y': /* symlink */ + output( "\t$(RM) $(DESTDIR)%s && $(LN_S) %s $(DESTDIR)%s\n", dest + 1, file, dest + 1 ); + break; default: assert(0); } @@ -1853,7 +1856,7 @@ static void output_install_rules( struct makefile *make, struct strarray files, static struct strarray output_sources( struct makefile *make, struct strarray *testlist_files ) { struct incl_file *source; - unsigned int i; + unsigned int i, j; struct strarray object_files = empty_strarray; struct strarray crossobj_files = empty_strarray; struct strarray res_files = empty_strarray; @@ -2018,6 +2021,7 @@ static struct strarray output_sources( struct makefile *make, struct strarray *t { if (strendswith( obj, ".man" ) && source->file->args) { + struct strarray symlinks; char *dir, *dest = replace_extension( obj, ".man", "" ); char *lang = strchr( dest, '.' ); char *section = source->file->args; @@ -2028,6 +2032,10 @@ static struct strarray output_sources( struct makefile *make, struct strarray *t } else dir = strmake( "$(mandir)/man%s", section ); add_install_rule( make, dest, xstrdup(obj), strmake( "d%s/%s.%s", dir, dest, section )); + symlinks = get_expanded_make_var_array( make, file_local_var( dest, "SYMLINKS" )); + for (j = 0; j < symlinks.count; j++) + add_install_rule( make, symlinks.str[j], strmake( "%s.%s", dest, section ), + strmake( "y%s/%s.%s", dir, symlinks.str[j], section )); free( dest ); free( dir ); strarray_add( &all_targets, xstrdup(obj) ); @@ -2447,6 +2455,8 @@ static struct strarray output_sources( struct makefile *make, struct strarray *t struct strarray all_libs = empty_strarray; struct strarray objs = get_expanded_make_var_array( make, file_local_var( make->programs.str[i], "OBJS" )); + struct strarray symlinks = get_expanded_make_var_array( make, + file_local_var( make->programs.str[i], "SYMLINKS" )); if (!objs.count) objs = object_files; output( "%s:", obj_dir_path( make, program ) ); @@ -2485,8 +2495,19 @@ static struct strarray output_sources( struct makefile *make, struct strarray *t output( "\n" ); strarray_add( &all_targets, program ); + if (symlinks.count) + { + output_filenames_obj_dir( make, symlinks ); + output( ": %s\n", obj_dir_path( make, program )); + output( "\t$(RM) $@ && $(LN_S) %s $@\n", obj_dir_path( make, program )); + strarray_addall( &all_targets, symlinks ); + } + add_install_rule( make, program, program_installed ? program_installed : program, strmake( "p$(bindir)/%s", program )); + for (j = 0; j < symlinks.count; j++) + add_install_rule( make, symlinks.str[j], program, + strmake( "y$(bindir)/%s%s", symlinks.str[j], exe_ext )); } for (i = 0; i < make->scripts.count; i++) diff --git a/tools/winegcc/Makefile.in b/tools/winegcc/Makefile.in index 1a3b2a7..daeb91b 100644 --- a/tools/winegcc/Makefile.in +++ b/tools/winegcc/Makefile.in @@ -2,6 +2,8 @@ PROGRAMS = winegcc MANPAGES = winegcc.man.in +winegcc_SYMLINKS = winecpp wineg++ + C_SRCS = \ utils.c \ winegcc.c @@ -16,21 +18,4 @@ winegcc_EXTRADEFS = \ -DLD="\"$(LD)\"" \ -DPRELINK="\"$(PRELINK)\"" -INSTALL_DEV = $(PROGRAMS) - -EXTRA_TARGETS = winecpp$(EXEEXT) wineg++$(EXEEXT) - -all: $(EXTRA_TARGETS) - -winecpp$(EXEEXT) wineg++$(EXEEXT): winegcc$(EXEEXT) - $(RM) $@ && $(LN_S) winegcc$(EXEEXT) $@ - -install install-dev:: - cd $(DESTDIR)$(bindir) && $(RM) wineg++$(EXEEXT) && $(LN_S) winegcc$(EXEEXT) wineg++$(EXEEXT) - cd $(DESTDIR)$(bindir) && $(RM) winecpp$(EXEEXT) && $(LN_S) winegcc$(EXEEXT) winecpp$(EXEEXT) - cd $(DESTDIR)$(mandir)/man$(prog_manext) && $(RM) wineg++.$(prog_manext) && $(LN_S) winegcc.$(prog_manext) wineg++.$(prog_manext) - cd $(DESTDIR)$(mandir)/man$(prog_manext) && $(RM) winecpp.$(prog_manext) && $(LN_S) winegcc.$(prog_manext) winecpp.$(prog_manext) - -uninstall:: - $(RM) $(DESTDIR)$(bindir)/wineg++$(EXEEXT) $(DESTDIR)$(bindir)/winecpp$(EXEEXT) - $(RM) $(DESTDIR)$(mandir)/man$(prog_manext)/wineg++.$(prog_manext) $(DESTDIR)$(mandir)/man$(prog_manext)/winecpp.$(prog_manext) +INSTALL_DEV = $(PROGRAMS) $(winegcc_SYMLINKS)

1 0

Nikolay Sivov : shell32: Fix temporary item array leak (Valgrind).
by Alexandre Julliard Oct. 29, 2015

Oct. 29, 2015

Module: wine Branch: master Commit: 4e88852415dd72a77eec3eca8903310550527c99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e88852415dd72a77eec3eca8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Oct 29 12:23:57 2015 +0300 shell32: Fix temporary item array leak (Valgrind). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shellitem.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/shell32/shellitem.c b/dlls/shell32/shellitem.c index f64c2d0..d688f17 100644 --- a/dlls/shell32/shellitem.c +++ b/dlls/shell32/shellitem.c @@ -1197,6 +1197,7 @@ HRESULT WINAPI SHCreateShellItemArray(PCIDLIST_ABSOLUTE pidlParent, if(SUCCEEDED(ret)) { ret = create_shellitemarray(array, cidl, ppsiItemArray); + HeapFree(GetProcessHeap(), 0, array); if(SUCCEEDED(ret)) return ret; } @@ -1310,6 +1311,7 @@ HRESULT WINAPI SHCreateShellItemArrayFromIDLists(UINT cidl, if(SUCCEEDED(ret)) { ret = create_shellitemarray(array, cidl, psia); + HeapFree(GetProcessHeap(), 0, array); if(SUCCEEDED(ret)) return ret; }

1 0

Nikolay Sivov : dwrite: Fix streams and files pointer arrays leak ( Valgrind).
by Alexandre Julliard Oct. 29, 2015

Oct. 29, 2015

Module: wine Branch: master Commit: d829c50cbea22fb8eaf023401c32f4e3758a6e8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d829c50cbea22fb8eaf023401… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Oct 29 10:20:53 2015 +0300 dwrite: Fix streams and files pointer arrays leak (Valgrind). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 22de471..0e3c09a 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -431,6 +431,8 @@ static ULONG WINAPI dwritefontface_Release(IDWriteFontFace2 *iface) if (This->files[i]) IDWriteFontFile_Release(This->files[i]); } + heap_free(This->streams); + heap_free(This->files); for (i = 0; i < sizeof(This->glyphs)/sizeof(This->glyphs[0]); i++) heap_free(This->glyphs[i]);

1 0

Nikolay Sivov : dwrite: Fail earlier in TranslateColorGlyphRun() for fonts without color info.
by Alexandre Julliard Oct. 29, 2015

Oct. 29, 2015

Module: wine Branch: master Commit: 9441b26dc5829a3b4e24ac051a5e444e42ebff0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9441b26dc5829a3b4e24ac051… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Oct 29 10:20:54 2015 +0300 dwrite: Fail earlier in TranslateColorGlyphRun() for fonts without color info. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 15 +++++++++++++++ dlls/dwrite/tests/font.c | 2 -- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 0e3c09a..97ea039 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -4556,8 +4556,23 @@ HRESULT create_colorglyphenum(FLOAT originX, FLOAT originY, const DWRITE_GLYPH_R DWRITE_MEASURING_MODE mode, const DWRITE_MATRIX *transform, UINT32 palette, IDWriteColorGlyphRunEnumerator **ret) { struct dwrite_colorglyphenum *colorglyphenum; + IDWriteFontFace2 *fontface2; + BOOL colorfont; + HRESULT hr; *ret = NULL; + + hr = IDWriteFontFace_QueryInterface(run->fontFace, &IID_IDWriteFontFace2, (void**)&fontface2); + if (FAILED(hr)) { + WARN("failed to get IDWriteFontFace2, 0x%08x\n", hr); + return hr; + } + + colorfont = IDWriteFontFace2_IsColorFont(fontface2); + IDWriteFontFace2_Release(fontface2); + if (!colorfont) + return DWRITE_E_NOCOLOR; + colorglyphenum = heap_alloc(sizeof(*colorglyphenum)); if (!colorglyphenum) return E_OUTOFMEMORY; diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index e03c819..41d848e 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -5074,10 +5074,8 @@ static void test_TranslateColorGlyphRun(void) layers = (void*)0xdeadbeef; hr = IDWriteFactory2_TranslateColorGlyphRun(factory2, 0.0, 0.0, &run, NULL, DWRITE_MEASURING_MODE_NATURAL, NULL, 0, &layers); -todo_wine { ok(hr == DWRITE_E_NOCOLOR, "got 0x%08x\n", hr); ok(layers == NULL, "got %p\n", layers); -} IDWriteFontFace_Release(fontface); /* Segoe UI Emoji, with color support */

1 0

Gerald Pfeifer : gdiplus: Avoid shift overflow in get_gif_background_color.
by Alexandre Julliard Oct. 29, 2015

Oct. 29, 2015

Module: wine Branch: master Commit: 8f5b50d46ba09e2699e044fc48ee586f6b1f4ccf URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f5b50d46ba09e2699e044fc4… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Mon Oct 19 22:06:42 2015 +0200 gdiplus: Avoid shift overflow in get_gif_background_color. Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/image.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 53ace05..f803efa 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -3838,7 +3838,7 @@ static DWORD get_gif_background_color(GpBitmap *bitmap) if(bitmap->prop_item[i].id == PropertyTagGlobalPalette) { if(bitmap->prop_item[i].length/3 > bgcolor_idx) { BYTE *color = ((BYTE*)bitmap->prop_item[i].value)+bgcolor_idx*3; - return color[2] + (color[1]<<8) + (color[0]<<16) + (0xff<<24); + return color[2] + (color[1]<<8) + (color[0]<<16) + (0xffu<<24); } break; }

1 0