April 2008 - Wine-commits - list.winehq.org

Lei Zhang : gdiplus: Add a stub for GdipSetCustomLineCapWidthScale.
by Alexandre Julliard 10 Apr '08

10 Apr '08

Module: wine Branch: master Commit: a1394d4d482c8f286b273f76d7617f1a4343edda URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1394d4d482c8f286b273f76d… Author: Lei Zhang <thestig(a)google.com> Date: Wed Apr 9 12:51:08 2008 -0700 gdiplus: Add a stub for GdipSetCustomLineCapWidthScale. --- dlls/gdiplus/customlinecap.c | 11 +++++++++++ dlls/gdiplus/gdiplus.spec | 2 +- 2 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/customlinecap.c b/dlls/gdiplus/customlinecap.c index ce44243..54005a8 100644 --- a/dlls/gdiplus/customlinecap.c +++ b/dlls/gdiplus/customlinecap.c @@ -173,3 +173,14 @@ GpStatus WINGDIPAPI GdipSetCustomLineCapStrokeJoin(GpCustomLineCap* custom, return NotImplemented; } + +GpStatus WINGDIPAPI GdipSetCustomLineCapWidthScale(GpCustomLineCap* custom, + REAL width) +{ + static int calls; + + if(!(calls++)) + FIXME("not implemented\n"); + + return NotImplemented; +} diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index f191aeb..bc52d6f 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -518,7 +518,7 @@ @ stdcall GdipSetCustomLineCapBaseInset(ptr long) @ stdcall GdipSetCustomLineCapStrokeCaps(ptr long long) @ stdcall GdipSetCustomLineCapStrokeJoin(ptr long) -@ stub GdipSetCustomLineCapWidthScale +@ stdcall GdipSetCustomLineCapWidthScale(ptr long) @ stub GdipSetEffectParameters @ stub GdipSetEmpty @ stub GdipSetImageAttributesCachedBackground

1 0

Lei Zhang : gdiplus: Add a stub for GdipSetEmpty.
by Alexandre Julliard 10 Apr '08

10 Apr '08

