December 2017 - Wine-commits

Alexandre Julliard : winebuild: Add support for -mfloat-abi option.
by Alexandre Julliard 08 Dec '17

08 Dec '17

Module: wine Branch: master Commit: 0c42b33a0b13a701615b1157e1849339441360ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c42b33a0b13a701615b1157e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 8 11:55:30 2017 +0100 winebuild: Add support for -mfloat-abi option. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/build.h | 1 + tools/winebuild/main.c | 6 ++++++ tools/winebuild/winebuild.man.in | 2 +- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/tools/winebuild/build.h b/tools/winebuild/build.h index d365b56..90e8e34 100644 --- a/tools/winebuild/build.h +++ b/tools/winebuild/build.h @@ -362,6 +362,7 @@ extern struct strarray ld_command; extern struct strarray nm_command; extern char *cpu_option; extern char *arch_option; +extern const char *float_abi_option; extern int thumb_mode; extern int needs_get_pc_thunk; diff --git a/tools/winebuild/main.c b/tools/winebuild/main.c index 09ebb34..f4656f9 100644 --- a/tools/winebuild/main.c +++ b/tools/winebuild/main.c @@ -89,6 +89,11 @@ struct strarray ld_command = { 0 }; struct strarray nm_command = { 0 }; char *cpu_option = NULL; char *arch_option = NULL; +#ifdef __SOFTFP__ +const char *float_abi_option = "soft"; +#else +const char *float_abi_option = "softfp"; +#endif #ifdef __thumb__ int thumb_mode = 1; @@ -408,6 +413,7 @@ static char **parse_options( int argc, char **argv, DLLSPEC *spec ) else if (!strcmp( optarg, "thumb" )) thumb_mode = 1; else if (!strncmp( optarg, "cpu=", 4 )) cpu_option = xstrdup( optarg + 4 ); else if (!strncmp( optarg, "arch=", 5 )) arch_option = xstrdup( optarg + 5 ); + else if (!strncmp( optarg, "float-abi=", 10 )) float_abi_option = xstrdup( optarg + 10 ); else fatal_error( "Unknown -m option '%s'\n", optarg ); break; case 'M': diff --git a/tools/winebuild/winebuild.man.in b/tools/winebuild/winebuild.man.in index 564f312..89865ac 100644 --- a/tools/winebuild/winebuild.man.in +++ b/tools/winebuild/winebuild.man.in @@ -156,7 +156,7 @@ option. .B \-m16, -m32, -m64 Generate respectively 16-bit, 32-bit or 64-bit code. .TP -.BI \-marm,\ \-mthumb,\ \-march= option ,\ \-mcpu= option +.BI \-marm,\ \-mthumb,\ \-march= option ,\ \-mcpu= option ,\ \-mfloat-abi= option Set code generation options for the assembler. .TP .BI \-M,\ --main-module= module

1 0

Alexandre Julliard : winegcc: Add support for -mfloat-abi option.
by Alexandre Julliard 08 Dec '17

08 Dec '17

Module: wine Branch: master Commit: c81de726f2d2555492afd4442a5a8635e64af584 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c81de726f2d2555492afd4442… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 8 11:55:42 2017 +0100 winegcc: Add support for -mfloat-abi option. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/winegcc.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 514a574..80dba4c 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -1537,7 +1537,9 @@ int main(int argc, char **argv) strarray_add(opts.winebuild_args, argv[i]); raw_linker_arg = 1; } - else if (strncmp("-mcpu=", argv[i], 6) == 0 || strncmp("-march=", argv[i], 7) == 0) + else if (!strncmp("-mcpu=", argv[i], 6) || + !strncmp("-march=", argv[i], 7) || + !strncmp("-mfloat-abi=", argv[i], 12)) strarray_add(opts.winebuild_args, argv[i]); break; case 'n':

1 0

Alexandre Julliard : configure: Add option for overriding the floating point ABI on ARM platforms.
by Alexandre Julliard 08 Dec '17

