December 2013 - Wine-Commits

Alexandre Julliard : makedep: Generate rules for test binaries.
by Alexandre Julliard Dec. 31, 2013

Dec. 31, 2013

Module: wine Branch: master Commit: 8bf0f5fe6dc8de6986ed5eef40654d0d0ecdfb17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8bf0f5fe6dc8de6986ed5eef4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 30 20:19:33 2013 +0100 makedep: Generate rules for test binaries. --- Make.rules.in | 19 +-------------- configure | 15 +----------- configure.ac | 15 +----------- tools/makedep.c | 69 +++++++++++++++++++++++++++++++++++++++++++++++++++--- 4 files changed, 68 insertions(+), 50 deletions(-) diff --git a/Make.rules.in b/Make.rules.in index 0a40ff4..52fdf9c 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -19,12 +19,9 @@ RCFLAGS = --nostdinc $(PORCFLAGS) $(TARGETFLAGS) $(DEFS) $(EXTRARCFLAGS) IDL_GEN_C_SRCS = $(IDL_C_SRCS:.idl=_c.c) $(IDL_I_SRCS:.idl=_i.c) \ $(IDL_P_SRCS:.idl=_p.c) $(IDL_S_SRCS:.idl=_s.c) -CLEAN_TARGETS = $(TESTMODULE) $(TESTMODULE_STRIPPED) $(CROSSTESTMODULE) - OBJS = $(C_SRCS:.c=.o) $(BISON_SRCS:.y=.tab.o) $(LEX_SRCS:.l=.yy.o) $(IDL_GEN_C_SRCS:.c=.o) $(OBJC_SRCS:.m=.o) \ $(IDL_R_SRCS:.idl=_r.res) $(IDL_TLB_RES) $(RC_SRCS:.rc=.res) $(MC_SRCS:.mc=.res) $(EXTRA_OBJS) -CROSSOBJS = $(OBJS:.o=.cross.o) ALLCROSSCFLAGS = $(DEFS) -DWINE_CROSSTEST $(CPPFLAGS) $(CFLAGS) # Rules for dependencies @@ -34,20 +31,6 @@ depend: dummy .PHONY: depend -# Rules for tests - -$(TESTMODULE) $(TESTMODULE:%=%.so): $(OBJS) - $(WINEGCC) $(APPMODE) $(OBJS) -o $@ $(IMPORTS:%=-l%) $(LDFLAGS) $(LIBS) - -$(TESTMODULE_STRIPPED): $(OBJS) - $(WINEGCC) -s -Wb,-F,$(TESTMODULE) $(APPMODE) $(OBJS) -o $@ $(IMPORTS:%=-l%) $(LDFLAGS) $(LIBS) - -$(CROSSTESTMODULE): $(CROSSOBJS) - $(CROSSWINEGCC) $(CROSSOBJS) -o $@ $(IMPORTS:%=-l%) $(LDFLAGS) $(LIBS) - -$(WINETEST_RES): $(TESTMODULE_STRIPPED) - echo "$(TESTMODULE) TESTRES \"$(TESTMODULE_STRIPPED)\"" | $(WRC) $(RCFLAGS) -o $@ - # Rules for man pages all: $(MANPAGES:.man.in=.man) @@ -55,7 +38,7 @@ all: $(MANPAGES:.man.in=.man) # Rules for cleaning clean:: - $(RM) $(CLEAN_FILES) $(CLEAN_TARGETS) $(PROGRAMS) + $(RM) $(CLEAN_FILES) $(PROGRAMS) .PHONY: clean diff --git a/configure b/configure index 91bb070..5b2f013 100755 --- a/configure +++ b/configure @@ -16577,25 +16577,14 @@ DLLFLAGS = $DLLFLAGS MAKE_TEST_RULES=" DLLFLAGS = $DLLFLAGS -TESTMODULE = \$(TESTDLL:%.dll=%)_test.exe -TESTMODULE_STRIPPED = \$(TESTDLL:%.dll=%)_test-stripped.exe$DLLEXT -WINETEST_RES = \$(top_builddir)/programs/winetest/\$(TESTDLL:%.dll=%)_test.res -RUNTESTFLAGS = -q -P wine -T \$(top_builddir) -M \$(TESTDLL) -p \$(TESTMODULE)$DLLEXT +RUNTESTFLAGS = -q -P wine EXTRA_OBJS = testlist.o - -all: \$(TESTMODULE)$DLLEXT \$(WINETEST_RES) - -\$(C_SRCS:.c=.ok): \$(TESTMODULE)$DLLEXT \$(TESTDLL:%=../%$DLLEXT) " if test -n "$CROSSTARGET" then as_fn_append MAKE_TEST_RULES " MAKEDEPFLAGS = -xo -xcross.o -CROSSTESTMODULE = \$(TESTDLL:%.dll=%)_crosstest.exe - -crosstest: \$(CROSSTESTMODULE) -.PHONY: crosstest " fi @@ -17409,8 +17398,6 @@ zh_TW" -wine_fn_ignore_file "*.exe" -test -n "$DLLEXT" && wine_fn_ignore_file "*$DLLEXT" wine_fn_ignore_file ".gitignore" wine_fn_ignore_file "Makefile" wine_fn_ignore_file "TAGS" diff --git a/configure.ac b/configure.ac index 9d1948c..74950e3 100644 --- a/configure.ac +++ b/configure.ac @@ -2635,24 +2635,13 @@ dnl Test rules AC_SUBST(MAKE_TEST_RULES," DLLFLAGS = $DLLFLAGS -TESTMODULE = \$(TESTDLL:%.dll=%)_test.exe -TESTMODULE_STRIPPED = \$(TESTDLL:%.dll=%)_test-stripped.exe$DLLEXT -WINETEST_RES = \$(top_builddir)/programs/winetest/\$(TESTDLL:%.dll=%)_test.res -RUNTESTFLAGS = -q -P wine -T \$(top_builddir) -M \$(TESTDLL) -p \$(TESTMODULE)$DLLEXT +RUNTESTFLAGS = -q -P wine EXTRA_OBJS = testlist.o - -all: \$(TESTMODULE)$DLLEXT \$(WINETEST_RES) - -\$(C_SRCS:.c=.ok): \$(TESTMODULE)$DLLEXT \$(TESTDLL:%=../%$DLLEXT) ") if test -n "$CROSSTARGET" then AS_VAR_APPEND([MAKE_TEST_RULES]," MAKEDEPFLAGS = -xo -xcross.o -CROSSTESTMODULE = \$(TESTDLL:%.dll=%)_crosstest.exe - -crosstest: \$(CROSSTESTMODULE) -.PHONY: crosstest ") fi @@ -3455,8 +3444,6 @@ dnl End of auto-generated output commands dnl Main ignore file -WINE_IGNORE_FILE("*.exe") -test -n "$DLLEXT" && WINE_IGNORE_FILE("*$DLLEXT") WINE_IGNORE_FILE(".gitignore") WINE_IGNORE_FILE("Makefile") WINE_IGNORE_FILE("TAGS") diff --git a/tools/makedep.c b/tools/makedep.c index ee24bba..a9b4d6b 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -1367,7 +1367,6 @@ static struct strarray output_sources(void) struct incl_file *source; int i; const char *dllext = ".so"; - int is_test = find_src_file( "testlist.o" ) != NULL; struct strarray object_files = empty_strarray; struct strarray crossobj_files = empty_strarray; struct strarray res_files = empty_strarray; @@ -1385,6 +1384,7 @@ static struct strarray output_sources(void) struct strarray delayimports = get_expanded_make_var_array( "DELAYIMPORTS" ); char *module = get_expanded_make_variable( "MODULE" ); char *exeext = get_expanded_make_variable( "EXEEXT" ); + char *testdll = get_expanded_make_variable( "TESTDLL" ); char *appmode = get_expanded_make_variable( "APPMODE" ); char *staticlib = get_expanded_make_variable( "STATICLIB" ); char *crosstarget = get_expanded_make_variable( "CROSSTARGET" ); @@ -1602,11 +1602,12 @@ static struct strarray output_sources(void) output_filename( "$(ALLCROSSCFLAGS)" ); output( "\n" ); } - if (is_test && !strcmp( ext, "c" ) && !(source->flags & FLAG_GENERATED)) + if (testdll && !strcmp( ext, "c" ) && !(source->flags & FLAG_GENERATED)) { strarray_add( &test_files, source->name ); output( "%s.ok:\n", obj ); - output( "\t$(RUNTEST) $(RUNTESTFLAGS) %s && touch $@\n", obj ); + output( "\t$(RUNTEST) $(RUNTESTFLAGS) -T %s -M %s -p %s%s %s && touch $@\n", top_obj_dir, + testdll, replace_extension( testdll, ".dll", "_test.exe" ), dllext, obj ); } for (i = 0; i < object_extensions.count; i++) output( "%s.%s ", obj, object_extensions.str[i] ); @@ -1773,13 +1774,73 @@ static struct strarray output_sources(void) } } - if (is_test) + if (testdll) { struct strarray ok_files = strarray_replace_extension( &test_files, ".c", ".ok" ); + char *testmodule = replace_extension( testdll, ".dll", "_test.exe" ); + char *stripped = replace_extension( testdll, ".dll", "_test-stripped.exe" ); + struct strarray all_libs = empty_strarray; + + for (i = 0; i < imports.count; i++) strarray_add( &all_libs, strmake( "-l%s", imports.str[i] )); + strarray_addall( &all_libs, get_expanded_make_var_array( "LIBS" )); + + strarray_add( &all_targets, strmake( "%s%s", testmodule, dllext )); + strarray_add( &clean_files, strmake( "%s%s", stripped, dllext )); + output( "%s%s:\n", testmodule, dllext ); + output( "\t$(WINEGCC) -o $@" ); + if (appmode) output_filename( appmode ); + output_filenames( object_files ); + output_filenames( res_files ); + output_filenames( all_libs ); + output_filename( "$(LDFLAGS)" ); + output( "\n" ); + output( "%s%s:\n", stripped, dllext ); + output( "\t$(WINEGCC) -s -o $@ -Wb,-F,%s", testmodule ); + if (appmode) output_filename( appmode ); + output_filenames( object_files ); + output_filenames( res_files ); + output_filenames( all_libs ); + output_filename( "$(LDFLAGS)" ); + output( "\n" ); + output( "%s%s %s%s:", testmodule, dllext, stripped, dllext ); + output_filenames( object_files ); + output_filenames( res_files ); + output( "\n" ); + + if (top_obj_dir) + { + char *testres = replace_extension( testdll, ".dll", "_test.res" ); + output( "all: %s/programs/winetest/%s\n", top_obj_dir, testres ); + output( "%s/programs/winetest/%s: %s%s\n", top_obj_dir, testres, stripped, dllext ); + output( "\techo \"%s TESTRES \\\"%s%s\\\"\" | $(WRC) $(RCFLAGS) -o $@\n", + testmodule, stripped, dllext ); + } + + if (crosstarget) + { + char *crosstest = replace_extension( testdll, ".dll", "_crosstest.exe" ); + + strarray_add( &clean_files, crosstest ); + output( "crosstest: %s\n", crosstest ); + output( "%s:", crosstest ); + output_filenames( crossobj_files ); + output_filenames( res_files ); + output( "\n" ); + output( "\t$(CROSSWINEGCC) -o $@" ); + output_filenames( crossobj_files ); + output_filenames( res_files ); + output_filenames( all_libs ); + output_filename( "$(LDFLAGS)" ); + output( "\n" ); + strarray_add( &phony_targets, "crosstest" ); + } + 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( "\n" ); + output_filenames( ok_files ); + output( ": %s%s ../%s%s\n", testmodule, dllext, testdll, dllext ); output( "check test:" ); output_filenames( ok_files ); output( "\n" );