Module: wine Branch: master Commit: 5d7e2254f6a9bc3a844ada910995fa58728c5bf4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d7e2254f6a9bc3a844ada910… Author: Lei Zhang <thestig(a)google.com> Date: Wed Apr 9 13:09:34 2008 -0700 gdiplus: Add a stub for GdipSetEmpty. --- dlls/gdiplus/Makefile.in | 1 + dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/region.c | 41 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 43 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/Makefile.in b/dlls/gdiplus/Makefile.in index f71aaab..f1e9e92 100644 --- a/dlls/gdiplus/Makefile.in +++ b/dlls/gdiplus/Makefile.in @@ -19,6 +19,7 @@ C_SRCS = \ matrix.c \ pathiterator.c \ pen.c \ + region.c \ stringformat.c @MAKE_DLL_RULES@ diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 810a565..865eb78 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -520,7 +520,7 @@ @ stdcall GdipSetCustomLineCapStrokeJoin(ptr long) @ stdcall GdipSetCustomLineCapWidthScale(ptr long) @ stdcall GdipSetEffectParameters(ptr ptr long) -@ stub GdipSetEmpty +@ stdcall GdipSetEmpty(ptr) @ stub GdipSetImageAttributesCachedBackground @ stdcall GdipSetImageAttributesColorKeys(ptr long long long long) @ stdcall GdipSetImageAttributesColorMatrix(ptr long long ptr ptr long) diff --git a/dlls/gdiplus/region.c b/dlls/gdiplus/region.c new file mode 100644 index 0000000..9656f4e --- /dev/null +++ b/dlls/gdiplus/region.c @@ -0,0 +1,41 @@ +/* + * 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 "windef.h" +#include "winbase.h" +#include "wingdi.h" + +#include "objbase.h" + +#include "gdiplus.h" +#include "gdiplus_private.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(gdiplus); + +GpStatus WINGDIPAPI GdipSetEmpty(GpRegion *region) +{ + static int calls; + + if(!(calls++)) + FIXME("not implemented\n"); + + return NotImplemented; +}

1 0

Lei Zhang : gdiplus: Add a stub for GdipSetEffectParameters.
by Alexandre Julliard 10 Apr '08

10 Apr '08

Module: wine Branch: master Commit: 20a8cf641712289dfb96cc9cccfa5b06f1b8d970 URL: http://source.winehq.org/git/wine.git/?a=commit;h=20a8cf641712289dfb96cc9cc… Author: Lei Zhang <thestig(a)google.com> Date: Wed Apr 9 13:00:16 2008 -0700 gdiplus: Add a stub for GdipSetEffectParameters. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/image.c | 11 +++++++++++ include/gdiplusgpstubs.h | 2 ++ 3 files changed, 14 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index bc52d6f..810a565 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -519,7 +519,7 @@ @ stdcall GdipSetCustomLineCapStrokeCaps(ptr long long) @ stdcall GdipSetCustomLineCapStrokeJoin(ptr long) @ stdcall GdipSetCustomLineCapWidthScale(ptr long) -@ stub GdipSetEffectParameters +@ stdcall GdipSetEffectParameters(ptr ptr long) @ stub GdipSetEmpty @ stub GdipSetImageAttributesCachedBackground @ stdcall GdipSetImageAttributesColorKeys(ptr long long long long) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index b1ec2c7..3de6ff0 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -1096,3 +1096,14 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromHBITMAP(HBITMAP hbm, HPALETTE hpal, GpBi return retval; } + +GpStatus WINGDIPAPI GdipSetEffectParameters(CGpEffect *effect, + const VOID *params, const UINT size) +{ + static int calls; + + if(!(calls++)) + FIXME("not implemented\n"); + + return NotImplemented; +} diff --git a/include/gdiplusgpstubs.h b/include/gdiplusgpstubs.h index cba15e4..d7d8702 100644 --- a/include/gdiplusgpstubs.h +++ b/include/gdiplusgpstubs.h @@ -39,6 +39,7 @@ class GpTexture : public GpBrush {}; class GpFont {}; class GpStringFormat {}; class GpRegion {}; +class CGpEffect {}; #else /* end of c++ declarations */ @@ -60,6 +61,7 @@ typedef struct GpTexture GpTexture; typedef struct GpFont GpFont; typedef struct GpStringFormat GpStringFormat; typedef struct GpRegion GpRegion; +typedef struct CGpEffect CGpEffect; #endif /* end of c declarations */

1 0

Lei Zhang : gdiplus: Add a stub for GdipSetImageAttributesCachedBackground.
by Alexandre Julliard 10 Apr '08

10 Apr '08

Module: wine Branch: master Commit: 2b2db98cb6839b0baddf092ce0dd15409ec9fead URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b2db98cb6839b0baddf092ce… Author: Lei Zhang <thestig(a)google.com> Date: Wed Apr 9 13:09:58 2008 -0700 gdiplus: Add a stub for GdipSetImageAttributesCachedBackground. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/imageattributes.c | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 865eb78..0c2ae87 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -521,7 +521,7 @@ @ stdcall GdipSetCustomLineCapWidthScale(ptr long) @ stdcall GdipSetEffectParameters(ptr ptr long) @ stdcall GdipSetEmpty(ptr) -@ stub GdipSetImageAttributesCachedBackground +@ stdcall GdipSetImageAttributesCachedBackground(ptr long) @ stdcall GdipSetImageAttributesColorKeys(ptr long long long long) @ stdcall GdipSetImageAttributesColorMatrix(ptr long long ptr ptr long) @ stub GdipSetImageAttributesGamma diff --git a/dlls/gdiplus/imageattributes.c b/dlls/gdiplus/imageattributes.c index ac6caa5..4b08151 100644 --- a/dlls/gdiplus/imageattributes.c +++ b/dlls/gdiplus/imageattributes.c @@ -90,3 +90,14 @@ GpStatus WINGDIPAPI GdipSetImageAttributesWrapMode(GpImageAttributes *imageAttr, return NotImplemented; } + +GpStatus WINGDIPAPI GdipSetImageAttributesCachedBackground(GpImageAttributes *imageAttr, + BOOL enableFlag) +{ + static int calls; + + if(!(calls++)) + FIXME("not implemented\n"); + + return NotImplemented; +}

