February 2008 - Wine-Commits

Gerald Pfeifer : msi: Adjust the signedness of three variables.
by Alexandre Julliard Feb. 19, 2008

Feb. 19, 2008

Module: wine Branch: master Commit: 6bf0f0e1f67d2d9a80f28f27f9d34856b4b3dde8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6bf0f0e1f67d2d9a80f28f27f… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sun Feb 17 13:23:38 2008 +0100 msi: Adjust the signedness of three variables. --- dlls/msi/streams.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msi/streams.c b/dlls/msi/streams.c index 3d91b9b..defcad5 100644 --- a/dlls/msi/streams.c +++ b/dlls/msi/streams.c @@ -39,7 +39,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(msidb); typedef struct tabSTREAM { - int str_index; + UINT str_index; LPWSTR name; IStream *stream; } STREAM; @@ -54,7 +54,7 @@ typedef struct tagMSISTREAMSVIEW UINT row_size; } MSISTREAMSVIEW; -static BOOL streams_set_table_size(MSISTREAMSVIEW *sv, int size) +static BOOL streams_set_table_size(MSISTREAMSVIEW *sv, UINT size) { if (size >= sv->max_streams) { @@ -372,7 +372,7 @@ static UINT STREAMS_modify(struct tagMSIVIEW *view, MSIMODIFY eModifyMode, MSIRE static UINT STREAMS_delete(struct tagMSIVIEW *view) { MSISTREAMSVIEW *sv = (MSISTREAMSVIEW *)view; - int i; + UINT i; TRACE("(%p)\n", view);

1 0

Lei Zhang : qedit: Add stub implementation of MediaDet.
by Alexandre Julliard Feb. 19, 2008

Feb. 19, 2008

Module: wine Branch: master Commit: 4868cde91d34d493c67b60ed28e9ef25a0edc177 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4868cde91d34d493c67b60ed2… Author: Lei Zhang <thestig(a)google.com> Date: Wed Feb 13 14:12:17 2008 -0800 qedit: Add stub implementation of MediaDet. --- dlls/qedit/Makefile.in | 1 + dlls/qedit/main.c | 1 + dlls/qedit/mediadet.c | 234 +++++++++++++++++++++++++++++++++++++++++++ dlls/qedit/qedit_private.h | 2 + dlls/qedit/tests/mediadet.c | 5 +- 5 files changed, 241 insertions(+), 2 deletions(-) diff --git a/dlls/qedit/Makefile.in b/dlls/qedit/Makefile.in index ae43c74..34707fa 100644 --- a/dlls/qedit/Makefile.in +++ b/dlls/qedit/Makefile.in @@ -8,6 +8,7 @@ EXTRALIBS = -lstrmiids -luuid C_SRCS = \ main.c \ + mediadet.c \ regsvr.c @MAKE_DLL_RULES@ diff --git a/dlls/qedit/main.c b/dlls/qedit/main.c index 1ece4ee..df00137 100644 --- a/dlls/qedit/main.c +++ b/dlls/qedit/main.c @@ -52,6 +52,7 @@ struct object_creation_info static const struct object_creation_info object_creation[] = { + { &CLSID_MediaDet, MediaDet_create }, }; static HRESULT WINAPI diff --git a/dlls/qedit/mediadet.c b/dlls/qedit/mediadet.c new file mode 100644 index 0000000..f7e6966 --- /dev/null +++ b/dlls/qedit/mediadet.c @@ -0,0 +1,234 @@ +/* DirectShow Media Detector object (QEDIT.DLL) + * + * Copyright 2008 Google (Lei Zhang) + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "qedit_private.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(qedit); + +typedef struct MediaDetImpl { + const IMediaDetVtbl *MediaDet_Vtbl; + LONG refCount; +} MediaDetImpl; + +static ULONG WINAPI MediaDet_AddRef(IMediaDet* iface) +{ + MediaDetImpl *This = (MediaDetImpl *)iface; + ULONG refCount = InterlockedIncrement(&This->refCount); + TRACE("(%p)->() AddRef from %d\n", This, refCount - 1); + return refCount; +} + +static ULONG WINAPI MediaDet_Release(IMediaDet* iface) +{ + MediaDetImpl *This = (MediaDetImpl *)iface; + ULONG refCount = InterlockedDecrement(&This->refCount); + TRACE("(%p)->() Release from %d\n", This, refCount + 1); + + if (refCount == 0) + { + CoTaskMemFree(This); + return 0; + } + + return refCount; +} + +static HRESULT WINAPI MediaDet_QueryInterface(IMediaDet* iface, REFIID riid, + void **ppvObject) +{ + MediaDetImpl *This = (MediaDetImpl *)iface; + TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppvObject); + + if (IsEqualIID(riid, &IID_IUnknown) || + IsEqualIID(riid, &IID_IMediaDet)) { + MediaDet_AddRef(iface); + *ppvObject = This; + return S_OK; + } + *ppvObject = NULL; + WARN("(%p, %s,%p): not found\n", This, debugstr_guid(riid), ppvObject); + return E_NOINTERFACE; +} + +static HRESULT WINAPI MediaDet_get_Filter(IMediaDet* iface, IUnknown **pVal) +{ + MediaDetImpl *This = (MediaDetImpl *)iface; + FIXME("(%p)->(%p)\n", This, pVal); + return E_NOTIMPL; +} + +static HRESULT WINAPI MediaDet_put_Filter(IMediaDet* iface, IUnknown *newVal) +{ + MediaDetImpl *This = (MediaDetImpl *)iface; + FIXME("(%p)->(%p)\n", This, newVal); + return E_NOTIMPL; +} + +static HRESULT WINAPI MediaDet_get_OutputStreams(IMediaDet* iface, long *pVal) +{ + MediaDetImpl *This = (MediaDetImpl *)iface; + FIXME("(%p)->(%p)\n", This, pVal); + return E_NOTIMPL; +} + +static HRESULT WINAPI MediaDet_get_CurrentStream(IMediaDet* iface, long *pVal) +{ + MediaDetImpl *This = (MediaDetImpl *)iface; + FIXME("(%p)->(%p)\n", This, pVal); + return E_NOTIMPL; +} + +static HRESULT WINAPI MediaDet_put_CurrentStream(IMediaDet* iface, long newVal) +{ + MediaDetImpl *This = (MediaDetImpl *)iface; + FIXME("(%p)->(%ld)\n", This, newVal); + return E_NOTIMPL; +} + +static HRESULT WINAPI MediaDet_get_StreamType(IMediaDet* iface, GUID *pVal) +{ + MediaDetImpl *This = (MediaDetImpl *)iface; + FIXME("(%p)->(%p)\n", This, debugstr_guid(pVal)); + return E_NOTIMPL; +} + +static HRESULT WINAPI MediaDet_get_StreamTypeB(IMediaDet* iface, BSTR *pVal) +{ + MediaDetImpl *This = (MediaDetImpl *)iface; + FIXME("(%p)->(%p)\n", This, pVal); + return E_NOTIMPL; +} + +static HRESULT WINAPI MediaDet_get_StreamLength(IMediaDet* iface, double *pVal) +{ + MediaDetImpl *This = (MediaDetImpl *)iface; + FIXME("(%p)->(%p)\n", This, pVal); + return E_NOTIMPL; +} + +static HRESULT WINAPI MediaDet_get_Filename(IMediaDet* iface, BSTR *pVal) +{ + MediaDetImpl *This = (MediaDetImpl *)iface; + FIXME("(%p)->(%p)\n", This, pVal); + return E_NOTIMPL; +} + +static HRESULT WINAPI MediaDet_put_Filename(IMediaDet* iface, BSTR newVal) +{ + MediaDetImpl *This = (MediaDetImpl *)iface; + FIXME("(%p)->(%p)\n", This, newVal); + return E_NOTIMPL; +} + +static HRESULT WINAPI MediaDet_GetBitmapBits(IMediaDet* iface, + double StreamTime, + long *pBufferSize, char *pBuffer, + long Width, long Height) +{ + MediaDetImpl *This = (MediaDetImpl *)iface; + FIXME("(%p)->(%f %p %p %ld %ld)\n", This, StreamTime, pBufferSize, pBuffer, + Width, Height); + return E_NOTIMPL; +} + +static HRESULT WINAPI MediaDet_WriteBitmapBits(IMediaDet* iface, + double StreamTime, long Width, + long Height, BSTR Filename) +{ + MediaDetImpl *This = (MediaDetImpl *)iface; + FIXME("(%p)->(%f %ld %ld %p)\n", This, StreamTime, Width, Height, Filename); + return E_NOTIMPL; +} + +static HRESULT WINAPI MediaDet_get_StreamMediaType(IMediaDet* iface, + AM_MEDIA_TYPE *pVal) +{ + MediaDetImpl *This = (MediaDetImpl *)iface; + FIXME("(%p)->(%p)\n", This, pVal); + return E_NOTIMPL; +} + +static HRESULT WINAPI MediaDet_GetSampleGrabber(IMediaDet* iface, + ISampleGrabber **ppVal) +{ + MediaDetImpl *This = (MediaDetImpl *)iface; + FIXME("(%p)->(%p)\n", This, ppVal); + return E_NOTIMPL; +} + +static HRESULT WINAPI MediaDet_get_FrameRate(IMediaDet* iface, double *pVal) +{ + MediaDetImpl *This = (MediaDetImpl *)iface; + FIXME("(%p)->(%p)\n", This, pVal); + return E_NOTIMPL; +} + +static HRESULT WINAPI MediaDet_EnterBitmapGrabMode(IMediaDet* iface, + double SeekTime) +{ + MediaDetImpl *This = (MediaDetImpl *)iface; + FIXME("(%p)->(%f)\n", This, SeekTime); + return E_NOTIMPL; +} + +static const IMediaDetVtbl IMediaDet_VTable = +{ + MediaDet_QueryInterface, + MediaDet_AddRef, + MediaDet_Release, + MediaDet_get_Filter, + MediaDet_put_Filter, + MediaDet_get_OutputStreams, + MediaDet_get_CurrentStream, + MediaDet_put_CurrentStream, + MediaDet_get_StreamType, + MediaDet_get_StreamTypeB, + MediaDet_get_StreamLength, + MediaDet_get_Filename, + MediaDet_put_Filename, + MediaDet_GetBitmapBits, + MediaDet_WriteBitmapBits, + MediaDet_get_StreamMediaType, + MediaDet_GetSampleGrabber, + MediaDet_get_FrameRate, + MediaDet_EnterBitmapGrabMode, +}; + +HRESULT MediaDet_create(IUnknown * pUnkOuter, LPVOID * ppv) { + MediaDetImpl* obj = NULL; + + TRACE("(%p,%p)\n", ppv, pUnkOuter); + + if (pUnkOuter) + return CLASS_E_NOAGGREGATION; + + obj = CoTaskMemAlloc(sizeof(MediaDetImpl)); + if (NULL == obj) { + *ppv = NULL; + return E_OUTOFMEMORY; + } + ZeroMemory(obj, sizeof(MediaDetImpl)); + + obj->refCount = 1; + obj->MediaDet_Vtbl = &IMediaDet_VTable; + *ppv = obj; + + return S_OK; +} diff --git a/dlls/qedit/qedit_private.h b/dlls/qedit/qedit_private.h index 27893da..7af54ce 100644 --- a/dlls/qedit/qedit_private.h +++ b/dlls/qedit/qedit_private.h @@ -35,4 +35,6 @@ #include "dshow.h" #include "qedit.h" +HRESULT MediaDet_create(IUnknown *pUnkOuter, LPVOID *ppObj); + #endif /* __QEDIT_PRIVATE_INCLUDED__ */ diff --git a/dlls/qedit/tests/mediadet.c b/dlls/qedit/tests/mediadet.c index 35a569e..5d5178d 100644 --- a/dlls/qedit/tests/mediadet.c +++ b/dlls/qedit/tests/mediadet.c @@ -32,10 +32,11 @@ static void test_mediadet(void) hr = CoCreateInstance(&CLSID_MediaDet, NULL, CLSCTX_INPROC_SERVER, &IID_IMediaDet, (LPVOID*)&pM); - todo_wine { ok(hr == S_OK, "CoCreateInstance failed with %x\n", hr); ok(pM != NULL, "pM is NULL\n"); - } + + hr = IMediaDet_Release(pM); + ok(hr == 0, "IMediaDet_Release returned: %x\n", hr); } START_TEST(mediadet)

1 0

Lei Zhang : qedit: Add tests directory and a simple test.
by Alexandre Julliard Feb. 19, 2008

Feb. 19, 2008

Module: wine Branch: master Commit: e8551a073db54c4a58363b180bf02def20bfe018 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8551a073db54c4a58363b180… Author: Lei Zhang <thestig(a)google.com> Date: Wed Feb 13 14:47:12 2008 -0800 qedit: Add tests directory and a simple test. --- .gitignore | 4 +++ Makefile.in | 2 + configure | 3 ++ configure.ac | 1 + dlls/Makefile.in | 1 + dlls/qedit/tests/Makefile.in | 14 ++++++++++++ dlls/qedit/tests/mediadet.c | 45 +++++++++++++++++++++++++++++++++++++++++ programs/winetest/Makefile.in | 3 ++ programs/winetest/winetest.rc | 1 + 9 files changed, 74 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index d4b76bb..807044c 100644 --- a/.gitignore +++ b/.gitignore @@ -389,6 +389,9 @@ dlls/psapi/tests/*.ok dlls/psapi/tests/psapi_crosstest.exe dlls/psapi/tests/testlist.c dlls/qcap/version.res +dlls/qedit/tests/*.ok +dlls/qedit/tests/qedit_crosstest.exe +dlls/qedit/tests/testlist.c dlls/qmgr/qmgr_local.h dlls/qmgr/qmgr_local_i.c dlls/qmgrprxy/qmgrprxy.h @@ -775,6 +778,7 @@ programs/winetest/oleaut32_test.exe programs/winetest/opengl32_test.exe programs/winetest/pdh_test.exe programs/winetest/psapi_test.exe +programs/winetest/qedit_test.exe programs/winetest/quartz_test.exe programs/winetest/riched20_test.exe programs/winetest/riched32_test.exe diff --git a/Makefile.in b/Makefile.in index b6efebe..6347f93 100644 --- a/Makefile.in +++ b/Makefile.in @@ -381,6 +381,7 @@ ALL_MAKEFILES = \ dlls/pstorec/Makefile \ dlls/qcap/Makefile \ dlls/qedit/Makefile \ + dlls/qedit/tests/Makefile \ dlls/qmgr/Makefile \ dlls/qmgrprxy/Makefile \ dlls/quartz/Makefile \ @@ -793,6 +794,7 @@ dlls/psapi/tests/Makefile: dlls/psapi/tests/Makefile.in dlls/Maketest.rules dlls/pstorec/Makefile: dlls/pstorec/Makefile.in dlls/Makedll.rules dlls/qcap/Makefile: dlls/qcap/Makefile.in dlls/Makedll.rules dlls/qedit/Makefile: dlls/qedit/Makefile.in dlls/Makedll.rules +dlls/qedit/tests/Makefile: dlls/qedit/tests/Makefile.in dlls/Maketest.rules dlls/qmgr/Makefile: dlls/qmgr/Makefile.in dlls/Makedll.rules dlls/qmgrprxy/Makefile: dlls/qmgrprxy/Makefile.in dlls/Makedll.rules dlls/quartz/Makefile: dlls/quartz/Makefile.in dlls/Makedll.rules diff --git a/configure b/configure index 9ae32d3..3d81b67 100755 --- a/configure +++ b/configure @@ -21613,6 +21613,8 @@ ac_config_files="$ac_config_files dlls/qcap/Makefile" ac_config_files="$ac_config_files dlls/qedit/Makefile" +ac_config_files="$ac_config_files dlls/qedit/tests/Makefile" + ac_config_files="$ac_config_files dlls/qmgr/Makefile" ac_config_files="$ac_config_files dlls/qmgrprxy/Makefile" @@ -22750,6 +22752,7 @@ do "dlls/pstorec/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/pstorec/Makefile" ;; "dlls/qcap/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/qcap/Makefile" ;; "dlls/qedit/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/qedit/Makefile" ;; + "dlls/qedit/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/qedit/tests/Makefile" ;; "dlls/qmgr/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/qmgr/Makefile" ;; "dlls/qmgrprxy/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/qmgrprxy/Makefile" ;; "dlls/quartz/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/quartz/Makefile" ;; diff --git a/configure.ac b/configure.ac index e2ba38e..1272088 100644 --- a/configure.ac +++ b/configure.ac @@ -1880,6 +1880,7 @@ AC_CONFIG_FILES([dlls/psapi/tests/Makefile]) AC_CONFIG_FILES([dlls/pstorec/Makefile]) AC_CONFIG_FILES([dlls/qcap/Makefile]) AC_CONFIG_FILES([dlls/qedit/Makefile]) +AC_CONFIG_FILES([dlls/qedit/tests/Makefile]) AC_CONFIG_FILES([dlls/qmgr/Makefile]) AC_CONFIG_FILES([dlls/qmgrprxy/Makefile]) AC_CONFIG_FILES([dlls/quartz/Makefile]) diff --git a/dlls/Makefile.in b/dlls/Makefile.in index 4be9323..643ab54 100644 --- a/dlls/Makefile.in +++ b/dlls/Makefile.in @@ -326,6 +326,7 @@ TESTSUBDIRS = \ opengl32/tests \ pdh/tests \ psapi/tests \ + qedit/tests \ quartz/tests \ riched20/tests \ riched32/tests \ diff --git a/dlls/qedit/tests/Makefile.in b/dlls/qedit/tests/Makefile.in new file mode 100644 index 0000000..5236975 --- /dev/null +++ b/dlls/qedit/tests/Makefile.in @@ -0,0 +1,14 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +TESTDLL = qedit.dll +IMPORTS = ole32 kernel32 +EXTRALIBS = -lstrmiids -luuid + +CTESTS = \ + mediadet.c + +(a)MAKE_TEST_RULES@ + +(a)DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/qedit/tests/mediadet.c b/dlls/qedit/tests/mediadet.c new file mode 100644 index 0000000..35a569e --- /dev/null +++ b/dlls/qedit/tests/mediadet.c @@ -0,0 +1,45 @@ +/* + * Unit tests for Media Detector + * + * Copyright (C) 2008 Google (Lei Zhang) + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <assert.h> + +#define COBJMACROS + +#include "wine/test.h" +#include "qedit.h" + +static void test_mediadet(void) +{ + HRESULT hr; + IMediaDet *pM = NULL; + + hr = CoCreateInstance(&CLSID_MediaDet, NULL, CLSCTX_INPROC_SERVER, + &IID_IMediaDet, (LPVOID*)&pM); + todo_wine { + ok(hr == S_OK, "CoCreateInstance failed with %x\n", hr); + ok(pM != NULL, "pM is NULL\n"); + } +} + +START_TEST(mediadet) +{ + CoInitialize(NULL); + test_mediadet(); +} diff --git a/programs/winetest/Makefile.in b/programs/winetest/Makefile.in index 02448ab..c3f6715 100644 --- a/programs/winetest/Makefile.in +++ b/programs/winetest/Makefile.in @@ -70,6 +70,7 @@ TESTBINS = \ opengl32_test.exe \ pdh_test.exe \ psapi_test.exe \ + qedit_test.exe \ quartz_test.exe \ riched20_test.exe \ riched32_test.exe \ @@ -196,6 +197,8 @@ pdh_test.exe: $(DLLDIR)/pdh/tests/pdh_test.exe$(DLLEXT) cp $(DLLDIR)/pdh/tests/pdh_test.exe$(DLLEXT) $@ && $(STRIP) $@ psapi_test.exe: $(DLLDIR)/psapi/tests/psapi_test.exe$(DLLEXT) cp $(DLLDIR)/psapi/tests/psapi_test.exe$(DLLEXT) $@ && $(STRIP) $@ +qedit_test.exe: $(DLLDIR)/qedit/tests/qedit_test.exe$(DLLEXT) + cp $(DLLDIR)/qedit/tests/qedit_test.exe$(DLLEXT) $@ && $(STRIP) $@ quartz_test.exe: $(DLLDIR)/quartz/tests/quartz_test.exe$(DLLEXT) cp $(DLLDIR)/quartz/tests/quartz_test.exe$(DLLEXT) $@ && $(STRIP) $@ riched20_test.exe: $(DLLDIR)/riched20/tests/riched20_test.exe$(DLLEXT) diff --git a/programs/winetest/winetest.rc b/programs/winetest/winetest.rc index 7f155d8..0bcb214 100644 --- a/programs/winetest/winetest.rc +++ b/programs/winetest/winetest.rc @@ -128,6 +128,7 @@ oleaut32_test.exe TESTRES "oleaut32_test.exe" opengl32_test.exe TESTRES "opengl32_test.exe" pdh_test.exe TESTRES "pdh_test.exe" psapi_test.exe TESTRES "psapi_test.exe" +qedit_test.exe TESTRES "qedit_test.exe" quartz_test.exe TESTRES "quartz_test.exe" riched20_test.exe TESTRES "riched20_test.exe" riched32_test.exe TESTRES "riched32_test.exe"

1 0

Lei Zhang : qedit: Add MediaDet registration.
by Alexandre Julliard Feb. 19, 2008

Feb. 19, 2008

Module: wine Branch: master Commit: f4f7a5c5c952de127c8cc367dfe45fafbe922175 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4f7a5c5c952de127c8cc367d… Author: Lei Zhang <thestig(a)google.com> Date: Wed Feb 13 14:10:12 2008 -0800 qedit: Add MediaDet registration. Much of the code is from quartz. --- dlls/qedit/Makefile.in | 2 +- dlls/qedit/qedit_private.h | 1 + dlls/qedit/regsvr.c | 284 +++++++++++++++++++++++++++++++++++++++++++- tools/wine.inf | 1 + 4 files changed, 284 insertions(+), 4 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f4f7a5c5c952de127c8cc…

1 0

Lei Zhang : include: Add IMediaDet interface and MediaDet class.
by Alexandre Julliard Feb. 19, 2008

Feb. 19, 2008

Module: wine Branch: master Commit: 6e2ce6982968a65464aa216a2ba5818781331fd4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e2ce6982968a65464aa216a2… Author: Lei Zhang <thestig(a)google.com> Date: Wed Feb 13 00:49:37 2008 -0800 include: Add IMediaDet interface and MediaDet class. --- include/qedit.idl | 87 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 87 insertions(+), 0 deletions(-) diff --git a/include/qedit.idl b/include/qedit.idl index c4219af..48764c1 100644 --- a/include/qedit.idl +++ b/include/qedit.idl @@ -79,3 +79,90 @@ interface ISampleGrabber: IUnknown long WhichMethodToCallback ); }; + +[ + object, + uuid(65bd0710-24d2-4FF7-9324-ed2e5d3abafa), + pointer_default(unique) +] +interface IMediaDet : IUnknown +{ + HRESULT get_Filter( + [out] IUnknown* *pVal + ); + + HRESULT put_Filter( + IUnknown* newVal + ); + + HRESULT get_OutputStreams( + [out] long *pVal + ); + + HRESULT get_CurrentStream( + [out] long *pVal + ); + + HRESULT put_CurrentStream( + long newVal + ); + + HRESULT get_StreamType( + [out] GUID *pVal + ); + + HRESULT get_StreamTypeB( + [out] BSTR *pVal + ); + + HRESULT get_StreamLength( + [out] double *pVal + ); + + HRESULT get_Filename( + [out] BSTR *pVal + ); + + HRESULT put_Filename( + BSTR newVal + ); + + HRESULT GetBitmapBits( + double StreamTime, + long * pBufferSize, + char * pBuffer, + long Width, + long Height + ); + + HRESULT WriteBitmapBits( + double StreamTime, + long Width, + long Height, + BSTR Filename + ); + + HRESULT get_StreamMediaType( + [out] AM_MEDIA_TYPE * pVal + ); + + HRESULT GetSampleGrabber( + [out] ISampleGrabber ** ppVal + ); + + HRESULT get_FrameRate( + [out] double *pVal + ); + + HRESULT EnterBitmapGrabMode( + double SeekTime + ); +}; + +[ + uuid(65BD0711-24D2-4ff7-9324-ED2E5D3ABAFA), +] +coclass MediaDet +{ + [default] interface IMediaDet; +};

1 0

Lei Zhang : include: Add ISampleGrabber interface.
by Alexandre Julliard Feb. 19, 2008

Feb. 19, 2008

Module: wine Branch: master Commit: 121e8ebbbe9ad5e408f5ee39711b419f67713d72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=121e8ebbbe9ad5e408f5ee397… Author: Lei Zhang <thestig(a)google.com> Date: Wed Feb 13 13:10:23 2008 -0800 include: Add ISampleGrabber interface. --- include/qedit.idl | 39 +++++++++++++++++++++++++++++++++++++++ 1 files changed, 39 insertions(+), 0 deletions(-) diff --git a/include/qedit.idl b/include/qedit.idl index 886e46f..c4219af 100644 --- a/include/qedit.idl +++ b/include/qedit.idl @@ -40,3 +40,42 @@ interface ISampleGrabberCB : IUnknown long BufferLen ); } + +[ + object, + uuid(6B652FFF-11FE-4fce-92AD-0266B5D7C78F), + local, + pointer_default(unique) +] +interface ISampleGrabber: IUnknown +{ + HRESULT SetOneShot( + BOOL OneShot + ); + + HRESULT SetMediaType( + const AM_MEDIA_TYPE * pType + ); + + HRESULT GetConnectedMediaType( + AM_MEDIA_TYPE * pType + ); + + HRESULT SetBufferSamples( + BOOL BufferThem + ); + + HRESULT GetCurrentBuffer( + [in,out] long * pBufferSize, + [out] long * pBuffer + ); + + HRESULT GetCurrentSample( + [out] IMediaSample ** ppSample + ); + + HRESULT SetCallback( + ISampleGrabberCB * pCallback, + long WhichMethodToCallback + ); +};

1 0

Lei Zhang : qedit: Skeleton implementation of qedit.dll.
by Alexandre Julliard Feb. 19, 2008

Feb. 19, 2008

Module: wine Branch: master Commit: 6de8be71b3b849ab2c510829977ee7f6c33d359c URL: http://source.winehq.org/git/wine.git/?a=commit;h=6de8be71b3b849ab2c5108299… Author: Lei Zhang <thestig(a)google.com> Date: Mon Feb 11 18:07:45 2008 -0800 qedit: Skeleton implementation of qedit.dll. --- Makefile.in | 2 + configure | 3 ++ configure.ac | 1 + dlls/Makefile.in | 1 + dlls/qedit/Makefile.in | 15 ++++++++++ dlls/qedit/main.c | 65 ++++++++++++++++++++++++++++++++++++++++++++ dlls/qedit/qedit.spec | 4 +++ dlls/qedit/qedit_private.h | 37 +++++++++++++++++++++++++ dlls/qedit/regsvr.c | 46 +++++++++++++++++++++++++++++++ 9 files changed, 174 insertions(+), 0 deletions(-) diff --git a/Makefile.in b/Makefile.in index 509162d..b6efebe 100644 --- a/Makefile.in +++ b/Makefile.in @@ -380,6 +380,7 @@ ALL_MAKEFILES = \ dlls/psapi/tests/Makefile \ dlls/pstorec/Makefile \ dlls/qcap/Makefile \ + dlls/qedit/Makefile \ dlls/qmgr/Makefile \ dlls/qmgrprxy/Makefile \ dlls/quartz/Makefile \ @@ -791,6 +792,7 @@ dlls/psapi/Makefile: dlls/psapi/Makefile.in dlls/Makedll.rules dlls/psapi/tests/Makefile: dlls/psapi/tests/Makefile.in dlls/Maketest.rules dlls/pstorec/Makefile: dlls/pstorec/Makefile.in dlls/Makedll.rules dlls/qcap/Makefile: dlls/qcap/Makefile.in dlls/Makedll.rules +dlls/qedit/Makefile: dlls/qedit/Makefile.in dlls/Makedll.rules dlls/qmgr/Makefile: dlls/qmgr/Makefile.in dlls/Makedll.rules dlls/qmgrprxy/Makefile: dlls/qmgrprxy/Makefile.in dlls/Makedll.rules dlls/quartz/Makefile: dlls/quartz/Makefile.in dlls/Makedll.rules diff --git a/configure b/configure index abf1a71..9ae32d3 100755 --- a/configure +++ b/configure @@ -21611,6 +21611,8 @@ ac_config_files="$ac_config_files dlls/pstorec/Makefile" ac_config_files="$ac_config_files dlls/qcap/Makefile" +ac_config_files="$ac_config_files dlls/qedit/Makefile" + ac_config_files="$ac_config_files dlls/qmgr/Makefile" ac_config_files="$ac_config_files dlls/qmgrprxy/Makefile" @@ -22747,6 +22749,7 @@ do "dlls/psapi/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/psapi/tests/Makefile" ;; "dlls/pstorec/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/pstorec/Makefile" ;; "dlls/qcap/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/qcap/Makefile" ;; + "dlls/qedit/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/qedit/Makefile" ;; "dlls/qmgr/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/qmgr/Makefile" ;; "dlls/qmgrprxy/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/qmgrprxy/Makefile" ;; "dlls/quartz/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/quartz/Makefile" ;; diff --git a/configure.ac b/configure.ac index d3e5ddc..e2ba38e 100644 --- a/configure.ac +++ b/configure.ac @@ -1879,6 +1879,7 @@ AC_CONFIG_FILES([dlls/psapi/Makefile]) AC_CONFIG_FILES([dlls/psapi/tests/Makefile]) AC_CONFIG_FILES([dlls/pstorec/Makefile]) AC_CONFIG_FILES([dlls/qcap/Makefile]) +AC_CONFIG_FILES([dlls/qedit/Makefile]) AC_CONFIG_FILES([dlls/qmgr/Makefile]) AC_CONFIG_FILES([dlls/qmgrprxy/Makefile]) AC_CONFIG_FILES([dlls/quartz/Makefile]) diff --git a/dlls/Makefile.in b/dlls/Makefile.in index 7b0741e..4be9323 100644 --- a/dlls/Makefile.in +++ b/dlls/Makefile.in @@ -184,6 +184,7 @@ BASEDIRS = \ psapi \ pstorec \ qcap \ + qedit \ qmgr \ qmgrprxy \ quartz \ diff --git a/dlls/qedit/Makefile.in b/dlls/qedit/Makefile.in new file mode 100644 index 0000000..146a05e --- /dev/null +++ b/dlls/qedit/Makefile.in @@ -0,0 +1,15 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = qedit.dll +IMPORTS = kernel32 +EXTRALIBS = + +C_SRCS = \ + main.c \ + regsvr.c + +(a)MAKE_DLL_RULES@ + +(a)DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/qedit/main.c b/dlls/qedit/main.c new file mode 100644 index 0000000..d6e792c --- /dev/null +++ b/dlls/qedit/main.c @@ -0,0 +1,65 @@ +/* DirectShow Editing Services (qedit.dll) + * + * Copyright 2008 Google (Lei Zhang) + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "qedit_private.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(qedit); + +BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) +{ + switch(fdwReason) { + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hInstDLL); + break; + case DLL_PROCESS_DETACH: + break; + } + return TRUE; +} + +/*********************************************************************** + * DllCanUnloadNow (QEDIT.@) + */ +HRESULT WINAPI DllCanUnloadNow(void) +{ + return S_OK; +} + +/******************************************************************************* + * DllGetClassObject [QEDIT.@] + * Retrieves class object from a DLL object + * + * PARAMS + * rclsid [I] CLSID for the class object + * riid [I] Reference to identifier of interface for class object + * ppv [O] Address of variable to receive interface pointer for riid + * + * RETURNS + * Success: S_OK + * Failure: CLASS_E_CLASSNOTAVAILABLE, E_OUTOFMEMORY, E_INVALIDARG, + * E_UNEXPECTED, E_NOINTERFACE + */ + +HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) +{ + TRACE("(%s,%s,%p)\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); + + return E_NOINTERFACE; +} diff --git a/dlls/qedit/qedit.spec b/dlls/qedit/qedit.spec new file mode 100644 index 0000000..b16365d --- /dev/null +++ b/dlls/qedit/qedit.spec @@ -0,0 +1,4 @@ +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() diff --git a/dlls/qedit/qedit_private.h b/dlls/qedit/qedit_private.h new file mode 100644 index 0000000..661e5d9 --- /dev/null +++ b/dlls/qedit/qedit_private.h @@ -0,0 +1,37 @@ +/* DirectShow Editing Services (qedit.dll) + * + * Copyright 2008 Google (Lei Zhang) + * + * This file contains the (internal) driver registration functions, + * driver enumeration APIs and DirectDraw creation functions. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __QEDIT_PRIVATE_INCLUDED__ +#define __QEDIT_PRIVATE_INCLUDED__ + +#include <stdarg.h> + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "wtypes.h" +#include "wingdi.h" +#include "winuser.h" +#include "dshow.h" + +#endif /* __QEDIT_PRIVATE_INCLUDED__ */ diff --git a/dlls/qedit/regsvr.c b/dlls/qedit/regsvr.c new file mode 100644 index 0000000..e49ab93 --- /dev/null +++ b/dlls/qedit/regsvr.c @@ -0,0 +1,46 @@ +/* + * self-registerable dll functions for qedit.dll + * + * Copyright (C) 2008 Google (Lei Zhang) + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#include "winerror.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(qedit); + +/*********************************************************************** + * DllRegisterServer (QEDIT.@) + */ +HRESULT WINAPI DllRegisterServer(void) +{ + TRACE("\n"); + + return S_OK; +} + +/*********************************************************************** + * DllUnregisterServer (QEDIT.@) + */ +HRESULT WINAPI DllUnregisterServer(void) +{ + TRACE("\n"); + + return S_OK; +}

1 0

Lei Zhang : qedit: Add the DirectShow ClassFactory.
by Alexandre Julliard Feb. 19, 2008

Feb. 19, 2008

Module: wine Branch: master Commit: 080c0812bc310203d1885328758a53427b7063b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=080c0812bc310203d18853287… Author: Lei Zhang <thestig(a)google.com> Date: Mon Feb 11 18:18:06 2008 -0800 qedit: Add the DirectShow ClassFactory. --- dlls/qedit/Makefile.in | 4 +- dlls/qedit/main.c | 120 +++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 121 insertions(+), 3 deletions(-) diff --git a/dlls/qedit/Makefile.in b/dlls/qedit/Makefile.in index 146a05e..1cac045 100644 --- a/dlls/qedit/Makefile.in +++ b/dlls/qedit/Makefile.in @@ -3,8 +3,8 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = qedit.dll -IMPORTS = kernel32 -EXTRALIBS = +IMPORTS = ole32 kernel32 +EXTRALIBS = -lstrmiids -luuid C_SRCS = \ main.c \ diff --git a/dlls/qedit/main.c b/dlls/qedit/main.c index d6e792c..1ece4ee 100644 --- a/dlls/qedit/main.c +++ b/dlls/qedit/main.c @@ -34,6 +34,96 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) return TRUE; } +/****************************************************************************** + * DirectShow ClassFactory + */ +typedef struct { + IClassFactory ITF_IClassFactory; + + LONG ref; + HRESULT (*pfnCreateInstance)(IUnknown *pUnkOuter, LPVOID *ppObj); +} IClassFactoryImpl; + +struct object_creation_info +{ + const CLSID *clsid; + HRESULT (*pfnCreateInstance)(IUnknown *pUnkOuter, LPVOID *ppObj); +}; + +static const struct object_creation_info object_creation[] = +{ +}; + +static HRESULT WINAPI +DSCF_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj) +{ + IClassFactoryImpl *This = (IClassFactoryImpl *)iface; + + if (IsEqualGUID(riid, &IID_IUnknown) + || IsEqualGUID(riid, &IID_IClassFactory)) + { + IClassFactory_AddRef(iface); + *ppobj = This; + return S_OK; + } + + *ppobj = NULL; + WARN("(%p)->(%s,%p),not found\n",This,debugstr_guid(riid),ppobj); + return E_NOINTERFACE; +} + +static ULONG WINAPI DSCF_AddRef(LPCLASSFACTORY iface) +{ + IClassFactoryImpl *This = (IClassFactoryImpl *)iface; + return InterlockedIncrement(&This->ref); +} + +static ULONG WINAPI DSCF_Release(LPCLASSFACTORY iface) +{ + IClassFactoryImpl *This = (IClassFactoryImpl *)iface; + + ULONG ref = InterlockedDecrement(&This->ref); + + if (ref == 0) + CoTaskMemFree(This); + + return ref; +} + +static HRESULT WINAPI DSCF_CreateInstance(LPCLASSFACTORY iface, LPUNKNOWN pOuter, REFIID riid, LPVOID *ppobj) +{ + IClassFactoryImpl *This = (IClassFactoryImpl *)iface; + HRESULT hres; + LPUNKNOWN punk; + + TRACE("(%p)->(%p,%s,%p)\n",This,pOuter,debugstr_guid(riid),ppobj); + + *ppobj = NULL; + hres = This->pfnCreateInstance(pOuter, (LPVOID *) &punk); + if (SUCCEEDED(hres)) { + hres = IUnknown_QueryInterface(punk, riid, ppobj); + IUnknown_Release(punk); + } + return hres; +} + +static HRESULT WINAPI DSCF_LockServer(LPCLASSFACTORY iface, BOOL dolock) +{ + IClassFactoryImpl *This = (IClassFactoryImpl *)iface; + FIXME("(%p)->(%d),stub!\n",This,dolock); + return S_OK; +} + +static const IClassFactoryVtbl DSCF_Vtbl = +{ + DSCF_QueryInterface, + DSCF_AddRef, + DSCF_Release, + DSCF_CreateInstance, + DSCF_LockServer +}; + + /*********************************************************************** * DllCanUnloadNow (QEDIT.@) */ @@ -59,7 +149,35 @@ HRESULT WINAPI DllCanUnloadNow(void) HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) { + unsigned int i; + IClassFactoryImpl *factory; + TRACE("(%s,%s,%p)\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); - return E_NOINTERFACE; + if ( !IsEqualGUID( &IID_IClassFactory, riid ) + && ! IsEqualGUID( &IID_IUnknown, riid) ) + return E_NOINTERFACE; + + for (i=0; i < sizeof(object_creation)/sizeof(object_creation[0]); i++) + { + if (IsEqualGUID(object_creation[i].clsid, rclsid)) + break; + } + + if (i == sizeof(object_creation)/sizeof(object_creation[0])) + { + FIXME("%s: no class found.\n", debugstr_guid(rclsid)); + return CLASS_E_CLASSNOTAVAILABLE; + } + + factory = CoTaskMemAlloc(sizeof(*factory)); + if (factory == NULL) return E_OUTOFMEMORY; + + factory->ITF_IClassFactory.lpVtbl = &DSCF_Vtbl; + factory->ref = 1; + + factory->pfnCreateInstance = object_creation[i].pfnCreateInstance; + + *ppv = &(factory->ITF_IClassFactory); + return S_OK; }

1 0

Alexandre Julliard : server: Don' t access the process after send_client_fd as it may have been killed.
by Alexandre Julliard Feb. 19, 2008

Feb. 19, 2008

Module: wine Branch: master Commit: a319263230f9fbce698be51af90291ccaee3b441 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a319263230f9fbce698be51af… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 19 16:51:16 2008 +0100 server: Don't access the process after send_client_fd as it may have been killed. --- server/fd.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/server/fd.c b/server/fd.c index c7f20d5..41e404c 100644 --- a/server/fd.c +++ b/server/fd.c @@ -1979,11 +1979,11 @@ DECL_HANDLER(get_handle_fd) int unix_fd = get_unix_fd( fd ); if (unix_fd != -1) { - send_client_fd( current->process, unix_fd, req->handle ); reply->type = fd->fd_ops->get_fd_type( fd ); reply->removable = is_fd_removable(fd); reply->options = fd->options; reply->access = get_handle_access( current->process, req->handle ); + send_client_fd( current->process, unix_fd, req->handle ); } release_object( fd ); }

1 0

Lei Zhang : include: Generate qedit.h, add ISampleGrabberCB interface.
by Alexandre Julliard Feb. 19, 2008

Feb. 19, 2008

Module: wine Branch: master Commit: 3a69b83f1eedb72d3851c151014a80863fffb317 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a69b83f1eedb72d3851c1510… Author: Lei Zhang <thestig(a)google.com> Date: Wed Feb 13 12:59:43 2008 -0800 include: Generate qedit.h, add ISampleGrabberCB interface. --- .gitignore | 1 + dlls/strmiids/strmiids.c | 1 + include/Makefile.in | 1 + include/qedit.idl | 42 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 45 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index b28cdb6..d4b76bb 100644 --- a/.gitignore +++ b/.gitignore @@ -626,6 +626,7 @@ include/oleidl.h include/optary.h include/propidl.h include/pstore.h +include/qedit.h include/richole.h include/sensevts.h include/servprov.h diff --git a/dlls/strmiids/strmiids.c b/dlls/strmiids/strmiids.c index 579bc74..b060ec4 100644 --- a/dlls/strmiids/strmiids.c +++ b/dlls/strmiids/strmiids.c @@ -35,3 +35,4 @@ #include "strmif.h" #include "control.h" #include "amstream.h" +#include "qedit.h" diff --git a/include/Makefile.in b/include/Makefile.in index 7562ebe..d3731a5 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -51,6 +51,7 @@ IDL_H_SRCS = \ optary.idl \ propidl.idl \ pstore.idl \ + qedit.idl \ richole.idl \ sensevts.idl \ servprov.idl \ diff --git a/include/qedit.idl b/include/qedit.idl new file mode 100644 index 0000000..886e46f --- /dev/null +++ b/include/qedit.idl @@ -0,0 +1,42 @@ +/* + * Copyright (C) 2008 Google (Lei Zhang) + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +import "oaidl.idl"; +import "ocidl.idl"; +/* import "dxtrans.idl"; */ +import "amstream.idl"; +import "msxml.idl"; + +[ + object, + uuid(0579154A-2B53-4994-B0D0-E773148EFF85), + local, + pointer_default(unique) +] +interface ISampleGrabberCB : IUnknown +{ + HRESULT SampleCB( + double SampleTime, + IMediaSample * pSample + ); + HRESULT BufferCB( + double SampleTime, + BYTE * pBuffer, + long BufferLen + ); +}

1 0