wine-commits January 2014

wine-commits@winehq.org

3 participants
814 discussions

André Hentschel : gdi32: Use boolean return values in boolean functions.
by Alexandre Julliard 30 Jan '14

30 Jan '14

Module: wine Branch: master Commit: 540d1459f98f72d945167932507ffaa35cb83b4f URL: http://source.winehq.org/git/wine.git/?a=commit;h=540d1459f98f72d9451679325… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Jan 28 00:04:18 2014 +0100 gdi32: Use boolean return values in boolean functions. --- dlls/gdi32/enhmfdrv/dc.c | 14 +++++++------- dlls/gdi32/enhmfdrv/objects.c | 2 +- dlls/gdi32/font.c | 4 ++-- dlls/gdi32/gdiobj.c | 8 ++++---- dlls/gdi32/mfdrv/objects.c | 2 +- dlls/gdi32/palette.c | 4 ++-- 6 files changed, 17 insertions(+), 17 deletions(-) diff --git a/dlls/gdi32/enhmfdrv/dc.c b/dlls/gdi32/enhmfdrv/dc.c index 389dc38..cbf3f5c 100644 --- a/dlls/gdi32/enhmfdrv/dc.c +++ b/dlls/gdi32/enhmfdrv/dc.c @@ -262,7 +262,7 @@ BOOL EMFDRV_SetWindowExtEx( PHYSDEV dev, INT cx, INT cy, SIZE *size ) emr.szlExtent.cx = cx; emr.szlExtent.cy = cy; - if (!EMFDRV_WriteRecord( dev, &emr.emr )) return 0; + if (!EMFDRV_WriteRecord( dev, &emr.emr )) return FALSE; return next->funcs->pSetWindowExtEx( next, cx, cy, size ); } @@ -276,7 +276,7 @@ BOOL EMFDRV_SetViewportOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) emr.ptlOrigin.x = x; emr.ptlOrigin.y = y; - if (!EMFDRV_WriteRecord( dev, &emr.emr )) return 0; + if (!EMFDRV_WriteRecord( dev, &emr.emr )) return FALSE; return next->funcs->pSetViewportOrgEx( next, x, y, pt ); } @@ -290,7 +290,7 @@ BOOL EMFDRV_SetWindowOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) emr.ptlOrigin.x = x; emr.ptlOrigin.y = y; - if (!EMFDRV_WriteRecord( dev, &emr.emr )) return 0; + if (!EMFDRV_WriteRecord( dev, &emr.emr )) return FALSE; return next->funcs->pSetWindowOrgEx( next, x, y, pt ); } @@ -306,7 +306,7 @@ BOOL EMFDRV_ScaleViewportExtEx( PHYSDEV dev, INT xNum, INT xDenom, INT yNum, INT emr.yNum = yNum; emr.yDenom = yDenom; - if (!EMFDRV_WriteRecord( dev, &emr.emr )) return 0; + if (!EMFDRV_WriteRecord( dev, &emr.emr )) return FALSE; return next->funcs->pScaleViewportExtEx( next, xNum, xDenom, yNum, yDenom, size ); } @@ -322,7 +322,7 @@ BOOL EMFDRV_ScaleWindowExtEx( PHYSDEV dev, INT xNum, INT xDenom, INT yNum, INT y emr.yNum = yNum; emr.yDenom = yDenom; - if (!EMFDRV_WriteRecord( dev, &emr.emr )) return 0; + if (!EMFDRV_WriteRecord( dev, &emr.emr )) return FALSE; return next->funcs->pScaleWindowExtEx( next, xNum, xDenom, yNum, yDenom, size ); } @@ -376,7 +376,7 @@ BOOL EMFDRV_OffsetViewportOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) emr.ptlOrigin.x = prev.x + x; emr.ptlOrigin.y = prev.y + y; - if (!EMFDRV_WriteRecord( dev, &emr.emr )) return 0; + if (!EMFDRV_WriteRecord( dev, &emr.emr )) return FALSE; return next->funcs->pOffsetViewportOrgEx( next, x, y, pt ); } @@ -393,7 +393,7 @@ BOOL EMFDRV_OffsetWindowOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) emr.ptlOrigin.x = prev.x + x; emr.ptlOrigin.y = prev.y + y; - if (!EMFDRV_WriteRecord( dev, &emr.emr )) return 0; + if (!EMFDRV_WriteRecord( dev, &emr.emr )) return FALSE; return next->funcs->pOffsetWindowOrgEx( next, x, y, pt ); } diff --git a/dlls/gdi32/enhmfdrv/objects.c b/dlls/gdi32/enhmfdrv/objects.c index 60414a3..ee2abd7 100644 --- a/dlls/gdi32/enhmfdrv/objects.c +++ b/dlls/gdi32/enhmfdrv/objects.c @@ -243,7 +243,7 @@ static BOOL EMFDRV_CreateFontIndirect(PHYSDEV dev, HFONT hFont ) EMREXTCREATEFONTINDIRECTW emr; int i; - if (!GetObjectW( hFont, sizeof(emr.elfw.elfLogFont), &emr.elfw.elfLogFont )) return 0; + if (!GetObjectW( hFont, sizeof(emr.elfw.elfLogFont), &emr.elfw.elfLogFont )) return FALSE; emr.emr.iType = EMR_EXTCREATEFONTINDIRECTW; emr.emr.nSize = (sizeof(emr) + 3) / 4 * 4; diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 0dfd5b1..66072af 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -3378,7 +3378,7 @@ BOOL WINAPI GetCharWidthFloatA(HDC hdc, UINT iFirstChar, UINT iLastChar, PFLOAT pxBuffer) { FIXME("%p, %u, %u, %p: stub!\n", hdc, iFirstChar, iLastChar, pxBuffer); - return 0; + return FALSE; } /************************************************************************* @@ -3388,7 +3388,7 @@ BOOL WINAPI GetCharWidthFloatW(HDC hdc, UINT iFirstChar, UINT iLastChar, PFLOAT pxBuffer) { FIXME("%p, %u, %u, %p: stub!\n", hdc, iFirstChar, iLastChar, pxBuffer); - return 0; + return FALSE; } diff --git a/dlls/gdi32/gdiobj.c b/dlls/gdi32/gdiobj.c index de64474..a255a4c 100644 --- a/dlls/gdi32/gdiobj.c +++ b/dlls/gdi32/gdiobj.c @@ -1325,8 +1325,8 @@ DWORD WINAPI GdiSetBatchLimit( DWORD limit ) */ BOOL WINAPI GetColorAdjustment(HDC hdc, LPCOLORADJUSTMENT lpca) { - FIXME("stub\n"); - return 0; + FIXME("stub\n"); + return FALSE; } /******************************************************************* @@ -1355,6 +1355,6 @@ BOOL WINAPI GdiComment(HDC hdc, UINT cbSize, const BYTE *lpData) */ BOOL WINAPI SetColorAdjustment(HDC hdc, const COLORADJUSTMENT* lpca) { - FIXME("stub\n"); - return 0; + FIXME("stub\n"); + return FALSE; } diff --git a/dlls/gdi32/mfdrv/objects.c b/dlls/gdi32/mfdrv/objects.c index 697644d..e0275dd 100644 --- a/dlls/gdi32/mfdrv/objects.c +++ b/dlls/gdi32/mfdrv/objects.c @@ -104,7 +104,7 @@ BOOL MFDRV_DeleteObject( PHYSDEV dev, HGDIOBJ obj ) index = MFDRV_FindObject(dev, obj); if( index < 0 ) - return 0; + return FALSE; mr.rdSize = sizeof mr / 2; mr.rdFunction = META_DELETEOBJECT; diff --git a/dlls/gdi32/palette.c b/dlls/gdi32/palette.c index fb27f4f..d850d0f 100644 --- a/dlls/gdi32/palette.c +++ b/dlls/gdi32/palette.c @@ -703,7 +703,7 @@ BOOL WINAPI UpdateColors( HMODULE mod; int size = GetDeviceCaps( hDC, SIZEPALETTE ); - if (!size) return 0; + if (!size) return FALSE; mod = GetModuleHandleA("user32.dll"); if (mod) @@ -723,7 +723,7 @@ BOOL WINAPI UpdateColors( } } } - return 0x666; + return TRUE; } /*********************************************************************

