January 2014 - Wine-Commits

Marcus Meissner : mmsystem.dll16: Free the correct pointer (Coverity).
by Alexandre Julliard Jan. 1, 2014

Jan. 1, 2014

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

Nikolay Sivov : ntdll: Fix manifest attribute parsing.
by Alexandre Julliard Jan. 1, 2014

Jan. 1, 2014

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

Stefan Dösinger : d3dx9_36: Make NUM_ELEM a define.
by Alexandre Julliard Jan. 1, 2014

Jan. 1, 2014

Module: wine Branch: master Commit: 4734771f2867e5df5ff177f320aff984ec0e65e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4734771f2867e5df5ff177f32… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jan 1 19:01:45 2014 +0100 d3dx9_36: Make NUM_ELEM a define. --- dlls/d3dx9_36/mesh.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index 414f338..8180d8e 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -6393,7 +6393,7 @@ static BOOL weld_float16_2(void *to, void *from, FLOAT epsilon) FLOAT diff_x; FLOAT diff_y; FLOAT max_abs_diff; - const UINT NUM_ELEM = 2; +#define NUM_ELEM 2 FLOAT v1[NUM_ELEM]; FLOAT v2[NUM_ELEM]; @@ -6412,6 +6412,7 @@ static BOOL weld_float16_2(void *to, void *from, FLOAT epsilon) } return FALSE; +#undef NUM_ELEM } static BOOL weld_float16_4(void *to, void *from, FLOAT epsilon) @@ -6423,7 +6424,7 @@ static BOOL weld_float16_4(void *to, void *from, FLOAT epsilon) FLOAT diff_z; FLOAT diff_w; FLOAT max_abs_diff; - const UINT NUM_ELEM = 4; +#define NUM_ELEM 4 FLOAT v1[NUM_ELEM]; FLOAT v2[NUM_ELEM]; @@ -6446,6 +6447,7 @@ static BOOL weld_float16_4(void *to, void *from, FLOAT epsilon) } return FALSE; +#undef NUM_ELEM } /* Sets the vertex components to the same value if they are within epsilon. */

1 0

Alexandre Julliard : makefiles: Add support for a variable to list extra targets.
by Alexandre Julliard Jan. 1, 2014

Jan. 1, 2014

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

Alexandre Julliard : makefiles: Define libwine soversion from configure.
by Alexandre Julliard Jan. 1, 2014

Jan. 1, 2014

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

Marcus Meissner : setupapi: Do not free stack pointers (Coverity).
by Alexandre Julliard Jan. 1, 2014

Jan. 1, 2014

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

Alexandre Julliard : makefiles: Include manpages in the all: target.
by Alexandre Julliard Jan. 1, 2014

Jan. 1, 2014

Module: wine Branch: master Commit: a40d4d20e0b915d16b96e660dab69d187303ebc9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a40d4d20e0b915d16b96e660d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 31 19:18:06 2013 +0100 makefiles: Include manpages in the all: target. --- Make.rules.in | 4 ---- tools/makedep.c | 3 ++- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/Make.rules.in b/Make.rules.in index 7cffd10..8d2c0cf 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -28,10 +28,6 @@ depend: dummy .PHONY: depend -# Rules for man pages - -all: $(MANPAGES:.man.in=.man) - # Rules for cleaning clean:: diff --git a/tools/makedep.c b/tools/makedep.c index 1216ff6..58e9646 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -1530,9 +1530,10 @@ static struct strarray output_sources(void) dir, dest, source->sourcename ); free( dest ); free( dir ); + strarray_add( &all_targets, xstrdup(obj) ); strarray_add_uniq( &phony_targets, "install-man-pages" ); } - strarray_add( &clean_files, xstrdup(obj) ); + else strarray_add( &clean_files, xstrdup(obj) ); output( "%s: %s\n", obj, sourcedep ); output( "\t$(SED_CMD) %s >$@ || ($(RM) $@ && false)\n", source->filename ); output( "%s:", obj );

1 0

Alexandre Julliard : makefiles: Remove no longer needed dlldata. o and testlist.o extra objects.
by Alexandre Julliard Jan. 1, 2014

Jan. 1, 2014

