December 2013 - Wine-commits

Alexandre Julliard : makedep: Generate rules for test binaries.
by Alexandre Julliard 31 Dec '13

31 Dec '13

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: Generate rules for API documentation.
by Alexandre Julliard 31 Dec '13

31 Dec '13

Module: wine Branch: master Commit: 6ee09e4d3cece7ad08212cca76bbabad00e8c51b URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ee09e4d3cece7ad08212cca7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 30 20:23:16 2013 +0100 makedep: Generate rules for API documentation. --- configure | 11 ----------- configure.ac | 11 ----------- tools/makedep.c | 41 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 41 insertions(+), 22 deletions(-) diff --git a/configure b/configure index 5b2f013..925ead3 100755 --- a/configure +++ b/configure @@ -16555,17 +16555,6 @@ fi MAKE_DLL_RULES=" DLLFLAGS = $DLLFLAGS -MAINSPEC = \$(srcdir)/\$(MODULE:%.dll=%).spec - -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) -htmlpages:: dummy - \$(C2MAN) -o \$(top_builddir)/documentation/html -R\$(top_builddir) -C\$(srcdir) \$(PARENTSRC:%=-P%) -I\$(top_srcdir)/include -Th \$(MAINSPEC:%=-w %) \$(C_SRCS) -sgmlpages:: dummy - \$(C2MAN) -o \$(top_builddir)/documentation/api-guide -R\$(top_builddir) -C\$(srcdir) \$(PARENTSRC:%=-P%) -I\$(top_srcdir)/include -Ts \$(MAINSPEC:%=-w %) \$(C_SRCS) -xmlpages:: dummy - \$(C2MAN) -o \$(top_builddir)/documentation/api-guide-xml -R\$(top_builddir) -C\$(srcdir) \$(PARENTSRC:%=-P%) -I\$(top_srcdir)/include -Tx \$(MAINSPEC:%=-w %) \$(C_SRCS) -.PHONY: manpages htmlpages sgmlpages xmlpages " diff --git a/configure.ac b/configure.ac index 74950e3..e83cbd1 100644 --- a/configure.ac +++ b/configure.ac @@ -2614,17 +2614,6 @@ dnl Dll and program rules AC_SUBST(MAKE_DLL_RULES," DLLFLAGS = $DLLFLAGS -MAINSPEC = \$(srcdir)/\$(MODULE:%.dll=%).spec - -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) -htmlpages:: dummy - \$(C2MAN) -o \$(top_builddir)/documentation/html -R\$(top_builddir) -C\$(srcdir) \$(PARENTSRC:%=-P%) -I\$(top_srcdir)/include -Th \$(MAINSPEC:%=-w %) \$(C_SRCS) -sgmlpages:: dummy - \$(C2MAN) -o \$(top_builddir)/documentation/api-guide -R\$(top_builddir) -C\$(srcdir) \$(PARENTSRC:%=-P%) -I\$(top_srcdir)/include -Ts \$(MAINSPEC:%=-w %) \$(C_SRCS) -xmlpages:: dummy - \$(C2MAN) -o \$(top_builddir)/documentation/api-guide-xml -R\$(top_builddir) -C\$(srcdir) \$(PARENTSRC:%=-P%) -I\$(top_srcdir)/include -Tx \$(MAINSPEC:%=-w %) \$(C_SRCS) -.PHONY: manpages htmlpages sgmlpages xmlpages ") AC_SUBST(MAKE_PROG_RULES," diff --git a/tools/makedep.c b/tools/makedep.c index a9b4d6b..136b5ce 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -1375,6 +1375,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 c2man_files = empty_strarray; struct strarray implib_objs = empty_strarray; struct strarray includes = empty_strarray; struct strarray subdirs = empty_strarray; @@ -1609,6 +1610,8 @@ static struct strarray output_sources(void) 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 ); } + if (!strcmp( ext, "c" ) && !(source->flags & FLAG_GENERATED)) + strarray_add( &c2man_files, source->filename ); for (i = 0; i < object_extensions.count; i++) output( "%s.%s ", obj, object_extensions.str[i] ); if (source->flags & FLAG_C_IMPLIB) output( "%s.cross.o", obj ); @@ -1749,6 +1752,44 @@ static struct strarray output_sources(void) output( "\n" ); } } + + if (spec_file) + { + if (c2man_files.count && top_obj_dir) + { + char *manext = get_expanded_make_variable( "api_manext" ); + + output( "manpages::\n" ); + output( "\t$(C2MAN) -w %s -R%s", spec_file, top_obj_dir ); + output_filename( strmake( "-I%s/include", top_src_dir ? top_src_dir : top_obj_dir )); + output_filename( strmake( "-o %s/documentation/man%s", top_obj_dir, manext ? manext : "3w" )); + output_filenames( c2man_files ); + output( "\n" ); + output( "htmlpages::\n" ); + output( "\t$(C2MAN) -Th -w %s -R%s", spec_file, top_obj_dir ); + output_filename( strmake( "-I%s/include", top_src_dir ? top_src_dir : top_obj_dir )); + output_filename( strmake( "-o %s/documentation/html", top_obj_dir )); + output_filenames( c2man_files ); + output( "\n" ); + output( "sgmlpages::\n" ); + output( "\t$(C2MAN) -Ts -w %s -R%s", spec_file, top_obj_dir ); + output_filename( strmake( "-I%s/include", top_src_dir ? top_src_dir : top_obj_dir )); + output_filename( strmake( "-o %s/documentation/api-guide", top_obj_dir )); + output_filenames( c2man_files ); + output( "\n" ); + output( "xmlpages::\n" ); + output( "\t$(C2MAN) -Tx -w %s -R%s", spec_file, top_obj_dir ); + output_filename( strmake( "-I%s/include", top_src_dir ? top_src_dir : top_obj_dir )); + output_filename( strmake( "-o %s/documentation/api-guide-xml", top_obj_dir )); + output_filenames( c2man_files ); + output( "\n" ); + strarray_add( &phony_targets, "manpages" ); + strarray_add( &phony_targets, "htmlpages" ); + strarray_add( &phony_targets, "sgmlpages" ); + strarray_add( &phony_targets, "xmlpages" ); + } + else output( "manpages htmlpages sgmlpages xmlpages::\n" ); + } } if (staticlib)

1 0

Alexandre Julliard : oleaut32: Don't create non-existent typelib files.
by Alexandre Julliard 31 Dec '13

31 Dec '13

Module: wine Branch: master Commit: a41468164805b54aea40d19416915699ee308a9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a41468164805b54aea40d1941… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 30 20:35:02 2013 +0100 oleaut32: Don't create non-existent typelib files. --- dlls/oleaut32/typelib.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 0d8c43e..812612a 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -3405,8 +3405,7 @@ static HRESULT TLB_ReadTypeLib(LPCWSTR pszFileName, LPWSTR pszPath, UINT cchPath if(file != pszFileName) heap_free(file); - h = CreateFileW(pszPath, GENERIC_READ, 0, NULL, OPEN_ALWAYS, - FILE_ATTRIBUTE_NORMAL, NULL); + h = CreateFileW(pszPath, GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); if(h != INVALID_HANDLE_VALUE){ FILE_NAME_INFORMATION *info; char data[MAX_PATH * sizeof(WCHAR) + sizeof(info->FileNameLength)];

1 0

Jacek Caban : qcap: Added IPersistPropertyBag::Load implementation.
by Alexandre Julliard 31 Dec '13

31 Dec '13

Module: wine Branch: master Commit: d45241dd915d8e1425f9abbf71a9dc4bbf6102d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d45241dd915d8e1425f9abbf7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 30 20:21:36 2013 +0100 qcap: Added IPersistPropertyBag::Load implementation. --- dlls/qcap/Makefile.in | 2 +- dlls/qcap/avico.c | 37 ++++++++++++++++++++- dlls/qcap/tests/qcap.c | 81 ++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 117 insertions(+), 3 deletions(-) diff --git a/dlls/qcap/Makefile.in b/dlls/qcap/Makefile.in index 41871e3..f565855 100644 --- a/dlls/qcap/Makefile.in +++ b/dlls/qcap/Makefile.in @@ -1,5 +1,5 @@ MODULE = qcap.dll -IMPORTS = strmiids strmbase uuid ole32 gdi32 advapi32 +IMPORTS = strmiids strmbase uuid ole32 oleaut32 gdi32 advapi32 C_SRCS = \ avico.c \ diff --git a/dlls/qcap/avico.c b/dlls/qcap/avico.c index 70c3283..a155f00 100644 --- a/dlls/qcap/avico.c +++ b/dlls/qcap/avico.c @@ -23,6 +23,7 @@ #include "windef.h" #include "winbase.h" #include "dshow.h" +#include "aviriff.h" #include "qcap_main.h" @@ -36,6 +37,8 @@ typedef struct { BaseInputPin *in; BaseOutputPin *out; + + DWORD fcc_handler; } AVICompressor; static inline AVICompressor *impl_from_BaseFilter(BaseFilter *filter) @@ -234,8 +237,38 @@ static HRESULT WINAPI AVICompressorPropertyBag_InitNew(IPersistPropertyBag *ifac static HRESULT WINAPI AVICompressorPropertyBag_Load(IPersistPropertyBag *iface, IPropertyBag *pPropBag, IErrorLog *pErrorLog) { AVICompressor *This = impl_from_IPersistPropertyBag(iface); - FIXME("(%p)->(%p %p)\n", This, pPropBag, pErrorLog); - return E_NOTIMPL; + BSTR str; + VARIANT v; + HRESULT hres; + + static const WCHAR fcc_handlerW[] = {'F','c','c','H','a','n','d','l','e','r',0}; + + TRACE("(%p)->(%p %p)\n", This, pPropBag, pErrorLog); + + V_VT(&v) = VT_EMPTY; + hres = IPropertyBag_Read(pPropBag, fcc_handlerW, &v, NULL); + if(FAILED(hres)) { + WARN("Could not read FccHandler: %08x\n", hres); + return hres; + } + + if(V_VT(&v) != VT_BSTR) { + FIXME("Got vt %d\n", V_VT(&v)); + VariantClear(&v); + return E_FAIL; + } + + str = V_BSTR(&v); + TRACE("FccHandler = %s\n", debugstr_w(str)); + if(SysStringLen(str) != 4) { + FIXME("Invalid FccHandler len\n"); + SysFreeString(str); + return E_FAIL; + } + + This->fcc_handler = FCC(str[0], str[1], str[2], str[3]); + SysFreeString(str); + return S_OK; } static HRESULT WINAPI AVICompressorPropertyBag_Save(IPersistPropertyBag *iface, IPropertyBag *pPropBag, diff --git a/dlls/qcap/tests/qcap.c b/dlls/qcap/tests/qcap.c index b053bbd..b403a74 100644 --- a/dlls/qcap/tests/qcap.c +++ b/dlls/qcap/tests/qcap.c @@ -59,6 +59,7 @@ DEFINE_EXPECT(ReceiveConnection); DEFINE_EXPECT(GetAllocatorRequirements); DEFINE_EXPECT(NotifyAllocator); DEFINE_EXPECT(Reconnect); +DEFINE_EXPECT(Read_FccHandler); static const char *debugstr_guid(REFIID riid) { @@ -72,6 +73,28 @@ static const char *debugstr_guid(REFIID riid) return buf; } +static int strcmp_wa(LPCWSTR strw, const char *stra) +{ + CHAR buf[512]; + WideCharToMultiByte(CP_ACP, 0, strw, -1, buf, sizeof(buf), NULL, NULL); + return lstrcmpA(stra, buf); +} + +static BSTR a2bstr(const char *str) +{ + BSTR ret; + int len; + + if(!str) + return NULL; + + len = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0); + ret = SysAllocStringLen(NULL, len-1); + MultiByteToWideChar(CP_ACP, 0, str, -1, ret, len); + + return ret; +} + static void test_smart_tee_filter(void) { HRESULT hr; @@ -1333,6 +1356,59 @@ static void test_AviMux(void) IBaseFilter_Release(avimux); } +static HRESULT WINAPI PropertyBag_QueryInterface(IPropertyBag *iface, REFIID riid, void **ppv) +{ + if(IsEqualGUID(&IID_IUnknown, riid) || IsEqualGUID(&IID_IPropertyBag, riid)) { + *ppv = iface; + return S_OK; + } + + ok(0, "unexpected call %s\n", debugstr_guid(riid)); + *ppv = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI PropertyBag_AddRef(IPropertyBag *iface) +{ + return 2; +} + +static ULONG WINAPI PropertyBag_Release(IPropertyBag *iface) +{ + return 1; +} + +static HRESULT WINAPI PropertyBag_Read(IPropertyBag *iface, LPCOLESTR pszPropName, VARIANT *pVar, IErrorLog *pErrorLog) +{ + ok(!pErrorLog, "pErrorLog = %p\n", pErrorLog); + + if(!strcmp_wa(pszPropName, "FccHandler")) { + CHECK_EXPECT(Read_FccHandler); + V_VT(pVar) = VT_BSTR; + V_BSTR(pVar) = a2bstr("mrle"); + return S_OK; + } + + ok(0, "unexpected call: %s\n", wine_dbgstr_w(pszPropName)); + return E_NOTIMPL; +} + +static HRESULT WINAPI PropertyBag_Write(IPropertyBag *iface, LPCOLESTR pszPropName, VARIANT *pVar) +{ + ok(0, "unexpected call: %s\n", wine_dbgstr_w(pszPropName)); + return E_NOTIMPL; +} + +static const IPropertyBagVtbl PropertyBagVtbl = { + PropertyBag_QueryInterface, + PropertyBag_AddRef, + PropertyBag_Release, + PropertyBag_Read, + PropertyBag_Write +}; + +static IPropertyBag PropertyBag = { &PropertyBagVtbl }; + static void test_AviCo(void) { IPersistPropertyBag *persist_bag; @@ -1358,6 +1434,11 @@ static void test_AviCo(void) hres = IBaseFilter_QueryInterface(avico, &IID_IPersistPropertyBag, (void**)&persist_bag); ok(hres == S_OK, "QueryInterface(IID_IPersistPropertyBag) returned: %08x\n", hres); + SET_EXPECT(Read_FccHandler); + hres = IPersistPropertyBag_Load(persist_bag, &PropertyBag, NULL); + ok(hres == S_OK, "Load failed: %08x\n", hres); + CHECK_CALLED(Read_FccHandler); + IPersistPropertyBag_Release(persist_bag); hres = IBaseFilter_EnumPins(avico, &enum_pins);

1 0

Jacek Caban : qcap: Added AVICompressorIn_CheckMediaType implementation.
by Alexandre Julliard 31 Dec '13

31 Dec '13

Module: wine Branch: master Commit: 1a2c6b9570055b12ea0d7f80bfa7ce1263220d40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a2c6b9570055b12ea0d7f80b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 30 20:21:47 2013 +0100 qcap: Added AVICompressorIn_CheckMediaType implementation. --- dlls/qcap/Makefile.in | 1 + dlls/qcap/avico.c | 42 ++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 41 insertions(+), 2 deletions(-) diff --git a/dlls/qcap/Makefile.in b/dlls/qcap/Makefile.in index f565855..c672d84 100644 --- a/dlls/qcap/Makefile.in +++ b/dlls/qcap/Makefile.in @@ -1,5 +1,6 @@ MODULE = qcap.dll IMPORTS = strmiids strmbase uuid ole32 oleaut32 gdi32 advapi32 +DELAYIMPORTS = msvfw32 C_SRCS = \ avico.c \ diff --git a/dlls/qcap/avico.c b/dlls/qcap/avico.c index a155f00..7496e0c 100644 --- a/dlls/qcap/avico.c +++ b/dlls/qcap/avico.c @@ -23,6 +23,7 @@ #include "windef.h" #include "winbase.h" #include "dshow.h" +#include "vfw.h" #include "aviriff.h" #include "qcap_main.h" @@ -39,6 +40,7 @@ typedef struct { BaseOutputPin *out; DWORD fcc_handler; + HIC hic; } AVICompressor; static inline AVICompressor *impl_from_BaseFilter(BaseFilter *filter) @@ -57,6 +59,20 @@ static inline AVICompressor *impl_from_BasePin(BasePin *pin) return impl_from_IBaseFilter(pin->pinInfo.pFilter); } +static HRESULT ensure_driver(AVICompressor *This) +{ + if(This->hic) + return S_OK; + + This->hic = ICOpen(FCC('v','i','d','c'), This->fcc_handler, ICMODE_COMPRESS); + if(!This->hic) { + FIXME("ICOpen failed\n"); + return E_FAIL; + } + + return S_OK; +} + static HRESULT WINAPI AVICompressor_QueryInterface(IBaseFilter *iface, REFIID riid, void **ppv) { AVICompressor *This = impl_from_IBaseFilter(iface); @@ -95,6 +111,8 @@ static ULONG WINAPI AVICompressor_Release(IBaseFilter *iface) TRACE("(%p) ref=%d\n", This, ref); if(!ref) { + if(This->hic) + ICClose(This->hic); if(This->in) BaseInputPinImpl_Release(&This->in->pin.IPin_iface); if(This->out) @@ -351,9 +369,29 @@ static const IPinVtbl AVICompressorInputPinVtbl = { static HRESULT WINAPI AVICompressorIn_CheckMediaType(BasePin *base, const AM_MEDIA_TYPE *pmt) { - FIXME("(%p)->(AM_MEDIA_TYPE(%p))\n", base, pmt); + AVICompressor *This = impl_from_BasePin(base); + VIDEOINFOHEADER *videoinfo; + HRESULT hres; + DWORD res; + + TRACE("(%p)->(AM_MEDIA_TYPE(%p))\n", base, pmt); dump_AM_MEDIA_TYPE(pmt); - return E_NOTIMPL; + + if(!IsEqualIID(&pmt->majortype, &MEDIATYPE_Video)) + return S_FALSE; + + if(!IsEqualIID(&pmt->formattype, &FORMAT_VideoInfo)) { + FIXME("formattype %s unsupported\n", debugstr_guid(&pmt->formattype)); + return S_FALSE; + } + + hres = ensure_driver(This); + if(hres != S_OK) + return hres; + + videoinfo = (VIDEOINFOHEADER*)pmt->pbFormat; + res = ICCompressQuery(This->hic, &videoinfo->bmiHeader, NULL); + return res == ICERR_OK ? S_OK : S_FALSE; } static LONG WINAPI AVICompressorIn_GetMediaTypeVersion(BasePin *base)

1 0

Jacek Caban : qcap: Added AVICompressorIn_ReceiveConnection implementation.
by Alexandre Julliard 31 Dec '13

31 Dec '13

Module: wine Branch: master Commit: 56fa8f1cc5afc4454326c38094bdd201fe715e3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=56fa8f1cc5afc4454326c3809… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 30 20:21:58 2013 +0100 qcap: Added AVICompressorIn_ReceiveConnection implementation. --- dlls/qcap/avico.c | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 52 insertions(+), 2 deletions(-) diff --git a/dlls/qcap/avico.c b/dlls/qcap/avico.c index 7496e0c..6c5d53f 100644 --- a/dlls/qcap/avico.c +++ b/dlls/qcap/avico.c @@ -41,6 +41,10 @@ typedef struct { DWORD fcc_handler; HIC hic; + + VIDEOINFOHEADER *videoinfo; + size_t videoinfo_size; + DWORD driver_flags; } AVICompressor; static inline AVICompressor *impl_from_BaseFilter(BaseFilter *filter) @@ -73,6 +77,41 @@ static HRESULT ensure_driver(AVICompressor *This) return S_OK; } +static HRESULT fill_format_info(AVICompressor *This, VIDEOINFOHEADER *src_videoinfo) +{ + DWORD size; + ICINFO icinfo; + HRESULT hres; + + hres = ensure_driver(This); + if(hres != S_OK) + return hres; + + size = ICGetInfo(This->hic, &icinfo, sizeof(icinfo)); + if(size != sizeof(icinfo)) + return E_FAIL; + + size = ICCompressGetFormatSize(This->hic, &src_videoinfo->bmiHeader); + if(!size) { + FIXME("ICCompressGetFormatSize failed\n"); + return E_FAIL; + } + + size += FIELD_OFFSET(VIDEOINFOHEADER, bmiHeader); + This->videoinfo = heap_alloc(size); + if(!This->videoinfo) + return E_OUTOFMEMORY; + + This->videoinfo_size = size; + This->driver_flags = icinfo.dwFlags; + memset(This->videoinfo, 0, sizeof(*This->videoinfo)); + ICCompressGetFormat(This->hic, &src_videoinfo->bmiHeader, &This->videoinfo->bmiHeader); + + This->videoinfo->dwBitRate = 10000000/src_videoinfo->AvgTimePerFrame * This->videoinfo->bmiHeader.biSizeImage * 8; + This->videoinfo->AvgTimePerFrame = src_videoinfo->AvgTimePerFrame; + return S_OK; +} + static HRESULT WINAPI AVICompressor_QueryInterface(IBaseFilter *iface, REFIID riid, void **ppv) { AVICompressor *This = impl_from_IBaseFilter(iface); @@ -113,6 +152,7 @@ static ULONG WINAPI AVICompressor_Release(IBaseFilter *iface) if(!ref) { if(This->hic) ICClose(This->hic); + heap_free(This->videoinfo); if(This->in) BaseInputPinImpl_Release(&This->in->pin.IPin_iface); if(This->out) @@ -334,9 +374,19 @@ 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); + HRESULT hres; + + TRACE("(%p)->(%p AM_MEDIA_TYPE(%p))\n", This, pConnector, pmt); dump_AM_MEDIA_TYPE(pmt); - return E_NOTIMPL; + + hres = BaseInputPinImpl_ReceiveConnection(iface, pConnector, pmt); + if(FAILED(hres)) + return hres; + + hres = fill_format_info(This, (VIDEOINFOHEADER*)pmt->pbFormat); + if(FAILED(hres)) + BasePinImpl_Disconnect(iface); + return hres; } static HRESULT WINAPI AVICompressorIn_Disconnect(IPin *iface)