1 0

Hans Leidekker : advapi32/tests: Mark a test result on Windows 2000 as broken.
by Alexandre Julliard 30 Jan '14

30 Jan '14

Module: wine Branch: master Commit: e0c5dfdf5d7f4337d0b68a9985b82a27caacc7a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0c5dfdf5d7f4337d0b68a998… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jan 30 13:06:09 2014 +0100 advapi32/tests: Mark a test result on Windows 2000 as broken. --- dlls/advapi32/tests/service.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index 74cb9a8..9b6c1cf 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -108,7 +108,8 @@ static void test_open_scm(void) /* Again a correct one */ SetLastError(0xdeadbeef); scm_handle = OpenSCManagerA(NULL, NULL, SC_MANAGER_CONNECT); - ok(GetLastError() == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", GetLastError()); + ok(GetLastError() == ERROR_SUCCESS || broken(GetLastError() == ERROR_IO_PENDING) /* win2k */, + "Expected ERROR_SUCCESS, got %u\n", GetLastError()); ok(scm_handle != NULL, "Expected success, got error %u\n", GetLastError()); CloseServiceHandle(scm_handle); }

1 0

Alexandre Julliard : configure: Use AS_VAR_IF to test variables where appropriate.
by Alexandre Julliard 30 Jan '14

30 Jan '14

Module: wine Branch: master Commit: 2a741324fea748efd8f9b734bda0d030d54c2755 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a741324fea748efd8f9b734b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 30 12:22:08 2014 +0100 configure: Use AS_VAR_IF to test variables where appropriate. --- aclocal.m4 | 47 +++---- configure | 436 ++++++++++++++++++++++++++++++------------------------------ 2 files changed, 240 insertions(+), 243 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2a741324fea748efd8f9b…

1 0

Alexandre Julliard : configure: Rename substituted variables to a standard _CFLAGS and _LIBS format.
by Alexandre Julliard 30 Jan '14

30 Jan '14

Module: wine Branch: master Commit: cf0e96c6d0edc3a22b8ee5ac423d9b6b652ce0e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf0e96c6d0edc3a22b8ee5ac4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 30 12:14:47 2014 +0100 configure: Rename substituted variables to a standard _CFLAGS and _LIBS format. --- configure | 190 ++++++++++++++++++++---------------- configure.ac | 108 ++++++++++---------- dlls/advapi32/Makefile.in | 2 +- dlls/cabinet/Makefile.in | 2 +- dlls/crypt32/Makefile.in | 2 +- dlls/dbghelp/Makefile.in | 2 +- dlls/dinput/Makefile.in | 2 +- dlls/dnsapi/Makefile.in | 2 +- dlls/gdi32/Makefile.in | 2 +- dlls/iphlpapi/Makefile.in | 2 +- dlls/kernel32/Makefile.in | 2 +- dlls/mountmgr.sys/Makefile.in | 2 +- dlls/ntdll/Makefile.in | 2 +- dlls/openal32/Makefile.in | 2 +- dlls/opencl/Makefile.in | 2 +- dlls/rpcrt4/Makefile.in | 2 +- dlls/secur32/Makefile.in | 2 +- dlls/shell32/Makefile.in | 2 +- dlls/windowscodecs/Makefile.in | 2 +- dlls/winealsa.drv/Makefile.in | 2 +- dlls/winecoreaudio.drv/Makefile.in | 2 +- dlls/winegstreamer/Makefile.in | 2 +- dlls/winemp3.acm/Makefile.in | 2 +- dlls/wineoss.drv/Makefile.in | 2 +- dlls/wineqtdecoder/Makefile.in | 2 +- dlls/winhttp/Makefile.in | 2 +- dlls/wininet/Makefile.in | 2 +- dlls/winspool.drv/Makefile.in | 4 +- dlls/wldap32/Makefile.in | 2 +- dlls/ws2_32/Makefile.in | 2 +- libs/wine/Makefile.in | 2 +- loader/Makefile.in | 2 +- programs/hostname/Makefile.in | 2 +- programs/winedbg/Makefile.in | 2 +- server/Makefile.in | 2 +- tools/wmc/Makefile.in | 2 +- tools/wrc/Makefile.in | 2 +- 37 files changed, 198 insertions(+), 172 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cf0e96c6d0edc3a22b8ee…

1 0

Alexandre Julliard : configure: Merge the X_LIBS and XLIB variables.
by Alexandre Julliard 30 Jan '14

30 Jan '14

Module: wine Branch: master Commit: 754b65062ebc3c6905bdc6b94ac653c24fc50244 URL: http://source.winehq.org/git/wine.git/?a=commit;h=754b65062ebc3c6905bdc6b94… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 30 11:47:20 2014 +0100 configure: Merge the X_LIBS and XLIB variables. --- configure | 42 +++++++++++++++++++---------------------- configure.ac | 43 ++++++++++++++++++------------------------ dlls/glu32/Makefile.in | 2 +- dlls/winex11.drv/Makefile.in | 2 +- 4 files changed, 39 insertions(+), 50 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=754b65062ebc3c6905bdc…

1 0

Alexandre Julliard : configure: Trace the results of pkg-config checks to the config.log file.
by Alexandre Julliard 30 Jan '14

30 Jan '14

Module: wine Branch: master Commit: cebed408c74779d5659d0043a02edd1014a2d114 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cebed408c74779d5659d0043a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 30 11:42:38 2014 +0100 configure: Trace the results of pkg-config checks to the config.log file. --- aclocal.m4 | 2 ++ configure | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+) diff --git a/aclocal.m4 b/aclocal.m4 index c582890..1a3715a 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -99,6 +99,8 @@ AS_IF([test -n "$ac_libs"],[], [ac_libs=`$PKG_CONFIG --libs [$2] 2>/dev/null`]) m4_ifval([$5],[test "$cross_compiling" = yes || ac_libs=[$]{ac_libs:-[$5]}]) m4_ifval([$3],[ac_libs=[$]{ac_libs:-"$3"}]) +AS_ECHO(["$as_me:${as_lineno-$LINENO}: $2 cflags: $ac_cflags"]) >&AS_MESSAGE_LOG_FD +AS_ECHO(["$as_me:${as_lineno-$LINENO}: $2 libs: $ac_libs"]) >&AS_MESSAGE_LOG_FD ac_save_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS $ac_cflags" $6 diff --git a/configure b/configure index 1fc40e7..8c0fd16 100755 --- a/configure +++ b/configure @@ -10475,6 +10475,8 @@ elif test -n "$PKG_CONFIG"; then : fi test "$cross_compiling" = yes || XML2_LIBS=${XML2_LIBS:-`xml2-config --libs 2>/dev/null`} XML2_LIBS=${XML2_LIBS:-"-lxml2"} +$as_echo "$as_me:${as_lineno-$LINENO}: libxml-2.0 cflags: $XML2_CFLAGS" >&5 +$as_echo "$as_me:${as_lineno-$LINENO}: libxml-2.0 libs: $XML2_LIBS" >&5 ac_save_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS $XML2_CFLAGS" for ac_header in libxml/parser.h libxml/xmlsave.h libxml/SAX2.h @@ -10787,6 +10789,8 @@ elif test -n "$PKG_CONFIG"; then : fi test "$cross_compiling" = yes || XSLT_LIBS=${XSLT_LIBS:-`xslt-config --libs 2>/dev/null`} XSLT_LIBS=${XSLT_LIBS:-"-lxml2"} +$as_echo "$as_me:${as_lineno-$LINENO}: libxslt cflags: $XSLT_CFLAGS" >&5 +$as_echo "$as_me:${as_lineno-$LINENO}: libxslt libs: $XSLT_LIBS" >&5 ac_save_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS $XSLT_CFLAGS" for ac_header in libxslt/pattern.h libxslt/transform.h @@ -10892,6 +10896,8 @@ elif test -n "$PKG_CONFIG"; then : fi +$as_echo "$as_me:${as_lineno-$LINENO}: dbus-1 cflags: $DBUS_CFLAGS" >&5 +$as_echo "$as_me:${as_lineno-$LINENO}: dbus-1 libs: $DBUS_LIBS" >&5 ac_save_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS $DBUS_CFLAGS" ac_fn_c_check_header_mongrel "$LINENO" "dbus/dbus.h" "ac_cv_header_dbus_dbus_h" "$ac_includes_default" @@ -10984,6 +10990,8 @@ elif test -n "$PKG_CONFIG"; then : fi HAL_LIBS=${HAL_LIBS:-"-ldbus-1"} +$as_echo "$as_me:${as_lineno-$LINENO}: hal cflags: $HAL_CFLAGS" >&5 +$as_echo "$as_me:${as_lineno-$LINENO}: hal libs: $HAL_LIBS" >&5 ac_save_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS $HAL_CFLAGS" ac_fn_c_check_header_mongrel "$LINENO" "hal/libhal.h" "ac_cv_header_hal_libhal_h" "$ac_includes_default" @@ -11076,6 +11084,8 @@ elif test -n "$PKG_CONFIG"; then : fi +$as_echo "$as_me:${as_lineno-$LINENO}: gnutls cflags: $GNUTLS_CFLAGS" >&5 +$as_echo "$as_me:${as_lineno-$LINENO}: gnutls libs: $GNUTLS_LIBS" >&5 ac_save_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS $GNUTLS_CFLAGS" ac_fn_c_check_header_mongrel "$LINENO" "gnutls/gnutls.h" "ac_cv_header_gnutls_gnutls_h" "$ac_includes_default" @@ -11317,6 +11327,8 @@ elif test -n "$PKG_CONFIG"; then : fi test "$cross_compiling" = yes || SANE_LIBS=${SANE_LIBS:-`sane-config --ldflags 2>/dev/null`} +$as_echo "$as_me:${as_lineno-$LINENO}: libsane cflags: $SANE_CFLAGS" >&5 +$as_echo "$as_me:${as_lineno-$LINENO}: libsane libs: $SANE_LIBS" >&5 ac_save_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS $SANE_CFLAGS" ac_fn_c_check_header_mongrel "$LINENO" "sane/sane.h" "ac_cv_header_sane_sane_h" "$ac_includes_default" @@ -11473,6 +11485,8 @@ elif test -n "$PKG_CONFIG"; then : fi test "$cross_compiling" = yes || GPHOTO2_LIBS=${GPHOTO2_LIBS:-`gphoto2-config --libs 2>/dev/null`} GPHOTO2_LIBS=${GPHOTO2_LIBS:-"-lgphoto2"} +$as_echo "$as_me:${as_lineno-$LINENO}: libgphoto2 cflags: $GPHOTO2_CFLAGS" >&5 +$as_echo "$as_me:${as_lineno-$LINENO}: libgphoto2 libs: $GPHOTO2_LIBS" >&5 ac_save_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS $GPHOTO2_CFLAGS" ac_fn_c_check_header_mongrel "$LINENO" "gphoto2-camera.h" "ac_cv_header_gphoto2_camera_h" "$ac_includes_default" @@ -11543,6 +11557,8 @@ elif test -n "$PKG_CONFIG"; then : fi test "$cross_compiling" = yes || GPHOTO2_PORT_LIBS=${GPHOTO2_PORT_LIBS:-`gphoto2-port-config --libs 2>/dev/null`} GPHOTO2_PORT_LIBS=${GPHOTO2_PORT_LIBS:-"-lgphoto2_port"} +$as_echo "$as_me:${as_lineno-$LINENO}: libgphoto2_port cflags: $GPHOTO2_PORT_CFLAGS" >&5 +$as_echo "$as_me:${as_lineno-$LINENO}: libgphoto2_port libs: $GPHOTO2_PORT_LIBS" >&5 ac_save_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS $GPHOTO2_PORT_CFLAGS" ac_fn_c_check_header_mongrel "$LINENO" "gphoto2-port.h" "ac_cv_header_gphoto2_port_h" "$ac_includes_default" @@ -11670,6 +11686,8 @@ elif test -n "$PKG_CONFIG"; then : fi LCMS2_LIBS=${LCMS2_LIBS:-"-llcms2"} +$as_echo "$as_me:${as_lineno-$LINENO}: lcms2 cflags: $LCMS2_CFLAGS" >&5 +$as_echo "$as_me:${as_lineno-$LINENO}: lcms2 libs: $LCMS2_LIBS" >&5 ac_save_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS $LCMS2_CFLAGS" for ac_header in lcms2.h @@ -11763,6 +11781,8 @@ elif test -n "$PKG_CONFIG"; then : fi test "$cross_compiling" = yes || 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}: freetype2 cflags: $FREETYPE_CFLAGS" >&5 +$as_echo "$as_me:${as_lineno-$LINENO}: freetype2 libs: $FREETYPE_LIBS" >&5 ac_save_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS $FREETYPE_CFLAGS" for ac_header in ft2build.h @@ -12050,6 +12070,8 @@ elif test -n "$PKG_CONFIG"; then : fi +$as_echo "$as_me:${as_lineno-$LINENO}: gstreamer-app-0.10 cflags: $GSTREAMER_CFLAGS" >&5 +$as_echo "$as_me:${as_lineno-$LINENO}: gstreamer-app-0.10 libs: $GSTREAMER_LIBS" >&5 ac_save_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS $GSTREAMER_CFLAGS" ac_gst_incl="" @@ -12300,6 +12322,8 @@ elif test -n "$PKG_CONFIG"; then : fi +$as_echo "$as_me:${as_lineno-$LINENO}: capi20 cflags: $CAPI20_CFLAGS" >&5 +$as_echo "$as_me:${as_lineno-$LINENO}: capi20 libs: $CAPI20_LIBS" >&5 ac_save_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS $CAPI20_CFLAGS" for ac_header in capi20.h linux/capi.h @@ -12484,6 +12508,8 @@ elif test -n "$PKG_CONFIG"; then : fi test "$cross_compiling" = yes || FONTCONFIG_LIBS=${FONTCONFIG_LIBS:-$X_LIBS} +$as_echo "$as_me:${as_lineno-$LINENO}: fontconfig cflags: $FONTCONFIG_CFLAGS" >&5 +$as_echo "$as_me:${as_lineno-$LINENO}: fontconfig libs: $FONTCONFIG_LIBS" >&5 ac_save_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS $FONTCONFIG_CFLAGS" for ac_header in fontconfig/fontconfig.h @@ -12650,6 +12676,8 @@ elif test -n "$PKG_CONFIG"; then : fi +$as_echo "$as_me:${as_lineno-$LINENO}: libjpeg cflags: $JPEG_CFLAGS" >&5 +$as_echo "$as_me:${as_lineno-$LINENO}: libjpeg libs: $JPEG_LIBS" >&5 ac_save_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS $JPEG_CFLAGS" for ac_header in jpeglib.h @@ -12751,6 +12779,8 @@ elif test -n "$PKG_CONFIG"; then : fi test "$cross_compiling" = yes || PNG_LIBS=${PNG_LIBS:-$X_LIBS} +$as_echo "$as_me:${as_lineno-$LINENO}: libpng cflags: $PNG_CFLAGS" >&5 +$as_echo "$as_me:${as_lineno-$LINENO}: libpng libs: $PNG_LIBS" >&5 ac_save_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS $PNG_CFLAGS" for ac_header in png.h @@ -12868,6 +12898,8 @@ elif test -n "$PKG_CONFIG"; then : fi +$as_echo "$as_me:${as_lineno-$LINENO}: libtiff cflags: $TIFF_CFLAGS" >&5 +$as_echo "$as_me:${as_lineno-$LINENO}: libtiff libs: $TIFF_LIBS" >&5 ac_save_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS $TIFF_CFLAGS" for ac_header in tiffio.h @@ -12967,6 +12999,8 @@ elif test -n "$PKG_CONFIG"; then : fi MPG123_LIBS=${MPG123_LIBS:-"-lmpg123"} +$as_echo "$as_me:${as_lineno-$LINENO}: libmpg123 cflags: $MPG123_CFLAGS" >&5 +$as_echo "$as_me:${as_lineno-$LINENO}: libmpg123 libs: $MPG123_LIBS" >&5 ac_save_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS $MPG123_CFLAGS" for ac_header in mpg123.h

