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

Ken Thomases : winemac: Change some run-time asserts to compile-time.
by Alexandre Julliard May 6, 2013

May 6, 2013

Module: wine Branch: master Commit: 3964f805cc19260f0d3054cf296a9db2a593fbc2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3964f805cc19260f0d3054cf2… Author: Ken Thomases <ken(a)codeweavers.com> Date: Fri May 3 23:05:08 2013 -0500 winemac: Change some run-time asserts to compile-time. --- dlls/winemac.drv/macdrv_main.c | 4 ++-- dlls/winemac.drv/opengl.c | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/winemac.drv/macdrv_main.c b/dlls/winemac.drv/macdrv_main.c index f4cb7be..501b7d5 100644 --- a/dlls/winemac.drv/macdrv_main.c +++ b/dlls/winemac.drv/macdrv_main.c @@ -37,6 +37,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(macdrv); #define kCFCoreFoundationVersionNumber10_7 635.00 #endif +C_ASSERT(NUM_EVENT_TYPES <= sizeof(macdrv_event_mask) * 8); + DWORD thread_data_tls_index = TLS_OUT_OF_INDEXES; @@ -96,8 +98,6 @@ static BOOL process_attach(void) SessionAttributeBits attributes; OSStatus status; - assert(NUM_EVENT_TYPES <= sizeof(macdrv_event_mask) * 8); - status = SessionGetInfo(callerSecuritySession, NULL, &attributes); if (status != noErr || !(attributes & sessionHasGraphicAccess)) return FALSE; diff --git a/dlls/winemac.drv/opengl.c b/dlls/winemac.drv/opengl.c index 5f269fc..b1d2c1e 100644 --- a/dlls/winemac.drv/opengl.c +++ b/dlls/winemac.drv/opengl.c @@ -231,6 +231,7 @@ typedef union pixel_format format; UInt64 code; } pixel_format_or_code; +C_ASSERT(sizeof(((pixel_format_or_code*)0)->format) <= sizeof(((pixel_format_or_code*)0)->code)); static pixel_format *pixel_formats; @@ -1080,8 +1081,6 @@ static BOOL init_pixel_formats(void) TRACE("()\n"); - assert(sizeof(((pixel_format_or_code*)0)->format) <= sizeof(((pixel_format_or_code*)0)->code)); - err = CGLQueryRendererInfo(CGDisplayIDToOpenGLDisplayMask(CGMainDisplayID()), &renderer_info, &rendererCount); if (err) {

1 0

Francois Gouget : fusion/tests: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard May 6, 2013

May 6, 2013

Module: wine Branch: master Commit: 2767aca7bba4faed88f7fd02b02d70be85e6265b URL: http://source.winehq.org/git/wine.git/?a=commit;h=2767aca7bba4faed88f7fd02b… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat May 4 09:26:05 2013 +0200 fusion/tests: Fix compilation on systems that don't support nameless unions. --- dlls/fusion/tests/asmcache.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/fusion/tests/asmcache.c b/dlls/fusion/tests/asmcache.c index 320a938..da39505 100644 --- a/dlls/fusion/tests/asmcache.c +++ b/dlls/fusion/tests/asmcache.c @@ -822,11 +822,11 @@ static void create_assembly(LPCSTR file) assembly.tableshdr.MaskValid.u.LowPart = 0x00000005; assembly.tableshdr.MaskSorted.u.HighPart = 0x1600; assembly.tableshdr.MaskSorted.u.LowPart = 0x3301FA00; - U1(assembly.labelres).Name = 0x10; + U(assembly.labelres).Name = 0x10; U2(assembly.labelres).OffsetToData = 0x80000018; - U1(assembly.label11res).Name = 0x1; + U(assembly.label11res).Name = 0x1; U2(assembly.label11res).OffsetToData = 0x80000030; - U1(assembly.label10res).Name = 0x0; + U(assembly.label10res).Name = 0x0; U2(assembly.label10res).OffsetToData = 0x48; hfile = CreateFileA(file, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0);

1 0

Daniel Jelinski : msi: Fix ComputerName property.
by Alexandre Julliard May 3, 2013

May 3, 2013

Module: wine Branch: master Commit: ce6a037abc91123b249efe710615883628adefe8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce6a037abc91123b249efe710… Author: Daniel Jelinski <djelinski1(a)gmail.com> Date: Fri May 3 20:55:13 2013 +0200 msi: Fix ComputerName property. --- dlls/msi/package.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index f7cc908..74f19ac 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -1020,7 +1020,7 @@ static VOID set_installer_properties(MSIPACKAGE *package) if ((computername = msi_alloc( len * sizeof(WCHAR) ))) { if (GetComputerNameW( computername, &len )) - msi_set_property( package->db, szComputerName, computername, len - 1 ); + msi_set_property( package->db, szComputerName, computername, len ); msi_free( computername ); } }

1 0

Hans Leidekker : wbemprox: Avoid a crash in to_safearray.
by Alexandre Julliard May 3, 2013

May 3, 2013