1 0

Lei Zhang : gdiplus: Add a stub for GdipSetImageAttributesGamma.
by Alexandre Julliard 10 Apr '08

10 Apr '08

Module: wine Branch: master Commit: 7b403d6b4680ba2d958eef5a0f2913e14ee64b43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b403d6b4680ba2d958eef5a0… Author: Lei Zhang <thestig(a)google.com> Date: Wed Apr 9 13:14:45 2008 -0700 gdiplus: Add a stub for GdipSetImageAttributesGamma. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/imageattributes.c | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 0c2ae87..1c4b727 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -524,7 +524,7 @@ @ stdcall GdipSetImageAttributesCachedBackground(ptr long) @ stdcall GdipSetImageAttributesColorKeys(ptr long long long long) @ stdcall GdipSetImageAttributesColorMatrix(ptr long long ptr ptr long) -@ stub GdipSetImageAttributesGamma +@ stdcall GdipSetImageAttributesGamma(ptr long long long) @ stub GdipSetImageAttributesNoOp @ stub GdipSetImageAttributesOutputChannel @ stub GdipSetImageAttributesOutputChannelColorProfile diff --git a/dlls/gdiplus/imageattributes.c b/dlls/gdiplus/imageattributes.c index 4b08151..ab47d1d 100644 --- a/dlls/gdiplus/imageattributes.c +++ b/dlls/gdiplus/imageattributes.c @@ -101,3 +101,14 @@ GpStatus WINGDIPAPI GdipSetImageAttributesCachedBackground(GpImageAttributes *im return NotImplemented; } + +GpStatus WINGDIPAPI GdipSetImageAttributesGamma(GpImageAttributes *imageAttr, + ColorAdjustType type, BOOL enableFlag, REAL gamma) +{ + static int calls; + + if(!(calls++)) + FIXME("not implemented\n"); + + return NotImplemented; +}

1 0

Lei Zhang : gdiplus: Add a stub for GdipSetImageAttributesNoOp.
by Alexandre Julliard 10 Apr '08

10 Apr '08

Module: wine Branch: master Commit: 68f5cdb28e21d20dad925737485a163833960761 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68f5cdb28e21d20dad9257374… Author: Lei Zhang <thestig(a)google.com> Date: Wed Apr 9 13:16:32 2008 -0700 gdiplus: Add a stub for GdipSetImageAttributesNoOp. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/imageattributes.c | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 1c4b727..b9d4c59 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -525,7 +525,7 @@ @ stdcall GdipSetImageAttributesColorKeys(ptr long long long long) @ stdcall GdipSetImageAttributesColorMatrix(ptr long long ptr ptr long) @ stdcall GdipSetImageAttributesGamma(ptr long long long) -@ stub GdipSetImageAttributesNoOp +@ stdcall GdipSetImageAttributesNoOp(ptr long long) @ stub GdipSetImageAttributesOutputChannel @ stub GdipSetImageAttributesOutputChannelColorProfile @ stub GdipSetImageAttributesRemapTable diff --git a/dlls/gdiplus/imageattributes.c b/dlls/gdiplus/imageattributes.c index ab47d1d..5562c91 100644 --- a/dlls/gdiplus/imageattributes.c +++ b/dlls/gdiplus/imageattributes.c @@ -112,3 +112,14 @@ GpStatus WINGDIPAPI GdipSetImageAttributesGamma(GpImageAttributes *imageAttr, return NotImplemented; } + +GpStatus WINGDIPAPI GdipSetImageAttributesNoOp(GpImageAttributes *imageAttr, + ColorAdjustType type, BOOL enableFlag) +{ + static int calls; + + if(!(calls++)) + FIXME("not implemented\n"); + + return NotImplemented; +}

1 0