1 0

Alexandre Julliard : configure: Add a pkg-config check for fontconfig.
by Alexandre Julliard 30 Jan '14

30 Jan '14

Module: wine Branch: master Commit: db2be9dc0b40480f5420e3ab261b1b6c07b53607 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db2be9dc0b40480f5420e3ab2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 30 11:39:48 2014 +0100 configure: Add a pkg-config check for fontconfig. --- configure | 104 ++++++++++++++++-------------------------------- configure.ac | 27 +++++-------- dlls/gdi32/Makefile.in | 2 +- 3 files changed, 45 insertions(+), 88 deletions(-) diff --git a/configure b/configure index 0934c87..1fc40e7 100755 --- a/configure +++ b/configure @@ -645,7 +645,8 @@ PNG_LIBS PNG_CFLAGS JPEG_LIBS JPEG_CFLAGS -FONTCONFIGINCL +FONTCONFIG_LIBS +FONTCONFIG_CFLAGS CUPSINCL CAPI20_LIBS CAPI20_CFLAGS @@ -1385,6 +1386,8 @@ GSTREAMER_CFLAGS GSTREAMER_LIBS CAPI20_CFLAGS CAPI20_LIBS +FONTCONFIG_CFLAGS +FONTCONFIG_LIBS JPEG_CFLAGS JPEG_LIBS PNG_CFLAGS @@ -2116,6 +2119,10 @@ Some influential environment variables: CAPI20_CFLAGS C compiler flags for capi20, overriding pkg-config CAPI20_LIBS Linker flags for capi20, overriding pkg-config + FONTCONFIG_CFLAGS + C compiler flags for fontconfig, overriding pkg-config + FONTCONFIG_LIBS + Linker flags for fontconfig, overriding pkg-config JPEG_CFLAGS C compiler flags for libjpeg, overriding pkg-config JPEG_LIBS Linker flags for libjpeg, overriding pkg-config PNG_CFLAGS C compiler flags for libpng, overriding pkg-config @@ -5902,8 +5909,6 @@ OPENGL_LIBS="" -test "x$with_fontconfig" != "xno" || ac_cv_header_fontconfig_fontconfig_h=no - # Check whether --enable-largefile was given. if test "${enable_largefile+set}" = set; then : enableval=$enable_largefile; @@ -6402,7 +6407,6 @@ for ac_header in \ elf.h \ float.h \ fnmatch.h \ - fontconfig/fontconfig.h \ getopt.h \ gettext-po.h \ grp.h \ @@ -12465,67 +12469,24 @@ This is an error since --with-cups was requested." "$LINENO" 5 ;; esac fi -if test "$ac_cv_header_fontconfig_fontconfig_h" = "yes" +if test "x$with_fontconfig" != "xno" then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -lfontconfig" >&5 -$as_echo_n "checking for -lfontconfig... " >&6; } -if ${ac_cv_lib_soname_fontconfig+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_soname_save_LIBS=$LIBS -LIBS="-lfontconfig $LIBS" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ + if test -n "$FONTCONFIG_CFLAGS"; then : -/* 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 -if ac_fn_c_try_link "$LINENO"; then : - case "$LIBEXT" in - dll) ac_cv_lib_soname_fontconfig=`$ac_cv_path_LDD conftest.exe | grep "fontconfig" | sed -e "s/dll.*/dll/"';2,$d'` ;; - 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=`$READELF -d conftest$ac_exeext | grep "NEEDED.*libfontconfig\\.$LIBEXT" | sed -e "s/^.*\\[\$libfontconfig\\.$LIBEXT[^ ]*\$\\].*$/\1/"';2,$d'` - if test "x$ac_cv_lib_soname_fontconfig" = x; then : - ac_cv_lib_soname_fontconfig=`$LDD conftest$ac_exeext | grep "libfontconfig\\.$LIBEXT" | sed -e "s/^.*$libfontconfig\.$LIBEXT[^ ]*$.*$/\1/"';2,$d'` -fi ;; - esac -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_soname_save_LIBS +elif test -n "$PKG_CONFIG"; then : + FONTCONFIG_CFLAGS=`$PKG_CONFIG --cflags fontconfig 2>/dev/null` fi -if test "x$ac_cv_lib_soname_fontconfig" = "x"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 -$as_echo "not found" >&6; } - -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_soname_fontconfig" >&5 -$as_echo "$ac_cv_lib_soname_fontconfig" >&6; } - -cat >>confdefs.h <<_ACEOF -#define SONAME_LIBFONTCONFIG "$ac_cv_lib_soname_fontconfig" -_ACEOF - +test "$cross_compiling" = yes || FONTCONFIG_CFLAGS=${FONTCONFIG_CFLAGS:-$X_CFLAGS} +if test -n "$FONTCONFIG_LIBS"; then : +elif test -n "$PKG_CONFIG"; then : + FONTCONFIG_LIBS=`$PKG_CONFIG --libs fontconfig 2>/dev/null` fi -elif test -n "$X_CFLAGS" -a "x$with_fontconfig" != "xno" -then - ac_save_CPPFLAGS="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS $X_CFLAGS" - $as_unset ac_cv_header_fontconfig_fontconfig_h - for ac_header in fontconfig/fontconfig.h +test "$cross_compiling" = yes || FONTCONFIG_LIBS=${FONTCONFIG_LIBS:-$X_LIBS} + +ac_save_CPPFLAGS=$CPPFLAGS +CPPFLAGS="$CPPFLAGS $FONTCONFIG_CFLAGS" +for ac_header in fontconfig/fontconfig.h do : ac_fn_c_check_header_mongrel "$LINENO" "fontconfig/fontconfig.h" "ac_cv_header_fontconfig_fontconfig_h" "$ac_includes_default" if test "x$ac_cv_header_fontconfig_fontconfig_h" = xyes; then : @@ -12537,18 +12498,15 @@ fi done - CPPFLAGS="$ac_save_CPPFLAGS" - if test "$ac_cv_header_fontconfig_fontconfig_h" = "yes" - then - FONTCONFIGINCL="$X_CFLAGS" - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -lfontconfig" >&5 + if test "$ac_cv_header_fontconfig_fontconfig_h" = "yes" + then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -lfontconfig" >&5 $as_echo_n "checking for -lfontconfig... " >&6; } if ${ac_cv_lib_soname_fontconfig+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_soname_save_LIBS=$LIBS -LIBS="-lfontconfig $X_LIBS $LIBS" +LIBS="-lfontconfig $FONTCONFIG_LIBS $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -12584,7 +12542,7 @@ fi if test "x$ac_cv_lib_soname_fontconfig" = "x"; then : { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 $as_echo "not found" >&6; } - + FONTCONFIG_CFLAGS="" else { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_soname_fontconfig" >&5 $as_echo "$ac_cv_lib_soname_fontconfig" >&6; } @@ -12595,7 +12553,13 @@ _ACEOF fi - fi + else + FONTCONFIG_CFLAGS="" + fi +CPPFLAGS=$ac_save_CPPFLAGS +test -z "$FONTCONFIG_CFLAGS" || FONTCONFIG_CFLAGS=`echo " $FONTCONFIG_CFLAGS" | sed 's/ -I$[^/]$/ -I\$(top_builddir)\/\1/g'` +test -z "$FONTCONFIG_LIBS" || FONTCONFIG_LIBS=`echo " $FONTCONFIG_LIBS" | sed 's/ -L$[^/]$/ -L\$(top_builddir)\/\1/g'` + fi if test "x$ac_cv_lib_soname_fontconfig" = "x"; then : case "x$with_fontconfig" in @@ -16492,6 +16456,8 @@ GSTREAMER_CFLAGS = $GSTREAMER_CFLAGS GSTREAMER_LIBS = $GSTREAMER_LIBS CAPI20_CFLAGS = $CAPI20_CFLAGS CAPI20_LIBS = $CAPI20_LIBS +FONTCONFIG_CFLAGS = $FONTCONFIG_CFLAGS +FONTCONFIG_LIBS = $FONTCONFIG_LIBS JPEG_CFLAGS = $JPEG_CFLAGS JPEG_LIBS = $JPEG_LIBS PNG_CFLAGS = $PNG_CFLAGS diff --git a/configure.ac b/configure.ac index f9f3e07..39b4c51 100644 --- a/configure.ac +++ b/configure.ac @@ -373,8 +373,6 @@ AC_SUBST(OPENGL_LIBS,"") dnl **** Check for header files **** -test "x$with_fontconfig" != "xno" || ac_cv_header_fontconfig_fontconfig_h=no - AC_SYS_LARGEFILE() AC_CHECK_HEADERS(\ @@ -407,7 +405,6 @@ AC_CHECK_HEADERS(\ elf.h \ float.h \ fnmatch.h \ - fontconfig/fontconfig.h \ getopt.h \ gettext-po.h \ grp.h \ @@ -1616,22 +1613,16 @@ WINE_NOTICE_WITH(cups,[test "x$ac_cv_lib_soname_cups" = "x"], [libcups ${notice_platform}development files not found, CUPS won't be supported.]) dnl **** Check for fontconfig **** -if test "$ac_cv_header_fontconfig_fontconfig_h" = "yes" -then - WINE_CHECK_SONAME(fontconfig,FcInit) -elif test -n "$X_CFLAGS" -a "x$with_fontconfig" != "xno" +if test "x$with_fontconfig" != "xno" then - dnl fontconfig is in the X directory on Mac OS X - ac_save_CPPFLAGS="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS $X_CFLAGS" - $as_unset ac_cv_header_fontconfig_fontconfig_h - AC_CHECK_HEADERS([fontconfig/fontconfig.h]) - CPPFLAGS="$ac_save_CPPFLAGS" - if test "$ac_cv_header_fontconfig_fontconfig_h" = "yes" - then - AC_SUBST(FONTCONFIGINCL,"$X_CFLAGS") - WINE_CHECK_SONAME(fontconfig,FcInit,,,[$X_LIBS]) - fi + WINE_PACKAGE_FLAGS(FONTCONFIG,[fontconfig],,[$X_CFLAGS],[$X_LIBS], + [AC_CHECK_HEADERS([fontconfig/fontconfig.h]) + if test "$ac_cv_header_fontconfig_fontconfig_h" = "yes" + then + WINE_CHECK_SONAME(fontconfig,FcInit,,[FONTCONFIG_CFLAGS=""],[$FONTCONFIG_LIBS]) + else + FONTCONFIG_CFLAGS="" + fi]) fi WINE_NOTICE_WITH(fontconfig,[test "x$ac_cv_lib_soname_fontconfig" = "x"], [fontconfig ${notice_platform}development files not found, fontconfig won't be supported.]) diff --git a/dlls/gdi32/Makefile.in b/dlls/gdi32/Makefile.in index da31559..1b66302 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 = $(FREETYPE_CFLAGS) @FONTCONFIGINCL@ +EXTRAINCL = $(FREETYPE_CFLAGS) $(FONTCONFIG_CFLAGS) EXTRALIBS = @CARBONLIB@ @APPKITLIB@ DELAYIMPORTS = usp10