Module: wine Branch: master Commit: 1adaad4c89a6b7496a544718becf5e0e05bd2800 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1adaad4c89a6b7496a544718b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 31 19:05:12 2013 +0100 makefiles: Remove no longer needed dlldata.o and testlist.o extra objects. --- configure | 1 - configure.ac | 1 - dlls/actxprxy/Makefile.in | 2 -- dlls/dispex/Makefile.in | 2 -- dlls/msdaps/Makefile.in | 2 -- dlls/ole32/Makefile.in | 2 -- dlls/oleaut32/Makefile.in | 2 -- dlls/qmgrprxy/Makefile.in | 2 -- dlls/quartz/Makefile.in | 2 -- dlls/sti/Makefile.in | 2 -- dlls/urlmon/Makefile.in | 2 -- dlls/windowscodecs/Makefile.in | 2 -- 12 files changed, 0 insertions(+), 22 deletions(-) diff --git a/configure b/configure index 925ead3..19db3c3 100755 --- a/configure +++ b/configure @@ -16567,7 +16567,6 @@ DLLFLAGS = $DLLFLAGS MAKE_TEST_RULES=" DLLFLAGS = $DLLFLAGS RUNTESTFLAGS = -q -P wine -EXTRA_OBJS = testlist.o " if test -n "$CROSSTARGET" diff --git a/configure.ac b/configure.ac index e83cbd1..9a37857 100644 --- a/configure.ac +++ b/configure.ac @@ -2625,7 +2625,6 @@ dnl Test rules AC_SUBST(MAKE_TEST_RULES," DLLFLAGS = $DLLFLAGS RUNTESTFLAGS = -q -P wine -EXTRA_OBJS = testlist.o ") if test -n "$CROSSTARGET" then diff --git a/dlls/actxprxy/Makefile.in b/dlls/actxprxy/Makefile.in index 9cd1b47..69394c1 100644 --- a/dlls/actxprxy/Makefile.in +++ b/dlls/actxprxy/Makefile.in @@ -2,8 +2,6 @@ MODULE = actxprxy.dll IMPORTS = uuid oleaut32 ole32 rpcrt4 EXTRADEFS = -DWINE_REGISTER_DLL -DPROXY_DELEGATION -EXTRA_OBJS = dlldata.o - C_SRCS = \ usrmarshal.c diff --git a/dlls/dispex/Makefile.in b/dlls/dispex/Makefile.in index 19d3083..f663249 100644 --- a/dlls/dispex/Makefile.in +++ b/dlls/dispex/Makefile.in @@ -2,8 +2,6 @@ MODULE = dispex.dll IMPORTS = uuid oleaut32 ole32 rpcrt4 advapi32 EXTRADEFS = -DWINE_REGISTER_DLL -DPROXY_DELEGATION -EXTRA_OBJS = dlldata.o - C_SRCS = \ usrmarshal.c diff --git a/dlls/msdaps/Makefile.in b/dlls/msdaps/Makefile.in index bcfde21..74b38c5 100644 --- a/dlls/msdaps/Makefile.in +++ b/dlls/msdaps/Makefile.in @@ -3,8 +3,6 @@ IMPORTS = uuid oleaut32 ole32 rpcrt4 advapi32 EXTRADEFS = -DWINE_REGISTER_DLL -DPROXY_CLSID=CLSID_PSFactoryBuffer -DENTRY_PREFIX=msdaps_ EXTRAIDLFLAGS = --win32-align=2 -EXTRA_OBJS = dlldata.o - C_SRCS = \ main.c \ row_server.c \ diff --git a/dlls/ole32/Makefile.in b/dlls/ole32/Makefile.in index 71869a0..141c27f 100644 --- a/dlls/ole32/Makefile.in +++ b/dlls/ole32/Makefile.in @@ -50,6 +50,4 @@ IDL_SRCS = \ ole32_oleidl.idl \ ole32_unknwn.idl -EXTRA_OBJS = dlldata.o - @MAKE_DLL_RULES@ diff --git a/dlls/oleaut32/Makefile.in b/dlls/oleaut32/Makefile.in index caf4098..fc5b1dd 100644 --- a/dlls/oleaut32/Makefile.in +++ b/dlls/oleaut32/Makefile.in @@ -27,6 +27,4 @@ IDL_SRCS = \ oleaut32_oaidl.idl \ oleaut32_ocidl.idl -EXTRA_OBJS = dlldata.o - @MAKE_DLL_RULES@ diff --git a/dlls/qmgrprxy/Makefile.in b/dlls/qmgrprxy/Makefile.in index d520fe7..1137465 100644 --- a/dlls/qmgrprxy/Makefile.in +++ b/dlls/qmgrprxy/Makefile.in @@ -4,6 +4,4 @@ EXTRADEFS = -DWINE_REGISTER_DLL IDL_SRCS = qmgrprxy.idl -EXTRA_OBJS = dlldata.o - @MAKE_DLL_RULES@ diff --git a/dlls/quartz/Makefile.in b/dlls/quartz/Makefile.in index 9a6057d..c1b92a8 100644 --- a/dlls/quartz/Makefile.in +++ b/dlls/quartz/Makefile.in @@ -34,6 +34,4 @@ IDL_SRCS = \ fil_data.idl \ quartz_strmif.idl -EXTRA_OBJS = dlldata.o - @MAKE_DLL_RULES@ diff --git a/dlls/sti/Makefile.in b/dlls/sti/Makefile.in index 3decb9a..22efe3e 100644 --- a/dlls/sti/Makefile.in +++ b/dlls/sti/Makefile.in @@ -9,6 +9,4 @@ C_SRCS = \ IDL_SRCS = sti_wia.idl -EXTRA_OBJS = dlldata.o - @MAKE_DLL_RULES@ diff --git a/dlls/urlmon/Makefile.in b/dlls/urlmon/Makefile.in index ec2cd5c..c0a57c1 100644 --- a/dlls/urlmon/Makefile.in +++ b/dlls/urlmon/Makefile.in @@ -32,6 +32,4 @@ RC_SRCS = urlmon.rc IDL_SRCS = urlmon_urlmon.idl -EXTRA_OBJS = dlldata.o - @MAKE_DLL_RULES@ diff --git a/dlls/windowscodecs/Makefile.in b/dlls/windowscodecs/Makefile.in index 2456ae4..04adda4 100644 --- a/dlls/windowscodecs/Makefile.in +++ b/dlls/windowscodecs/Makefile.in @@ -38,6 +38,4 @@ RC_SRCS = version.rc IDL_SRCS = windowscodecs_wincodec.idl -EXTRA_OBJS = dlldata.o - @MAKE_DLL_RULES@

