[ros-diffs] 01/01: [D3DRM] Sync with Wine Staging 3.9. CORE-14656

[Amine Khaldi]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=61ea4c528e724bf3c1825…
commit 61ea4c528e724bf3c1825a1b642deb72021195a8
Author:     Amine Khaldi <amine.khaldi(a)reactos.org>
AuthorDate: Sun May 27 03:53:02 2018 +0100
Commit:     Amine Khaldi <amine.khaldi(a)reactos.org>
CommitDate: Sun May 27 03:53:02 2018 +0100
    [D3DRM] Sync with Wine Staging 3.9. CORE-14656
---
 dll/directx/wine/d3drm/viewport.c | 6 +++---
 media/doc/README.WINE             | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/dll/directx/wine/d3drm/viewport.c b/dll/directx/wine/d3drm/viewport.c
index 37c70c8db2..5c0e24bc42 100644
--- a/dll/directx/wine/d3drm/viewport.c
+++ b/dll/directx/wine/d3drm/viewport.c
@@ -339,6 +339,9 @@ static HRESULT WINAPI d3drm_viewport2_Init(IDirect3DRMViewport2
*iface, IDirect3
     if (FAILED(hr = IDirect3D_CreateViewport(d3d1, &viewport->d3d_viewport,
NULL)))
         goto cleanup;
+    if (FAILED(hr = IDirect3DDevice_AddViewport(d3d_device, viewport->d3d_viewport)))
+        goto cleanup;
+
     vp.dwSize = sizeof(vp);
     vp.dwWidth = width;
     vp.dwHeight = height;
@@ -355,9 +358,6 @@ static HRESULT WINAPI d3drm_viewport2_Init(IDirect3DRMViewport2
*iface, IDirect3
     if (FAILED(hr = IDirect3DViewport_SetViewport(viewport->d3d_viewport, &vp)))
         goto cleanup;
-    if (FAILED(hr = IDirect3DDevice_AddViewport(d3d_device, viewport->d3d_viewport)))
-        goto cleanup;
-
     if (FAILED(hr = IDirect3DRMFrame3_QueryInterface(camera, &IID_IDirect3DRMFrame,
(void **)&viewport->camera)))
         goto cleanup;
diff --git a/media/doc/README.WINE b/media/doc/README.WINE
index 1847393ab6..2e0303348c 100644
--- a/media/doc/README.WINE
+++ b/media/doc/README.WINE
@@ -25,7 +25,7 @@ reactos/dll/directx/wine/amstream       # Synced to WineStaging-3.9
 reactos/dll/directx/wine/d3d8           # Synced to WineStaging-3.9
 reactos/dll/directx/wine/d3d9           # Synced to WineStaging-3.9
 reactos/dll/directx/wine/d3dcompiler_43 # Synced to WineStaging-3.3
-reactos/dll/directx/wine/d3drm          # Synced to WineStaging-3.3
+reactos/dll/directx/wine/d3drm          # Synced to WineStaging-3.9
 reactos/dll/directx/wine/d3dx9_24 => 43 # Synced to WineStaging-3.3
 reactos/dll/directx/wine/d3dxof         # Synced to WineStaging-3.3
 reactos/dll/directx/wine/ddraw          # Synced to WineStaging-3.9