Lei Zhang : gdiplus: Add a stub for GdipSetCustomLineCapBaseCap.
by Alexandre Julliard 10 Apr '08

10 Apr '08

Module: wine Branch: master Commit: 39e9bdbd2a1d4a5c99f0c6c246a8c60e198d0391 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39e9bdbd2a1d4a5c99f0c6c24… Author: Lei Zhang <thestig(a)google.com> Date: Wed Apr 9 12:42:12 2008 -0700 gdiplus: Add a stub for GdipSetCustomLineCapBaseCap. --- dlls/gdiplus/customlinecap.c | 11 +++++++++++ dlls/gdiplus/gdiplus.spec | 2 +- 2 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/customlinecap.c b/dlls/gdiplus/customlinecap.c index e161e1b..75dcd99 100644 --- a/dlls/gdiplus/customlinecap.c +++ b/dlls/gdiplus/customlinecap.c @@ -129,3 +129,14 @@ GpStatus WINGDIPAPI GdipSetCustomLineCapStrokeCaps(GpCustomLineCap* custom, return NotImplemented; } + +GpStatus WINGDIPAPI GdipSetCustomLineCapBaseCap(GpCustomLineCap* custom, + GpLineCap base) +{ + static int calls; + + if(!(calls++)) + FIXME("not implemented\n"); + + return NotImplemented; +} diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index f6024cd..bb6dfee 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -514,7 +514,7 @@ @ stdcall GdipSetClipRegion(ptr ptr long) @ stdcall GdipSetCompositingMode(ptr long) @ stdcall GdipSetCompositingQuality(ptr long) -@ stub GdipSetCustomLineCapBaseCap +@ stdcall GdipSetCustomLineCapBaseCap(ptr long) @ stub GdipSetCustomLineCapBaseInset @ stdcall GdipSetCustomLineCapStrokeCaps(ptr long long) @ stub GdipSetCustomLineCapStrokeJoin

1 0

Lei Zhang : gdiplus: Add a stub for GdipGetCustomLineCapBaseInset.
by Alexandre Julliard 10 Apr '08

10 Apr '08

Module: wine Branch: master Commit: 6112d16bad2cab5f3018af189f556f72bd718f91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6112d16bad2cab5f3018af189… Author: Lei Zhang <thestig(a)google.com> Date: Wed Apr 9 12:46:36 2008 -0700 gdiplus: Add a stub for GdipGetCustomLineCapBaseInset. --- dlls/gdiplus/customlinecap.c | 11 +++++++++++ dlls/gdiplus/gdiplus.spec | 2 +- 2 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/customlinecap.c b/dlls/gdiplus/customlinecap.c index 75dcd99..31a3b6b 100644 --- a/dlls/gdiplus/customlinecap.c +++ b/dlls/gdiplus/customlinecap.c @@ -140,3 +140,14 @@ GpStatus WINGDIPAPI GdipSetCustomLineCapBaseCap(GpCustomLineCap* custom, return NotImplemented; } + +GpStatus WINGDIPAPI GdipGetCustomLineCapBaseInset(GpCustomLineCap* custom, + REAL* inset) +{ + static int calls; + + if(!(calls++)) + FIXME("not implemented\n"); + + return NotImplemented; +} diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index bb6dfee..d31c727 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -250,7 +250,7 @@ @ stdcall GdipGetCompositingMode(ptr ptr) @ stdcall GdipGetCompositingQuality(ptr ptr) @ stub GdipGetCustomLineCapBaseCap -@ stub GdipGetCustomLineCapBaseInset +@ stdcall GdipGetCustomLineCapBaseInset(ptr ptr) @ stub GdipGetCustomLineCapStrokeCaps @ stub GdipGetCustomLineCapStrokeJoin @ stub GdipGetCustomLineCapType

1 0

Lei Zhang : gdiplus: Add a stub for GdipSetCustomLineCapBaseInset.
by Alexandre Julliard 10 Apr '08

10 Apr '08