1 0

Alexandre Julliard : configure: Automatically expand _CFLAGS and _LIBS variables in all makefiles.
by Alexandre Julliard 30 Jan '14

30 Jan '14

Module: wine Branch: master Commit: 8aa64e358054c069a649e5df83a07d2b8dfea6e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8aa64e358054c069a649e5df8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 30 11:15:49 2014 +0100 configure: Automatically expand _CFLAGS and _LIBS variables in all makefiles. --- Make.vars.in | 1 + configure | 41 ++++++++++++++++++++++++++++++++++++++++ configure.ac | 4 ++++ dlls/capi2032/Makefile.in | 2 +- dlls/gdi32/Makefile.in | 2 +- dlls/glu32/Makefile.in | 4 ++-- dlls/gphoto2.ds/Makefile.in | 4 ++-- dlls/mountmgr.sys/Makefile.in | 2 +- dlls/mscms/Makefile.in | 4 ++-- dlls/msxml3/Makefile.in | 4 ++-- dlls/sane.ds/Makefile.in | 2 +- dlls/secur32/Makefile.in | 2 +- dlls/windowscodecs/Makefile.in | 2 +- dlls/winegstreamer/Makefile.in | 4 ++-- dlls/winemp3.acm/Makefile.in | 4 ++-- dlls/winex11.drv/Makefile.in | 4 ++-- tools/Makefile.in | 4 ++-- 17 files changed, 68 insertions(+), 22 deletions(-) diff --git a/Make.vars.in b/Make.vars.in index 21f7fac..a0727bd 100644 --- a/Make.vars.in +++ b/Make.vars.in @@ -66,6 +66,7 @@ INSTALL_DATA = $(top_srcdir)/tools/install-sh -m 644 $(INSTALL_DATA_FLAGS) prog_manext = 1 api_manext = 3w conf_manext = 5 +@ALL_VARS_RULES@ @SET_MAKE@ all: diff --git a/configure b/configure index 5f8bbf5..0934c87 100755 --- a/configure +++ b/configure @@ -625,6 +625,7 @@ ac_includes_default="\ ac_subst_vars='LTLIBOBJS LIBOBJS LINGUAS +ALL_VARS_RULES LDAPLIBS LIBRT LIBPOLL @@ -16462,6 +16463,46 @@ ac_config_commands="$ac_config_commands include/stamp-h" $as_echo_n "creating Makefile rules..." >&6 +ALL_VARS_RULES="OPENGL_LIBS = $OPENGL_LIBS +X_CFLAGS = $X_CFLAGS +X_PRE_LIBS = $X_PRE_LIBS +X_LIBS = $X_LIBS +X_EXTRA_LIBS = $X_EXTRA_LIBS +XML2_CFLAGS = $XML2_CFLAGS +XML2_LIBS = $XML2_LIBS +XSLT_CFLAGS = $XSLT_CFLAGS +XSLT_LIBS = $XSLT_LIBS +DBUS_CFLAGS = $DBUS_CFLAGS +DBUS_LIBS = $DBUS_LIBS +HAL_CFLAGS = $HAL_CFLAGS +HAL_LIBS = $HAL_LIBS +GNUTLS_CFLAGS = $GNUTLS_CFLAGS +GNUTLS_LIBS = $GNUTLS_LIBS +SANE_CFLAGS = $SANE_CFLAGS +SANE_LIBS = $SANE_LIBS +GPHOTO2_CFLAGS = $GPHOTO2_CFLAGS +GPHOTO2_LIBS = $GPHOTO2_LIBS +GPHOTO2_PORT_CFLAGS = $GPHOTO2_PORT_CFLAGS +GPHOTO2_PORT_LIBS = $GPHOTO2_PORT_LIBS +LCMS2_CFLAGS = $LCMS2_CFLAGS +LCMS2_LIBS = $LCMS2_LIBS +FREETYPE_CFLAGS = $FREETYPE_CFLAGS +FREETYPE_LIBS = $FREETYPE_LIBS +GSTREAMER_CFLAGS = $GSTREAMER_CFLAGS +GSTREAMER_LIBS = $GSTREAMER_LIBS +CAPI20_CFLAGS = $CAPI20_CFLAGS +CAPI20_LIBS = $CAPI20_LIBS +JPEG_CFLAGS = $JPEG_CFLAGS +JPEG_LIBS = $JPEG_LIBS +PNG_CFLAGS = $PNG_CFLAGS +PNG_LIBS = $PNG_LIBS +TIFF_CFLAGS = $TIFF_CFLAGS +TIFF_LIBS = $TIFF_LIBS +MPG123_CFLAGS = $MPG123_CFLAGS +MPG123_LIBS = $MPG123_LIBS +" + + wine_fn_append_rule " # Rules automatically generated by configure diff --git a/configure.ac b/configure.ac index 1a39337..f9f3e07 100644 --- a/configure.ac +++ b/configure.ac @@ -2593,6 +2593,10 @@ AH_BOTTOM([#endif /* WINE_CROSSTEST */ AC_CONFIG_COMMANDS([include/stamp-h], [echo timestamp > include/stamp-h]) AS_ECHO_N("creating Makefile rules...") >&AS_MESSAGE_FD +AC_SUBST([ALL_VARS_RULES], +"m4_set_foreach([_AC_SUBST_VARS],[var],[m4_if(m4_bregexp(m4_defn([var]),[$_CFLAGS\|_LIBS$$]),-1,,[var = $var +])])") + dnl Main makefile WINE_APPEND_RULE([ diff --git a/dlls/capi2032/Makefile.in b/dlls/capi2032/Makefile.in index 6312c13..aa4003e 100644 --- a/dlls/capi2032/Makefile.in +++ b/dlls/capi2032/Makefile.in @@ -1,5 +1,5 @@ MODULE = capi2032.dll IMPORTLIB = capi2032 -EXTRAINCL = @CAPI20_CFLAGS@ +EXTRAINCL = $(CAPI20_CFLAGS) C_SRCS = cap20wxx.c diff --git a/dlls/gdi32/Makefile.in b/dlls/gdi32/Makefile.in index 7f77208..da31559 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 = @FREETYPE_CFLAGS@ @FONTCONFIGINCL@ +EXTRAINCL = $(FREETYPE_CFLAGS) @FONTCONFIGINCL@ EXTRALIBS = @CARBONLIB@ @APPKITLIB@ DELAYIMPORTS = usp10 diff --git a/dlls/glu32/Makefile.in b/dlls/glu32/Makefile.in index a31b14c..79418f7 100644 --- a/dlls/glu32/Makefile.in +++ b/dlls/glu32/Makefile.in @@ -1,7 +1,7 @@ MODULE = glu32.dll IMPORTLIB = glu32 -EXTRAINCL = @X_CFLAGS@ -EXTRALIBS = -lGLU @OPENGL_LIBS@ @X_LIBS@ @XLIB@ @X_EXTRA_LIBS@ +EXTRAINCL = $(X_CFLAGS) +EXTRALIBS = -lGLU $(OPENGL_LIBS) $(X_LIBS) @XLIB@ $(X_EXTRA_LIBS) C_SRCS = \ glu.c diff --git a/dlls/gphoto2.ds/Makefile.in b/dlls/gphoto2.ds/Makefile.in index 6e50a21..f2921be 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 = @GPHOTO2_LIBS@ @GPHOTO2_PORT_LIBS@ -EXTRAINCL = @GPHOTO2_CFLAGS@ @GPHOTO2_PORT_CFLAGS@ @JPEG_CFLAGS@ +EXTRALIBS = $(GPHOTO2_LIBS) $(GPHOTO2_PORT_LIBS) +EXTRAINCL = $(GPHOTO2_CFLAGS) $(GPHOTO2_PORT_CFLAGS) $(JPEG_CFLAGS) C_SRCS = \ capability.c \ diff --git a/dlls/mountmgr.sys/Makefile.in b/dlls/mountmgr.sys/Makefile.in index 36895e3..3e542fa 100644 --- a/dlls/mountmgr.sys/Makefile.in +++ b/dlls/mountmgr.sys/Makefile.in @@ -2,7 +2,7 @@ MODULE = mountmgr.sys IMPORTS = uuid advapi32 ntoskrnl.exe DELAYIMPORTS = user32 EXTRADLLFLAGS = -Wb,--subsystem,native -EXTRAINCL = @DBUS_CFLAGS@ @HAL_CFLAGS@ +EXTRAINCL = $(DBUS_CFLAGS) $(HAL_CFLAGS) EXTRALIBS = @DISKARBITRATIONLIB@ C_SRCS = \ diff --git a/dlls/mscms/Makefile.in b/dlls/mscms/Makefile.in index ffe8cb1..ef6ae23 100644 --- a/dlls/mscms/Makefile.in +++ b/dlls/mscms/Makefile.in @@ -1,8 +1,8 @@ MODULE = mscms.dll IMPORTLIB = mscms IMPORTS = shlwapi advapi32 -EXTRAINCL = @LCMS2_CFLAGS@ -EXTRALIBS = @LCMS2_LIBS@ +EXTRAINCL = $(LCMS2_CFLAGS) +EXTRALIBS = $(LCMS2_LIBS) C_SRCS = \ handle.c \ diff --git a/dlls/msxml3/Makefile.in b/dlls/msxml3/Makefile.in index a4fc087..936c745 100644 --- a/dlls/msxml3/Makefile.in +++ b/dlls/msxml3/Makefile.in @@ -1,7 +1,7 @@ MODULE = msxml3.dll IMPORTS = uuid urlmon shlwapi oleaut32 ole32 user32 advapi32 -EXTRALIBS = @XML2_LIBS@ -EXTRAINCL = @XML2_CFLAGS@ @XSLT_CFLAGS@ +EXTRALIBS = $(XML2_LIBS) +EXTRAINCL = $(XML2_CFLAGS) $(XSLT_CFLAGS) C_SRCS = \ attribute.c \ diff --git a/dlls/sane.ds/Makefile.in b/dlls/sane.ds/Makefile.in index a98766a..a0310d3 100644 --- a/dlls/sane.ds/Makefile.in +++ b/dlls/sane.ds/Makefile.in @@ -1,6 +1,6 @@ MODULE = sane.ds IMPORTS = comctl32 user32 gdi32 -EXTRAINCL = @SANE_CFLAGS@ +EXTRAINCL = $(SANE_CFLAGS) C_SRCS = \ capability.c \ diff --git a/dlls/secur32/Makefile.in b/dlls/secur32/Makefile.in index 72e6df4..413e5b3 100644 --- a/dlls/secur32/Makefile.in +++ b/dlls/secur32/Makefile.in @@ -2,7 +2,7 @@ MODULE = secur32.dll IMPORTLIB = secur32 IMPORTS = netapi32 advapi32 DELAYIMPORTS = crypt32 -EXTRAINCL = @GNUTLS_CFLAGS@ +EXTRAINCL = $(GNUTLS_CFLAGS) EXTRALIBS = @SECURITYLIB@ C_SRCS = \ diff --git a/dlls/windowscodecs/Makefile.in b/dlls/windowscodecs/Makefile.in index 2244642..50ecc29 100644 --- a/dlls/windowscodecs/Makefile.in +++ b/dlls/windowscodecs/Makefile.in @@ -1,7 +1,7 @@ MODULE = windowscodecs.dll IMPORTLIB = windowscodecs IMPORTS = uuid ole32 oleaut32 rpcrt4 shlwapi user32 gdi32 advapi32 -EXTRAINCL = @JPEG_CFLAGS@ @PNG_CFLAGS@ @TIFF_CFLAGS@ +EXTRAINCL = $(JPEG_CFLAGS) $(PNG_CFLAGS) $(TIFF_CFLAGS) EXTRALIBS = @APPLICATIONSERVICESLIB@ C_SRCS = \ diff --git a/dlls/winegstreamer/Makefile.in b/dlls/winegstreamer/Makefile.in index 286d6ec..af07a43 100644 --- a/dlls/winegstreamer/Makefile.in +++ b/dlls/winegstreamer/Makefile.in @@ -1,7 +1,7 @@ MODULE = winegstreamer.dll IMPORTS = strmbase strmiids uuid winmm msacm32 msvfw32 ole32 oleaut32 user32 gdi32 advapi32 -EXTRAINCL = @GSTREAMER_CFLAGS@ -EXTRALIBS = @GSTREAMER_LIBS@ @LIBPTHREAD@ +EXTRAINCL = $(GSTREAMER_CFLAGS) +EXTRALIBS = $(GSTREAMER_LIBS) @LIBPTHREAD@ C_SRCS = \ glibthread.c \ diff --git a/dlls/winemp3.acm/Makefile.in b/dlls/winemp3.acm/Makefile.in index 71e2ccd..7627155 100644 --- a/dlls/winemp3.acm/Makefile.in +++ b/dlls/winemp3.acm/Makefile.in @@ -1,7 +1,7 @@ MODULE = winemp3.acm IMPORTS = winmm user32 -EXTRAINCL = @MPG123_CFLAGS@ -EXTRALIBS = @MPG123_LIBS@ @COREAUDIO@ +EXTRAINCL = $(MPG123_CFLAGS) +EXTRALIBS = $(MPG123_LIBS) @COREAUDIO@ C_SRCS = \ mpegl3.c diff --git a/dlls/winex11.drv/Makefile.in b/dlls/winex11.drv/Makefile.in index 3f40fda..bc8c5bc 100644 --- a/dlls/winex11.drv/Makefile.in +++ b/dlls/winex11.drv/Makefile.in @@ -1,8 +1,8 @@ MODULE = winex11.drv IMPORTS = uuid user32 gdi32 advapi32 DELAYIMPORTS = comctl32 ole32 shell32 imm32 -EXTRAINCL = @X_CFLAGS@ -EXTRALIBS = @X_LIBS@ @XLIB@ @X_EXTRA_LIBS@ +EXTRAINCL = $(X_CFLAGS) +EXTRALIBS = $(X_LIBS) @XLIB@ $(X_EXTRA_LIBS) C_SRCS = \ bitblt.c \ diff --git a/tools/Makefile.in b/tools/Makefile.in index 3ee8473..a7cc154 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -1,5 +1,5 @@ -EXTRAINCL = @FREETYPE_CFLAGS@ -FREETYPELIBS = @FREETYPE_LIBS@ +EXTRAINCL = $(FREETYPE_CFLAGS) +FREETYPELIBS = $(FREETYPE_LIBS) PROGRAMS = \ fnt2fon$(EXEEXT) \

