July 2007 - Wine-commits - list.winehq.org

Alexandre Julliard : configure: Make the libcups soname check depend on the header check.
by Alexandre Julliard 03 Jul '07

03 Jul '07

Module: wine Branch: master Commit: 702d35560b8b5dcccf7d0f34019b28d74a548a98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=702d35560b8b5dcccf7d0f340… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 2 17:30:44 2007 +0200 configure: Make the libcups soname check depend on the header check. --- configure | 160 +++++++++++++++++++++++---------------------- configure.ac | 7 ++- dlls/wineps.drv/init.c | 12 +-- dlls/winspool.drv/info.c | 9 +-- 4 files changed, 95 insertions(+), 93 deletions(-) diff --git a/configure b/configure index f109e73..13e7847 100755 --- a/configure +++ b/configure @@ -13582,6 +13582,88 @@ fi fi +if test "$ac_cv_header_cups_cups_h" = "yes" +then + { echo "$as_me:$LINENO: checking for -lcups" >&5 +echo $ECHO_N "checking for -lcups... $ECHO_C" >&6; } +if test "${ac_cv_lib_soname_cups+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_soname_save_LIBS=$LIBS +LIBS="-lcups $LIBS" + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char cupsGetDefault (); +int +main () +{ +return cupsGetDefault (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + case "$LIBEXT" in + dll) ;; + dylib) ac_cv_lib_soname_cups=`otool -L conftest$ac_exeext | grep "libcups\\.[0-9A-Za-z.]*dylib" | sed -e "s/^.*\/$libcups\.[0-9A-Za-z.]*dylib$.*$/\1/"';2,$d'` ;; + *) ac_cv_lib_soname_cups=`$ac_cv_path_LDD conftest$ac_exeext | grep "libcups\\.$LIBEXT" | sed -e "s/^.*$libcups\.$LIBEXT[^ ]*$.*$/\1/"';2,$d'` ;; + esac +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_soname_save_LIBS +fi +if test "x$ac_cv_lib_soname_cups" = "x"; then + { echo "$as_me:$LINENO: result: not found" >&5 +echo "${ECHO_T}not found" >&6; } + +else + { echo "$as_me:$LINENO: result: $ac_cv_lib_soname_cups" >&5 +echo "${ECHO_T}$ac_cv_lib_soname_cups" >&6; } + +cat >>confdefs.h <<_ACEOF +#define SONAME_LIBCUPS "$ac_cv_lib_soname_cups" +_ACEOF + + +fi + +fi + EXTRACFLAGS="" @@ -15072,84 +15154,6 @@ _ACEOF fi -{ echo "$as_me:$LINENO: checking for -lcups" >&5 -echo $ECHO_N "checking for -lcups... $ECHO_C" >&6; } -if test "${ac_cv_lib_soname_cups+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_soname_save_LIBS=$LIBS -LIBS="-lcups $LIBS" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char cupsGetDefault (); -int -main () -{ -return cupsGetDefault (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - case "$LIBEXT" in - dll) ;; - dylib) ac_cv_lib_soname_cups=`otool -L conftest$ac_exeext | grep "libcups\\.[0-9A-Za-z.]*dylib" | sed -e "s/^.*\/$libcups\.[0-9A-Za-z.]*dylib$.*$/\1/"';2,$d'` ;; - *) ac_cv_lib_soname_cups=`$ac_cv_path_LDD conftest$ac_exeext | grep "libcups\\.$LIBEXT" | sed -e "s/^.*$libcups\.$LIBEXT[^ ]*$.*$/\1/"';2,$d'` ;; - esac -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_soname_save_LIBS -fi -if test "x$ac_cv_lib_soname_cups" = "x"; then - { echo "$as_me:$LINENO: result: not found" >&5 -echo "${ECHO_T}not found" >&6; } - -else - { echo "$as_me:$LINENO: result: $ac_cv_lib_soname_cups" >&5 -echo "${ECHO_T}$ac_cv_lib_soname_cups" >&6; } - -cat >>confdefs.h <<_ACEOF -#define SONAME_LIBCUPS "$ac_cv_lib_soname_cups" -_ACEOF - - -fi - { echo "$as_me:$LINENO: checking for -ljack" >&5 echo $ECHO_N "checking for -ljack... $ECHO_C" >&6; } if test "${ac_cv_lib_soname_jack+set}" = set; then diff --git a/configure.ac b/configure.ac index 0c5b1a4..7deadf5 100644 --- a/configure.ac +++ b/configure.ac @@ -967,6 +967,12 @@ then WINE_CHECK_SONAME(capi20,capi20_register) fi +dnl **** Check for cups **** +if test "$ac_cv_header_cups_cups_h" = "yes" +then + WINE_CHECK_SONAME(cups,cupsGetDefault) +fi + dnl **** Check for gcc specific options **** AC_SUBST(EXTRACFLAGS,"") @@ -1115,7 +1121,6 @@ WINE_CHECK_SONAME(Xcursor,XcursorImageLoadCursor,,,[$X_LIBS -lX11 $X_EXTRA_LIBS] WINE_CHECK_SONAME(freetype,FT_Init_FreeType,,,[$X_LIBS]) WINE_CHECK_SONAME(GL,glXQueryExtension,,,[$X_LIBS $X_EXTRA_LIBS]) WINE_CHECK_SONAME(txc_dxtn,fetch_2d_texel_rgba_dxt1) -WINE_CHECK_SONAME(cups,cupsGetDefault) WINE_CHECK_SONAME(jack,jack_client_new) WINE_CHECK_SONAME(fontconfig,FcInit) WINE_CHECK_SONAME(ssl,SSL_library_init) diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c index cf3b8a5..a794bec 100644 --- a/dlls/wineps.drv/init.c +++ b/dlls/wineps.drv/init.c @@ -45,11 +45,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(psdrv); -#ifndef SONAME_LIBCUPS -#define SONAME_LIBCUPS "libcups" SONAME_EXT -#endif - -#ifdef HAVE_CUPS_CUPS_H +#ifdef SONAME_LIBCUPS static void *cupshandle = NULL; #endif @@ -144,7 +140,7 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) HeapDestroy(PSDRV_Heap); return FALSE; } -#ifdef HAVE_CUPS_CUPS_H +#ifdef SONAME_LIBCUPS /* dynamically load CUPS if not yet loaded */ if (!cupshandle) { cupshandle = wine_dlopen(SONAME_LIBCUPS, RTLD_NOW, NULL, 0); @@ -157,7 +153,7 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) DeleteObject( PSDRV_DefaultFont ); HeapDestroy( PSDRV_Heap ); -#ifdef HAVE_CUPS_CUPS_H +#ifdef SONAME_LIBCUPS if (cupshandle && (cupshandle != (void*)-1)) { wine_dlclose(cupshandle, NULL, 0); cupshandle = NULL; @@ -580,7 +576,7 @@ PRINTERINFO *PSDRV_FindPrinterInfo(LPCSTR name) goto cleanup; } -#ifdef HAVE_CUPS_CUPS_H +#ifdef SONAME_LIBCUPS if (cupshandle != (void*)-1) { typeof(cupsGetPPD) * pcupsGetPPD = NULL; diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index d379df6..19b70be 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -38,9 +38,6 @@ #include <signal.h> #ifdef HAVE_CUPS_CUPS_H # include <cups/cups.h> -# ifndef SONAME_LIBCUPS -# define SONAME_LIBCUPS "libcups" SONAME_EXT -# endif #endif #define NONAMELESSUNION @@ -410,7 +407,7 @@ static BOOL add_printer_driver(const char *name) return TRUE; } -#ifdef HAVE_CUPS_CUPS_H +#ifdef SONAME_LIBCUPS static typeof(cupsGetDests) *pcupsGetDests; static typeof(cupsGetPPD) *pcupsGetPPD; static typeof(cupsPrintFile) *pcupsPrintFile; @@ -1567,7 +1564,7 @@ void WINSPOOL_LoadSystemPrinters(void) } -#ifdef HAVE_CUPS_CUPS_H +#ifdef SONAME_LIBCUPS done = CUPS_LoadPrinters(); #endif @@ -7129,7 +7126,7 @@ static BOOL schedule_lpr(LPCWSTR printer_name, LPCWSTR filename) */ static BOOL schedule_cups(LPCWSTR printer_name, LPCWSTR filename, LPCWSTR document_title) { -#if HAVE_CUPS_CUPS_H +#ifdef SONAME_LIBCUPS if(pcupsPrintFile) { char *unixname, *queue, *doc_titleA;