1 0

Alexandre Julliard : makedep: Keep track of object files in separate arrays .
by Alexandre Julliard Dec. 31, 2013

Dec. 31, 2013

Module: wine Branch: master Commit: 8d6e9161683d9be818412ef35cd775c13930acd9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d6e9161683d9be818412ef35… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 30 20:07:02 2013 +0100 makedep: Keep track of object files in separate arrays. --- tools/makedep.c | 18 +++++++++++++----- 1 files changed, 13 insertions(+), 5 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 3c35a8a..c8a3a6f 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -1367,6 +1367,9 @@ static struct strarray output_sources(void) struct incl_file *source; int i; int is_test = find_src_file( "testlist.o" ) != NULL; + struct strarray object_files = empty_strarray; + struct strarray crossobj_files = empty_strarray; + struct strarray res_files = empty_strarray; struct strarray clean_files = empty_strarray; struct strarray po_files = empty_strarray; struct strarray mc_files = empty_strarray; @@ -1457,13 +1460,13 @@ static struct strarray output_sources(void) output( "\n" ); output( "%s.res:", obj ); } - strarray_add( &clean_files, strmake( "%s.res", obj )); + strarray_add( &res_files, strmake( "%s.res", obj )); } else if (!strcmp( ext, "mc" )) /* message file */ { output( "%s.res: $(WMC) $(ALL_MO_FILES) %s\n", obj, sourcedep ); output( "\t$(WMC) -U -O res $(PORCFLAGS) -o $@ %s\n", source->filename ); - strarray_add( &clean_files, strmake( "%s.res", obj )); + strarray_add( &res_files, strmake( "%s.res", obj )); strarray_add( &mc_files, source->filename ); output( "msg.pot %s.res:", obj ); } @@ -1551,7 +1554,7 @@ static struct strarray output_sources(void) } else if (!strcmp( ext, "res" )) { - strarray_add( &clean_files, source->name ); + strarray_add( &res_files, source->name ); continue; /* no dependencies */ } else @@ -1559,10 +1562,10 @@ static struct strarray output_sources(void) if (source->flags & FLAG_GENERATED) strarray_add( &clean_files, source->filename ); for (i = 0; i < object_extensions.count; i++) { - strarray_add( &clean_files, strmake( "%s.%s", obj, object_extensions.str[i] )); output( "%s.%s: %s\n", obj, object_extensions.str[i], sourcedep ); if (strstr( object_extensions.str[i], "cross" )) { + strarray_add( &crossobj_files, strmake( "%s.%s", obj, object_extensions.str[i] )); output( "\t$(CROSSCC) -c -o $@ %s", source->filename ); output_filenames( includes ); output_filename( "$(ALLCROSSCFLAGS)" ); @@ -1570,6 +1573,7 @@ static struct strarray output_sources(void) } else { + strarray_add( &object_files, strmake( "%s.%s", obj, object_extensions.str[i] )); output( "\t$(CC) -c -o $@ %s", source->filename ); output_filenames( includes ); output_filename( "$(ALLCFLAGS)" ); @@ -1578,7 +1582,7 @@ static struct strarray output_sources(void) } if (source->flags & FLAG_C_IMPLIB) { - strarray_add( &clean_files, strmake( "%s.cross.o", obj )); + strarray_add( &crossobj_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 ); @@ -1658,6 +1662,10 @@ static struct strarray output_sources(void) strarray_add( &phony_targets, "testclean" ); } + strarray_addall( &clean_files, object_files ); + strarray_addall( &clean_files, crossobj_files ); + strarray_addall( &clean_files, res_files ); + if (clean_files.count) { output( "clean::\n" );

1 0

Alexandre Julliard : makedep: Generate rules for the main module.
by Alexandre Julliard Dec. 31, 2013

Dec. 31, 2013

Module: wine Branch: master Commit: f6479c051313e68946f31bb3bfa623e6940f84bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6479c051313e68946f31bb3b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 30 20:08:13 2013 +0100 makedep: Generate rules for the main module. --- Make.rules.in | 7 +----- configure | 14 ----------- configure.ac | 14 ----------- tools/makedep.c | 67 +++++++++++++++++++++++++++++++++++++++++++++++++++++- 4 files changed, 66 insertions(+), 36 deletions(-) diff --git a/Make.rules.in b/Make.rules.in index 08b790d..004e5f1 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -19,7 +19,7 @@ RCFLAGS = --nostdinc $(PORCFLAGS) $(TARGETFLAGS) $(DEFS) $(EXTRARCFLAGS) IDL_GEN_C_SRCS = $(IDL_C_SRCS:.idl=_c.c) $(IDL_I_SRCS:.idl=_i.c) \ $(IDL_P_SRCS:.idl=_p.c) $(IDL_S_SRCS:.idl=_s.c) -CLEAN_TARGETS = $(MODULE) $(IMPORTLIB:%=lib%.(a)IMPLIBEXT@) \ +CLEAN_TARGETS = $(IMPORTLIB:%=lib%.(a)IMPLIBEXT@) \ $(TESTMODULE) $(TESTMODULE_STRIPPED) $(CROSSTESTMODULE) OBJS = $(C_SRCS:.c=.o) $(BISON_SRCS:.y=.tab.o) $(LEX_SRCS:.l=.yy.o) $(IDL_GEN_C_SRCS:.c=.o) $(OBJC_SRCS:.m=.o) \ @@ -28,11 +28,6 @@ OBJS = $(C_SRCS:.c=.o) $(BISON_SRCS:.y=.tab.o) $(LEX_SRCS:.l=.yy.o) $(IDL_GEN_C_ CROSSOBJS = $(OBJS:.o=.cross.o) ALLCROSSCFLAGS = $(DEFS) -DWINE_CROSSTEST $(CPPFLAGS) $(CFLAGS) -# Rules for main module - -$(MODULE) $(MODULE:%=%.so) $(MODULE:%=%.fake): $(MAINSPEC) $(OBJS) - $(WINEGCC) $(APPMODE) $(MODULEFLAGS) $(OBJS) -o $@ $(DELAYIMPORTS:%=-l%) $(IMPORTS:%=-l%) $(DELAYIMPORTS:%=-Wb,-d%) -lwine $(LIBPORT) $(EXTRALIBS) $(LDFLAGS) $(LIBS) - # Rules for static libraries all: $(STATICLIB) diff --git a/configure b/configure index a3c36ce..6fb5933 100755 --- a/configure +++ b/configure @@ -16556,20 +16556,9 @@ all: \$(STATICLIB:.a=.cross.a) fi -if test -n "$DLLEXT" -then - deps="\$(MODULE)$DLLEXT \$(MODULE).fake" -else - deps="\$(MODULE)" -fi - MAKE_DLL_RULES=" DLLFLAGS = $DLLFLAGS MAINSPEC = \$(srcdir)/\$(MODULE:%.dll=%).spec -IDL_TLB_RES = \$(IDL_TLB_SRCS:.idl=_t.res) -MODULEFLAGS = -shared \$(MAINSPEC) \$(EXTRADLLFLAGS) - -all: $deps manpages:: dummy \$(C2MAN) -o \$(top_builddir)/documentation/man\$(api_manext) -R\$(top_builddir) -C\$(srcdir) \$(PARENTSRC:%=-P%) -I\$(top_srcdir)/include \$(MAINSPEC:%=-w %) \$(C_SRCS) @@ -16585,8 +16574,6 @@ xmlpages:: dummy MAKE_PROG_RULES=" DLLFLAGS = $DLLFLAGS - -all: $deps " @@ -17428,7 +17415,6 @@ zh_TW" wine_fn_ignore_file "*.a" wine_fn_ignore_file "*.exe" test -n "$DLLEXT" && wine_fn_ignore_file "*$DLLEXT" -test -n "$DLLEXT" && wine_fn_ignore_file "*.fake" wine_fn_ignore_file ".gitignore" wine_fn_ignore_file "Makefile" wine_fn_ignore_file "TAGS" diff --git a/configure.ac b/configure.ac index 964c068..9d9078c 100644 --- a/configure.ac +++ b/configure.ac @@ -2613,20 +2613,9 @@ fi dnl Dll and program rules -if test -n "$DLLEXT" -then - deps="\$(MODULE)$DLLEXT \$(MODULE).fake" -else - deps="\$(MODULE)" -fi - AC_SUBST(MAKE_DLL_RULES," DLLFLAGS = $DLLFLAGS MAINSPEC = \$(srcdir)/\$(MODULE:%.dll=%).spec -IDL_TLB_RES = \$(IDL_TLB_SRCS:.idl=_t.res) -MODULEFLAGS = -shared \$(MAINSPEC) \$(EXTRADLLFLAGS) - -all: $deps manpages:: dummy \$(C2MAN) -o \$(top_builddir)/documentation/man\$(api_manext) -R\$(top_builddir) -C\$(srcdir) \$(PARENTSRC:%=-P%) -I\$(top_srcdir)/include \$(MAINSPEC:%=-w %) \$(C_SRCS) @@ -2641,8 +2630,6 @@ xmlpages:: dummy AC_SUBST(MAKE_PROG_RULES," DLLFLAGS = $DLLFLAGS - -all: $deps ") dnl Test rules @@ -3472,7 +3459,6 @@ dnl Main ignore file WINE_IGNORE_FILE("*.a") WINE_IGNORE_FILE("*.exe") test -n "$DLLEXT" && WINE_IGNORE_FILE("*$DLLEXT") -test -n "$DLLEXT" && WINE_IGNORE_FILE("*.fake") WINE_IGNORE_FILE(".gitignore") WINE_IGNORE_FILE("Makefile") WINE_IGNORE_FILE("TAGS") diff --git a/tools/makedep.c b/tools/makedep.c index c8a3a6f..0516cbb 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -1366,6 +1366,7 @@ static struct strarray output_sources(void) { struct incl_file *source; int i; + const char *dllext = ".so"; int is_test = find_src_file( "testlist.o" ) != NULL; struct strarray object_files = empty_strarray; struct strarray crossobj_files = empty_strarray; @@ -1377,7 +1378,15 @@ static struct strarray output_sources(void) struct strarray dlldata_files = 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 delayimports = get_expanded_make_var_array( "DELAYIMPORTS" ); + char *module = get_expanded_make_variable( "MODULE" ); + char *exeext = get_expanded_make_variable( "EXEEXT" ); + char *appmode = get_expanded_make_variable( "APPMODE" ); + + if (exeext && !strcmp( exeext, ".exe" )) dllext = ""; strarray_add( &includes, "-I." ); if (src_dir) strarray_add( &includes, strmake( "-I%s", src_dir )); @@ -1642,6 +1651,52 @@ static struct strarray output_sources(void) output( "\n" ); } + if (module) + { + struct strarray all_libs = empty_strarray; + char *spec_file = appmode ? NULL : replace_extension( module, ".dll", ".spec" ); + + if (spec_file && src_dir) spec_file = strmake( "%s/%s", src_dir, spec_file ); + for (i = 0; i < delayimports.count; i++) + strarray_add( &all_libs, strmake( "-l%s", delayimports.str[i] )); + for (i = 0; i < imports.count; i++) + strarray_add( &all_libs, strmake( "-l%s", imports.str[i] )); + for (i = 0; i < delayimports.count; i++) + strarray_add( &all_libs, strmake( "-Wb,-d%s", delayimports.str[i] )); + strarray_add( &all_libs, "-lwine" ); + strarray_addall( &all_libs, get_expanded_make_var_array( "LIBPORT" )); + strarray_addall( &all_libs, get_expanded_make_var_array( "EXTRALIBS" )); + strarray_addall( &all_libs, get_expanded_make_var_array( "LIBS" )); + + if (*dllext) + { + strarray_add( &all_targets, strmake( "%s%s", module, dllext )); + strarray_add( &all_targets, strmake( "%s.fake", module )); + output( "%s%s %s.fake:", module, dllext, module ); + } + else + { + strarray_add( &all_targets, module ); + output( "%s:", module ); + } + if (spec_file) output_filename( spec_file ); + output_filenames( object_files ); + output_filenames( res_files ); + output( "\n" ); + output( "\t$(WINEGCC) -o $@" ); + if (spec_file) + { + output( " -shared %s", spec_file ); + output_filenames( get_expanded_make_var_array( "EXTRADLLFLAGS" )); + } + else output_filename( appmode ); + output_filenames( object_files ); + output_filenames( res_files ); + output_filenames( all_libs ); + output_filename( "$(LDFLAGS)" ); + output( "\n" ); + } + if (is_test) { struct strarray ok_files = strarray_replace_extension( &test_files, ".c", ".ok" ); @@ -1662,9 +1717,17 @@ static struct strarray output_sources(void) strarray_add( &phony_targets, "testclean" ); } + if (all_targets.count) + { + output( "all:" ); + output_filenames( all_targets ); + output( "\n" ); + } + strarray_addall( &clean_files, object_files ); strarray_addall( &clean_files, crossobj_files ); strarray_addall( &clean_files, res_files ); + strarray_addall( &clean_files, all_targets ); if (clean_files.count) { @@ -1780,7 +1843,7 @@ static void output_dependencies( const char *path ) } if (fclose( output_file )) fatal_perror( "write" ); output_file = tmp_file; - if (!found && !list_empty(&sources)) output( "\n%s\n", Separator ); + if (!found) output( "\n%s\n", Separator ); } else { @@ -1788,7 +1851,7 @@ static void output_dependencies( const char *path ) fatal_perror( "%s", path ); } - if (!list_empty( &sources )) targets = output_sources(); + targets = output_sources(); fclose( output_file ); output_file = NULL;

1 0

Alexandre Julliard : makedep: Generate rules for static libraries.
by Alexandre Julliard Dec. 31, 2013

Dec. 31, 2013

Module: wine Branch: master Commit: 908dada6620ce84df6044b786d348671d26a72d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=908dada6620ce84df6044b786… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 30 20:17:36 2013 +0100 makedep: Generate rules for static libraries. --- Make.rules.in | 14 -------------- Make.vars.in | 2 -- configure | 2 -- configure.ac | 2 -- tools/makedep.c | 24 ++++++++++++++++++++++++ 5 files changed, 24 insertions(+), 20 deletions(-) diff --git a/Make.rules.in b/Make.rules.in index c368f9a..0a40ff4 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -27,20 +27,6 @@ OBJS = $(C_SRCS:.c=.o) $(BISON_SRCS:.y=.tab.o) $(LEX_SRCS:.l=.yy.o) $(IDL_GEN_C_ CROSSOBJS = $(OBJS:.o=.cross.o) ALLCROSSCFLAGS = $(DEFS) -DWINE_CROSSTEST $(CPPFLAGS) $(CFLAGS) -# Rules for static libraries - -all: $(STATICLIB) - -$(STATICLIB): $(OBJS) - $(RM) $@ - $(AR) $(ARFLAGS) $@ $(OBJS) - $(RANLIB) $@ - -$(STATICLIB:.a=.cross.a): $(CROSSOBJS) - $(RM) $@ - $(CROSSAR) $(ARFLAGS) $@ $(CROSSOBJS) - $(CROSSRANLIB) $@ - # Rules for dependencies depend: dummy diff --git a/Make.vars.in b/Make.vars.in index 5246f89..bc19456 100644 --- a/Make.vars.in +++ b/Make.vars.in @@ -49,8 +49,6 @@ CROSSTARGET = @CROSSTARGET@ LINGUAS = @LINGUAS@ ALL_MO_FILES = $(LINGUAS:%=@top_builddir@/po/%.mo) PORCFLAGS = @PORCFLAGS@ -CROSSAR = $(CROSSTARGET)-ar -CROSSRANLIB = $(CROSSTARGET)-ranlib BUILDIMAGE = $(top_srcdir)/tools/buildimage C2MAN = $(top_srcdir)/tools/c2man.pl RUNTEST = $(top_srcdir)/tools/runtest diff --git a/configure b/configure index 8a254ad..91bb070 100755 --- a/configure +++ b/configure @@ -16549,7 +16549,6 @@ MAKE_IMPLIB_RULES="DLLFLAGS = $DLLFLAGS if test -n "$CROSSTARGET" then as_fn_append MAKE_IMPLIB_RULES "MAKEDEPFLAGS = -xo -xcross.o -all: \$(STATICLIB:.a=.cross.a) " fi @@ -17410,7 +17409,6 @@ zh_TW" -wine_fn_ignore_file "*.a" wine_fn_ignore_file "*.exe" test -n "$DLLEXT" && wine_fn_ignore_file "*$DLLEXT" wine_fn_ignore_file ".gitignore" diff --git a/configure.ac b/configure.ac index a8a7da4..9d1948c 100644 --- a/configure.ac +++ b/configure.ac @@ -2607,7 +2607,6 @@ AC_SUBST(MAKE_IMPLIB_RULES,"DLLFLAGS = $DLLFLAGS if test -n "$CROSSTARGET" then AS_VAR_APPEND([MAKE_IMPLIB_RULES],"MAKEDEPFLAGS = -xo -xcross.o -all: \$(STATICLIB:.a=.cross.a) ") fi @@ -3456,7 +3455,6 @@ dnl End of auto-generated output commands dnl Main ignore file -WINE_IGNORE_FILE("*.a") WINE_IGNORE_FILE("*.exe") test -n "$DLLEXT" && WINE_IGNORE_FILE("*$DLLEXT") WINE_IGNORE_FILE(".gitignore") diff --git a/tools/makedep.c b/tools/makedep.c index f7bba41..ee24bba 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -1386,6 +1386,7 @@ static struct strarray output_sources(void) char *module = get_expanded_make_variable( "MODULE" ); char *exeext = get_expanded_make_variable( "EXEEXT" ); char *appmode = get_expanded_make_variable( "APPMODE" ); + char *staticlib = get_expanded_make_variable( "STATICLIB" ); char *crosstarget = get_expanded_make_variable( "CROSSTARGET" ); if (exeext && !strcmp( exeext, ".exe" )) dllext = ""; @@ -1749,6 +1750,29 @@ static struct strarray output_sources(void) } } + if (staticlib) + { + strarray_add( &all_targets, staticlib ); + output( "%s:", staticlib ); + output_filenames( object_files ); + output( "\n\t$(RM) $@\n" ); + output( "\t$(AR) $(ARFLAGS) $@" ); + output_filenames( object_files ); + output( "\n\t$(RANLIB) $@\n" ); + if (crosstarget && object_extensions.count > 1) + { + char *name = replace_extension( staticlib, ".a", ".cross.a" ); + + strarray_add( &all_targets, name ); + output( "%s:", name ); + output_filenames( crossobj_files ); + output( "\n\t$(RM) $@\n" ); + output( "\t%s-ar $(ARFLAGS) $@", crosstarget ); + output_filenames( crossobj_files ); + output( "\n\t%s-ranlib $@\n", crosstarget ); + } + } + if (is_test) { struct strarray ok_files = strarray_replace_extension( &test_files, ".c", ".ok" );

1 0

Alexandre Julliard : makedep: Generate rules for import libraries.
by Alexandre Julliard Dec. 31, 2013

Dec. 31, 2013

Module: wine Branch: master Commit: a37ef65ea83d5b1e9d257ed81fda7ab2be75d5bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=a37ef65ea83d5b1e9d257ed81… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 30 20:14:45 2013 +0100 makedep: Generate rules for import libraries. --- Make.rules.in | 16 +--------------- Make.vars.in | 1 - configure | 5 +---- configure.ac | 3 +-- tools/makedep.c | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++++- 5 files changed, 56 insertions(+), 23 deletions(-) diff --git a/Make.rules.in b/Make.rules.in index 004e5f1..c368f9a 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -19,8 +19,7 @@ RCFLAGS = --nostdinc $(PORCFLAGS) $(TARGETFLAGS) $(DEFS) $(EXTRARCFLAGS) IDL_GEN_C_SRCS = $(IDL_C_SRCS:.idl=_c.c) $(IDL_I_SRCS:.idl=_i.c) \ $(IDL_P_SRCS:.idl=_p.c) $(IDL_S_SRCS:.idl=_s.c) -CLEAN_TARGETS = $(IMPORTLIB:%=lib%.(a)IMPLIBEXT@) \ - $(TESTMODULE) $(TESTMODULE_STRIPPED) $(CROSSTESTMODULE) +CLEAN_TARGETS = $(TESTMODULE) $(TESTMODULE_STRIPPED) $(CROSSTESTMODULE) OBJS = $(C_SRCS:.c=.o) $(BISON_SRCS:.y=.tab.o) $(LEX_SRCS:.l=.yy.o) $(IDL_GEN_C_SRCS:.c=.o) $(OBJC_SRCS:.m=.o) \ $(IDL_R_SRCS:.idl=_r.res) $(IDL_TLB_RES) $(RC_SRCS:.rc=.res) $(MC_SRCS:.mc=.res) $(EXTRA_OBJS) @@ -42,19 +41,6 @@ $(STATICLIB:.a=.cross.a): $(CROSSOBJS) $(CROSSAR) $(ARFLAGS) $@ $(CROSSOBJS) $(CROSSRANLIB) $@ -# Rules for import libraries - -$(IMPORTLIB:%=lib%.def.a): $(IMPLIB_SRCS:.c=.o) - $(RM) $@ - $(AR) $(ARFLAGS) $@ $(IMPLIB_SRCS:.c=.o) - $(RANLIB) $@ - -$(IMPORTLIB:%=lib%.a): $(MAINSPEC) $(IMPLIB_SRCS:.c=.o) - $(WINEBUILD) $(TARGETFLAGS) -w --implib -o $@ --export $(MAINSPEC) $(IMPLIB_SRCS:.c=.o) - -$(IMPORTLIB:%=lib%.cross.a): $(MAINSPEC) $(IMPLIB_SRCS:.c=.cross.o) - $(WINEBUILD) $(CROSSTARGET:%=-b %) -w --implib -o $@ --export $(MAINSPEC) $(IMPLIB_SRCS:.c=.cross.o) - # Rules for dependencies depend: dummy diff --git a/Make.vars.in b/Make.vars.in index 7b6e265..5246f89 100644 --- a/Make.vars.in +++ b/Make.vars.in @@ -30,7 +30,6 @@ FLEX = @FLEX@ EXEEXT = @EXEEXT@ DLLPREFIX = @DLLPREFIX@ TOOLSEXT = @TOOLSEXT@ -IMPLIBEXT = @IMPLIBEXT@ DLLTOOL = @DLLTOOL@ AR = @AR@ ARFLAGS = @ARFLAGS@ diff --git a/configure b/configure index 6fb5933..8a254ad 100755 --- a/configure +++ b/configure @@ -711,7 +711,6 @@ READELF LDD LDRPATH_LOCAL LDRPATH_INSTALL -IMPLIBEXT DLLFLAGS DLLPREFIX dlldir @@ -6908,14 +6907,13 @@ DLLPREFIX="" DLLFLAGS="-D_REENTRANT" -IMPLIBEXT="def" - LDRPATH_INSTALL="" LDRPATH_LOCAL="" LIBEXT="so" DLLEXT=".so" +IMPLIBEXT="def" STATIC_IMPLIBEXT="def.a" # Extract the first word of "ldd", so it can be a program name with args. set dummy ldd; ac_word=$2 @@ -17426,7 +17424,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" -wine_fn_ignore_file "dlls/*/*.def" 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" diff --git a/configure.ac b/configure.ac index 9d9078c..a8a7da4 100644 --- a/configure.ac +++ b/configure.ac @@ -675,11 +675,11 @@ dnl **** Check for working dll **** AC_SUBST(dlldir,"\${libdir}/wine") AC_SUBST(DLLPREFIX,"") AC_SUBST(DLLFLAGS,"-D_REENTRANT") -AC_SUBST(IMPLIBEXT,"def") AC_SUBST(LDRPATH_INSTALL,"") AC_SUBST(LDRPATH_LOCAL,"") LIBEXT="so" DLLEXT=".so" +IMPLIBEXT="def" STATIC_IMPLIBEXT="def.a" WINE_PATH_SONAME_TOOLS @@ -3470,7 +3470,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("dlls/*/*.def") 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) diff --git a/tools/makedep.c b/tools/makedep.c index 0516cbb..f7bba41 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -1376,6 +1376,7 @@ static struct strarray output_sources(void) struct strarray mc_files = empty_strarray; struct strarray test_files = empty_strarray; struct strarray dlldata_files = empty_strarray; + struct strarray implib_objs = empty_strarray; struct strarray includes = empty_strarray; struct strarray subdirs = empty_strarray; struct strarray all_targets = empty_strarray; @@ -1385,6 +1386,7 @@ static struct strarray output_sources(void) char *module = get_expanded_make_variable( "MODULE" ); char *exeext = get_expanded_make_variable( "EXEEXT" ); char *appmode = get_expanded_make_variable( "APPMODE" ); + char *crosstarget = get_expanded_make_variable( "CROSSTARGET" ); if (exeext && !strcmp( exeext, ".exe" )) dllext = ""; @@ -1569,6 +1571,7 @@ static struct strarray output_sources(void) else { if (source->flags & FLAG_GENERATED) strarray_add( &clean_files, source->filename ); + if (source->flags & FLAG_C_IMPLIB) strarray_add( &implib_objs, strmake( "%s.o", obj )); for (i = 0; i < object_extensions.count; i++) { output( "%s.%s: %s\n", obj, object_extensions.str[i], sourcedep ); @@ -1589,7 +1592,7 @@ static struct strarray output_sources(void) output( "\n" ); } } - if (source->flags & FLAG_C_IMPLIB) + if (crosstarget && (source->flags & FLAG_C_IMPLIB)) { strarray_add( &crossobj_files, strmake( "%s.cross.o", obj )); output( "%s.cross.o: %s\n", obj, sourcedep ); @@ -1653,6 +1656,8 @@ static struct strarray output_sources(void) if (module) { + int is_win16 = strendswith( module, "16" ); + char *importlib = get_expanded_make_variable( "IMPORTLIB" ); struct strarray all_libs = empty_strarray; char *spec_file = appmode ? NULL : replace_extension( module, ".dll", ".spec" ); @@ -1695,6 +1700,53 @@ static struct strarray output_sources(void) output_filenames( all_libs ); output_filename( "$(LDFLAGS)" ); output( "\n" ); + + if (spec_file && importlib) + { + if (*dllext) + { + strarray_add( &clean_files, strmake( "lib%s.def", importlib )); + output( "lib%s.def: %s\n", importlib, spec_file ); + output( "\t$(WINEBUILD) -w --def -o $@ --export %s", spec_file ); + output_filenames( get_expanded_make_var_array( "TARGETFLAGS" )); + if (is_win16) output_filename( "-m16" ); + output( "\n" ); + if (implib_objs.count) + { + strarray_add( &clean_files, strmake( "lib%s.def.a", importlib )); + output( "lib%s.def.a:", importlib ); + output_filenames( implib_objs ); + output( "\n" ); + output( "\t$(RM) $@\n" ); + output( "\t$(AR) $(ARFLAGS) $@" ); + output_filenames( implib_objs ); + output( "\n" ); + output( "\t$(RANLIB) $@\n" ); + } + } + else + { + strarray_add( &clean_files, strmake( "lib%s.a", importlib )); + output( "lib%s.a: %s", importlib, spec_file ); + output_filenames( implib_objs ); + output( "\n" ); + output( "\t$(WINEBUILD) -w --implib -o $@ --export %s", spec_file ); + output_filenames( get_expanded_make_var_array( "TARGETFLAGS" )); + output_filenames( implib_objs ); + output( "\n" ); + } + if (crosstarget && !is_win16) + { + struct strarray cross_files = strarray_replace_extension( &implib_objs, ".o", ".cross.o" ); + strarray_add( &clean_files, strmake( "lib%s.cross.a", importlib )); + output( "lib%s.cross.a: %s", importlib, spec_file ); + output_filenames( cross_files ); + output( "\n" ); + output( "\t$(WINEBUILD) -b %s -w --implib -o $@ --export %s", crosstarget, spec_file ); + output_filenames( cross_files ); + output( "\n" ); + } + } } if (is_test)

1 0

Jacek Caban : qcap: Added AVI compressor input pin stub implementation.
by Alexandre Julliard Dec. 30, 2013

Dec. 30, 2013

Module: wine Branch: master Commit: 792c53ad256d2e9aa52914a70635bbd86f69dd99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=792c53ad256d2e9aa52914a70… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 30 16:38:03 2013 +0100 qcap: Added AVI compressor input pin stub implementation. --- dlls/qcap/avico.c | 142 ++++++++++++++++++++++++++++++++++++++++++++++-- dlls/qcap/tests/qcap.c | 21 +++++++- 2 files changed, 158 insertions(+), 5 deletions(-) diff --git a/dlls/qcap/avico.c b/dlls/qcap/avico.c index 6817bf6..a4bc02e 100644 --- a/dlls/qcap/avico.c +++ b/dlls/qcap/avico.c @@ -33,6 +33,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(qcap); typedef struct { BaseFilter filter; IPersistPropertyBag IPersistPropertyBag_iface; + + BaseInputPin *in; } AVICompressor; static inline AVICompressor *impl_from_BaseFilter(BaseFilter *filter) @@ -46,6 +48,11 @@ static inline AVICompressor *impl_from_IBaseFilter(IBaseFilter *iface) return impl_from_BaseFilter(filter); } +static inline AVICompressor *impl_from_BasePin(BasePin *pin) +{ + return impl_from_IBaseFilter(pin->pinInfo.pFilter); +} + static HRESULT WINAPI AVICompressor_QueryInterface(IBaseFilter *iface, REFIID riid, void **ppv) { AVICompressor *This = impl_from_IBaseFilter(iface); @@ -83,8 +90,11 @@ static ULONG WINAPI AVICompressor_Release(IBaseFilter *iface) TRACE("(%p) ref=%d\n", This, ref); - if(!ref) + if(!ref) { + if(This->in) + BaseInputPinImpl_Release(&This->in->pin.IPin_iface); heap_free(This); + } return ref; } @@ -152,15 +162,31 @@ static const IBaseFilterVtbl AVICompressorVtbl = { static IPin* WINAPI AVICompressor_GetPin(BaseFilter *iface, int pos) { AVICompressor *This = impl_from_BaseFilter(iface); - FIXME("(%p)->(%d)\n", This, pos); - return NULL; + IPin *ret; + + TRACE("(%p)->(%d)\n", This, pos); + + switch(pos) { + case 0: + ret = &This->in->pin.IPin_iface; + break; + case 1: + FIXME("out pin not implemented\n"); + return NULL; + default: + TRACE("No pin %d\n", pos); + return NULL; + }; + + IPin_AddRef(ret); + return ret; } static LONG WINAPI AVICompressor_GetPinCount(BaseFilter *iface) { AVICompressor *This = impl_from_BaseFilter(iface); FIXME("(%p)\n", This); - return 0; + return 1; } static const BaseFilterFuncTable filter_func_table = { @@ -229,9 +255,107 @@ static const IPersistPropertyBagVtbl PersistPropertyBagVtbl = { AVICompressorPropertyBag_Save }; +static inline AVICompressor *impl_from_IPin(IPin *iface) +{ + BasePin *bp = CONTAINING_RECORD(iface, BasePin, IPin_iface); + return impl_from_IBaseFilter(bp->pinInfo.pFilter); +} + +static HRESULT WINAPI AVICompressorIn_QueryInterface(IPin *iface, REFIID riid, void **ppv) +{ + return BaseInputPinImpl_QueryInterface(iface, riid, ppv); +} + +static ULONG WINAPI AVICompressorIn_AddRef(IPin *iface) +{ + AVICompressor *This = impl_from_IPin(iface); + return IBaseFilter_AddRef(&This->filter.IBaseFilter_iface); +} + +static ULONG WINAPI AVICompressorIn_Release(IPin *iface) +{ + AVICompressor *This = impl_from_IPin(iface); + return IBaseFilter_Release(&This->filter.IBaseFilter_iface); +} + +static HRESULT WINAPI AVICompressorIn_ReceiveConnection(IPin *iface, + IPin *pConnector, const AM_MEDIA_TYPE *pmt) +{ + AVICompressor *This = impl_from_IPin(iface); + FIXME("(%p)->(%p AM_MEDIA_TYPE(%p))\n", This, pConnector, pmt); + dump_AM_MEDIA_TYPE(pmt); + return E_NOTIMPL; +} + +static HRESULT WINAPI AVICompressorIn_Disconnect(IPin *iface) +{ + AVICompressor *This = impl_from_IPin(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +static const IPinVtbl AVICompressorInputPinVtbl = { + AVICompressorIn_QueryInterface, + AVICompressorIn_AddRef, + AVICompressorIn_Release, + BaseInputPinImpl_Connect, + AVICompressorIn_ReceiveConnection, + AVICompressorIn_Disconnect, + BasePinImpl_ConnectedTo, + BasePinImpl_ConnectionMediaType, + BasePinImpl_QueryPinInfo, + BasePinImpl_QueryDirection, + BasePinImpl_QueryId, + BasePinImpl_QueryAccept, + BasePinImpl_EnumMediaTypes, + BasePinImpl_QueryInternalConnections, + BaseInputPinImpl_EndOfStream, + BaseInputPinImpl_BeginFlush, + BaseInputPinImpl_EndFlush, + BaseInputPinImpl_NewSegment +}; + +static HRESULT WINAPI AVICompressorIn_CheckMediaType(BasePin *base, const AM_MEDIA_TYPE *pmt) +{ + FIXME("(%p)->(AM_MEDIA_TYPE(%p))\n", base, pmt); + dump_AM_MEDIA_TYPE(pmt); + return E_NOTIMPL; +} + +static LONG WINAPI AVICompressorIn_GetMediaTypeVersion(BasePin *base) +{ + return 0; +} + +static HRESULT WINAPI AVICompressorIn_GetMediaType(BasePin *base, int iPosition, AM_MEDIA_TYPE *amt) +{ + TRACE("(%p)->(%d %p)\n", base, iPosition, amt); + return S_FALSE; +} + +static const BasePinFuncTable AVICompressorInputBasePinVtbl = { + AVICompressorIn_CheckMediaType, + NULL, + AVICompressorIn_GetMediaTypeVersion, + AVICompressorIn_GetMediaType +}; + +static HRESULT WINAPI AVICompressorIn_Receive(BaseInputPin *base, IMediaSample *pSample) +{ + AVICompressor *This = impl_from_BasePin(&base->pin); + FIXME("(%p)->(%p)\n", This, pSample); + return E_NOTIMPL; +} + +static const BaseInputPinFuncTable AVICompressorBaseInputPinVtbl = { + AVICompressorIn_Receive +}; + IUnknown* WINAPI QCAP_createAVICompressor(IUnknown *outer, HRESULT *phr) { + PIN_INFO in_pin_info = {NULL, PINDIR_INPUT, {'I','n','p','u','t',0}}; AVICompressor *compressor; + HRESULT hres; TRACE("\n"); @@ -246,6 +370,16 @@ IUnknown* WINAPI QCAP_createAVICompressor(IUnknown *outer, HRESULT *phr) compressor->IPersistPropertyBag_iface.lpVtbl = &PersistPropertyBagVtbl; + in_pin_info.pFilter = &compressor->filter.IBaseFilter_iface; + hres = BaseInputPin_Construct(&AVICompressorInputPinVtbl, sizeof(BaseInputPin), &in_pin_info, + &AVICompressorInputBasePinVtbl, &AVICompressorBaseInputPinVtbl, + &compressor->filter.csFilter, NULL, (IPin**)&compressor->in); + if(FAILED(hres)) { + IBaseFilter_Release(&compressor->filter.IBaseFilter_iface); + *phr = hres; + return NULL; + } + *phr = S_OK; return (IUnknown*)&compressor->filter.IBaseFilter_iface; } diff --git a/dlls/qcap/tests/qcap.c b/dlls/qcap/tests/qcap.c index 8081bce..942a120 100644 --- a/dlls/qcap/tests/qcap.c +++ b/dlls/qcap/tests/qcap.c @@ -1336,10 +1336,14 @@ static void test_AviMux(void) static void test_AviCo(void) { IPersistPropertyBag *persist_bag; + IPin *pin, *in_pin; + IEnumPins *enum_pins; IBaseFilter *avico; - IPin *pin; + PIN_INFO pin_info; HRESULT hres; + static const WCHAR inputW[] = {'I','n','p','u','t',0}; + hres = CoCreateInstance(&CLSID_AVICo, NULL, CLSCTX_INPROC_SERVER, &IID_IBaseFilter, (void**)&avico); if(hres == REGDB_E_CLASSNOTREG) { win_skip("CLSID_AVICo not restered\n"); @@ -1354,6 +1358,21 @@ static void test_AviCo(void) ok(hres == S_OK, "QueryInterface(IID_IPersistPropertyBag) returned: %08x\n", hres); IPersistPropertyBag_Release(persist_bag); + + hres = IBaseFilter_EnumPins(avico, &enum_pins); + ok(hres == S_OK, "EnumPins failed: %08x\n", hres); + + hres = IEnumPins_Next(enum_pins, 1, &in_pin, NULL); + ok(hres == S_OK, "Next failed: %08x\n", hres); + + hres = IPin_QueryPinInfo(in_pin, &pin_info); + ok(hres == S_OK, "QueryPinInfo failed: %08x\n", hres); + ok(pin_info.pFilter == avico, "pin_info.pFilter != avico\n"); + ok(pin_info.dir == PINDIR_INPUT, "pin_info.dir = %d\n", pin_info.dir); + ok(!lstrcmpW(pin_info.achName, inputW), "pin_info.achName = %s\n", wine_dbgstr_w(pin_info.achName)); + + IEnumPins_Release(enum_pins); + IBaseFilter_Release(avico); }

1 0

Jacek Caban : qcap: Added AVI compressor output pin stub implementation.
by Alexandre Julliard Dec. 30, 2013

Dec. 30, 2013

Module: wine Branch: master Commit: 71687bef17e5ebc02cc0d2ba7d85c33b0958d7c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=71687bef17e5ebc02cc0d2ba7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 30 16:38:18 2013 +0100 qcap: Added AVI compressor output pin stub implementation. --- dlls/qcap/avico.c | 105 +++++++++++++++++++++++++++++++++++++++++++++-- dlls/qcap/tests/qcap.c | 14 ++++++- 2 files changed, 113 insertions(+), 6 deletions(-) diff --git a/dlls/qcap/avico.c b/dlls/qcap/avico.c index a4bc02e..70c3283 100644 --- a/dlls/qcap/avico.c +++ b/dlls/qcap/avico.c @@ -35,6 +35,7 @@ typedef struct { IPersistPropertyBag IPersistPropertyBag_iface; BaseInputPin *in; + BaseOutputPin *out; } AVICompressor; static inline AVICompressor *impl_from_BaseFilter(BaseFilter *filter) @@ -93,6 +94,8 @@ static ULONG WINAPI AVICompressor_Release(IBaseFilter *iface) if(!ref) { if(This->in) BaseInputPinImpl_Release(&This->in->pin.IPin_iface); + if(This->out) + BaseOutputPinImpl_Release(&This->out->pin.IPin_iface); heap_free(This); } @@ -171,8 +174,8 @@ static IPin* WINAPI AVICompressor_GetPin(BaseFilter *iface, int pos) ret = &This->in->pin.IPin_iface; break; case 1: - FIXME("out pin not implemented\n"); - return NULL; + ret = &This->out->pin.IPin_iface; + break; default: TRACE("No pin %d\n", pos); return NULL; @@ -184,9 +187,7 @@ static IPin* WINAPI AVICompressor_GetPin(BaseFilter *iface, int pos) static LONG WINAPI AVICompressor_GetPinCount(BaseFilter *iface) { - AVICompressor *This = impl_from_BaseFilter(iface); - FIXME("(%p)\n", This); - return 1; + return 2; } static const BaseFilterFuncTable filter_func_table = { @@ -351,9 +352,93 @@ static const BaseInputPinFuncTable AVICompressorBaseInputPinVtbl = { AVICompressorIn_Receive }; +static HRESULT WINAPI AVICompressorOut_QueryInterface(IPin *iface, REFIID riid, void **ppv) +{ + return BaseInputPinImpl_QueryInterface(iface, riid, ppv); +} + +static ULONG WINAPI AVICompressorOut_AddRef(IPin *iface) +{ + AVICompressor *This = impl_from_IPin(iface); + return IBaseFilter_AddRef(&This->filter.IBaseFilter_iface); +} + +static ULONG WINAPI AVICompressorOut_Release(IPin *iface) +{ + AVICompressor *This = impl_from_IPin(iface); + return IBaseFilter_Release(&This->filter.IBaseFilter_iface); +} + +static const IPinVtbl AVICompressorOutputPinVtbl = { + AVICompressorOut_QueryInterface, + AVICompressorOut_AddRef, + AVICompressorOut_Release, + BaseOutputPinImpl_Connect, + BaseOutputPinImpl_ReceiveConnection, + BaseOutputPinImpl_Disconnect, + BasePinImpl_ConnectedTo, + BasePinImpl_ConnectionMediaType, + BasePinImpl_QueryPinInfo, + BasePinImpl_QueryDirection, + BasePinImpl_QueryId, + BasePinImpl_QueryAccept, + BasePinImpl_EnumMediaTypes, + BasePinImpl_QueryInternalConnections, + BaseOutputPinImpl_EndOfStream, + BaseOutputPinImpl_BeginFlush, + BaseOutputPinImpl_EndFlush, + BasePinImpl_NewSegment +}; + +static LONG WINAPI AVICompressorOut_GetMediaTypeVersion(BasePin *base) +{ + FIXME("(%p)\n", base); + return 0; +} + +static HRESULT WINAPI AVICompressorOut_GetMediaType(BasePin *base, int iPosition, AM_MEDIA_TYPE *amt) +{ + AVICompressor *This = impl_from_IBaseFilter(base->pinInfo.pFilter); + FIXME("(%p)->(%d %p)\n", This, iPosition, amt); + return E_NOTIMPL; +} + +static const BasePinFuncTable AVICompressorOutputBasePinVtbl = { + NULL, + BaseOutputPinImpl_AttemptConnection, + AVICompressorOut_GetMediaTypeVersion, + AVICompressorOut_GetMediaType +}; + +static HRESULT WINAPI AVICompressorOut_DecideBufferSize(BaseOutputPin *base, IMemAllocator *alloc, ALLOCATOR_PROPERTIES *ppropInputRequest) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI AVICompressorOut_DecideAllocator(BaseOutputPin *base, + IMemInputPin *pPin, IMemAllocator **pAlloc) +{ + TRACE("(%p)->(%p %p)\n", base, pPin, pAlloc); + return BaseOutputPinImpl_DecideAllocator(base, pPin, pAlloc); +} + +static HRESULT WINAPI AVICompressorOut_BreakConnect(BaseOutputPin *base) +{ + FIXME("(%p)\n", base); + return E_NOTIMPL; +} + +static const BaseOutputPinFuncTable AVICompressorBaseOutputPinVtbl = { + AVICompressorOut_DecideBufferSize, + AVICompressorOut_DecideAllocator, + AVICompressorOut_BreakConnect +}; + IUnknown* WINAPI QCAP_createAVICompressor(IUnknown *outer, HRESULT *phr) { PIN_INFO in_pin_info = {NULL, PINDIR_INPUT, {'I','n','p','u','t',0}}; + PIN_INFO out_pin_info = {NULL, PINDIR_OUTPUT, {'O','u','t','p','u','t',0}}; AVICompressor *compressor; HRESULT hres; @@ -380,6 +465,16 @@ IUnknown* WINAPI QCAP_createAVICompressor(IUnknown *outer, HRESULT *phr) return NULL; } + out_pin_info.pFilter = &compressor->filter.IBaseFilter_iface; + hres = BaseOutputPin_Construct(&AVICompressorOutputPinVtbl, sizeof(BaseOutputPin), &out_pin_info, + &AVICompressorOutputBasePinVtbl, &AVICompressorBaseOutputPinVtbl, + &compressor->filter.csFilter, (IPin**)&compressor->out); + if(FAILED(hres)) { + IBaseFilter_Release(&compressor->filter.IBaseFilter_iface); + *phr = hres; + return NULL; + } + *phr = S_OK; return (IUnknown*)&compressor->filter.IBaseFilter_iface; } diff --git a/dlls/qcap/tests/qcap.c b/dlls/qcap/tests/qcap.c index 942a120..b053bbd 100644 --- a/dlls/qcap/tests/qcap.c +++ b/dlls/qcap/tests/qcap.c @@ -1336,13 +1336,14 @@ static void test_AviMux(void) static void test_AviCo(void) { IPersistPropertyBag *persist_bag; - IPin *pin, *in_pin; + IPin *pin, *in_pin, *out_pin; IEnumPins *enum_pins; IBaseFilter *avico; PIN_INFO pin_info; HRESULT hres; static const WCHAR inputW[] = {'I','n','p','u','t',0}; + static const WCHAR outputW[] = {'O','u','t','p','u','t',0}; hres = CoCreateInstance(&CLSID_AVICo, NULL, CLSCTX_INPROC_SERVER, &IID_IBaseFilter, (void**)&avico); if(hres == REGDB_E_CLASSNOTREG) { @@ -1371,8 +1372,19 @@ static void test_AviCo(void) ok(pin_info.dir == PINDIR_INPUT, "pin_info.dir = %d\n", pin_info.dir); ok(!lstrcmpW(pin_info.achName, inputW), "pin_info.achName = %s\n", wine_dbgstr_w(pin_info.achName)); + hres = IEnumPins_Next(enum_pins, 1, &out_pin, NULL); + ok(hres == S_OK, "Next failed: %08x\n", hres); + + hres = IPin_QueryPinInfo(out_pin, &pin_info); + ok(hres == S_OK, "QueryPinInfo failed: %08x\n", hres); + ok(pin_info.pFilter == avico, "pin_info.pFilter != avico\n"); + ok(pin_info.dir == PINDIR_OUTPUT, "pin_info.dir = %d\n", pin_info.dir); + ok(!lstrcmpW(pin_info.achName, outputW), "pin_info.achName = %s\n", wine_dbgstr_w(pin_info.achName)); + IEnumPins_Release(enum_pins); + IPin_Release(in_pin); + IPin_Release(out_pin); IBaseFilter_Release(avico); }

1 0

Piotr Caban : msvcrt: Convert data to multibyte encoding in ungetwc if needed.
by Alexandre Julliard Dec. 30, 2013

Dec. 30, 2013

Module: wine Branch: master Commit: 6122c2ba37a8871c6118d0596e9576b17660f581 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6122c2ba37a8871c6118d0596… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Dec 30 16:55:42 2013 +0100 msvcrt: Convert data to multibyte encoding in ungetwc if needed. --- dlls/msvcrt/file.c | 29 +++++++++++++++++++++++++---- 1 files changed, 25 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 3796482..4665e6b 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -4730,18 +4730,39 @@ int CDECL MSVCRT_ungetc(int c, MSVCRT_FILE * file) MSVCRT_wint_t CDECL MSVCRT_ungetwc(MSVCRT_wint_t wc, MSVCRT_FILE * file) { MSVCRT_wchar_t mwc = wc; - unsigned char * pp = (unsigned char *)&mwc; - int i; if (wc == MSVCRT_WEOF) return MSVCRT_WEOF; MSVCRT__lock_file(file); - for(i=sizeof(MSVCRT_wchar_t)-1;i>=0;i--) { - if(pp[i] != MSVCRT_ungetc(pp[i],file)) { + + if((msvcrt_get_ioinfo(file->_file)->exflag & (EF_UTF8 | EF_UTF16)) + || !(msvcrt_get_ioinfo(file->_file)->wxflag & WX_TEXT)) { + unsigned char * pp = (unsigned char *)&mwc; + int i; + + for(i=sizeof(MSVCRT_wchar_t)-1;i>=0;i--) { + if(pp[i] != MSVCRT_ungetc(pp[i],file)) { + MSVCRT__unlock_file(file); + return MSVCRT_WEOF; + } + } + }else { + char mbs[MSVCRT_MB_LEN_MAX]; + int len; + + len = MSVCRT_wctomb(mbs, mwc); + if(len == -1) { MSVCRT__unlock_file(file); return MSVCRT_WEOF; } + + for(len--; len>=0; len--) { + if(mbs[len] != MSVCRT_ungetc(mbs[len], file)) { + MSVCRT__unlock_file(file); + return MSVCRT_WEOF; + } + } } MSVCRT__unlock_file(file);

1 0

Dmitry Timoshkov : advapi32/tests: Test generic access mapping for a mutex.
by Alexandre Julliard Dec. 30, 2013

Dec. 30, 2013

Module: wine Branch: master Commit: 8caa9f351dd7d7cc4b22b7fcb50bb32c9a2e4a45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8caa9f351dd7d7cc4b22b7fcb… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Dec 26 16:34:05 2013 +0900 advapi32/tests: Test generic access mapping for a mutex. --- dlls/advapi32/tests/security.c | 46 +++++++++++++++++++++++++++++++++++++++- 1 files changed, 45 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 4de588f..0727130 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -4499,13 +4499,37 @@ todo_wine { HeapFree(GetProcessHeap(), 0, sd); } +static ACCESS_MASK get_obj_access(HANDLE obj) +{ + OBJECT_BASIC_INFORMATION info; + NTSTATUS status; + + if (!pNtQueryObject) return 0; + + status = pNtQueryObject(obj, ObjectBasicInformation, &info, sizeof(info), NULL); + ok(!status, "NtQueryObject error %#x\n", status); + + return info.GrantedAccess; +} + static void test_mutex_security(HANDLE token) { - HANDLE mutex; + DWORD ret, i, access; + HANDLE mutex, dup; GENERIC_MAPPING mapping = { STANDARD_RIGHTS_READ | MUTANT_QUERY_STATE | SYNCHRONIZE, STANDARD_RIGHTS_WRITE | MUTEX_MODIFY_STATE | SYNCHRONIZE, STANDARD_RIGHTS_EXECUTE | SYNCHRONIZE, STANDARD_RIGHTS_ALL | MUTEX_ALL_ACCESS }; + static const struct + { + int todo, generic, mapped; + } map[] = + { + { 1, GENERIC_READ, STANDARD_RIGHTS_READ | MUTANT_QUERY_STATE }, + { 0, GENERIC_WRITE, STANDARD_RIGHTS_WRITE }, + { 0, GENERIC_EXECUTE, STANDARD_RIGHTS_EXECUTE | SYNCHRONIZE }, + { 0, GENERIC_ALL, STANDARD_RIGHTS_ALL | MUTANT_QUERY_STATE } + }; SetLastError(0xdeadbeef); mutex = OpenMutexA(0, FALSE, "WineTestMutex"); @@ -4516,6 +4540,26 @@ static void test_mutex_security(HANDLE token) mutex = CreateMutexA(NULL, FALSE, "WineTestMutex"); ok(mutex != 0, "CreateMutex error %d\n", GetLastError()); + access = get_obj_access(mutex); + ok(access == MUTANT_ALL_ACCESS, "expected MUTANT_ALL_ACCESS, got %#x\n", access); + + for (i = 0; i < sizeof(map)/sizeof(map[0]); i++) + { + SetLastError( 0xdeadbeef ); + ret = DuplicateHandle(GetCurrentProcess(), mutex, GetCurrentProcess(), &dup, + map[i].generic, FALSE, 0); + ok(ret, "DuplicateHandle error %d\n", GetLastError()); + + access = get_obj_access(dup); + if (map[i].todo) +todo_wine + ok(access == map[i].mapped, "%d: expected %#x, got %#x\n", i, map[i].mapped, access); + else + ok(access == map[i].mapped, "%d: expected %#x, got %#x\n", i, map[i].mapped, access); + + CloseHandle(dup); + } + test_default_handle_security(token, mutex, &mapping); CloseHandle (mutex);

1 0

Dmitry Timoshkov : advapi32/tests: Test generic access mapping for a semaphore.
by Alexandre Julliard Dec. 30, 2013

Dec. 30, 2013

Module: wine Branch: master Commit: 8b91e6e41e67cdf0bc7a70dfc7d268ba0d5b7cae URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b91e6e41e67cdf0bc7a70dfc… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Dec 26 16:34:14 2013 +0900 advapi32/tests: Test generic access mapping for a semaphore. --- dlls/advapi32/tests/security.c | 58 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 58 insertions(+), 0 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 10eea5f..b69a5ac 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -42,6 +42,10 @@ #define EVENT_QUERY_STATE 0x0001 #endif +#ifndef SEMAPHORE_QUERY_STATE +#define SEMAPHORE_QUERY_STATE 0x0001 +#endif + /* copied from Wine winternl.h - not included in the Windows SDK */ typedef enum _OBJECT_INFORMATION_CLASS { ObjectBasicInformation, @@ -4618,6 +4622,59 @@ todo_wine CloseHandle(event); } +static void test_semaphore_security(HANDLE token) +{ + DWORD ret, i, access; + HANDLE sem, dup; + GENERIC_MAPPING mapping = { STANDARD_RIGHTS_READ | SEMAPHORE_QUERY_STATE, + STANDARD_RIGHTS_WRITE | SEMAPHORE_MODIFY_STATE, + STANDARD_RIGHTS_EXECUTE | SYNCHRONIZE, + STANDARD_RIGHTS_ALL | SEMAPHORE_ALL_ACCESS }; + static const struct + { + int todo, generic, mapped; + } map[] = + { + { 1, GENERIC_READ, STANDARD_RIGHTS_READ | SEMAPHORE_QUERY_STATE }, + { 0, GENERIC_WRITE, STANDARD_RIGHTS_WRITE | SEMAPHORE_MODIFY_STATE }, + { 1, GENERIC_EXECUTE, STANDARD_RIGHTS_EXECUTE | SYNCHRONIZE }, + { 0, GENERIC_ALL, STANDARD_RIGHTS_ALL | SEMAPHORE_QUERY_STATE | SEMAPHORE_MODIFY_STATE } + }; + + SetLastError(0xdeadbeef); + sem = OpenSemaphoreA(0, FALSE, "WineTestSemaphore"); + ok(!sem, "semaphore should not exist\n"); + ok(GetLastError() == ERROR_FILE_NOT_FOUND, "wrong error %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + sem = CreateSemaphoreA(NULL, 0, 10, "WineTestSemaphore"); + ok(sem != 0, "CreateSemaphore error %d\n", GetLastError()); + + access = get_obj_access(sem); + ok(access == SEMAPHORE_ALL_ACCESS, "expected SEMAPHORE_ALL_ACCESS, got %#x\n", access); + + for (i = 0; i < sizeof(map)/sizeof(map[0]); i++) + { + SetLastError( 0xdeadbeef ); + ret = DuplicateHandle(GetCurrentProcess(), sem, GetCurrentProcess(), &dup, + map[i].generic, FALSE, 0); + ok(ret, "DuplicateHandle error %d\n", GetLastError()); + + access = get_obj_access(dup); + if (map[i].todo) +todo_wine + ok(access == map[i].mapped, "%d: expected %#x, got %#x\n", i, map[i].mapped, access); + else + ok(access == map[i].mapped, "%d: expected %#x, got %#x\n", i, map[i].mapped, access); + + CloseHandle(dup); + } + + test_default_handle_security(token, sem, &mapping); + + CloseHandle(sem); +} + #define WINE_TEST_PIPE "\\\\.\\pipe\\WineTestPipe" static void test_named_pipe_security(HANDLE token) { @@ -4721,6 +4778,7 @@ static void test_kernel_objects_security(void) test_mutex_security(token); test_event_security(token); test_named_pipe_security(token); + test_semaphore_security(token); /* FIXME: test other kernel object types */ CloseHandle(process_token);

1 0