ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wined3d: Use width while converting surfaces. 

This fixes also a heap corruption with 1x1 and 2x2 surfaces.
This commit is contained in:
Markus Amsler 2006-11-06 19:45:10 +01:00 committed by Alexandre Julliard
parent 5864d18c96
commit 5ec0ce5b38
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
dlls/wined3d/surface.c
View File

@ -47,7 +47,7 @@ typedef enum {
CONVERT_RGB32_888 CONVERT_RGB32_888
} CONVERT_TYPES; } CONVERT_TYPES;
HRESULT d3dfmt_convert_surface(BYTE *src, BYTE *dst, UINT pitch, UINT height, UINT outpitch, CONVERT_TYPES convert, IWineD3DSurfaceImpl *surf); HRESULT d3dfmt_convert_surface(BYTE *src, BYTE *dst, UINT pitch, UINT width, UINT height, UINT outpitch, CONVERT_TYPES convert, IWineD3DSurfaceImpl *surf);
static void surface_download_data(IWineD3DSurfaceImpl *This) { static void surface_download_data(IWineD3DSurfaceImpl *This) {
if (This->resource.format == WINED3DFMT_DXT1 || if (This->resource.format == WINED3DFMT_DXT1 ||
@ -991,6 +991,7 @@ static void flush_to_framebuffer_drawpixels(IWineD3DSurfaceImpl *This) {
d3dfmt_convert_surface(This->resource.allocatedMemory, d3dfmt_convert_surface(This->resource.allocatedMemory,
mem, mem,
pitch, pitch,
pitch,
height, height,
pitch * 4, pitch * 4,
CONVERT_PALETTED, CONVERT_PALETTED,
@ -1572,8 +1573,8 @@ HRESULT d3dfmt_get_conv(IWineD3DSurfaceImpl *This, BOOL need_alpha_ck, BOOL use_
return WINED3D_OK; return WINED3D_OK;
} }
HRESULT d3dfmt_convert_surface(BYTE *src, BYTE *dst, UINT pitch, UINT height, UINT outpitch, CONVERT_TYPES convert, IWineD3DSurfaceImpl *surf) { HRESULT d3dfmt_convert_surface(BYTE *src, BYTE *dst, UINT pitch, UINT width, UINT height, UINT outpitch, CONVERT_TYPES convert, IWineD3DSurfaceImpl *surf) {
BYTE *dest; BYTE *source, *dest;
TRACE("(%p)->(%p),(%d,%d,%d,%d,%p)\n", src, dst, pitch, height, outpitch, convert, surf); TRACE("(%p)->(%p),(%d,%d,%d,%d,%p)\n", src, dst, pitch, height, outpitch, convert, surf);
switch (convert) { switch (convert) {
@ -1636,10 +1637,11 @@ HRESULT d3dfmt_convert_surface(BYTE *src, BYTE *dst, UINT pitch, UINT height, UI
for (y = 0; y < height; y++) for (y = 0; y < height; y++)
{ {
source = src + pitch * y;
dest = dst + outpitch * y; dest = dst + outpitch * y;
/* This is an 1 bpp format, using the pitch here is fine */ /* This is an 1 bpp format, using the width here is fine */
for (x = 0; x < pitch; x++) { for (x = 0; x < width; x++) {
BYTE color = *src++; BYTE color = *source++;
*dest++ = table[color][0]; *dest++ = table[color][0];
*dest++ = table[color][1]; *dest++ = table[color][1];
*dest++ = table[color][2]; *dest++ = table[color][2];
@ -1670,7 +1672,7 @@ HRESULT d3dfmt_convert_surface(BYTE *src, BYTE *dst, UINT pitch, UINT height, UI
for (y = 0; y < height; y++) { for (y = 0; y < height; y++) {
Source = (WORD *) (src + y * pitch); Source = (WORD *) (src + y * pitch);
Dest = (WORD *) (dst + y * outpitch); Dest = (WORD *) (dst + y * outpitch);
for (x = 0; x < pitch / 2; x++ ) { for (x = 0; x < width / 2; x++ ) {
WORD color = *Source++; WORD color = *Source++;
*Dest = ((color & 0xFFC0) | ((color & 0x1F) << 1)); *Dest = ((color & 0xFFC0) | ((color & 0x1F) << 1));
if ((color < surf->SrcBltCKey.dwColorSpaceLowValue) || if ((color < surf->SrcBltCKey.dwColorSpaceLowValue) ||
@ -1849,7 +1851,7 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_LoadTexture(IWineD3DSurface *iface) {
ERR("Out of memory %d, %d!\n", outpitch, height); ERR("Out of memory %d, %d!\n", outpitch, height);
return WINED3DERR_OUTOFVIDEOMEMORY; return WINED3DERR_OUTOFVIDEOMEMORY;
} }
d3dfmt_convert_surface(This->resource.allocatedMemory, mem, pitch, height, outpitch, convert, This); d3dfmt_convert_surface(This->resource.allocatedMemory, mem, pitch, width, height, outpitch, convert, This);
This->Flags |= SFLAG_CONVERTED; This->Flags |= SFLAG_CONVERTED;
} else if (This->resource.format == WINED3DFMT_P8 && GL_SUPPORT(EXT_PALETTED_TEXTURE)) { } else if (This->resource.format == WINED3DFMT_P8 && GL_SUPPORT(EXT_PALETTED_TEXTURE)) {