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

Rob Shearman : secur32: Don' t free the password in InitializeSecurityContextW to enable the credentials handle to be re-used in further InitializeSecurityContextW calls .
by Alexandre Julliard July 3, 2007

July 3, 2007

Module: wine Branch: master Commit: 2ede1370d35757857b0c8141ff7de6e2e9682fd3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ede1370d35757857b0c8141f… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Jul 2 19:45:03 2007 +0100 secur32: Don't free the password in InitializeSecurityContextW to enable the credentials handle to be re-used in further InitializeSecurityContextW calls. --- dlls/secur32/ntlm.c | 15 +++------------ 1 files changed, 3 insertions(+), 12 deletions(-) diff --git a/dlls/secur32/ntlm.c b/dlls/secur32/ntlm.c index 4c7f3b4..890c74a 100644 --- a/dlls/secur32/ntlm.c +++ b/dlls/secur32/ntlm.c @@ -524,12 +524,7 @@ static SECURITY_STATUS SEC_ENTRY ntlm_InitializeSecurityContextW( if((ret = encodeBase64((unsigned char*)helper->password, helper->pwlen, buffer+3, max_len-3, &buffer_len)) != SEC_E_OK) - { - TRACE("Deleting password!\n"); - memset(helper->password, 0, helper->pwlen); - HeapFree(GetProcessHeap(), 0, helper->password); goto isc_end; - } } @@ -770,13 +765,6 @@ static SECURITY_STATUS SEC_ENTRY ntlm_InitializeSecurityContextW( helper->crypt.ntlm2.recv_seq_no = 0l; } - if(ret != SEC_I_CONTINUE_NEEDED) - { - TRACE("Deleting password!\n"); - if(helper->password) - memset(helper->password, 0, helper->pwlen); - HeapFree(GetProcessHeap(), 0, helper->password); - } isc_end: HeapFree(GetProcessHeap(), 0, want_flags); HeapFree(GetProcessHeap(), 0, buffer); @@ -1515,6 +1503,9 @@ static SECURITY_STATUS SEC_ENTRY ntlm_FreeCredentialsHandle( PNegoHelper helper = (PNegoHelper) phCredential->dwLower; phCredential->dwUpper = 0; phCredential->dwLower = 0; + if (helper->password) + memset(helper->password, 0, helper->pwlen); + HeapFree(GetProcessHeap(), 0, helper->password); cleanup_helper(helper); ret = SEC_E_OK; }

1 0

Alexandre Julliard : configure: Make the libjpeg soname check depend on the header check.
by Alexandre Julliard July 3, 2007

July 3, 2007

