May 2007 - Wine-commits - list.winehq.org

H. Verbeet : d3d8: Add a surface locking test.
by Alexandre Julliard 04 May '07

04 May '07

Module: wine Branch: master Commit: 2c7328891bc91f3b997fe65e06bf030d17451be6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c7328891bc91f3b997fe65e0… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Thu May 3 20:59:25 2007 +0200 d3d8: Add a surface locking test. --- dlls/d3d8/tests/surface.c | 77 ++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 76 insertions(+), 1 deletions(-) diff --git a/dlls/d3d8/tests/surface.c b/dlls/d3d8/tests/surface.c index 21f9dfe..ad4d4ae 100644 --- a/dlls/d3d8/tests/surface.c +++ b/dlls/d3d8/tests/surface.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006 Henri Verbeet + * Copyright 2006-2007 Henri Verbeet * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -121,6 +121,80 @@ cleanup: if (surface_ptr) IDirect3DSurface8_Release(surface_ptr); } +static void test_lockrect_invalid(IDirect3DDevice8 *device) +{ + IDirect3DSurface8 *surface = 0; + D3DLOCKED_RECT locked_rect; + unsigned int i; + BYTE *base; + HRESULT hr; + + const RECT valid[] = { + {60, 60, 68, 68}, + {120, 60, 128, 68}, + {60, 120, 68, 128}, + }; + + const RECT invalid[] = { + {60, 60, 60, 68}, /* 0 height */ + {60, 60, 68, 60}, /* 0 width */ + {68, 60, 60, 68}, /* left > right */ + {60, 68, 68, 60}, /* top > bottom */ + {-8, 60, 0, 68}, /* left < surface */ + {60, -8, 68, 0}, /* top < surface */ + {-16, 60, -8, 68}, /* right < surface */ + {60, -16, 68, -8}, /* bottom < surface */ + {60, 60, 136, 68}, /* right > surface */ + {60, 60, 68, 136}, /* bottom > surface */ + {136, 60, 144, 68}, /* left > surface */ + {60, 136, 68, 144}, /* top > surface */ + }; + + hr = IDirect3DDevice8_CreateImageSurface(device, 128, 128, D3DFMT_A8R8G8B8, &surface); + ok(SUCCEEDED(hr), "CreateImageSurface failed (0x%08x)\n", hr); + + hr = IDirect3DSurface8_LockRect(surface, &locked_rect, NULL, 0); + ok(SUCCEEDED(hr), "LockRect failed (0x%08x)\n", hr); + + base = locked_rect.pBits; + + hr = IDirect3DSurface8_UnlockRect(surface); + ok(SUCCEEDED(hr), "UnlockRect failed (0x%08x)\n", hr); + + for (i = 0; i < (sizeof(valid) / sizeof(*valid)); ++i) + { + unsigned int offset, expected_offset; + const RECT *rect = &valid[i]; + + locked_rect.pBits = (BYTE *)0xdeadbeef; + locked_rect.Pitch = 0xdeadbeef; + + hr = IDirect3DSurface8_LockRect(surface, &locked_rect, rect, 0); + ok(SUCCEEDED(hr), "LockRect failed (0x%08x) for rect [%d, %d]->[%d, %d]\n", + hr, rect->left, rect->top, rect->right, rect->bottom); + + offset = (BYTE *)locked_rect.pBits - base; + expected_offset = rect->top * locked_rect.Pitch + rect->left * 4; + ok(offset == expected_offset, "Got offset %u, expected offset %u for rect [%d, %d]->[%d, %d]\n", + offset, expected_offset, rect->left, rect->top, rect->right, rect->bottom); + + hr = IDirect3DSurface8_UnlockRect(surface); + ok(SUCCEEDED(hr), "UnlockRect failed (0x%08x)\n", hr); + } + + for (i = 0; i < (sizeof(invalid) / sizeof(*invalid)); ++i) + { + const RECT *rect = &invalid[i]; + + hr = IDirect3DSurface8_LockRect(surface, &locked_rect, rect, 0); + ok(hr == D3DERR_INVALIDCALL, "LockRect returned 0x%08x for rect [%d, %d]->[%d, %d]" + ", expected D3DERR_INVALIDCALL (0x%08x)\n", hr, rect->left, rect->top, + rect->right, rect->bottom, D3DERR_INVALIDCALL); + } + + IDirect3DSurface8_Release(surface); +} + START_TEST(surface) { HMODULE d3d8_handle; @@ -137,4 +211,5 @@ START_TEST(surface) if (!device_ptr) return; test_surface_get_container(device_ptr); + test_lockrect_invalid(device_ptr); }

