wine-commits January 2014

wine-commits@winehq.org

3 participants
814 discussions

Marcus Meissner : msxml3: Avoid double free of str (Coverity).
by Alexandre Julliard 01 Jan '14

01 Jan '14

Module: wine Branch: master Commit: 88923cd6f32d3c318cc76dc00507a8c9334a1d6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=88923cd6f32d3c318cc76dc00… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Wed Jan 1 20:33:43 2014 +0100 msxml3: Avoid double free of str (Coverity). --- dlls/msxml3/tests/domdoc.c | 36 ++++++++++++++++-------------------- 1 files changed, 16 insertions(+), 20 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index df11197..e9294d7 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -11014,6 +11014,7 @@ static void test_xmlns_attribute(void) IXMLDOMAttribute *pAttribute; IXMLDOMElement *elem; HRESULT hr; + VARIANT v; doc = create_document(&IID_IXMLDOMDocument); @@ -11026,32 +11027,27 @@ static void test_xmlns_attribute(void) str = SysAllocString(szAttribute); hr = IXMLDOMDocument_createAttribute(doc, _bstr_("xmlns:dt"), &pAttribute); ok( hr == S_OK, "returns %08x\n", hr ); - if(hr == S_OK) - { - VARIANT v; - V_VT(&v) = VT_BSTR; - V_BSTR(&v) = _bstr_("urn:schemas-microsoft-com:datatypes"); - hr = IXMLDOMAttribute_put_nodeValue(pAttribute, v); + V_VT(&v) = VT_BSTR; + V_BSTR(&v) = _bstr_("urn:schemas-microsoft-com:datatypes"); + hr = IXMLDOMAttribute_put_nodeValue(pAttribute, v); - hr = IXMLDOMElement_setAttributeNode(root, pAttribute, NULL); - ok(hr == S_OK, "ret %08x\n", hr ); + hr = IXMLDOMElement_setAttributeNode(root, pAttribute, NULL); + ok(hr == S_OK, "ret %08x\n", hr ); - hr = IXMLDOMNode_put_dataType((IXMLDOMNode*)root, _bstr_("bin.base64")); - ok(hr == S_OK, "ret %08x\n", hr ); + hr = IXMLDOMNode_put_dataType((IXMLDOMNode*)root, _bstr_("bin.base64")); + ok(hr == S_OK, "ret %08x\n", hr ); - hr = IXMLDOMDocument_get_documentElement(doc, &elem); - EXPECT_HR(hr, S_OK); + hr = IXMLDOMDocument_get_documentElement(doc, &elem); + EXPECT_HR(hr, S_OK); - hr = IXMLDOMElement_get_xml(elem, &str); - ok( hr == S_OK, "got 0x%08x\n", hr); - todo_wine ok( lstrcmpW(str, _bstr_("<Testing xmlns:dt=\"urn:schemas-microsoft-com:datatypes\" dt:dt=\"bin.base64\"/>")) == 0, - "got %s\n", wine_dbgstr_w(str)); - SysFreeString(str); + hr = IXMLDOMElement_get_xml(elem, &str); + ok( hr == S_OK, "got 0x%08x\n", hr); + todo_wine ok( lstrcmpW(str, _bstr_("<Testing xmlns:dt=\"urn:schemas-microsoft-com:datatypes\" dt:dt=\"bin.base64\"/>")) == 0, + "got %s\n", wine_dbgstr_w(str)); - IXMLDOMElement_Release(elem); - IXMLDOMAttribute_Release( pAttribute); - } + IXMLDOMElement_Release(elem); + IXMLDOMAttribute_Release( pAttribute); SysFreeString(str);

1 0

Marcus Meissner : setupapi: Do not free stack pointers (Coverity).
by Alexandre Julliard 01 Jan '14

01 Jan '14

