d3drm: Implement IDirect3DRMDevice{2-3}::InitFromD3D2.

dlls/d3drm/d3drm.c

@@ -801,38 +801,22 @@ static HRESULT WINAPI d3drm2_CreateDeviceFromD3D(IDirect3DRM2 *iface,
     IDirect3D2 *d3d, IDirect3DDevice2 *d3d_device, IDirect3DRMDevice2 **device)
 {
     struct d3drm *d3drm = impl_from_IDirect3DRM2(iface);
-    IDirect3D *d3d1;
-    IDirect3DDevice *d3d_device1;
-    IDirect3DRMDevice *device1;
+    IDirect3DRMDevice3 *device3;
     HRESULT hr;
+
     TRACE("iface %p, d3d %p, d3d_device %p, device %p.\n",
             iface, d3d, d3d_device, device);
 
     if (!device)
         return D3DRMERR_BADVALUE;
     *device = NULL;
-    if (!d3d || !d3d_device)
-        return D3DRMERR_BADVALUE;
-
-    hr = IDirect3D2_QueryInterface(d3d, &IID_IDirect3D, (void **)&d3d1);
-    if (FAILED(hr))
-        return hr;
-
-    hr = IDirect3DDevice2_QueryInterface(d3d_device, &IID_IDirect3DDevice, (void **)&d3d_device1);
-    if (FAILED(hr))
-    {
-        IDirect3D_Release(d3d1);
-        return hr;
-    }
 
-    hr = IDirect3DRM_CreateDeviceFromD3D(&d3drm->IDirect3DRM_iface, d3d1, d3d_device1, &device1);
-    IDirect3D_Release(d3d1);
-    IDirect3DDevice_Release(d3d_device1);
+    hr = IDirect3DRM3_CreateDeviceFromD3D(&d3drm->IDirect3DRM3_iface, d3d, d3d_device, &device3);
     if (FAILED(hr))
         return hr;
 
-    hr = IDirect3DRMDevice_QueryInterface(device1, &IID_IDirect3DRMDevice2, (void **)device);
-    IDirect3DRMDevice_Release(device1);
+    hr = IDirect3DRMDevice3_QueryInterface(device3, &IID_IDirect3DRMDevice2, (void **)device);
+    IDirect3DRMDevice3_Release(device3);
 
     return hr;
 }
@@ -1361,39 +1345,27 @@ static HRESULT WINAPI d3drm3_CreateDeviceFromD3D(IDirect3DRM3 *iface,
         IDirect3D2 *d3d, IDirect3DDevice2 *d3d_device, IDirect3DRMDevice3 **device)
 {
     struct d3drm *d3drm = impl_from_IDirect3DRM3(iface);
-    IDirect3D *d3d1;
-    IDirect3DDevice *d3d_device1;
-    IDirect3DRMDevice *device1;
+    struct d3drm_device *object;
     HRESULT hr;
+
     TRACE("iface %p, d3d %p, d3d_device %p, device %p.\n",
             iface, d3d, d3d_device, device);
 
     if (!device)
         return D3DRMERR_BADVALUE;
     *device = NULL;
-    if (!d3d || !d3d_device)
-        return D3DRMERR_BADVALUE;
 
-    hr = IDirect3D2_QueryInterface(d3d, &IID_IDirect3D, (void **)&d3d1);
-    if (FAILED(hr))
+    if (FAILED(hr = d3drm_device_create(&object, &d3drm->IDirect3DRM_iface)))
         return hr;
-    hr = IDirect3DDevice2_QueryInterface(d3d_device, &IID_IDirect3DDevice, (void **)&d3d_device1);
-    if (FAILED(hr))
+
+    if (FAILED(hr = IDirect3DRMDevice3_InitFromD3D2(&object->IDirect3DRMDevice3_iface, d3d, d3d_device)))
     {
-        IDirect3D_Release(d3d1);
+        d3drm_device_destroy(object);
         return hr;
     }
+    *device = &object->IDirect3DRMDevice3_iface;
 
-    hr = IDirect3DRM_CreateDeviceFromD3D(&d3drm->IDirect3DRM_iface, d3d1, d3d_device1, &device1);
-    IDirect3D_Release(d3d1);
-    IDirect3DDevice_Release(d3d_device1);
-    if (FAILED(hr))
-        return hr;
-
-    hr = IDirect3DRMDevice_QueryInterface(device1, &IID_IDirect3DRMDevice3, (void **)device);
-    IDirect3DRMDevice_Release(device1);
-
-    return hr;
+    return D3DRM_OK;
 }
 
 static HRESULT WINAPI d3drm3_CreateDeviceFromClipper(IDirect3DRM3 *iface,

dlls/d3drm/device.c

@@ -1200,9 +1200,29 @@ static HRESULT WINAPI d3drm_device1_GetDirect3DDevice(IDirect3DRMDevice *iface,
 static HRESULT WINAPI d3drm_device3_InitFromD3D2(IDirect3DRMDevice3 *iface,
         IDirect3D2 *d3d, IDirect3DDevice2 *d3d_device)
 {
-    FIXME("iface %p, d3d %p, d3d_device %p stub!\n", iface, d3d, d3d_device);
+    struct d3drm_device *device = impl_from_IDirect3DRMDevice3(iface);
+    IDirect3D *d3d1;
+    IDirect3DDevice *d3d_device1;
+    HRESULT hr;
 
-    return E_NOTIMPL;
+    TRACE("iface %p, d3d %p, d3d_device %p.\n", iface, d3d, d3d_device);
+
+    if (!d3d || !d3d_device)
+        return D3DRMERR_BADVALUE;
+
+    if (FAILED(hr = IDirect3D2_QueryInterface(d3d, &IID_IDirect3D, (void **)&d3d1)))
+        return hr;
+    if (FAILED(hr = IDirect3DDevice2_QueryInterface(d3d_device, &IID_IDirect3DDevice, (void **)&d3d_device1)))
+    {
+        IDirect3D_Release(d3d1);
+        return hr;
+    }
+
+    hr = d3drm_device_set_ddraw_device_d3d(device, d3d1, d3d_device1);
+    IDirect3D_Release(d3d1);
+    IDirect3DDevice_Release(d3d_device1);
+
+    return hr;
 }
 
 static HRESULT WINAPI d3drm_device2_InitFromD3D2(IDirect3DRMDevice2 *iface,