1 0

Dmitry Timoshkov : scrrun: Fix file object leak on destruction.
by Alexandre Julliard 30 Jan '14

30 Jan '14

Module: wine Branch: master Commit: 5a14d9e1e30ab348c38bd8fab99dcbf4fdc548b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a14d9e1e30ab348c38bd8fab… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Jan 30 14:20:03 2014 +0900 scrrun: Fix file object leak on destruction. --- dlls/scrrun/filesystem.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index 41cb51f..59add71 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -1522,7 +1522,10 @@ static ULONG WINAPI file_Release(IFile *iface) TRACE("(%p) ref=%d\n", This, ref); if(!ref) + { heap_free(This->path); + heap_free(This); + } return ref; }

1 0

Dmitry Timoshkov : scrrun: Make file and folder collection constructors static.
by Alexandre Julliard 30 Jan '14

30 Jan '14

Module: wine Branch: master Commit: e526f120a9db000827fdeaaf20ebf92d99840441 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e526f120a9db000827fdeaaf2… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Jan 30 14:19:53 2014 +0900 scrrun: Make file and folder collection constructors static. --- dlls/scrrun/filesystem.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index 630e7e3..41cb51f 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -615,7 +615,7 @@ static const IEnumVARIANTVtbl foldercollenumvariantvtbl = { foldercoll_enumvariant_Clone }; -HRESULT create_foldercoll_enum(struct foldercollection *collection, IUnknown **newenum) +static HRESULT create_foldercoll_enum(struct foldercollection *collection, IUnknown **newenum) { struct enumvariant *This; @@ -770,7 +770,7 @@ static const IEnumVARIANTVtbl filecollenumvariantvtbl = { filecoll_enumvariant_Clone }; -HRESULT create_filecoll_enum(struct filecollection *collection, IUnknown **newenum) +static HRESULT create_filecoll_enum(struct filecollection *collection, IUnknown **newenum) { struct enumvariant *This;

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits January 2014