[PATCH v2 0/1] MR167: d3drm: IDirect3DRMMeshBuilder3::Load support loading from resource

[Alistair Leslie-Hughes (＠alesliehughes)]

Signed-off-by: Alistair Leslie-Hughes

--
  v2: d3drm: IDirect3DRMMeshBuilder3 Load support loading from resource

https://gitlab.winehq.org/wine/wine/-/merge_requests/167

[PATCH v2 1/1] d3drm: IDirect3DRMMeshBuilder3 Load support loading from resource

[Alistair Leslie-Hughes]

From: Alistair Leslie-Hughes

Signed-off-by: Alistair Leslie-Hughes 
---
 dlls/d3drm/meshbuilder.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c
index 1f783baf1fe..79e3a408885 100644
--- a/dlls/d3drm/meshbuilder.c
+++ b/dlls/d3drm/meshbuilder.c
@@ -1487,6 +1487,10 @@ static HRESULT WINAPI d3drm_mesh_builder3_Load(IDirect3DRMMeshBuilder3 *iface, v
         load_options = DXFILELOAD_FROMFILE;
         TRACE("Loading from file %s\n", debugstr_a(filename));
     }
+    else if (loadflags == D3DRMLOAD_FROMRESOURCE)
+    {
+        load_options = DXFILELOAD_FROMRESOURCE;
+    }
     else
     {
         FIXME("Load options %ld not supported yet\n", loadflags);

[PATCH v2 1/1] d3drm: IDirect3DRMMeshBuilder3 Load support loading from resource

[Alistair Leslie-Hughes]

We could just pass loadflags into IDirectXFile_CreateEnumObject as the 
flags for d3d and xfile are the same values.  Then add a FIXME when 
CreateEnumObject fails.

Just another option if people would prefer.

Regards
Alistair

On 1/6/22 20:09, Alistair Leslie-Hughes wrote:
> From: Alistair Leslie-Hughes
> Signed-off-by: Alistair Leslie-Hughes
>
> dlls/d3drm/meshbuilder.c | 4 ++++
>   1 file changed, 4 insertions(+)
>
> diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c
> index 1f783baf1fe..79e3a408885 100644
> --- a/dlls/d3drm/meshbuilder.c
> +++ b/dlls/d3drm/meshbuilder.c
> @@ -1487,6 +1487,10 @@ static HRESULT WINAPI d3drm_mesh_builder3_Load(IDirect3DRMMeshBuilder3 *iface, v
>           load_options = DXFILELOAD_FROMFILE;
>           TRACE("Loading from file %s\n", debugstr_a(filename));
>       }
> - else if (loadflags == D3DRMLOAD_FROMRESOURCE)
> - {
> -
>    load_options = DXFILELOAD_FROMRESOURCE;
> - }
>  else
>  {
>      FIXME("Load options %ld not supported yet\n", loadflags);

[PATCH v2 1/1] d3drm: IDirect3DRMMeshBuilder3 Load support loading from resource

[Zebediah Figura]

On 6/1/22 05:35, Alistair Leslie-Hughes wrote:
> We could just pass loadflags into IDirectXFile_CreateEnumObject as the 
> flags for d3d and xfile are the same values.  Then add a FIXME when 
> CreateEnumObject fails.

I'm inclined to think that makes the most sense, yes. Note however that 
only the D3DFMLOAD_FROM* values match; the others do not.