Module: wine Branch: master Commit: 84a51f64cab6d0a9599e4384ba1da3013497f32a URL: http://source.winehq.org/git/wine.git/?a=commit;h=84a51f64cab6d0a9599e4384b… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Wed Jan 1 19:53:26 2014 +0100 setupapi: Do not free stack pointers (Coverity). --- dlls/setupapi/query.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/setupapi/query.c b/dlls/setupapi/query.c index e343835..f21bc36 100644 --- a/dlls/setupapi/query.c +++ b/dlls/setupapi/query.c @@ -607,7 +607,7 @@ BOOL WINAPI SetupGetTargetPathW( HINF hinf, PINFCONTEXT context, PCWSTR section, else { SetLastError( ERROR_INSUFFICIENT_BUFFER ); - HeapFree( GetProcessHeap(), 0, dir ); + if (dir != systemdir) HeapFree( GetProcessHeap(), 0, dir ); return FALSE; } }

1 0

Marcus Meissner : mmsystem.dll16: Free the correct pointer (Coverity).
by Alexandre Julliard 01 Jan '14

01 Jan '14

Module: wine Branch: master Commit: a21c489f0fc50f04a8e19ee9fdbd5a50f5927be1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a21c489f0fc50f04a8e19ee9f… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Wed Jan 1 19:26:02 2014 +0100 mmsystem.dll16: Free the correct pointer (Coverity). --- dlls/mmsystem.dll16/mci16.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/mmsystem.dll16/mci16.c b/dlls/mmsystem.dll16/mci16.c index ad27405..2ad82a6 100644 --- a/dlls/mmsystem.dll16/mci16.c +++ b/dlls/mmsystem.dll16/mci16.c @@ -323,12 +323,14 @@ static MMSYSTEM_MapType MCI_MapMsg16To32W(WORD wMsg, DWORD dwFlags, DWORD_PTR* l return MMSYSTEM_MAP_OKMEM; case MCI_SYSINFO: { + MCI_SYSINFO_PARMSW *origmsip32w; MCI_SYSINFO_PARMSW *msip32w = HeapAlloc(GetProcessHeap(), 0, sizeof(MCI_OPEN_PARMS16 *) + sizeof(MCI_SYSINFO_PARMSW)); MCI_SYSINFO_PARMS16 *msip16 = MapSL(*lParam); if (!msip32w) return MMSYSTEM_MAP_NOMEM; + origmsip32w = msip32w; *(MCI_SYSINFO_PARMS16 **)msip32w = msip16; msip32w = (MCI_SYSINFO_PARMSW *)((char *)msip32w + sizeof(MCI_OPEN_PARMS16 *)); msip32w->dwCallback = msip16->dwCallback; @@ -337,7 +339,7 @@ static MMSYSTEM_MapType MCI_MapMsg16To32W(WORD wMsg, DWORD dwFlags, DWORD_PTR* l msip16->dwRetSize * sizeof(WCHAR)); if (!msip32w->lpstrReturn) { - HeapFree(GetProcessHeap(), 0, msip32w); + HeapFree(GetProcessHeap(), 0, origmsip32w); return MMSYSTEM_MAP_NOMEM; } msip32w->dwRetSize = (dwFlags & MCI_SYSINFO_QUANTITY) ? sizeof(DWORD) : msip16->dwRetSize;

1 0

Marcus Meissner : gdiplus: Free the correct pointer (Coverity).
by Alexandre Julliard 01 Jan '14

01 Jan '14

Module: wine Branch: master Commit: ba8cacebf38580e9bd8f33bdd3ff08029f4705b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba8cacebf38580e9bd8f33bdd… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Wed Jan 1 19:25:59 2014 +0100 gdiplus: Free the correct pointer (Coverity). --- dlls/gdiplus/graphicspath.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index 8508b9b..882bc48 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -868,7 +868,7 @@ static GpStatus format_string_callback(HDC dc, for (i = index; i < length; ++i) { GLYPHMETRICS gm; - TTPOLYGONHEADER *ph = NULL; + TTPOLYGONHEADER *ph = NULL, *origph; char *start; DWORD len, ofs = 0; len = GetGlyphOutlineW(dc, string[i], GGO_BEZIER, &gm, 0, NULL, &identity); @@ -877,7 +877,7 @@ static GpStatus format_string_callback(HDC dc, status = GenericError; break; } - ph = GdipAlloc(len); + origph = ph = GdipAlloc(len); start = (char *)ph; if (!ph || !lengthen_path(path, len / sizeof(POINTFX))) { @@ -931,7 +931,7 @@ static GpStatus format_string_callback(HDC dc, x += gm.gmCellIncX * args->scale; y += gm.gmCellIncY * args->scale; - GdipFree(ph); + GdipFree(origph); if (status != Ok) break; }

1 0

Nikolay Sivov : ntdll: Fix manifest attribute parsing.
by Alexandre Julliard 01 Jan '14

01 Jan '14

Module: wine Branch: master Commit: 1e1084232d8d95540fbd7196c948ee4f8b5532b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e1084232d8d95540fbd7196c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 1 22:00:40 2014 +0400 ntdll: Fix manifest attribute parsing. --- dlls/kernel32/tests/actctx.c | 12 ++++++++++++ dlls/ntdll/actctx.c | 12 +++++++++++- 2 files changed, 23 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/actctx.c b/dlls/kernel32/tests/actctx.c index ab655c0..5795e18 100644 --- a/dlls/kernel32/tests/actctx.c +++ b/dlls/kernel32/tests/actctx.c @@ -74,6 +74,11 @@ static const char manifest1[] = "<assemblyIdentity version=\"1.0.0.0\" name=\"Wine.Test\" type=\"win32\"></assemblyIdentity>" "</assembly>"; +static const char manifest1_1[] = +"<assembly xmlns = \"urn:schemas-microsoft-com:asm.v1\" manifestVersion = \"1.0\">" +"<assemblyIdentity version = \"1.0.0.0\" name = \"Wine.Test\" type = \"win32\"></assemblyIdentity>" +"</assembly>"; + static const char manifest2[] = "<assembly xmlns=\"urn:schemas-microsoft-com:asm.v1\" manifestVersion=\"1.0\">" "<assemblyIdentity version=\"1.2.3.4\" name=\"Wine.Test\" type=\"win32\">" @@ -1748,6 +1753,13 @@ static void test_actctx(void) pReleaseActCtx(handle); } + /* test for whitespace handling in Eq ::= S? '=' S? */ + create_manifest_file("test1_1.manifest", manifest1_1, -1, NULL, NULL); + handle = test_create("test1_1.manifest"); + ok(handle != INVALID_HANDLE_VALUE, "got %p\n", handle); + DeleteFileA("test1_1.manifest"); + pReleaseActCtx(handle); + if(!create_manifest_file("test1.manifest", manifest1, -1, NULL, NULL)) { skip("Could not create manifest file\n"); return; diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index 962a4e5..bdbb330 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -1125,13 +1125,23 @@ static BOOL next_xml_attr(xmlbuf_t* xmlbuf, xmlstr_t* name, xmlstr_t* value, ptr = xmlbuf->ptr; while (ptr < xmlbuf->end && *ptr != '=' && *ptr != '>' && !isxmlspace(*ptr)) ptr++; - if (ptr == xmlbuf->end || *ptr != '=') return FALSE; + if (ptr == xmlbuf->end) return FALSE; name->ptr = xmlbuf->ptr; name->len = ptr-xmlbuf->ptr; xmlbuf->ptr = ptr; + /* skip spaces before '=' */ + while (ptr < xmlbuf->end && *ptr != '=' && isxmlspace(*ptr)) ptr++; + if (ptr == xmlbuf->end || *ptr != '=') return FALSE; + + /* skip '=' itself */ ptr++; + if (ptr == xmlbuf->end) return FALSE; + + /* skip spaces after '=' */ + while (ptr < xmlbuf->end && *ptr != '"' && *ptr != '\'' && isxmlspace(*ptr)) ptr++; + if (ptr == xmlbuf->end || (*ptr != '"' && *ptr != '\'')) return FALSE; value->ptr = ++ptr;

1 0

Francois Gouget : gdi32/tests: Fix a flood of failures on Windows XP SP1 and 2003 pre-SP1.
by Alexandre Julliard 01 Jan '14

01 Jan '14

Module: wine Branch: master Commit: b6ba53e5726fd5409f48456b80230500d2351283 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6ba53e5726fd5409f48456b8… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Dec 20 19:05:29 2013 +0100 gdi32/tests: Fix a flood of failures on Windows XP SP1 and 2003 pre-SP1. --- dlls/gdi32/tests/bitmap.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index f8e71b4..aa2be70 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -1611,7 +1611,7 @@ static void test_bitmap_colors( HDC hdc, COLORREF fg, COLORREF bg, int r, int g, old_brush = SelectObject( hdc, CreatePatternBrush( bitmap )); PatBlt( hdc, 0, 0, 16, 16, PATCOPY ); GetBitmapBits( GetCurrentObject( hdc, OBJ_BITMAP ), sizeof(bits), bits ); - ok( bits[0] == 0x5555, + ok( bits[0] == 0x5555 || broken(bits[0] == 0xaada) /* XP SP1 & 2003 SP0 */, "wrong bits %04x for %02x,%02x,%02x fg %06x bg %06x\n", bits[0], r, g, b, fg, bg ); DeleteObject( SelectObject( hdc, old_brush ));

1 0

Dmitry Timoshkov : xmllite: Constify pointers in arrays that hold const data.
by Alexandre Julliard 01 Jan '14

01 Jan '14

Module: wine Branch: master Commit: 07e7f40dc933291915345944e320e55ae0544f0a URL: http://source.winehq.org/git/wine.git/?a=commit;h=07e7f40dc933291915345944e… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Dec 30 18:17:08 2013 +0900 xmllite: Constify pointers in arrays that hold const data. --- dlls/xmllite/reader.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index cfd54d4..9fe48bd 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -102,7 +102,7 @@ static const WCHAR piW[] = {'<','?',0}; static const char *debugstr_nodetype(XmlNodeType nodetype) { - static const char* type_names[] = + static const char * const type_names[] = { "None", "Element", @@ -132,7 +132,7 @@ static const char *debugstr_nodetype(XmlNodeType nodetype) static const char *debugstr_prop(XmlReaderProperty prop) { - static const char* prop_names[] = + static const char * const prop_names[] = { "MultiLanguage", "ConformanceLevel",

1 0

Dmitry Timoshkov : xmllite: Use wine_dbg_sprintf instead of a static buffer .
by Alexandre Julliard 01 Jan '14

01 Jan '14

Module: wine Branch: master Commit: 1be348ea5165dd12eec698101b6938bdef2b7140 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1be348ea5165dd12eec698101… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Dec 30 18:16:59 2013 +0900 xmllite: Use wine_dbg_sprintf instead of a static buffer. --- dlls/xmllite/reader.c | 14 ++++---------- 1 files changed, 4 insertions(+), 10 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 0ecb593..cfd54d4 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -125,11 +125,8 @@ static const char *debugstr_nodetype(XmlNodeType nodetype) }; if (nodetype > _XmlNodeType_Last) - { - static char buf[25]; - sprintf(buf, "unknown type=%d", nodetype); - return buf; - } + return wine_dbg_sprintf("unknown type=%d", nodetype); + return type_names[nodetype]; } @@ -148,11 +145,8 @@ static const char *debugstr_prop(XmlReaderProperty prop) }; if (prop > _XmlReaderProperty_Last) - { - static char buf[25]; - sprintf(buf, "unknown property=%d", prop); - return buf; - } + return wine_dbg_sprintf("unknown property=%d", prop); + return prop_names[prop]; }

1 0

Alexandre Julliard : makefiles: Define libwine soversion from configure.
by Alexandre Julliard 01 Jan '14

01 Jan '14

Module: wine Branch: master Commit: d822f32a4f02377316a5d22bd158682a514f3b4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d822f32a4f02377316a5d22bd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 31 19:25:54 2013 +0100 makefiles: Define libwine soversion from configure. --- configure | 76 ++++++++++++++++++++++-------------------------- configure.ac | 76 ++++++++++++++++++++++-------------------------- libs/wine/Makefile.in | 3 -- 3 files changed, 70 insertions(+), 85 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d822f32a4f02377316a5d…

1 0

Alexandre Julliard : makefiles: Add support for a variable to list extra targets.
by Alexandre Julliard 01 Jan '14

01 Jan '14

Module: wine Branch: master Commit: 54300b2302c1c1f290bc5831915f97d78804a8fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=54300b2302c1c1f290bc58319… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 31 19:21:17 2013 +0100 makefiles: Add support for a variable to list extra targets. --- configure | 5 +---- configure.ac | 5 +---- fonts/Makefile.in | 5 ++--- programs/winetest/Makefile.in | 3 +-- tools/make_makefiles | 3 ++- tools/makedep.c | 1 + 6 files changed, 8 insertions(+), 14 deletions(-) diff --git a/configure b/configure index 24a470b..6fb273b 100755 --- a/configure +++ b/configure @@ -17390,10 +17390,6 @@ wine_fn_ignore_file "config.status" wine_fn_ignore_file "configure.lineno" wine_fn_ignore_file "include/config.h" wine_fn_ignore_file "include/stamp-h" -test "x$enable_fonts" = xno || wine_fn_ignore_file "fonts/*.fon" -test "x$enable_winetest" = xno || wine_fn_ignore_file "programs/winetest/build.nfo" -test "x$enable_winetest" = xno || wine_fn_ignore_file "programs/winetest/build.rc" -test "x$enable_tools" = xno || wine_fn_ignore_file "tools/makedep$ac_exeext" test "$wine_binary" = wine || wine_fn_ignore_file "loader/wine" ac_config_commands="$ac_config_commands Makefile" @@ -17447,6 +17443,7 @@ if test "x$enable_tools" != xno then ac_config_commands="$ac_config_commands tools" + wine_fn_ignore_file "tools/makedep$ac_exeext" wine_fn_append_rule "tools/makedep$ac_exeext: $srcdir/tools/makedep.c include/config.h \$(CC) -Iinclude -I$srcdir/include -D__WINESRC__ \$(EXTRACFLAGS) \$(CPPFLAGS) \$(CFLAGS) -o \$@ $srcdir/tools/makedep.c \$(LDFLAGS) clean:: __clean__ diff --git a/configure.ac b/configure.ac index 73eb820..f366657 100644 --- a/configure.ac +++ b/configure.ac @@ -3440,10 +3440,6 @@ WINE_IGNORE_FILE("config.status") WINE_IGNORE_FILE("configure.lineno") WINE_IGNORE_FILE("include/config.h") WINE_IGNORE_FILE("include/stamp-h") -WINE_IGNORE_FILE("fonts/*.fon",enable_fonts) -WINE_IGNORE_FILE("programs/winetest/build.nfo",enable_winetest) -WINE_IGNORE_FILE("programs/winetest/build.rc",enable_winetest) -WINE_IGNORE_FILE("tools/makedep$ac_exeext",enable_tools) test "$wine_binary" = wine || WINE_IGNORE_FILE("loader/wine") AC_CONFIG_COMMANDS([Makefile], [wine_fn_output_makefile Makefile], @@ -3505,6 +3501,7 @@ fi if test "x$enable_tools" != xno then AC_CONFIG_COMMANDS([tools],[AS_MKDIR_P(tools)]) + WINE_IGNORE_FILE("tools/makedep$ac_exeext") WINE_APPEND_RULE( [tools/makedep$ac_exeext: $srcdir/tools/makedep.c include/config.h \$(CC) -Iinclude -I$srcdir/include -D__WINESRC__ \$(EXTRACFLAGS) \$(CPPFLAGS) \$(CFLAGS) -o \$@ $srcdir/tools/makedep.c \$(LDFLAGS) diff --git a/fonts/Makefile.in b/fonts/Makefile.in index 6650af5..bfb8714 100644 --- a/fonts/Makefile.in +++ b/fonts/Makefile.in @@ -71,6 +71,8 @@ TRUETYPE_FONTS = \ tahomabd.ttf \ wingding.ttf +EXTRA_TARGETS = $(BITMAP_FONTS) + all: $(BITMAP_FONTS) @MAKE_RULES@ @@ -234,6 +236,3 @@ install install-lib:: $(BITMAP_FONTS) uninstall:: -cd $(DESTDIR)$(fontdir) && $(RM) $(BITMAP_FONTS) $(TRUETYPE_FONTS) -rmdir $(DESTDIR)$(fontdir) - -clean:: - $(RM) $(BITMAP_FONTS) diff --git a/programs/winetest/Makefile.in b/programs/winetest/Makefile.in index 6865e93..e317c6a 100644 --- a/programs/winetest/Makefile.in +++ b/programs/winetest/Makefile.in @@ -16,8 +16,7 @@ SVG_SRCS = winetest.svg EXTRA_OBJS = build.res @ALL_TEST_RESOURCES@ -clean:: - $(RM) build.rc build.nfo +EXTRA_TARGETS = build.rc build.nfo build.rc: dummy build="BUILD_INFO STRINGRES build.nfo STRINGTABLE { 1 \"`GIT_DIR=$(top_srcdir)/.git git rev-parse HEAD 2>/dev/null`\" }" && (echo $$build | cmp -s - $@) || echo $$build >$@ || ($(RM) $@ && exit 1) diff --git a/tools/make_makefiles b/tools/make_makefiles index 22d66b5..2dc621a 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -276,12 +276,13 @@ sub parse_makefile($) ${$make{"=flags"}}{"implib"} = 1 if $var eq "IMPORTLIB"; next; } - if (/^\s*(BISON_SRCS|LEX_SRCS|IDL_SRCS|IMPLIB_SRCS|C_SRCS|OBJC_SRCS|MC_SRCS|RC_SRCS|SVG_SRCS|FONT_SRCS|IN_SRCS|PROGRAMS|MANPAGES)\s*=\s*(.*)/) + if (/^\s*(BISON_SRCS|LEX_SRCS|IDL_SRCS|IMPLIB_SRCS|C_SRCS|OBJC_SRCS|MC_SRCS|RC_SRCS|SVG_SRCS|FONT_SRCS|IN_SRCS|PROGRAMS|EXTRA_TARGETS|MANPAGES)\s*=\s*(.*)/) { my $var = $1; my @list = split(/\s+/, $2); $make{$var} = \@list; ${$make{"=flags"}}{"clean"} = 1 if $var eq "PROGRAMS"; + ${$make{"=flags"}}{"clean"} = 1 if $var eq "EXTRA_TARGETS"; next; } if (/(install-lib|install-dev|clean)\s*:/) diff --git a/tools/makedep.c b/tools/makedep.c index 58e9646..fba15ed 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -1907,6 +1907,7 @@ static struct strarray output_sources(void) strarray_addall( &clean_files, crossobj_files ); strarray_addall( &clean_files, res_files ); strarray_addall( &clean_files, all_targets ); + strarray_addall( &clean_files, get_expanded_make_var_array( "EXTRA_TARGETS" )); if (clean_files.count) {

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