1 0

Alexandre Julliard : configure: Merge the libhal existence check with the soname check.
by Alexandre Julliard 03 Jul '07

03 Jul '07

Module: wine Branch: master Commit: c1099bb759ef3b18e4405833976e656488735b5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1099bb759ef3b18e44058339… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 2 17:28:33 2007 +0200 configure: Merge the libhal existence check with the soname check. --- configure | 142 ++++++++++++----------------------------------- configure.ac | 8 +-- include/config.h.in | 3 - programs/explorer/hal.c | 10 +-- 4 files changed, 42 insertions(+), 121 deletions(-) diff --git a/configure b/configure index 8eebf24..4463c60 100755 --- a/configure +++ b/configure @@ -10784,13 +10784,13 @@ done if test "$ac_cv_header_dbus_dbus_h" = "yes" -a "$ac_cv_header_hal_libhal_h" = "yes" then - { echo "$as_me:$LINENO: checking for libhal_ctx_new in -lhal" >&5 -echo $ECHO_N "checking for libhal_ctx_new in -lhal... $ECHO_C" >&6; } -if test "${ac_cv_lib_hal_libhal_ctx_new+set}" = set; then + { echo "$as_me:$LINENO: checking for dbus_connection_close in -ldbus-1" >&5 +echo $ECHO_N "checking for dbus_connection_close in -ldbus-1... $ECHO_C" >&6; } +if test "${ac_cv_lib_dbus_1_dbus_connection_close+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lhal $LIBS" +LIBS="-ldbus-1 $ac_hal_libs $LIBS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -10804,11 +10804,11 @@ cat >>conftest.$ac_ext <<_ACEOF #ifdef __cplusplus extern "C" #endif -char libhal_ctx_new (); +char dbus_connection_close (); int main () { -return libhal_ctx_new (); +return dbus_connection_close (); ; return 0; } @@ -10831,29 +10831,29 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 test ! -s conftest.err } && test -s conftest$ac_exeext && $as_test_x conftest$ac_exeext; then - ac_cv_lib_hal_libhal_ctx_new=yes + ac_cv_lib_dbus_1_dbus_connection_close=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_lib_hal_libhal_ctx_new=no + ac_cv_lib_dbus_1_dbus_connection_close=no fi rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_hal_libhal_ctx_new" >&5 -echo "${ECHO_T}$ac_cv_lib_hal_libhal_ctx_new" >&6; } -if test $ac_cv_lib_hal_libhal_ctx_new = yes; then - { echo "$as_me:$LINENO: checking for dbus_connection_close in -ldbus-1" >&5 -echo $ECHO_N "checking for dbus_connection_close in -ldbus-1... $ECHO_C" >&6; } -if test "${ac_cv_lib_dbus_1_dbus_connection_close+set}" = set; then +{ echo "$as_me:$LINENO: result: $ac_cv_lib_dbus_1_dbus_connection_close" >&5 +echo "${ECHO_T}$ac_cv_lib_dbus_1_dbus_connection_close" >&6; } +if test $ac_cv_lib_dbus_1_dbus_connection_close = yes; then + { echo "$as_me:$LINENO: checking for -lhal" >&5 +echo $ECHO_N "checking for -lhal... $ECHO_C" >&6; } +if test "${ac_cv_lib_soname_hal+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ldbus-1 $ac_hal_libs $LIBS" -cat >conftest.$ac_ext <<_ACEOF + ac_check_soname_save_LIBS=$LIBS +LIBS="-lhal $ac_hal_libs $LIBS" + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -10866,11 +10866,11 @@ cat >>conftest.$ac_ext <<_ACEOF #ifdef __cplusplus extern "C" #endif -char dbus_connection_close (); +char libhal_ctx_new (); int main () { -return dbus_connection_close (); +return libhal_ctx_new (); ; return 0; } @@ -10893,27 +10893,35 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 test ! -s conftest.err } && test -s conftest$ac_exeext && $as_test_x conftest$ac_exeext; then - ac_cv_lib_dbus_1_dbus_connection_close=yes + case "$LIBEXT" in + dll) ;; + dylib) ac_cv_lib_soname_hal=`otool -L conftest$ac_exeext | grep "libhal\\.[0-9A-Za-z.]*dylib" | sed -e "s/^.*\/$libhal\.[0-9A-Za-z.]*dylib$.*$/\1/"';2,$d'` ;; + *) ac_cv_lib_soname_hal=`$ac_cv_path_LDD conftest$ac_exeext | grep "libhal\\.$LIBEXT" | sed -e "s/^.*$libhal\.$LIBEXT[^ ]*$.*$/\1/"';2,$d'` ;; + esac else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_lib_dbus_1_dbus_connection_close=no + fi rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS + LIBS=$ac_check_soname_save_LIBS fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_dbus_1_dbus_connection_close" >&5 -echo "${ECHO_T}$ac_cv_lib_dbus_1_dbus_connection_close" >&6; } -if test $ac_cv_lib_dbus_1_dbus_connection_close = yes; then +if test "x$ac_cv_lib_soname_hal" = "x"; then + { echo "$as_me:$LINENO: result: not found" >&5 +echo "${ECHO_T}not found" >&6; } -cat >>confdefs.h <<\_ACEOF -#define HAVE_LIBHAL 1 +else + { echo "$as_me:$LINENO: result: $ac_cv_lib_soname_hal" >&5 +echo "${ECHO_T}$ac_cv_lib_soname_hal" >&6; } + +cat >>confdefs.h <<_ACEOF +#define SONAME_LIBHAL "$ac_cv_lib_soname_hal" _ACEOF - HALINCL="$ac_hal_cflags" + HALINCL="$ac_hal_cflags" fi fi @@ -14881,84 +14889,6 @@ _ACEOF fi -{ echo "$as_me:$LINENO: checking for -lhal" >&5 -echo $ECHO_N "checking for -lhal... $ECHO_C" >&6; } -if test "${ac_cv_lib_soname_hal+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_soname_save_LIBS=$LIBS -LIBS="-lhal $LIBS" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char libhal_ctx_new (); -int -main () -{ -return libhal_ctx_new (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - case "$LIBEXT" in - dll) ;; - dylib) ac_cv_lib_soname_hal=`otool -L conftest$ac_exeext | grep "libhal\\.[0-9A-Za-z.]*dylib" | sed -e "s/^.*\/$libhal\.[0-9A-Za-z.]*dylib$.*$/\1/"';2,$d'` ;; - *) ac_cv_lib_soname_hal=`$ac_cv_path_LDD conftest$ac_exeext | grep "libhal\\.$LIBEXT" | sed -e "s/^.*$libhal\.$LIBEXT[^ ]*$.*$/\1/"';2,$d'` ;; - esac -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_soname_save_LIBS -fi -if test "x$ac_cv_lib_soname_hal" = "x"; then - { echo "$as_me:$LINENO: result: not found" >&5 -echo "${ECHO_T}not found" >&6; } - -else - { echo "$as_me:$LINENO: result: $ac_cv_lib_soname_hal" >&5 -echo "${ECHO_T}$ac_cv_lib_soname_hal" >&6; } - -cat >>confdefs.h <<_ACEOF -#define SONAME_LIBHAL "$ac_cv_lib_soname_hal" -_ACEOF - - -fi - { echo "$as_me:$LINENO: checking for -ltxc_dxtn" >&5 echo $ECHO_N "checking for -ltxc_dxtn... $ECHO_C" >&6; } if test "${ac_cv_lib_soname_txc_dxtn+set}" = set; then diff --git a/configure.ac b/configure.ac index 2f0a569..e300937 100644 --- a/configure.ac +++ b/configure.ac @@ -676,10 +676,9 @@ then AC_CHECK_HEADERS([dbus/dbus.h hal/libhal.h]) if test "$ac_cv_header_dbus_dbus_h" = "yes" -a "$ac_cv_header_hal_libhal_h" = "yes" then - AC_CHECK_LIB(hal, libhal_ctx_new, - [AC_CHECK_LIB(dbus-1, dbus_connection_close, - [AC_DEFINE(HAVE_LIBHAL, 1, [Define if you have the hal library]) - HALINCL="$ac_hal_cflags"],,$ac_hal_libs)]) + AC_CHECK_LIB(dbus-1, dbus_connection_close, + [WINE_CHECK_SONAME(hal, libhal_ctx_new, + [HALINCL="$ac_hal_cflags"],,[$ac_hal_libs])],,[$ac_hal_libs]) fi CPPFLAGS="$ac_save_CPPFLAGS" fi @@ -1117,7 +1116,6 @@ WINE_CHECK_SONAME(Xrandr,XRRQueryExtension,,,[$X_LIBS -lXext -lX11 $X_EXTRA_LIBS WINE_CHECK_SONAME(Xcursor,XcursorImageLoadCursor,,,[$X_LIBS -lX11 $X_EXTRA_LIBS]) WINE_CHECK_SONAME(freetype,FT_Init_FreeType,,,[$X_LIBS]) WINE_CHECK_SONAME(GL,glXQueryExtension,,,[$X_LIBS $X_EXTRA_LIBS]) -WINE_CHECK_SONAME(hal,libhal_ctx_new) WINE_CHECK_SONAME(txc_dxtn,fetch_2d_texel_rgba_dxt1) WINE_CHECK_SONAME(cups,cupsGetDefault) WINE_CHECK_SONAME(jack,jack_client_new) diff --git a/include/config.h.in b/include/config.h.in index dc8b613..a466d47 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -297,9 +297,6 @@ /* Define to 1 if you have the <libaudioio.h> header file. */ #undef HAVE_LIBAUDIOIO_H -/* Define if you have the hal library */ -#undef HAVE_LIBHAL - /* Define to 1 if you have the `i386' library (-li386). */ #undef HAVE_LIBI386 diff --git a/programs/explorer/hal.c b/programs/explorer/hal.c index 47c6708..6b5be46 100644 --- a/programs/explorer/hal.c +++ b/programs/explorer/hal.c @@ -40,7 +40,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(explorer); -#ifdef HAVE_LIBHAL +#ifdef SONAME_LIBHAL #include <dbus/dbus.h> #include <hal/libhal.h> @@ -75,10 +75,6 @@ DBUS_FUNCS; HAL_FUNCS; #undef DO_FUNC -#ifndef SONAME_LIBHAL -#define SONAME_LIBHAL "libhal" SONAME_EXT -#endif - static BOOL load_functions(void) { void *hal_handle; @@ -240,11 +236,11 @@ void initialize_hal(void) CloseHandle( handle ); } -#else /* HAVE_LIBHAL */ +#else /* SONAME_LIBHAL */ void initialize_hal(void) { WINE_TRACE( "Skipping, HAL support not compiled in\n" ); } -#endif /* HAVE_LIBHAL */ +#endif /* SONAME_LIBHAL */