1 0

Jacek Caban : qcap: Added AVICompressorOut_GetMediaType implementation.
by Alexandre Julliard 31 Dec '13

31 Dec '13

Module: wine Branch: master Commit: 6b30b6fb4ee666472673f66140c57083d0f4b862 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b30b6fb4ee666472673f6614… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 30 20:22:07 2013 +0100 qcap: Added AVICompressorOut_GetMediaType implementation. --- dlls/qcap/avico.c | 18 ++++++++++++++++-- 1 files changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/qcap/avico.c b/dlls/qcap/avico.c index 6c5d53f..4866b47 100644 --- a/dlls/qcap/avico.c +++ b/dlls/qcap/avico.c @@ -520,8 +520,22 @@ static LONG WINAPI AVICompressorOut_GetMediaTypeVersion(BasePin *base) 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; + + TRACE("(%p)->(%d %p)\n", base, iPosition, amt); + + if(iPosition || !This->videoinfo) + return S_FALSE; + + amt->majortype = MEDIATYPE_Video; + amt->subtype = MEDIASUBTYPE_PCM; + amt->bFixedSizeSamples = FALSE; + amt->bTemporalCompression = (This->driver_flags & VIDCF_TEMPORAL) != 0; + amt->lSampleSize = This->in->pin.mtCurrent.lSampleSize; + amt->formattype = FORMAT_VideoInfo; + amt->pUnk = NULL; + amt->cbFormat = This->videoinfo_size; + amt->pbFormat = (BYTE*)This->videoinfo; + return S_OK; } static const BasePinFuncTable AVICompressorOutputBasePinVtbl = {

1 0

Jacek Caban : qcap: Added AVICompressorOut_DecideBufferSize implementation.
by Alexandre Julliard 31 Dec '13

31 Dec '13

Module: wine Branch: master Commit: 0414557ef76762d4c1200bd7acd9af13f911fe79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0414557ef76762d4c1200bd7a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 30 20:22:17 2013 +0100 qcap: Added AVICompressorOut_DecideBufferSize implementation. --- dlls/qcap/avico.c | 15 +++++++++++++-- 1 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/qcap/avico.c b/dlls/qcap/avico.c index 4866b47..6ac9da3 100644 --- a/dlls/qcap/avico.c +++ b/dlls/qcap/avico.c @@ -547,8 +547,19 @@ static const BasePinFuncTable AVICompressorOutputBasePinVtbl = { static HRESULT WINAPI AVICompressorOut_DecideBufferSize(BaseOutputPin *base, IMemAllocator *alloc, ALLOCATOR_PROPERTIES *ppropInputRequest) { - FIXME("\n"); - return E_NOTIMPL; + AVICompressor *This = impl_from_BasePin(&base->pin); + ALLOCATOR_PROPERTIES actual; + + TRACE("(%p)\n", This); + + if (!ppropInputRequest->cBuffers) + ppropInputRequest->cBuffers = 1; + if (ppropInputRequest->cbBuffer < This->videoinfo->bmiHeader.biSizeImage) + ppropInputRequest->cbBuffer = This->videoinfo->bmiHeader.biSizeImage; + if (!ppropInputRequest->cbAlign) + ppropInputRequest->cbAlign = 1; + + return IMemAllocator_SetProperties(alloc, ppropInputRequest, &actual); } static HRESULT WINAPI AVICompressorOut_DecideAllocator(BaseOutputPin *base,

1 0

Jacek Caban : qcap: Added AVI compressor Start and Stop implementations.
by Alexandre Julliard 31 Dec '13

31 Dec '13

Module: wine Branch: master Commit: 47cc78c45470285e9836e74363e33a08d8746a15 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47cc78c45470285e9836e7436… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 30 20:22:25 2013 +0100 qcap: Added AVI compressor Start and Stop implementations. --- dlls/qcap/avico.c | 32 ++++++++++++++++++++++++++++---- 1 files changed, 28 insertions(+), 4 deletions(-) diff --git a/dlls/qcap/avico.c b/dlls/qcap/avico.c index 6ac9da3..4720ae3 100644 --- a/dlls/qcap/avico.c +++ b/dlls/qcap/avico.c @@ -45,6 +45,8 @@ typedef struct { VIDEOINFOHEADER *videoinfo; size_t videoinfo_size; DWORD driver_flags; + + DWORD frame_cnt; } AVICompressor; static inline AVICompressor *impl_from_BaseFilter(BaseFilter *filter) @@ -166,8 +168,15 @@ static ULONG WINAPI AVICompressor_Release(IBaseFilter *iface) static HRESULT WINAPI AVICompressor_Stop(IBaseFilter *iface) { AVICompressor *This = impl_from_IBaseFilter(iface); - FIXME("(%p)\n", This); - return E_NOTIMPL; + + TRACE("(%p)\n", This); + + if(This->filter.state == State_Stopped) + return S_OK; + + ICCompressEnd(This->hic); + This->filter.state = State_Stopped; + return S_OK; } static HRESULT WINAPI AVICompressor_Pause(IBaseFilter *iface) @@ -180,8 +189,23 @@ static HRESULT WINAPI AVICompressor_Pause(IBaseFilter *iface) static HRESULT WINAPI AVICompressor_Run(IBaseFilter *iface, REFERENCE_TIME tStart) { AVICompressor *This = impl_from_IBaseFilter(iface); - FIXME("(%p)->(%s)\n", This, wine_dbgstr_longlong(tStart)); - return E_NOTIMPL; + HRESULT hres; + + TRACE("(%p)->(%s)\n", This, wine_dbgstr_longlong(tStart)); + + if(This->filter.state == State_Running) + return S_OK; + + hres = IMemAllocator_Commit(This->out->pAllocator); + if(FAILED(hres)) { + FIXME("Commit failed: %08x\n", hres); + return hres; + } + + This->frame_cnt = 0; + + This->filter.state = State_Running; + return S_OK; } static HRESULT WINAPI AVICompressor_FindPin(IBaseFilter *iface, LPCWSTR Id, IPin **ppPin)

1 0

Michael Stefaniuc : dmusic/tests: Don't crash with old dmusic versions.
by Alexandre Julliard 31 Dec '13

31 Dec '13

Module: wine Branch: master Commit: 7474a370502b10f4add187a5684159c5f843a20a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7474a370502b10f4add187a56… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Dec 30 23:25:56 2013 +0100 dmusic/tests: Don't crash with old dmusic versions. --- dlls/dmusic/tests/dmusic.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/dmusic/tests/dmusic.c b/dlls/dmusic/tests/dmusic.c index c425840..ced2336 100644 --- a/dlls/dmusic/tests/dmusic.c +++ b/dlls/dmusic/tests/dmusic.c @@ -245,6 +245,11 @@ static void test_COM(void) /* Same refcount for DirectMusic and DirectMusic8 */ hr = CoCreateInstance(&CLSID_DirectMusic, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusic8, (void**)&dm8); + if (hr == E_NOINTERFACE) + { + win_skip("DirectMusic too old (no IDirectMusic8)\n"); + return; + } ok(hr == S_OK, "DirectMusic8 create failed: %08x, expected S_OK\n", hr); refcount = IDirectMusic8_AddRef(dm8); ok(refcount == 2, "refcount == %u, expected 2\n", refcount);

1 0