[PATCH 0/2] MR615: include: Add IMediaParams definitions.

[Zhiyi Zhang (＠zhiyi)]

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com>

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/615

[PATCH 1/2] include: Add IMediaParams definitions.

[Zhiyi Zhang]

From: Zhiyi Zhang <zzhang(a)codeweavers.com>

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com>
---
 include/medparam.idl | 39 ++++++++++++++++++++++++++++++++++++++-
 1 file changed, 38 insertions(+), 1 deletion(-)

diff --git a/include/medparam.idl b/include/medparam.idl
index f3b7f2f463e..f32dd49827d 100644
--- a/include/medparam.idl
+++ b/include/medparam.idl
@@ -16,10 +16,11 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-import "unknwn.idl";
+import "strmif.idl";
 
 typedef float MP_DATA;
 typedef DWORD MP_CAPS;
+typedef DWORD MP_FLAGS;
 typedef DWORD MP_TIMEDATA;
 
 typedef enum _MP_Type
@@ -42,6 +43,28 @@ typedef struct _MP_PARAMINFO
     WCHAR szLabel[32];
 } MP_PARAMINFO;
 
+typedef enum _MP_CURVE_TYPE {
+    MP_CURVE_JUMP = 0x0001,
+    MP_CURVE_LINEAR = 0x0002,
+    MP_CURVE_SQUARE = 0x0004,
+    MP_CURVE_INVSQUARE = 0x0008,
+    MP_CURVE_SINE = 0x0010,
+} MP_CURVE_TYPE;
+
+const MP_FLAGS MPF_ENVLP_STANDARD = 0x0000;
+const MP_FLAGS MPF_ENVLP_BEGIN_CURRENTVAL = 0x0001;
+const MP_FLAGS MPF_ENVLP_BEGIN_NEUTRALVAL = 0x0002;
+
+typedef struct _MP_ENVELOPE_SEGMENT
+{
+    REFERENCE_TIME rtStart;
+    REFERENCE_TIME rtEnd;
+    MP_DATA valStart;
+    MP_DATA valEnd;
+    MP_CURVE_TYPE iCurve;
+    MP_FLAGS flags;
+} MP_ENVELOPE_SEGMENT;
+
 [
 object,
 uuid(6D6CBB60-A223-44AA-842F-A2F06750BE6D),
@@ -56,3 +79,17 @@ interface IMediaParamInfo : IUnknown
     HRESULT GetSupportedTimeFormat([in] DWORD index, [out] GUID *guid);
     HRESULT GetCurrentTimeFormat([out] GUID *guid, [out] MP_TIMEDATA *time_data);
 }
+
+[
+object,
+uuid(6d6cbb61-a223-44aa-842f-a2f06750be6e),
+version(1.0)
+]
+interface IMediaParams : IUnknown
+{
+    HRESULT GetParam([in] DWORD index, [out] MP_DATA *data);
+    HRESULT SetParam([in] DWORD index, [in] MP_DATA data);
+    HRESULT AddEnvelope([in] DWORD index, [in] DWORD count, [in] MP_ENVELOPE_SEGMENT *segments);
+    HRESULT FlushEnvelope([in] DWORD index, [in] REFERENCE_TIME start, [in] REFERENCE_TIME end);
+    HRESULT SetTimeFormat([in] GUID guid, [in] MP_TIMEDATA time_data);
+}
-- 
GitLab


https://gitlab.winehq.org/wine/wine/-/merge_requests/615

[PATCH 2/2] dsdmo: Add IMediaParams stub interface.

[Zhiyi Zhang]

From: Zhiyi Zhang <zzhang(a)codeweavers.com>

Zuma's Revenge queries this interface.

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com>
---
 dlls/dsdmo/main.c        | 73 ++++++++++++++++++++++++++++++++++++++++
 dlls/dsdmo/tests/dsdmo.c |  1 +
 2 files changed, 74 insertions(+)

