Christian Costa : d3drm: Add support for frame with fake data in IDirect3DRMX:Load methods + tests.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 4d53115cb99f7b5ab678068572770fc52d5e5e56
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=4d53115cb99f7b5ab678068572...

Author: Christian Costa 
Date:   Thu Mar 29 23:56:54 2012 +0200

d3drm: Add support for frame with fake data in IDirect3DRMX:Load methods + tests.

---

dlls/d3drm/d3drm.c       |   15 ++++++++++++++-
 dlls/d3drm/tests/d3drm.c |   14 ++++++++++----
 2 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c
index afd794e..c067c27 100644
--- a/dlls/d3drm/d3drm.c
+++ b/dlls/d3drm/d3drm.c
@@ -1389,6 +1389,8 @@ static HRESULT WINAPI IDirect3DRM3Impl_Load(IDirect3DRM3* iface, LPVOID ObjSourc
         else if (IsEqualGUID(pGuid, &TID_D3DRMFrame))
         {
             BOOL requested = FALSE;
+            HRESULT hr;
+            LPDIRECT3DRMFRAME3 frame;

TRACE("Found TID_D3DRMFrame\n");

@@ -1400,7 +1402,18 @@ static HRESULT WINAPI IDirect3DRM3Impl_Load(IDirect3DRM3* iface, LPVOID ObjSourc

if (requested)
             {
-                FIXME("Processing frame not supported yet\n");
+                FIXME("Fake frame data and notify application\n");
+
+                hr = IDirect3DRM3_CreateFrame(iface, NULL, &frame);
+                if (SUCCEEDED(hr))
+                {
+                    LoadProc((LPDIRECT3DRMOBJECT)frame, &IID_IDirect3DRMFrame, ArgLP);
+                    IDirect3DRMFrame3_Release(frame);
+                }
+
+                if (FAILED(hr))
+                    ERR("Cannot process mesh\n");
+
             }
         }
         else if (IsEqualGUID(pGuid, &TID_D3DRMMaterial))
diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c
index 8d18d3b..0a05dcd 100644
--- a/dlls/d3drm/tests/d3drm.c
+++ b/dlls/d3drm/tests/d3drm.c
@@ -153,6 +153,11 @@ static char data_d3drm_load[] =
 " 0.1; 0.2; 0.3;,\n"
 " 1;\n"
 " 3; 0, 1, 2;;\n"
+"}\n"
+"Frame Scene\n"
+"{\n"
+" {Object1}\n"
+" {Object2}\n"
 "}\n";

static void test_MeshBuilder(void)
@@ -604,7 +609,8 @@ static int nb_objects = 0;
 static const GUID* refiids[] =
 {
     &IID_IDirect3DRMMeshBuilder,
-    &IID_IDirect3DRMMeshBuilder
+    &IID_IDirect3DRMMeshBuilder,
+    &IID_IDirect3DRMFrame
 };

void __cdecl object_load_callback(LPDIRECT3DRMOBJECT object, REFIID objectguid, LPVOID arg)
@@ -620,16 +626,16 @@ static void test_d3drm_load(void)
     HRESULT hr;
     LPDIRECT3DRM pD3DRM;
     D3DRMLOADMEMORY info;
-    const GUID* req_refiids[] = { &IID_IDirect3DRMMeshBuilder };
+    const GUID* req_refiids[] = { &IID_IDirect3DRMMeshBuilder, &IID_IDirect3DRMFrame };

hr = pDirect3DRMCreate(&pD3DRM);
     ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x)\n", hr);

info.lpMemory = data_d3drm_load;
     info.dSize = strlen(data_d3drm_load);
-    hr = IDirect3DRM_Load(pD3DRM, &info, NULL, (GUID**)req_refiids, 1, D3DRMLOAD_FROMMEMORY, object_load_callback, (LPVOID)0xdeadbeef, NULL, NULL, NULL);
+    hr = IDirect3DRM_Load(pD3DRM, &info, NULL, (GUID**)req_refiids, 2, D3DRMLOAD_FROMMEMORY, object_load_callback, (LPVOID)0xdeadbeef, NULL, NULL, NULL);
     ok(hr == D3DRM_OK, "Cannot load data (hr = %x)\n", hr);
-    ok(nb_objects == 2, "Should have loaded 2 objects (got %d)\n", nb_objects);
+    ok(nb_objects == 3, "Should have loaded 3 objects (got %d)\n", nb_objects);

IDirect3DRM_Release(pD3DRM);
 }