1 0

Alexandre Julliard : makefiles: Include program files in the all: target.
by Alexandre Julliard Jan. 1, 2014

Jan. 1, 2014

Module: wine Branch: master Commit: 092f37fc2d20428930ca8dc058525cb9d45fc3c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=092f37fc2d20428930ca8dc05… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 31 19:07:49 2013 +0100 makefiles: Include program files in the all: target. --- Make.rules.in | 2 +- aclocal.m4 | 3 --- configure | 35 ++++++++++------------------------- configure.ac | 27 ++++++++------------------- loader/Makefile.in | 7 ------- server/Makefile.in | 2 -- tools/Makefile.in | 5 ++--- tools/makedep.c | 2 +- tools/widl/Makefile.in | 2 -- tools/winebuild/Makefile.in | 2 -- tools/winedump/Makefile.in | 2 -- tools/winegcc/Makefile.in | 2 -- tools/wmc/Makefile.in | 2 -- tools/wrc/Makefile.in | 2 -- 14 files changed, 22 insertions(+), 73 deletions(-) diff --git a/Make.rules.in b/Make.rules.in index 0a5a046..7cffd10 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -35,7 +35,7 @@ all: $(MANPAGES:.man.in=.man) # Rules for cleaning clean:: - $(RM) $(CLEAN_FILES) $(PROGRAMS) + $(RM) $(CLEAN_FILES) .PHONY: clean diff --git a/aclocal.m4 b/aclocal.m4 index 7760a20..dff44af 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -644,9 +644,6 @@ wine_fn_config_tool () case $ac_dir in tools/winebuild) wine_fn_append_rule "\$(WINEBUILD): $ac_dir" ;; esac - case $ac_dir in - tools/*) wine_fn_ignore_file $ac_dir/`expr $ac_dir : tools/"\$.*\$"`$ac_exeext ;; - esac } wine_fn_config_makerules () diff --git a/configure b/configure index 19db3c3..24a470b 100755 --- a/configure +++ b/configure @@ -7049,10 +7049,6 @@ else READELF="$ac_cv_prog_READELF" fi - -wine_binary="wine" -test "x$enable_win64" != "xyes" || wine_binary="wine64" - wine_rules_file=conf$$rules.make rm -f $wine_rules_file ALL_POT_FILES="" @@ -7521,9 +7517,6 @@ fi case $ac_dir in tools/winebuild) wine_fn_append_rule "\$(WINEBUILD): $ac_dir" ;; esac - case $ac_dir in - tools/*) wine_fn_ignore_file $ac_dir/`expr $ac_dir : tools/"\$.*\$"`$ac_exeext ;; - esac } wine_fn_config_makerules () @@ -7556,13 +7549,12 @@ distclean:: test -n "$ac_linkdir" || return wine_fn_append_rule "$ac_linkdir/Makefile $ac_linkdir/depend: $ac_links" } -wine_fn_ignore_file "loader/wine" -test "$wine_binary" = wine || wine_fn_ignore_file "loader/$wine_binary" -wine_fn_ignore_file "loader/wine-installed" -LOADER_RULES=" -all: $wine_binary wine-installed +wine_binary="wine" +test "x$enable_win64" != "xyes" || wine_binary="wine64" +loader_programs="$wine_binary wine-installed" +LOADER_RULES=" install install-lib:: wine-installed \$(INSTALL_PROGRAM) wine-installed \$(DESTDIR)\$(bindir)/$wine_binary @@ -14409,11 +14401,9 @@ case $host_os in linux*) case $host_cpu in *i[3456789]86*|x86_64*) - wine_fn_ignore_file "loader/wine-preloader" - test "$wine_binary" = wine || wine_fn_ignore_file "loader/$wine_binary-preloader" + test "$wine_binary" = wine || wine_fn_ignore_file "loader/wine-preloader" + loader_programs="$loader_programs $wine_binary-preloader" as_fn_append LOADER_RULES " -all: $wine_binary-preloader - $wine_binary-preloader: preloader.o \$(CC) -o \$@ -static -nostartfiles -nodefaultlibs -Wl,-Ttext=0x7c400000 preloader.o \$(LIBPORT) \$(LDFLAGS) @@ -14426,6 +14416,9 @@ uninstall:: esac ;; esac +as_fn_append LOADER_RULES " +PROGRAMS = $loader_programs +" ac_save_CFLAGS="$CFLAGS" @@ -17400,16 +17393,8 @@ 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_server" = xno || wine_fn_ignore_file "server/wineserver" -test "x$enable_server" = xno || wine_fn_ignore_file "server/wineserver-installed" -test "x$enable_tools" = xno || wine_fn_ignore_file "tools/fnt2fon$ac_exeext" -test "x$enable_tools" = xno || wine_fn_ignore_file "tools/make_ctests$ac_exeext" -test "x$enable_tools" = xno || wine_fn_ignore_file "tools/make_xftmpl$ac_exeext" test "x$enable_tools" = xno || wine_fn_ignore_file "tools/makedep$ac_exeext" -test "x$enable_tools" = xno || wine_fn_ignore_file "tools/sfnt2fnt$ac_exeext" -test "x$enable_tools" = xno || wine_fn_ignore_file "tools/wineapploader$ac_exeext" -test "x$enable_tools" = xno || wine_fn_ignore_file "tools/winegcc/winecpp$ac_exeext" -test "x$enable_tools" = xno || wine_fn_ignore_file "tools/winegcc/wineg++$ac_exeext" +test "$wine_binary" = wine || wine_fn_ignore_file "loader/wine" ac_config_commands="$ac_config_commands Makefile" diff --git a/configure.ac b/configure.ac index 9a37857..73eb820 100644 --- a/configure.ac +++ b/configure.ac @@ -682,17 +682,13 @@ DLLEXT=".so" IMPLIBEXT="def" STATIC_IMPLIBEXT="def.a" WINE_PATH_SONAME_TOOLS +WINE_CONFIG_HELPERS wine_binary="wine" test "x$enable_win64" != "xyes" || wine_binary="wine64" - -WINE_IGNORE_FILE("loader/wine") -test "$wine_binary" = wine || WINE_IGNORE_FILE("loader/$wine_binary") -WINE_IGNORE_FILE("loader/wine-installed") +loader_programs="$wine_binary wine-installed" AC_SUBST(LOADER_RULES,[" -all: $wine_binary wine-installed - install install-lib:: wine-installed \$(INSTALL_PROGRAM) wine-installed \$(DESTDIR)\$(bindir)/$wine_binary @@ -2000,11 +1996,9 @@ case $host_os in linux*) case $host_cpu in *i[[3456789]]86*|x86_64*) - WINE_IGNORE_FILE("loader/wine-preloader") - test "$wine_binary" = wine || WINE_IGNORE_FILE("loader/$wine_binary-preloader") + test "$wine_binary" = wine || WINE_IGNORE_FILE("loader/wine-preloader") + loader_programs="$loader_programs $wine_binary-preloader" AS_VAR_APPEND([LOADER_RULES],[" -all: $wine_binary-preloader - $wine_binary-preloader: preloader.o \$(CC) -o \$@ -static -nostartfiles -nodefaultlibs -Wl,-Ttext=0x7c400000 preloader.o \$(LIBPORT) \$(LDFLAGS) @@ -2017,6 +2011,9 @@ uninstall:: esac ;; esac +AS_VAR_APPEND([LOADER_RULES],[" +PROGRAMS = $loader_programs +"]) dnl **** Check for functions **** @@ -3446,16 +3443,8 @@ 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("server/wineserver",enable_server) -WINE_IGNORE_FILE("server/wineserver-installed",enable_server) -WINE_IGNORE_FILE("tools/fnt2fon$ac_exeext",enable_tools) -WINE_IGNORE_FILE("tools/make_ctests$ac_exeext",enable_tools) -WINE_IGNORE_FILE("tools/make_xftmpl$ac_exeext",enable_tools) WINE_IGNORE_FILE("tools/makedep$ac_exeext",enable_tools) -WINE_IGNORE_FILE("tools/sfnt2fnt$ac_exeext",enable_tools) -WINE_IGNORE_FILE("tools/wineapploader$ac_exeext",enable_tools) -WINE_IGNORE_FILE("tools/winegcc/winecpp$ac_exeext",enable_tools) -WINE_IGNORE_FILE("tools/winegcc/wineg++$ac_exeext",enable_tools) +test "$wine_binary" = wine || WINE_IGNORE_FILE("loader/wine") AC_CONFIG_COMMANDS([Makefile], [wine_fn_output_makefile Makefile], [wine_fn_output_makefile () diff --git a/loader/Makefile.in b/loader/Makefile.in index de3d4f8..2c81e26 100644 --- a/loader/Makefile.in +++ b/loader/Makefile.in @@ -5,13 +5,6 @@ C_SRCS = \ main.c \ preloader.c -PROGRAMS = \ - wine \ - wine-installed \ - wine-preloader \ - wine64 \ - wine64-preloader - MANPAGES = \ wine.de.UTF-8.man.in \ wine.fr.UTF-8.man.in \ diff --git a/server/Makefile.in b/server/Makefile.in index ea19dc4..3998f2f 100644 --- a/server/Makefile.in +++ b/server/Makefile.in @@ -52,8 +52,6 @@ MANPAGES = \ wineserver.fr.UTF-8.man.in \ wineserver.man.in -all: $(PROGRAMS) - @MAKE_RULES@ wineserver: $(OBJS) diff --git a/tools/Makefile.in b/tools/Makefile.in index 5cfa005..5863014 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -5,8 +5,7 @@ PROGRAMS = \ fnt2fon$(EXEEXT) \ make_ctests$(EXEEXT) \ make_xftmpl$(EXEEXT) \ - sfnt2fnt$(EXEEXT) \ - wineapploader + sfnt2fnt$(EXEEXT) MANPAGES = \ winemaker.de.UTF-8.man.in \ @@ -25,7 +24,7 @@ IN_SRCS = \ UPDATE_DESKTOP_DATABASE = update-desktop-database -all: $(PROGRAMS) +all: wineapploader @MAKE_RULES@ diff --git a/tools/makedep.c b/tools/makedep.c index e113cf9..1216ff6 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -1379,9 +1379,9 @@ static struct strarray output_sources(void) struct strarray implib_objs = empty_strarray; struct strarray includes = empty_strarray; struct strarray subdirs = empty_strarray; - struct strarray all_targets = empty_strarray; struct strarray phony_targets = empty_strarray; struct strarray imports = get_expanded_make_var_array( "IMPORTS" ); + struct strarray all_targets = get_expanded_make_var_array( "PROGRAMS" ); struct strarray delayimports = get_expanded_make_var_array( "DELAYIMPORTS" ); char *module = get_expanded_make_variable( "MODULE" ); char *exeext = get_expanded_make_variable( "EXEEXT" ); diff --git a/tools/widl/Makefile.in b/tools/widl/Makefile.in index 01c22e6..4565f54 100644 --- a/tools/widl/Makefile.in +++ b/tools/widl/Makefile.in @@ -21,8 +21,6 @@ BISON_SRCS = parser.y EXTRADEFS = -DDEFAULT_INCLUDE_DIR=\"$(includedir)/windows/\" -all: $(PROGRAMS) - @MAKE_RULES@ widl$(EXEEXT): $(OBJS) $(LIBWPP) diff --git a/tools/winebuild/Makefile.in b/tools/winebuild/Makefile.in index bcd7c8c..638e3e5 100644 --- a/tools/winebuild/Makefile.in +++ b/tools/winebuild/Makefile.in @@ -12,8 +12,6 @@ C_SRCS = \ spec32.c \ utils.c -all: $(PROGRAMS) - @MAKE_RULES@ winebuild$(EXEEXT): $(OBJS) diff --git a/tools/winedump/Makefile.in b/tools/winedump/Makefile.in index 421baa1..d5f0e7b 100644 --- a/tools/winedump/Makefile.in +++ b/tools/winedump/Makefile.in @@ -23,8 +23,6 @@ C_SRCS = \ symbol.c \ tlb.c -all: $(PROGRAMS) - @MAKE_RULES@ winedump$(EXEEXT): $(OBJS) diff --git a/tools/winegcc/Makefile.in b/tools/winegcc/Makefile.in index 074a972..6b72211 100644 --- a/tools/winegcc/Makefile.in +++ b/tools/winegcc/Makefile.in @@ -18,8 +18,6 @@ C_SRCS = \ utils.c \ winegcc.c -all: $(PROGRAMS) - @MAKE_RULES@ winegcc$(EXEEXT): winegcc.o utils.o diff --git a/tools/wmc/Makefile.in b/tools/wmc/Makefile.in index fcf8212..e2adaf4 100644 --- a/tools/wmc/Makefile.in +++ b/tools/wmc/Makefile.in @@ -12,8 +12,6 @@ C_SRCS = \ BISON_SRCS = mcy.y -all: $(PROGRAMS) - @MAKE_RULES@ wmc$(EXEEXT): $(OBJS) diff --git a/tools/wrc/Makefile.in b/tools/wrc/Makefile.in index 8a74f64..9d956b8 100644 --- a/tools/wrc/Makefile.in +++ b/tools/wrc/Makefile.in @@ -17,8 +17,6 @@ C_SRCS = \ LEX_SRCS = parser.l BISON_SRCS = parser.y -all: $(PROGRAMS) - @MAKE_RULES@ wrc$(EXEEXT): $(OBJS) $(LIBWPP)

1 0

Stefan Dösinger : wined3d: Fix an msvc warning.
by Alexandre Julliard Jan. 1, 2014

Jan. 1, 2014

Module: wine Branch: master Commit: 1e9fe22f4cd07b3362c6f5d049154c229e3c6aa4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e9fe22f4cd07b3362c6f5d04… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jan 1 19:01:41 2014 +0100 wined3d: Fix an msvc warning. --- dlls/wined3d/wined3d_private.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 5f42964..a0cb5bb 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -938,7 +938,7 @@ void draw_primitive(struct wined3d_device *device, UINT start_idx, UINT index_co UINT start_instance, UINT instance_count, BOOL indexed) DECLSPEC_HIDDEN; DWORD get_flexible_vertex_size(DWORD d3dvtVertexType) DECLSPEC_HIDDEN; -#define eps 1e-8 +#define eps 1e-8f #define GET_TEXCOORD_SIZE_FROM_FVF(d3dvtVertexType, tex_num) \ (((((d3dvtVertexType) >> (16 + (2 * (tex_num)))) + 1) & 0x03) + 1)

1 0