Module: wine Branch: master Commit: d0fddf4f684569172457eb904c001f1d71dfbb2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0fddf4f684569172457eb904… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 2 19:53:14 2007 +0200 configure: Make the libjpeg soname check depend on the header check. --- configure | 160 ++++++++++++++++++++++--------------------- configure.ac | 7 ++- dlls/gphoto2.ds/ds_image.c | 4 - dlls/gphoto2.ds/gphoto2_i.h | 9 +-- dlls/oleaut32/olepicture.c | 11 +-- 5 files changed, 95 insertions(+), 96 deletions(-) diff --git a/configure b/configure index 97208d2..f25fbe6 100755 --- a/configure +++ b/configure @@ -13988,6 +13988,88 @@ fi fi +if test "$ac_cv_header_jpeglib_h" = "yes" +then + { echo "$as_me:$LINENO: checking for -ljpeg" >&5 +echo $ECHO_N "checking for -ljpeg... $ECHO_C" >&6; } +if test "${ac_cv_lib_soname_jpeg+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_soname_save_LIBS=$LIBS +LIBS="-ljpeg $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 jpeg_start_decompress (); +int +main () +{ +return jpeg_start_decompress (); + ; + 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_jpeg=`otool -L conftest$ac_exeext | grep "libjpeg\\.[0-9A-Za-z.]*dylib" | sed -e "s/^.*\/$libjpeg\.[0-9A-Za-z.]*dylib$.*$/\1/"';2,$d'` ;; + *) ac_cv_lib_soname_jpeg=`$ac_cv_path_LDD conftest$ac_exeext | grep "libjpeg\\.$LIBEXT" | sed -e "s/^.*$libjpeg\.$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_jpeg" = "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_jpeg" >&5 +echo "${ECHO_T}$ac_cv_lib_soname_jpeg" >&6; } + +cat >>confdefs.h <<_ACEOF +#define SONAME_LIBJPEG "$ac_cv_lib_soname_jpeg" +_ACEOF + + +fi + +fi + EXTRACFLAGS="" @@ -15478,84 +15560,6 @@ _ACEOF fi -{ echo "$as_me:$LINENO: checking for -ljpeg" >&5 -echo $ECHO_N "checking for -ljpeg... $ECHO_C" >&6; } -if test "${ac_cv_lib_soname_jpeg+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_soname_save_LIBS=$LIBS -LIBS="-ljpeg $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 jpeg_start_decompress (); -int -main () -{ -return jpeg_start_decompress (); - ; - 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_jpeg=`otool -L conftest$ac_exeext | grep "libjpeg\\.[0-9A-Za-z.]*dylib" | sed -e "s/^.*\/$libjpeg\.[0-9A-Za-z.]*dylib$.*$/\1/"';2,$d'` ;; - *) ac_cv_lib_soname_jpeg=`$ac_cv_path_LDD conftest$ac_exeext | grep "libjpeg\\.$LIBEXT" | sed -e "s/^.*$libjpeg\.$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_jpeg" = "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_jpeg" >&5 -echo "${ECHO_T}$ac_cv_lib_soname_jpeg" >&6; } - -cat >>confdefs.h <<_ACEOF -#define SONAME_LIBJPEG "$ac_cv_lib_soname_jpeg" -_ACEOF - - -fi - diff --git a/configure.ac b/configure.ac index bd64583..d4e4f12 100644 --- a/configure.ac +++ b/configure.ac @@ -992,6 +992,12 @@ then WINE_CHECK_SONAME(crypto,BIO_new_socket) fi +dnl **** Check for libjpeg **** +if test "$ac_cv_header_jpeglib_h" = "yes" +then + WINE_CHECK_SONAME(jpeg,jpeg_start_decompress) +fi + dnl **** Check for gcc specific options **** AC_SUBST(EXTRACFLAGS,"") @@ -1140,7 +1146,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(jpeg,jpeg_start_decompress) dnl **** Check for functions **** diff --git a/dlls/gphoto2.ds/ds_image.c b/dlls/gphoto2.ds/ds_image.c index e59c978..4196813 100644 --- a/dlls/gphoto2.ds/ds_image.c +++ b/dlls/gphoto2.ds/ds_image.c @@ -47,10 +47,6 @@ MAKE_FUNCPTR(jpeg_finish_decompress); MAKE_FUNCPTR(jpeg_destroy_decompress); #undef MAKE_FUNCPTR -#ifndef SONAME_LIBJPEG -#define SONAME_LIBJPEG "libjpeg" SONAME_EXT -#endif - static void *load_libjpeg(void) { if((libjpeg_handle = wine_dlopen(SONAME_LIBJPEG, RTLD_NOW, NULL, 0)) != NULL) { diff --git a/dlls/gphoto2.ds/gphoto2_i.h b/dlls/gphoto2.ds/gphoto2_i.h index 7167171..265da49 100644 --- a/dlls/gphoto2.ds/gphoto2_i.h +++ b/dlls/gphoto2.ds/gphoto2_i.h @@ -24,7 +24,7 @@ # error You must include config.h first #endif -#if defined(HAVE_GPHOTO2) && !defined(HAVE_JPEGLIB_H) +#if defined(HAVE_GPHOTO2) && !defined(SONAME_LIBJPEG) # warning "gphoto2 support in twain needs jpeg development headers" # undef HAVE_GPHOTO2 #endif @@ -38,7 +38,7 @@ #include <stdio.h> -#ifdef HAVE_JPEGLIB_H +#ifdef SONAME_LIBJPEG /* This is a hack, so jpeglib.h does not redefine INT32 and the like*/ # define XMD_H # define UINT8 JPEG_UINT8 @@ -46,9 +46,6 @@ # undef FAR # include <jpeglib.h> # undef UINT16 -# ifndef SONAME_LIBJPEG -# define SONAME_LIBJPEG "libjpeg" SONAME_EXT -# endif #endif #include <stdarg.h> @@ -96,7 +93,7 @@ struct tagActiveDS #ifdef HAVE_GPHOTO2 CameraFile *file; #endif -#ifdef HAVE_JPEGLIB_H +#ifdef SONAME_LIBJPEG struct jpeg_source_mgr xjsm; struct jpeg_decompress_struct jd; struct jpeg_error_mgr jerr; diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c index c2f32e4..3fb5611 100644 --- a/dlls/oleaut32/olepicture.c +++ b/dlls/oleaut32/olepicture.c @@ -67,7 +67,7 @@ #include "wine/wingdi16.h" -#ifdef HAVE_JPEGLIB_H +#ifdef SONAME_LIBJPEG /* This is a hack, so jpeglib.h does not redefine INT32 and the like*/ #define XMD_H #define UINT8 JPEG_UINT8 @@ -77,9 +77,6 @@ # include <jpeglib.h> #undef jpeg_boolean #undef UINT16 -#ifndef SONAME_LIBJPEG -#define SONAME_LIBJPEG "libjpeg" SONAME_EXT -#endif #endif #include "ungif.h" @@ -937,7 +934,7 @@ static HRESULT WINAPI OLEPictureImpl_IsDirty( return E_NOTIMPL; } -#ifdef HAVE_JPEGLIB_H +#ifdef SONAME_LIBJPEG static void *libjpeg_handle; #define MAKE_FUNCPTR(f) static typeof(f) * p##f @@ -991,7 +988,7 @@ static boolean _jpeg_resync_to_restart(j_decompress_ptr cinfo, int desired) { return FALSE; } static void _jpeg_term_source(j_decompress_ptr cinfo) { } -#endif /* HAVE_JPEGLIB_H */ +#endif /* SONAME_LIBJPEG */ struct gifdata { unsigned char *data; @@ -1210,7 +1207,7 @@ static HRESULT OLEPictureImpl_LoadGif(OLEPictureImpl *This, BYTE *xbuf, ULONG xr static HRESULT OLEPictureImpl_LoadJpeg(OLEPictureImpl *This, BYTE *xbuf, ULONG xread) { -#ifdef HAVE_JPEGLIB_H +#ifdef SONAME_LIBJPEG struct jpeg_decompress_struct jd; struct jpeg_error_mgr jerr; int ret;

