system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-01 21:33:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

d3drm: Fix components of palette when loading texture from 8-bit BMP file.

Browse source
This commit is contained in:
Jeff Smith 2022-07-22 07:39:28 -05:00 committed by Alexandre Julliard
parent b32acacb4f
commit 3c914dc2ae
2 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
dlls/d3drm/tests/d3drm.c
View file

@ -6189,9 +6189,9 @@ static char *create_bitmap(unsigned int w, unsigned int h, BOOL palettized)
{ {
for (i = 0; i < 256; ++i) for (i = 0; i < 256; ++i)
{ {
info->bmiColors[i].rgbBlue = i; info->bmiColors[i].rgbBlue = i % MOD_B;
info->bmiColors[i].rgbGreen = i; info->bmiColors[i].rgbGreen = i % MOD_G;
info->bmiColors[i].rgbRed = i; info->bmiColors[i].rgbRed = i % MOD_R;
} }
} }
ret = WriteFile(file, info, size, &written, NULL); ret = WriteFile(file, info, size, &written, NULL);
@ -6317,7 +6317,8 @@ static void test_bitmap_data(unsigned int test_idx, const D3DRMIMAGE *img,
ok(img->palette_size == 256, "Test %u: Got unexpected palette size %u.\n", test_idx, img->palette_size); ok(img->palette_size == 256, "Test %u: Got unexpected palette size %u.\n", test_idx, img->palette_size);
for (i = 0; i < 256; ++i) for (i = 0; i < 256; ++i)
{ {
ok(img->palette[i].red == i && img->palette[i].green == i && img->palette[i].blue == i, ok(img->palette[i].red == i % MOD_R
&& img->palette[i].green == i % MOD_G && img->palette[i].blue == i % MOD_B,
"Test %u: Got unexpected palette entry (%u) color 0x%02x%02x%02x.\n", "Test %u: Got unexpected palette entry (%u) color 0x%02x%02x%02x.\n",
test_idx, i, img->palette[i].red, img->palette[i].green, img->palette[i].blue); test_idx, i, img->palette[i].red, img->palette[i].green, img->palette[i].blue);
ok(img->palette[i].flags == D3DRMPALETTE_READONLY, ok(img->palette[i].flags == D3DRMPALETTE_READONLY,

4
dlls/d3drm/texture.c
View file

@ -219,9 +219,11 @@ static HRESULT d3drm_image_load_8(D3DRMIMAGE *image, const RGBQUAD *palette,
return D3DRMERR_BADALLOC; return D3DRMERR_BADALLOC;
} }
memcpy(image->palette, palette, 256 * sizeof(*image->palette));
for (i = 0; i < 256; ++i) for (i = 0; i < 256; ++i)
{ {
image->palette[i].red = palette[i].rgbRed;
image->palette[i].green = palette[i].rgbGreen;
image->palette[i].blue = palette[i].rgbBlue;
image->palette[i].flags = D3DRMPALETTE_READONLY; image->palette[i].flags = D3DRMPALETTE_READONLY;
} }