1 0

H. Verbeet : ddraw: Add a surface locking test.
by Alexandre Julliard 04 May '07

04 May '07

Module: wine Branch: master Commit: 0b9808761f38e90f6afec12485d985ccf9843a27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b9808761f38e90f6afec1248… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Thu May 3 20:59:45 2007 +0200 ddraw: Add a surface locking test. --- dlls/ddraw/tests/dsurface.c | 82 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 82 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/tests/dsurface.c b/dlls/ddraw/tests/dsurface.c index fc3ee44..537cb29 100644 --- a/dlls/ddraw/tests/dsurface.c +++ b/dlls/ddraw/tests/dsurface.c @@ -1238,6 +1238,87 @@ static void CubeMapTest(void) IDirectDraw7_Release(dd7); } +static void test_lockrect_invalid(void) +{ + unsigned int i, j; + + RECT valid[] = { + {60, 60, 68, 68}, + {60, 60, 60, 68}, + {60, 60, 68, 60}, + {120, 60, 128, 68}, + {60, 120, 68, 128}, + }; + + RECT invalid[] = { + {68, 60, 60, 68}, /* left > right */ + {60, 68, 68, 60}, /* top > bottom */ + {-8, 60, 0, 68}, /* left < surface */ + {60, -8, 68, 0}, /* top < surface */ + {-16, 60, -8, 68}, /* right < surface */ + {60, -16, 68, -8}, /* bottom < surface */ + {60, 60, 136, 68}, /* right > surface */ + {60, 60, 68, 136}, /* bottom > surface */ + {136, 60, 144, 68}, /* left > surface */ + {60, 136, 68, 144}, /* top > surface */ + }; + + const DWORD dds_caps[] = { + DDSCAPS_OFFSCREENPLAIN, + DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE, + }; + + for (j = 0; j < (sizeof(dds_caps) / sizeof(*dds_caps)); ++j) + { + IDirectDrawSurface *surface = 0; + DDSURFACEDESC surface_desc = {0}; + DDSURFACEDESC locked_desc = {0}; + HRESULT hr; + + surface_desc.dwSize = sizeof(surface_desc); + surface_desc.ddpfPixelFormat.dwSize = sizeof(surface_desc.ddpfPixelFormat); + surface_desc.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PIXELFORMAT; + surface_desc.ddsCaps.dwCaps = dds_caps[j]; + surface_desc.dwWidth = 128; + surface_desc.dwHeight = 128; + surface_desc.ddpfPixelFormat.dwFlags = DDPF_RGB; + U1(surface_desc.ddpfPixelFormat).dwRGBBitCount = 32; + U2(surface_desc.ddpfPixelFormat).dwRBitMask = 0xFF0000; + U3(surface_desc.ddpfPixelFormat).dwGBitMask = 0x00FF00; + U4(surface_desc.ddpfPixelFormat).dwBBitMask = 0x0000FF; + + hr = IDirectDraw_CreateSurface(lpDD, &surface_desc, &surface, NULL); + ok(SUCCEEDED(hr), "CreateSurface failed (0x%08x)\n", hr); + + for (i = 0; i < (sizeof(valid) / sizeof(*valid)); ++i) + { + RECT *rect = &valid[i]; + + memset(&locked_desc, 0, sizeof(locked_desc)); + locked_desc.dwSize = sizeof(locked_desc); + + hr = IDirectDrawSurface_Lock(surface, rect, &locked_desc, DDLOCK_WAIT, NULL); + ok(SUCCEEDED(hr), "Lock failed (0x%08x) for rect [%d, %d]->[%d, %d]\n", + hr, rect->left, rect->top, rect->right, rect->bottom); + + hr = IDirectDrawSurface_Unlock(surface, NULL); + ok(SUCCEEDED(hr), "Unlock failed (0x%08x)\n", hr); + } + + for (i = 0; i < (sizeof(invalid) / sizeof(*invalid)); ++i) + { + RECT *rect = &invalid[i]; + + hr = IDirectDrawSurface_Lock(surface, rect, &locked_desc, DDLOCK_WAIT, NULL); + ok(hr == DDERR_INVALIDPARAMS, "Lock returned 0x%08x for rect [%d, %d]->[%d, %d]" + ", expected DDERR_INVALIDPARAMS (0x%08x)\n", hr, rect->left, rect->top, + rect->right, rect->bottom, DDERR_INVALIDPARAMS); + } + + IDirectDrawSurface_Release(surface); + } +} + START_TEST(dsurface) { if (!CreateDirectDraw()) @@ -1252,5 +1333,6 @@ START_TEST(dsurface) EnumTest(); AttachmentTest(); CubeMapTest(); + test_lockrect_invalid(); ReleaseDirectDraw(); }

