December 2013 - Wine-Commits

Austin English : wine.inf: Bump XP 64-bit to service pack 2.
by Alexandre Julliard Dec. 30, 2013

Dec. 30, 2013

Module: wine Branch: master Commit: 4af2ca4c39f86111494ebcf39e1fd4285cbfd667 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4af2ca4c39f86111494ebcf39… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Dec 27 14:12:37 2013 -0600 wine.inf: Bump XP 64-bit to service pack 2. --- loader/wine.inf.in | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 1cefe01..ac6c697 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -3030,12 +3030,12 @@ HKLM,%Control%\Session Manager\Environment,"OS",2,"Windows_NT" [VersionInfo.ntamd64] HKLM,%CurrentVersionNT%,"CurrentVersion",2,"5.2" -HKLM,%CurrentVersionNT%,"CSDVersion",2,"Service Pack 1" +HKLM,%CurrentVersionNT%,"CSDVersion",2,"Service Pack 2" HKLM,%CurrentVersionNT%,"CurrentBuildNumber",2,"3790" HKLM,%CurrentVersionNT%,"CurrentType",2,"Uniprocessor Free" HKLM,%CurrentVersionNT%,"ProductName",2,"Microsoft Windows XP" HKLM,%Control%\ProductOptions,"ProductType",2,"WinNT" -HKLM,%Control%\Windows,"CSDVersion",0x10003,0x100 +HKLM,%Control%\Windows,"CSDVersion",0x10003,0x200 HKLM,%Control%\Session Manager\Environment,"OS",2,"Windows_NT" [Wow64]

1 0

Alexandre Julliard : makedep: Manage current output column with a global variable.
by Alexandre Julliard Dec. 30, 2013

Dec. 30, 2013

Module: wine Branch: master Commit: 2af368b88cb24be028dfb46cd6dc040dbd5e7507 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2af368b88cb24be028dfb46cd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Dec 28 11:48:03 2013 +0100 makedep: Manage current output column with a global variable. --- tools/makedep.c | 143 +++++++++++++++++++++++++++---------------------------- 1 files changed, 70 insertions(+), 73 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2af368b88cb24be028dfb…

1 0

Michael Stefaniuc : dmusic: These COM classes don't support COM aggregation .
by Alexandre Julliard Dec. 30, 2013

Dec. 30, 2013

Module: wine Branch: master Commit: 5f5c21e55d3277964214c7b4d0227817246d78c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f5c21e55d3277964214c7b4d… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sat Dec 28 23:34:11 2013 +0100 dmusic: These COM classes don't support COM aggregation. --- dlls/dmusic/collection.c | 13 ++++++++----- dlls/dmusic/dmusic.c | 2 ++ 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/dmusic/collection.c b/dlls/dmusic/collection.c index e30f89d..f98bc19 100644 --- a/dlls/dmusic/collection.c +++ b/dlls/dmusic/collection.c @@ -814,12 +814,15 @@ static const IPersistStreamVtbl DirectMusicCollection_PersistStream_Vtbl = { HRESULT WINAPI DMUSIC_CreateDirectMusicCollectionImpl(LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) { IDirectMusicCollectionImpl* obj; - + + *ppobj = NULL; + if (pUnkOuter) + return CLASS_E_NOAGGREGATION; + obj = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicCollectionImpl)); - if (NULL == obj) { - *ppobj = NULL; - return E_OUTOFMEMORY; - } + if (!obj) + return E_OUTOFMEMORY; + obj->IDirectMusicCollection_iface.lpVtbl = &DirectMusicCollection_Collection_Vtbl; obj->IDirectMusicObject_iface.lpVtbl = &DirectMusicCollection_Object_Vtbl; obj->IPersistStream_iface.lpVtbl = &DirectMusicCollection_PersistStream_Vtbl; diff --git a/dlls/dmusic/dmusic.c b/dlls/dmusic/dmusic.c index 0c2584f..6c837f7 100644 --- a/dlls/dmusic/dmusic.c +++ b/dlls/dmusic/dmusic.c @@ -408,6 +408,8 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicImpl(LPCGUID riid, LPVOID* ret_iface, LPU TRACE("(%p,%p,%p)\n", riid, ret_iface, unkouter); *ret_iface = NULL; + if (unkouter) + return CLASS_E_NOAGGREGATION; dmusic = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusic8Impl)); if (!dmusic)

1 0