Module: wine Branch: master Commit: af1e221f170c4c5ee6c92083c5e91d92b5f7de51 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af1e221f170c4c5ee6c92083c… Author: Lei Zhang <thestig(a)google.com> Date: Wed Apr 9 12:47:22 2008 -0700 gdiplus: Add a stub for GdipSetCustomLineCapBaseInset. --- dlls/gdiplus/customlinecap.c | 11 +++++++++++ dlls/gdiplus/gdiplus.spec | 2 +- 2 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/customlinecap.c b/dlls/gdiplus/customlinecap.c index 31a3b6b..544f856 100644 --- a/dlls/gdiplus/customlinecap.c +++ b/dlls/gdiplus/customlinecap.c @@ -151,3 +151,14 @@ GpStatus WINGDIPAPI GdipGetCustomLineCapBaseInset(GpCustomLineCap* custom, return NotImplemented; } + +GpStatus WINGDIPAPI GdipSetCustomLineCapBaseInset(GpCustomLineCap* custom, + REAL inset) +{ + static int calls; + + if(!(calls++)) + FIXME("not implemented\n"); + + return NotImplemented; +} diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index d31c727..598c663 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -515,7 +515,7 @@ @ stdcall GdipSetCompositingMode(ptr long) @ stdcall GdipSetCompositingQuality(ptr long) @ stdcall GdipSetCustomLineCapBaseCap(ptr long) -@ stub GdipSetCustomLineCapBaseInset +@ stdcall GdipSetCustomLineCapBaseInset(ptr long) @ stdcall GdipSetCustomLineCapStrokeCaps(ptr long long) @ stub GdipSetCustomLineCapStrokeJoin @ stub GdipSetCustomLineCapWidthScale

1 0

Dan Hipschman : qedit: Implement IMediaDet_get_FrameRate.
by Alexandre Julliard 10 Apr '08

10 Apr '08