1 0

H. Verbeet : wined3d: Remove some redundant fields from IWineD3DBaseTextureImpl.
by Alexandre Julliard 04 May '07

04 May '07

Module: wine Branch: master Commit: 5d00923017453ad2b919d4d96511f2b624fba190 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d00923017453ad2b919d4d96… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Thu May 3 21:00:25 2007 +0200 wined3d: Remove some redundant fields from IWineD3DBaseTextureImpl. --- dlls/wined3d/arb_program_shader.c | 2 +- dlls/wined3d/basetexture.c | 4 ++-- dlls/wined3d/device.c | 4 ---- dlls/wined3d/wined3d_private.h | 2 -- 4 files changed, 3 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 7faf45c..be66033 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -419,7 +419,7 @@ static void shader_hw_sample(SHADER_OPCODE_ARG* arg, DWORD sampler_idx, const ch /* Signedness correction */ if(!GL_SUPPORT(NV_TEXTURE_SHADER3) /* Provides signed formats */ && texture) { - WINED3DFORMAT format = texture->baseTexture.format; + WINED3DFORMAT format = texture->resource.format; if((format == WINED3DFMT_V8U8 && !GL_SUPPORT(ATI_ENVMAP_BUMPMAP)) || format == WINED3DFMT_Q8W8V8U8 || diff --git a/dlls/wined3d/basetexture.c b/dlls/wined3d/basetexture.c index d01847f..3faac87 100644 --- a/dlls/wined3d/basetexture.c +++ b/dlls/wined3d/basetexture.c @@ -191,7 +191,7 @@ DWORD WINAPI IWineD3DBaseTextureImpl_GetLevelCount(IWineD3DBaseTexture *iface) { HRESULT WINAPI IWineD3DBaseTextureImpl_SetAutoGenFilterType(IWineD3DBaseTexture *iface, WINED3DTEXTUREFILTERTYPE FilterType) { IWineD3DBaseTextureImpl *This = (IWineD3DBaseTextureImpl *)iface; - if (!(This->baseTexture.usage & WINED3DUSAGE_AUTOGENMIPMAP)) { + if (!(This->resource.usage & WINED3DUSAGE_AUTOGENMIPMAP)) { TRACE("(%p) : returning invalid call\n", This); return WINED3DERR_INVALIDCALL; } @@ -203,7 +203,7 @@ HRESULT WINAPI IWineD3DBaseTextureImpl_SetAutoGenFilterType(IWineD3DBaseTexture WINED3DTEXTUREFILTERTYPE WINAPI IWineD3DBaseTextureImpl_GetAutoGenFilterType(IWineD3DBaseTexture *iface) { IWineD3DBaseTextureImpl *This = (IWineD3DBaseTextureImpl *)iface; FIXME("(%p) : stub\n", This); - if (!(This->baseTexture.usage & WINED3DUSAGE_AUTOGENMIPMAP)) { + if (!(This->resource.usage & WINED3DUSAGE_AUTOGENMIPMAP)) { return WINED3DTEXF_NONE; } return This->baseTexture.filterType; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index e80614e..b581afb 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -829,8 +829,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateTexture(IWineD3DDevice *iface, U object->pow2scalingFactorY = (((float)Height) / ((float)pow2Height)); TRACE(" xf(%f) yf(%f)\n", object->pow2scalingFactorX, object->pow2scalingFactorY); - object->baseTexture.format = Format; - /* Calculate levels for mip mapping */ if (Levels == 0) { TRACE("calculating levels %d\n", object->baseTexture.levels); @@ -904,7 +902,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateVolumeTexture(IWineD3DDevice *ifa object->width = Width; object->height = Height; object->depth = Depth; - object->baseTexture.format = Format; /* Calculate levels for mip mapping */ if (Levels == 0) { @@ -1025,7 +1022,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateCubeTexture(IWineD3DDevice *iface /* TODO: support for native non-power 2 */ /* Precalculated scaling for 'faked' non power of two texture coords */ object->pow2scalingFactor = ((float)EdgeLength) / ((float)pow2EdgeLength); - object->baseTexture.format = Format; /* Calculate levels for mip mapping */ if (Levels == 0) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 80f1751..d0870b4 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -874,8 +874,6 @@ typedef struct IWineD3DBaseTextureClass { UINT levels; BOOL dirty; - WINED3DFORMAT format; - DWORD usage; UINT textureName; UINT LOD; WINED3DTEXTUREFILTERTYPE filterType;

1 0

H. Verbeet : wined3d: Handle the ps_3_0 vPos field.
by Alexandre Julliard 04 May '07

04 May '07

Module: wine Branch: master Commit: 89245248c739273f2f2c2e09443a10bc1cdfcc29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=89245248c739273f2f2c2e094… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Thu May 3 21:01:09 2007 +0200 wined3d: Handle the ps_3_0 vPos field. --- dlls/wined3d/baseshader.c | 8 ++++++++ dlls/wined3d/glsl_shader.c | 12 ++++++++++++ 2 files changed, 20 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index 2944663..8035abb 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -519,6 +519,7 @@ void shader_dump_param( IWineD3DBaseShaderImpl* This = (IWineD3DBaseShaderImpl*) iface; static const char * const rastout_reg_names[] = { "oPos", "oFog", "oPts" }; + static const char * const misctype_reg_names[] = { "vPos", "vFace"}; char swizzle_reg_chars[4]; DWORD reg = param & WINED3DSP_REGNUM_MASK; @@ -611,6 +612,13 @@ void shader_dump_param( case WINED3DSPR_SAMPLER: TRACE("s%u", reg); break; + case WINED3DSPR_MISCTYPE: + if (reg > 1) { + FIXME("Unhandled misctype register %d\n", reg); + } else { + TRACE("%s", misctype_reg_names[reg]); + } + break; case WINED3DSPR_PREDICATE: TRACE("p%u", reg); break; diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index f6d55d1..9ff5378 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -690,6 +690,18 @@ static void shader_glsl_get_register_name( else sprintf(tmpStr, "gl_TexCoord[%u]", reg); break; + case WINED3DSPR_MISCTYPE: + if (reg == 0) { + /* vPos */ + sprintf(tmpStr, "gl_FragCoord"); + } else { + /* gl_FrontFacing could be used for vFace, but note that + * gl_FrontFacing is a bool, while vFace is a float for + * which the sign determines front/back */ + FIXME("Unhandled misctype register %d\n", reg); + sprintf(tmpStr, "unrecognized_register"); + } + break; default: FIXME("Unhandled register name Type(%d)\n", regtype); sprintf(tmpStr, "unrecognized_register");

1 0

H. Verbeet : wined3d: Flip the coordinate system rather than the coordinates itself for onscreen surfaces in stretch_rect_fbo .
by Alexandre Julliard 04 May '07

04 May '07

Module: wine Branch: master Commit: d9b7369255b4964efb89cbe83cd39b9d2fef2f7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9b7369255b4964efb89cbe83… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Thu May 3 20:57:09 2007 +0200 wined3d: Flip the coordinate system rather than the coordinates itself for onscreen surfaces in stretch_rect_fbo. --- dlls/wined3d/device.c | 10 ++++++---- dlls/wined3d/wined3d_private.h | 4 ++-- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 5c2d700..2ad92da 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5485,8 +5485,8 @@ void apply_fbo_state(IWineD3DDevice *iface) { check_fbo_status(iface); } -void stretch_rect_fbo(IWineD3DDevice *iface, IWineD3DSurface *src_surface, const WINED3DRECT *src_rect, - IWineD3DSurface *dst_surface, const WINED3DRECT *dst_rect, const WINED3DTEXTUREFILTERTYPE filter, BOOL flip) { +void stretch_rect_fbo(IWineD3DDevice *iface, IWineD3DSurface *src_surface, WINED3DRECT *src_rect, + IWineD3DSurface *dst_surface, WINED3DRECT *dst_rect, const WINED3DTEXTUREFILTERTYPE filter, BOOL flip) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; GLbitfield mask = GL_COLOR_BUFFER_BIT; /* TODO: Support blitting depth/stencil surfaces */ IWineD3DSwapChain *src_swapchain, *dst_swapchain; @@ -5525,7 +5525,8 @@ void stretch_rect_fbo(IWineD3DDevice *iface, IWineD3DSurface *src_surface, const glReadBuffer(buffer); checkGLcall("glReadBuffer()"); - flip = !flip; + src_rect->y1 = ((IWineD3DSurfaceImpl *)src_surface)->currentDesc.Height - src_rect->y1; + src_rect->y2 = ((IWineD3DSurfaceImpl *)src_surface)->currentDesc.Height - src_rect->y2; } else { TRACE("Source surface %p is offscreen\n", src_surface); bind_fbo(iface, GL_READ_FRAMEBUFFER_EXT, &This->src_fbo); @@ -5546,7 +5547,8 @@ void stretch_rect_fbo(IWineD3DDevice *iface, IWineD3DSurface *src_surface, const glDrawBuffer(buffer); checkGLcall("glDrawBuffer()"); - flip = !flip; + dst_rect->y1 = ((IWineD3DSurfaceImpl *)dst_surface)->currentDesc.Height - dst_rect->y1; + dst_rect->y2 = ((IWineD3DSurfaceImpl *)dst_surface)->currentDesc.Height - dst_rect->y2; } else { TRACE("Destination surface %p is offscreen\n", dst_surface); bind_fbo(iface, GL_DRAW_FRAMEBUFFER_EXT, &This->dst_fbo); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index d6e5e22..80f1751 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1998,7 +1998,7 @@ static inline BOOL use_ps(IWineD3DDeviceImpl *device) { && ((IWineD3DPixelShaderImpl *)device->stateBlock->pixelShader)->baseShader.function); } -void stretch_rect_fbo(IWineD3DDevice *iface, IWineD3DSurface *src_surface, const WINED3DRECT *src_rect, - IWineD3DSurface *dst_surface, const WINED3DRECT *dst_rect, WINED3DTEXTUREFILTERTYPE filter, BOOL flip); +void stretch_rect_fbo(IWineD3DDevice *iface, IWineD3DSurface *src_surface, WINED3DRECT *src_rect, + IWineD3DSurface *dst_surface, WINED3DRECT *dst_rect, WINED3DTEXTUREFILTERTYPE filter, BOOL flip); #endif

1 0

H. Verbeet : wined3d: Make the IWineD3DDeviceImpl_ColorFill TRACE a bit more useful.
by Alexandre Julliard 04 May '07

04 May '07

Module: wine Branch: master Commit: b66791118e260c2c7327be1e05f1ee455f6f7221 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b66791118e260c2c7327be1e0… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Thu May 3 20:57:23 2007 +0200 wined3d: Make the IWineD3DDeviceImpl_ColorFill TRACE a bit more useful. --- dlls/wined3d/device.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 2ad92da..90fbd99 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5209,7 +5209,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_ColorFill(IWineD3DDevice *iface, IWineD IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *) iface; IWineD3DSurfaceImpl *surface = (IWineD3DSurfaceImpl *) pSurface; WINEDDBLTFX BltFx; - TRACE("(%p) Colour fill Surface: %p rect: %p color: %d\n", This, pSurface, pRect, color); + TRACE("(%p) Colour fill Surface: %p rect: %p color: 0x%08x\n", This, pSurface, pRect, color); if (surface->resource.pool != WINED3DPOOL_DEFAULT && surface->resource.pool != WINED3DPOOL_SYSTEMMEM) { FIXME("call to colorfill with non WINED3DPOOL_DEFAULT or WINED3DPOOL_SYSTEMMEM surface\n");

1 0

H. Verbeet : wined3d: Bind GL_FRAMEBUFFER_EXT rather than GL_DRAW_FRAMEBUFFER_EXT in color_fill_fbo .
by Alexandre Julliard 04 May '07

04 May '07

Module: wine Branch: master Commit: 81edcea0201ea5aa7601eef9aa8aee7d60b197de URL: http://source.winehq.org/git/wine.git/?a=commit;h=81edcea0201ea5aa7601eef9a… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Thu May 3 20:57:50 2007 +0200 wined3d: Bind GL_FRAMEBUFFER_EXT rather than GL_DRAW_FRAMEBUFFER_EXT in color_fill_fbo. --- dlls/wined3d/device.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 90fbd99..d00022f 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5160,14 +5160,14 @@ static void color_fill_fbo(IWineD3DDevice *iface, IWineD3DSurface *surface, CONS TRACE("Surface %p is onscreen\n", surface); - GL_EXTCALL(glBindFramebufferEXT(GL_DRAW_FRAMEBUFFER_EXT, 0)); + GL_EXTCALL(glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0)); buffer = surface_get_gl_buffer(surface, swapchain); glDrawBuffer(buffer); checkGLcall("glDrawBuffer()"); } else { TRACE("Surface %p is offscreen\n", surface); - bind_fbo(iface, GL_DRAW_FRAMEBUFFER_EXT, &This->dst_fbo); - attach_surface_fbo(This, GL_DRAW_FRAMEBUFFER_EXT, 0, surface); + bind_fbo(iface, GL_FRAMEBUFFER_EXT, &This->dst_fbo); + attach_surface_fbo(This, GL_FRAMEBUFFER_EXT, 0, surface); } if (rect) {

1 0

H. Verbeet : wined3d: Improve a few VBO traces.
by Alexandre Julliard 04 May '07

04 May '07

Module: wine Branch: master Commit: 1fca7eccb0ed03302656bdb8f0c5f5945f48730b URL: http://source.winehq.org/git/wine.git/?a=commit;h=1fca7eccb0ed03302656bdb8f… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Thu May 3 20:58:13 2007 +0200 wined3d: Improve a few VBO traces. --- dlls/wined3d/device.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index d00022f..e80614e 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -274,14 +274,14 @@ static void CreateVBO(IWineD3DVertexBufferImpl *object) { GL_EXTCALL(glGenBuffersARB(1, &object->vbo)); error = glGetError(); if(object->vbo == 0 || error != GL_NO_ERROR) { - WARN("Failed to create a VBO with error %d\n", error); + WARN("Failed to create a VBO with error %s (%#x)\n", debug_glerror(error), error); goto error; } GL_EXTCALL(glBindBufferARB(GL_ARRAY_BUFFER_ARB, object->vbo)); error = glGetError(); if(error != GL_NO_ERROR) { - WARN("Failed to bind the VBO, error %d\n", error); + WARN("Failed to bind the VBO with error %s (%#x)\n", debug_glerror(error), error); goto error; } @@ -309,7 +309,7 @@ static void CreateVBO(IWineD3DVertexBufferImpl *object) { GL_EXTCALL(glBufferDataARB(GL_ARRAY_BUFFER_ARB, object->resource.size, NULL, glUsage)); error = glGetError(); if(error != GL_NO_ERROR) { - WARN("glBufferDataARB failed with error %d\n", error); + WARN("glBufferDataARB failed with error %s (%#x)\n", debug_glerror(error), error); goto error; } @@ -392,14 +392,14 @@ static void CreateIndexBufferVBO(IWineD3DDeviceImpl *This, IWineD3DIndexBufferIm GL_EXTCALL(glGenBuffersARB(1, &object->vbo)); error = glGetError(); if(error != GL_NO_ERROR || object->vbo == 0) { - ERR("Creating a vbo failed, continueing without vbo for this buffer\n"); + ERR("Creating a vbo failed with error %s (%#x), continuing without vbo for this buffer\n", debug_glerror(error), error); goto out; } GL_EXTCALL(glBindBufferARB(GL_ELEMENT_ARRAY_BUFFER_ARB, object->vbo)); error = glGetError(); if(error != GL_NO_ERROR) { - ERR("Failed to bind index buffer, continueing without vbo for this buffer\n"); + ERR("Failed to bind index buffer with error %s (%#x), continuing without vbo for this buffer\n", debug_glerror(error), error); goto out; } @@ -410,7 +410,7 @@ static void CreateIndexBufferVBO(IWineD3DDeviceImpl *This, IWineD3DIndexBufferIm GL_EXTCALL(glBufferDataARB(GL_ELEMENT_ARRAY_BUFFER_ARB, object->resource.size, NULL, glUsage)); error = glGetError(); if(error != GL_NO_ERROR) { - ERR("Failed to initialize the index buffer\n"); + ERR("Failed to initialize the index buffer with error %s (%#x)\n", debug_glerror(error), error); goto out; } LEAVE_GL();

1 0

H. Verbeet : d3d: Fix the surface locking rectangle validation.
by Alexandre Julliard 04 May '07

04 May '07

Module: wine Branch: master Commit: 7b48db196f2fbf83a61a3856da65a55552c14382 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b48db196f2fbf83a61a3856d… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Thu May 3 20:58:48 2007 +0200 d3d: Fix the surface locking rectangle validation. --- dlls/d3d8/surface.c | 16 ++++++++++++++++ dlls/ddraw/surface.c | 14 ++++++++++++++ dlls/wined3d/surface.c | 11 ----------- dlls/wined3d/surface_gdi.c | 11 ----------- 4 files changed, 30 insertions(+), 22 deletions(-) diff --git a/dlls/d3d8/surface.c b/dlls/d3d8/surface.c index 93ea2f5..4d2f9b4 100644 --- a/dlls/d3d8/surface.c +++ b/dlls/d3d8/surface.c @@ -147,6 +147,22 @@ static HRESULT WINAPI IDirect3DSurface8Impl_LockRect(LPDIRECT3DSURFACE8 iface, D IDirect3DSurface8Impl *This = (IDirect3DSurface8Impl *)iface; TRACE("(%p) Relay\n", This); TRACE("(%p) calling IWineD3DSurface_LockRect %p %p %p %d\n", This, This->wineD3DSurface, pLockedRect, pRect, Flags); + + if (pRect) { + D3DSURFACE_DESC desc; + IDirect3DSurface8_GetDesc(iface, &desc); + + if ((pRect->left < 0) + || (pRect->top < 0) + || (pRect->left >= pRect->right) + || (pRect->top >= pRect->bottom) + || (pRect->right > desc.Width) + || (pRect->bottom > desc.Height)) { + WARN("Trying to lock an invalid rectangle, returning D3DERR_INVALIDCALL\n"); + return D3DERR_INVALIDCALL; + } + } + return IWineD3DSurface_LockRect(This->wineD3DSurface, (WINED3DLOCKED_RECT *) pLockedRect, pRect, Flags); } diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 00b2820..e99c2b8 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -549,6 +549,20 @@ IDirectDrawSurfaceImpl_Lock(IDirectDrawSurface7 *iface, HRESULT hr; TRACE("(%p)->(%p,%p,%x,%p)\n", This, Rect, DDSD, Flags, h); + if (Rect) + { + if ((Rect->left < 0) + || (Rect->top < 0) + || (Rect->left > Rect->right) + || (Rect->top > Rect->bottom) + || (Rect->right > This->surface_desc.dwWidth) + || (Rect->bottom > This->surface_desc.dwHeight)) + { + WARN("Trying to lock an invalid rectangle, returning DDERR_INVALIDPARAMS\n"); + return DDERR_INVALIDPARAMS; + } + } + if(!DDSD) return DDERR_INVALIDPARAMS; diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 909ee84..65a14d3 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -720,17 +720,6 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_LockRect(IWineD3DSurface *iface, WINED } else { TRACE("Lock Rect (%p) = l %d, t %d, r %d, b %d\n", pRect, pRect->left, pRect->top, pRect->right, pRect->bottom); - if ((pRect->top < 0) || - (pRect->left < 0) || - (pRect->left >= pRect->right) || - (pRect->top >= pRect->bottom) || - (pRect->right > This->currentDesc.Width) || - (pRect->bottom > This->currentDesc.Height)) - { - WARN(" Invalid values in pRect !!!\n"); - return WINED3DERR_INVALIDCALL; - } - /* DXTn textures are based on compressed blocks of 4x4 pixels, each * 16 bytes large (8 bytes in case of DXT1). Because of that Pitch has * slightly different meaning compared to regular textures. For DXTn diff --git a/dlls/wined3d/surface_gdi.c b/dlls/wined3d/surface_gdi.c index 4731608..ce37680 100644 --- a/dlls/wined3d/surface_gdi.c +++ b/dlls/wined3d/surface_gdi.c @@ -209,17 +209,6 @@ IWineGDISurfaceImpl_LockRect(IWineD3DSurface *iface, TRACE("Lock Rect (%p) = l %d, t %d, r %d, b %d\n", pRect, pRect->left, pRect->top, pRect->right, pRect->bottom); - if ((pRect->top < 0) || - (pRect->left < 0) || - (pRect->left >= pRect->right) || - (pRect->top >= pRect->bottom) || - (pRect->right > This->currentDesc.Width) || - (pRect->bottom > This->currentDesc.Height)) - { - WARN(" Invalid values in pRect !!!\n"); - return WINED3DERR_INVALIDCALL; - } - if (This->resource.format == WINED3DFMT_DXT1) { /* DXT1 is half byte per pixel */

1 0

H. Verbeet : d3d9: Add a surface locking test.
by Alexandre Julliard 04 May '07

04 May '07

Module: wine Branch: master Commit: 1316b7f5e47f1cb0b44baf6e3f314360d797da81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1316b7f5e47f1cb0b44baf6e3… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Thu May 3 20:59:07 2007 +0200 d3d9: Add a surface locking test. --- dlls/d3d9/tests/surface.c | 60 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 60 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/tests/surface.c b/dlls/d3d9/tests/surface.c index 189ebf6..ab4a81e 100644 --- a/dlls/d3d9/tests/surface.c +++ b/dlls/d3d9/tests/surface.c @@ -227,6 +227,65 @@ static void test_lockrect_offset(IDirect3DDevice9 *device) } } +static void test_lockrect_invalid(IDirect3DDevice9 *device) +{ + IDirect3DSurface9 *surface = 0; + D3DLOCKED_RECT locked_rect; + unsigned int i; + BYTE *base; + HRESULT hr; + + const RECT test_data[] = { + {60, 60, 68, 68}, /* Valid */ + {60, 60, 60, 68}, /* 0 height */ + {60, 60, 68, 60}, /* 0 width */ + {68, 60, 60, 68}, /* left > right */ + {60, 68, 68, 60}, /* top > bottom */ + {-8, 60, 0, 68}, /* left < surface */ + {60, -8, 68, 0}, /* top < surface */ + {-16, 60, -8, 68}, /* right < surface */ + {60, -16, 68, -8}, /* bottom < surface */ + {60, 60, 136, 68}, /* right > surface */ + {60, 60, 68, 136}, /* bottom > surface */ + {136, 60, 144, 68}, /* left > surface */ + {60, 136, 68, 144}, /* top > surface */ + }; + + hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, 128, 128, D3DFMT_A8R8G8B8, D3DPOOL_SCRATCH, &surface, 0); + ok(SUCCEEDED(hr), "CreateOffscreenPlainSurface failed (0x%08x)\n", hr); + + hr = IDirect3DSurface9_LockRect(surface, &locked_rect, NULL, 0); + ok(SUCCEEDED(hr), "LockRect failed (0x%08x)\n", hr); + + base = locked_rect.pBits; + + hr = IDirect3DSurface9_UnlockRect(surface); + ok(SUCCEEDED(hr), "UnlockRect failed (0x%08x)\n", hr); + + for (i = 0; i < (sizeof(test_data) / sizeof(*test_data)); ++i) + { + unsigned int offset, expected_offset; + const RECT *rect = &test_data[i]; + + locked_rect.pBits = (BYTE *)0xdeadbeef; + locked_rect.Pitch = 0xdeadbeef; + + hr = IDirect3DSurface9_LockRect(surface, &locked_rect, rect, 0); + ok(SUCCEEDED(hr), "LockRect failed (0x%08x) for rect [%d, %d]->[%d, %d]\n", + hr, rect->left, rect->top, rect->right, rect->bottom); + + offset = (BYTE *)locked_rect.pBits - base; + expected_offset = rect->top * locked_rect.Pitch + rect->left * 4; + ok(offset == expected_offset, "Got offset %u, expected offset %u for rect [%d, %d]->[%d, %d]\n", + offset, expected_offset, rect->left, rect->top, rect->right, rect->bottom); + + hr = IDirect3DSurface9_UnlockRect(surface); + ok(SUCCEEDED(hr), "UnlockRect failed (0x%08x)\n", hr); + } + + IDirect3DSurface9_Release(surface); +} + START_TEST(surface) { HMODULE d3d9_handle; @@ -245,4 +304,5 @@ START_TEST(surface) test_surface_get_container(device_ptr); test_surface_alignment(device_ptr); test_lockrect_offset(device_ptr); + test_lockrect_invalid(device_ptr); }

1 0