Module: wine Branch: master Commit: 7f81a2c6b1716feb0bffe08d998ad7e8220ddae0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f81a2c6b1716feb0bffe08d9… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri May 3 14:45:25 2013 +0200 wbemprox: Avoid a crash in to_safearray. --- dlls/wbemprox/query.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wbemprox/query.c b/dlls/wbemprox/query.c index 028b334..1850368 100644 --- a/dlls/wbemprox/query.c +++ b/dlls/wbemprox/query.c @@ -580,7 +580,7 @@ SAFEARRAY *to_safearray( const struct array *array, CIMTYPE type ) VARTYPE vartype = to_vartype( type ); LONG i; - if (!(ret = SafeArrayCreateVector( vartype, 0, array->count ))) return NULL; + if (!array || !(ret = SafeArrayCreateVector( vartype, 0, array->count ))) return NULL; for (i = 0; i < array->count; i++) {

1 0

Piotr Caban : wininet: Handle NULL req-> netconn in INTERNET_OPTION_SECURITY_CERTIFICATE_STRUCT query.
by Alexandre Julliard May 3, 2013

May 3, 2013

Module: wine Branch: master Commit: 33d62f3f17fcd34e2ad172847ee5267fc71ed96e URL: http://source.winehq.org/git/wine.git/?a=commit;h=33d62f3f17fcd34e2ad172847… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri May 3 15:19:22 2013 +0200 wininet: Handle NULL req->netconn in INTERNET_OPTION_SECURITY_CERTIFICATE_STRUCT query. --- dlls/wininet/http.c | 3 +++ dlls/wininet/tests/http.c | 7 +++++++ 2 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index e160d04..188259d 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -2125,6 +2125,9 @@ static DWORD HTTPREQ_QueryOption(object_header_t *hdr, DWORD option, void *buffe case INTERNET_OPTION_SECURITY_CERTIFICATE_STRUCT: { PCCERT_CONTEXT context; + if(!req->netconn) + return ERROR_INTERNET_INVALID_OPERATION; + if(*size < sizeof(INTERNET_CERTIFICATE_INFOA)) { *size = sizeof(INTERNET_CERTIFICATE_INFOA); return ERROR_INSUFFICIENT_BUFFER; diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index bfa215b..264aee7 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -3354,6 +3354,13 @@ static void test_options(int port) ret = InternetQueryOption(req, INTERNET_OPTION_DIAGNOSTIC_SOCKET_INFO, &idsi, &size); ok(ret, "InternetQueryOption failed %u\n", GetLastError()); + size = 0; + SetLastError(0xdeadbeef); + ret = InternetQueryOption(req, INTERNET_OPTION_SECURITY_CERTIFICATE_STRUCT, NULL, &size); + error = GetLastError(); + ok(!ret, "InternetQueryOption succeeded\n"); + ok(error == ERROR_INTERNET_INVALID_OPERATION, "expected ERROR_INTERNET_INVALID_OPERATION, got %u\n", error); + /* INTERNET_OPTION_PROXY */ SetLastError(0xdeadbeef); ret = InternetQueryOptionA(ses, INTERNET_OPTION_PROXY, NULL, NULL);

1 0

Hans Leidekker : msi: Assume a transform is applicable if it doesn' t specify any products.
by Alexandre Julliard May 3, 2013

May 3, 2013

Module: wine Branch: master Commit: 8328562e4ce60db4757eb5a8f8feece92aba724a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8328562e4ce60db4757eb5a8f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri May 3 14:46:32 2013 +0200 msi: Assume a transform is applicable if it doesn't specify any products. --- dlls/msi/patch.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/msi/patch.c b/dlls/msi/patch.c index 59785a6..d97ab2e 100644 --- a/dlls/msi/patch.c +++ b/dlls/msi/patch.c @@ -44,22 +44,22 @@ static BOOL match_language( MSIPACKAGE *package, LANGID langid ) return FALSE; } -static UINT check_transform_applicable( MSIPACKAGE *package, IStorage *patch ) +static UINT check_transform_applicable( MSIPACKAGE *package, IStorage *transform ) { - LPWSTR prod_code, patch_product, template = NULL; + WCHAR *package_product, *transform_product, *template = NULL; UINT ret = ERROR_FUNCTION_FAILED; - prod_code = msi_dup_property( package->db, szProductCode ); - patch_product = msi_get_suminfo_product( patch ); + package_product = msi_dup_property( package->db, szProductCode ); + transform_product = msi_get_suminfo_product( transform ); - TRACE("db = %s patch = %s\n", debugstr_w(prod_code), debugstr_w(patch_product)); + TRACE("package = %s transform = %s\n", debugstr_w(package_product), debugstr_w(transform_product)); - if (strstrW( patch_product, prod_code )) + if (!transform_product || strstrW( transform_product, package_product )) { MSISUMMARYINFO *si; const WCHAR *p; - si = MSI_GetSummaryInformationW( patch, 0 ); + si = MSI_GetSummaryInformationW( transform, 0 ); if (!si) { ERR("no summary information!\n"); @@ -90,8 +90,8 @@ static UINT check_transform_applicable( MSIPACKAGE *package, IStorage *patch ) } end: - msi_free( patch_product ); - msi_free( prod_code ); + msi_free( transform_product ); + msi_free( package_product ); msi_free( template ); return ret; }

1 0

Alexandre Julliard : configure: Use the pkg-config helper macro for gstreamer.
by Alexandre Julliard May 3, 2013

May 3, 2013

Module: wine Branch: master Commit: 96d9a7dec21243d38bc3f0a4527fbfe29a17f9c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=96d9a7dec21243d38bc3f0a45… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 3 17:44:45 2013 +0200 configure: Use the pkg-config helper macro for gstreamer. --- configure | 55 ++++++++++++++++++++++++++-------------- configure.ac | 32 +++++++++++------------ dlls/winegstreamer/Makefile.in | 2 +- 3 files changed, 52 insertions(+), 37 deletions(-) diff --git a/configure b/configure index e384ef2..90109d1 100755 --- a/configure +++ b/configure @@ -646,8 +646,8 @@ FONTCONFIGINCL CUPSINCL OSS4INCL ALSALIBS -GSTREAMER_INCL GSTREAMER_LIBS +GSTREAMER_CFLAGS LIBGETTEXTPO ZLIB FREETYPE_LIBS @@ -875,7 +875,9 @@ SANE_LIBS GPHOTO2_CFLAGS GPHOTO2_LIBS FREETYPE_CFLAGS -FREETYPE_LIBS' +FREETYPE_LIBS +GSTREAMER_CFLAGS +GSTREAMER_LIBS' # Initialize some variables set by options. @@ -1584,6 +1586,10 @@ Some influential environment variables: C compiler flags for freetype2, overriding pkg-config FREETYPE_LIBS Linker flags for freetype2, overriding pkg-config + GSTREAMER_CFLAGS + C compiler flags for gstreamer-app-0.10, overriding pkg-config + GSTREAMER_LIBS + Linker flags for gstreamer-app-0.10, 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. @@ -11131,17 +11137,30 @@ fi if test "x$with_gstreamer" != "xno" then ac_save_CPPFLAGS="$CPPFLAGS" - if test "$PKG_CONFIG" != "false"; then - ac_gst_incl="" - for i in `$PKG_CONFIG --cflags gstreamer-app-0.10 2>/dev/null` - do - case "$i" in - -I*) ac_gst_incl="$ac_gst_incl $i";; - esac - done - ac_gst_libs="`$PKG_CONFIG --libs gstreamer-app-0.10 2>/dev/null`" - CPPFLAGS="$CPPFLAGS $ac_gst_incl" - ac_fn_c_check_header_mongrel "$LINENO" "gst/gstpad.h" "ac_cv_header_gst_gstpad_h" "$ac_includes_default" + if test -n "$GSTREAMER_CFLAGS"; then : + +elif test -n "$PKG_CONFIG"; then : + GSTREAMER_CFLAGS=`$PKG_CONFIG --cflags gstreamer-app-0.10 2>/dev/null` +fi + +CPPFLAGS="$CPPFLAGS $GSTREAMER_CFLAGS" +if test -n "$GSTREAMER_LIBS"; then : + +elif test -n "$PKG_CONFIG"; then : + GSTREAMER_LIBS=`$PKG_CONFIG --libs gstreamer-app-0.10 2>/dev/null` +fi + + + ac_gst_incl="" + for i in $GSTREAMER_CFLAGS + do + case "$i" in + -I*) ac_gst_incl="$ac_gst_incl $i";; + esac + done + GSTREAMER_CFLAGS=$ac_gst_incl + CPPFLAGS="$ac_save_CPPFLAGS $GSTREAMER_CFLAGS" + ac_fn_c_check_header_mongrel "$LINENO" "gst/gstpad.h" "ac_cv_header_gst_gstpad_h" "$ac_includes_default" if test "x$ac_cv_header_gst_gstpad_h" = xyes; then : ac_fn_c_check_header_mongrel "$LINENO" "gst/app/gstappsink.h" "ac_cv_header_gst_app_gstappsink_h" "$ac_includes_default" if test "x$ac_cv_header_gst_app_gstappsink_h" = xyes; then : @@ -11204,7 +11223,7 @@ if ${ac_cv_lib_gstapp_0_10_gst_app_buffer_new+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lgstapp-0.10 $ac_gst_libs $LIBS" +LIBS="-lgstapp-0.10 $GSTREAMER_LIBS $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -11235,10 +11254,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gstapp_0_10_gst_app_buffer_new" >&5 $as_echo "$ac_cv_lib_gstapp_0_10_gst_app_buffer_new" >&6; } if test "x$ac_cv_lib_gstapp_0_10_gst_app_buffer_new" = xyes; then : - GSTREAMER_LIBS="$ac_gst_libs" - - GSTREAMER_INCL="$ac_gst_incl" - + : fi fi @@ -11251,10 +11267,11 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi +else + GSTREAMER_CFLAGS="" fi - fi CPPFLAGS="$ac_save_CPPFLAGS" fi if test "x$ac_cv_lib_gstapp_0_10_gst_app_buffer_new" != xyes -a "x$ac_cv_header_QuickTime_ImageCompression_h" != xyes; then : diff --git a/configure.ac b/configure.ac index ed5fb80..97da660 100644 --- a/configure.ac +++ b/configure.ac @@ -1536,28 +1536,26 @@ dnl **** Check for gstreamer **** if test "x$with_gstreamer" != "xno" then ac_save_CPPFLAGS="$CPPFLAGS" - if test "$PKG_CONFIG" != "false"; then - ac_gst_incl="" - for i in `$PKG_CONFIG --cflags gstreamer-app-0.10 2>/dev/null` - do - case "$i" in - -I*) ac_gst_incl="$ac_gst_incl $i";; - esac - done - ac_gst_libs="`$PKG_CONFIG --libs gstreamer-app-0.10 2>/dev/null`" - CPPFLAGS="$CPPFLAGS $ac_gst_incl" - AC_CHECK_HEADER([gst/gstpad.h], - [AC_CHECK_HEADER([gst/app/gstappsink.h], + WINE_PACKAGE_FLAGS(GSTREAMER,[gstreamer-app-0.10]) + ac_gst_incl="" + for i in $GSTREAMER_CFLAGS + do + case "$i" in + -I*) ac_gst_incl="$ac_gst_incl $i";; + esac + done + GSTREAMER_CFLAGS=$ac_gst_incl + CPPFLAGS="$ac_save_CPPFLAGS $GSTREAMER_CFLAGS" + AC_CHECK_HEADER([gst/gstpad.h], + [AC_CHECK_HEADER([gst/app/gstappsink.h], [AC_MSG_CHECKING([whether gint64 defined by gst/app/gstappsink.h is indeed 64-bit]) AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <gst/app/gstappsink.h>]], [[static int a[sizeof(gint64) > 4 ? 1 : -1]; if (a[0]) return 0;]])], [AC_MSG_RESULT([yes]) AC_CHECK_LIB(gstreamer-0.10,gst_pad_get_caps_reffed, - [AC_CHECK_LIB(gstapp-0.10,gst_app_buffer_new, - [AC_SUBST(GSTREAMER_LIBS,"$ac_gst_libs") - AC_SUBST(GSTREAMER_INCL,"$ac_gst_incl")],,[$ac_gst_libs])])], - [AC_MSG_RESULT([no])])])]) - fi + [AC_CHECK_LIB(gstapp-0.10,gst_app_buffer_new,[:],,[$GSTREAMER_LIBS])])], + [AC_MSG_RESULT([no])])])], + [GSTREAMER_CFLAGS=""]) CPPFLAGS="$ac_save_CPPFLAGS" fi WINE_NOTICE_WITH(gstreamer,[test "x$ac_cv_lib_gstapp_0_10_gst_app_buffer_new" != xyes -a "x$ac_cv_header_QuickTime_ImageCompression_h" != xyes], diff --git a/dlls/winegstreamer/Makefile.in b/dlls/winegstreamer/Makefile.in index f6695be..db3a0e5 100644 --- a/dlls/winegstreamer/Makefile.in +++ b/dlls/winegstreamer/Makefile.in @@ -1,6 +1,6 @@ MODULE = winegstreamer.dll IMPORTS = strmbase strmiids uuid winmm msacm32 msvfw32 ole32 oleaut32 user32 gdi32 advapi32 -EXTRAINCL = @GSTREAMER_INCL@ +EXTRAINCL = @GSTREAMER_CFLAGS@ EXTRALIBS = @GSTREAMER_LIBS@ @LIBPTHREAD@ C_SRCS = \

1 0

Alexandre Julliard : configure: Use the pkg-config helper macro for freetype.
by Alexandre Julliard May 3, 2013

May 3, 2013

Module: wine Branch: master Commit: 100806e4730db80d36579bc11ec9a93e591db362 URL: http://source.winehq.org/git/wine.git/?a=commit;h=100806e4730db80d36579bc11… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 3 17:31:23 2013 +0200 configure: Use the pkg-config helper macro for freetype. --- configure | 94 +++++++++++++++--------------------------------- configure.ac | 33 +++++++---------- dlls/gdi32/Makefile.in | 2 +- tools/Makefile.in | 4 +- 4 files changed, 45 insertions(+), 88 deletions(-) diff --git a/configure b/configure index d4daacb..e384ef2 100755 --- a/configure +++ b/configure @@ -650,9 +650,8 @@ GSTREAMER_INCL GSTREAMER_LIBS LIBGETTEXTPO ZLIB -FREETYPEINCL -FREETYPELIBS -ft_devel +FREETYPE_LIBS +FREETYPE_CFLAGS LCMSLIBS RESOLVLIBS GPHOTO2_LIBS @@ -874,7 +873,9 @@ GNUTLS_LIBS SANE_CFLAGS SANE_LIBS GPHOTO2_CFLAGS -GPHOTO2_LIBS' +GPHOTO2_LIBS +FREETYPE_CFLAGS +FREETYPE_LIBS' # Initialize some variables set by options. @@ -1579,6 +1580,10 @@ Some influential environment variables: C compiler flags for libgphoto2, overriding pkg-config GPHOTO2_LIBS Linker flags for libgphoto2, overriding pkg-config + FREETYPE_CFLAGS + C compiler flags for freetype2, overriding pkg-config + FREETYPE_LIBS + Linker flags for freetype2, 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. @@ -10809,68 +10814,28 @@ fi if test "x$with_freetype" != "xno" then - if test "$PKG_CONFIG" != "false" - then - ac_freetype_incl="`$PKG_CONFIG --cflags freetype2 2>/dev/null`" - ac_freetype_libs="`$PKG_CONFIG --libs freetype2 2>/dev/null`" - else - for ac_prog in freetype-config freetype2-config -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; 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_ft_devel+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ft_devel"; then - ac_cv_prog_ft_devel="$ft_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_ft_devel="$ac_prog" - $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 + ac_save_CPPFLAGS="$CPPFLAGS" + if test -n "$FREETYPE_CFLAGS"; then : +elif test -n "$PKG_CONFIG"; then : + FREETYPE_CFLAGS=`$PKG_CONFIG --cflags freetype2 2>/dev/null` fi -fi -ft_devel=$ac_cv_prog_ft_devel -if test -n "$ft_devel"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ft_devel" >&5 -$as_echo "$ft_devel" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - test -n "$ft_devel" && break -done -test -n "$ft_devel" || ft_devel="no" +FREETYPE_CFLAGS=${FREETYPE_CFLAGS:-`(freetype-config --cflags || freetype2-config --cflags) 2>/dev/null`} +CPPFLAGS="$CPPFLAGS $FREETYPE_CFLAGS" +if test -n "$FREETYPE_LIBS"; then : - if test "$ft_devel" != "no" - then - ac_freetype_incl=`$ft_devel --cflags` - ac_freetype_libs=`$ft_devel --libs` - fi - fi - ac_freetype_libs=${ac_freetype_libs:-"-lfreetype"} +elif test -n "$PKG_CONFIG"; then : + FREETYPE_LIBS=`$PKG_CONFIG --libs freetype2 2>/dev/null` +fi +FREETYPE_LIBS=${FREETYPE_LIBS:-`(freetype-config --libs || freetype2-config --libs) 2>/dev/null`} +FREETYPE_LIBS=${FREETYPE_LIBS:-"-lfreetype"} { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -lfreetype" >&5 $as_echo_n "checking for -lfreetype... " >&6; } if ${ac_cv_lib_soname_freetype+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_soname_save_LIBS=$LIBS -LIBS="-lfreetype $ac_freetype_libs $LIBS" +LIBS="-lfreetype $FREETYPE_LIBS $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -10919,8 +10884,6 @@ _ACEOF fi if test "$ft_lib" = "yes" then - ac_save_CPPFLAGS="$CPPFLAGS" - CPPFLAGS="$ac_freetype_incl $CPPFLAGS" for ac_header in ft2build.h \ freetype/freetype.h \ freetype/ftglyph.h \ @@ -10977,21 +10940,22 @@ fi $as_echo "#define HAVE_FREETYPE 1" >>confdefs.h - FREETYPELIBS="$ac_freetype_libs" - - FREETYPEINCL="$ac_freetype_incl" - + else + FREETYPE_LIBS="" fi + else + FREETYPE_LIBS="" fi + CPPFLAGS="$ac_save_CPPFLAGS" fi -if test "x$FREETYPELIBS" = "x"; then : +if test "x$ac_cv_header_freetype_freetype_h" != xyes -o "x$wine_cv_fttrigon" != xyes; then : case "x$with_freetype" in xno) ;; *) as_fn_error $? "FreeType ${notice_platform}development files not found. Fonts will not be built. Use the --without-freetype option if you really want this." "$LINENO" 5 ;; esac fi -test "x$FREETYPELIBS" = "x" && enable_fonts=${enable_fonts:-no} +test "x$ac_cv_header_freetype_freetype_h" = xyes -a "x$wine_cv_fttrigon" = xyes || enable_fonts=${enable_fonts:-no} { $as_echo "$as_me:${as_lineno-$LINENO}: checking for parport header/ppdev.h" >&5 $as_echo_n "checking for parport header/ppdev.h... " >&6; } diff --git a/configure.ac b/configure.ac index 6d006d0..ed5fb80 100644 --- a/configure.ac +++ b/configure.ac @@ -1448,24 +1448,13 @@ WINE_NOTICE_WITH(cms,[test "$ac_cv_lib_lcms_cmsOpenProfileFromFile" != "yes"], dnl **** Check for FreeType 2 **** if test "x$with_freetype" != "xno" then - if test "$PKG_CONFIG" != "false" - then - ac_freetype_incl="`$PKG_CONFIG --cflags freetype2 2>/dev/null`" - ac_freetype_libs="`$PKG_CONFIG --libs freetype2 2>/dev/null`" - else - AC_CHECK_PROGS(ft_devel,[freetype-config freetype2-config],no) - if test "$ft_devel" != "no" - then - ac_freetype_incl=`$ft_devel --cflags` - ac_freetype_libs=`$ft_devel --libs` - fi - fi - ac_freetype_libs=${ac_freetype_libs:-"-lfreetype"} - WINE_CHECK_SONAME(freetype,FT_Init_FreeType,[ft_lib=yes],[ft_lib=no],[$ac_freetype_libs]) + ac_save_CPPFLAGS="$CPPFLAGS" + WINE_PACKAGE_FLAGS(FREETYPE,[freetype2],[-lfreetype], + [(freetype-config --cflags || freetype2-config --cflags)], + [(freetype-config --libs || freetype2-config --libs)]) + WINE_CHECK_SONAME(freetype,FT_Init_FreeType,[ft_lib=yes],[ft_lib=no],[$FREETYPE_LIBS]) if test "$ft_lib" = "yes" then - ac_save_CPPFLAGS="$CPPFLAGS" - CPPFLAGS="$ac_freetype_incl $CPPFLAGS" AC_CHECK_HEADERS(ft2build.h \ freetype/freetype.h \ freetype/ftglyph.h \ @@ -1489,13 +1478,17 @@ then if test "$ac_cv_header_freetype_freetype_h" = "yes" -a "$wine_cv_fttrigon" = "yes" then AC_DEFINE(HAVE_FREETYPE, 1, [Define if FreeType 2 is installed]) - AC_SUBST(FREETYPELIBS,"$ac_freetype_libs") - AC_SUBST(FREETYPEINCL,"$ac_freetype_incl") + else + FREETYPE_LIBS="" fi + else + FREETYPE_LIBS="" fi + CPPFLAGS="$ac_save_CPPFLAGS" fi -WINE_ERROR_WITH(freetype,[test "x$FREETYPELIBS" = "x"],[FreeType ${notice_platform}development files not found. Fonts will not be built.]) -test "x$FREETYPELIBS" = "x" && enable_fonts=${enable_fonts:-no} +WINE_ERROR_WITH(freetype,[test "x$ac_cv_header_freetype_freetype_h" != xyes -o "x$wine_cv_fttrigon" != xyes], + [FreeType ${notice_platform}development files not found. Fonts will not be built.]) +test "x$ac_cv_header_freetype_freetype_h" = xyes -a "x$wine_cv_fttrigon" = xyes || enable_fonts=${enable_fonts:-no} dnl **** Check for parport (currently Linux only) **** AC_CACHE_CHECK([for parport header/ppdev.h], ac_cv_c_ppdev, diff --git a/dlls/gdi32/Makefile.in b/dlls/gdi32/Makefile.in index ea1b159..f4661da 100644 --- a/dlls/gdi32/Makefile.in +++ b/dlls/gdi32/Makefile.in @@ -2,7 +2,7 @@ EXTRADEFS = -D_GDI32_ MODULE = gdi32.dll IMPORTLIB = gdi32 IMPORTS = advapi32 -EXTRAINCL = @FREETYPEINCL@ @FONTCONFIGINCL@ +EXTRAINCL = @FREETYPE_CFLAGS@ @FONTCONFIGINCL@ EXTRALIBS = @CARBONLIB@ DELAYIMPORTS = usp10 diff --git a/tools/Makefile.in b/tools/Makefile.in index 975d2a7..f26bd72 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -1,6 +1,6 @@ DEFS = -D__WINESRC__ $(EXTRADEFS) -EXTRAINCL = @FREETYPEINCL@ -FREETYPELIBS = @FREETYPELIBS@ +EXTRAINCL = @FREETYPE_CFLAGS@ +FREETYPELIBS = @FREETYPE_LIBS@ PROGRAMS = \ fnt2fon$(EXEEXT) \

1 0

Alexandre Julliard : configure: Use the pkg-config helper macro for gphoto2 .
by Alexandre Julliard May 3, 2013

May 3, 2013

Module: wine Branch: master Commit: f54b85817b3a835b4bef5bd49ad0bc14e778b6af URL: http://source.winehq.org/git/wine.git/?a=commit;h=f54b85817b3a835b4bef5bd49… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 3 17:18:13 2013 +0200 configure: Use the pkg-config helper macro for gphoto2. --- configure | 120 +++++++++---------------------------------- configure.ac | 27 +++------- dlls/gphoto2.ds/Makefile.in | 4 +- 3 files changed, 33 insertions(+), 118 deletions(-) diff --git a/configure b/configure index f036eae..d4daacb 100755 --- a/configure +++ b/configure @@ -655,10 +655,8 @@ FREETYPELIBS ft_devel LCMSLIBS RESOLVLIBS -GPHOTO2INCL -GPHOTO2LIBS -gphoto2port_devel -gphoto2_devel +GPHOTO2_LIBS +GPHOTO2_CFLAGS SANE_LIBS SANE_CFLAGS GNUTLS_LIBS @@ -874,7 +872,9 @@ HAL_LIBS GNUTLS_CFLAGS GNUTLS_LIBS SANE_CFLAGS -SANE_LIBS' +SANE_LIBS +GPHOTO2_CFLAGS +GPHOTO2_LIBS' # Initialize some variables set by options. @@ -1575,6 +1575,10 @@ Some influential environment variables: 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 + GPHOTO2_CFLAGS + C compiler flags for libgphoto2, overriding pkg-config + GPHOTO2_LIBS + Linker flags for libgphoto2, 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. @@ -10633,96 +10637,20 @@ fi if test "x$with_gphoto" != "xno" then ac_save_CPPFLAGS="$CPPFLAGS" - # Extract the first word of "gphoto2-config", so it can be a program name with args. -set dummy gphoto2-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_gphoto2_devel+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$gphoto2_devel"; then - ac_cv_prog_gphoto2_devel="$gphoto2_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_gphoto2_devel="gphoto2-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 "$GPHOTO2_CFLAGS"; then : - test -z "$ac_cv_prog_gphoto2_devel" && ac_cv_prog_gphoto2_devel="no" -fi -fi -gphoto2_devel=$ac_cv_prog_gphoto2_devel -if test -n "$gphoto2_devel"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gphoto2_devel" >&5 -$as_echo "$gphoto2_devel" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } +elif test -n "$PKG_CONFIG"; then : + GPHOTO2_CFLAGS=`$PKG_CONFIG --cflags libgphoto2 2>/dev/null` fi +GPHOTO2_CFLAGS=${GPHOTO2_CFLAGS:-`(gphoto2-config --cflags || gphoto2-port-config --cflags) 2>/dev/null`} +CPPFLAGS="$CPPFLAGS $GPHOTO2_CFLAGS" +if test -n "$GPHOTO2_LIBS"; then : - - # Extract the first word of "gphoto2-port-config", so it can be a program name with args. -set dummy gphoto2-port-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_gphoto2port_devel+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$gphoto2port_devel"; then - ac_cv_prog_gphoto2port_devel="$gphoto2port_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_gphoto2port_devel="gphoto2-port-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 - - test -z "$ac_cv_prog_gphoto2port_devel" && ac_cv_prog_gphoto2port_devel="no" -fi -fi -gphoto2port_devel=$ac_cv_prog_gphoto2port_devel -if test -n "$gphoto2port_devel"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gphoto2port_devel" >&5 -$as_echo "$gphoto2port_devel" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } +elif test -n "$PKG_CONFIG"; then : + GPHOTO2_LIBS=`$PKG_CONFIG --libs libgphoto2 2>/dev/null` fi - - - if test "$gphoto2_devel" != "no" -a "$gphoto2port_devel" != "no" - then - ac_gphoto2_incl="`$gphoto2_devel --cflags` `$gphoto2port_devel --cflags`" - ac_gphoto2_libs="" - for i in `$gphoto2_devel --libs` `$gphoto2port_devel --libs` - do - case "$i" in - -L/usr/lib|-L/usr/lib64) ;; - -L*|-l*) ac_gphoto2_libs="$ac_gphoto2_libs $i";; - esac - done - CPPFLAGS="$CPPFLAGS $ac_gphoto2_incl" - fi - ac_gphoto2_libs=${ac_gphoto2_libs:-"-lgphoto2"} +GPHOTO2_LIBS=${GPHOTO2_LIBS:-`(gphoto2-config --libs || gphoto2-port-config --libs) 2>/dev/null`} +GPHOTO2_LIBS=${GPHOTO2_LIBS:-"-lgphoto2"} ac_fn_c_check_header_mongrel "$LINENO" "gphoto2-camera.h" "ac_cv_header_gphoto2_camera_h" "$ac_includes_default" if test "x$ac_cv_header_gphoto2_camera_h" = xyes; then : { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gp_camera_new in -lgphoto2" >&5 @@ -10731,7 +10659,7 @@ if ${ac_cv_lib_gphoto2_gp_camera_new+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lgphoto2 $ac_gphoto2_libs $LIBS" +LIBS="-lgphoto2 $GPHOTO2_LIBS $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -10765,12 +10693,12 @@ if test "x$ac_cv_lib_gphoto2_gp_camera_new" = xyes; then : $as_echo "#define HAVE_GPHOTO2 1" >>confdefs.h - GPHOTO2LIBS="$ac_gphoto2_libs" - - GPHOTO2INCL="$ac_gphoto2_incl" - +else + GPHOTO2_LIBS=""; GPHOTO2_CFLAGS="" fi +else + GPHOTO2_LIBS=""; GPHOTO2_CFLAGS="" fi diff --git a/configure.ac b/configure.ac index 0df10a6..6d006d0 100644 --- a/configure.ac +++ b/configure.ac @@ -1399,28 +1399,15 @@ dnl **** Check for libgphoto2 **** if test "x$with_gphoto" != "xno" then ac_save_CPPFLAGS="$CPPFLAGS" - AC_CHECK_PROG(gphoto2_devel,gphoto2-config,gphoto2-config,no) - AC_CHECK_PROG(gphoto2port_devel,gphoto2-port-config,gphoto2-port-config,no) - if test "$gphoto2_devel" != "no" -a "$gphoto2port_devel" != "no" - then - ac_gphoto2_incl="`$gphoto2_devel --cflags` `$gphoto2port_devel --cflags`" - ac_gphoto2_libs="" - for i in `$gphoto2_devel --libs` `$gphoto2port_devel --libs` - do - case "$i" in - -L/usr/lib|-L/usr/lib64) ;; - -L*|-l*) ac_gphoto2_libs="$ac_gphoto2_libs $i";; - esac - done - CPPFLAGS="$CPPFLAGS $ac_gphoto2_incl" - fi - ac_gphoto2_libs=${ac_gphoto2_libs:-"-lgphoto2"} + WINE_PACKAGE_FLAGS(GPHOTO2,[libgphoto2],[-lgphoto2], + [(gphoto2-config --cflags || gphoto2-port-config --cflags)], + [(gphoto2-config --libs || gphoto2-port-config --libs)]) AC_CHECK_HEADER(gphoto2-camera.h, [AC_CHECK_LIB(gphoto2,gp_camera_new, - [AC_DEFINE(HAVE_GPHOTO2, 1, [Define if we have libgphoto2 development environment]) - AC_SUBST(GPHOTO2LIBS,"$ac_gphoto2_libs") - AC_SUBST(GPHOTO2INCL,"$ac_gphoto2_incl")],, - [$ac_gphoto2_libs])]) + [AC_DEFINE(HAVE_GPHOTO2, 1, [Define if we have libgphoto2 development environment])], + [GPHOTO2_LIBS=""; GPHOTO2_CFLAGS=""], + [$GPHOTO2_LIBS])], + [GPHOTO2_LIBS=""; GPHOTO2_CFLAGS=""]) CPPFLAGS="$ac_save_CPPFLAGS" fi WINE_NOTICE_WITH(gphoto,[test "$ac_cv_lib_gphoto2_gp_camera_new" != "yes"], diff --git a/dlls/gphoto2.ds/Makefile.in b/dlls/gphoto2.ds/Makefile.in index d7186e9..e77de86 100644 --- a/dlls/gphoto2.ds/Makefile.in +++ b/dlls/gphoto2.ds/Makefile.in @@ -1,7 +1,7 @@ MODULE = gphoto2.ds IMPORTS = comctl32 user32 gdi32 advapi32 -EXTRALIBS = @GPHOTO2LIBS@ -EXTRAINCL = @GPHOTO2INCL@ +EXTRALIBS = @GPHOTO2_LIBS@ +EXTRAINCL = @GPHOTO2_CFLAGS@ C_SRCS = \ capability.c \

1 0

Piotr Caban : wininet: Handle NULL req-> netconn in INTERNET_DIAGNOSTIC_SOCKET_INFO query.
by Alexandre Julliard May 3, 2013

May 3, 2013

Module: wine Branch: master Commit: dd35601b0773e3ff1bb206edfd2eef2a004724b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd35601b0773e3ff1bb206edf… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri May 3 15:19:11 2013 +0200 wininet: Handle NULL req->netconn in INTERNET_DIAGNOSTIC_SOCKET_INFO query. --- dlls/wininet/http.c | 2 +- dlls/wininet/tests/http.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 94b63c8..e160d04 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1997,7 +1997,7 @@ static DWORD HTTPREQ_QueryOption(object_header_t *hdr, DWORD option, void *buffe info->Flags |= IDSI_FLAG_KEEP_ALIVE; if (req->proxy) info->Flags |= IDSI_FLAG_PROXY; - if (req->netconn->secure) + if (req->netconn && req->netconn->secure) info->Flags |= IDSI_FLAG_SECURE; return ERROR_SUCCESS; diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 5f0bf43..bfa215b 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -3249,6 +3249,7 @@ static void test_HttpQueryInfo(int port) static void test_options(int port) { + INTERNET_DIAGNOSTIC_SOCKET_INFO idsi; HINTERNET ses, con, req; DWORD size, error; DWORD_PTR ctx; @@ -3349,6 +3350,10 @@ static void test_options(int port) ok(ret, "InternetQueryOption failed %u\n", GetLastError()); ok(ctx == 3, "expected 3 got %lu\n", ctx); + size = sizeof(idsi); + ret = InternetQueryOption(req, INTERNET_OPTION_DIAGNOSTIC_SOCKET_INFO, &idsi, &size); + ok(ret, "InternetQueryOption failed %u\n", GetLastError()); + /* INTERNET_OPTION_PROXY */ SetLastError(0xdeadbeef); ret = InternetQueryOptionA(ses, INTERNET_OPTION_PROXY, NULL, NULL);

1 0