Frédéric Delanoy : scrrun/tests: Constify a character string.
by Alexandre Julliard Dec. 30, 2013

Dec. 30, 2013

Module: wine Branch: master Commit: fe7f9e5fbb80f6505a58c489a9005ee56595b45d URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe7f9e5fbb80f6505a58c489a… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Dec 28 14:10:45 2013 +0100 scrrun/tests: Constify a character string. --- dlls/scrrun/tests/filesystem.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index 630de1b..ba0ff37 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -134,7 +134,7 @@ static void test_createfolder(void) static void test_textstream(void) { - static WCHAR testfileW[] = {'t','e','s','t','f','i','l','e','.','t','x','t',0}; + static const WCHAR testfileW[] = {'t','e','s','t','f','i','l','e','.','t','x','t',0}; ITextStream *stream; VARIANT_BOOL b; HANDLE file;

1 0

Alexandre Julliard : makedep: Generate a list of phony targets.
by Alexandre Julliard Dec. 30, 2013

Dec. 30, 2013

Module: wine Branch: master Commit: 3b7cc5ec92ea6bbbee2bb8ea91e131e93f014812 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b7cc5ec92ea6bbbee2bb8ea9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Dec 28 11:41:45 2013 +0100 makedep: Generate a list of phony targets. --- Make.rules.in | 2 -- configure | 3 +-- configure.ac | 3 +-- tools/makedep.c | 13 +++++++++++++ 4 files changed, 15 insertions(+), 6 deletions(-) diff --git a/Make.rules.in b/Make.rules.in index 7e50787..08b790d 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -85,8 +85,6 @@ $(WINETEST_RES): $(TESTMODULE_STRIPPED) all: $(MANPAGES:.man.in=.man) -.PHONY: install-man-pages - # Rules for cleaning clean:: diff --git a/configure b/configure index f56f46a..10dea9a 100755 --- a/configure +++ b/configure @@ -16602,8 +16602,6 @@ EXTRA_OBJS = testlist.o all: \$(TESTMODULE)$DLLEXT \$(WINETEST_RES) \$(C_SRCS:.c=.ok): \$(TESTMODULE)$DLLEXT \$(TESTDLL:%=../%$DLLEXT) - -.PHONY: check test testclean crosstest " if test -n "$CROSSTARGET" @@ -16613,6 +16611,7 @@ MAKEDEPFLAGS = -xo -xcross.o CROSSTESTMODULE = \$(TESTDLL:%.dll=%)_crosstest.exe crosstest: \$(CROSSTESTMODULE) +.PHONY: crosstest " fi diff --git a/configure.ac b/configure.ac index b4fc0b1..afec9bb 100644 --- a/configure.ac +++ b/configure.ac @@ -2658,8 +2658,6 @@ EXTRA_OBJS = testlist.o all: \$(TESTMODULE)$DLLEXT \$(WINETEST_RES) \$(C_SRCS:.c=.ok): \$(TESTMODULE)$DLLEXT \$(TESTDLL:%=../%$DLLEXT) - -.PHONY: check test testclean crosstest ") if test -n "$CROSSTARGET" then @@ -2668,6 +2666,7 @@ MAKEDEPFLAGS = -xo -xcross.o CROSSTESTMODULE = \$(TESTDLL:%.dll=%)_crosstest.exe crosstest: \$(CROSSTESTMODULE) +.PHONY: crosstest ") fi diff --git a/tools/makedep.c b/tools/makedep.c index 041ef2e..4eab2a8 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -1350,6 +1350,7 @@ static struct strarray output_sources(void) struct strarray dlldata_files = empty_strarray; struct strarray includes = empty_strarray; struct strarray subdirs = empty_strarray; + struct strarray phony_targets = empty_strarray; strarray_add( &includes, "-I." ); if (src_dir) strarray_add( &includes, strmake( "-I%s", src_dir )); @@ -1492,6 +1493,7 @@ static struct strarray output_sources(void) dir, dest, source->sourcename ); free( dest ); free( dir ); + strarray_add_uniq( &phony_targets, "install-man-pages" ); } strarray_add( &clean_files, xstrdup(obj) ); output( "%s: %s\n", obj, sourcedep ); @@ -1631,6 +1633,9 @@ static struct strarray output_sources(void) output_filenames( &ok_files, &column ); output( "\n" ); strarray_addall( &clean_files, &ok_files ); + strarray_add( &phony_targets, "check" ); + strarray_add( &phony_targets, "test" ); + strarray_add( &phony_targets, "testclean" ); } if (clean_files.count) @@ -1648,6 +1653,14 @@ static struct strarray output_sources(void) output( ":\n" ); output( "\t$(MKDIR_P) -m 755 $@\n" ); } + + if (phony_targets.count) + { + column = output( ".PHONY:" ); + output_filenames( &phony_targets, &column ); + output( "\n" ); + } + return clean_files; }

1 0

Nikolay Sivov : ntdll: Open source file only when needed during context creation.
by Alexandre Julliard Dec. 30, 2013

Dec. 30, 2013

Module: wine Branch: master Commit: 031c02726236efaa6470026a2f2687d618b82ff5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=031c02726236efaa6470026a2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Dec 30 00:25:18 2013 +0400 ntdll: Open source file only when needed during context creation. --- dlls/kernel32/tests/actctx.c | 33 ++++++++++++++++++++++++++++++--- dlls/ntdll/actctx.c | 6 ++++-- 2 files changed, 34 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/tests/actctx.c b/dlls/kernel32/tests/actctx.c index 19bab72..9894568 100644 --- a/dlls/kernel32/tests/actctx.c +++ b/dlls/kernel32/tests/actctx.c @@ -2113,14 +2113,41 @@ static void test_CreateActCtx(void) actctx.lpAssemblyDirectory = dir; actctx.lpSource = path; + SetLastError(0xdeadbeef); handle = pCreateActCtxA(&actctx); -todo_wine - ok(handle == INVALID_HANDLE_VALUE && GetLastError() == ERROR_SXS_CANT_GEN_ACTCTX, - "got handle %p, supposed to fail\n", handle); +todo_wine { + ok(handle == INVALID_HANDLE_VALUE, "got handle %p\n", handle); + ok(GetLastError() == ERROR_SXS_CANT_GEN_ACTCTX, "got error %d\n", GetLastError()); +} if (handle != INVALID_HANDLE_VALUE) pReleaseActCtx(handle); delete_manifest_file("main.manifest"); delete_manifest_file("testdep1.manifest"); + + /* ACTCTX_FLAG_HMODULE_VALID but hModule is not set */ + memset(&actctx, 0, sizeof(ACTCTXA)); + actctx.cbSize = sizeof(ACTCTXA); + actctx.dwFlags = ACTCTX_FLAG_HMODULE_VALID; + SetLastError(0xdeadbeef); + handle = pCreateActCtxA(&actctx); + ok(handle == INVALID_HANDLE_VALUE, "got handle %p\n", handle); +todo_wine + ok(GetLastError() == ERROR_SXS_CANT_GEN_ACTCTX || broken(GetLastError() == ERROR_NOT_ENOUGH_MEMORY) /* XP, win2k3 */, + "got error %d\n", GetLastError()); + + /* create from HMODULE - resource doesn't exist, lpSource is set */ + memset(&actctx, 0, sizeof(ACTCTXA)); + actctx.cbSize = sizeof(ACTCTXA); + actctx.dwFlags = ACTCTX_FLAG_RESOURCE_NAME_VALID | ACTCTX_FLAG_HMODULE_VALID; + actctx.lpSource = "dummyfile.dll"; + actctx.lpResourceName = MAKEINTRESOURCEA(20); + actctx.hModule = GetModuleHandleA(NULL); + + SetLastError(0xdeadbeef); + handle = pCreateActCtxA(&actctx); + ok(handle == INVALID_HANDLE_VALUE, "got handle %p\n", handle); +todo_wine + ok(GetLastError() == ERROR_RESOURCE_TYPE_NOT_FOUND, "got error %d\n", GetLastError()); } static BOOL init_funcs(void) diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index bf6e47b..68dd7ec 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -4519,7 +4519,10 @@ NTSTATUS WINAPI RtlCreateActivationContext( HANDLE *handle, const void *ptr ) } nameW.Buffer = NULL; - if (pActCtx->lpSource) + + /* open file only if it's going to be used */ + if (pActCtx->lpSource && !((pActCtx->dwFlags & ACTCTX_FLAG_RESOURCE_NAME_VALID) && + (pActCtx->dwFlags & ACTCTX_FLAG_HMODULE_VALID))) { if (!RtlDosPathNameToNtPathName_U(pActCtx->lpSource, &nameW, NULL, NULL)) { @@ -4550,7 +4553,6 @@ NTSTATUS WINAPI RtlCreateActivationContext( HANDLE *handle, const void *ptr ) status = get_manifest_in_module( &acl, NULL, NULL, directory, FALSE, pActCtx->hModule, pActCtx->lpResourceName, lang ); if (status && status != STATUS_SXS_CANT_GEN_ACTCTX) - /* FIXME: what to do if pActCtx->lpSource is set */ status = get_manifest_in_associated_manifest( &acl, NULL, NULL, directory, pActCtx->hModule, pActCtx->lpResourceName ); }

1 0

Frédéric Delanoy : shlwapi/tests: Fix StrChrNW prototype.
by Alexandre Julliard Dec. 30, 2013

Dec. 30, 2013

Module: wine Branch: master Commit: bdce3b9994463e8df5eb2e9af8d1b724609c35a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bdce3b9994463e8df5eb2e9af… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Dec 28 14:14:57 2013 +0100 shlwapi/tests: Fix StrChrNW prototype. --- dlls/shlwapi/tests/string.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shlwapi/tests/string.c b/dlls/shlwapi/tests/string.c index d45b2a7..12f8bfc 100644 --- a/dlls/shlwapi/tests/string.c +++ b/dlls/shlwapi/tests/string.c @@ -64,7 +64,7 @@ static LPWSTR (WINAPI *pStrStrNW)(LPCWSTR,LPCWSTR,UINT); static LPWSTR (WINAPI *pStrStrNIW)(LPCWSTR,LPCWSTR,UINT); static INT (WINAPIV *pwnsprintfA)(LPSTR,INT,LPCSTR, ...); static INT (WINAPIV *pwnsprintfW)(LPWSTR,INT,LPCWSTR, ...); -static LPWSTR (WINAPI *pStrChrNW)(LPWSTR,WCHAR,UINT); +static LPWSTR (WINAPI *pStrChrNW)(LPCWSTR,WCHAR,UINT); static BOOL (WINAPI *pStrToInt64ExA)(LPCSTR,DWORD,LONGLONG*); static BOOL (WINAPI *pStrToInt64ExW)(LPCWSTR,DWORD,LONGLONG*);

1 0

Frédéric Delanoy : shdocvw/tests: Constify some character strings.
by Alexandre Julliard Dec. 30, 2013

Dec. 30, 2013

Module: wine Branch: master Commit: 844ea00392883f1913fe7254dd5a1c78924fc50f URL: http://source.winehq.org/git/wine.git/?a=commit;h=844ea00392883f1913fe7254d… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Dec 28 14:10:47 2013 +0100 shdocvw/tests: Constify some character strings. --- dlls/shdocvw/tests/shdocvw.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/shdocvw/tests/shdocvw.c b/dlls/shdocvw/tests/shdocvw.c index ad89c4a..7b4eccf 100644 --- a/dlls/shdocvw/tests/shdocvw.c +++ b/dlls/shdocvw/tests/shdocvw.c @@ -36,13 +36,13 @@ static HRESULT (WINAPI *pURLSubRegQueryA)(LPCSTR, LPCSTR, DWORD, LPVOID, DWORD, static DWORD (WINAPI *pParseURLFromOutsideSourceA)(LPCSTR, LPSTR, LPDWORD, LPDWORD); static DWORD (WINAPI *pParseURLFromOutsideSourceW)(LPCWSTR, LPWSTR, LPDWORD, LPDWORD); -static CHAR appdata[] = "AppData"; -static CHAR common_appdata[] = "Common AppData"; -static CHAR default_page_url[] = "Default_Page_URL"; -static CHAR does_not_exist[] = "does_not_exist"; -static CHAR regpath_iemain[] = "Software\\Microsoft\\Internet Explorer\\Main"; -static CHAR regpath_shellfolders[] = "Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Folders"; -static CHAR start_page[] = "Start Page"; +static const char appdata[] = "AppData"; +static const char common_appdata[] = "Common AppData"; +static const char default_page_url[] = "Default_Page_URL"; +static const char does_not_exist[] = "does_not_exist"; +static const char regpath_iemain[] = "Software\\Microsoft\\Internet Explorer\\Main"; +static const char regpath_shellfolders[] = "Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Folders"; +static const char start_page[] = "Start Page"; /* ################ */

1 0

Bruno Jesus : ws2_32: Add support to print IPX socket address.
by Alexandre Julliard Dec. 30, 2013

Dec. 30, 2013

Module: wine Branch: master Commit: 38a3a574f37b7b77b5566a8498040b475252d902 URL: http://source.winehq.org/git/wine.git/?a=commit;h=38a3a574f37b7b77b5566a849… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Fri Dec 27 18:28:05 2013 -0200 ws2_32: Add support to print IPX socket address. --- dlls/ws2_32/socket.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 8f9c491..1d79b74 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -292,6 +292,18 @@ static inline const char *debugstr_sockaddr( const struct WS_sockaddr *a ) return wine_dbg_sprintf("{ family AF_INET6, address %s, port %d }", p, ntohs(sin->sin6_port)); } + case WS_AF_IPX: + { + int i; + char netnum[16], nodenum[16]; + struct WS_sockaddr_ipx *sin = (struct WS_sockaddr_ipx *)a; + + for (i = 0;i < 4; i++) sprintf(netnum + i * 2, "%02X", (unsigned char) sin->sa_netnum[i]); + for (i = 0;i < 6; i++) sprintf(nodenum + i * 2, "%02X", (unsigned char) sin->sa_nodenum[i]); + + return wine_dbg_sprintf("{ family AF_IPX, address %s.%s, ipx socket %d }", + netnum, nodenum, sin->sa_socket); + } case WS_AF_IRDA: { DWORD addr;

1 0

Alexandre Julliard : makedep: Pass string arrays by value in some places.
by Alexandre Julliard Dec. 30, 2013

Dec. 30, 2013

Module: wine Branch: master Commit: 5706cdaa5bda259615055a558ffae0da7e447e72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5706cdaa5bda259615055a558… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Dec 28 19:52:33 2013 +0100 makedep: Pass string arrays by value in some places. --- tools/makedep.c | 52 ++++++++++++++++++++++++++-------------------------- 1 files changed, 26 insertions(+), 26 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 4141756..3c35a8a 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -301,11 +301,11 @@ static void strarray_add( struct strarray *array, const char *str ) /******************************************************************* * strarray_addall */ -static void strarray_addall( struct strarray *array, const struct strarray *added ) +static void strarray_addall( struct strarray *array, struct strarray added ) { unsigned int i; - for (i = 0; i < added->count; i++) strarray_add( array, added->str[i] ); + for (i = 0; i < added.count; i++) strarray_add( array, added.str[i] ); } @@ -352,11 +352,11 @@ static void output_filename( const char *name ) /******************************************************************* * output_filenames */ -static void output_filenames( struct strarray *array ) +static void output_filenames( struct strarray array ) { unsigned int i; - for (i = 0; i < array->count; i++) output_filename( array->str[i] ); + for (i = 0; i < array.count; i++) output_filename( array.str[i] ); } @@ -1384,7 +1384,7 @@ static struct strarray output_sources(void) else strarray_add( &includes, strmake( "-I%s", parent_dir )); } if (top_src_dir && top_obj_dir) strarray_add( &includes, strmake( "-I%s/include", top_obj_dir )); - strarray_addall( &includes, &include_args ); + strarray_addall( &includes, include_args ); LIST_FOR_EACH_ENTRY( source, &sources, struct incl_file, entry ) { @@ -1442,7 +1442,7 @@ static struct strarray output_sources(void) { output( "%s.res: $(WRC) $(ALL_MO_FILES) %s\n", obj, sourcedep ); output( "\t$(WRC) -o $@ %s", source->filename ); - output_filenames( &includes ); + output_filenames( includes ); output_filename( "$(RCFLAGS)" ); output( "\n" ); output( "%s.res rsrc.pot:", obj ); @@ -1452,7 +1452,7 @@ static struct strarray output_sources(void) { output( "%s.res: $(WRC) %s\n", obj, sourcedep ); output( "\t$(WRC) -o $@ %s", source->filename ); - output_filenames( &includes ); + output_filenames( includes ); output_filename( "$(RCFLAGS)" ); output( "\n" ); output( "%s.res:", obj ); @@ -1484,14 +1484,14 @@ static struct strarray output_sources(void) strarray_add( &targets, dest ); } if (source->flags & FLAG_IDL_PROXY) strarray_add( &dlldata_files, source->name ); - output_filenames( &targets ); + output_filenames( targets ); output( ": $(WIDL)\n" ); output( "\t$(WIDL) -o $@ %s", source->filename ); - output_filenames( &includes ); + output_filenames( includes ); output_filename( "$(TARGETFLAGS)" ); output_filename( "$(IDLFLAGS)" ); output( "\n" ); - output_filenames( &targets ); + output_filenames( targets ); output( ": %s", sourcedep ); } else if (!strcmp( ext, "in" )) /* .in file or man page */ @@ -1564,14 +1564,14 @@ static struct strarray output_sources(void) if (strstr( object_extensions.str[i], "cross" )) { output( "\t$(CROSSCC) -c -o $@ %s", source->filename ); - output_filenames( &includes ); + output_filenames( includes ); output_filename( "$(ALLCROSSCFLAGS)" ); output( "\n" ); } else { output( "\t$(CC) -c -o $@ %s", source->filename ); - output_filenames( &includes ); + output_filenames( includes ); output_filename( "$(ALLCFLAGS)" ); output( "\n" ); } @@ -1581,7 +1581,7 @@ static struct strarray output_sources(void) strarray_add( &clean_files, strmake( "%s.cross.o", obj )); output( "%s.cross.o: %s\n", obj, sourcedep ); output( "\t$(CROSSCC) -c -o $@ %s", source->filename ); - output_filenames( &includes ); + output_filenames( includes ); output_filename( "$(ALLCROSSCFLAGS)" ); output( "\n" ); } @@ -1609,12 +1609,12 @@ static struct strarray output_sources(void) if (po_files.count) { output( "rsrc.pot: $(WRC)" ); - output_filenames( &po_files ); + output_filenames( po_files ); output( "\n" ); output( "\t$(WRC) -O pot -o $@" ); - output_filenames( &includes ); + output_filenames( includes ); output_filename( "$(RCFLAGS)" ); - output_filenames( &po_files ); + output_filenames( po_files ); output( "\n" ); strarray_add( &clean_files, "rsrc.pot" ); } @@ -1622,10 +1622,10 @@ static struct strarray output_sources(void) if (mc_files.count) { output( "msg.pot: $(WMC)" ); - output_filenames( &mc_files ); + output_filenames( mc_files ); output( "\n" ); output( "\t$(WMC) -O pot -o $@" ); - output_filenames( &mc_files ); + output_filenames( mc_files ); output( "\n" ); strarray_add( &clean_files, "msg.pot" ); } @@ -1634,7 +1634,7 @@ static struct strarray output_sources(void) { output( "dlldata.c: $(WIDL) %s\n", src_dir ? strmake("%s/Makefile.in", src_dir ) : "Makefile.in" ); output( "\t$(WIDL) --dlldata-only -o $@" ); - output_filenames( &dlldata_files ); + output_filenames( dlldata_files ); output( "\n" ); } @@ -1643,16 +1643,16 @@ static struct strarray output_sources(void) struct strarray ok_files = strarray_replace_extension( &test_files, ".c", ".ok" ); output( "testlist.c: $(MAKECTESTS) %s\n", src_dir ? strmake("%s/Makefile.in", src_dir ) : "Makefile.in" ); output( "\t$(MAKECTESTS) -o $@" ); - output_filenames( &test_files ); + output_filenames( test_files ); output( "\n" ); output( "check test:" ); - output_filenames( &ok_files ); + output_filenames( ok_files ); output( "\n" ); output( "testclean::\n" ); output( "\t$(RM)" ); - output_filenames( &ok_files ); + output_filenames( ok_files ); output( "\n" ); - strarray_addall( &clean_files, &ok_files ); + strarray_addall( &clean_files, ok_files ); strarray_add( &phony_targets, "check" ); strarray_add( &phony_targets, "test" ); strarray_add( &phony_targets, "testclean" ); @@ -1662,13 +1662,13 @@ static struct strarray output_sources(void) { output( "clean::\n" ); output( "\t$(RM)" ); - output_filenames( &clean_files ); + output_filenames( clean_files ); output( "\n" ); } if (subdirs.count) { - output_filenames( &subdirs ); + output_filenames( subdirs ); output( ":\n" ); output( "\t$(MKDIR_P) -m 755 $@\n" ); } @@ -1676,7 +1676,7 @@ static struct strarray output_sources(void) if (phony_targets.count) { output( ".PHONY:" ); - output_filenames( &phony_targets ); + output_filenames( phony_targets ); output( "\n" ); }

1 0