1 0

Alexandre Julliard : configure: Merge the libcurses existence check with the soname check.
by Alexandre Julliard 03 Jul '07

03 Jul '07

Module: wine Branch: master Commit: d0783774e722c8b5f35ca9736f3f7315c349277c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0783774e722c8b5f35ca9736… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 2 17:28:50 2007 +0200 configure: Merge the libcurses existence check with the soname check. --- configure | 230 +++++++++-------------------------------- configure.ac | 6 +- programs/wineconsole/curses.c | 10 +-- 3 files changed, 54 insertions(+), 192 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d0783774e722c8b5f35ca…

1 0

Alexandre Julliard : configure: Merge the libcapi20 existence check with the soname check.
by Alexandre Julliard 03 Jul '07

03 Jul '07

Module: wine Branch: master Commit: 3336e9bf0565ba9bf48367b1cb3e4a5895efec95 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3336e9bf0565ba9bf48367b1c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 2 17:29:17 2007 +0200 configure: Merge the libcapi20 existence check with the soname check. --- configure | 113 +++++++++------------------------------------- configure.ac | 3 +- dlls/capi2032/cap20wxx.c | 26 +++++------ include/config.h.in | 3 - 4 files changed, 34 insertions(+), 111 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3336e9bf0565ba9bf4836…

