[PATCH 1/3] include: Add MFP_POSITIONTYPE_100NS symbol.

[Nikolay Sivov]

Signed-off-by: Nikolay Sivov 
---
 dlls/mfuuid/mfplay.c | 4 ++++
 include/mfplay.idl   | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/dlls/mfuuid/mfplay.c b/dlls/mfuuid/mfplay.c
index 1d28306fe4f..d73e52607c4 100644
--- a/dlls/mfuuid/mfplay.c
+++ b/dlls/mfuuid/mfplay.c
@@ -17,5 +17,9 @@
  */

#include "evr.h"
+
+#undef EXTERN_GUID
+#define EXTERN_GUID DEFINE_GUID
+
 #include "initguid.h"
 #include "mfplay.h"
diff --git a/include/mfplay.idl b/include/mfplay.idl
index 7d4345e69e7..42591439a0b 100644
--- a/include/mfplay.idl
+++ b/include/mfplay.idl
@@ -197,6 +197,8 @@ cpp_quote("#define MFP_GET_ERROR_EVENT(hdr)                   __MFP_CAST_EVENT(h
 cpp_quote("#define MFP_GET_PLAYBACK_ENDED_EVENT(hdr)          __MFP_CAST_EVENT(hdr, PLAYBACK_ENDED)")
 cpp_quote("#define MFP_GET_ACQUIRE_USER_CREDENTIAL_EVENT(hdr) __MFP_CAST_EVENT(hdr, ACQUIRE_USER_CREDENTIAL)")

+cpp_quote("EXTERN_GUID(MFP_POSITIONTYPE_100NS, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0);")
+
 [
     object,
     uuid(766c8ffb-5fdb-4fea-a28d-b912996f51bd),

[PATCH 2/3] mfplay: Keep start/stop positions for items.

[Nikolay Sivov]

Signed-off-by: Nikolay Sivov 
---
 dlls/mfplay/player.c | 81 +++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 77 insertions(+), 4 deletions(-)

diff --git a/dlls/mfplay/player.c b/dlls/mfplay/player.c
index c4913134901..0e41656f0c8 100644
--- a/dlls/mfplay/player.c
+++ b/dlls/mfplay/player.c
@@ -63,6 +63,8 @@ struct media_item
     DWORD_PTR user_data;
     WCHAR *url;
     IUnknown *object;
+    LONGLONG start_position;
+    LONGLONG stop_position;
 };

struct media_player
@@ -418,21 +420,92 @@ static HRESULT WINAPI media_item_SetUserData(IMFPMediaItem *iface, DWORD_PTR use
     return S_OK;
 }

+static HRESULT media_item_set_position(const GUID *format, const PROPVARIANT *position, LARGE_INTEGER *ret)
+{
+    ret->QuadPart = 0;
+
+    if (format && !IsEqualGUID(format, &MFP_POSITIONTYPE_100NS))
+        return E_INVALIDARG;
+
+    if ((format != NULL) ^ (position != NULL))
+        return E_POINTER;
+
+    if (position && position->vt != VT_EMPTY && position->vt != VT_I8)
+        return E_INVALIDARG;
+
+    if ((!format && !position) || position->vt == VT_EMPTY)
+        return S_OK;
+
+    if (position->hVal.QuadPart == 0)
+        return MF_E_OUT_OF_RANGE;
+
+    ret->QuadPart = position->hVal.QuadPart;
+
+    return S_OK;
+}
+
+static void media_item_get_position(LONGLONG value, GUID *format, PROPVARIANT *position)
+{
+    if (!format)
+        return;
+
+    memcpy(format, &MFP_POSITIONTYPE_100NS, sizeof(*format));
+
+    if (value)
+    {
+        position->vt = VT_I8;
+        position->hVal.QuadPart = value;
+    }
+}
+
 static HRESULT WINAPI media_item_GetStartStopPosition(IMFPMediaItem *iface, GUID *start_format,
         PROPVARIANT *start_position, GUID *stop_format, PROPVARIANT *stop_position)
 {
-    FIXME("%p, %p, %p, %p, %p.\n", iface, start_format, start_position, stop_format, stop_position);
+    struct media_item *item = impl_from_IMFPMediaItem(iface);

-    return E_NOTIMPL;
+    TRACE("%p, %p, %p, %p, %p.\n", iface, start_format, start_position, stop_format, stop_position);
+
+    if (start_position)
+        start_position->vt = VT_EMPTY;
+    if (stop_position)
+        stop_position->vt = VT_EMPTY;
+
+    if (((start_format != NULL) ^ (start_position != NULL)) ||
+            ((stop_format != NULL) ^ (stop_position != NULL)))
+    {
+        return E_POINTER;
+    }
+
+    media_item_get_position(item->start_position, start_format, start_position);
+    media_item_get_position(item->stop_position, stop_format, stop_position);
+
+    return S_OK;
 }

static HRESULT WINAPI media_item_SetStartStopPosition(IMFPMediaItem *iface, const GUID *start_format,
         const PROPVARIANT *start_position, const GUID *stop_format, const PROPVARIANT *stop_position)
 {
-    FIXME("%p, %s, %p, %s, %p.\n", iface, debugstr_guid(start_format), start_position,
+    struct media_item *item = impl_from_IMFPMediaItem(iface);
+    LARGE_INTEGER start, stop;
+    HRESULT hr;
+
+    TRACE("%p, %s, %p, %s, %p.\n", iface, debugstr_guid(start_format), start_position,
             debugstr_guid(stop_format), stop_position);

-    return E_NOTIMPL;
+    hr = media_item_set_position(start_format, start_position, &start);
+    if (SUCCEEDED(hr))
+        hr = media_item_set_position(stop_format, stop_position, &stop);
+
+    if (FAILED(hr))
+        return hr;
+
+    if (start.QuadPart > stop.QuadPart)
+        return MF_E_OUT_OF_RANGE;
+
+    item->start_position = start.QuadPart;
+    item->stop_position = stop.QuadPart;
+
+    return hr;
 }

static HRESULT media_item_get_stream_type(IMFStreamDescriptor *sd, GUID *major)

[PATCH 3/3] mfplay: Set start/stop position on source nodes.

[Nikolay Sivov]

Signed-off-by: Nikolay Sivov 
---
 dlls/mfplay/player.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/dlls/mfplay/player.c b/dlls/mfplay/player.c
index 0e41656f0c8..959cf701b99 100644
--- a/dlls/mfplay/player.c
+++ b/dlls/mfplay/player.c
@@ -1128,6 +1128,10 @@ static HRESULT media_item_create_source_node(struct media_item *item, IMFStreamD
         IMFTopologyNode_SetUnknown(*node, &MF_TOPONODE_SOURCE, (IUnknown *)item->source);
         IMFTopologyNode_SetUnknown(*node, &MF_TOPONODE_PRESENTATION_DESCRIPTOR, (IUnknown *)item->pd);
         IMFTopologyNode_SetUnknown(*node, &MF_TOPONODE_STREAM_DESCRIPTOR, (IUnknown *)sd);
+        if (item->start_position)
+            IMFTopologyNode_SetUINT64(*node, &MF_TOPONODE_MEDIASTART, item->start_position);
+        if (item->stop_position)
+            IMFTopologyNode_SetUINT64(*node, &MF_TOPONODE_MEDIASTOP, item->stop_position);
     }

return hr;