[PATCH] d3drm: Partially Implement IDirect3DRM*::LoadTexture(v3).
Aaryaman Vasishta
jem456.vasishta at gmail.com
Mon Mar 28 13:02:04 CDT 2016
v3: Add bitmap verification, use InitFromFile and other minor improvements.
Signed-off-by: Aaryaman Vasishta <jem456.vasishta at gmail.com>
---
dlls/d3drm/Makefile.in | 2 +-
dlls/d3drm/d3drm.c | 32 ++++-
dlls/d3drm/d3drm_private.h | 11 ++
dlls/d3drm/tests/d3drm.c | 84 ++++++++++--
dlls/d3drm/texture.c | 321 +++++++++++++++++++++++++++++++++++++++++++--
5 files changed, 425 insertions(+), 25 deletions(-)
diff --git a/dlls/d3drm/Makefile.in b/dlls/d3drm/Makefile.in
index 5db3494..c923e74 100644
--- a/dlls/d3drm/Makefile.in
+++ b/dlls/d3drm/Makefile.in
@@ -1,6 +1,6 @@
MODULE = d3drm.dll
IMPORTLIB = d3drm
-IMPORTS = dxguid uuid d3dxof ddraw
+IMPORTS = dxguid uuid d3dxof ddraw gdi32
C_SRCS = \
d3drm.c \
diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c
index fe33315..2252b9a 100644
--- a/dlls/d3drm/d3drm.c
+++ b/dlls/d3drm/d3drm.c
@@ -414,11 +414,19 @@ static HRESULT WINAPI d3drm1_LoadTexture(IDirect3DRM *iface,
struct d3drm_texture *object;
HRESULT hr;
- FIXME("iface %p, filename %s, texture %p stub!\n", iface, debugstr_a(filename), texture);
+ TRACE("iface %p, filename %s, texture %p.\n", iface, debugstr_a(filename), texture);
if (FAILED(hr = d3drm_texture_create(&object)))
return hr;
+ if (FAILED(hr = IDirect3DRMTexture_InitFromFile(&object->IDirect3DRMTexture_iface, filename)))
+ {
+ d3drm_texture_destroy(object);
+ return hr;
+ }
+
+ object->d3drm = iface;
+ IDirect3DRM_AddRef(iface);
*texture = &object->IDirect3DRMTexture_iface;
return D3DRM_OK;
@@ -853,14 +861,23 @@ static HRESULT WINAPI d3drm2_CreateUserVisual(IDirect3DRM2 *iface,
static HRESULT WINAPI d3drm2_LoadTexture(IDirect3DRM2 *iface,
const char *filename, IDirect3DRMTexture2 **texture)
{
+ struct d3drm *d3drm = impl_from_IDirect3DRM2(iface);
struct d3drm_texture *object;
HRESULT hr;
- FIXME("iface %p, filename %s, texture %p stub!\n", iface, debugstr_a(filename), texture);
+ TRACE("iface %p, filename %s, texture %p.\n", iface, debugstr_a(filename), texture);
if (FAILED(hr = d3drm_texture_create(&object)))
return hr;
+ if (FAILED(hr = IDirect3DRMTexture2_InitFromFile(&object->IDirect3DRMTexture2_iface, filename)))
+ {
+ d3drm_texture_destroy(object);
+ return hr;
+ }
+
+ object->d3drm = &d3drm->IDirect3DRM_iface;
+ IDirect3DRM_AddRef(object->d3drm);
*texture = &object->IDirect3DRMTexture2_iface;
return D3DRM_OK;
@@ -1352,14 +1369,23 @@ static HRESULT WINAPI d3drm3_CreateUserVisual(IDirect3DRM3 *iface,
static HRESULT WINAPI d3drm3_LoadTexture(IDirect3DRM3 *iface,
const char *filename, IDirect3DRMTexture3 **texture)
{
+ struct d3drm *d3drm = impl_from_IDirect3DRM3(iface);
struct d3drm_texture *object;
HRESULT hr;
- FIXME("iface %p, filename %s, texture %p stub!\n", iface, debugstr_a(filename), texture);
+ TRACE("iface %p, filename %s, texture %p.\n", iface, debugstr_a(filename), texture);
if (FAILED(hr = d3drm_texture_create(&object)))
return hr;
+ if (FAILED(hr = IDirect3DRMTexture3_InitFromFile(&object->IDirect3DRMTexture3_iface, filename)))
+ {
+ d3drm_texture_destroy(object);
+ return hr;
+ }
+
+ object->d3drm = &d3drm->IDirect3DRM_iface;
+ IDirect3DRM_AddRef(object->d3drm);
*texture = &object->IDirect3DRMTexture3_iface;
return D3DRM_OK;
diff --git a/dlls/d3drm/d3drm_private.h b/dlls/d3drm/d3drm_private.h
index 5452b36..22ef8fc 100644
--- a/dlls/d3drm/d3drm_private.h
+++ b/dlls/d3drm/d3drm_private.h
@@ -23,6 +23,7 @@
#include "d3drm.h"
#include "dxfile.h"
+#include <limits.h>
#include "wine/list.h"
@@ -39,6 +40,9 @@ struct d3drm_texture
IDirect3DRMTexture IDirect3DRMTexture_iface;
IDirect3DRMTexture2 IDirect3DRMTexture2_iface;
IDirect3DRMTexture3 IDirect3DRMTexture3_iface;
+ IDirect3DRM *d3drm;
+ D3DRMIMAGE *image;
+ BOOL internal_image_created;
LONG ref;
DWORD app_data;
};
@@ -74,6 +78,13 @@ HRESULT d3drm_device_init(struct d3drm_device *device, UINT version, IDirect3DRM
HRESULT d3drm_device_set_ddraw_device_d3d(struct d3drm_device *device, IDirect3DRM *d3drm, IDirect3D *d3d, IDirect3DDevice *d3d_device) DECLSPEC_HIDDEN;
+void d3drm_texture_destroy(struct d3drm_texture *texture) DECLSPEC_HIDDEN;
+
+HRESULT d3drm_texture_load(struct d3drm_texture *texture, IDirect3DRM *d3drm, const char *path,
+ BOOL load_upside_down) DECLSPEC_HIDDEN;
+
+D3DRMIMAGE *d3drm_create_image(unsigned char *buffer, BITMAPINFO *info, BOOL palette, BOOL upside_down) DECLSPEC_HIDDEN;
+
struct d3drm_file_header
{
WORD major;
diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c
index d973d88..75db1d8 100644
--- a/dlls/d3drm/tests/d3drm.c
+++ b/dlls/d3drm/tests/d3drm.c
@@ -4079,6 +4079,7 @@ static void test_load_texture(void)
char *filename;
HRESULT hr;
BOOL ret;
+ ULONG ref1, ref2;
int i;
static const struct
@@ -4102,6 +4103,7 @@ static void test_load_texture(void)
ok(SUCCEEDED(hr), "Failed to get IDirect3DRM2 interface, hr %#x.\n", hr);
hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM3, (void **)&d3drm3);
ok(SUCCEEDED(hr), "Failed to get IDirect3DRM3 interface, hr %#x.\n", hr);
+ ref1 = get_refcount((IUnknown *)d3drm1);
for (i = 0; i < sizeof(tests) / sizeof(*tests); ++i)
{
@@ -4109,36 +4111,94 @@ static void test_load_texture(void)
hr = IDirect3DRM_LoadTexture(d3drm1, filename, &texture1);
ok(SUCCEEDED(hr), "Test %u: Failed to load texture, hr %#x.\n", i, hr);
+ ref2 = get_refcount((IUnknown *)d3drm1);
+ ok(ref2 > ref1, "Test %u: expected ref2 > ref1, got ref1 = %u, ref2 = %u.\n", i, ref1, ref2);
+
+ hr = IDirect3DRMTexture_InitFromFile(texture1, filename);
+ ok(hr == D3DRMERR_BADOBJECT, "Test %u: Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", i, hr);
+ /* It's odd, but InitFromFile seems to AddRef IDirect3DRM even if it fails. */
+ IDirect3DRM_Release(d3drm1);
+
d3drm_img = IDirect3DRMTexture_GetImage(texture1);
- todo_wine ok(!!d3drm_img, "Test %u: Failed to get image.\n", i);
- if (d3drm_img)
- test_bitmap_data(i * 4, d3drm_img, FALSE, tests[i].w, tests[i].h, tests[i].palettized);
+ ok(!!d3drm_img, "Test %u: Failed to get image.\n", i);
+ test_bitmap_data(i * 7, d3drm_img, FALSE, tests[i].w, tests[i].h, tests[i].palettized);
IDirect3DRMTexture_Release(texture1);
+ ref2 = get_refcount((IUnknown *)d3drm1);
+ ok(ref1 == ref2, "Test %u: expected ref1 == ref2, got ref1 = %u, ref2 = %u.\n", i, ref1, ref2);
+ hr = IDirect3DRM_CreateObject(d3drm1, &CLSID_CDirect3DRMTexture, NULL, &IID_IDirect3DRMTexture, (void **)&texture1);
+ todo_wine ok(SUCCEEDED(hr), "Test %u: Failed to create texture, hr %#x.\n", i, hr);
+ if (SUCCEEDED(hr))
+ {
+ hr = IDirect3DRMTexture_InitFromFile(texture1, filename);
+ ok(SUCCEEDED(hr), "Test %u: Failed to initialize texture from file, hr %#x.\n", i, hr);
+ d3drm_img = IDirect3DRMTexture_GetImage(texture1);
+ ok(!!d3drm_img, "Test %u: Failed to get image.\n", i);
+ test_bitmap_data(i * 7 + 1, d3drm_img, FALSE, tests[i].w, tests[i].h, tests[i].palettized);
+ IDirect3DRMTexture_Release(texture1);
+ }
hr = IDirect3DRM2_LoadTexture(d3drm2, filename, &texture2);
ok(SUCCEEDED(hr), "Test %u: Failed to load texture, hr %#x.\n", i, hr);
+ ref2 = get_refcount((IUnknown *)d3drm1);
+ ok(ref2 > ref1, "Test %u: expected ref2 > ref1, got ref1 = %u, ref2 = %u.\n", i, ref1, ref2);
+
+ hr = IDirect3DRMTexture2_InitFromFile(texture2, filename);
+ ok(hr == D3DRMERR_BADOBJECT, "Test %u: Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", i, hr);
+ IDirect3DRM_Release(d3drm1);
+
d3drm_img = IDirect3DRMTexture2_GetImage(texture2);
- todo_wine ok(!!d3drm_img, "Test %u: Failed to get image.\n", i);
- if (d3drm_img)
- test_bitmap_data(i * 4 + 1, d3drm_img, TRUE, tests[i].w, tests[i].h, tests[i].palettized);
+ ok(!!d3drm_img, "Test %u: Failed to get image.\n", i);
+ test_bitmap_data(i * 7 + 2, d3drm_img, TRUE, tests[i].w, tests[i].h, tests[i].palettized);
IDirect3DRMTexture2_Release(texture2);
+ ref2 = get_refcount((IUnknown *)d3drm1);
+ ok(ref1 == ref2, "Test %u: expected ref1 == ref2, got ref1 = %u, ref2 = %u.\n", i, ref1, ref2);
+ hr = IDirect3DRM2_CreateObject(d3drm2, &CLSID_CDirect3DRMTexture, NULL, &IID_IDirect3DRMTexture2, (void **)&texture2);
+ todo_wine ok(SUCCEEDED(hr), "Test %u: Failed to create texture, hr %#x.\n", i, hr);
+ if (SUCCEEDED(hr))
+ {
+ hr = IDirect3DRMTexture2_InitFromFile(texture2, filename);
+ ok(SUCCEEDED(hr), "Test %u: Failed to initialize texture from file, hr %#x.\n", i, hr);
+ d3drm_img = IDirect3DRMTexture2_GetImage(texture2);
+ ok(!!d3drm_img, "Test %u: Failed to get image.\n", i);
+ test_bitmap_data(i * 7 + 3, d3drm_img, TRUE, tests[i].w, tests[i].h, tests[i].palettized);
+ IDirect3DRMTexture2_Release(texture2);
+ }
hr = IDirect3DRM3_LoadTexture(d3drm3, filename, &texture3);
ok(SUCCEEDED(hr), "Test %u: Failed to load texture, hr %#x.\n", i, hr);
+ ref2 = get_refcount((IUnknown *)d3drm1);
+ ok(ref2 > ref1, "Test %u: expected ref2 > ref1, got ref1 = %u, ref2 = %u.\n", i, ref1, ref2);
+
+ hr = IDirect3DRMTexture3_InitFromFile(texture3, filename);
+ ok(hr == D3DRMERR_BADOBJECT, "Test %u: Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", i, hr);
+ IDirect3DRM_Release(d3drm1);
+
d3drm_img = IDirect3DRMTexture3_GetImage(texture3);
- todo_wine ok(!!d3drm_img, "Test %u: Failed to get image.\n", i);
- if (d3drm_img)
- test_bitmap_data(i * 4 + 2, d3drm_img, TRUE, tests[i].w, tests[i].h, tests[i].palettized);
+ ok(!!d3drm_img, "Test %u: Failed to get image.\n", i);
+ test_bitmap_data(i * 7 + 4, d3drm_img, TRUE, tests[i].w, tests[i].h, tests[i].palettized);
/* Test whether querying a version 1 texture from version 3 causes a
* change in the loading behavior. */
hr = IDirect3DRMTexture3_QueryInterface(texture3, &IID_IDirect3DRMTexture, (void **)&texture1);
ok(SUCCEEDED(hr), "Failed to get IDirect3DRMTexture interface, hr %#x.\n", hr);
d3drm_img = IDirect3DRMTexture_GetImage(texture1);
- todo_wine ok(!!d3drm_img, "Test %u: Failed to get image.\n", i);
- if (d3drm_img)
- test_bitmap_data(i * 4 + 3, d3drm_img, TRUE, tests[i].w, tests[i].h, tests[i].palettized);
+ ok(!!d3drm_img, "Test %u: Failed to get image.\n", i);
+ test_bitmap_data(i * 7 + 5, d3drm_img, TRUE, tests[i].w, tests[i].h, tests[i].palettized);
IDirect3DRMTexture_Release(texture1);
IDirect3DRMTexture3_Release(texture3);
+ ref2 = get_refcount((IUnknown *)d3drm1);
+ ok(ref1 == ref2, "Test %u: expected ref1 == ref2, got ref1 = %u, ref2 = %u.\n", i, ref1, ref2);
+
+ hr = IDirect3DRM3_CreateObject(d3drm3, &CLSID_CDirect3DRMTexture, NULL, &IID_IDirect3DRMTexture3, (void **)&texture3);
+ todo_wine ok(SUCCEEDED(hr), "Test %u: Failed to create texture, hr %#x.\n", i, hr);
+ if (SUCCEEDED(hr))
+ {
+ hr = IDirect3DRMTexture3_InitFromFile(texture3, filename);
+ ok(SUCCEEDED(hr), "Test %u: Failed to initialize texture from file, hr %#x.\n", i, hr);
+ d3drm_img = IDirect3DRMTexture3_GetImage(texture3);
+ ok(!!d3drm_img, "Test %u: Failed to get image.\n", i);
+ test_bitmap_data(i * 7 + 6, d3drm_img, TRUE, tests[i].w, tests[i].h, tests[i].palettized);
+ IDirect3DRMTexture3_Release(texture3);
+ }
ret = DeleteFileA(filename);
ok(ret, "Test %u: Failed to delete bitmap \"%s\".\n", i, filename);
diff --git a/dlls/d3drm/texture.c b/dlls/d3drm/texture.c
index 1ca7074..4dbc80d 100644
--- a/dlls/d3drm/texture.c
+++ b/dlls/d3drm/texture.c
@@ -2,6 +2,7 @@
* Implementation of IDirect3DRMTextureX interfaces
*
* Copyright 2012 Christian Costa
+ * Copyright 2016 Aaryaman Vasishta
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -44,6 +45,272 @@ static inline struct d3drm_texture *impl_from_IDirect3DRMTexture3(IDirect3DRMTex
return CONTAINING_RECORD(iface, struct d3drm_texture, IDirect3DRMTexture3_iface);
}
+void d3drm_texture_destroy(struct d3drm_texture *texture)
+{
+ if (texture->image)
+ {
+ TRACE("Releasing attached members.\n");
+ HeapFree(GetProcessHeap(), 0, texture->image->buffer1);
+ if (texture->internal_image_created)
+ {
+ if (texture->image->palette)
+ HeapFree(GetProcessHeap(), 0, texture->image->palette);
+ HeapFree(GetProcessHeap(), 0, texture->image);
+ }
+ IDirect3DRM_Release(texture->d3drm);
+ }
+ TRACE("Releasing texture.\n");
+ HeapFree(GetProcessHeap(), 0, texture);
+}
+
+HRESULT d3drm_texture_load(struct d3drm_texture *texture, IDirect3DRM *d3drm, const char *path, BOOL load_upside_down)
+{
+ BITMAPINFO *info;
+ BITMAPFILEHEADER *bmp_header;
+ unsigned char *buffer;
+ DWORD size;
+ HANDLE hfile, hmapping;
+ HRESULT hr = D3DRM_OK;
+
+ hfile = CreateFileA(path, GENERIC_READ, FILE_SHARE_READ, 0, OPEN_EXISTING, 0, 0);
+ if (hfile == INVALID_HANDLE_VALUE)
+ return D3DRMERR_BADFILE;
+
+ size = GetFileSize(hfile, NULL);
+ if (size == INVALID_FILE_SIZE)
+ {
+ CloseHandle(hfile);
+ return D3DRMERR_BADVALUE;
+ }
+ if (!(hmapping = CreateFileMappingA(hfile, NULL, PAGE_READONLY, 0, 0, NULL)))
+ {
+ CloseHandle(hfile);
+ return D3DRMERR_BADVALUE;
+ }
+ if (!(buffer = MapViewOfFile(hmapping, FILE_MAP_READ, 0, 0, 0)))
+ {
+ CloseHandle(hmapping);
+ CloseHandle(hfile);
+ return D3DRMERR_BADVALUE;
+ }
+
+ bmp_header = (BITMAPFILEHEADER *)buffer;
+ if (bmp_header->bfType != 0x4d42) /* BM */
+ {
+ hr = D3DRMERR_BADFILE;
+ goto cleanup;
+ }
+
+ info = (BITMAPINFO *)(bmp_header + 1);
+ /* Only allow version 1 DIB's (BITMAPINFOHEADER) to be loaded */
+ if (info->bmiHeader.biSize != sizeof(info->bmiHeader))
+ {
+ hr = D3DRMERR_BADFILE;
+ goto cleanup;
+ }
+
+ if (info->bmiHeader.biBitCount == 8)
+ texture->image = d3drm_create_image(buffer + sizeof(BITMAPINFOHEADER) + sizeof(BITMAPFILEHEADER) + 256 * sizeof(RGBQUAD), info, TRUE, load_upside_down);
+ else if (info->bmiHeader.biBitCount == 24)
+ texture->image = d3drm_create_image(buffer + sizeof(BITMAPINFOHEADER) + sizeof(BITMAPFILEHEADER), info, FALSE, load_upside_down);
+ else
+ {
+ hr = D3DRMERR_BADFILE;
+ goto cleanup;
+ }
+
+ if (!texture->image)
+ {
+ hr = D3DRMERR_BADALLOC;
+ goto cleanup;
+ }
+
+ texture->internal_image_created = TRUE;
+
+cleanup:
+ UnmapViewOfFile(buffer);
+ CloseHandle(hmapping);
+ CloseHandle(hfile);
+
+ return hr;
+}
+
+D3DRMIMAGE *d3drm_create_image(unsigned char *buffer, BITMAPINFO *info, BOOL palette, BOOL upside_down)
+{
+ D3DRMPALETTEENTRY *colors;
+ D3DRMIMAGE *image;
+ BOOL black_used = FALSE;
+ LONG w = info->bmiHeader.biWidth;
+ LONG h = abs(info->bmiHeader.biHeight);
+ int i, j, k;
+ unsigned int idx, buffer1_idx;
+ unsigned char *buffer1;
+ int bpp = info->bmiHeader.biBitCount == 24 ? 32 : info->bmiHeader.biBitCount;
+ int bpl = palette ? w : ((w + 3) & ~3) * bpp / 8;
+ int num_colors = 0;
+ struct colors_24bpp
+ {
+ BYTE red;
+ BYTE green;
+ BYTE blue;
+ } *color;
+ color = (struct colors_24bpp *)buffer;
+
+ if (bpl * h > UINT_MAX)
+ {
+ return NULL;
+ }
+
+ if (!(colors = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, 256 * sizeof(*colors))))
+ {
+ WARN("Not enough memory to allocate palette, returning NULL.\n");
+ return NULL;
+ }
+
+
+ if (!(image = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*image))))
+ {
+ WARN("Not enough memory to allocate image struct, returning NULL.\n");
+ return NULL;
+ }
+
+ if (!(image->buffer1 = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, bpl * h)))
+ {
+ WARN("Not enough memory to allocate image buffer, returning NULL.\n");
+ return NULL;
+ }
+
+ buffer1 = image->buffer1;
+ memset(buffer1, 255, sizeof(unsigned char) * bpl * h);
+ if (!palette)
+ {
+
+ for (i = 0; i < h; i++)
+ {
+ for (j = 0; j < w; j++)
+ {
+ buffer1_idx = ((w + 3) & ~3) * i + j;
+ idx = upside_down ? (h - 1 - i) * w + j : i * w + j;
+ for (k = 0; k < 256; k++)
+ {
+ if (color[idx].blue == colors[k].blue &&
+ color[idx].green == colors[k].green &&
+ color[idx].red == colors[k].red)
+ {
+ if (color[idx].blue == 0 &&
+ color[idx].green == 0 &&
+ color[idx].red == 0 &&
+ !black_used)
+ {
+ black_used = TRUE;
+ colors[num_colors++].flags = D3DRMPALETTE_READONLY;
+ }
+ buffer1[buffer1_idx] = k;
+
+ break;
+ }
+ }
+ if (k == 256)
+ {
+ if (num_colors == 256)
+ {
+ num_colors++;
+ i = h;
+ break;
+ }
+ buffer1[buffer1_idx] = num_colors;
+ colors[num_colors].red = color[idx].red;
+ colors[num_colors].green = color[idx].green;
+ colors[num_colors].blue = color[idx].blue;
+ colors[num_colors++].flags = D3DRMPALETTE_READONLY;
+ }
+ }
+
+ }
+
+ if (num_colors <= 256)
+ {
+ if (!(image->palette = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, num_colors * sizeof(*image->palette))))
+ {
+ WARN("Not enough memory to allocate image palette, returning NULL.\n");
+ return NULL;
+ }
+ image->red_mask = 0xff;
+ image->green_mask = 0xff;
+ image->blue_mask = 0xff;
+ bpl = bpl / (bpp / 8);
+ memcpy(image->palette, colors, num_colors * sizeof(D3DRMPALETTEENTRY));
+ image->palette_size = num_colors;
+ palette = TRUE;
+ }
+ else
+ {
+ bpl = w * 4;
+ image->rgb = 1;
+ image->palette = NULL;
+ for (i = 0; i < h; ++i)
+ {
+ for (j = 0; j < w; ++j)
+ {
+ unsigned char *ptr = &buffer1[i * bpl + j * 4];
+ idx = upside_down ? (h - 1 - i) * w * 3 + j * 3 : i * w * 3 + j * 3;
+ ptr[0] = buffer[idx];
+ ptr[1] = buffer[idx + 1];
+ ptr[2] = buffer[idx + 2];
+ ptr[3] = 0xff;
+ }
+ }
+
+ image->red_mask = 0xff0000;
+ image->green_mask = 0x00ff00;
+ image->blue_mask = 0x0000ff;
+ }
+ }
+ else
+ {
+ if (!(image->palette = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, 256 * sizeof(*image->palette))))
+ {
+ WARN("Not enough memory to allocate image palette, returning NULL.\n");
+ return NULL;
+ }
+
+ memcpy(image->palette, info->bmiColors, 256 * sizeof(D3DRMPALETTEENTRY));
+ for (i = 0; i < 256; i++)
+ {
+ image->palette[i].flags = D3DRMPALETTE_READONLY;
+ }
+ if (upside_down)
+ {
+ for (i = 0; i < h; i++)
+ {
+ for (j = 0; j < w; j++)
+ {
+ idx = (h - 1 - i) * bpl + j;
+ buffer1[i * bpl + j] = buffer[idx];
+ }
+ }
+ }
+ else
+ {
+ memcpy(buffer1, buffer, bpl * h);
+ }
+ image->palette_size = 256;
+ image->red_mask = 0xff;
+ image->green_mask = 0xff;
+ image->blue_mask = 0xff;
+ }
+ image->width = w;
+ image->height = h;
+ image->aspectx = 1;
+ image->aspecty = 1;
+ image->alpha_mask = 0;
+ image->depth = palette ? 8 : bpp;
+ image->bytes_per_line = bpl;
+ HeapFree(GetProcessHeap(), 0, colors);
+
+ return image;
+}
+
static HRESULT WINAPI d3drm_texture1_QueryInterface(IDirect3DRMTexture *iface, REFIID riid, void **out)
{
struct d3drm_texture *texture = impl_from_IDirect3DRMTexture(iface);
@@ -144,9 +411,23 @@ static HRESULT WINAPI d3drm_texture1_GetClassName(IDirect3DRMTexture *iface, DWO
static HRESULT WINAPI d3drm_texture1_InitFromFile(IDirect3DRMTexture *iface, const char *filename)
{
- FIXME("iface %p, filename %s stub!\n", iface, debugstr_a(filename));
+ struct d3drm_texture *object = impl_from_IDirect3DRMTexture(iface);
+ HRESULT hr;
- return E_NOTIMPL;
+ TRACE("iface %p, filename %s.\n", iface, debugstr_a(filename));
+
+ if (object->d3drm)
+ {
+ /* InitFromFile seems to AddRef IDirect3DRM even if it fails. */
+ IDirect3DRM_AddRef(object->d3drm);
+ }
+
+ if (object->image)
+ return D3DRMERR_BADOBJECT;
+ if (FAILED(hr = d3drm_texture_load(object, object->d3drm, filename, FALSE)))
+ return hr;
+
+ return D3DRM_OK;
}
static HRESULT WINAPI d3drm_texture1_InitFromSurface(IDirect3DRMTexture *iface,
@@ -440,9 +721,15 @@ static HRESULT WINAPI d3drm_texture2_GetClassName(IDirect3DRMTexture2 *iface, DW
static HRESULT WINAPI d3drm_texture2_InitFromFile(IDirect3DRMTexture2 *iface, const char *filename)
{
- FIXME("iface %p, filename %s stub!\n", iface, debugstr_a(filename));
+ struct d3drm_texture *object = impl_from_IDirect3DRMTexture2(iface);
+ HRESULT hr;
- return E_NOTIMPL;
+ TRACE("iface %p, filename %s.\n", iface, debugstr_a(filename));
+
+ if (FAILED(hr = IDirect3DRMTexture3_InitFromFile(&object->IDirect3DRMTexture3_iface, filename)))
+ return hr;
+
+ return D3DRM_OK;
}
static HRESULT WINAPI d3drm_texture2_InitFromSurface(IDirect3DRMTexture2 *iface,
@@ -714,7 +1001,7 @@ static ULONG WINAPI d3drm_texture3_Release(IDirect3DRMTexture3 *iface)
TRACE("%p decreasing refcount to %u.\n", iface, refcount);
if (!refcount)
- HeapFree(GetProcessHeap(), 0, texture);
+ d3drm_texture_destroy(texture);
return refcount;
}
@@ -792,9 +1079,23 @@ static HRESULT WINAPI d3drm_texture3_GetClassName(IDirect3DRMTexture3 *iface, DW
static HRESULT WINAPI d3drm_texture3_InitFromFile(IDirect3DRMTexture3 *iface, const char *filename)
{
- FIXME("iface %p, filename %s stub!\n", iface, debugstr_a(filename));
+ struct d3drm_texture *object = impl_from_IDirect3DRMTexture3(iface);
+ HRESULT hr;
- return E_NOTIMPL;
+ TRACE("iface %p, filename %s.\n", iface, debugstr_a(filename));
+
+ if (object->d3drm)
+ {
+ /* InitFromFile seems to AddRef IDirect3DRM even if it fails. */
+ IDirect3DRM_AddRef(object->d3drm);
+ }
+
+ if (object->image)
+ return D3DRMERR_BADOBJECT;
+ if (FAILED(hr = d3drm_texture_load(object, object->d3drm, filename, TRUE)))
+ return hr;
+
+ return D3DRM_OK;
}
static HRESULT WINAPI d3drm_texture3_InitFromSurface(IDirect3DRMTexture3 *iface,
@@ -885,9 +1186,11 @@ static HRESULT WINAPI d3drm_texture3_GetDecalOrigin(IDirect3DRMTexture3 *iface,
static D3DRMIMAGE * WINAPI d3drm_texture3_GetImage(IDirect3DRMTexture3 *iface)
{
- FIXME("iface %p stub!\n", iface);
+ struct d3drm_texture *texture = impl_from_IDirect3DRMTexture3(iface);
+
+ TRACE("iface %p\n", iface);
- return NULL;
+ return texture->image;
}
static DWORD WINAPI d3drm_texture3_GetShades(IDirect3DRMTexture3 *iface)
--
2.3.2 (Apple Git-55)
More information about the wine-patches
mailing list