1 0

Alexandre Julliard : configure: Change WINE_GET_SONAME to allow it to be used as a replacement for AC_CHECK_LIB .
by Alexandre Julliard 03 Jul '07

03 Jul '07

Module: wine Branch: master Commit: 66afa98f133cf0f4aef501c5b57ec10bbc1b1916 URL: http://source.winehq.org/git/wine.git/?a=commit;h=66afa98f133cf0f4aef501c5b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 2 17:02:51 2007 +0200 configure: Change WINE_GET_SONAME to allow it to be used as a replacement for AC_CHECK_LIB. --- aclocal.m4 | 24 ++++--- configure | 210 +++++++++++++++++++++++++++++++++++----------------------- configure.ac | 42 ++++++------ 3 files changed, 161 insertions(+), 115 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=66afa98f133cf0f4aef50…

1 0

Alexandre Julliard : configure: Move the dll checks earlier in the file to make them available for library checks .
by Alexandre Julliard 03 Jul '07

03 Jul '07

Module: wine Branch: master Commit: a30976281dd401666c31318fad616cde28246c18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a30976281dd401666c31318fa… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 2 17:27:48 2007 +0200 configure: Move the dll checks earlier in the file to make them available for library checks. --- configure | 2651 +++++++++++++++++++++++++++++----------------------------- configure.ac | 297 ++++---- 2 files changed, 1476 insertions(+), 1472 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a30976281dd401666c313…