1 0

Evan Stade : oleaut32: Save load time format of pictures.
by Alexandre Julliard July 3, 2007

July 3, 2007

Module: wine Branch: master Commit: 72e20d8f57980586dc3745b6fd53e47c84d4faca URL: http://source.winehq.org/git/wine.git/?a=commit;h=72e20d8f57980586dc3745b6f… Author: Evan Stade <estade(a)gmail.com> Date: Tue Jun 19 13:15:46 2007 -0700 oleaut32: Save load time format of pictures. --- dlls/oleaut32/olepicture.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c index 516b7f9..01e766d 100644 --- a/dlls/oleaut32/olepicture.c +++ b/dlls/oleaut32/olepicture.c @@ -1765,6 +1765,8 @@ static HRESULT WINAPI OLEPictureImpl_Load(IPersistStream* iface,IStream*pStm) { */ magic = xbuf[0] + (xbuf[1]<<8); + This->loadtime_format = magic; + switch (magic) { case 0x4947: /* GIF */ hr = OLEPictureImpl_LoadGif(This, xbuf, xread);

1 0

Ben Hodgetts : ws2_32: Don' t tell users to run Wine as root when sockets not creatable.
by Alexandre Julliard July 3, 2007

July 3, 2007

Module: wine Branch: master Commit: f438e524e780ed40a070b7a27667031d4536b322 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f438e524e780ed40a070b7a27… Author: Ben Hodgetts <ben(a)atomnet.co.uk> Date: Sat Jun 30 00:27:59 2007 +0100 ws2_32: Don't tell users to run Wine as root when sockets not creatable. --- dlls/ws2_32/socket.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index b3f1bae..60c4e44 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3767,9 +3767,11 @@ SOCKET WINAPI WSASocketW(int af, int type, int protocol, if (GetLastError() == WSAEACCES) /* raw socket denied */ { if (type == SOCK_RAW) - MESSAGE("WARNING: Trying to create a socket of type SOCK_RAW, will fail unless running as root\n"); + MESSAGE("WARNING: Trying to create a socket of type SOCK_RAW, this" + " will fail unless you have special permissions.\n"); else - MESSAGE("WS_SOCKET: not enough privileges to create socket, try running as root\n"); + MESSAGE("WS_SOCKET: Failed to create socket, this requires" + " special permissions.\n"); SetLastError(WSAESOCKTNOSUPPORT); }

1 0

Evan Stade : oleaut32: Added support for decoding some PNG files.
by Alexandre Julliard July 3, 2007

July 3, 2007

