[PATCH 1/3] evr/presenter: Fix hns-to-msec conversion multiplier.

[Nikolay Sivov]

From: Andrew Eikum

Signed-off-by: Nikolay Sivov 
---
 dlls/evr/presenter.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dlls/evr/presenter.c b/dlls/evr/presenter.c
index 7e14cb2f720..1b119ce9cab 100644
--- a/dlls/evr/presenter.c
+++ b/dlls/evr/presenter.c
@@ -548,7 +548,7 @@ static void video_presenter_check_queue(struct video_presenter *presenter,
             if (delta > 3 * presenter->frame_time_threshold)
             {
                 /* Convert 100ns -> msec */
-                wait = (delta - 3 * presenter->frame_time_threshold) / 100000;
+                wait = (delta - 3 * presenter->frame_time_threshold) / 10000;
                 present = FALSE;
             }
         }

[PATCH 2/3] evr/presenter: Place early samples back to the front of the queue.

[Nikolay Sivov]

From: Andrew Eikum

Signed-off-by: Nikolay Sivov 
---
 dlls/evr/presenter.c | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/dlls/evr/presenter.c b/dlls/evr/presenter.c
index 1b119ce9cab..e70e25a19a7 100644
--- a/dlls/evr/presenter.c
+++ b/dlls/evr/presenter.c
@@ -429,15 +429,20 @@ static HRESULT video_presenter_sample_queue_init(struct video_presenter *present
     return S_OK;
 }

-static void video_presenter_sample_queue_push(struct video_presenter *presenter, IMFSample *sample)
+static void video_presenter_sample_queue_push(struct video_presenter *presenter, IMFSample *sample,
+        BOOL at_front)
 {
     struct sample_queue *queue = &presenter->thread.queue;
+    unsigned int idx;

EnterCriticalSection(&presenter->cs);
     if (queue->used != queue->size)
     {
-        queue->back = (queue->back + 1) % queue->size;
-        queue->samples[queue->back] = sample;
+        if (at_front)
+            idx = queue->front = (queue->size + queue->front - 1) % queue->size;
+        else
+            idx = queue->back = (queue->back + 1) % queue->size;
+        queue->samples[idx] = sample;
         queue->used++;
         IMFSample_AddRef(sample);
     }
@@ -556,7 +561,7 @@ static void video_presenter_check_queue(struct video_presenter *presenter,
         if (present)
             video_presenter_sample_present(presenter, sample);
         else
-            video_presenter_sample_queue_push(presenter, sample);
+            video_presenter_sample_queue_push(presenter, sample, TRUE);

IMFSample_Release(sample);

@@ -580,7 +585,7 @@ static void video_presenter_schedule_sample(struct video_presenter *presenter, I

if (presenter->clock)
     {
-        video_presenter_sample_queue_push(presenter, sample);
+        video_presenter_sample_queue_push(presenter, sample, FALSE);
         PostThreadMessageW(presenter->thread.tid, EVRM_PRESENT, 0, 0);
     }
     else

[PATCH 3/3] evr/presenter: Make GetCurrentImage() work without output window.

[Nikolay Sivov]

Signed-off-by: Nikolay Sivov 
---

Used by Secret of Mana game.

dlls/evr/presenter.c | 31 +++++++++++++++----------------
 1 file changed, 15 insertions(+), 16 deletions(-)

diff --git a/dlls/evr/presenter.c b/dlls/evr/presenter.c
index e70e25a19a7..d8bdbee3915 100644
--- a/dlls/evr/presenter.c
+++ b/dlls/evr/presenter.c
@@ -492,27 +492,28 @@ static void video_presenter_sample_present(struct video_presenter *presenter, IM
     IDirect3DDevice9 *device;
     HRESULT hr;

-    if (!presenter->swapchain)
-        return;
-
     if (FAILED(hr = video_presenter_get_sample_surface(sample, &surface)))
     {
         WARN("Failed to get sample surface, hr %#lx.\n", hr);
         return;
     }

-    if (FAILED(hr = IDirect3DSwapChain9_GetBackBuffer(presenter->swapchain, 0, D3DBACKBUFFER_TYPE_MONO, &backbuffer)))
+    if (presenter->swapchain)
     {
-        WARN("Failed to get a backbuffer, hr %#lx.\n", hr);
-        IDirect3DSurface9_Release(surface);
-        return;
-    }
+        if (SUCCEEDED(hr = IDirect3DSwapChain9_GetBackBuffer(presenter->swapchain, 0, D3DBACKBUFFER_TYPE_MONO, &backbuffer)))
+        {
+            IDirect3DSwapChain9_GetDevice(presenter->swapchain, &device);
+            IDirect3DDevice9_StretchRect(device, surface, NULL, backbuffer, NULL, D3DTEXF_POINT);

-    IDirect3DSwapChain9_GetDevice(presenter->swapchain, &device);
-    IDirect3DDevice9_StretchRect(device, surface, NULL, backbuffer, NULL, D3DTEXF_POINT);
+            IDirect3DSwapChain9_Present(presenter->swapchain, NULL, NULL, NULL, NULL, 0);
+            presenter->frame_stats.presented++;

-    IDirect3DSwapChain9_Present(presenter->swapchain, NULL, NULL, NULL, NULL, 0);
-    presenter->frame_stats.presented++;
+            IDirect3DDevice9_Release(device);
+            IDirect3DSurface9_Release(backbuffer);
+        }
+        else
+            WARN("Failed to get a backbuffer, hr %#lx.\n", hr);
+    }

EnterCriticalSection(&presenter->cs);
     if (presenter->thread.queue.last_presented)
@@ -521,8 +522,6 @@ static void video_presenter_sample_present(struct video_presenter *presenter, IM
     IMFSample_AddRef(presenter->thread.queue.last_presented);
     LeaveCriticalSection(&presenter->cs);

-    IDirect3DDevice9_Release(device);
-    IDirect3DSurface9_Release(backbuffer);
     IDirect3DSurface9_Release(surface);
 }

@@ -1493,13 +1492,13 @@ static HRESULT WINAPI video_presenter_control_GetCurrentImage(IMFVideoDisplayCon
     sample = presenter->thread.queue.last_presented;
     presenter->thread.queue.last_presented = NULL;

-    if (!presenter->swapchain || !sample)
+    if (!sample)
     {
         hr = MF_E_INVALIDREQUEST;
     }
     else if (SUCCEEDED(hr = video_presenter_get_sample_surface(sample, &surface)))
     {
-        IDirect3DSwapChain9_GetDevice(presenter->swapchain, &device);
+        IDirect3DSurface9_GetDevice(surface, &device);
         IDirect3DSurface9_GetDesc(surface, &surface_desc);

if (surface_desc.Format != D3DFMT_X8R8G8B8)