08 Dec '17

Module: wine Branch: master Commit: 364e04ce0ca011c4bf8087d4982283093766ee56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=364e04ce0ca011c4bf8087d49… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 8 11:37:16 2017 +0100 configure: Add option for overriding the floating point ABI on ARM platforms. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 38 +++++++++++++++++++++++++++++++------- configure.ac | 31 ++++++++++++++++++++++++------- 2 files changed, 55 insertions(+), 14 deletions(-) diff --git a/configure b/configure index 5e1eeef..25930e3 100755 --- a/configure +++ b/configure @@ -829,6 +829,7 @@ with_coreaudio with_cups with_curses with_dbus +with_float_abi with_fontconfig with_freetype with_gettext @@ -2388,6 +2389,7 @@ Optional Packages: --without-cups do not use CUPS --without-curses do not use (n)curses --without-dbus do not use DBus (dynamic device support) + --with-float-abi=abi specify the ABI (soft|softfp|hard) for ARM platforms --without-fontconfig do not use fontconfig --without-freetype do not use the FreeType library --without-gettext do not use gettext @@ -3545,6 +3547,12 @@ if test "${with_dbus+set}" = set; then : fi +# Check whether --with-float-abi was given. +if test "${with_float_abi+set}" = set; then : + withval=$with_float_abi; +fi + + # Check whether --with-fontconfig was given. if test "${with_fontconfig+set}" = set; then : withval=$with_fontconfig; @@ -5263,12 +5271,20 @@ $as_echo "no" >&6; } fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext - CFLAGS="$CFLAGS -marm" - TARGETFLAGS="-marm" - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC supports floating point" >&5 -$as_echo_n "checking whether $CC supports floating point... " >&6; } - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + case $with_float_abi in + soft|softfp|hard) + float_abi=$with_float_abi ;; + *) + case $host_os in + *eabihf) + float_abi=hard ;; + *) + float_abi=softfp + saved_CFLAGS=$CFLAGS + CFLAGS="$CFLAGS -marm -mfloat-abi=$float_abi" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC supports -mfloat-abi=$float_abi" >&5 +$as_echo_n "checking whether $CC supports -mfloat-abi=$float_abi... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -5285,10 +5301,18 @@ $as_echo "yes" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - as_fn_error $? "You need a target with floating point support to build Wine for ARM." "$LINENO" 5 + float_abi=soft + as_fn_append wine_warnings "|Floating point is not supported for this target. The resulting build won't be compatible with Windows ARM binaries." fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext + CFLAGS=$saved_CFLAGS + esac + ;; + esac + CFLAGS="$CFLAGS -marm -mfloat-abi=$float_abi" + TARGETFLAGS="-marm -mfloat-abi=$float_abi" + ;; i[3456789]86*) enable_win16=${enable_win16:-yes} diff --git a/configure.ac b/configure.ac index 8d9ec29..00413bc 100644 --- a/configure.ac +++ b/configure.ac @@ -43,6 +43,7 @@ AC_ARG_WITH(cups, AS_HELP_STRING([--without-cups],[do not use CUPS])) AC_ARG_WITH(curses, AS_HELP_STRING([--without-curses],[do not use (n)curses]), [if test "x$withval" = "xno"; then ac_cv_header_ncurses_h=no; ac_cv_header_curses_h=no; fi]) AC_ARG_WITH(dbus, AS_HELP_STRING([--without-dbus],[do not use DBus (dynamic device support)])) +AC_ARG_WITH(float-abi, AS_HELP_STRING([--with-float-abi=abi],[specify the ABI (soft|softfp|hard) for ARM platforms])) AC_ARG_WITH(fontconfig,AS_HELP_STRING([--without-fontconfig],[do not use fontconfig])) AC_ARG_WITH(freetype, AS_HELP_STRING([--without-freetype],[do not use the FreeType library])) AC_ARG_WITH(gettext, AS_HELP_STRING([--without-gettext],[do not use gettext])) @@ -177,13 +178,29 @@ case $host in [AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no]) AC_MSG_ERROR([You need a target with Thumb support to build Wine for ARM.])]) - CFLAGS="$CFLAGS -marm" - AC_SUBST(TARGETFLAGS,"-marm") - AC_MSG_CHECKING([whether $CC supports floating point]) - WINE_TRY_ASM_LINK(["vmrs r2,fpscr"],,, - [AC_MSG_RESULT([yes])], - [AC_MSG_RESULT([no]) - AC_MSG_ERROR([You need a target with floating point support to build Wine for ARM.])]) + case $with_float_abi in + soft|softfp|hard) + float_abi=$with_float_abi ;; + *) + case $host_os in + *eabihf) + float_abi=hard ;; + *) + float_abi=softfp + saved_CFLAGS=$CFLAGS + CFLAGS="$CFLAGS -marm -mfloat-abi=$float_abi" + AC_MSG_CHECKING([whether $CC supports -mfloat-abi=$float_abi]) + WINE_TRY_ASM_LINK(["vmrs r2,fpscr"],,, + [AC_MSG_RESULT([yes])], + [AC_MSG_RESULT([no]) + float_abi=soft + WINE_WARNING([Floating point is not supported for this target. The resulting build won't be compatible with Windows ARM binaries.])]) + CFLAGS=$saved_CFLAGS + esac + ;; + esac + CFLAGS="$CFLAGS -marm -mfloat-abi=$float_abi" + AC_SUBST(TARGETFLAGS,"-marm -mfloat-abi=$float_abi") ;; i[[3456789]]86*) enable_win16=${enable_win16:-yes}