Module: wine Branch: master Commit: 5c5c5aabc549044e1c200e5932b7c5bd835e84be URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c5c5aabc549044e1c200e593… Author: Evan Stade <estade(a)gmail.com> Date: Tue Jun 19 13:12:57 2007 -0700 oleaut32: Added support for decoding some PNG files. --- dlls/oleaut32/olepicture.c | 198 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 198 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c index 3fb5611..516b7f9 100644 --- a/dlls/oleaut32/olepicture.c +++ b/dlls/oleaut32/olepicture.c @@ -79,6 +79,11 @@ #undef UINT16 #endif +#ifdef HAVE_PNG_H +#undef FAR +#include <png.h> +#endif + #include "ungif.h" WINE_DEFAULT_DEBUG_CHANNEL(ole); @@ -1334,6 +1339,193 @@ static HRESULT OLEPictureImpl_LoadDIB(OLEPictureImpl *This, BYTE *xbuf, ULONG xr return S_OK; } +/***************************************************** +* start of PNG-specific code +* currently only supports colortype PNG_COLOR_TYPE_RGB +*/ +#ifdef SONAME_LIBPNG +typedef struct{ + ULONG position; + ULONG size; + BYTE * buff; +} png_io; + +static void png_stream_read_data(png_structp png_ptr, png_bytep data, + png_size_t length) +{ + png_io * io_ptr = png_ptr->io_ptr; + + if(length + io_ptr->position > io_ptr->size){ + length = io_ptr->size - io_ptr->position; + } + + memcpy(data, io_ptr->buff + io_ptr->position, length); + + io_ptr->position += length; +} + +static void *libpng_handle; +#define MAKE_FUNCPTR(f) static typeof(f) * p##f +MAKE_FUNCPTR(png_create_read_struct); +MAKE_FUNCPTR(png_create_info_struct); +MAKE_FUNCPTR(png_set_read_fn); +MAKE_FUNCPTR(png_read_info); +MAKE_FUNCPTR(png_read_image); +MAKE_FUNCPTR(png_get_rowbytes); +MAKE_FUNCPTR(png_set_bgr); +MAKE_FUNCPTR(png_destroy_read_struct); +MAKE_FUNCPTR(png_set_palette_to_rgb); +MAKE_FUNCPTR(png_read_update_info); +#undef MAKE_FUNCPTR + +static void *load_libpng(void) +{ + if((libpng_handle = wine_dlopen(SONAME_LIBPNG, RTLD_NOW, NULL, 0)) != NULL) { + +#define LOAD_FUNCPTR(f) \ + if((p##f = wine_dlsym(libpng_handle, #f, NULL, 0)) == NULL) { \ + libpng_handle = NULL; \ + return NULL; \ + } + LOAD_FUNCPTR(png_create_read_struct); + LOAD_FUNCPTR(png_create_info_struct); + LOAD_FUNCPTR(png_set_read_fn); + LOAD_FUNCPTR(png_read_info); + LOAD_FUNCPTR(png_read_image); + LOAD_FUNCPTR(png_get_rowbytes); + LOAD_FUNCPTR(png_set_bgr); + LOAD_FUNCPTR(png_destroy_read_struct); + LOAD_FUNCPTR(png_set_palette_to_rgb); + LOAD_FUNCPTR(png_read_update_info); + +#undef LOAD_FUNCPTR + } + return libpng_handle; +} +#endif /* SONAME_LIBPNG */ + +static HRESULT OLEPictureImpl_LoadPNG(OLEPictureImpl *This, BYTE *xbuf, ULONG xread) +{ +#ifdef SONAME_LIBPNG + png_io io; + png_structp png_ptr = NULL; + png_infop info_ptr = NULL; + INT row, rowsize, height, width; + png_bytep* row_pointers = NULL; + png_bytep pngdata = NULL; + BITMAPINFOHEADER bmi; + HDC hdcref = NULL; + HRESULT ret; + BOOL set_bgr = FALSE; + + if(!libpng_handle) { + if(!load_libpng()) { + ERR("Failed reading PNG because unable to find %s\n",SONAME_LIBPNG); + return E_FAIL; + } + } + + io.size = xread; + io.position = 0; + io.buff = xbuf; + + png_ptr = ppng_create_read_struct(PNG_LIBPNG_VER_STRING, + NULL, NULL, NULL); + + if(setjmp(png_jmpbuf(png_ptr))){ + TRACE("Error in libpng\n"); + ret = E_FAIL; + goto pngend; + } + + info_ptr = ppng_create_info_struct(png_ptr); + ppng_set_read_fn(png_ptr, &io, png_stream_read_data); + ppng_read_info(png_ptr, info_ptr); + + if(!(png_ptr->color_type == PNG_COLOR_TYPE_RGB || + png_ptr->color_type == PNG_COLOR_TYPE_PALETTE)){ + FIXME("Unsupported .PNG type: %d\n", png_ptr->color_type); + ret = E_FAIL; + goto pngend; + } + + if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE){ + ppng_set_palette_to_rgb(png_ptr); + set_bgr = TRUE; + } + + if (png_ptr->color_type == PNG_COLOR_TYPE_RGB || + png_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA || + set_bgr){ + ppng_set_bgr(png_ptr); + } + + ppng_read_update_info(png_ptr, info_ptr); + + rowsize = ppng_get_rowbytes(png_ptr, info_ptr); + /* align rowsize to 4-byte boundary */ + rowsize = (rowsize + 3) & ~3; + height = info_ptr->height; + width = info_ptr->width; + + pngdata = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, height * rowsize); + row_pointers = HeapAlloc(GetProcessHeap(), 0, height * (sizeof(VOID *))); + + if(!pngdata || !row_pointers){ + ret = E_FAIL; + goto pngend; + } + + for (row = 0; row < height; row++){ + row_pointers[row] = pngdata + row * rowsize; + } + + ppng_read_image(png_ptr, row_pointers); + + bmi.biSize = sizeof(bmi); + bmi.biWidth = width; + bmi.biHeight = -height; + bmi.biPlanes = 1; + bmi.biBitCount = info_ptr->channels * 8; + bmi.biCompression = BI_RGB; + bmi.biSizeImage = height * rowsize; + bmi.biXPelsPerMeter = 0; + bmi.biYPelsPerMeter = 0; + bmi.biClrUsed = 0; + bmi.biClrImportant = 0; + + hdcref = GetDC(0); + This->desc.u.bmp.hbitmap = CreateDIBitmap( + hdcref, + &bmi, + CBM_INIT, + pngdata, + (BITMAPINFO*)&bmi, + DIB_RGB_COLORS + ); + ReleaseDC(0, hdcref); + This->desc.picType = PICTYPE_BITMAP; + OLEPictureImpl_SetBitmap(This); + ret = S_OK; + +pngend: + if(png_ptr) + ppng_destroy_read_struct(&png_ptr, + (info_ptr ? &info_ptr : (png_infopp) NULL), + (png_infopp)NULL); + HeapFree(GetProcessHeap(), 0, row_pointers); + HeapFree(GetProcessHeap(), 0, pngdata); + return ret; +#else /* SONAME_LIBPNG */ + ERR("Trying to load PNG picture, but PNG supported not compiled in.\n"); + return E_FAIL; +#endif +} + +/***************************************************** +* start of Icon-specific code +*/ + static HRESULT OLEPictureImpl_LoadIcon(OLEPictureImpl *This, BYTE *xbuf, ULONG xread) { HICON hicon; @@ -1583,6 +1775,9 @@ static HRESULT WINAPI OLEPictureImpl_Load(IPersistStream* iface,IStream*pStm) { case 0x4d42: /* Bitmap */ hr = OLEPictureImpl_LoadDIB(This, xbuf, xread); break; + case 0x5089: /* PNG */ + hr = OLEPictureImpl_LoadPNG(This, xbuf, xread); + break; case 0x0000: { /* ICON , first word is dwReserved */ hr = OLEPictureImpl_LoadIcon(This, xbuf, xread); break; @@ -1878,6 +2073,9 @@ static HRESULT WINAPI OLEPictureImpl_Save( case 0x4947: FIXME("(%p,%p,%d), PICTYPE_BITMAP (format GIF) not implemented!\n",This,pStm,fClearDirty); break; + case 0x5089: + FIXME("(%p,%p,%d), PICTYPE_BITMAP (format PNG) not implemented!\n",This,pStm,fClearDirty); + break; default: FIXME("(%p,%p,%d), PICTYPE_BITMAP (format UNKNOWN, using BMP?) not implemented!\n",This,pStm,fClearDirty); break;

