<div dir="ltr">Reviving this patch series which was last sent around May 2016.<div><br></div><div>Hope to get this upstream! Reviews are appreciated ^_^<br><br>Cheers,</div><div>Jam</div></div><br><div class="gmail_quote"><div dir="ltr">On Sun, Aug 26, 2018 at 8:56 PM Aaryaman Vasishta <<a href="mailto:jem456.vasishta@gmail.com">jem456.vasishta@gmail.com</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">v6: Rebased on top of master as of this patch date<br>
v5: Redundant newline removed.<br>
Signed-off-by: Aaryaman Vasishta <<a href="mailto:jem456.vasishta@gmail.com" target="_blank">jem456.vasishta@gmail.com</a>><br>
---<br>
dlls/d3drm/d3drm_private.h | 1 +<br>
dlls/d3drm/tests/d3drm.c | 79 ++++++++-<br>
dlls/d3drm/texture.c | 325 ++++++++++++++++++++++++++++++++++++-<br>
3 files changed, 393 insertions(+), 12 deletions(-)<br>
<br>
diff --git a/dlls/d3drm/d3drm_private.h b/dlls/d3drm/d3drm_private.h<br>
index 858911f350..333b809896 100644<br>
--- a/dlls/d3drm/d3drm_private.h<br>
+++ b/dlls/d3drm/d3drm_private.h<br>
@@ -26,6 +26,7 @@<br>
#define COBJMACROS<br>
#include <assert.h><br>
#include <math.h><br>
+#include <limits.h><br>
#include "dxfile.h"<br>
#include "d3drmwin.h"<br>
#include "rmxfguid.h"<br>
diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c<br>
index f78e098fec..4ed90ca682 100644<br>
--- a/dlls/d3drm/tests/d3drm.c<br>
+++ b/dlls/d3drm/tests/d3drm.c<br>
@@ -5572,6 +5572,7 @@ static void test_load_texture(void)<br>
char *filename;<br>
HRESULT hr;<br>
BOOL ret;<br>
+ ULONG ref1, ref2;<br>
int i;<br>
<br>
static const struct<br>
@@ -5595,6 +5596,7 @@ static void test_load_texture(void)<br>
ok(SUCCEEDED(hr), "Failed to get IDirect3DRM2 interface, hr %#x.\n", hr);<br>
hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM3, (void **)&d3drm3);<br>
ok(SUCCEEDED(hr), "Failed to get IDirect3DRM3 interface, hr %#x.\n", hr);<br>
+ ref1 = get_refcount((IUnknown *)d3drm1);<br>
<br>
for (i = 0; i < ARRAY_SIZE(tests); ++i)<br>
{<br>
@@ -5602,24 +5604,74 @@ static void test_load_texture(void)<br>
<br>
hr = IDirect3DRM_LoadTexture(d3drm1, filename, &texture1);<br>
ok(SUCCEEDED(hr), "Test %u: Failed to load texture, hr %#x.\n", i, hr);<br>
+ ref2 = get_refcount((IUnknown *)d3drm1);<br>
+ todo_wine ok(ref2 > ref1, "Test %u: expected ref2 > ref1, got ref1 = %u, ref2 = %u.\n", i, ref1, ref2);<br>
+<br>
+ hr = IDirect3DRMTexture_InitFromFile(texture1, filename);<br>
+ todo_wine ok(hr == D3DRMERR_BADOBJECT, "Test %u: Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", i, hr);<br>
+ /* InitFromFile seems to AddRef IDirect3DRM even if it fails. */<br>
+ if (FAILED(hr))<br>
+ IDirect3DRM_Release(d3drm1);<br>
d3drm_img = IDirect3DRMTexture_GetImage(texture1);<br>
- todo_wine ok(!!d3drm_img, "Test %u: Failed to get image.\n", i);<br>
+ ok(!!d3drm_img, "Test %u: Failed to get image.\n", i);<br>
if (d3drm_img)<br>
- test_bitmap_data(i * 4, d3drm_img, FALSE, tests[i].w, tests[i].h, tests[i].palettized);<br>
+ test_bitmap_data(i * 7, d3drm_img, FALSE, tests[i].w, tests[i].h, tests[i].palettized);<br>
+ IDirect3DRMTexture_Release(texture1);<br>
+ ref2 = get_refcount((IUnknown *)d3drm1);<br>
+ ok(ref1 == ref2, "Test %u: expected ref1 == ref2, got ref1 = %u, ref2 = %u.\n", i, ref1, ref2);<br>
+ hr = IDirect3DRM_CreateObject(d3drm1, &CLSID_CDirect3DRMTexture, NULL, &IID_IDirect3DRMTexture, (void **)&texture1);<br>
+ ok(SUCCEEDED(hr), "Test %u: Failed to create texture, hr %#x.\n", i, hr);<br>
+ hr = IDirect3DRMTexture_InitFromFile(texture1, NULL);<br>
+ ok(hr == D3DRMERR_BADOBJECT, "Test %u: Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", i, hr);<br>
+ hr = IDirect3DRMTexture_InitFromFile(texture1, "");<br>
+ ok(hr == D3DRMERR_BADOBJECT, "Test %u: Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", i, hr);<br>
+ hr = IDirect3DRMTexture_InitFromFile(texture1, filename);<br>
+ ok(SUCCEEDED(hr), "Test %u: Failed to initialize texture from file, hr %#x.\n", i, hr);<br>
+ d3drm_img = IDirect3DRMTexture_GetImage(texture1);<br>
+ ok(!!d3drm_img, "Test %u: Failed to get image.\n", i);<br>
+ test_bitmap_data(i * 7 + 1, d3drm_img, FALSE, tests[i].w, tests[i].h, tests[i].palettized);<br>
IDirect3DRMTexture_Release(texture1);<br>
<br>
hr = IDirect3DRM2_LoadTexture(d3drm2, filename, &texture2);<br>
ok(SUCCEEDED(hr), "Test %u: Failed to load texture, hr %#x.\n", i, hr);<br>
+ ref2 = get_refcount((IUnknown *)d3drm1);<br>
+ todo_wine ok(ref2 > ref1, "Test %u: expected ref2 > ref1, got ref1 = %u, ref2 = %u.\n", i, ref1, ref2);<br>
+<br>
+ hr = IDirect3DRMTexture2_InitFromFile(texture2, filename);<br>
+ todo_wine ok(hr == D3DRMERR_BADOBJECT, "Test %u: Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", i, hr);<br>
+ if (FAILED(hr))<br>
+ IDirect3DRM_Release(d3drm1);<br>
d3drm_img = IDirect3DRMTexture2_GetImage(texture2);<br>
- todo_wine ok(!!d3drm_img, "Test %u: Failed to get image.\n", i);<br>
+ ok(!!d3drm_img, "Test %u: Failed to get image.\n", i);<br>
if (d3drm_img)<br>
- test_bitmap_data(i * 4 + 1, d3drm_img, TRUE, tests[i].w, tests[i].h, tests[i].palettized);<br>
+ test_bitmap_data(i * 7 + 2, d3drm_img, TRUE, tests[i].w, tests[i].h, tests[i].palettized);<br>
+ IDirect3DRMTexture2_Release(texture2);<br>
+ ref2 = get_refcount((IUnknown *)d3drm1);<br>
+ ok(ref1 == ref2, "Test %u: expected ref1 == ref2, got ref1 = %u, ref2 = %u.\n", i, ref1, ref2);<br>
+ hr = IDirect3DRM2_CreateObject(d3drm2, &CLSID_CDirect3DRMTexture, NULL, &IID_IDirect3DRMTexture2, (void **)&texture2);<br>
+ ok(SUCCEEDED(hr), "Test %u: Failed to create texture, hr %#x.\n", i, hr);<br>
+ hr = IDirect3DRMTexture2_InitFromFile(texture2, NULL);<br>
+ ok(hr == D3DRMERR_BADOBJECT, "Test %u: Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", i, hr);<br>
+ hr = IDirect3DRMTexture2_InitFromFile(texture2, "");<br>
+ ok(hr == D3DRMERR_BADOBJECT, "Test %u: Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", i, hr);<br>
+ hr = IDirect3DRMTexture2_InitFromFile(texture2, filename);<br>
+ ok(SUCCEEDED(hr), "Test %u: Failed to initialize texture from file, hr %#x.\n", i, hr);<br>
+ d3drm_img = IDirect3DRMTexture2_GetImage(texture2);<br>
+ ok(!!d3drm_img, "Test %u: Failed to get image.\n", i);<br>
+ test_bitmap_data(i * 7 + 3, d3drm_img, TRUE, tests[i].w, tests[i].h, tests[i].palettized);<br>
IDirect3DRMTexture2_Release(texture2);<br>
<br>
hr = IDirect3DRM3_LoadTexture(d3drm3, filename, &texture3);<br>
ok(SUCCEEDED(hr), "Test %u: Failed to load texture, hr %#x.\n", i, hr);<br>
+ ref2 = get_refcount((IUnknown *)d3drm1);<br>
+ todo_wine ok(ref2 > ref1, "Test %u: expected ref2 > ref1, got ref1 = %u, ref2 = %u.\n", i, ref1, ref2);<br>
+<br>
+ hr = IDirect3DRMTexture3_InitFromFile(texture3, filename);<br>
+ todo_wine ok(hr == D3DRMERR_BADOBJECT, "Test %u: Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", i, hr);<br>
+ if (FAILED(hr))<br>
+ IDirect3DRM_Release(d3drm1);<br>
d3drm_img = IDirect3DRMTexture3_GetImage(texture3);<br>
- todo_wine ok(!!d3drm_img, "Test %u: Failed to get image.\n", i);<br>
+ ok(!!d3drm_img, "Test %u: Failed to get image.\n", i);<br>
if (d3drm_img)<br>
test_bitmap_data(i * 4 + 2, d3drm_img, TRUE, tests[i].w, tests[i].h, tests[i].palettized);<br>
/* Test whether querying a version 1 texture from version 3 causes a<br>
@@ -5627,11 +5679,26 @@ static void test_load_texture(void)<br>
hr = IDirect3DRMTexture3_QueryInterface(texture3, &IID_IDirect3DRMTexture, (void **)&texture1);<br>
ok(SUCCEEDED(hr), "Failed to get IDirect3DRMTexture interface, hr %#x.\n", hr);<br>
d3drm_img = IDirect3DRMTexture_GetImage(texture1);<br>
- todo_wine ok(!!d3drm_img, "Test %u: Failed to get image.\n", i);<br>
+ ok(!!d3drm_img, "Test %u: Failed to get image.\n", i);<br>
if (d3drm_img)<br>
test_bitmap_data(i * 4 + 3, d3drm_img, TRUE, tests[i].w, tests[i].h, tests[i].palettized);<br>
IDirect3DRMTexture_Release(texture1);<br>
IDirect3DRMTexture3_Release(texture3);<br>
+ ref2 = get_refcount((IUnknown *)d3drm1);<br>
+ ok(ref1 == ref2, "Test %u: expected ref1 == ref2, got ref1 = %u, ref2 = %u.\n", i, ref1, ref2);<br>
+<br>
+ hr = IDirect3DRM3_CreateObject(d3drm3, &CLSID_CDirect3DRMTexture, NULL, &IID_IDirect3DRMTexture3, (void **)&texture3);<br>
+ ok(SUCCEEDED(hr), "Test %u: Failed to create texture, hr %#x.\n", i, hr);<br>
+ hr = IDirect3DRMTexture3_InitFromFile(texture3, NULL);<br>
+ ok(hr == D3DRMERR_BADOBJECT, "Test %u: Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", i, hr);<br>
+ hr = IDirect3DRMTexture3_InitFromFile(texture3, "");<br>
+ ok(hr == D3DRMERR_BADOBJECT, "Test %u: Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", i, hr);<br>
+ hr = IDirect3DRMTexture3_InitFromFile(texture3, filename);<br>
+ ok(SUCCEEDED(hr), "Test %u: Failed to initialize texture from file, hr %#x.\n", i, hr);<br>
+ d3drm_img = IDirect3DRMTexture3_GetImage(texture3);<br>
+ ok(!!d3drm_img, "Test %u: Failed to get image.\n", i);<br>
+ test_bitmap_data(i * 7 + 6, d3drm_img, TRUE, tests[i].w, tests[i].h, tests[i].palettized);<br>
+ IDirect3DRMTexture3_Release(texture3);<br>
<br>
ret = DeleteFileA(filename);<br>
ok(ret, "Test %u: Failed to delete bitmap \"%s\".\n", i, filename);<br>
diff --git a/dlls/d3drm/texture.c b/dlls/d3drm/texture.c<br>
index fd56e76ff9..4c81c788bf 100644<br>
--- a/dlls/d3drm/texture.c<br>
+++ b/dlls/d3drm/texture.c<br>
@@ -2,6 +2,7 @@<br>
* Implementation of IDirect3DRMTextureX interfaces<br>
*<br>
* Copyright 2012 Christian Costa<br>
+ * Copyright 2016 Aaryaman Vasishta<br>
*<br>
* This library is free software; you can redistribute it and/or<br>
* modify it under the terms of the GNU Lesser General Public<br>
@@ -67,6 +68,294 @@ static BOOL d3drm_validate_image(D3DRMIMAGE *image)<br>
return TRUE;<br>
}<br>
<br>
+static void CDECL destroy_image_callback(IDirect3DRMObject *obj, void *arg)<br>
+{<br>
+ D3DRMIMAGE *image = arg;<br>
+<br>
+ TRACE("image %p texture object %p.\n", arg, obj);<br>
+<br>
+ HeapFree(GetProcessHeap(), 0, image->buffer1);<br>
+ HeapFree(GetProcessHeap(), 0, image);<br>
+}<br>
+<br>
+HRESULT d3drm_texture_load(struct d3drm_texture *texture, const char *path, BOOL load_upside_down, D3DRMIMAGE **image_out)<br>
+{<br>
+ BITMAPINFO *info;<br>
+ BITMAPFILEHEADER *bmp_header;<br>
+ unsigned char *buffer;<br>
+ DWORD size;<br>
+ HANDLE hfile, hmapping;<br>
+ HRESULT hr = D3DRM_OK;<br>
+ D3DRMPALETTEENTRY *colors = NULL;<br>
+ D3DRMIMAGE *image = NULL;<br>
+ BOOL black_used = FALSE, palette_used;<br>
+ LONG w;<br>
+ LONG h;<br>
+ UINT i, j, k;<br>
+ UINT idx, buffer1_idx;<br>
+ unsigned char *buffer1;<br>
+ UINT bpp;<br>
+ UINT bpl;<br>
+ UINT num_colors = 0;<br>
+ struct colors_24bpp<br>
+ {<br>
+ BYTE red;<br>
+ BYTE green;<br>
+ BYTE blue;<br>
+ } *color = NULL;<br>
+<br>
+ /* Load the bitmap data */<br>
+ hfile = CreateFileA(path, GENERIC_READ, FILE_SHARE_READ, 0, OPEN_EXISTING, 0, 0);<br>
+ if (hfile == INVALID_HANDLE_VALUE)<br>
+ return D3DRMERR_BADOBJECT;<br>
+<br>
+ size = GetFileSize(hfile, NULL);<br>
+ if (size == INVALID_FILE_SIZE)<br>
+ {<br>
+ CloseHandle(hfile);<br>
+ return D3DRMERR_BADVALUE;<br>
+ }<br>
+ if (!(hmapping = CreateFileMappingA(hfile, NULL, PAGE_READONLY, 0, 0, NULL)))<br>
+ {<br>
+ CloseHandle(hfile);<br>
+ return D3DRMERR_BADVALUE;<br>
+ }<br>
+ if (!(buffer = MapViewOfFile(hmapping, FILE_MAP_READ, 0, 0, 0)))<br>
+ {<br>
+ CloseHandle(hmapping);<br>
+ CloseHandle(hfile);<br>
+ return D3DRMERR_BADVALUE;<br>
+ }<br>
+<br>
+ bmp_header = (BITMAPFILEHEADER *)buffer;<br>
+ if (bmp_header->bfType != 0x4d42) /* BM */<br>
+ {<br>
+ hr = D3DRMERR_BADFILE;<br>
+ goto cleanup;<br>
+ }<br>
+<br>
+ info = (BITMAPINFO *)(bmp_header + 1);<br>
+ /* Only allow version 1 DIB's (BITMAPINFOHEADER) to be loaded */<br>
+ if (info->bmiHeader.biSize != sizeof(info->bmiHeader))<br>
+ {<br>
+ hr = D3DRMERR_BADFILE;<br>
+ goto cleanup;<br>
+ }<br>
+<br>
+ bpp = info->bmiHeader.biBitCount == 24 ? 32 : info->bmiHeader.biBitCount;<br>
+ w = info->bmiHeader.biWidth;<br>
+ h = abs(info->bmiHeader.biHeight);<br>
+<br>
+ if (bpp == 8)<br>
+ {<br>
+ buffer += sizeof(BITMAPINFOHEADER) + sizeof(BITMAPFILEHEADER) + 256 * sizeof(RGBQUAD);<br>
+ palette_used = TRUE;<br>
+ }<br>
+ else if (bpp == 32)<br>
+ {<br>
+ buffer += sizeof(BITMAPINFOHEADER) + sizeof(BITMAPFILEHEADER);<br>
+ palette_used = FALSE;<br>
+ }<br>
+ else<br>
+ {<br>
+ hr = D3DRMERR_BADFILE;<br>
+ goto cleanup;<br>
+ }<br>
+<br>
+ /* Create and initialize the image struct. */<br>
+ color = (struct colors_24bpp *)buffer;<br>
+<br>
+ if (palette_used)<br>
+ bpl = w;<br>
+ else if ((bpl = ((w + 3) & ~3)) > UINT_MAX / (bpp / 8))<br>
+ {<br>
+ hr = D3DRMERR_BADALLOC;<br>
+ goto cleanup;<br>
+ }<br>
+<br>
+ bpl = bpl * bpp / 8;<br>
+<br>
+ if (bpl > UINT_MAX / h)<br>
+ {<br>
+ hr = D3DRMERR_BADALLOC;<br>
+ goto cleanup;<br>
+ }<br>
+<br>
+ if (!(colors = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, 256 * sizeof(*colors))))<br>
+ {<br>
+ WARN("Not enough memory to allocate palette, returning NULL.\n");<br>
+ hr = D3DRMERR_BADALLOC;<br>
+ goto cleanup;<br>
+ }<br>
+<br>
+ if (!(image = HeapAlloc(GetProcessHeap(), 0, sizeof(*image))))<br>
+ {<br>
+ WARN("Not enough memory to allocate image struct, returning NULL.\n");<br>
+ hr = D3DRMERR_BADALLOC;<br>
+ goto cleanup;<br>
+ }<br>
+ image->buffer1 = NULL;<br>
+<br>
+ if (!(image->buffer1 = HeapAlloc(GetProcessHeap(), 0, bpl * h)))<br>
+ {<br>
+ WARN("Not enough memory to allocate image buffer, returning NULL.\n");<br>
+ hr = D3DRMERR_BADALLOC;<br>
+ goto cleanup;<br>
+ }<br>
+<br>
+ buffer1 = image->buffer1;<br>
+ memset(buffer1, 0xff, bpl * h);<br>
+ if (!palette_used)<br>
+ {<br>
+ for (i = 0; i < h; i++)<br>
+ {<br>
+ for (j = 0; j < w; j++)<br>
+ {<br>
+ buffer1_idx = ((w + 3) & ~3) * i + j;<br>
+ idx = load_upside_down ? (h - 1 - i) * w + j : i * w + j;<br>
+ for (k = 0; k < 256; k++)<br>
+ {<br>
+ if (color[idx].blue == colors[k].blue &&<br>
+ color[idx].green == colors[k].green &&<br>
+ color[idx].red == colors[k].red)<br>
+ {<br>
+ if (color[idx].blue == 0 &&<br>
+ color[idx].green == 0 &&<br>
+ color[idx].red == 0 &&<br>
+ !black_used)<br>
+ {<br>
+ black_used = TRUE;<br>
+ colors[num_colors++].flags = D3DRMPALETTE_READONLY;<br>
+ }<br>
+ buffer1[buffer1_idx] = k;<br>
+<br>
+ break;<br>
+ }<br>
+ }<br>
+ if (k == 256)<br>
+ {<br>
+ if (num_colors == 256)<br>
+ {<br>
+ num_colors++;<br>
+ i = h;<br>
+ break;<br>
+ }<br>
+ buffer1[buffer1_idx] = num_colors;<br>
+ colors[num_colors].red = color[idx].red;<br>
+ colors[num_colors].green = color[idx].green;<br>
+ colors[num_colors].blue = color[idx].blue;<br>
+ colors[num_colors++].flags = D3DRMPALETTE_READONLY;<br>
+ }<br>
+ }<br>
+ }<br>
+<br>
+ if (num_colors <= 256)<br>
+ {<br>
+ if (!(image->palette = HeapAlloc(GetProcessHeap(), 0, num_colors * sizeof(*image->palette))))<br>
+ {<br>
+ WARN("Not enough memory to allocate image palette, returning NULL.\n");<br>
+ hr = D3DRMERR_BADALLOC;<br>
+ goto cleanup;<br>
+ }<br>
+ image->red_mask = 0xff;<br>
+ image->green_mask = 0xff;<br>
+ image->blue_mask = 0xff;<br>
+ image->rgb = 0;<br>
+ bpl = bpl / (bpp / 8);<br>
+ memcpy(image->palette, colors, num_colors * sizeof(D3DRMPALETTEENTRY));<br>
+ image->palette_size = num_colors;<br>
+ palette_used = TRUE;<br>
+ }<br>
+ else<br>
+ {<br>
+ bpl = w * 4;<br>
+ image->rgb = 1;<br>
+ image->palette = NULL;<br>
+ image->palette_size = 0;<br>
+ for (i = 0; i < h; ++i)<br>
+ {<br>
+ for (j = 0; j < w; ++j)<br>
+ {<br>
+ unsigned char *ptr = &buffer1[i * bpl + j * 4];<br>
+ idx = load_upside_down ? (h - 1 - i) * w * 3 + j * 3 : i * w * 3 + j * 3;<br>
+ ptr[0] = buffer[idx];<br>
+ ptr[1] = buffer[idx + 1];<br>
+ ptr[2] = buffer[idx + 2];<br>
+ ptr[3] = 0xff;<br>
+ }<br>
+ }<br>
+<br>
+ image->red_mask = 0xff0000;<br>
+ image->green_mask = 0x00ff00;<br>
+ image->blue_mask = 0x0000ff;<br>
+ }<br>
+ }<br>
+ else<br>
+ {<br>
+ if (!(image->palette = HeapAlloc(GetProcessHeap(), 0, 256 * sizeof(*image->palette))))<br>
+ {<br>
+ WARN("Not enough memory to allocate image palette, returning NULL.\n");<br>
+ hr = D3DRMERR_BADALLOC;<br>
+ goto cleanup;<br>
+ }<br>
+<br>
+ memcpy(image->palette, info->bmiColors, 256 * sizeof(D3DRMPALETTEENTRY));<br>
+ for (i = 0; i < 256; i++)<br>
+ {<br>
+ image->palette[i].flags = D3DRMPALETTE_READONLY;<br>
+ }<br>
+ if (load_upside_down)<br>
+ {<br>
+ for (i = 0; i < h; i++)<br>
+ {<br>
+ for (j = 0; j < w; j++)<br>
+ {<br>
+ idx = (h - 1 - i) * bpl + j;<br>
+ buffer1[i * bpl + j] = buffer[idx];<br>
+ }<br>
+ }<br>
+ }<br>
+ else<br>
+ {<br>
+ memcpy(buffer1, buffer, bpl * h);<br>
+ }<br>
+ image->palette_size = 256;<br>
+ image->red_mask = 0xff;<br>
+ image->green_mask = 0xff;<br>
+ image->blue_mask = 0xff;<br>
+ image->rgb = 0;<br>
+ }<br>
+ image->width = w;<br>
+ image->height = h;<br>
+ image->aspectx = 1;<br>
+ image->aspecty = 1;<br>
+ image->alpha_mask = 0;<br>
+ image->depth = palette_used ? 8 : bpp;<br>
+ image->bytes_per_line = bpl;<br>
+ image->buffer2 = NULL;<br>
+<br>
+ /* Use an internal destroy callback to destroy image struct */<br>
+ hr = IDirect3DRMObject_AddDestroyCallback(&texture->IDirect3DRMTexture3_iface, destroy_image_callback, image);<br>
+<br>
+ *image_out = image;<br>
+<br>
+cleanup:<br>
+ UnmapViewOfFile(buffer);<br>
+ CloseHandle(hmapping);<br>
+ CloseHandle(hfile);<br>
+<br>
+ HeapFree(GetProcessHeap(), 0, colors);<br>
+<br>
+ if (FAILED(hr))<br>
+ {<br>
+ if (image)<br>
+ HeapFree(GetProcessHeap(), 0, image->buffer1);<br>
+ HeapFree(GetProcessHeap(), 0, image);<br>
+ }<br>
+<br>
+ return hr;<br>
+}<br>
+<br>
static HRESULT WINAPI d3drm_texture1_QueryInterface(IDirect3DRMTexture *iface, REFIID riid, void **out)<br>
{<br>
struct d3drm_texture *texture = impl_from_IDirect3DRMTexture(iface);<br>
@@ -171,9 +460,18 @@ static HRESULT WINAPI d3drm_texture1_GetClassName(IDirect3DRMTexture *iface, DWO<br>
<br>
static HRESULT WINAPI d3drm_texture1_InitFromFile(IDirect3DRMTexture *iface, const char *filename)<br>
{<br>
- FIXME("iface %p, filename %s stub!\n", iface, debugstr_a(filename));<br>
+ struct d3drm_texture *texture = impl_from_IDirect3DRMTexture(iface);<br>
+ D3DRMIMAGE *image;<br>
+ HRESULT hr;<br>
<br>
- return E_NOTIMPL;<br>
+ TRACE("iface %p, filename %s.\n", iface, debugstr_a(filename));<br>
+<br>
+ if (FAILED(hr = d3drm_texture_load(texture, filename, FALSE, &image)))<br>
+ return hr;<br>
+<br>
+ hr = IDirect3DRMTexture3_InitFromImage(&texture->IDirect3DRMTexture3_iface, image);<br>
+<br>
+ return hr;<br>
}<br>
<br>
static HRESULT WINAPI d3drm_texture1_InitFromSurface(IDirect3DRMTexture *iface,<br>
@@ -473,9 +771,15 @@ static HRESULT WINAPI d3drm_texture2_GetClassName(IDirect3DRMTexture2 *iface, DW<br>
<br>
static HRESULT WINAPI d3drm_texture2_InitFromFile(IDirect3DRMTexture2 *iface, const char *filename)<br>
{<br>
- FIXME("iface %p, filename %s stub!\n", iface, debugstr_a(filename));<br>
+ struct d3drm_texture *object = impl_from_IDirect3DRMTexture2(iface);<br>
+ HRESULT hr;<br>
<br>
- return E_NOTIMPL;<br>
+ TRACE("iface %p, filename %s.\n", iface, debugstr_a(filename));<br>
+<br>
+ if (FAILED(hr = IDirect3DRMTexture3_InitFromFile(&object->IDirect3DRMTexture3_iface, filename)))<br>
+ return hr;<br>
+<br>
+ return D3DRM_OK;<br>
}<br>
<br>
static HRESULT WINAPI d3drm_texture2_InitFromSurface(IDirect3DRMTexture2 *iface,<br>
@@ -833,9 +1137,18 @@ static HRESULT WINAPI d3drm_texture3_GetClassName(IDirect3DRMTexture3 *iface, DW<br>
<br>
static HRESULT WINAPI d3drm_texture3_InitFromFile(IDirect3DRMTexture3 *iface, const char *filename)<br>
{<br>
- FIXME("iface %p, filename %s stub!\n", iface, debugstr_a(filename));<br>
+ struct d3drm_texture *texture = impl_from_IDirect3DRMTexture3(iface);<br>
+ D3DRMIMAGE *image;<br>
+ HRESULT hr;<br>
<br>
- return E_NOTIMPL;<br>
+ TRACE("iface %p, filename %s.\n", iface, debugstr_a(filename));<br>
+<br>
+ if (FAILED(hr = d3drm_texture_load(texture, filename, TRUE, &image)))<br>
+ return hr;<br>
+<br>
+ hr = IDirect3DRMTexture3_InitFromImage(iface, image);<br>
+<br>
+ return hr;<br>
}<br>
<br>
static HRESULT WINAPI d3drm_texture3_InitFromSurface(IDirect3DRMTexture3 *iface,<br>
-- <br>
2.17.1<br>
<br>
</blockquote></div>