diff --git a/dlls/dsdmo/main.c b/dlls/dsdmo/main.c
index 720d37350fe..3b106a8f633 100644
--- a/dlls/dsdmo/main.c
+++ b/dlls/dsdmo/main.c
@@ -34,6 +34,7 @@ struct effect
 {
     IMediaObject IMediaObject_iface;
     IMediaObjectInPlace IMediaObjectInPlace_iface;
+    IMediaParams IMediaParams_iface;
     IMediaParamInfo IMediaParamInfo_iface;
     IUnknown IUnknown_inner;
     IUnknown *outer_unk;
@@ -68,6 +69,8 @@ static HRESULT WINAPI effect_inner_QueryInterface(IUnknown *iface, REFIID iid, v
         *out = &effect->IMediaObject_iface;
     else if (IsEqualGUID(iid, &IID_IMediaObjectInPlace))
         *out = &effect->IMediaObjectInPlace_iface;
+    else if (IsEqualGUID(iid, &IID_IMediaParams))
+        *out = &effect->IMediaParams_iface;
     else if (IsEqualGUID(iid, &IID_IMediaParamInfo))
         *out = &effect->IMediaParamInfo_iface;
     else if (!(*out = effect->ops->query_interface(effect, iid)))
@@ -422,6 +425,75 @@ static const IMediaObjectInPlaceVtbl effect_inplace_vtbl =
     effect_inplace_GetLatency,
 };
 
+static struct effect *impl_from_IMediaParams(IMediaParams *iface)
+{
+    return CONTAINING_RECORD(iface, struct effect, IMediaParams_iface);
+}
+
+static HRESULT WINAPI effect_media_params_QueryInterface(IMediaParams *iface, REFIID iid, void **out)
+{
+    struct effect *effect = impl_from_IMediaParams(iface);
+    return IUnknown_QueryInterface(effect->outer_unk, iid, out);
+}
+
+static ULONG WINAPI effect_media_params_AddRef(IMediaParams *iface)
+{
+    struct effect *effect = impl_from_IMediaParams(iface);
+    return IUnknown_AddRef(effect->outer_unk);
+}
+
+static ULONG WINAPI effect_media_params_Release(IMediaParams *iface)
+{
+    struct effect *effect = impl_from_IMediaParams(iface);
+    return IUnknown_Release(effect->outer_unk);
+}
+
+static HRESULT WINAPI effect_media_params_GetParam(IMediaParams *iface, DWORD index, MP_DATA *data)
+{
+    FIXME("iface %p, index %lu, data %p, stub!\n", iface, index, data);
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI effect_media_params_SetParam(IMediaParams *iface, DWORD index, MP_DATA data)
+{
+    FIXME("iface %p, index %lu, data %f, stub!\n", iface, index, data);
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI effect_media_params_AddEnvelope(IMediaParams *iface, DWORD index, DWORD count,
+                                                      MP_ENVELOPE_SEGMENT *segments)
+{
+    FIXME("iface %p, index %lu, count %lu, segments %p, stub!\n", iface, index, count, segments);
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI effect_media_params_FlushEnvelope(IMediaParams *iface, DWORD index,
+                                                        REFERENCE_TIME start, REFERENCE_TIME end)
+{
+    FIXME("iface %p, index %lu, start %s, end %s, stub!\n", iface, index,
+          wine_dbgstr_longlong(start), wine_dbgstr_longlong(end));
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI effect_media_params_SetTimeFormat(IMediaParams *iface, GUID guid,
+                                                        MP_TIMEDATA time_data)
+{
+    FIXME("iface %p, guid %s, time_data %lx, stub!\n", iface, wine_dbgstr_guid(&guid), time_data);
+    return E_NOTIMPL;
+}
+
+static const IMediaParamsVtbl effect_media_params_vtbl =
+{
+    effect_media_params_QueryInterface,
+    effect_media_params_AddRef,
+    effect_media_params_Release,
+    effect_media_params_GetParam,
+    effect_media_params_SetParam,
+    effect_media_params_AddEnvelope,
+    effect_media_params_FlushEnvelope,
+    effect_media_params_SetTimeFormat,
+};
+
 static struct effect *impl_from_IMediaParamInfo(IMediaParamInfo *iface)
 {
     return CONTAINING_RECORD(iface, struct effect, IMediaParamInfo_iface);
@@ -501,6 +573,7 @@ static void effect_init(struct effect *effect, IUnknown *outer, const struct eff
     effect->IUnknown_inner.lpVtbl = &effect_inner_vtbl;
     effect->IMediaObject_iface.lpVtbl = &effect_vtbl;
     effect->IMediaObjectInPlace_iface.lpVtbl = &effect_inplace_vtbl;
+    effect->IMediaParams_iface.lpVtbl = &effect_media_params_vtbl;
     effect->IMediaParamInfo_iface.lpVtbl = &effect_media_param_info_vtbl;
 
     InitializeCriticalSection(&effect->cs);
diff --git a/dlls/dsdmo/tests/dsdmo.c b/dlls/dsdmo/tests/dsdmo.c
index 90b8e61f5e7..31f4dc6a473 100644
--- a/dlls/dsdmo/tests/dsdmo.c
+++ b/dlls/dsdmo/tests/dsdmo.c
@@ -136,6 +136,7 @@ static void test_interfaces(const GUID *clsid, const GUID *iid)
     {
         &IID_IMediaObject,
         &IID_IMediaObjectInPlace,
+        &IID_IMediaParams,
         &IID_IMediaParamInfo,
     };
     IUnknown *unk, *unk2, *unk3;
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/615

[PATCH 0/2] MR615: include: Add IMediaParams definitions. - approved

[Zebediah Figura (＠zfigura)]

This merge request was approved by Zebediah Figura.
-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/615