May 2013 - Wine-commits - list.winehq.org

Ken Thomases : winemac: Return 0 from ToUnicodeEx() for a key release.
by Alexandre Julliard 03 May '13

03 May '13

Module: wine Branch: master Commit: 7c808ddfbc2c4a0cb489a76eaf8a894bd1678fea URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c808ddfbc2c4a0cb489a76ea… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu May 2 18:56:39 2013 -0500 winemac: Return 0 from ToUnicodeEx() for a key release. --- dlls/winemac.drv/keyboard.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/winemac.drv/keyboard.c b/dlls/winemac.drv/keyboard.c index 33f7994..98d17ba 100644 --- a/dlls/winemac.drv/keyboard.c +++ b/dlls/winemac.drv/keyboard.c @@ -1372,6 +1372,9 @@ INT CDECL macdrv_ToUnicodeEx(UINT virtKey, UINT scanCode, const BYTE *lpKeyState if (is_menu) { + if (keyAction == kUCKeyActionUp) + goto done; + options = kUCKeyTranslateNoDeadKeysMask; deadKeyState = 0; } @@ -1390,8 +1393,13 @@ INT CDECL macdrv_ToUnicodeEx(UINT virtKey, UINT scanCode, const BYTE *lpKeyState goto done; } if (!is_menu) + { thread_data->dead_key_state = deadKeyState; + if (keyAction == kUCKeyActionUp) + goto done; + } + if (len == 0 && deadKeyState) { /* Repeat the translation, but disabling dead-key generation to

1 0

Alexandre Julliard : kernel32: Disable relay for some trivial functions.
by Alexandre Julliard 03 May '13

03 May '13

Module: wine Branch: master Commit: 3173e275ecf263c38121e862bebae100b17d551f URL: http://source.winehq.org/git/wine.git/?a=commit;h=3173e275ecf263c38121e862b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 3 12:42:20 2013 +0200 kernel32: Disable relay for some trivial functions. --- dlls/kernel32/kernel32.spec | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 72c1697..9d06e12 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -499,11 +499,11 @@ @ stdcall GetCurrentDirectoryA(long ptr) @ stdcall GetCurrentDirectoryW(long ptr) @ stdcall GetCurrentPackageId(ptr ptr) -@ stdcall GetCurrentProcess() -@ stdcall GetCurrentProcessId() +@ stdcall -norelay GetCurrentProcess() +@ stdcall -norelay GetCurrentProcessId() @ stdcall GetCurrentProcessorNumber() ntdll.NtGetCurrentProcessorNumber -@ stdcall GetCurrentThread() -@ stdcall GetCurrentThreadId() +@ stdcall -norelay GetCurrentThread() +@ stdcall -norelay GetCurrentThreadId() @ stdcall GetDateFormatA(long long ptr str ptr long) @ stdcall GetDateFormatW(long long ptr wstr ptr long) @ stdcall GetDaylightFlag() @@ -606,7 +606,7 @@ @ stdcall GetProcessDEPPolicy(long ptr ptr) @ stdcall GetProcessFlags(long) @ stdcall GetProcessHandleCount(long ptr) -@ stdcall GetProcessHeap() +@ stdcall -norelay GetProcessHeap() @ stdcall GetProcessHeaps(long ptr) @ stdcall GetProcessId(long) @ stdcall GetProcessIoCounters(long ptr)

1 0

Alexandre Julliard : configure: Add a helper macro for invoking pkg-config, and use it for libxml.
by Alexandre Julliard 03 May '13

03 May '13

Module: wine Branch: master Commit: 8dabde1782e8627fc6a077564746be4725815a3d URL: http://source.winehq.org/git/wine.git/?a=commit;h=8dabde1782e8627fc6a077564… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 3 16:09:38 2013 +0200 configure: Add a helper macro for invoking pkg-config, and use it for libxml. --- aclocal.m4 | 27 +++++- configure | 258 +++++++++++++++++++++++++++++------------------ configure.ac | 46 +++------ dlls/msxml3/Makefile.in | 4 +- 4 files changed, 199 insertions(+), 136 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8dabde1782e8627fc6a07…

1 0

Alexandre Julliard : configure: Use the pkg-config helper macro for hal and dbus.
by Alexandre Julliard 03 May '13

03 May '13

Module: wine Branch: master Commit: e7bd23ba477ce37cea56869c40326e0550b94f51 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7bd23ba477ce37cea56869c4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 3 16:39:40 2013 +0200 configure: Use the pkg-config helper macro for hal and dbus. --- configure | 70 ++++++++++++++++++++++++++++------------ configure.ac | 22 +++--------- dlls/mountmgr.sys/Makefile.in | 2 +- 3 files changed, 56 insertions(+), 38 deletions(-) diff --git a/configure b/configure index 6592696..16bc364 100755 --- a/configure +++ b/configure @@ -662,8 +662,10 @@ gphoto2_devel SANEINCL sane_devel GNUTLSINCL -HALINCL -DBUSINCL +HAL_LIBS +HAL_CFLAGS +DBUS_LIBS +DBUS_CFLAGS XSLT_LIBS XSLT_CFLAGS XML2_LIBS @@ -863,7 +865,11 @@ XMKMF XML2_CFLAGS XML2_LIBS XSLT_CFLAGS -XSLT_LIBS' +XSLT_LIBS +DBUS_CFLAGS +DBUS_LIBS +HAL_CFLAGS +HAL_LIBS' # Initialize some variables set by options. @@ -1555,6 +1561,10 @@ Some influential environment variables: XML2_LIBS Linker flags for libxml-2.0, overriding pkg-config XSLT_CFLAGS C compiler flags for libxslt, overriding pkg-config XSLT_LIBS Linker flags for libxslt, overriding pkg-config + DBUS_CFLAGS C compiler flags for dbus-1, overriding pkg-config + DBUS_LIBS Linker flags for dbus-1, overriding pkg-config + HAL_CFLAGS C compiler flags for hal, overriding pkg-config + HAL_LIBS Linker flags for hal, overriding pkg-config Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. @@ -10046,12 +10056,20 @@ fi if test "x$with_dbus" != "xno" then ac_save_CPPFLAGS="$CPPFLAGS" - if test "$PKG_CONFIG" != "false" - then - ac_dbus_libs="`$PKG_CONFIG --libs dbus-1 2>/dev/null`" - ac_dbus_cflags="`$PKG_CONFIG --cflags dbus-1 2>/dev/null`" - CPPFLAGS="$CPPFLAGS $ac_dbus_cflags" - fi + if test -n "$DBUS_CFLAGS"; then : + +elif test -n "$PKG_CONFIG"; then : + DBUS_CFLAGS=`$PKG_CONFIG --cflags dbus-1 2>/dev/null` +fi + +CPPFLAGS="$CPPFLAGS $DBUS_CFLAGS" +if test -n "$DBUS_LIBS"; then : + +elif test -n "$PKG_CONFIG"; then : + DBUS_LIBS=`$PKG_CONFIG --libs dbus-1 2>/dev/null` +fi + + ac_fn_c_check_header_mongrel "$LINENO" "dbus/dbus.h" "ac_cv_header_dbus_dbus_h" "$ac_includes_default" if test "x$ac_cv_header_dbus_dbus_h" = xyes; then : { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -ldbus-1" >&5 @@ -10060,7 +10078,7 @@ if ${ac_cv_lib_soname_dbus_1+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_soname_save_LIBS=$LIBS -LIBS="-ldbus-1 $ac_dbus_libs $LIBS" +LIBS="-ldbus-1 $DBUS_LIBS $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -10096,7 +10114,7 @@ fi if test "x$ac_cv_lib_soname_dbus_1" = "x"; then : { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 $as_echo "not found" >&6; } - + DBUS_CFLAGS="" else { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_soname_dbus_1" >&5 $as_echo "$ac_cv_lib_soname_dbus_1" >&6; } @@ -10105,9 +10123,10 @@ cat >>confdefs.h <<_ACEOF #define SONAME_LIBDBUS_1 "$ac_cv_lib_soname_dbus_1" _ACEOF - DBUSINCL="$ac_dbus_cflags" fi +else + DBUS_CFLAGS="" fi @@ -10126,12 +10145,20 @@ fi if test "x$with_hal" != "xno" -a "x$ac_cv_lib_soname_dbus_1" != x then ac_save_CPPFLAGS="$CPPFLAGS" - if test "$PKG_CONFIG" != "false" - then - ac_hal_libs="`$PKG_CONFIG --libs hal 2>/dev/null`" - ac_hal_cflags="`$PKG_CONFIG --cflags hal 2>/dev/null`" - CPPFLAGS="$CPPFLAGS $ac_hal_cflags" - fi + if test -n "$HAL_CFLAGS"; then : + +elif test -n "$PKG_CONFIG"; then : + HAL_CFLAGS=`$PKG_CONFIG --cflags hal 2>/dev/null` +fi + +CPPFLAGS="$CPPFLAGS $HAL_CFLAGS" +if test -n "$HAL_LIBS"; then : + +elif test -n "$PKG_CONFIG"; then : + HAL_LIBS=`$PKG_CONFIG --libs hal 2>/dev/null` +fi + +HAL_LIBS=${HAL_LIBS:-"-ldbus-1"} ac_fn_c_check_header_mongrel "$LINENO" "hal/libhal.h" "ac_cv_header_hal_libhal_h" "$ac_includes_default" if test "x$ac_cv_header_hal_libhal_h" = xyes; then : { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -lhal" >&5 @@ -10140,7 +10167,7 @@ if ${ac_cv_lib_soname_hal+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_soname_save_LIBS=$LIBS -LIBS="-lhal $ac_hal_libs $LIBS" +LIBS="-lhal $HAL_LIBS $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -10176,7 +10203,7 @@ fi if test "x$ac_cv_lib_soname_hal" = "x"; then : { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 $as_echo "not found" >&6; } - + HAL_CFLAGS="" else { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_soname_hal" >&5 $as_echo "$ac_cv_lib_soname_hal" >&6; } @@ -10185,9 +10212,10 @@ cat >>confdefs.h <<_ACEOF #define SONAME_LIBHAL "$ac_cv_lib_soname_hal" _ACEOF - HALINCL="$ac_hal_cflags" fi +else + HAL_CFLAGS="" fi diff --git a/configure.ac b/configure.ac index 4f75317..09d411e 100644 --- a/configure.ac +++ b/configure.ac @@ -1320,15 +1320,10 @@ dnl **** Check for libdbus **** if test "x$with_dbus" != "xno" then ac_save_CPPFLAGS="$CPPFLAGS" - if test "$PKG_CONFIG" != "false" - then - ac_dbus_libs="`$PKG_CONFIG --libs dbus-1 2>/dev/null`" - ac_dbus_cflags="`$PKG_CONFIG --cflags dbus-1 2>/dev/null`" - CPPFLAGS="$CPPFLAGS $ac_dbus_cflags" - fi + WINE_PACKAGE_FLAGS(DBUS,[dbus-1]) AC_CHECK_HEADER([dbus/dbus.h], - [WINE_CHECK_SONAME(dbus-1, dbus_connection_close, - [AC_SUBST(DBUSINCL,"$ac_dbus_cflags")],,[$ac_dbus_libs])]) + [WINE_CHECK_SONAME(dbus-1, dbus_connection_close,,[DBUS_CFLAGS=""],[$DBUS_LIBS])], + [DBUS_CFLAGS=""]) CPPFLAGS="$ac_save_CPPFLAGS" fi WINE_NOTICE_WITH(dbus,[test "x$ac_cv_lib_soname_dbus_1" = "x" -a \ @@ -1339,15 +1334,10 @@ dnl **** Check for libhal **** if test "x$with_hal" != "xno" -a "x$ac_cv_lib_soname_dbus_1" != x then ac_save_CPPFLAGS="$CPPFLAGS" - if test "$PKG_CONFIG" != "false" - then - ac_hal_libs="`$PKG_CONFIG --libs hal 2>/dev/null`" - ac_hal_cflags="`$PKG_CONFIG --cflags hal 2>/dev/null`" - CPPFLAGS="$CPPFLAGS $ac_hal_cflags" - fi + WINE_PACKAGE_FLAGS(HAL,[hal],[-ldbus-1]) AC_CHECK_HEADER([hal/libhal.h], - [WINE_CHECK_SONAME(hal, libhal_ctx_new, - [AC_SUBST(HALINCL,"$ac_hal_cflags")],,[$ac_hal_libs])]) + [WINE_CHECK_SONAME(hal, libhal_ctx_new,,[HAL_CFLAGS=""],[$HAL_LIBS])], + [HAL_CFLAGS=""]) CPPFLAGS="$ac_save_CPPFLAGS" WINE_NOTICE_WITH(hal,[test "x$ac_cv_lib_soname_hal" = "x" -a \ "x$ac_cv_header_DiskArbitration_DiskArbitration_h" != "xyes"], diff --git a/dlls/mountmgr.sys/Makefile.in b/dlls/mountmgr.sys/Makefile.in index 3510bec..aa3eb0f 100644 --- a/dlls/mountmgr.sys/Makefile.in +++ b/dlls/mountmgr.sys/Makefile.in @@ -2,7 +2,7 @@ MODULE = mountmgr.sys IMPORTS = uuid advapi32 ntoskrnl.exe DELAYIMPORTS = user32 EXTRADLLFLAGS = -Wb,--subsystem,native -EXTRADEFS = @DBUSINCL@ @HALINCL@ +EXTRADEFS = @DBUS_CFLAGS@ @HAL_CFLAGS@ EXTRALIBS = @DISKARBITRATIONLIB@ C_SRCS = \

1 0

Alexandre Julliard : configure: Use the pkg-config helper macro for gnutls.
by Alexandre Julliard 03 May '13

03 May '13

Module: wine Branch: master Commit: 1470c5c3c1bb9800751c07f1adbca2301920e7de URL: http://source.winehq.org/git/wine.git/?a=commit;h=1470c5c3c1bb9800751c07f1a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 3 17:03:17 2013 +0200 configure: Use the pkg-config helper macro for gnutls. --- configure | 37 ++++++++++++++++++++++++++----------- configure.ac | 11 +++-------- dlls/secur32/Makefile.in | 2 +- 3 files changed, 30 insertions(+), 20 deletions(-) diff --git a/configure b/configure index 16bc364..98c3869 100755 --- a/configure +++ b/configure @@ -661,7 +661,8 @@ gphoto2port_devel gphoto2_devel SANEINCL sane_devel -GNUTLSINCL +GNUTLS_LIBS +GNUTLS_CFLAGS HAL_LIBS HAL_CFLAGS DBUS_LIBS @@ -869,7 +870,9 @@ XSLT_LIBS DBUS_CFLAGS DBUS_LIBS HAL_CFLAGS -HAL_LIBS' +HAL_LIBS +GNUTLS_CFLAGS +GNUTLS_LIBS' # Initialize some variables set by options. @@ -1565,6 +1568,9 @@ Some influential environment variables: DBUS_LIBS Linker flags for dbus-1, overriding pkg-config HAL_CFLAGS C compiler flags for hal, overriding pkg-config HAL_LIBS Linker flags for hal, overriding pkg-config + GNUTLS_CFLAGS + C compiler flags for gnutls, overriding pkg-config + GNUTLS_LIBS Linker flags for gnutls, overriding pkg-config Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. @@ -10234,12 +10240,20 @@ fi if test "x$with_gnutls" != "xno" then ac_save_CPPFLAGS="$CPPFLAGS" - if test "$PKG_CONFIG" != "false" - then - ac_gnutls_libs="`$PKG_CONFIG --libs gnutls 2>/dev/null`" - ac_gnutls_cflags="`$PKG_CONFIG --cflags gnutls 2>/dev/null`" - CPPFLAGS="$CPPFLAGS $ac_gnutls_cflags" - fi + if test -n "$GNUTLS_CFLAGS"; then : + +elif test -n "$PKG_CONFIG"; then : + GNUTLS_CFLAGS=`$PKG_CONFIG --cflags gnutls 2>/dev/null` +fi + +CPPFLAGS="$CPPFLAGS $GNUTLS_CFLAGS" +if test -n "$GNUTLS_LIBS"; then : + +elif test -n "$PKG_CONFIG"; then : + GNUTLS_LIBS=`$PKG_CONFIG --libs gnutls 2>/dev/null` +fi + + ac_fn_c_check_header_mongrel "$LINENO" "gnutls/gnutls.h" "ac_cv_header_gnutls_gnutls_h" "$ac_includes_default" if test "x$ac_cv_header_gnutls_gnutls_h" = xyes; then : cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -10260,7 +10274,7 @@ if ${ac_cv_lib_soname_gnutls+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_soname_save_LIBS=$LIBS -LIBS="-lgnutls $ac_gnutls_libs $LIBS" +LIBS="-lgnutls $GNUTLS_LIBS $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -10296,7 +10310,7 @@ fi if test "x$ac_cv_lib_soname_gnutls" = "x"; then : { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 $as_echo "not found" >&6; } - + GNUTLS_CFLAGS="" else { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_soname_gnutls" >&5 $as_echo "$ac_cv_lib_soname_gnutls" >&6; } @@ -10305,11 +10319,12 @@ cat >>confdefs.h <<_ACEOF #define SONAME_LIBGNUTLS "$ac_cv_lib_soname_gnutls" _ACEOF - GNUTLSINCL="$ac_gnutls_cflags" fi fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +else + GNUTLS_CFLAGS="" fi diff --git a/configure.ac b/configure.ac index 09d411e..05593dc 100644 --- a/configure.ac +++ b/configure.ac @@ -1348,16 +1348,11 @@ dnl **** Check for libgnutls **** if test "x$with_gnutls" != "xno" then ac_save_CPPFLAGS="$CPPFLAGS" - if test "$PKG_CONFIG" != "false" - then - ac_gnutls_libs="`$PKG_CONFIG --libs gnutls 2>/dev/null`" - ac_gnutls_cflags="`$PKG_CONFIG --cflags gnutls 2>/dev/null`" - CPPFLAGS="$CPPFLAGS $ac_gnutls_cflags" - fi + WINE_PACKAGE_FLAGS(GNUTLS,[gnutls]) AC_CHECK_HEADER(gnutls/gnutls.h, [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <gnutls/gnutls.h>]], [[static typeof(gnutls_mac_get_key_size) *func; if (func) return 0;]])], - [WINE_CHECK_SONAME(gnutls,gnutls_global_init, - [AC_SUBST(GNUTLSINCL,"$ac_gnutls_cflags")],,[$ac_gnutls_libs])])]) + [WINE_CHECK_SONAME(gnutls,gnutls_global_init,,[GNUTLS_CFLAGS=""],[$GNUTLS_LIBS])])], + [GNUTLS_CFLAGS=""]) CPPFLAGS="$ac_save_CPPFLAGS" fi WINE_NOTICE_WITH(gnutls,[test "x$ac_cv_lib_soname_gnutls" = "x"], diff --git a/dlls/secur32/Makefile.in b/dlls/secur32/Makefile.in index c666dca..a6d3cfe 100644 --- a/dlls/secur32/Makefile.in +++ b/dlls/secur32/Makefile.in @@ -2,7 +2,7 @@ MODULE = secur32.dll IMPORTLIB = secur32 IMPORTS = netapi32 advapi32 DELAYIMPORTS = crypt32 -EXTRAINCL = @GNUTLSINCL@ +EXTRAINCL = @GNUTLS_CFLAGS@ EXTRALIBS = @SECURITYLIB@ C_SRCS = \

1 0

Alexandre Julliard : configure: Use the pkg-config helper macro for sane.
by Alexandre Julliard 03 May '13

03 May '13

Module: wine Branch: master Commit: ad6ee47defba6dad4ca490c11af1848bbc90cc11 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad6ee47defba6dad4ca490c11… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 3 17:03:29 2013 +0200 configure: Use the pkg-config helper macro for sane. --- configure | 66 ++++++++++++++-------------------------------- configure.ac | 11 ++----- dlls/sane.ds/Makefile.in | 2 +- 3 files changed, 24 insertions(+), 55 deletions(-) diff --git a/configure b/configure index 98c3869..f036eae 100755 --- a/configure +++ b/configure @@ -659,8 +659,8 @@ GPHOTO2INCL GPHOTO2LIBS gphoto2port_devel gphoto2_devel -SANEINCL -sane_devel +SANE_LIBS +SANE_CFLAGS GNUTLS_LIBS GNUTLS_CFLAGS HAL_LIBS @@ -872,7 +872,9 @@ DBUS_LIBS HAL_CFLAGS HAL_LIBS GNUTLS_CFLAGS -GNUTLS_LIBS' +GNUTLS_LIBS +SANE_CFLAGS +SANE_LIBS' # Initialize some variables set by options. @@ -1571,6 +1573,8 @@ Some influential environment variables: GNUTLS_CFLAGS C compiler flags for gnutls, overriding pkg-config GNUTLS_LIBS Linker flags for gnutls, overriding pkg-config + SANE_CFLAGS C compiler flags for libsane, overriding pkg-config + SANE_LIBS Linker flags for libsane, overriding pkg-config Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. @@ -10477,50 +10481,20 @@ fi if test "x$with_sane" != "xno" then ac_save_CPPFLAGS="$CPPFLAGS" - # Extract the first word of "sane-config", so it can be a program name with args. -set dummy sane-config; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_sane_devel+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$sane_devel"; then - ac_cv_prog_sane_devel="$sane_devel" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_sane_devel="sane-config" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS + if test -n "$SANE_CFLAGS"; then : - test -z "$ac_cv_prog_sane_devel" && ac_cv_prog_sane_devel="no" -fi -fi -sane_devel=$ac_cv_prog_sane_devel -if test -n "$sane_devel"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $sane_devel" >&5 -$as_echo "$sane_devel" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } +elif test -n "$PKG_CONFIG"; then : + SANE_CFLAGS=`$PKG_CONFIG --cflags libsane 2>/dev/null` fi +SANE_CFLAGS=${SANE_CFLAGS:-`sane-config --cflags 2>/dev/null`} +CPPFLAGS="$CPPFLAGS $SANE_CFLAGS" +if test -n "$SANE_LIBS"; then : +elif test -n "$PKG_CONFIG"; then : + SANE_LIBS=`$PKG_CONFIG --libs libsane 2>/dev/null` +fi +SANE_LIBS=${SANE_LIBS:-`sane-config --ldflags 2>/dev/null`} - if test "$sane_devel" != "no" - then - ac_sane_incl="`$sane_devel --cflags`" - ac_sane_libs="`$sane_devel --ldflags`" - CPPFLAGS="$CPPFLAGS $ac_sane_incl" - fi ac_fn_c_check_header_mongrel "$LINENO" "sane/sane.h" "ac_cv_header_sane_sane_h" "$ac_includes_default" if test "x$ac_cv_header_sane_sane_h" = xyes; then : { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -lsane" >&5 @@ -10529,7 +10503,7 @@ if ${ac_cv_lib_soname_sane+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_soname_save_LIBS=$LIBS -LIBS="-lsane $ac_sane_libs $LIBS" +LIBS="-lsane $SANE_LIBS $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -10565,7 +10539,7 @@ fi if test "x$ac_cv_lib_soname_sane" = "x"; then : { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 $as_echo "not found" >&6; } - + SANE_CFLAGS="" else { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_soname_sane" >&5 $as_echo "$ac_cv_lib_soname_sane" >&6; } @@ -10574,9 +10548,9 @@ cat >>confdefs.h <<_ACEOF #define SONAME_LIBSANE "$ac_cv_lib_soname_sane" _ACEOF - SANEINCL="$ac_sane_incl" fi + SANE_CFLAGS="" fi diff --git a/configure.ac b/configure.ac index 05593dc..0df10a6 100644 --- a/configure.ac +++ b/configure.ac @@ -1378,15 +1378,10 @@ dnl **** Check for SANE **** if test "x$with_sane" != "xno" then ac_save_CPPFLAGS="$CPPFLAGS" - AC_CHECK_PROG(sane_devel,sane-config,sane-config,no) - if test "$sane_devel" != "no" - then - ac_sane_incl="`$sane_devel --cflags`" - ac_sane_libs="`$sane_devel --ldflags`" - CPPFLAGS="$CPPFLAGS $ac_sane_incl" - fi + WINE_PACKAGE_FLAGS(SANE,[libsane],,[sane-config --cflags],[sane-config --ldflags]) AC_CHECK_HEADER(sane/sane.h, - [WINE_CHECK_SONAME(sane,sane_init,[AC_SUBST(SANEINCL,"$ac_sane_incl")],,[$ac_sane_libs])]) + [WINE_CHECK_SONAME(sane,sane_init,,[SANE_CFLAGS=""],[$SANE_LIBS])] + [SANE_CFLAGS=""]) CPPFLAGS="$ac_save_CPPFLAGS" fi WINE_NOTICE_WITH(sane,[test "x$ac_cv_lib_soname_sane" = "x"], diff --git a/dlls/sane.ds/Makefile.in b/dlls/sane.ds/Makefile.in index 20be6ea..64c49db 100644 --- a/dlls/sane.ds/Makefile.in +++ b/dlls/sane.ds/Makefile.in @@ -1,6 +1,6 @@ MODULE = sane.ds IMPORTS = comctl32 user32 gdi32 -EXTRAINCL = @SANEINCL@ +EXTRAINCL = @SANE_CFLAGS@ C_SRCS = \ capability.c \

1 0

Hans Leidekker : msi: Properly map script function return values to MSI errors.
by Alexandre Julliard 02 May '13

02 May '13

Module: wine Branch: master Commit: 1ed6bc2e025fb9de4d2f7f19f8573f310ec529af URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ed6bc2e025fb9de4d2f7f19f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu May 2 12:03:23 2013 +0200 msi: Properly map script function return values to MSI errors. --- dlls/msi/script.c | 19 +++++++++++++++---- 1 files changed, 15 insertions(+), 4 deletions(-) diff --git a/dlls/msi/script.c b/dlls/msi/script.c index 8d48a94..0fec716 100644 --- a/dlls/msi/script.c +++ b/dlls/msi/script.c @@ -273,6 +273,20 @@ static HRESULT create_activescriptsite(MsiActiveScriptSite **obj) return S_OK; } +static UINT map_return_value(LONG val) +{ + switch (val) + { + case 0: + case IDOK: + case IDIGNORE: return ERROR_SUCCESS; + case IDCANCEL: return ERROR_INSTALL_USEREXIT; + case IDRETRY: return ERROR_INSTALL_SUSPEND; + case IDABORT: + default: return ERROR_INSTALL_FAILURE; + } +} + /* * Call a script. */ @@ -354,13 +368,10 @@ DWORD call_script(MSIHANDLE hPackage, INT type, LPCWSTR script, LPCWSTR function hr = IDispatch_Invoke(pDispatch, dispid, &IID_NULL, LOCALE_USER_DEFAULT, DISPATCH_METHOD, &dispparamsNoArgs, &var, NULL, NULL); if (FAILED(hr)) goto done; - /* Check return value, if it's not IDOK we failed */ hr = VariantChangeType(&var, &var, 0, VT_I4); if (FAILED(hr)) goto done; - if (V_I4(&var) == IDOK) - ret = ERROR_SUCCESS; - else ret = ERROR_INSTALL_FAILURE; + ret = map_return_value(V_I4(&var)); VariantClear(&var); } else {

1 0

Jacek Caban : mshtml: Added IHTMLAnchorElement::rel property implementation .
by Alexandre Julliard 02 May '13

02 May '13

Module: wine Branch: master Commit: ca1f4c447ad80ebc3ae576262022613f5184677b URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca1f4c447ad80ebc3ae576262… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 2 14:05:01 2013 +0200 mshtml: Added IHTMLAnchorElement::rel property implementation. --- dlls/mshtml/htmlanchor.c | 24 ++++++++++++++++++++---- 1 files changed, 20 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlanchor.c b/dlls/mshtml/htmlanchor.c index d4e1238..8471b71 100644 --- a/dlls/mshtml/htmlanchor.c +++ b/dlls/mshtml/htmlanchor.c @@ -266,15 +266,31 @@ static HRESULT WINAPI HTMLAnchorElement_get_target(IHTMLAnchorElement *iface, BS static HRESULT WINAPI HTMLAnchorElement_put_rel(IHTMLAnchorElement *iface, BSTR v) { HTMLAnchorElement *This = impl_from_IHTMLAnchorElement(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + nsAString nsstr; + nsresult nsres; + + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + + nsAString_InitDepend(&nsstr, v); + nsres = nsIDOMHTMLAnchorElement_SetRel(This->nsanchor, &nsstr); + nsAString_Finish(&nsstr); + if(NS_FAILED(nsres)) + return E_FAIL; + + return S_OK; } static HRESULT WINAPI HTMLAnchorElement_get_rel(IHTMLAnchorElement *iface, BSTR *p) { HTMLAnchorElement *This = impl_from_IHTMLAnchorElement(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsAString nsstr; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsAString_Init(&nsstr, NULL); + nsres = nsIDOMHTMLAnchorElement_GetRel(This->nsanchor, &nsstr); + return return_nsstr(nsres, &nsstr, p); } static HRESULT WINAPI HTMLAnchorElement_put_rev(IHTMLAnchorElement *iface, BSTR v)

1 0

Jacek Caban : mshtml: Added IHTMLAnchorElement::rel property tests.
by Alexandre Julliard 02 May '13

02 May '13

Module: wine Branch: master Commit: b019f565b0b8c3837f8c623b5bd6a3cd24f169bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=b019f565b0b8c3837f8c623b5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 2 14:05:15 2013 +0200 mshtml: Added IHTMLAnchorElement::rel property tests. --- dlls/mshtml/tests/dom.c | 33 +++++++++++++++++++++++++++++++++ 1 files changed, 33 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 7228649..d4693ae 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -1352,6 +1352,35 @@ static void _test_anchor_put_href(unsigned line, IUnknown *unk, const char *exhr _test_disp_value(line, unk, exhref); } +#define test_anchor_rel(a,h) _test_anchor_rel(__LINE__,a,h) +static void _test_anchor_rel(unsigned line, IUnknown *unk, const char *exrel) +{ + IHTMLAnchorElement *anchor = _get_anchor_iface(line, unk); + BSTR str; + HRESULT hres; + + hres = IHTMLAnchorElement_get_rel(anchor, &str); + ok_(__FILE__,line)(hres == S_OK, "get_rel failed: %08x\n", hres); + if(exrel) + ok_(__FILE__,line)(!strcmp_wa(str, exrel), "rel = %s, expected %s\n", wine_dbgstr_w(str), exrel); + else + ok_(__FILE__,line)(!str, "rel = %s, expected NULL\n", wine_dbgstr_w(str)); + SysFreeString(str); +} + +#define test_anchor_put_rel(a,h) _test_anchor_put_rel(__LINE__,a,h) +static void _test_anchor_put_rel(unsigned line, IUnknown *unk, const char *exrel) +{ + IHTMLAnchorElement *anchor = _get_anchor_iface(line, unk); + BSTR str; + HRESULT hres; + + str = a2bstr(exrel); + hres = IHTMLAnchorElement_put_rel(anchor, str); + ok_(__FILE__,line)(hres == S_OK, "get_rel failed: %08x\n", hres); + SysFreeString(str); +} + #define test_anchor_get_target(a,h) _test_anchor_get_target(__LINE__,a,h) static void _test_anchor_get_target(unsigned line, IUnknown *unk, const char *target) { @@ -6256,6 +6285,10 @@ static void test_elems(IHTMLDocument2 *doc) /* target */ test_anchor_get_target((IUnknown*)elem, NULL); + test_anchor_rel((IUnknown*)elem, NULL); + test_anchor_put_rel((IUnknown*)elem, "Next"); + test_anchor_rel((IUnknown*)elem, "Next"); + /* Change the target */ test_anchor_put_target((IUnknown*)elem, "wine"); test_anchor_get_target((IUnknown*)elem, "wine");

1 0

Francois Gouget : msi/tests: Add a trailing '\n' to an ok() call and fix a typo.
by Alexandre Julliard 02 May '13

02 May '13

Module: wine Branch: master Commit: d5fc4ce772959812da1cc12dbecd836a585e1ea9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5fc4ce772959812da1cc12db… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu May 2 16:38:19 2013 +0200 msi/tests: Add a trailing '\n' to an ok() call and fix a typo. --- dlls/msi/tests/install.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index e5d996e..f343c02 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -3110,7 +3110,7 @@ static void test_continuouscabs(void) /* Filename from msi is right and the one from cab is wrong */ create_cc_test_files(); - ok(MoveFile("test2.cab", "test2_.cab"), "Cannot rename test3.cab to test3_.cab"); + ok(MoveFile("test2.cab", "test2_.cab"), "Cannot rename test2.cab to test2_.cab\n"); create_database(msifile, cc3_tables, sizeof(cc3_tables) / sizeof(msi_table)); MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL);

1 0