1 0

James Hawkins : msi: Return ERROR_SUCCESS if the PackageName property is not present.
by Alexandre Julliard 02 Jul '07

02 Jul '07

Module: wine Branch: master Commit: c26505b7016fa593c46a1e9666ba97ceee7f9cef URL: http://source.winehq.org/git/wine.git/?a=commit;h=c26505b7016fa593c46a1e966… Author: James Hawkins <truiken(a)gmail.com> Date: Fri Jun 29 14:12:52 2007 -0700 msi: Return ERROR_SUCCESS if the PackageName property is not present. --- dlls/msi/source.c | 2 +- dlls/msi/tests/source.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msi/source.c b/dlls/msi/source.c index 70a9552..74e2881 100644 --- a/dlls/msi/source.c +++ b/dlls/msi/source.c @@ -344,7 +344,7 @@ UINT WINAPI MsiSourceListGetInfoW( LPCWSTR szProduct, LPCWSTR szUserSid, rc = RegQueryValueExW(sourcekey, INSTALLPROPERTY_PACKAGENAMEW, 0, 0, (LPBYTE)szValue, pcchValue); if (rc != ERROR_SUCCESS && rc != ERROR_MORE_DATA) - rc = ERROR_UNKNOWN_PROPERTY; + rc = ERROR_SUCCESS; } else { diff --git a/dlls/msi/tests/source.c b/dlls/msi/tests/source.c index b87d1ba..2c2fe05 100644 --- a/dlls/msi/tests/source.c +++ b/dlls/msi/tests/source.c @@ -208,9 +208,9 @@ static void test_MsiSourceListGetInfo(void) size = 0xdeadbeef; r = MsiSourceListGetInfoA(prodcode, usersid, MSIINSTALLCONTEXT_USERUNMANAGED, MSICODE_PRODUCT, INSTALLPROPERTY_PACKAGENAME, NULL, &size); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); todo_wine { - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); ok(size == 0, "Expected 0, got %d\n", size); }