1 0

Alexandre Julliard : include: Don' t use floating point for WINAPI functions when building for soft-float on ARM.
by Alexandre Julliard 08 Dec '17

08 Dec '17

Module: wine Branch: master Commit: 5c50ec0c747c1d1406e21304357f1a132b24861c URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c50ec0c747c1d1406e213043… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 8 12:43:19 2017 +0100 include: Don't use floating point for WINAPI functions when building for soft-float on ARM. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/crtdefs.h | 6 +++--- include/windef.h | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/msvcrt/crtdefs.h b/include/msvcrt/crtdefs.h index ff0f4bd..a9edef5 100644 --- a/include/msvcrt/crtdefs.h +++ b/include/msvcrt/crtdefs.h @@ -60,7 +60,7 @@ # else # define __stdcall __attribute__((ms_abi)) # endif -# elif defined(__arm__) && defined (__GNUC__) +# elif defined(__arm__) && defined (__GNUC__) && !defined(__SOFTFP__) # define __stdcall __attribute__((pcs("aapcs-vfp"))) # else /* __i386__ */ # define __stdcall @@ -80,7 +80,7 @@ # else # define __cdecl __attribute__((ms_abi)) # endif -# elif defined(__arm__) && defined (__GNUC__) +# elif defined(__arm__) && defined (__GNUC__) && !defined(__SOFTFP__) # define __cdecl __attribute__((pcs("aapcs-vfp"))) # elif !defined(_MSC_VER) # define __cdecl @@ -106,7 +106,7 @@ #endif #ifndef WINAPIV -# if defined(__arm__) && defined (__GNUC__) +# if defined(__arm__) && defined (__GNUC__) && !defined(__SOFTFP__) # define WINAPIV __attribute__((pcs("aapcs"))) # else # define WINAPIV __cdecl diff --git a/include/windef.h b/include/windef.h index d2afcf4..8a9f944 100644 --- a/include/windef.h +++ b/include/windef.h @@ -69,7 +69,7 @@ extern "C" { # else # define __stdcall __attribute__((ms_abi)) # endif -# elif defined(__arm__) && defined (__GNUC__) +# elif defined(__arm__) && defined (__GNUC__) && !defined(__SOFTFP__) # define __stdcall __attribute__((pcs("aapcs-vfp"))) # else /* __i386__ */ # define __stdcall @@ -89,7 +89,7 @@ extern "C" { # else # define __cdecl __attribute__((ms_abi)) # endif -# elif defined(__arm__) && defined (__GNUC__) +# elif defined(__arm__) && defined (__GNUC__) && !defined(__SOFTFP__) # define __cdecl __attribute__((pcs("aapcs-vfp"))) # elif !defined(_MSC_VER) # define __cdecl @@ -114,7 +114,7 @@ extern "C" { # endif #endif -#if defined(__arm__) && defined (__GNUC__) +#if defined(__arm__) && defined (__GNUC__) && !defined(__SOFTFP__) # define WINAPIV __attribute__((pcs("aapcs"))) #else # define WINAPIV __cdecl

