wine-commits November 2017

wine-commits@winehq.org

2 participants
436 discussions

Michael Stefaniuc : wined3d: Use ARRAY_SIZE().
by Alexandre Julliard 02 Nov '17

02 Nov '17

Module: wine Branch: master Commit: 9d1acd197d4aaddb618b0e77caebf8b384785740 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d1acd197d4aaddb618b0e77c… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Oct 31 12:10:29 2017 +0100 wined3d: Use ARRAY_SIZE(). Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 994c4b1..76f6705 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -488,7 +488,7 @@ ULONG CDECL wined3d_device_decref(struct wined3d_device *device) state_cleanup(&device->state); - for (i = 0; i < sizeof(device->multistate_funcs) / sizeof(device->multistate_funcs[0]); ++i) + for (i = 0; i < ARRAY_SIZE(device->multistate_funcs); ++i) { HeapFree(GetProcessHeap(), 0, device->multistate_funcs[i]); device->multistate_funcs[i] = NULL; @@ -5106,7 +5106,7 @@ HRESULT device_init(struct wined3d_device *device, struct wined3d *wined3d, return WINED3D_OK; err: - for (i = 0; i < sizeof(device->multistate_funcs) / sizeof(device->multistate_funcs[0]); ++i) + for (i = 0; i < ARRAY_SIZE(device->multistate_funcs); ++i) { HeapFree(GetProcessHeap(), 0, device->multistate_funcs[i]); }

1 0

Michael Stefaniuc : ddraw/tests: Use ARRAY_SIZE() in the ddraw4 tests.
by Alexandre Julliard 02 Nov '17

02 Nov '17

Module: wine Branch: master Commit: 1677711d6ee89196208effca84b4a3546bb413f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1677711d6ee89196208effca8… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Oct 31 12:10:28 2017 +0100 ddraw/tests: Use ARRAY_SIZE() in the ddraw4 tests. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw4.c | 145 ++++++++++++++++++++++------------------------ 1 file changed, 69 insertions(+), 76 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1677711d6ee89196208ef…

1 0

Michael Stefaniuc : ddraw/tests: Use ARRAY_SIZE() in the ddraw2 tests.
by Alexandre Julliard 02 Nov '17

02 Nov '17

Module: wine Branch: master Commit: 71443a5e1259384961ded2914d47b696fa7a6e93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=71443a5e1259384961ded2914… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Oct 31 12:10:27 2017 +0100 ddraw/tests: Use ARRAY_SIZE() in the ddraw2 tests. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw2.c | 124 ++++++++++++++++++++++------------------------ 1 file changed, 59 insertions(+), 65 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=71443a5e1259384961ded…

1 0

Michael Stefaniuc : ddraw/tests: Use ARRAY_SIZE() in the ddraw1 tests.
by Alexandre Julliard 02 Nov '17

02 Nov '17

Module: wine Branch: master Commit: 27c203f237eb8eb41dbdebc8bd99ab985bce6bfe URL: http://source.winehq.org/git/wine.git/?a=commit;h=27c203f237eb8eb41dbdebc8b… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Oct 31 12:10:26 2017 +0100 ddraw/tests: Use ARRAY_SIZE() in the ddraw1 tests. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw1.c | 100 +++++++++++++++++++++++----------------------- 1 file changed, 50 insertions(+), 50 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=27c203f237eb8eb41dbde…

1 0

Martin Storsjo : msvcrt: Back up and restore the FPU state in setjmp/ longjmp on ARM.
by Alexandre Julliard 02 Nov '17

02 Nov '17

Module: wine Branch: master Commit: 171b3bcf3b7c4ef992fce81849108202d70dbddc URL: http://source.winehq.org/git/wine.git/?a=commit;h=171b3bcf3b7c4ef992fce8184… Author: Martin Storsjo <martin(a)martin.st> Date: Thu Nov 2 08:55:42 2017 +0200 msvcrt: Back up and restore the FPU state in setjmp/longjmp on ARM. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/except_arm.c | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/except_arm.c b/dlls/msvcrt/except_arm.c index 29ddb7b..76c4735 100644 --- a/dlls/msvcrt/except_arm.c +++ b/dlls/msvcrt/except_arm.c @@ -151,7 +151,16 @@ __ASM_GLOBAL_FUNC(MSVCRT__setjmpex, "str r11, [r0, #0x20]\n\t" /* jmp_buf->R11 */ "str sp, [r0, #0x24]\n\t" /* jmp_buf->Sp */ "str lr, [r0, #0x28]\n\t" /* jmp_buf->Pc */ - /* FIXME: Save floating point data */ + "vmrs r2, fpscr\n\t" + "str r2, [r0, #0x2c]\n\t" /* jmp_buf->Fpscr */ + "vstr d8, [r0, #0x30]\n\t" /* jmp_buf->D[0] */ + "vstr d9, [r0, #0x38]\n\t" /* jmp_buf->D[1] */ + "vstr d10, [r0, #0x40]\n\t" /* jmp_buf->D[2] */ + "vstr d11, [r0, #0x48]\n\t" /* jmp_buf->D[3] */ + "vstr d12, [r0, #0x50]\n\t" /* jmp_buf->D[4] */ + "vstr d13, [r0, #0x58]\n\t" /* jmp_buf->D[5] */ + "vstr d14, [r0, #0x60]\n\t" /* jmp_buf->D[6] */ + "vstr d15, [r0, #0x68]\n\t" /* jmp_buf->D[7] */ "mov r0, #0\n\t" "bx lr"); @@ -168,7 +177,16 @@ __ASM_GLOBAL_FUNC(longjmp_set_regs, "ldr r11, [r0, #0x20]\n\t" /* jmp_buf->R11 */ "ldr sp, [r0, #0x24]\n\t" /* jmp_buf->Sp */ "ldr r2, [r0, #0x28]\n\t" /* jmp_buf->Pc */ - /* FIXME: Restore floating point data */ + "ldr r3, [r0, #0x2c]\n\t" /* jmp_buf->Fpscr */ + "vmsr fpscr, r3\n\t" + "vldr d8, [r0, #0x30]\n\t" /* jmp_buf->D[0] */ + "vldr d9, [r0, #0x38]\n\t" /* jmp_buf->D[1] */ + "vldr d10, [r0, #0x40]\n\t" /* jmp_buf->D[2] */ + "vldr d11, [r0, #0x48]\n\t" /* jmp_buf->D[3] */ + "vldr d12, [r0, #0x50]\n\t" /* jmp_buf->D[4] */ + "vldr d13, [r0, #0x58]\n\t" /* jmp_buf->D[5] */ + "vldr d14, [r0, #0x60]\n\t" /* jmp_buf->D[6] */ + "vldr d15, [r0, #0x68]\n\t" /* jmp_buf->D[7] */ "mov r0, r1\n\t" /* retval */ "bx r2");

1 0

Alexandre Julliard : include: Use the hard-float calling convention for Windows APIs on ARM
by Alexandre Julliard 02 Nov '17

02 Nov '17

Module: wine Branch: master Commit: 644f497e87c51f1a1c62b26ea9f588e7bc97d13b URL: http://source.winehq.org/git/wine.git/?a=commit;h=644f497e87c51f1a1c62b26ea… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 2 10:22:56 2017 +0100 include: Use the hard-float calling convention for Windows APIs on ARM Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/crtdefs.h | 10 +++++++++- include/windef.h | 11 ++++++++++- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/include/msvcrt/crtdefs.h b/include/msvcrt/crtdefs.h index 9ec2082..ff0f4bd 100644 --- a/include/msvcrt/crtdefs.h +++ b/include/msvcrt/crtdefs.h @@ -60,6 +60,8 @@ # else # define __stdcall __attribute__((ms_abi)) # endif +# elif defined(__arm__) && defined (__GNUC__) +# define __stdcall __attribute__((pcs("aapcs-vfp"))) # else /* __i386__ */ # define __stdcall # endif /* __i386__ */ @@ -78,6 +80,8 @@ # else # define __cdecl __attribute__((ms_abi)) # endif +# elif defined(__arm__) && defined (__GNUC__) +# define __cdecl __attribute__((pcs("aapcs-vfp"))) # elif !defined(_MSC_VER) # define __cdecl # endif @@ -102,7 +106,11 @@ #endif #ifndef WINAPIV -# define WINAPIV __cdecl +# if defined(__arm__) && defined (__GNUC__) +# define WINAPIV __attribute__((pcs("aapcs"))) +# else +# define WINAPIV __cdecl +# endif #endif #ifndef DECLSPEC_ALIGN diff --git a/include/windef.h b/include/windef.h index e77b1ca..d2afcf4 100644 --- a/include/windef.h +++ b/include/windef.h @@ -69,6 +69,8 @@ extern "C" { # else # define __stdcall __attribute__((ms_abi)) # endif +# elif defined(__arm__) && defined (__GNUC__) +# define __stdcall __attribute__((pcs("aapcs-vfp"))) # else /* __i386__ */ # define __stdcall # endif /* __i386__ */ @@ -87,6 +89,8 @@ extern "C" { # else # define __cdecl __attribute__((ms_abi)) # endif +# elif defined(__arm__) && defined (__GNUC__) +# define __cdecl __attribute__((pcs("aapcs-vfp"))) # elif !defined(_MSC_VER) # define __cdecl # endif @@ -110,6 +114,12 @@ extern "C" { # endif #endif +#if defined(__arm__) && defined (__GNUC__) +# define WINAPIV __attribute__((pcs("aapcs"))) +#else +# define WINAPIV __cdecl +#endif + #ifdef __WINESRC__ #define __ONLY_IN_WINELIB(x) do_not_use_this_in_wine #else @@ -179,7 +189,6 @@ extern "C" { #define PASCAL __stdcall #define CDECL __cdecl #define _CDECL __cdecl -#define WINAPIV __cdecl #define APIENTRY WINAPI #define CONST __ONLY_IN_WINELIB(const)

1 0

Alexandre Julliard : xcopy: Use WINAPIV calling convention for variadic functions.
by Alexandre Julliard 02 Nov '17

02 Nov '17

Module: wine Branch: master Commit: 9aa298ba69401e4b9f0003c4543ec0b0f8e2ea78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9aa298ba69401e4b9f0003c45… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 2 10:22:27 2017 +0100 xcopy: Use WINAPIV calling convention for variadic functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/xcopy/xcopy.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/xcopy/xcopy.c b/programs/xcopy/xcopy.c index 5c2f7ca..a173cc1 100644 --- a/programs/xcopy/xcopy.c +++ b/programs/xcopy/xcopy.c @@ -94,7 +94,7 @@ static WCHAR *XCOPY_LoadMessage(UINT id) { * and hence required WriteConsoleW to output it, however if file i/o is * redirected, it needs to be WriteFile'd using OEM (not ANSI) format * ========================================================================= */ -static int __cdecl XCOPY_wprintf(const WCHAR *format, ...) { +static int WINAPIV XCOPY_wprintf(const WCHAR *format, ...) { static WCHAR *output_bufW = NULL; static char *output_bufA = NULL;

1 0

Alexandre Julliard : uninstaller: Use WINAPIV calling convention for variadic functions.
by Alexandre Julliard 02 Nov '17

02 Nov '17

Module: wine Branch: master Commit: 7c555f5c907ca42ec01d0af57d4fd17aaeadf7c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c555f5c907ca42ec01d0af57… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 2 10:22:17 2017 +0100 uninstaller: Use WINAPIV calling convention for variadic functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/uninstaller/main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/uninstaller/main.c b/programs/uninstaller/main.c index 1c834ea..736593e 100644 --- a/programs/uninstaller/main.c +++ b/programs/uninstaller/main.c @@ -97,7 +97,7 @@ static void output_formatstring(const WCHAR *fmt, __ms_va_list va_args) LocalFree(str); } -static void __cdecl output_message(unsigned int id, ...) +static void WINAPIV output_message(unsigned int id, ...) { WCHAR fmt[1024]; __ms_va_list va_args; @@ -112,7 +112,7 @@ static void __cdecl output_message(unsigned int id, ...) __ms_va_end(va_args); } -static void __cdecl output_array(WCHAR *fmt, ...) +static void WINAPIV output_array(WCHAR *fmt, ...) { __ms_va_list va_args;

1 0

Alexandre Julliard : taskkill: Use WINAPIV calling convention for variadic functions.
by Alexandre Julliard 02 Nov '17

02 Nov '17

Module: wine Branch: master Commit: 6c4cea952f94c3cef262ca74e539126a11414382 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c4cea952f94c3cef262ca74e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 2 10:22:10 2017 +0100 taskkill: Use WINAPIV calling convention for variadic functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/taskkill/taskkill.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/taskkill/taskkill.c b/programs/taskkill/taskkill.c index b9dd1a5..6e4e1eb 100644 --- a/programs/taskkill/taskkill.c +++ b/programs/taskkill/taskkill.c @@ -74,7 +74,7 @@ static int taskkill_vprintfW(const WCHAR *msg, __ms_va_list va_args) return count; } -static int CDECL taskkill_printfW(const WCHAR *msg, ...) +static int WINAPIV taskkill_printfW(const WCHAR *msg, ...) { __ms_va_list va_args; int len; @@ -86,7 +86,7 @@ static int CDECL taskkill_printfW(const WCHAR *msg, ...) return len; } -static int CDECL taskkill_message_printfW(int msg, ...) +static int WINAPIV taskkill_message_printfW(int msg, ...) { __ms_va_list va_args; WCHAR msg_buffer[8192];

1 0

Alexandre Julliard : regsvr32: Use WINAPIV calling convention for variadic functions.
by Alexandre Julliard 02 Nov '17

02 Nov '17

Module: wine Branch: master Commit: a31e62a2676806aafe05bc9ddc6150b65597efeb URL: http://source.winehq.org/git/wine.git/?a=commit;h=a31e62a2676806aafe05bc9dd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 2 10:22:01 2017 +0100 regsvr32: Use WINAPIV calling convention for variadic functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regsvr32/regsvr32.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/regsvr32/regsvr32.c b/programs/regsvr32/regsvr32.c index 6338bae..988aaa3 100644 --- a/programs/regsvr32/regsvr32.c +++ b/programs/regsvr32/regsvr32.c @@ -40,7 +40,7 @@ typedef HRESULT (WINAPI *DLLINSTALL) (BOOL,LPCWSTR); static BOOL Silent = FALSE; -static void __cdecl output_write(UINT id, ...) +static void WINAPIV output_write(UINT id, ...) { WCHAR fmt[1024]; __ms_va_list va_args;

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 November 2017