1 0

James Hawkins : msi: Add tests for MsiSourceListGetInfo.
by Alexandre Julliard 02 Jul '07

02 Jul '07

Module: wine Branch: master Commit: 1ff40d15587a9c41d2e22a1ae2abb540635a026a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ff40d15587a9c41d2e22a1ae… Author: James Hawkins <truiken(a)gmail.com> Date: Fri Jun 29 14:12:41 2007 -0700 msi: Add tests for MsiSourceListGetInfo. --- dlls/msi/tests/Makefile.in | 1 + dlls/msi/tests/msi.c | 2 +- dlls/msi/tests/source.c | 361 ++++++++++++++++++++++++++++++++++++++++++++ include/winerror.h | 1 + 4 files changed, 364 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1ff40d15587a9c41d2e22…

1 0

James Hawkins : msi: Validate MsiSourceListGetInfo parameters.
by Alexandre Julliard 02 Jul '07

02 Jul '07

Module: wine Branch: master Commit: 3e56d78f2eb38b186abaac482c009cef8c4222e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e56d78f2eb38b186abaac482… Author: James Hawkins <truiken(a)gmail.com> Date: Fri Jun 29 14:12:44 2007 -0700 msi: Validate MsiSourceListGetInfo parameters. --- dlls/msi/source.c | 14 ++++++++++++- dlls/msi/tests/source.c | 50 +++++++++------------------------------------- 2 files changed, 23 insertions(+), 41 deletions(-) diff --git a/dlls/msi/source.c b/dlls/msi/source.c index 49b7e4e..3c73351 100644 --- a/dlls/msi/source.c +++ b/dlls/msi/source.c @@ -214,11 +214,23 @@ UINT WINAPI MsiSourceListGetInfoW( LPCWSTR szProduct, LPCWSTR szUserSid, TRACE("%s %s\n", debugstr_w(szProduct), debugstr_w(szProperty)); - if (!szProduct || lstrlenW(szProduct) > 39) + if (!szProduct || !*szProduct) + return ERROR_INVALID_PARAMETER; + + if (lstrlenW(szProduct) != GUID_SIZE - 1 || + (szProduct[0] != '{' && szProduct[GUID_SIZE - 2] != '}')) return ERROR_INVALID_PARAMETER; if (szValue && !pcchValue) return ERROR_INVALID_PARAMETER; + + if (dwContext != MSIINSTALLCONTEXT_USERMANAGED && + dwContext != MSIINSTALLCONTEXT_USERUNMANAGED && + dwContext != MSIINSTALLCONTEXT_MACHINE) + return ERROR_INVALID_PARAMETER; + + if (!szProperty) + return ERROR_INVALID_PARAMETER; if (dwOptions == MSICODE_PATCH) { diff --git a/dlls/msi/tests/source.c b/dlls/msi/tests/source.c index 53f382a..306a3b4 100644 --- a/dlls/msi/tests/source.c +++ b/dlls/msi/tests/source.c @@ -118,34 +118,22 @@ static void test_MsiSourceListGetInfo(void) /* empty szProductCodeOrPatchCode */ r = MsiSourceListGetInfoA("", usersid, MSIINSTALLCONTEXT_USERUNMANAGED, MSICODE_PRODUCT, INSTALLPROPERTY_PACKAGENAME, NULL, NULL); - todo_wine - { - ok(r == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", r); - } + ok(r == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", r); /* garbage szProductCodeOrPatchCode */ r = MsiSourceListGetInfoA("garbage", usersid, MSIINSTALLCONTEXT_USERUNMANAGED, MSICODE_PRODUCT, INSTALLPROPERTY_PACKAGENAME, NULL, NULL); - todo_wine - { - ok(r == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", r); - } + ok(r == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", r); /* szProductCodeOrPatchCode */ r = MsiSourceListGetInfoA("garbage", usersid, MSIINSTALLCONTEXT_USERUNMANAGED, MSICODE_PRODUCT, INSTALLPROPERTY_PACKAGENAME, NULL, NULL); - todo_wine - { - ok(r == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", r); - } + ok(r == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", r); /* guid without brackets */ r = MsiSourceListGetInfoA("51CD2AD5-0482-4C46-8DDD-0ED1022AA1AA", usersid, MSIINSTALLCONTEXT_USERUNMANAGED, MSICODE_PRODUCT, INSTALLPROPERTY_PACKAGENAME, NULL, NULL); - todo_wine - { - ok(r == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", r); - } + ok(r == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", r); /* guid with brackets */ r = MsiSourceListGetInfoA("{51CD2AD5-0482-4C46-8DDD-0ED1022AA1AA}", usersid, MSIINSTALLCONTEXT_USERUNMANAGED, @@ -155,42 +143,27 @@ static void test_MsiSourceListGetInfo(void) /* same length as guid, but random */ r = MsiSourceListGetInfoA("ADKD-2KSDFF2-DKK1KNFJASD9GLKWME-1I3KAD", usersid, MSIINSTALLCONTEXT_USERUNMANAGED, MSICODE_PRODUCT, INSTALLPROPERTY_PACKAGENAME, NULL, NULL); - todo_wine - { - ok(r == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", r); - } + ok(r == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", r); /* invalid context */ r = MsiSourceListGetInfoA(prodcode, usersid, MSIINSTALLCONTEXT_NONE, MSICODE_PRODUCT, INSTALLPROPERTY_PACKAGENAME, NULL, NULL); - todo_wine - { - ok(r == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", r); - } + ok(r == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", r); /* another invalid context */ r = MsiSourceListGetInfoA(prodcode, usersid, MSIINSTALLCONTEXT_ALLUSERMANAGED, MSICODE_PRODUCT, INSTALLPROPERTY_PACKAGENAME, NULL, NULL); - todo_wine - { - ok(r == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", r); - } + ok(r == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", r); /* yet another invalid context */ r = MsiSourceListGetInfoA(prodcode, usersid, MSIINSTALLCONTEXT_ALL, MSICODE_PRODUCT, INSTALLPROPERTY_PACKAGENAME, NULL, NULL); - todo_wine - { - ok(r == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", r); - } + ok(r == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", r); /* mix two valid contexts */ r = MsiSourceListGetInfoA(prodcode, usersid, MSIINSTALLCONTEXT_USERMANAGED | MSIINSTALLCONTEXT_USERUNMANAGED, MSICODE_PRODUCT, INSTALLPROPERTY_PACKAGENAME, NULL, NULL); - todo_wine - { - ok(r == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", r); - } + ok(r == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", r); /* invalid option */ r = MsiSourceListGetInfoA(prodcode, usersid, MSIINSTALLCONTEXT_USERUNMANAGED, @@ -200,10 +173,7 @@ static void test_MsiSourceListGetInfo(void) /* NULL property */ r = MsiSourceListGetInfoA(prodcode, usersid, MSIINSTALLCONTEXT_USERUNMANAGED, MSICODE_PRODUCT, NULL, NULL, NULL); - todo_wine - { - ok(r == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", r); - } + ok(r == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", r); /* empty property */ r = MsiSourceListGetInfoA(prodcode, usersid, MSIINSTALLCONTEXT_USERUNMANAGED,

1 0

James Hawkins : msi: Return ERROR_BAD_CONFIGURATION if the SourceList key does not exist.
by Alexandre Julliard 02 Jul '07

02 Jul '07

Module: wine Branch: master Commit: 381b915b475f12e6ecd5fb14bb8fda05c52f2dac URL: http://source.winehq.org/git/wine.git/?a=commit;h=381b915b475f12e6ecd5fb14b… Author: James Hawkins <truiken(a)gmail.com> Date: Fri Jun 29 14:12:48 2007 -0700 msi: Return ERROR_BAD_CONFIGURATION if the SourceList key does not exist. --- dlls/msi/source.c | 10 +++++++--- dlls/msi/tests/source.c | 5 +---- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/msi/source.c b/dlls/msi/source.c index 3c73351..70a9552 100644 --- a/dlls/msi/source.c +++ b/dlls/msi/source.c @@ -63,12 +63,16 @@ static UINT OpenSourceKey(LPCWSTR szProduct, HKEY* key, BOOL user, BOOL create) rc = MSIREG_OpenProductsKey(szProduct, &rootkey, create); if (rc) - return rc; + return ERROR_UNKNOWN_PRODUCT; if (create) rc = RegCreateKeyW(rootkey, szSourceList, key); else - rc = RegOpenKeyW(rootkey,szSourceList, key); + { + rc = RegOpenKeyW(rootkey,szSourceList, key); + if (rc != ERROR_SUCCESS) + rc = ERROR_BAD_CONFIGURATION; + } return rc; } @@ -250,7 +254,7 @@ UINT WINAPI MsiSourceListGetInfoW( LPCWSTR szProduct, LPCWSTR szUserSid, rc = OpenSourceKey(szProduct, &sourcekey, TRUE, FALSE); if (rc != ERROR_SUCCESS) - return ERROR_UNKNOWN_PRODUCT; + return rc; if (strcmpW(szProperty, INSTALLPROPERTY_MEDIAPACKAGEPATHW) == 0) { diff --git a/dlls/msi/tests/source.c b/dlls/msi/tests/source.c index 306a3b4..b87d1ba 100644 --- a/dlls/msi/tests/source.c +++ b/dlls/msi/tests/source.c @@ -199,10 +199,7 @@ static void test_MsiSourceListGetInfo(void) /* user product key exists */ r = MsiSourceListGetInfoA(prodcode, usersid, MSIINSTALLCONTEXT_USERUNMANAGED, MSICODE_PRODUCT, INSTALLPROPERTY_PACKAGENAME, NULL, &size); - todo_wine - { - ok(r == ERROR_BAD_CONFIGURATION, "Expected ERROR_BAD_CONFIGURATION, got %d\n", r); - } + ok(r == ERROR_BAD_CONFIGURATION, "Expected ERROR_BAD_CONFIGURATION, got %d\n", r); res = RegCreateKeyA(userkey, "SourceList", &hkey); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);

1 0