1 0

Alexandre Julliard : msvcrt: Disable floating point instructions for the soft-float ARM build.
by Alexandre Julliard 08 Dec '17

08 Dec '17

Module: wine Branch: master Commit: 702da12d047d85bb14c357d07637273c557a6619 URL: http://source.winehq.org/git/wine.git/?a=commit;h=702da12d047d85bb14c357d07… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 8 13:03:28 2017 +0100 msvcrt: Disable floating point instructions for the soft-float ARM build. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/except_arm.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/msvcrt/except_arm.c b/dlls/msvcrt/except_arm.c index 76c4735..3f688a4 100644 --- a/dlls/msvcrt/except_arm.c +++ b/dlls/msvcrt/except_arm.c @@ -151,6 +151,7 @@ __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 */ +#ifndef __SOFTFP__ "vmrs r2, fpscr\n\t" "str r2, [r0, #0x2c]\n\t" /* jmp_buf->Fpscr */ "vstr d8, [r0, #0x30]\n\t" /* jmp_buf->D[0] */ @@ -161,6 +162,7 @@ __ASM_GLOBAL_FUNC(MSVCRT__setjmpex, "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] */ +#endif "mov r0, #0\n\t" "bx lr"); @@ -177,6 +179,7 @@ __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 */ +#ifndef __SOFTFP__ "ldr r3, [r0, #0x2c]\n\t" /* jmp_buf->Fpscr */ "vmsr fpscr, r3\n\t" "vldr d8, [r0, #0x30]\n\t" /* jmp_buf->D[0] */ @@ -187,6 +190,7 @@ __ASM_GLOBAL_FUNC(longjmp_set_regs, "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] */ +#endif "mov r0, r1\n\t" /* retval */ "bx r2");

1 0

Alexandre Julliard : oleaut32: Disable floating point instructions for the soft-float ARM build.
by Alexandre Julliard 08 Dec '17

08 Dec '17