1 0

Alexandre Julliard : configure: Added checks for libpng.
by Alexandre Julliard July 3, 2007

July 3, 2007

Module: wine Branch: master Commit: 00302152afc1041b0b053117c700fd70f279f315 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00302152afc1041b0b053117c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 2 19:54:00 2007 +0200 configure: Added checks for libpng. --- configure | 84 +++++++++++++++++++++++++++++++++++++++++++++++++++ configure.ac | 7 ++++ include/config.h.in | 6 ++++ 3 files changed, 97 insertions(+), 0 deletions(-) diff --git a/configure b/configure index f25fbe6..cc67602 100755 --- a/configure +++ b/configure @@ -6820,6 +6820,7 @@ done + for ac_header in \ AudioUnit/AudioUnit.h \ Carbon/Carbon.h \ @@ -6873,6 +6874,7 @@ for ac_header in \ netinet/tcp_fsm.h \ openssl/err.h \ openssl/ssl.h \ + png.h \ poll.h \ process.h \ pthread.h \ @@ -14070,6 +14072,88 @@ fi fi +if test "$ac_cv_header_png_h" = "yes" +then + { echo "$as_me:$LINENO: checking for -lpng" >&5 +echo $ECHO_N "checking for -lpng... $ECHO_C" >&6; } +if test "${ac_cv_lib_soname_png+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_soname_save_LIBS=$LIBS +LIBS="-lpng $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 png_create_read_struct (); +int +main () +{ +return png_create_read_struct (); + ; + 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_png=`otool -L conftest$ac_exeext | grep "libpng[0-9]*\\.[0-9A-Za-z.]*dylib" | sed -e "s/^.*\/$libpng[0-9]*\.[0-9A-Za-z.]*dylib$.*$/\1/"';2,$d'` ;; + *) ac_cv_lib_soname_png=`$ac_cv_path_LDD conftest$ac_exeext | grep "libpng[0-9]*\\.$LIBEXT" | sed -e "s/^.*$libpng[0-9]*\.$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_png" = "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_png" >&5 +echo "${ECHO_T}$ac_cv_lib_soname_png" >&6; } + +cat >>confdefs.h <<_ACEOF +#define SONAME_LIBPNG "$ac_cv_lib_soname_png" +_ACEOF + + +fi + +fi + EXTRACFLAGS="" diff --git a/configure.ac b/configure.ac index d4e4f12..f983e8b 100644 --- a/configure.ac +++ b/configure.ac @@ -209,6 +209,7 @@ AC_CHECK_HEADERS(\ netinet/tcp_fsm.h \ openssl/err.h \ openssl/ssl.h \ + png.h \ poll.h \ process.h \ pthread.h \ @@ -998,6 +999,12 @@ then WINE_CHECK_SONAME(jpeg,jpeg_start_decompress) fi +dnl **** Check for libpng **** +if test "$ac_cv_header_png_h" = "yes" +then + WINE_CHECK_SONAME(png,png_create_read_struct,,,,[[libpng[[0-9]]*]]) +fi + dnl **** Check for gcc specific options **** AC_SUBST(EXTRACFLAGS,"") diff --git a/include/config.h.in b/include/config.h.in index a96a9c3..3cd481f 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -480,6 +480,9 @@ /* Define to 1 if the system has the type `pid_t'. */ #undef HAVE_PID_T +/* Define to 1 if you have the <png.h> header file. */ +#undef HAVE_PNG_H + /* Define to 1 if you have the `poll' function. */ #undef HAVE_POLL @@ -996,6 +999,9 @@ /* Define to the soname of the libncurses library. */ #undef SONAME_LIBNCURSES +/* Define to the soname of the libpng library. */ +#undef SONAME_LIBPNG + /* Define to the soname of the libsane library. */ #undef SONAME_LIBSANE