Module: wine Branch: master Commit: 953600255210c563e938b3b83277aab058613a7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=953600255210c563e938b3b83… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Wed Apr 9 16:02:02 2008 -0700 qedit: Implement IMediaDet_get_FrameRate. --- dlls/qedit/mediadet.c | 26 +++++++++++++++- dlls/qedit/tests/mediadet.c | 68 +++++++++++++++++++++++------------------- 2 files changed, 61 insertions(+), 33 deletions(-) diff --git a/dlls/qedit/mediadet.c b/dlls/qedit/mediadet.c index 16b2a85..0dab032 100644 --- a/dlls/qedit/mediadet.c +++ b/dlls/qedit/mediadet.c @@ -524,8 +524,30 @@ static HRESULT WINAPI MediaDet_GetSampleGrabber(IMediaDet* iface, static HRESULT WINAPI MediaDet_get_FrameRate(IMediaDet* iface, double *pVal) { MediaDetImpl *This = (MediaDetImpl *)iface; - FIXME("(%p)->(%p): not implemented!\n", This, pVal); - return E_NOTIMPL; + AM_MEDIA_TYPE mt; + VIDEOINFOHEADER *vh; + HRESULT hr; + + TRACE("(%p)\n", This); + + if (!pVal) + return E_POINTER; + + hr = MediaDet_get_StreamMediaType(iface, &mt); + if (FAILED(hr)) + return hr; + + if (!IsEqualGUID(&mt.majortype, &MEDIATYPE_Video)) + { + CoTaskMemFree(mt.pbFormat); + return VFW_E_INVALIDMEDIATYPE; + } + + vh = (VIDEOINFOHEADER *) mt.pbFormat; + *pVal = 1.0e7 / (double) vh->AvgTimePerFrame; + + CoTaskMemFree(mt.pbFormat); + return S_OK; } static HRESULT WINAPI MediaDet_EnterBitmapGrabMode(IMediaDet* iface, diff --git a/dlls/qedit/tests/mediadet.c b/dlls/qedit/tests/mediadet.c index c97ccc2..235133c 100644 --- a/dlls/qedit/tests/mediadet.c +++ b/dlls/qedit/tests/mediadet.c @@ -23,6 +23,7 @@ #define COBJMACROS #include "ole2.h" +#include "vfwmsgs.h" #include "uuids.h" #include "wine/test.h" #include "qedit.h" @@ -95,7 +96,9 @@ static void test_mediadet(void) long nstrms = 0; long strm; AM_MEDIA_TYPE mt; + double fps; int flags; + int i; /* test.avi has one video stream. */ hr = CoCreateInstance(&CLSID_MediaDet, NULL, CLSCTX_INPROC_SERVER, @@ -211,6 +214,13 @@ static void test_mediadet(void) "IMediaDet_get_StreamMediaType\n"); CoTaskMemFree(mt.pbFormat); + hr = IMediaDet_get_FrameRate(pM, NULL); + ok(hr == E_POINTER, "IMediaDet_get_FrameRate\n"); + + hr = IMediaDet_get_FrameRate(pM, &fps); + ok(hr == S_OK, "IMediaDet_get_FrameRate\n"); + ok(fps == 10.0, "IMediaDet_get_FrameRate\n"); + hr = IMediaDet_Release(pM); ok(hr == 0, "IMediaDet_Release returned: %x\n", hr); @@ -242,37 +252,33 @@ static void test_mediadet(void) for both an audio and video stream. */ flags = 0; - hr = IMediaDet_put_CurrentStream(pM, 0); - ok(hr == S_OK, "IMediaDet_put_CurrentStream\n"); - - ZeroMemory(&mt, sizeof mt); - hr = IMediaDet_get_StreamMediaType(pM, &mt); - ok(hr == S_OK, "IMediaDet_get_StreamMediaType\n"); - flags += (IsEqualGUID(&mt.majortype, &MEDIATYPE_Video) - ? 1 - : (IsEqualGUID(&mt.majortype, &MEDIATYPE_Audio) - ? 2 - : 0)); - CoTaskMemFree(mt.pbFormat); - - hr = IMediaDet_put_CurrentStream(pM, 1); - ok(hr == S_OK, "IMediaDet_put_CurrentStream\n"); - - strm = -1; - hr = IMediaDet_get_CurrentStream(pM, &strm); - ok(hr == S_OK, "IMediaDet_get_CurrentStream\n"); - ok(strm == 1, "IMediaDet_get_CurrentStream\n"); - - ZeroMemory(&mt, sizeof mt); - hr = IMediaDet_get_StreamMediaType(pM, &mt); - ok(hr == S_OK, "IMediaDet_get_StreamMediaType\n"); - flags += (IsEqualGUID(&mt.majortype, &MEDIATYPE_Video) - ? 1 - : (IsEqualGUID(&mt.majortype, &MEDIATYPE_Audio) - ? 2 - : 0)); - CoTaskMemFree(mt.pbFormat); - + for (i = 0; i < 2; ++i) + { + hr = IMediaDet_put_CurrentStream(pM, i); + ok(hr == S_OK, "IMediaDet_put_CurrentStream\n"); + + strm = -1; + hr = IMediaDet_get_CurrentStream(pM, &strm); + ok(hr == S_OK, "IMediaDet_get_CurrentStream\n"); + ok(strm == i, "IMediaDet_get_CurrentStream\n"); + + ZeroMemory(&mt, sizeof mt); + hr = IMediaDet_get_StreamMediaType(pM, &mt); + ok(hr == S_OK, "IMediaDet_get_StreamMediaType\n"); + flags += (IsEqualGUID(&mt.majortype, &MEDIATYPE_Video) + ? 1 + : (IsEqualGUID(&mt.majortype, &MEDIATYPE_Audio) + ? 2 + : 0)); + + if (IsEqualGUID(&mt.majortype, &MEDIATYPE_Audio)) + { + hr = IMediaDet_get_FrameRate(pM, &fps); + ok(hr == VFW_E_INVALIDMEDIATYPE, "IMediaDet_get_FrameRate\n"); + } + + CoTaskMemFree(mt.pbFormat); + } ok(flags == 3, "IMediaDet_get_StreamMediaType\n"); hr = IMediaDet_put_CurrentStream(pM, 2);

1 0