Module: wine Branch: master Commit: 46aedd2ba4623f5ea72233d90c41c2291211b423 URL: http://source.winehq.org/git/wine.git/?a=commit;h=46aedd2ba4623f5ea72233d90… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 8 13:22:31 2017 +0100 oleaut32: Disable floating point instructions for the soft-float ARM build. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/typelib.c | 30 +++++++++++++++++++----------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 388f108..4e72ac0 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -6443,7 +6443,10 @@ __ASM_GLOBAL_FUNC( call_method, "subs r1, r1, #4\n\t" /* Decrement count */ "bgt 2b\n\t" /* Loop till done */ - "1:\tvldm r3!, {s0-s15}\n\t" /* Load the s0-s15/d0-d7 arguments */ + "1:\n\t" +#ifndef __SOFTFP__ + "vldm r3!, {s0-s15}\n\t" /* Load the s0-s15/d0-d7 arguments */ +#endif "mov ip, r0\n\t" /* Save the function call address to ip before we nuke r0 with arguments to pass */ "ldm r3, {r0-r3}\n\t" /* Load the r0-r3 arguments */ @@ -6854,14 +6857,18 @@ DispCallFunc( UINT i; DWORD *args; struct { +#ifndef __SOFTFP__ union { float s[16]; double d[8]; } sd; +#endif DWORD r[4]; } regs; int rcount; /* 32-bit register index count */ - int scount; /* single-precision float register index count (will be incremented twice for doubles, plus alignment) */ +#ifndef __SOFTFP__ + int scount = 0; /* single-precision float register index count (will be incremented twice for doubles, plus alignment) */ +#endif TRACE("(%p, %ld, %d, %d, %d, %p, %p, %p (vt=%d))\n", pvInstance, oVft, cc, vtReturn, cActuals, prgvt, prgpvarg, pvargResult, V_VT(pvargResult)); @@ -6874,7 +6881,6 @@ DispCallFunc( argspos = 0; rcount = 0; - scount = 0; /* Determine if we need to pass a pointer for the return value as arg 0. If so, do that */ /* first as it will need to be in the 'r' registers: */ @@ -6912,14 +6918,9 @@ DispCallFunc( { case VT_EMPTY: break; - case VT_R4: /* these must be 4-byte aligned, and put in 's' regs or stack, as they are single-floats */ - if (scount < 16) - regs.sd.s[scount++] = V_R4(arg); - else - args[argspos++] = V_UI4(arg); - break; case VT_R8: /* these must be 8-byte aligned, and put in 'd' regs or stack, as they are double-floats */ case VT_DATE: +#ifndef __SOFTFP__ if (scount < 15) { scount += (scount % 2); /* align scount to next whole double */ @@ -6934,6 +6935,7 @@ DispCallFunc( argspos += sizeof(V_R8(arg)) / sizeof(DWORD); } break; +#endif case VT_I8: /* these must be 8-byte aligned, and put in 'r' regs or stack, as they are long-longs */ case VT_UI8: case VT_CY: @@ -6977,6 +6979,14 @@ DispCallFunc( else args[argspos++] = V_BOOL(arg); break; + case VT_R4: /* these must be 4-byte aligned, and put in 's' regs or stack, as they are single-floats */ +#ifndef __SOFTFP__ + if (scount < 16) + regs.sd.s[scount++] = V_R4(arg); + else + args[argspos++] = V_UI4(arg); + break; +#endif default: if (rcount < 4) regs.r[rcount++] = V_UI4(arg); @@ -6989,8 +6999,6 @@ DispCallFunc( argspos += (argspos % 2); /* Make sure stack function alignment is 8-byte */ - TRACE("rcount: %d, scount: %d, argspos: %d\n", rcount, scount, argspos); - switch (vtReturn) { case VT_EMPTY: /* EMPTY = no return value */

1 0

Alexandre Julliard : oleaut32: Fix ARM floating point register allocations.
by Alexandre Julliard 08 Dec '17

08 Dec '17

Module: wine Branch: master Commit: b67dc2f4da5012eca29cac7e55889ce895bc55f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b67dc2f4da5012eca29cac7e5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 8 15:08:57 2017 +0100 oleaut32: Fix ARM floating point register allocations. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/typelib.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 4e72ac0..b56d81f 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -6867,7 +6867,8 @@ DispCallFunc( } regs; int rcount; /* 32-bit register index count */ #ifndef __SOFTFP__ - int scount = 0; /* single-precision float register index count (will be incremented twice for doubles, plus alignment) */ + int scount = 0; /* single-precision float register index count */ + int dcount = 0; /* double-precision float register index count */ #endif TRACE("(%p, %ld, %d, %d, %d, %p, %p, %p (vt=%d))\n", @@ -6921,15 +6922,13 @@ DispCallFunc( case VT_R8: /* these must be 8-byte aligned, and put in 'd' regs or stack, as they are double-floats */ case VT_DATE: #ifndef __SOFTFP__ - if (scount < 15) + dcount = max( (scount + 1) / 2, dcount ); + if (dcount < 8) { - scount += (scount % 2); /* align scount to next whole double */ - regs.sd.d[scount/2] = V_R8(arg); - scount += 2; + regs.sd.d[dcount++] = V_R8(arg); } else { - scount = 16; /* Make sure we flag that all 's' regs are full */ argspos += (argspos % 2); /* align argspos to 8-bytes */ memcpy( &args[argspos], &V_R8(arg), sizeof(V_R8(arg)) ); argspos += sizeof(V_R8(arg)) / sizeof(DWORD); @@ -6981,6 +6980,7 @@ DispCallFunc( break; case VT_R4: /* these must be 4-byte aligned, and put in 's' regs or stack, as they are single-floats */ #ifndef __SOFTFP__ + if (!(scount % 2)) scount = max( scount, dcount * 2 ); if (scount < 16) regs.sd.s[scount++] = V_R4(arg); else