1 0

Alexandre Julliard : configure: Make the libssl soname check depend on the header check.
by Alexandre Julliard July 3, 2007

July 3, 2007

Module: wine Branch: master Commit: f91909b3b074f5464bd87f1c48e8a768c22422e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f91909b3b074f5464bd87f1c4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 2 17:32:09 2007 +0200 configure: Make the libssl soname check depend on the header check. --- configure | 316 +++++++++++++++++++++--------------------- configure.ac | 9 +- dlls/wininet/netconnection.c | 30 ++--- 3 files changed, 178 insertions(+), 177 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f91909b3b074f5464bd87…

1 0

Alexandre Julliard : configure: Make the libjack soname check depend on the header check.
by Alexandre Julliard July 3, 2007

July 3, 2007

Module: wine Branch: master Commit: 34200c35183b1123807f214d4e27e7c5581b1510 URL: http://source.winehq.org/git/wine.git/?a=commit;h=34200c35183b1123807f214d4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 2 17:31:19 2007 +0200 configure: Make the libjack soname check depend on the header check. --- configure | 160 +++++++++++++++++++++++---------------------- configure.ac | 7 ++- dlls/winejack.drv/audio.c | 6 +- dlls/winejack.drv/jack.c | 10 +-- 4 files changed, 94 insertions(+), 89 deletions(-) diff --git a/configure b/configure index 13e7847..50f0636 100755 --- a/configure +++ b/configure @@ -13664,6 +13664,88 @@ fi fi +if test "$ac_cv_header_jack_jack_h" = "yes" +then + { 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 + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_soname_save_LIBS=$LIBS +LIBS="-ljack $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 jack_client_new (); +int +main () +{ +return jack_client_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_jack=`otool -L conftest$ac_exeext | grep "libjack\\.[0-9A-Za-z.]*dylib" | sed -e "s/^.*\/$libjack\.[0-9A-Za-z.]*dylib$.*$/\1/"';2,$d'` ;; + *) ac_cv_lib_soname_jack=`$ac_cv_path_LDD conftest$ac_exeext | grep "libjack\\.$LIBEXT" | sed -e "s/^.*$libjack\.$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_jack" = "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_jack" >&5 +echo "${ECHO_T}$ac_cv_lib_soname_jack" >&6; } + +cat >>confdefs.h <<_ACEOF +#define SONAME_LIBJACK "$ac_cv_lib_soname_jack" +_ACEOF + + +fi + +fi + EXTRACFLAGS="" @@ -15154,84 +15236,6 @@ _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 - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_soname_save_LIBS=$LIBS -LIBS="-ljack $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 jack_client_new (); -int -main () -{ -return jack_client_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_jack=`otool -L conftest$ac_exeext | grep "libjack\\.[0-9A-Za-z.]*dylib" | sed -e "s/^.*\/$libjack\.[0-9A-Za-z.]*dylib$.*$/\1/"';2,$d'` ;; - *) ac_cv_lib_soname_jack=`$ac_cv_path_LDD conftest$ac_exeext | grep "libjack\\.$LIBEXT" | sed -e "s/^.*$libjack\.$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_jack" = "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_jack" >&5 -echo "${ECHO_T}$ac_cv_lib_soname_jack" >&6; } - -cat >>confdefs.h <<_ACEOF -#define SONAME_LIBJACK "$ac_cv_lib_soname_jack" -_ACEOF - - -fi - { echo "$as_me:$LINENO: checking for -lfontconfig" >&5 echo $ECHO_N "checking for -lfontconfig... $ECHO_C" >&6; } if test "${ac_cv_lib_soname_fontconfig+set}" = set; then diff --git a/configure.ac b/configure.ac index 7deadf5..a142486 100644 --- a/configure.ac +++ b/configure.ac @@ -973,6 +973,12 @@ then WINE_CHECK_SONAME(cups,cupsGetDefault) fi +dnl **** Check for jack **** +if test "$ac_cv_header_jack_jack_h" = "yes" +then + WINE_CHECK_SONAME(jack,jack_client_new) +fi + dnl **** Check for gcc specific options **** AC_SUBST(EXTRACFLAGS,"") @@ -1121,7 +1127,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(jack,jack_client_new) WINE_CHECK_SONAME(fontconfig,FcInit) WINE_CHECK_SONAME(ssl,SSL_library_init) WINE_CHECK_SONAME(crypto,BIO_new_socket) diff --git a/dlls/winejack.drv/audio.c b/dlls/winejack.drv/audio.c index ae5d09c..c266dd6 100644 --- a/dlls/winejack.drv/audio.c +++ b/dlls/winejack.drv/audio.c @@ -63,7 +63,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(wave); -#ifdef HAVE_JACK_JACK_H +#ifdef SONAME_LIBJACK #define MAKE_FUNCPTR(f) static typeof(f) * fp_##f = NULL; @@ -2386,7 +2386,7 @@ DWORD WINAPI JACK_widMessage(WORD wDevID, WORD wMsg, DWORD dwUser, return MMSYSERR_NOTSUPPORTED; } -#else /* !HAVE_JACK_JACK_H */ +#else /* !SONAME_LIBJACK */ /************************************************************************** * widMessage (WINEJACK.6) @@ -2408,4 +2408,4 @@ DWORD WINAPI JACK_wodMessage(WORD wDevID, WORD wMsg, DWORD dwUser, return MMSYSERR_NOTENABLED; } -#endif /* HAVE_JACK_JACK_H */ +#endif /* SONAME_LIBJACK */ diff --git a/dlls/winejack.drv/jack.c b/dlls/winejack.drv/jack.c index fa89115..80794ae 100644 --- a/dlls/winejack.drv/jack.c +++ b/dlls/winejack.drv/jack.c @@ -37,11 +37,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(jack); -#ifdef HAVE_JACK_JACK_H - -#ifndef SONAME_LIBJACK -#define SONAME_LIBJACK "libjack" SONAME_EXT -#endif +#ifdef SONAME_LIBJACK void *jackhandle = NULL; @@ -114,7 +110,7 @@ static LRESULT JACK_drvClose(DWORD_PTR dwDevID) TRACE("(%08lx)\n", dwDevID); return 1; } -#endif /* #ifdef HAVE_JACK_JACK_H */ +#endif /* #ifdef SONAME_LIBJACK */ /************************************************************************** @@ -137,7 +133,7 @@ LRESULT CALLBACK JACK_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg, wMsg, dwParam1, dwParam2); switch(wMsg) { -#ifdef HAVE_JACK_JACK_H +#ifdef SONAME_LIBJACK case DRV_LOAD: return JACK_drvLoad(); case DRV_FREE: return JACK_drvFree(); case DRV_OPEN: return JACK_drvOpen((LPSTR)dwParam1);

