diff --git a/dlls/quartz/control.c b/dlls/quartz/control.c index 36a610e646e..d14e2219b43 100644 --- a/dlls/quartz/control.c +++ b/dlls/quartz/control.c @@ -591,9 +591,9 @@ HRESULT WINAPI MediaSeekingImpl_SetPositions(IMediaSeeking * iface, LONGLONG * p This->llCurrent = llNewCurrent; This->llStop = llNewStop; - if (dwCurrentFlags & AM_SEEKING_ReturnTime) + if (pCurrent && (dwCurrentFlags & AM_SEEKING_ReturnTime)) *pCurrent = llNewCurrent; - if (dwStopFlags & AM_SEEKING_ReturnTime) + if (pStop && (dwStopFlags & AM_SEEKING_ReturnTime)) *pStop = llNewStop; ForwardCmdSeek(This->crst, This->pUserData, fwd_setposition, &args); diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 6f9e4c8a96f..2e5fdc42f6b 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -272,6 +272,11 @@ static void test_mediacontrol(void) ok(hr == S_OK, "GetCurrentPosition failed: %08x\n", hr); ok(pos == 0, "Position != 0 (%x%08x)\n", (DWORD)(pos >> 32), (DWORD)pos); + hr = IMediaSeeking_SetPositions(seeking, NULL, AM_SEEKING_ReturnTime, NULL, AM_SEEKING_NoPositioning); + ok(hr == S_OK, "SetPositions failed: %08x\n", hr); + hr = IMediaSeeking_SetPositions(seeking, NULL, AM_SEEKING_NoPositioning, NULL, AM_SEEKING_ReturnTime); + ok(hr == S_OK, "SetPositions failed: %08x\n", hr); + IMediaFilter_SetSyncSource(filter, NULL); pos = 0xdeadbeef; hr = IMediaSeeking_GetCurrentPosition(seeking, &pos);