1 0

Alexandre Julliard : oleaut32: Fix check for DECIMAL variant in VarNumFromParseNum.
by Alexandre Julliard 08 Dec '17

08 Dec '17

Module: wine Branch: master Commit: 756f78178666901f34613c4980b7714b83e97d77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=756f78178666901f34613c498… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 8 15:23:55 2017 +0100 oleaut32: Fix check for DECIMAL variant in VarNumFromParseNum. Reported by Gerald Pfeifer. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/variant.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index a1feb27..b9cf4b0 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -2161,7 +2161,7 @@ HRESULT WINAPI VarNumFromParseNum(NUMPARSE *pNumprs, BYTE *rgbDig, multiplier10, divisor10); if (dwVtBits & (INTEGER_VTBITS|VTBIT_DECIMAL) && - (!fractionalDigits || !(dwVtBits & (REAL_VTBITS|VTBIT_CY|VTBIT_DECIMAL)))) + (!fractionalDigits || !(dwVtBits & (REAL_VTBITS|VTBIT_DECIMAL)))) { /* We have one or more integer output choices, and either: * 1) An integer input value, or @@ -2275,7 +2275,7 @@ HRESULT WINAPI VarNumFromParseNum(NUMPARSE *pNumprs, BYTE *rgbDig, V_I8(pVarDst) = -ul64; return S_OK; } - else if ((dwVtBits & REAL_VTBITS) == VTBIT_DECIMAL) + else if ((dwVtBits & (REAL_VTBITS|VTBIT_DECIMAL)) == VTBIT_DECIMAL) { /* Decimal is only output choice left - fast path */ V_VT(pVarDst) = VT_DECIMAL; @@ -2337,7 +2337,7 @@ HRESULT WINAPI VarNumFromParseNum(NUMPARSE *pNumprs, BYTE *rgbDig, V_UI8(pVarDst) = ul64; return S_OK; } - else if ((dwVtBits & REAL_VTBITS) == VTBIT_DECIMAL) + else if ((dwVtBits & (REAL_VTBITS|VTBIT_DECIMAL)) == VTBIT_DECIMAL) { /* Decimal is only output choice left - fast path */ V_VT(pVarDst) = VT_DECIMAL;

1 0

Jacek Caban : rsaenh: Removed no longer needed ALG_ID argument from helper functions.
by Alexandre Julliard 07 Dec '17

07 Dec '17

Module: wine Branch: master Commit: d4c511b9f27c8cab2ad33e9f8989b5e5fe313fcc URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4c511b9f27c8cab2ad33e9f8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 7 19:47:21 2017 +0100 rsaenh: Removed no longer needed ALG_ID argument from helper functions. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rsaenh/implglue.c | 8 +++----- dlls/rsaenh/implglue.h | 6 +++--- dlls/rsaenh/rsaenh.c | 21 +++++++++------------ 3 files changed, 15 insertions(+), 20 deletions(-) diff --git a/dlls/rsaenh/implglue.c b/dlls/rsaenh/implglue.c index f12fc78..76c2b1f 100644 --- a/dlls/rsaenh/implglue.c +++ b/dlls/rsaenh/implglue.c @@ -82,22 +82,20 @@ BOOL init_hash_impl(ALG_ID aiAlgid, HASH_CONTEXT *pHashContext) return !status; } -BOOL update_hash_impl(ALG_ID aiAlgid, HASH_CONTEXT *pHashContext, const BYTE *pbData, - DWORD dwDataLen) +BOOL update_hash_impl(HASH_CONTEXT *pHashContext, const BYTE *pbData, DWORD dwDataLen) { BCryptHashData(pHashContext->bcrypt_hash, (UCHAR*)pbData, dwDataLen, 0); return TRUE; } -BOOL finalize_hash_impl(ALG_ID aiAlgid, HASH_CONTEXT *pHashContext, BYTE *pbHashValue) +BOOL finalize_hash_impl(HASH_CONTEXT *pHashContext, BYTE *pbHashValue) { BCryptFinishHash(pHashContext->bcrypt_hash, pbHashValue, RSAENH_MAX_HASH_SIZE, 0); BCryptDestroyHash(pHashContext->bcrypt_hash); return TRUE; } -BOOL duplicate_hash_impl(ALG_ID aiAlgid, const HASH_CONTEXT *pSrcHashContext, - HASH_CONTEXT *pDestHashContext) +BOOL duplicate_hash_impl(const HASH_CONTEXT *pSrcHashContext, HASH_CONTEXT *pDestHashContext) { return !BCryptDuplicateHash(pSrcHashContext->bcrypt_hash, &pDestHashContext->bcrypt_hash, NULL, 0, 0); } diff --git a/dlls/rsaenh/implglue.h b/dlls/rsaenh/implglue.h index 92323ca..9be642e 100644 --- a/dlls/rsaenh/implglue.h +++ b/dlls/rsaenh/implglue.h @@ -43,10 +43,10 @@ typedef union tagKEY_CONTEXT { } KEY_CONTEXT; BOOL init_hash_impl(ALG_ID aiAlgid, HASH_CONTEXT *pHashContext) DECLSPEC_HIDDEN; -BOOL update_hash_impl(ALG_ID aiAlgid, HASH_CONTEXT *pHashContext, const BYTE *pbData, +BOOL update_hash_impl(HASH_CONTEXT *pHashContext, const BYTE *pbData, DWORD dwDataLen) DECLSPEC_HIDDEN; -BOOL finalize_hash_impl(ALG_ID aiAlgid, HASH_CONTEXT *pHashContext, BYTE *pbHashValue) DECLSPEC_HIDDEN; -BOOL duplicate_hash_impl(ALG_ID aiAlgid, const HASH_CONTEXT *pSrcHashContext, +BOOL finalize_hash_impl(HASH_CONTEXT *pHashContext, BYTE *pbHashValue) DECLSPEC_HIDDEN; +BOOL duplicate_hash_impl(const HASH_CONTEXT *pSrcHashContext, HASH_CONTEXT *pDestHashContext) DECLSPEC_HIDDEN; BOOL new_key_impl(ALG_ID aiAlgid, KEY_CONTEXT *pKeyContext, DWORD dwKeyLen) DECLSPEC_HIDDEN; diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c index fdf410a..1332073 100644 --- a/dlls/rsaenh/rsaenh.c +++ b/dlls/rsaenh/rsaenh.c @@ -635,7 +635,7 @@ static inline BOOL init_hash(CRYPTHASH *pCryptHash) { if (!pAlgInfo) return FALSE; pCryptHash->dwHashSize = pAlgInfo->dwDefaultLen >> 3; init_hash_impl(pCryptHash->pHMACInfo->HashAlgid, &pCryptHash->context); - update_hash_impl(pCryptHash->pHMACInfo->HashAlgid, &pCryptHash->context, + update_hash_impl(&pCryptHash->context, pCryptHash->pHMACInfo->pbInnerString, pCryptHash->pHMACInfo->cbInnerString); } @@ -671,8 +671,7 @@ static inline void update_hash(CRYPTHASH *pCryptHash, const BYTE *pbData, DWORD { case CALG_HMAC: if (pCryptHash->pHMACInfo) - update_hash_impl(pCryptHash->pHMACInfo->HashAlgid, &pCryptHash->context, - pbData, dwDataLen); + update_hash_impl(&pCryptHash->context, pbData, dwDataLen); break; case CALG_MAC: @@ -685,7 +684,7 @@ static inline void update_hash(CRYPTHASH *pCryptHash, const BYTE *pbData, DWORD break; default: - update_hash_impl(pCryptHash->aiAlgid, &pCryptHash->context, pbData, dwDataLen); + update_hash_impl(&pCryptHash->context, pbData, dwDataLen); } } @@ -707,17 +706,15 @@ static inline void finalize_hash(CRYPTHASH *pCryptHash) { if (pCryptHash->pHMACInfo) { BYTE abHashValue[RSAENH_MAX_HASH_SIZE]; - finalize_hash_impl(pCryptHash->pHMACInfo->HashAlgid, &pCryptHash->context, - pCryptHash->abHashValue); + finalize_hash_impl(&pCryptHash->context, pCryptHash->abHashValue); memcpy(abHashValue, pCryptHash->abHashValue, pCryptHash->dwHashSize); init_hash_impl(pCryptHash->pHMACInfo->HashAlgid, &pCryptHash->context); - update_hash_impl(pCryptHash->pHMACInfo->HashAlgid, &pCryptHash->context, + update_hash_impl(&pCryptHash->context, pCryptHash->pHMACInfo->pbOuterString, pCryptHash->pHMACInfo->cbOuterString); - update_hash_impl(pCryptHash->pHMACInfo->HashAlgid, &pCryptHash->context, + update_hash_impl(&pCryptHash->context, abHashValue, pCryptHash->dwHashSize); - finalize_hash_impl(pCryptHash->pHMACInfo->HashAlgid, &pCryptHash->context, - pCryptHash->abHashValue); + finalize_hash_impl(&pCryptHash->context, pCryptHash->abHashValue); } break; @@ -728,7 +725,7 @@ static inline void finalize_hash(CRYPTHASH *pCryptHash) { break; default: - finalize_hash_impl(pCryptHash->aiAlgid, &pCryptHash->context, pCryptHash->abHashValue); + finalize_hash_impl(&pCryptHash->context, pCryptHash->abHashValue); } } @@ -2069,7 +2066,7 @@ BOOL WINAPI RSAENH_CPDuplicateHash(HCRYPTPROV hUID, HCRYPTHASH hHash, DWORD *pdw if (*phHash != (HCRYPTHASH)INVALID_HANDLE_VALUE) { *pDestHash = *pSrcHash; - duplicate_hash_impl(pSrcHash->aiAlgid, &pSrcHash->context, &pDestHash->context); + duplicate_hash_impl(&pSrcHash->context, &pDestHash->context); copy_hmac_info(&pDestHash->pHMACInfo, pSrcHash->pHMACInfo); copy_data_blob(&pDestHash->tpPRFParams.blobLabel, &pSrcHash->tpPRFParams.blobLabel); copy_data_blob(&pDestHash->tpPRFParams.blobSeed, &pSrcHash->tpPRFParams.blobSeed);

1 0

Alexandre Julliard : ntdll: Display floating point arguments in relay debugging on i386 and x86-64.
by Alexandre Julliard 07 Dec '17

07 Dec '17

Module: wine Branch: master Commit: 8c1bb2aa61abd8a6458c446efa55f8b261f63da9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c1bb2aa61abd8a6458c446ef… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 7 11:14:02 2017 +0100 ntdll: Display floating point arguments in relay debugging on i386 and x86-64. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/relay.c | 397 ++++++++++++++++++++++++++++++++--------------- tools/winebuild/build.h | 1 + tools/winebuild/spec32.c | 169 ++++++++++++-------- 3 files changed, 383 insertions(+), 184 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8c1bb2aa61abd8a6458c4…

1 0