1 0

Alexandre Julliard : configure: Make the libfontconfig soname check depend on the header check.
by Alexandre Julliard July 3, 2007

July 3, 2007

Module: wine Branch: master Commit: ccd5f2842904dd35a0b23ec2a327be51c5d2e1c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ccd5f2842904dd35a0b23ec2a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 2 17:31:48 2007 +0200 configure: Make the libfontconfig soname check depend on the header check. --- configure | 160 +++++++++++++++++++++++++------------------------ configure.ac | 7 ++- dlls/gdi32/freetype.c | 7 +-- 3 files changed, 90 insertions(+), 84 deletions(-) diff --git a/configure b/configure index 50f0636..74a7799 100755 --- a/configure +++ b/configure @@ -13746,6 +13746,88 @@ fi fi +if test "$ac_cv_header_fontconfig_fontconfig_h" = "yes" +then + { echo "$as_me:$LINENO: checking for -lfontconfig" >&5 +echo $ECHO_N "checking for -lfontconfig... $ECHO_C" >&6; } +if test "${ac_cv_lib_soname_fontconfig+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_soname_save_LIBS=$LIBS +LIBS="-lfontconfig $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 FcInit (); +int +main () +{ +return FcInit (); + ; + 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_fontconfig=`otool -L conftest$ac_exeext | grep "libfontconfig\\.[0-9A-Za-z.]*dylib" | sed -e "s/^.*\/$libfontconfig\.[0-9A-Za-z.]*dylib$.*$/\1/"';2,$d'` ;; + *) ac_cv_lib_soname_fontconfig=`$ac_cv_path_LDD conftest$ac_exeext | grep "libfontconfig\\.$LIBEXT" | sed -e "s/^.*$libfontconfig\.$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_fontconfig" = "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_fontconfig" >&5 +echo "${ECHO_T}$ac_cv_lib_soname_fontconfig" >&6; } + +cat >>confdefs.h <<_ACEOF +#define SONAME_LIBFONTCONFIG "$ac_cv_lib_soname_fontconfig" +_ACEOF + + +fi + +fi + EXTRACFLAGS="" @@ -15236,84 +15318,6 @@ _ACEOF fi -{ echo "$as_me:$LINENO: checking for -lfontconfig" >&5 -echo $ECHO_N "checking for -lfontconfig... $ECHO_C" >&6; } -if test "${ac_cv_lib_soname_fontconfig+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_soname_save_LIBS=$LIBS -LIBS="-lfontconfig $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 FcInit (); -int -main () -{ -return FcInit (); - ; - 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_fontconfig=`otool -L conftest$ac_exeext | grep "libfontconfig\\.[0-9A-Za-z.]*dylib" | sed -e "s/^.*\/$libfontconfig\.[0-9A-Za-z.]*dylib$.*$/\1/"';2,$d'` ;; - *) ac_cv_lib_soname_fontconfig=`$ac_cv_path_LDD conftest$ac_exeext | grep "libfontconfig\\.$LIBEXT" | sed -e "s/^.*$libfontconfig\.$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_fontconfig" = "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_fontconfig" >&5 -echo "${ECHO_T}$ac_cv_lib_soname_fontconfig" >&6; } - -cat >>confdefs.h <<_ACEOF -#define SONAME_LIBFONTCONFIG "$ac_cv_lib_soname_fontconfig" -_ACEOF - - -fi - { echo "$as_me:$LINENO: checking for -lssl" >&5 echo $ECHO_N "checking for -lssl... $ECHO_C" >&6; } if test "${ac_cv_lib_soname_ssl+set}" = set; then diff --git a/configure.ac b/configure.ac index a142486..6dc6d49 100644 --- a/configure.ac +++ b/configure.ac @@ -979,6 +979,12 @@ then WINE_CHECK_SONAME(jack,jack_client_new) fi +dnl **** Check for fontconfig **** +if test "$ac_cv_header_fontconfig_fontconfig_h" = "yes" +then + WINE_CHECK_SONAME(fontconfig,FcInit) +fi + dnl **** Check for gcc specific options **** AC_SUBST(EXTRACFLAGS,"") @@ -1127,7 +1133,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(fontconfig,FcInit) WINE_CHECK_SONAME(ssl,SSL_library_init) WINE_CHECK_SONAME(crypto,BIO_new_socket) WINE_CHECK_SONAME(jpeg,jpeg_start_decompress) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index e1a825b..33c9f1d 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -182,7 +182,7 @@ static FT_TrueTypeEngineType (*pFT_Get_TrueType_Engine_Type)(FT_Library); MAKE_FUNCPTR(FT_Get_WinFNT_Header); #endif -#ifdef HAVE_FONTCONFIG_FONTCONFIG_H +#ifdef SONAME_LIBFONTCONFIG #include <fontconfig/fontconfig.h> MAKE_FUNCPTR(FcConfigGetCurrent); MAKE_FUNCPTR(FcFontList); @@ -195,9 +195,6 @@ MAKE_FUNCPTR(FcPatternCreate); MAKE_FUNCPTR(FcPatternDestroy); MAKE_FUNCPTR(FcPatternGetBool); MAKE_FUNCPTR(FcPatternGetString); -#ifndef SONAME_LIBFONTCONFIG -#define SONAME_LIBFONTCONFIG "libfontconfig" SONAME_EXT -#endif #endif #undef MAKE_FUNCPTR @@ -1481,7 +1478,7 @@ static BOOL ReadFontDir(const char *dirname, BOOL external_fonts) static void load_fontconfig_fonts(void) { -#ifdef HAVE_FONTCONFIG_FONTCONFIG_H +#ifdef SONAME_LIBFONTCONFIG void *fc_handle = NULL; FcConfig *config; FcPattern *pat;

1 0

Alexandre Julliard : configure: Make the libcups soname check depend on the header check.
by Alexandre Julliard July 3, 2007

July 3, 2007

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