January 2014 - Wine-Commits

Henri Verbeet : wined3d: Also destroy the logo and cursor textures in wined3d_device_reset() when resetting state.
by Alexandre Julliard Jan. 30, 2014

Jan. 30, 2014

Module: wine Branch: master Commit: 82b38139eb21a6898e4621eb7405e99189c09b18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82b38139eb21a6898e4621eb7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 30 17:32:04 2014 +0100 wined3d: Also destroy the logo and cursor textures in wined3d_device_reset() when resetting state. --- dlls/wined3d/device.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 6ef944c..256052f 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4137,7 +4137,19 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, } if (reset_state) + { + if (device->logo_texture) + { + wined3d_texture_decref(device->logo_texture); + device->logo_texture = NULL; + } + if (device->cursor_texture) + { + wined3d_texture_decref(device->cursor_texture); + device->cursor_texture = NULL; + } state_unbind_resources(&device->state); + } if (device->fb.render_targets) {

1 0

Francois Gouget : dpnet/tests: Add a trailing '\n' to an ok() call.
by Alexandre Julliard Jan. 30, 2014

Jan. 30, 2014

Module: wine Branch: master Commit: a6a5273959df38718ae39d9429bab0da64e47238 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6a5273959df38718ae39d942… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Jan 30 14:32:08 2014 +0100 dpnet/tests: Add a trailing '\n' to an ok() call. --- dlls/dpnet/tests/server.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dpnet/tests/server.c b/dlls/dpnet/tests/server.c index 70cf16a..ab3e360 100644 --- a/dlls/dpnet/tests/server.c +++ b/dlls/dpnet/tests/server.c @@ -33,7 +33,7 @@ static void create_server(void) IDirectPlay8Server *server = NULL; hr = CoCreateInstance( &CLSID_DirectPlay8Server, NULL, CLSCTX_ALL, &IID_IDirectPlay8Server, (LPVOID*)&server); - ok(hr == S_OK, "Failed to create IDirectPlay8Server object"); + ok(hr == S_OK, "Failed to create IDirectPlay8Server object\n"); if( SUCCEEDED(hr) ) { hr = IDirectPlay8Server_Close(server, 0);

1 0

André Hentschel : oleaut32/tests: Use boolean return values in boolean functions.
by Alexandre Julliard Jan. 30, 2014

Jan. 30, 2014

Module: wine Branch: master Commit: 16111fa63c2aa67488bcc5421b52b86cee32fcb9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=16111fa63c2aa67488bcc5421… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Jan 28 00:09:34 2014 +0100 oleaut32/tests: Use boolean return values in boolean functions. --- dlls/oleaut32/tests/tmarshal.c | 5 ++--- dlls/oleaut32/tests/vartest.c | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/oleaut32/tests/tmarshal.c b/dlls/oleaut32/tests/tmarshal.c index 5753871..f9d9db9 100644 --- a/dlls/oleaut32/tests/tmarshal.c +++ b/dlls/oleaut32/tests/tmarshal.c @@ -721,9 +721,8 @@ static BOOL mystruct_uint_ordered(MYSTRUCT *mystruct) int i; for (i = 0; i < sizeof(mystruct->uarr)/sizeof(mystruct->uarr[0]); i++) if (mystruct->uarr[i] != i) - return 0; - - return 1; + return FALSE; + return TRUE; } static HRESULT WINAPI Widget_StructArgs( diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index bc8c4ba..9ca541f 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -290,7 +290,7 @@ static BOOL is_expected_variant( const VARIANT *result, const VARIANT *expected return !memcmp( &V_DECIMAL(result), &V_DECIMAL(expected), sizeof(DECIMAL) ); default: ok(0, "unhandled variant type %s\n",vtstr(V_VT(expected))); - return 0; + return FALSE; } }

1 0

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

Jan. 30, 2014

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: Rename substituted variables to a standard _CFLAGS and _LIBS format.
by Alexandre Julliard Jan. 30, 2014

Jan. 30, 2014

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

Jacek Caban : wmp: Added IProvideClassInfo2::GetGUID implementation.
by Alexandre Julliard Jan. 30, 2014

Jan. 30, 2014

Module: wine Branch: master Commit: fe7c32081f344c3f19e7accbdb7a1424d83d92c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe7c32081f344c3f19e7accbd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 30 14:38:15 2014 +0100 wmp: Added IProvideClassInfo2::GetGUID implementation. --- dlls/wmp/oleobj.c | 12 ++++++++++-- include/wmp.idl | 9 +++++++++ 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/wmp/oleobj.c b/dlls/wmp/oleobj.c index bab6c62..79a21ca 100644 --- a/dlls/wmp/oleobj.c +++ b/dlls/wmp/oleobj.c @@ -291,8 +291,16 @@ static HRESULT WINAPI ProvideClassInfo2_GetClassInfo(IProvideClassInfo2 *iface, static HRESULT WINAPI ProvideClassInfo2_GetGUID(IProvideClassInfo2 *iface, DWORD dwGuidKind, GUID *pGUID) { WindowsMediaPlayer *This = impl_from_IProvideClassInfo2(iface); - FIXME("(%p)->(%d %p)\n", This, dwGuidKind, pGUID); - return E_NOTIMPL; + + TRACE("(%p)->(%d %p)\n", This, dwGuidKind, pGUID); + + if(dwGuidKind != GUIDKIND_DEFAULT_SOURCE_DISP_IID) { + FIXME("Unexpected dwGuidKind %d\n", dwGuidKind); + return E_INVALIDARG; + } + + *pGUID = IID__WMPOCXEvents; + return S_OK; } static const IProvideClassInfo2Vtbl ProvideClassInfo2Vtbl = { diff --git a/include/wmp.idl b/include/wmp.idl index 86e507d..429fc8d 100644 --- a/include/wmp.idl +++ b/include/wmp.idl @@ -31,6 +31,15 @@ import "ocidl.idl"; uuid(6bf52a50-394a-11d3-b153-00c04f79Faa6) ] library WMPLib { + importlib("stdole2.tlb"); + + [ + hidden, + uuid(6bf52a51-394a-11d3-b153-00c04f79faa6) + ] + interface _WMPOCXEvents : IDispatch + {} + [ helpstring("Windows Media Player"), threading(apartment),

1 0

Francois Gouget : Assorted spelling fixes.
by Alexandre Julliard Jan. 30, 2014

Jan. 30, 2014

Module: wine Branch: master Commit: bff3d35e206cd2a957fc3a970b7c121d912d214f URL: http://source.winehq.org/git/wine.git/?a=commit;h=bff3d35e206cd2a957fc3a970… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Jan 30 14:31:52 2014 +0100 Assorted spelling fixes. --- dlls/kernel32/tests/sync.c | 2 +- dlls/ws2_32/socket.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/sync.c b/dlls/kernel32/tests/sync.c index 74f1a84..47984cc 100644 --- a/dlls/kernel32/tests/sync.c +++ b/dlls/kernel32/tests/sync.c @@ -2277,7 +2277,7 @@ static void test_srwlock_example(void) WaitForSingleObject(h3, 1000); ok(!srwlock_inside, "threads didn't terminate properly, srwlock_inside is %d.\n", srwlock_inside); - ok(!srwlock_example_errors, "errors occured while running SRWLock example test (number of errors: %d)\n", + ok(!srwlock_example_errors, "errors occurred while running SRWLock example test (number of errors: %d)\n", srwlock_example_errors); trace("number of shared accesses per thread are c1 %d, c2 %d, c3 %d\n", cnt1, cnt2, cnt3); diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 0ae0c4f..ff5a533 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -6070,7 +6070,7 @@ SOCKET WINAPI WSASocketW(int af, int type, int protocol, } /* - Windows has an extension to the IPX protocol that allows to create sockets + Windows has an extension to the IPX protocol that allows one to create sockets and set the IPX packet type at the same time, to do that a caller will use a protocol like NSPROTO_IPX + <PACKET TYPE> */

1 0

Jacek Caban : wmp/tests: Added tests.
by Alexandre Julliard Jan. 30, 2014

Jan. 30, 2014

Module: wine Branch: master Commit: d041a46caa18308748557c58dae27b25f94b440c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d041a46caa18308748557c58d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 30 14:38:30 2014 +0100 wmp/tests: Added tests. --- configure | 1 + configure.ac | 1 + dlls/wmp/tests/Makefile.in | 4 +++ dlls/wmp/tests/oleobj.c | 62 ++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 68 insertions(+) diff --git a/configure b/configure index 0411c35..6f5652a 100755 --- a/configure +++ b/configure @@ -17173,6 +17173,7 @@ wine_fn_config_dll wmi enable_wmi wine_fn_config_dll wmiutils enable_wmiutils clean wine_fn_config_test dlls/wmiutils/tests wmiutils_test wine_fn_config_dll wmp enable_wmp clean +wine_fn_config_test dlls/wmp/tests wmp_test wine_fn_config_dll wmvcore enable_wmvcore wine_fn_config_dll wnaspi32 enable_wnaspi32 implib wine_fn_config_dll wow32 enable_win16 implib diff --git a/configure.ac b/configure.ac index d3b9a91..9a8393c 100644 --- a/configure.ac +++ b/configure.ac @@ -3216,6 +3216,7 @@ WINE_CONFIG_DLL(wmi) WINE_CONFIG_DLL(wmiutils,,[clean]) WINE_CONFIG_TEST(dlls/wmiutils/tests) WINE_CONFIG_DLL(wmp,,[clean]) +WINE_CONFIG_TEST(dlls/wmp/tests) WINE_CONFIG_DLL(wmvcore) WINE_CONFIG_DLL(wnaspi32,,[implib]) WINE_CONFIG_DLL(wow32,enable_win16,[implib]) diff --git a/dlls/wmp/tests/Makefile.in b/dlls/wmp/tests/Makefile.in new file mode 100644 index 0000000..ac30f90 --- /dev/null +++ b/dlls/wmp/tests/Makefile.in @@ -0,0 +1,4 @@ +TESTDLL = wmp.dll +IMPORTS = ole32 + +C_SRCS = oleobj.c diff --git a/dlls/wmp/tests/oleobj.c b/dlls/wmp/tests/oleobj.c new file mode 100644 index 0000000..45dea43 --- /dev/null +++ b/dlls/wmp/tests/oleobj.c @@ -0,0 +1,62 @@ +/* + * Copyright 2014 Jacek Caban for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define WIN32_LEAN_AND_MEAN +#define COBJMACROS +#include <initguid.h> +#include <windows.h> +#include <wmp.h> + +#include "wine/test.h" + +static void test_wmp(void) +{ + IProvideClassInfo2 *class_info; + IOleObject *oleobj; + GUID guid; + LONG ref; + HRESULT hres; + + hres = CoCreateInstance(&CLSID_WindowsMediaPlayer, NULL, CLSCTX_INPROC_SERVER, &IID_IOleObject, (void**)&oleobj); + if(hres == REGDB_E_CLASSNOTREG) { + win_skip("CLSID_WindowsMediaPlayer not registered\n"); + return; + } + ok(hres == S_OK, "Coult not create CLSID_WindowsMediaPlayer instance: %08x\n", hres); + + hres = IOleObject_QueryInterface(oleobj, &IID_IProvideClassInfo2, (void**)&class_info); + ok(hres == S_OK, "Could not get IProvideClassInfo2 iface: %08x\n", hres); + + hres = IProvideClassInfo2_GetGUID(class_info, GUIDKIND_DEFAULT_SOURCE_DISP_IID, &guid); + ok(hres == S_OK, "GetGUID failed: %08x\n", hres); + ok(IsEqualGUID(&guid, &IID__WMPOCXEvents), "guid = %s\n", wine_dbgstr_guid(&guid)); + + IProvideClassInfo2_Release(class_info); + + ref = IOleObject_Release(oleobj); + ok(!ref, "ref = %d\n", ref); +} + +START_TEST(oleobj) +{ + CoInitialize(NULL); + + test_wmp(); + + CoUninitialize(); +}

1 0

Francois Gouget : gdiplus: Make METAFILE_GetEmfType() static.
by Alexandre Julliard Jan. 30, 2014

Jan. 30, 2014

Module: wine Branch: master Commit: d371225ec22b27705e582a475d70302c03e07f8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d371225ec22b27705e582a475… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Jan 30 14:31:11 2014 +0100 gdiplus: Make METAFILE_GetEmfType() static. --- dlls/gdiplus/metafile.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index 15929a0..ed00a3e 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -914,7 +914,7 @@ static int CALLBACK get_metafile_type_proc(HDC hDC, HANDLETABLE *lpHTable, const return FALSE; } -MetafileType METAFILE_GetEmfType(HENHMETAFILE hemf) +static MetafileType METAFILE_GetEmfType(HENHMETAFILE hemf) { MetafileType result = MetafileTypeInvalid; EnumEnhMetaFile(NULL, hemf, get_metafile_type_proc, &result, NULL);

1 0

André Hentschel : winex11: Use boolean return values in boolean function.
by Alexandre Julliard Jan. 30, 2014

Jan. 30, 2014

Module: wine Branch: master Commit: a35b41acaa3466a7a698e8ca8a5e7c362c72738c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a35b41acaa3466a7a698e8ca8… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Jan 28 00:09:00 2014 +0100 winex11: Use boolean return values in boolean function. --- dlls/winex11.drv/palette.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/palette.c b/dlls/winex11.drv/palette.c index d19d112..cd90885 100644 --- a/dlls/winex11.drv/palette.c +++ b/dlls/winex11.drv/palette.c @@ -1058,8 +1058,8 @@ static BOOL X11DRV_PALETTE_CheckSysColor( const PALETTEENTRY *sys_pal_template, int i; for( i = 0; i < NB_RESERVED_COLORS; i++ ) if( c == (*(const COLORREF*)(sys_pal_template + i) & 0x00ffffff) ) - return 0; - return 1; + return FALSE; + return TRUE; }

1 0

Alexandre Julliard : configure: Use AS_VAR_IF to test variables where appropriate.
by Alexandre Julliard Jan. 30, 2014

Jan. 30, 2014

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: Trace the results of pkg-config checks to the config.log file.
by Alexandre Julliard Jan. 30, 2014

Jan. 30, 2014

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 Jan. 30, 2014

Jan. 30, 2014

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

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

Jan. 30, 2014

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

André Hentschel : kernel32: Use boolean return values in boolean functions.
by Alexandre Julliard Jan. 30, 2014

Jan. 30, 2014

Module: wine Branch: master Commit: 8439cc9da49cb0784705e246974e347a7056de5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=8439cc9da49cb0784705e2469… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Jan 28 00:07:17 2014 +0100 kernel32: Use boolean return values in boolean functions. --- dlls/kernel32/process.c | 2 +- dlls/kernel32/resource.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index ca21e09..bf113d6 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -3544,7 +3544,7 @@ BOOL WINAPI QueryFullProcessImageNameW(HANDLE hProcess, DWORD dwFlags, LPWSTR lp if (ntlen + 1 > *pdwSize) { SetLastError(ERROR_INSUFFICIENT_BUFFER); - return 0; + return FALSE; } *pdwSize = ntlen; diff --git a/dlls/kernel32/resource.c b/dlls/kernel32/resource.c index a9491e0..e829f28 100644 --- a/dlls/kernel32/resource.c +++ b/dlls/kernel32/resource.c @@ -572,7 +572,7 @@ LPVOID WINAPI LockResource( HGLOBAL handle ) */ BOOL WINAPI FreeResource( HGLOBAL handle ) { - return 0; + return FALSE; }

1 0

Alexandre Julliard : configure: Merge the X_LIBS and XLIB variables.
by Alexandre Julliard Jan. 30, 2014

Jan. 30, 2014

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

André Hentschel : msvcp90: Use boolean return values in boolean functions.
by Alexandre Julliard Jan. 30, 2014

Jan. 30, 2014

Module: wine Branch: master Commit: 63faf29c2aaf0706f487e206edd5a036ad841652 URL: http://source.winehq.org/git/wine.git/?a=commit;h=63faf29c2aaf0706f487e206e… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Jan 28 00:08:10 2014 +0100 msvcp90: Use boolean return values in boolean functions. --- dlls/msvcp90/math.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/msvcp90/math.c b/dlls/msvcp90/math.c index f804ac9..11d3c75 100644 --- a/dlls/msvcp90/math.c +++ b/dlls/msvcp90/math.c @@ -462,7 +462,7 @@ __int64 __cdecl std_numeric_limits_int64_denorm_min(void) { return 0; } unsigned __int64 __cdecl std_numeric_limits_unsigned_int64_denorm_min(void) { return 0; } /* ?denorm_min@?$numeric_limits(a)_N@std@@SA_NXZ -> public: static bool __cdecl std::numeric_limits<bool>::denorm_min(void) */ -BOOLEAN __cdecl std_numeric_limits_bool_denorm_min(void) { return 0; } +BOOLEAN __cdecl std_numeric_limits_bool_denorm_min(void) { return FALSE; } /* ?denorm_min@?$numeric_limits(a)_W@std@@SA_WXZ -> public: static wchar_t __cdecl std::numeric_limits<wchar_t>::denorm_min(void) */ WCHAR __cdecl std_numeric_limits_wchar_t_denorm_min(void) { return 0; } @@ -510,7 +510,7 @@ __int64 __cdecl std_numeric_limits_int64_epsilon(void) { return 0; } unsigned __int64 __cdecl std_numeric_limits_unsigned_int64_epsilon(void) { return 0; } /* ?epsilon@?$numeric_limits(a)_N@std@@SA_NXZ -> public: static bool __cdecl std::numeric_limits<bool>::epsilon(void) */ -BOOLEAN __cdecl std_numeric_limits_bool_epsilon(void) { return 0; } +BOOLEAN __cdecl std_numeric_limits_bool_epsilon(void) { return FALSE; } /* ?epsilon@?$numeric_limits(a)_W@std@@SA_WXZ -> public: static wchar_t __cdecl std::numeric_limits<wchar_t>::epsilon(void) */ WCHAR __cdecl std_numeric_limits_wchar_t_epsilon(void) { return 0; } @@ -558,7 +558,7 @@ __int64 __cdecl std_numeric_limits_int64_infinity(void) { return 0; } unsigned __int64 __cdecl std_numeric_limits_unsigned_int64_infinity(void) { return 0; } /* ?infinity@?$numeric_limits(a)_N@std@@SA_NXZ -> public: static bool __cdecl std::numeric_limits<bool>::infinity(void) */ -BOOLEAN __cdecl std_numeric_limits_bool_infinity(void) { return 0; } +BOOLEAN __cdecl std_numeric_limits_bool_infinity(void) { return FALSE; } /* ?infinity@?$numeric_limits(a)_W@std@@SA_WXZ -> public: static wchar_t __cdecl std::numeric_limits<wchar_t>::infinity(void) */ WCHAR __cdecl std_numeric_limits_wchar_t_infinity(void) { return 0; } @@ -606,7 +606,7 @@ __int64 __cdecl std_numeric_limits_int64_max(void) { return I64_MAX; } unsigned __int64 __cdecl std_numeric_limits_unsigned_int64_max(void) { return UI64_MAX; } /* ?max@?$numeric_limits(a)_N@std@@SA_NXZ -> public: static bool __cdecl std::numeric_limits<bool>::max(void) */ -BOOLEAN __cdecl std_numeric_limits_bool_max(void) { return 1; } +BOOLEAN __cdecl std_numeric_limits_bool_max(void) { return TRUE; } /* ?max@?$numeric_limits(a)_W@std@@SA_WXZ -> public: static wchar_t __cdecl std::numeric_limits<wchar_t>::max(void) */ WCHAR __cdecl std_numeric_limits_wchar_t_max(void) { return USHRT_MAX; } @@ -654,7 +654,7 @@ __int64 __cdecl std_numeric_limits_int64_min(void) { return I64_MIN; } unsigned __int64 __cdecl std_numeric_limits_unsigned_int64_min(void) { return 0; } /* ?min@?$numeric_limits(a)_N@std@@SA_NXZ -> public: static bool __cdecl std::numeric_limits<bool>::min(void) */ -BOOLEAN __cdecl std_numeric_limits_bool_min(void) { return 0; } +BOOLEAN __cdecl std_numeric_limits_bool_min(void) { return FALSE; } /* ?min@?$numeric_limits(a)_W@std@@SA_WXZ -> public: static wchar_t __cdecl std::numeric_limits<wchar_t>::min(void) */ WCHAR __cdecl std_numeric_limits_wchar_t_min(void) { return 0; } @@ -702,7 +702,7 @@ __int64 __cdecl std_numeric_limits_int64_quiet_NaN(void) { return 0; } unsigned __int64 __cdecl std_numeric_limits_unsigned_int64_quiet_NaN(void) { return 0; } /* ?quiet_NaN@?$numeric_limits(a)_N@std@@SA_NXZ -> public: static bool __cdecl std::numeric_limits<bool>::quiet_NaN(void) */ -BOOLEAN __cdecl std_numeric_limits_bool_quiet_NaN(void) { return 0; } +BOOLEAN __cdecl std_numeric_limits_bool_quiet_NaN(void) { return FALSE; } /* ?quiet_NaN@?$numeric_limits(a)_W@std@@SA_WXZ -> public: static wchar_t __cdecl std::numeric_limits<wchar_t>::quiet_NaN(void) */ WCHAR __cdecl std_numeric_limits_wchar_t_quiet_NaN(void) { return 0; } @@ -750,7 +750,7 @@ __int64 __cdecl std_numeric_limits_int64_round_error(void) { return 0; } unsigned __int64 __cdecl std_numeric_limits_unsigned_int64_round_error(void) { return 0; } /* ?round_error@?$numeric_limits(a)_N@std@@SA_NXZ -> public: static bool __cdecl std::numeric_limits<bool>::round_error(void) */ -BOOLEAN __cdecl std_numeric_limits_bool_round_error(void) { return 0; } +BOOLEAN __cdecl std_numeric_limits_bool_round_error(void) { return FALSE; } /* ?round_error@?$numeric_limits(a)_W@std@@SA_WXZ -> public: static wchar_t __cdecl std::numeric_limits<wchar_t>::round_error(void) */ WCHAR __cdecl std_numeric_limits_wchar_t_round_error(void) { return 0; } @@ -798,7 +798,7 @@ __int64 __cdecl std_numeric_limits_int64_signaling_NaN(void) { return 0; } unsigned __int64 __cdecl std_numeric_limits_unsigned_int64_signaling_NaN(void) { return 0; } /* ?signaling_NaN@?$numeric_limits(a)_N@std@@SA_NXZ -> public: static bool __cdecl std::numeric_limits<bool>::signaling_NaN(void) */ -BOOLEAN __cdecl std_numeric_limits_bool_signaling_NaN(void) { return 0; } +BOOLEAN __cdecl std_numeric_limits_bool_signaling_NaN(void) { return FALSE; } /* ?signaling_NaN@?$numeric_limits(a)_W@std@@SA_WXZ -> public: static wchar_t __cdecl std::numeric_limits<wchar_t>::signaling_NaN(void) */ WCHAR __cdecl std_numeric_limits_wchar_t_signaling_NaN(void) { return 0; }

1 0

Michael Stefaniuc : dmband/tests: Use the standard COM tests for DirectMusicBandTrack.
by Alexandre Julliard Jan. 30, 2014

Jan. 30, 2014

Module: wine Branch: master Commit: e2ced54e2b4e3d277bfcb96b93774d086b753f86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2ced54e2b4e3d277bfcb96b9… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jan 30 00:54:41 2014 +0100 dmband/tests: Use the standard COM tests for DirectMusicBandTrack. --- dlls/dmband/tests/dmband.c | 75 ++++++++++++++++++++++++++++---------------- 1 file changed, 48 insertions(+), 27 deletions(-) diff --git a/dlls/dmband/tests/dmband.c b/dlls/dmband/tests/dmband.c index 0594c3e..60dbaca 100644 --- a/dlls/dmband/tests/dmband.c +++ b/dlls/dmband/tests/dmband.c @@ -94,35 +94,56 @@ static void test_COM(void) while (IDirectMusicBand_Release(dmb)); } -static void test_dmband(void) +static void test_COM_bandtrack(void) { - IUnknown *unknown = NULL; - IDirectMusicTrack *track = NULL; - IPersistStream *stream = NULL; - IPersistStream *private = NULL; + IDirectMusicTrack *dmbt = (IDirectMusicTrack*)0xdeadbeef; + IPersistStream *ps; + IUnknown *private; + IUnknown *unk; + ULONG refcount; HRESULT hr; - hr = CoCreateInstance(&CLSID_DirectMusicBandTrack, NULL, CLSCTX_INPROC_SERVER, &IID_IUnknown, (LPVOID*)&unknown); - ok(hr == S_OK, "CoCreateInstance returned: %x\n", hr); - hr = IUnknown_QueryInterface(unknown, &IID_IDirectMusicTrack, (LPVOID*)&track); - ok(hr == S_OK, "QueryInterface returned: %x\n", hr); - todo_wine ok((LPVOID)track == (LPVOID)unknown, "Interface are not the same %p != %p\n", stream, private); - hr = IUnknown_QueryInterface(unknown, &IID_IPersistStream, (LPVOID*)&stream); - ok(hr == S_OK, "QueryInterface returned: %x\n", hr); - /* Query private interface */ - hr = IUnknown_QueryInterface(unknown, &IID_IDirectMusicBandTrackPrivate, (LPVOID*)&private); - todo_wine ok(hr == S_OK, "QueryInterface returned: %x\n", hr); - - trace("Interfaces: unknown = %p, track = %p, stream = %p, private = %p\n", unknown, track, stream, private); - - if (private) - IPersistStream_Release(private); - if (stream) - IPersistStream_Release(stream); - if (track) - IDirectMusicTrack_Release(track); - if (unknown) - IUnknown_Release(unknown); + /* COM aggregation */ + hr = CoCreateInstance(&CLSID_DirectMusicBandTrack, (IUnknown*)&dmbt, CLSCTX_INPROC_SERVER, + &IID_IUnknown, (void**)&dmbt); + ok(hr == CLASS_E_NOAGGREGATION, + "DirectMusicBandTrack create failed: %08x, expected CLASS_E_NOAGGREGATION\n", hr); + ok(!dmbt, "dmbt = %p\n", dmbt); + + /* Invalid RIID */ + hr = CoCreateInstance(&CLSID_DirectMusicBandTrack, NULL, CLSCTX_INPROC_SERVER, + &IID_IDirectMusicObject, (void**)&dmbt); + ok(hr == E_NOINTERFACE, "DirectMusicBandTrack create failed: %08x, expected E_NOINTERFACE\n", hr); + + /* Same refcount for all DirectMusicBandTrack interfaces */ + hr = CoCreateInstance(&CLSID_DirectMusicBandTrack, NULL, CLSCTX_INPROC_SERVER, + &IID_IDirectMusicTrack, (void**)&dmbt); + ok(hr == S_OK, "DirectMusicBandTrack create failed: %08x, expected S_OK\n", hr); + refcount = IDirectMusicTrack_AddRef(dmbt); + ok(refcount == 2, "refcount == %u, expected 2\n", refcount); + + hr = IDirectMusicTrack_QueryInterface(dmbt, &IID_IPersistStream, (void**)&ps); + ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr); + refcount = IPersistStream_AddRef(ps); + ok(refcount == 4, "refcount == %u, expected 4\n", refcount); + refcount = IPersistStream_Release(ps); + + hr = IDirectMusicTrack_QueryInterface(dmbt, &IID_IUnknown, (void**)&unk); + ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %08x\n", hr); + refcount = IUnknown_AddRef(unk); + ok(refcount == 5, "refcount == %u, expected 5\n", refcount); + refcount = IUnknown_Release(unk); + + hr = IDirectMusicTrack_QueryInterface(dmbt, &IID_IDirectMusicBandTrackPrivate, + (void**)&private); + todo_wine ok(hr == S_OK, "QueryInterface for IID_IDirectMusicBandTrackPrivate failed: %08x\n", hr); + if (hr == S_OK) { + refcount = IUnknown_AddRef(private); + ok(refcount == 6, "refcount == %u, expected 6\n", refcount); + refcount = IUnknown_Release(private); + } + + while (IDirectMusicTrack_Release(dmbt)); } START_TEST(dmband) @@ -137,7 +158,7 @@ START_TEST(dmband) } test_COM(); - test_dmband(); + test_COM_bandtrack(); CoUninitialize(); }

1 0

Michael Stefaniuc : dmband: COM cleanup for IDirectMusicBand.
by Alexandre Julliard Jan. 30, 2014

Jan. 30, 2014

Module: wine Branch: master Commit: 868ad7dc723e339ab59fbf5430fa08fc17062bf1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=868ad7dc723e339ab59fbf543… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jan 30 01:04:58 2014 +0100 dmband: COM cleanup for IDirectMusicBand. --- dlls/dmband/band.c | 23 ++++++++++++++--------- dlls/dmband/dmband_private.h | 2 +- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/dlls/dmband/band.c b/dlls/dmband/band.c index 74cd98c..a985977 100644 --- a/dlls/dmband/band.c +++ b/dlls/dmband/band.c @@ -26,6 +26,11 @@ WINE_DECLARE_DEBUG_CHANNEL(dmfile); /***************************************************************************** * IDirectMusicBandImpl implementation */ +static inline IDirectMusicBandImpl *impl_from_IDirectMusicBand(IDirectMusicBand *iface) +{ + return CONTAINING_RECORD(iface, IDirectMusicBandImpl, IDirectMusicBand_iface); +} + /* IDirectMusicBandImpl IUnknown part: */ static HRESULT WINAPI IDirectMusicBandImpl_IUnknown_QueryInterface (LPUNKNOWN iface, REFIID riid, LPVOID *ppobj) { ICOM_THIS_MULTI(IDirectMusicBandImpl, UnknownVtbl, iface); @@ -36,7 +41,7 @@ static HRESULT WINAPI IDirectMusicBandImpl_IUnknown_QueryInterface (LPUNKNOWN if IUnknown_AddRef (iface); return S_OK; } else if (IsEqualIID (riid, &IID_IDirectMusicBand)) { - *ppobj = &This->BandVtbl; + *ppobj = &This->IDirectMusicBand_iface; IUnknown_AddRef (iface); return S_OK; } else if (IsEqualIID (riid, &IID_IDirectMusicObject)) { @@ -89,26 +94,26 @@ static const IUnknownVtbl DirectMusicBand_Unknown_Vtbl = { static HRESULT WINAPI IDirectMusicBandImpl_QueryInterface(IDirectMusicBand *iface, REFIID riid, void **ppobj) { - ICOM_THIS_MULTI(IDirectMusicBandImpl, BandVtbl, iface); + IDirectMusicBandImpl *This = impl_from_IDirectMusicBand(iface); return IUnknown_QueryInterface ((LPUNKNOWN)&This->UnknownVtbl, riid, ppobj); } static ULONG WINAPI IDirectMusicBandImpl_AddRef(IDirectMusicBand *iface) { - ICOM_THIS_MULTI(IDirectMusicBandImpl, BandVtbl, iface); + IDirectMusicBandImpl *This = impl_from_IDirectMusicBand(iface); return IUnknown_AddRef ((LPUNKNOWN)&This->UnknownVtbl); } static ULONG WINAPI IDirectMusicBandImpl_Release(IDirectMusicBand *iface) { - ICOM_THIS_MULTI(IDirectMusicBandImpl, BandVtbl, iface); + IDirectMusicBandImpl *This = impl_from_IDirectMusicBand(iface); return IUnknown_Release ((LPUNKNOWN)&This->UnknownVtbl); } static HRESULT WINAPI IDirectMusicBandImpl_CreateSegment(IDirectMusicBand *iface, IDirectMusicSegment **ppSegment) { - ICOM_THIS_MULTI(IDirectMusicBandImpl, BandVtbl, iface); + IDirectMusicBandImpl *This = impl_from_IDirectMusicBand(iface); FIXME("(%p, %p): stub\n", This, ppSegment); return S_OK; } @@ -116,7 +121,7 @@ static HRESULT WINAPI IDirectMusicBandImpl_CreateSegment(IDirectMusicBand *iface static HRESULT WINAPI IDirectMusicBandImpl_Download(IDirectMusicBand *iface, IDirectMusicPerformance *pPerformance) { - ICOM_THIS_MULTI(IDirectMusicBandImpl, BandVtbl, iface); + IDirectMusicBandImpl *This = impl_from_IDirectMusicBand(iface); FIXME("(%p, %p): stub\n", This, pPerformance); return S_OK; } @@ -124,12 +129,12 @@ static HRESULT WINAPI IDirectMusicBandImpl_Download(IDirectMusicBand *iface, static HRESULT WINAPI IDirectMusicBandImpl_Unload(IDirectMusicBand *iface, IDirectMusicPerformance *pPerformance) { - ICOM_THIS_MULTI(IDirectMusicBandImpl, BandVtbl, iface); + IDirectMusicBandImpl *This = impl_from_IDirectMusicBand(iface); FIXME("(%p, %p): stub\n", This, pPerformance); return S_OK; } -static const IDirectMusicBandVtbl DirectMusicBand_Band_Vtbl = { +static const IDirectMusicBandVtbl dmband_vtbl = { IDirectMusicBandImpl_QueryInterface, IDirectMusicBandImpl_AddRef, IDirectMusicBandImpl_Release, @@ -707,7 +712,7 @@ HRESULT WINAPI create_dmband(REFIID lpcGUID, void **ppobj) return E_OUTOFMEMORY; } obj->UnknownVtbl = &DirectMusicBand_Unknown_Vtbl; - obj->BandVtbl = &DirectMusicBand_Band_Vtbl; + obj->IDirectMusicBand_iface.lpVtbl = &dmband_vtbl; obj->ObjectVtbl = &DirectMusicBand_Object_Vtbl; obj->PersistStreamVtbl = &DirectMusicBand_PersistStream_Vtbl; obj->pDesc = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(DMUS_OBJECTDESC)); diff --git a/dlls/dmband/dmband_private.h b/dlls/dmband/dmband_private.h index b69e967..8dc0b12 100644 --- a/dlls/dmband/dmband_private.h +++ b/dlls/dmband/dmband_private.h @@ -88,7 +88,7 @@ typedef struct _DMUS_PRIVATE_BAND { struct IDirectMusicBandImpl { /* IUnknown fields */ const IUnknownVtbl *UnknownVtbl; - const IDirectMusicBandVtbl *BandVtbl; + IDirectMusicBand IDirectMusicBand_iface; const IDirectMusicObjectVtbl *ObjectVtbl; const IPersistStreamVtbl *PersistStreamVtbl; LONG ref;

1 0

Michael Stefaniuc : dmband: Remove the extraneous IUnknown from DirectMusicBand.
by Alexandre Julliard Jan. 30, 2014

Jan. 30, 2014

Module: wine Branch: master Commit: c1b3b58eac830c83200def7642dac0180e261822 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1b3b58eac830c83200def764… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jan 30 01:06:43 2014 +0100 dmband: Remove the extraneous IUnknown from DirectMusicBand. Also lock/unlock the module only on creation/destruction of the object. --- dlls/dmband/band.c | 122 +++++++++++++++++------------------------- dlls/dmband/dmband_private.h | 2 - 2 files changed, 49 insertions(+), 75 deletions(-) diff --git a/dlls/dmband/band.c b/dlls/dmband/band.c index a985977..97e7c30 100644 --- a/dlls/dmband/band.c +++ b/dlls/dmband/band.c @@ -31,83 +31,55 @@ static inline IDirectMusicBandImpl *impl_from_IDirectMusicBand(IDirectMusicBand return CONTAINING_RECORD(iface, IDirectMusicBandImpl, IDirectMusicBand_iface); } -/* IDirectMusicBandImpl IUnknown part: */ -static HRESULT WINAPI IDirectMusicBandImpl_IUnknown_QueryInterface (LPUNKNOWN iface, REFIID riid, LPVOID *ppobj) { - ICOM_THIS_MULTI(IDirectMusicBandImpl, UnknownVtbl, iface); - - TRACE("(%p, %s, %p)\n", This, debugstr_dmguid(riid), ppobj); - if (IsEqualIID (riid, &IID_IUnknown)) { - *ppobj = &This->UnknownVtbl; - IUnknown_AddRef (iface); - return S_OK; - } else if (IsEqualIID (riid, &IID_IDirectMusicBand)) { - *ppobj = &This->IDirectMusicBand_iface; - IUnknown_AddRef (iface); - return S_OK; - } else if (IsEqualIID (riid, &IID_IDirectMusicObject)) { - *ppobj = &This->ObjectVtbl; - IUnknown_AddRef (iface); - return S_OK; - } else if (IsEqualIID (riid, &IID_IPersistStream)) { - *ppobj = &This->PersistStreamVtbl; - IUnknown_AddRef (iface); - return S_OK; - } - - WARN("(%p, %s, %p): not found\n", This, debugstr_dmguid(riid), ppobj); - return E_NOINTERFACE; -} - -static ULONG WINAPI IDirectMusicBandImpl_IUnknown_AddRef (LPUNKNOWN iface) { - ICOM_THIS_MULTI(IDirectMusicBandImpl, UnknownVtbl, iface); - ULONG ref = InterlockedIncrement(&This->ref); - - TRACE("(%p) : AddRef from %d\n", This, ref - 1); - - DMBAND_LockModule(); - - return ref; -} - -static ULONG WINAPI IDirectMusicBandImpl_IUnknown_Release (LPUNKNOWN iface) { - ICOM_THIS_MULTI(IDirectMusicBandImpl, UnknownVtbl, iface); - ULONG ref = InterlockedDecrement(&This->ref); - - TRACE("(%p) : ReleaseRef to %d\n", This, ref); +/* DirectMusicBandImpl IDirectMusicBand part: */ +static HRESULT WINAPI IDirectMusicBandImpl_QueryInterface(IDirectMusicBand *iface, REFIID riid, + void **ret_iface) +{ + IDirectMusicBandImpl *This = impl_from_IDirectMusicBand(iface); - if (ref == 0) { - HeapFree(GetProcessHeap(), 0, This); - } + TRACE("(%p, %s, %p)\n", This, debugstr_dmguid(riid), ret_iface); - DMBAND_UnlockModule(); - - return ref; -} + *ret_iface = NULL; -static const IUnknownVtbl DirectMusicBand_Unknown_Vtbl = { - IDirectMusicBandImpl_IUnknown_QueryInterface, - IDirectMusicBandImpl_IUnknown_AddRef, - IDirectMusicBandImpl_IUnknown_Release -}; + if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IDirectMusicBand)) + *ret_iface = iface; + else if (IsEqualIID(riid, &IID_IDirectMusicObject)) + *ret_iface = &This->ObjectVtbl; + else if (IsEqualIID(riid, &IID_IPersistStream)) + *ret_iface = &This->PersistStreamVtbl; + else { + WARN("(%p, %s, %p): not found\n", This, debugstr_dmguid(riid), ret_iface); + return E_NOINTERFACE; + } -/* IDirectMusicBandImpl IDirectMusicBand part: */ -static HRESULT WINAPI IDirectMusicBandImpl_QueryInterface(IDirectMusicBand *iface, REFIID riid, - void **ppobj) -{ - IDirectMusicBandImpl *This = impl_from_IDirectMusicBand(iface); - return IUnknown_QueryInterface ((LPUNKNOWN)&This->UnknownVtbl, riid, ppobj); + IDirectMusicBand_AddRef((IUnknown*)*ret_iface); + return S_OK; } static ULONG WINAPI IDirectMusicBandImpl_AddRef(IDirectMusicBand *iface) { IDirectMusicBandImpl *This = impl_from_IDirectMusicBand(iface); - return IUnknown_AddRef ((LPUNKNOWN)&This->UnknownVtbl); + LONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + return ref; } static ULONG WINAPI IDirectMusicBandImpl_Release(IDirectMusicBand *iface) { IDirectMusicBandImpl *This = impl_from_IDirectMusicBand(iface); - return IUnknown_Release ((LPUNKNOWN)&This->UnknownVtbl); + LONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + if (!ref) { + HeapFree(GetProcessHeap(), 0, This->pDesc); + HeapFree(GetProcessHeap(), 0, This); + DMBAND_UnlockModule(); + } + + return ref; } static HRESULT WINAPI IDirectMusicBandImpl_CreateSegment(IDirectMusicBand *iface, @@ -146,17 +118,17 @@ static const IDirectMusicBandVtbl dmband_vtbl = { /* IDirectMusicBandImpl IDirectMusicObject part: */ static HRESULT WINAPI IDirectMusicBandImpl_IDirectMusicObject_QueryInterface (LPDIRECTMUSICOBJECT iface, REFIID riid, LPVOID *ppobj) { ICOM_THIS_MULTI(IDirectMusicBandImpl, ObjectVtbl, iface); - return IUnknown_QueryInterface ((LPUNKNOWN)&This->UnknownVtbl, riid, ppobj); + return IDirectMusicBand_QueryInterface(&This->IDirectMusicBand_iface, riid, ppobj); } static ULONG WINAPI IDirectMusicBandImpl_IDirectMusicObject_AddRef (LPDIRECTMUSICOBJECT iface) { ICOM_THIS_MULTI(IDirectMusicBandImpl, ObjectVtbl, iface); - return IUnknown_AddRef ((LPUNKNOWN)&This->UnknownVtbl); + return IDirectMusicBand_AddRef(&This->IDirectMusicBand_iface); } static ULONG WINAPI IDirectMusicBandImpl_IDirectMusicObject_Release (LPDIRECTMUSICOBJECT iface) { ICOM_THIS_MULTI(IDirectMusicBandImpl, ObjectVtbl, iface); - return IUnknown_Release ((LPUNKNOWN)&This->UnknownVtbl); + return IDirectMusicBand_Release(&This->IDirectMusicBand_iface); } static HRESULT WINAPI IDirectMusicBandImpl_IDirectMusicObject_GetDescriptor (LPDIRECTMUSICOBJECT iface, LPDMUS_OBJECTDESC pDesc) { @@ -360,17 +332,17 @@ static const IDirectMusicObjectVtbl DirectMusicBand_Object_Vtbl = { /* IDirectMusicBandImpl IPersistStream part: */ static HRESULT WINAPI IDirectMusicBandImpl_IPersistStream_QueryInterface (LPPERSISTSTREAM iface, REFIID riid, LPVOID *ppobj) { ICOM_THIS_MULTI(IDirectMusicBandImpl, PersistStreamVtbl, iface); - return IUnknown_QueryInterface ((LPUNKNOWN)&This->UnknownVtbl, riid, ppobj); + return IDirectMusicBand_QueryInterface(&This->IDirectMusicBand_iface, riid, ppobj); } static ULONG WINAPI IDirectMusicBandImpl_IPersistStream_AddRef (LPPERSISTSTREAM iface) { ICOM_THIS_MULTI(IDirectMusicBandImpl, PersistStreamVtbl, iface); - return IUnknown_AddRef ((LPUNKNOWN)&This->UnknownVtbl); + return IDirectMusicBand_AddRef(&This->IDirectMusicBand_iface); } static ULONG WINAPI IDirectMusicBandImpl_IPersistStream_Release (LPPERSISTSTREAM iface) { ICOM_THIS_MULTI(IDirectMusicBandImpl, PersistStreamVtbl, iface); - return IUnknown_Release ((LPUNKNOWN)&This->UnknownVtbl); + return IDirectMusicBand_Release(&This->IDirectMusicBand_iface); } static HRESULT WINAPI IDirectMusicBandImpl_IPersistStream_GetClassID (LPPERSISTSTREAM iface, CLSID* pClassID) { @@ -705,13 +677,13 @@ static const IPersistStreamVtbl DirectMusicBand_PersistStream_Vtbl = { HRESULT WINAPI create_dmband(REFIID lpcGUID, void **ppobj) { IDirectMusicBandImpl* obj; - + HRESULT hr; + obj = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicBandImpl)); if (NULL == obj) { *ppobj = NULL; return E_OUTOFMEMORY; } - obj->UnknownVtbl = &DirectMusicBand_Unknown_Vtbl; obj->IDirectMusicBand_iface.lpVtbl = &dmband_vtbl; obj->ObjectVtbl = &DirectMusicBand_Object_Vtbl; obj->PersistStreamVtbl = &DirectMusicBand_PersistStream_Vtbl; @@ -719,8 +691,12 @@ HRESULT WINAPI create_dmband(REFIID lpcGUID, void **ppobj) DM_STRUCT_INIT(obj->pDesc); obj->pDesc->dwValidData |= DMUS_OBJ_CLASS; obj->pDesc->guidClass = CLSID_DirectMusicBand; - obj->ref = 0; /* will be inited by QueryInterface */ + obj->ref = 1; list_init (&obj->Instruments); - return IDirectMusicBandImpl_IUnknown_QueryInterface ((LPUNKNOWN)&obj->UnknownVtbl, lpcGUID, ppobj); + DMBAND_LockModule(); + hr = IDirectMusicBand_QueryInterface(&obj->IDirectMusicBand_iface, lpcGUID, ppobj); + IDirectMusicBand_Release(&obj->IDirectMusicBand_iface); + + return hr; } diff --git a/dlls/dmband/dmband_private.h b/dlls/dmband/dmband_private.h index 8dc0b12..6be6ae8 100644 --- a/dlls/dmband/dmband_private.h +++ b/dlls/dmband/dmband_private.h @@ -86,8 +86,6 @@ typedef struct _DMUS_PRIVATE_BAND { * IDirectMusicBandImpl implementation structure */ struct IDirectMusicBandImpl { - /* IUnknown fields */ - const IUnknownVtbl *UnknownVtbl; IDirectMusicBand IDirectMusicBand_iface; const IDirectMusicObjectVtbl *ObjectVtbl; const IPersistStreamVtbl *PersistStreamVtbl;

1 0

Sebastian Lackner : ntdll: Fix incorrect value passed to RtlDeleteTimerQueueEx.
by Alexandre Julliard Jan. 30, 2014

Jan. 30, 2014

Module: wine Branch: master Commit: 23adc9aaed72ed38d0c682ee27451de6546e9794 URL: http://source.winehq.org/git/wine.git/?a=commit;h=23adc9aaed72ed38d0c682ee2… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Jan 30 03:56:19 2014 +0100 ntdll: Fix incorrect value passed to RtlDeleteTimerQueueEx. --- dlls/ntdll/threadpool.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/threadpool.c b/dlls/ntdll/threadpool.c index 4edd069..5bf3385 100644 --- a/dlls/ntdll/threadpool.c +++ b/dlls/ntdll/threadpool.c @@ -889,7 +889,7 @@ static struct timer_queue *get_timer_queue(HANDLE TimerQueue) (void **) &default_timer_queue, q, NULL); if (p) /* Got beat to the punch. */ - RtlDeleteTimerQueueEx(p, NULL); + RtlDeleteTimerQueueEx(q, NULL); } } return default_timer_queue;

1 0

Frédéric Delanoy : oledb32/tests: Use common wine_dbgstr_guid implementation from test.h.
by Alexandre Julliard Jan. 30, 2014

Jan. 30, 2014

Module: wine Branch: master Commit: 408c351035cf357d530a3a28f3d4a49163e5fe72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=408c351035cf357d530a3a28f… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Jan 25 15:24:41 2014 +0100 oledb32/tests: Use common wine_dbgstr_guid implementation from test.h. --- dlls/oledb32/tests/database.c | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/dlls/oledb32/tests/database.c b/dlls/oledb32/tests/database.c index fa56e56..b7020ab 100644 --- a/dlls/oledb32/tests/database.c +++ b/dlls/oledb32/tests/database.c @@ -40,21 +40,6 @@ DEFINE_GUID(CSLID_MSDAER, 0xc8b522cf,0x5cf3,0x11ce,0xad,0xe5,0x00,0xaa,0x00,0x44 static WCHAR initstring_default[] = {'D','a','t','a',' ','S','o','u','r','c','e','=','d','u','m','m','y',';',0}; -static const char *debugstr_guid(REFIID riid) -{ - static char buf[50]; - - if(!riid) - return "(null)"; - - sprintf(buf, "{%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}", - riid->Data1, riid->Data2, riid->Data3, riid->Data4[0], - riid->Data4[1], riid->Data4[2], riid->Data4[3], riid->Data4[4], - riid->Data4[5], riid->Data4[6], riid->Data4[7]); - - return buf; -} - static void test_GetDataSource(WCHAR *initstring) { IDataInitialize *datainit = NULL; @@ -266,7 +251,7 @@ if (hr == S_OK) { ok(hr == S_OK, "got 0x%08x\n", hr); hr = IConnectionPoint_GetConnectionInterface(cp, &iid); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(IsEqualIID(&iid, &IID_IRowPositionChange), "got %s\n", debugstr_guid(&iid)); + ok(IsEqualIID(&iid, &IID_IRowPositionChange), "got %s\n", wine_dbgstr_guid(&iid)); IConnectionPoint_Release(cp); hr = IEnumConnectionPoints_Next(enum_points, 1, &cp, NULL); @@ -300,7 +285,7 @@ static HRESULT WINAPI rset_QI(IRowset *iface, REFIID riid, void **obj) return S_OK; } - ok(0, "unexpected riid %s\n", debugstr_guid(riid)); + ok(0, "unexpected riid %s\n", wine_dbgstr_guid(riid)); return E_NOINTERFACE; }

1 0

Frédéric Delanoy : shell32/tests: Use common wine_dbgstr_guid implementation from test.h.
by Alexandre Julliard Jan. 30, 2014

Jan. 30, 2014

Module: wine Branch: master Commit: a2b548ac3ae7e26ad7495f3f2d880261b8610d50 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2b548ac3ae7e26ad7495f3f2… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Jan 30 02:41:06 2014 +0100 shell32/tests: Use common wine_dbgstr_guid implementation from test.h. --- dlls/shell32/tests/ebrowser.c | 25 +++++-------------------- dlls/shell32/tests/shellole.c | 20 ++++---------------- dlls/shell32/tests/shellpath.c | 36 ++++++++++-------------------------- dlls/shell32/tests/shlfolder.c | 14 +------------- 4 files changed, 20 insertions(+), 75 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a2b548ac3ae7e26ad7495…

1 0

Frédéric Delanoy : riched20/tests: Use common wine_dbgstr_guid implementation from test.h.
by Alexandre Julliard Jan. 30, 2014

Jan. 30, 2014

Module: wine Branch: master Commit: e877ec4c5a740eb4c224646f3a3d2cc2286c72b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e877ec4c5a740eb4c224646f3… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Jan 25 15:24:43 2014 +0100 riched20/tests: Use common wine_dbgstr_guid implementation from test.h. --- dlls/riched20/tests/txtsrv.c | 21 +++------------------ 1 file changed, 3 insertions(+), 18 deletions(-) diff --git a/dlls/riched20/tests/txtsrv.c b/dlls/riched20/tests/txtsrv.c index 566381c..efda32c 100644 --- a/dlls/riched20/tests/txtsrv.c +++ b/dlls/riched20/tests/txtsrv.c @@ -42,21 +42,6 @@ static IID *pIID_ITextHost; static IID *pIID_ITextHost2; static PCreateTextServices pCreateTextServices; -static const char *debugstr_guid(REFIID riid) -{ - static char buf[50]; - - if(!riid) - return "(null)"; - - sprintf(buf, "{%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}", - riid->Data1, riid->Data2, riid->Data3, riid->Data4[0], - riid->Data4[1], riid->Data4[2], riid->Data4[3], riid->Data4[4], - riid->Data4[5], riid->Data4[6], riid->Data4[7]); - - return buf; -} - /* Define C Macros for ITextServices calls. */ /* Use a special table for x86 machines to convert the thiscall @@ -806,11 +791,11 @@ DEFINE_GUID(expected_iid_itexthost2, 0x13e670f5,0x1a5a,0x11cf,0xab,0xeb,0x00,0xa static void test_IIDs(void) { ok(IsEqualIID(pIID_ITextServices, &expected_iid_itextservices), - "unexpected value for IID_ITextServices: %s\n", debugstr_guid(pIID_ITextServices)); + "unexpected value for IID_ITextServices: %s\n", wine_dbgstr_guid(pIID_ITextServices)); ok(IsEqualIID(pIID_ITextHost, &expected_iid_itexthost), - "unexpected value for IID_ITextHost: %s\n", debugstr_guid(pIID_ITextHost)); + "unexpected value for IID_ITextHost: %s\n", wine_dbgstr_guid(pIID_ITextHost)); ok(IsEqualIID(pIID_ITextHost2, &expected_iid_itexthost2), - "unexpected value for IID_ITextHost2: %s\n", debugstr_guid(pIID_ITextHost2)); + "unexpected value for IID_ITextHost2: %s\n", wine_dbgstr_guid(pIID_ITextHost2)); } /* Outer IUnknown for COM aggregation tests */

1 0

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

Jan. 30, 2014

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 +(a)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