August 2010 - Wine-commits - list.winehq.org

Tony Wasserka : d3dx9: Return D3DERR_INVALIDCALL in D3DXLoadSurfaceFromMemory if pDestRect is invalid .
by Alexandre Julliard 04 Aug '10

04 Aug '10

Module: wine Branch: master Commit: 5bdfd877a751fe5c99ede04eb25d41a481269bf2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5bdfd877a751fe5c99ede04eb… Author: Tony Wasserka <tony.wasserka(a)freenet.de> Date: Wed Jul 28 21:51:42 2010 +0200 d3dx9: Return D3DERR_INVALIDCALL in D3DXLoadSurfaceFromMemory if pDestRect is invalid. --- dlls/d3dx9_36/surface.c | 7 ++++++- dlls/d3dx9_36/tests/surface.c | 22 +++++++++++++++++++++- 2 files changed, 27 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index c39ec57..4bd7450 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -583,7 +583,8 @@ static void copy_simple_data(CONST BYTE *src, UINT srcpitch, POINT srcsize, C * Success: D3D_OK, if we successfully load the pixel data into our surface or * if pSrcMemory is NULL but the other parameters are valid * Failure: D3DERR_INVALIDCALL, if pDestSurface, SrcPitch or pSrcRect are NULL or - * if SrcFormat is an invalid format (other than D3DFMT_UNKNOWN) + * if SrcFormat is an invalid format (other than D3DFMT_UNKNOWN) or + * if DestRect is invalid * D3DXERR_INVALIDDATA, if we fail to lock pDestSurface * E_FAIL, if SrcFormat is D3DFMT_UNKNOWN or the dimensions of pSrcRect are invalid * @@ -631,8 +632,12 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(LPDIRECT3DSURFACE9 pDestSurface, destsize.x = surfdesc.Width; destsize.y = surfdesc.Height; } else { + if(pDestRect->left > pDestRect->right || pDestRect->right > surfdesc.Width) return D3DERR_INVALIDCALL; + if(pDestRect->top > pDestRect->bottom || pDestRect->bottom > surfdesc.Height) return D3DERR_INVALIDCALL; + if(pDestRect->left < 0 || pDestRect->top < 0) return D3DERR_INVALIDCALL; destsize.x = pDestRect->right - pDestRect->left; destsize.y = pDestRect->bottom - pDestRect->top; + if(destsize.x == 0 || destsize.y == 0) return D3D_OK; } hr = IDirect3DSurface9_LockRect(pDestSurface, &lockrect, pDestRect, 0); diff --git a/dlls/d3dx9_36/tests/surface.c b/dlls/d3dx9_36/tests/surface.c index 43ec02b..83895c0 100644 --- a/dlls/d3dx9_36/tests/surface.c +++ b/dlls/d3dx9_36/tests/surface.c @@ -217,7 +217,7 @@ static void test_D3DXLoadSurface(IDirect3DDevice9 *device) HRESULT hr; BOOL testdummy_ok, testbitmap_ok; IDirect3DSurface9 *surf, *newsurf; - RECT rect; + RECT rect, destrect; D3DLOCKED_RECT lockrect; const WORD pixdata_a8r3g3b2[] = { 0x57df, 0x98fc, 0xacdd, 0xc891 }; const WORD pixdata_a1r5g5b5[] = { 0x46b5, 0x99c8, 0x06a2, 0x9431 }; @@ -330,6 +330,26 @@ static void test_D3DXLoadSurface(IDirect3DDevice9 *device) hr = D3DXLoadSurfaceFromMemory(surf, NULL, NULL, pixdata, D3DFMT_UNKNOWN, sizeof(pixdata), NULL, &rect, D3DX_DEFAULT, 0); ok(hr == E_FAIL, "D3DXLoadSurfaceFromMemory returned %#x, expected %#x\n", hr, E_FAIL); + SetRect(&destrect, -1, -1, 1, 1); /* destination rect is partially outside texture boundaries */ + hr = D3DXLoadSurfaceFromMemory(surf, NULL, &destrect, pixdata, D3DFMT_A8R8G8B8, sizeof(pixdata), NULL, &rect, D3DX_FILTER_NONE, 0); + ok(hr == D3DERR_INVALIDCALL, "D3DXLoadSurfaceFromMemory returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); + + SetRect(&destrect, 255, 255, 257, 257); /* destination rect is partially outside texture boundaries */ + hr = D3DXLoadSurfaceFromMemory(surf, NULL, &destrect, pixdata, D3DFMT_A8R8G8B8, sizeof(pixdata), NULL, &rect, D3DX_FILTER_NONE, 0); + ok(hr == D3DERR_INVALIDCALL, "D3DXLoadSurfaceFromMemory returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); + + SetRect(&destrect, 1, 1, 0, 0); /* left > right, top > bottom */ + hr = D3DXLoadSurfaceFromMemory(surf, NULL, &destrect, pixdata, D3DFMT_A8R8G8B8, sizeof(pixdata), NULL, &rect, D3DX_FILTER_NONE, 0); + ok(hr == D3DERR_INVALIDCALL, "D3DXLoadSurfaceFromMemory returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); + + SetRect(&destrect, 0, 0, 0, 0); /* left = right, top = bottom */ + hr = D3DXLoadSurfaceFromMemory(surf, NULL, &destrect, pixdata, D3DFMT_A8R8G8B8, sizeof(pixdata), NULL, &rect, D3DX_FILTER_NONE, 0); + ok(hr == D3D_OK, "D3DXLoadSurfaceFromMemory returned %#x, expected %#x\n", hr, D3D_OK); + + SetRect(&destrect, 257, 257, 257, 257); /* left = right, top = bottom, but invalid values */ + hr = D3DXLoadSurfaceFromMemory(surf, NULL, &destrect, pixdata, D3DFMT_A8R8G8B8, sizeof(pixdata), NULL, &rect, D3DX_FILTER_NONE, 0); + ok(hr == D3DERR_INVALIDCALL, "D3DXLoadSurfaceFromMemory returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); + /* D3DXLoadSurfaceFromSurface */ hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, 256, 256, D3DFMT_A8R8G8B8, D3DPOOL_DEFAULT, &newsurf, NULL);

1 0

Tony Wasserka : d3dx9: Implement ARGB point filtering in D3DXLoadSurfaceFromMemory.
by Alexandre Julliard 04 Aug '10

04 Aug '10

Module: wine Branch: master Commit: 1905e93b542ad2c3357b6bcbb335d39a2bf022b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1905e93b542ad2c3357b6bcbb… Author: Tony Wasserka <tony.wasserka(a)freenet.de> Date: Wed Jul 28 21:56:00 2010 +0200 d3dx9: Implement ARGB point filtering in D3DXLoadSurfaceFromMemory. --- dlls/d3dx9_36/surface.c | 53 ++++++++++++++++++++++++++++++++++++++-- dlls/d3dx9_36/tests/surface.c | 6 +--- 2 files changed, 52 insertions(+), 7 deletions(-) diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index 4bd7450..b0427d2 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -562,6 +562,48 @@ static void copy_simple_data(CONST BYTE *src, UINT srcpitch, POINT srcsize, C } /************************************************************ + * point_filter_simple_data + * + * Copies the source buffer to the destination buffer, performing + * any necessary format conversion, color keying and stretching + * using a point filter. + * Works only for ARGB formats with 1 - 4 bytes per pixel. + */ +static void point_filter_simple_data(CONST BYTE *src, UINT srcpitch, POINT srcsize, CONST PixelFormatDesc *srcformat, + CONST BYTE *dest, UINT destpitch, POINT destsize, CONST PixelFormatDesc *destformat) +{ + struct argb_conversion_info conv_info; + DWORD channels[4]; + + UINT minwidth, minheight; + BYTE *srcptr, *destptr, *bufptr; + UINT x, y; + + ZeroMemory(channels, sizeof(channels)); + init_argb_conversion_info(srcformat, destformat, &conv_info); + + minwidth = (srcsize.x < destsize.x) ? srcsize.x : destsize.x; + minheight = (srcsize.y < destsize.y) ? srcsize.y : destsize.y; + + for(y = 0;y < destsize.y;y++) { + destptr = (BYTE*)dest + y * destpitch; + bufptr = (BYTE*)src + srcpitch * (y * srcsize.y / destsize.y); + srcptr = bufptr; + + for(x = 0;x < destsize.x;x++) { + /* extract source color components */ + if(srcformat->type == FORMAT_ARGB) get_relevant_argb_components(&conv_info, *(DWORD*)srcptr, channels); + + /* recombine the components */ + if(destformat->type == FORMAT_ARGB) make_argb_color(&conv_info, channels, (DWORD*)destptr); + + srcptr = bufptr + (x * srcsize.x / destsize.x) * srcformat->bytes_per_pixel; + destptr += destformat->bytes_per_pixel; + } + } +} + +/************************************************************ * D3DXLoadSurfaceFromMemory * * Loads data from a given memory chunk into a surface, @@ -616,7 +658,6 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(LPDIRECT3DSURFACE9 pDestSurface, if( !pDestSurface || !pSrcMemory || !pSrcRect ) return D3DERR_INVALIDCALL; if(SrcFormat == D3DFMT_UNKNOWN || pSrcRect->left >= pSrcRect->right || pSrcRect->top >= pSrcRect->bottom) return E_FAIL; - if((dwFilter & 0xF) != D3DX_FILTER_NONE) return E_NOTIMPL; if(dwFilter == D3DX_DEFAULT) dwFilter = D3DX_FILTER_TRIANGLE | D3DX_FILTER_DITHER; IDirect3DSurface9_GetDesc(pDestSurface, &surfdesc); @@ -643,8 +684,14 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(LPDIRECT3DSURFACE9 pDestSurface, hr = IDirect3DSurface9_LockRect(pDestSurface, &lockrect, pDestRect, 0); if(FAILED(hr)) return D3DXERR_INVALIDDATA; - copy_simple_data((CONST BYTE*)pSrcMemory, SrcPitch, srcsize, srcformatdesc, - (CONST BYTE*)lockrect.pBits, lockrect.Pitch, destsize, destformatdesc); + if((dwFilter & 0xF) == D3DX_FILTER_NONE) { + copy_simple_data((CONST BYTE*)pSrcMemory, SrcPitch, srcsize, srcformatdesc, + (CONST BYTE*)lockrect.pBits, lockrect.Pitch, destsize, destformatdesc); + } else /*if((dwFilter & 0xF) == D3DX_FILTER_POINT) */ { + /* always apply a point filter until D3DX_FILTER_LINEAR, D3DX_FILTER_TRIANGLE and D3DX_FILTER_BOX are implemented */ + point_filter_simple_data((CONST BYTE*)pSrcMemory, SrcPitch, srcsize, srcformatdesc, + (CONST BYTE*)lockrect.pBits, lockrect.Pitch, destsize, destformatdesc); + } IDirect3DSurface9_UnlockRect(pDestSurface); return D3D_OK; diff --git a/dlls/d3dx9_36/tests/surface.c b/dlls/d3dx9_36/tests/surface.c index 83895c0..a996e6d 100644 --- a/dlls/d3dx9_36/tests/surface.c +++ b/dlls/d3dx9_36/tests/surface.c @@ -354,10 +354,8 @@ static void test_D3DXLoadSurface(IDirect3DDevice9 *device) /* D3DXLoadSurfaceFromSurface */ hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, 256, 256, D3DFMT_A8R8G8B8, D3DPOOL_DEFAULT, &newsurf, NULL); if(SUCCEEDED(hr)) { - todo_wine { - hr = D3DXLoadSurfaceFromSurface(newsurf, NULL, NULL, surf, NULL, NULL, D3DX_DEFAULT, 0); - ok(hr == D3D_OK, "D3DXLoadSurfaceFromSurface returned %#x, expected %#x\n", hr, D3D_OK); - } + hr = D3DXLoadSurfaceFromSurface(newsurf, NULL, NULL, surf, NULL, NULL, D3DX_DEFAULT, 0); + ok(hr == D3D_OK, "D3DXLoadSurfaceFromSurface returned %#x, expected %#x\n", hr, D3D_OK); hr = D3DXLoadSurfaceFromSurface(NULL, NULL, NULL, surf, NULL, NULL, D3DX_DEFAULT, 0); ok(hr == D3DERR_INVALIDCALL, "D3DXLoadSurfaceFromSurface returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL);

1 0

Alexandre Julliard : d3dx9: Fix some incorrect const typecasts.
by Alexandre Julliard 04 Aug '10

04 Aug '10

Module: wine Branch: master Commit: 277040d92454b7cc32d668b49a9bbf95df2796d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=277040d92454b7cc32d668b49… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 4 17:53:14 2010 +0200 d3dx9: Fix some incorrect const typecasts. --- dlls/d3dx9_36/surface.c | 29 +++++++++++++---------------- 1 files changed, 13 insertions(+), 16 deletions(-) diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index b0427d2..82881bc 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -529,13 +529,11 @@ static void make_argb_color(CONST struct argb_conversion_info *info, CONST DWORD * Works only for ARGB formats with 1 - 4 bytes per pixel. */ static void copy_simple_data(CONST BYTE *src, UINT srcpitch, POINT srcsize, CONST PixelFormatDesc *srcformat, - CONST BYTE *dest, UINT destpitch, POINT destsize, CONST PixelFormatDesc *destformat) + BYTE *dest, UINT destpitch, POINT destsize, CONST PixelFormatDesc *destformat) { struct argb_conversion_info conv_info; DWORD channels[4]; - UINT minwidth, minheight; - BYTE *srcptr, *destptr; UINT x, y; ZeroMemory(channels, sizeof(channels)); @@ -545,11 +543,11 @@ static void copy_simple_data(CONST BYTE *src, UINT srcpitch, POINT srcsize, C minheight = (srcsize.y < destsize.y) ? srcsize.y : destsize.y; for(y = 0;y < minheight;y++) { - srcptr = (BYTE*)( src + y * srcpitch); - destptr = (BYTE*)(dest + y * destpitch); + const BYTE *srcptr = src + y * srcpitch; + BYTE *destptr = dest + y * destpitch; for(x = 0;x < minwidth;x++) { /* extract source color components */ - if(srcformat->type == FORMAT_ARGB) get_relevant_argb_components(&conv_info, *(DWORD*)srcptr, channels); + if(srcformat->type == FORMAT_ARGB) get_relevant_argb_components(&conv_info, *(const DWORD*)srcptr, channels); /* recombine the components */ if(destformat->type == FORMAT_ARGB) make_argb_color(&conv_info, channels, (DWORD*)destptr); @@ -570,13 +568,12 @@ static void copy_simple_data(CONST BYTE *src, UINT srcpitch, POINT srcsize, C * Works only for ARGB formats with 1 - 4 bytes per pixel. */ static void point_filter_simple_data(CONST BYTE *src, UINT srcpitch, POINT srcsize, CONST PixelFormatDesc *srcformat, - CONST BYTE *dest, UINT destpitch, POINT destsize, CONST PixelFormatDesc *destformat) + BYTE *dest, UINT destpitch, POINT destsize, CONST PixelFormatDesc *destformat) { struct argb_conversion_info conv_info; DWORD channels[4]; UINT minwidth, minheight; - BYTE *srcptr, *destptr, *bufptr; UINT x, y; ZeroMemory(channels, sizeof(channels)); @@ -586,13 +583,13 @@ static void point_filter_simple_data(CONST BYTE *src, UINT srcpitch, POINT sr minheight = (srcsize.y < destsize.y) ? srcsize.y : destsize.y; for(y = 0;y < destsize.y;y++) { - destptr = (BYTE*)dest + y * destpitch; - bufptr = (BYTE*)src + srcpitch * (y * srcsize.y / destsize.y); - srcptr = bufptr; + BYTE *destptr = dest + y * destpitch; + const BYTE *bufptr = src + srcpitch * (y * srcsize.y / destsize.y); + const BYTE *srcptr = bufptr; for(x = 0;x < destsize.x;x++) { /* extract source color components */ - if(srcformat->type == FORMAT_ARGB) get_relevant_argb_components(&conv_info, *(DWORD*)srcptr, channels); + if(srcformat->type == FORMAT_ARGB) get_relevant_argb_components(&conv_info, *(const DWORD*)srcptr, channels); /* recombine the components */ if(destformat->type == FORMAT_ARGB) make_argb_color(&conv_info, channels, (DWORD*)destptr); @@ -685,12 +682,12 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(LPDIRECT3DSURFACE9 pDestSurface, if(FAILED(hr)) return D3DXERR_INVALIDDATA; if((dwFilter & 0xF) == D3DX_FILTER_NONE) { - copy_simple_data((CONST BYTE*)pSrcMemory, SrcPitch, srcsize, srcformatdesc, - (CONST BYTE*)lockrect.pBits, lockrect.Pitch, destsize, destformatdesc); + copy_simple_data(pSrcMemory, SrcPitch, srcsize, srcformatdesc, + lockrect.pBits, lockrect.Pitch, destsize, destformatdesc); } else /*if((dwFilter & 0xF) == D3DX_FILTER_POINT) */ { /* always apply a point filter until D3DX_FILTER_LINEAR, D3DX_FILTER_TRIANGLE and D3DX_FILTER_BOX are implemented */ - point_filter_simple_data((CONST BYTE*)pSrcMemory, SrcPitch, srcsize, srcformatdesc, - (CONST BYTE*)lockrect.pBits, lockrect.Pitch, destsize, destformatdesc); + point_filter_simple_data(pSrcMemory, SrcPitch, srcsize, srcformatdesc, + lockrect.pBits, lockrect.Pitch, destsize, destformatdesc); } IDirect3DSurface9_UnlockRect(pDestSurface);

1 0

Henri Verbeet : wined3d: Cleanup Get/SetDepthStencilSurface().
by Alexandre Julliard 04 Aug '10

04 Aug '10

Module: wine Branch: master Commit: 43a86d1e56469418acbfe3c89434b50cbf924a25 URL: http://source.winehq.org/git/wine.git/?a=commit;h=43a86d1e56469418acbfe3c89… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 4 11:10:25 2010 +0200 wined3d: Cleanup Get/SetDepthStencilSurface(). --- dlls/wined3d/device.c | 33 +++++++++++++++++---------------- 1 files changed, 17 insertions(+), 16 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index f9e65d7..f4bce23 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5688,18 +5688,18 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetFrontBackBuffers(IWineD3DDevice *ifa return WINED3D_OK; } -static HRESULT WINAPI IWineD3DDeviceImpl_GetDepthStencilSurface(IWineD3DDevice* iface, IWineD3DSurface **ppZStencilSurface) { - IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; - *ppZStencilSurface = (IWineD3DSurface *)This->depth_stencil; - TRACE("(%p) : zStencilSurface returning %p\n", This, *ppZStencilSurface); +static HRESULT WINAPI IWineD3DDeviceImpl_GetDepthStencilSurface(IWineD3DDevice *iface, IWineD3DSurface **depth_stencil) +{ + IWineD3DDeviceImpl *device = (IWineD3DDeviceImpl *)iface; - if(*ppZStencilSurface != NULL) { - /* Note inc ref on returned surface */ - IWineD3DSurface_AddRef(*ppZStencilSurface); - return WINED3D_OK; - } else { - return WINED3DERR_NOTFOUND; - } + TRACE("iface %p, depth_stencil %p.\n", iface, depth_stencil); + + *depth_stencil = (IWineD3DSurface *)device->depth_stencil; + TRACE("Returning depth/stencil surface %p.\n", *depth_stencil); + if (!*depth_stencil) return WINED3DERR_NOTFOUND; + IWineD3DSurface_AddRef(*depth_stencil); + + return WINED3D_OK; } static HRESULT WINAPI IWineD3DDeviceImpl_SetRenderTarget(IWineD3DDevice *iface, @@ -5765,13 +5765,14 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetRenderTarget(IWineD3DDevice *iface, return WINED3D_OK; } -static HRESULT WINAPI IWineD3DDeviceImpl_SetDepthStencilSurface(IWineD3DDevice *iface, IWineD3DSurface *pNewZStencil) { +static HRESULT WINAPI IWineD3DDeviceImpl_SetDepthStencilSurface(IWineD3DDevice *iface, IWineD3DSurface *depth_stencil) +{ IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; IWineD3DSurfaceImpl *tmp; - TRACE("device %p, depth_stencil %p, old depth_stencil %p.\n", This, pNewZStencil, This->depth_stencil); + TRACE("device %p, depth_stencil %p, old depth_stencil %p.\n", This, depth_stencil, This->depth_stencil); - if (This->depth_stencil == (IWineD3DSurfaceImpl *)pNewZStencil) + if (This->depth_stencil == (IWineD3DSurfaceImpl *)depth_stencil) { TRACE("Trying to do a NOP SetRenderTarget operation.\n"); return WINED3D_OK; @@ -5794,11 +5795,11 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetDepthStencilSurface(IWineD3DDevice * } tmp = This->depth_stencil; - This->depth_stencil = (IWineD3DSurfaceImpl *)pNewZStencil; + This->depth_stencil = (IWineD3DSurfaceImpl *)depth_stencil; if (This->depth_stencil) IWineD3DSurface_AddRef((IWineD3DSurface *)This->depth_stencil); if (tmp) IWineD3DSurface_Release((IWineD3DSurface *)tmp); - if ((!tmp && pNewZStencil) || (!pNewZStencil && tmp)) + if ((!tmp && depth_stencil) || (!depth_stencil && tmp)) { /* Swapping NULL / non NULL depth stencil affects the depth and tests */ IWineD3DDeviceImpl_MarkStateDirty(This, STATE_RENDER(WINED3DRS_ZENABLE));

1 0

Henri Verbeet : wined3d: Only try to acquire a context in surface_cleanup() if there are GL resources to be destroyed.
by Alexandre Julliard 04 Aug '10

04 Aug '10

Module: wine Branch: master Commit: 2b88b2d3511c4d9c76867c379b09b547f5946a6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b88b2d3511c4d9c76867c379… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 4 11:10:26 2010 +0200 wined3d: Only try to acquire a context in surface_cleanup() if there are GL resources to be destroyed. The reason we're in surface_cleanup() might for example be that context creation failed. --- dlls/wined3d/surface.c | 60 ++++++++++++++++++++++------------------------- 1 files changed, 28 insertions(+), 32 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 47282b0..101c8c2 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -36,44 +36,42 @@ WINE_DECLARE_DEBUG_CHANNEL(d3d); static void surface_cleanup(IWineD3DSurfaceImpl *This) { - IWineD3DDeviceImpl *device = This->resource.device; - const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; - struct wined3d_context *context = NULL; - renderbuffer_entry_t *entry, *entry2; - TRACE("(%p) : Cleaning up.\n", This); - /* Need a context to destroy the texture. Use the currently active render - * target, but only if the primary render target exists. Otherwise - * lastActiveRenderTarget is garbage. When destroying the primary render - * target, Uninit3D() will activate a context before doing anything. */ - if (device->render_targets && device->render_targets[0]) + if (This->texture_name || (This->Flags & SFLAG_PBO) || !list_empty(&This->renderbuffers)) { - context = context_acquire(device, NULL); - } + const struct wined3d_gl_info *gl_info; + renderbuffer_entry_t *entry, *entry2; + struct wined3d_context *context; - ENTER_GL(); + context = context_acquire(This->resource.device, NULL); + gl_info = context->gl_info; - if (This->texture_name) - { - /* Release the OpenGL texture. */ - TRACE("Deleting texture %u.\n", This->texture_name); - glDeleteTextures(1, &This->texture_name); - } + ENTER_GL(); - if (This->Flags & SFLAG_PBO) - { - /* Delete the PBO. */ - GL_EXTCALL(glDeleteBuffersARB(1, &This->pbo)); - } + if (This->texture_name) + { + TRACE("Deleting texture %u.\n", This->texture_name); + glDeleteTextures(1, &This->texture_name); + } - LIST_FOR_EACH_ENTRY_SAFE(entry, entry2, &This->renderbuffers, renderbuffer_entry_t, entry) - { - gl_info->fbo_ops.glDeleteRenderbuffers(1, &entry->id); - HeapFree(GetProcessHeap(), 0, entry); - } + if (This->Flags & SFLAG_PBO) + { + TRACE("Deleting PBO %u.\n", This->pbo); + GL_EXTCALL(glDeleteBuffersARB(1, &This->pbo)); + } - LEAVE_GL(); + LIST_FOR_EACH_ENTRY_SAFE(entry, entry2, &This->renderbuffers, renderbuffer_entry_t, entry) + { + TRACE("Deleting renderbuffer %u.\n", entry->id); + gl_info->fbo_ops.glDeleteRenderbuffers(1, &entry->id); + HeapFree(GetProcessHeap(), 0, entry); + } + + LEAVE_GL(); + + context_release(context); + } if (This->Flags & SFLAG_DIBSECTION) { @@ -92,8 +90,6 @@ static void surface_cleanup(IWineD3DSurfaceImpl *This) HeapFree(GetProcessHeap(), 0, This->palette9); resource_cleanup((IWineD3DResource *)This); - - if (context) context_release(context); } UINT surface_calculate_size(const struct wined3d_format_desc *format_desc, UINT alignment, UINT width, UINT height)

1 0

Henri Verbeet : wined3d: Make some lookup tables const.
by Alexandre Julliard 04 Aug '10

04 Aug '10

Module: wine Branch: master Commit: 37c8632811e705148110fb07cf55e27cdfe249af URL: http://source.winehq.org/git/wine.git/?a=commit;h=37c8632811e705148110fb07c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 4 11:10:27 2010 +0200 wined3d: Make some lookup tables const. --- dlls/wined3d/arb_program_shader.c | 10 +++++----- dlls/wined3d/glsl_shader.c | 12 +++++------- dlls/wined3d/shader.c | 4 ++-- 3 files changed, 12 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index ab82bb8..ef78227 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -3412,7 +3412,7 @@ static const DWORD *find_loop_control_values(IWineD3DBaseShaderImpl *This, DWORD static void init_ps_input(const IWineD3DPixelShaderImpl *This, const struct arb_ps_compile_args *args, struct shader_arb_ctx_priv *priv) { - const char *texcoords[8] = + static const char * const texcoords[8] = { "fragment.texcoord[0]", "fragment.texcoord[1]", "fragment.texcoord[2]", "fragment.texcoord[3]", "fragment.texcoord[4]", "fragment.texcoord[5]", "fragment.texcoord[6]", "fragment.texcoord[7]" @@ -3894,7 +3894,7 @@ static void init_output_registers(IWineD3DVertexShaderImpl *shader, DWORD sig_nu struct arb_vs_compiled_shader *compiled) { unsigned int i, j; - static const char *texcoords[8] = + static const char * const texcoords[8] = { "result.texcoord[0]", "result.texcoord[1]", "result.texcoord[2]", "result.texcoord[3]", "result.texcoord[4]", "result.texcoord[5]", "result.texcoord[6]", "result.texcoord[7]" @@ -3908,10 +3908,10 @@ static void init_output_registers(IWineD3DVertexShaderImpl *shader, DWORD sig_nu /* Write generic input varyings 0 to 7 to result.texcoord[], varying 8 to result.color.primary * and varying 9 to result.color.secondary */ - const char *decl_idx_to_string[MAX_REG_INPUT] = + static const char * const decl_idx_to_string[MAX_REG_INPUT] = { - texcoords[0], texcoords[1], texcoords[2], texcoords[3], - texcoords[4], texcoords[5], texcoords[6], texcoords[7], + "result.texcoord[0]", "result.texcoord[1]", "result.texcoord[2]", "result.texcoord[3]", + "result.texcoord[4]", "result.texcoord[5]", "result.texcoord[6]", "result.texcoord[7]", "result.color.primary", "result.color.secondary" }; diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 7f772a2..86355fa 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -4462,18 +4462,16 @@ static GLhandleARB create_glsl_blt_shader(const struct wined3d_gl_info *gl_info, GLhandleARB vshader_id, pshader_id; const char *blt_pshader; - static const char *blt_vshader[] = - { + static const char *blt_vshader = "#version 120\n" "void main(void)\n" "{\n" " gl_Position = gl_Vertex;\n" " gl_FrontColor = vec4(1.0);\n" " gl_TexCoord[0] = gl_MultiTexCoord0;\n" - "}\n" - }; + "}\n"; - static const char *blt_pshaders_full[tex_type_count] = + static const char * const blt_pshaders_full[tex_type_count] = { /* tex_1d */ NULL, @@ -4503,7 +4501,7 @@ static GLhandleARB create_glsl_blt_shader(const struct wined3d_gl_info *gl_info, "}\n", }; - static const char *blt_pshaders_masked[tex_type_count] = + static const char * const blt_pshaders_masked[tex_type_count] = { /* tex_1d */ NULL, @@ -4547,7 +4545,7 @@ static GLhandleARB create_glsl_blt_shader(const struct wined3d_gl_info *gl_info, } vshader_id = GL_EXTCALL(glCreateShaderObjectARB(GL_VERTEX_SHADER_ARB)); - GL_EXTCALL(glShaderSourceARB(vshader_id, 1, blt_vshader, NULL)); + GL_EXTCALL(glShaderSourceARB(vshader_id, 1, &blt_vshader, NULL)); GL_EXTCALL(glCompileShaderARB(vshader_id)); pshader_id = GL_EXTCALL(glCreateShaderObjectARB(GL_FRAGMENT_SHADER_ARB)); diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index b656601..e14666c 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -33,7 +33,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d_shader); WINE_DECLARE_DEBUG_CHANNEL(d3d); -static const char *shader_opcode_names[] = +static const char * const shader_opcode_names[] = { /* WINED3DSIH_ABS */ "abs", /* WINED3DSIH_ADD */ "add", @@ -125,7 +125,7 @@ static const char *shader_opcode_names[] = /* WINED3DSIH_TEXREG2RGB */ "texreg2rgb", }; -static const char *semantic_names[] = +static const char * const semantic_names[] = { /* WINED3DDECLUSAGE_POSITION */ "SV_POSITION", /* WINED3DDECLUSAGE_BLENDWEIGHT */ "BLENDWEIGHT",

1 0

Nikolay Sivov : comctl32/monthcal: Add some tests for post-V1 hittest fields.
by Alexandre Julliard 04 Aug '10

04 Aug '10

Module: wine Branch: master Commit: 8e968fd29037a6ef837b15ec99a311bf9f8617d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e968fd29037a6ef837b15ec9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Aug 4 14:29:27 2010 +0400 comctl32/monthcal: Add some tests for post-V1 hittest fields. --- dlls/comctl32/monthcal.c | 18 ++--- dlls/comctl32/tests/monthcal.c | 176 ++++++++++++++++++++++++++++++++++----- include/commctrl.h | 2 + 3 files changed, 163 insertions(+), 33 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index c1c105c..130e5f8 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -1715,23 +1715,21 @@ MONTHCAL_HitTest(const MONTHCAL_INFO *infoPtr, MCHITTESTINFO *lpht) lpht->uHit = MCHT_CALENDARWEEKNUM; lpht->st.wYear = ht_month.wYear; - if (day < 1) { + if (day < 1) + { lpht->st.wMonth = ht_month.wMonth - 1; - } - else if (day > MONTHCAL_MonthLength(ht_month.wMonth, ht_month.wYear)) { - lpht->st.wMonth = ht_month.wMonth + 1; - } - else - lpht->st.wMonth = ht_month.wMonth; - - if (day < 1) { lpht->st.wDay = MONTHCAL_MonthLength(ht_month.wMonth-1, ht_month.wYear) - day; } - else if (day > MONTHCAL_MonthLength(ht_month.wMonth, ht_month.wYear)) { + else if (day > MONTHCAL_MonthLength(ht_month.wMonth, ht_month.wYear)) + { + lpht->st.wMonth = ht_month.wMonth + 1; lpht->st.wDay = day - MONTHCAL_MonthLength(ht_month.wMonth, ht_month.wYear); } else + { + lpht->st.wMonth = ht_month.wMonth; lpht->st.wDay = day; + } } else if(PtInRect(&infoPtr->calendars[calIdx].days, lpht->pt)) { diff --git a/dlls/comctl32/tests/monthcal.c b/dlls/comctl32/tests/monthcal.c index 30f682f..267b052 100644 --- a/dlls/comctl32/tests/monthcal.c +++ b/dlls/comctl32/tests/monthcal.c @@ -28,12 +28,14 @@ #include "commctrl.h" #include "wine/test.h" +#include "v6util.h" #include <assert.h> #include <windows.h> #include "msg.h" #define expect(expected, got) ok(expected == got, "Expected %d, got %d\n", expected, got); #define expect_hex(expected, got) ok(expected == got, "Expected %x, got %x\n", expected, got); +#define expect_d(expected, got) ok(abs((expected) - (got)) <= 2, "Expected %d, got %d\n", expected, got); #define NUM_MSG_SEQUENCES 2 #define PARENT_SEQ_INDEX 0 @@ -292,26 +294,6 @@ static const struct message destroy_monthcal_multi_sel_style_seq[] = { { 0 } }; -/* expected message sequence for parent window*/ -static const struct message destroy_parent_seq[] = { - { 0x0090, sent|optional }, /* Vista */ - { WM_WINDOWPOSCHANGING, sent|wparam, 0}, - { WM_WINDOWPOSCHANGED, sent|wparam, 0}, - { WM_IME_SETCONTEXT, sent|wparam|optional, 0}, - { WM_IME_NOTIFY, sent|wparam|lparam|defwinproc|optional, 1, 0}, - { WM_NCACTIVATE, sent|wparam|optional, 0}, - { WM_ACTIVATE, sent|wparam|optional, 0}, - { WM_NCACTIVATE, sent|wparam|lparam|optional, 0, 0}, - { WM_ACTIVATE, sent|wparam|lparam|optional, 0, 0}, - { WM_ACTIVATEAPP, sent|wparam|optional, 0}, - { WM_KILLFOCUS, sent|wparam|lparam|optional, 0, 0}, - { WM_IME_SETCONTEXT, sent|wparam|optional, 0}, - { WM_IME_NOTIFY, sent|wparam|lparam|defwinproc|optional, 1, 0}, - { WM_DESTROY, sent|wparam|lparam, 0, 0}, - { WM_NCDESTROY, sent|wparam|lparam, 0, 0}, - { 0 } -}; - static void test_monthcal(void) { HWND hwnd; @@ -1680,11 +1662,135 @@ static void test_killfocus(void) DestroyWindow(hwnd); } +static void test_hittest_v6(void) +{ + MCHITTESTINFO mchit; + DWORD ret; + HWND hwnd; + RECT r; + + hwnd = create_monthcal_control(0); + SendMessage(hwnd, MCM_SETCALENDARBORDER, TRUE, 0); + + SendMessage(hwnd, MCM_GETMINREQRECT, 0, (LPARAM)&r); + /* reserving some area around calendar */ + MoveWindow(hwnd, 0, 0, r.right * 3 / 2, r.bottom * 3 / 2, FALSE); + mchit.cbSize = sizeof(MCHITTESTINFO); + mchit.pt.x = mchit.pt.y = 0; + mchit.iOffset = -1; + mchit.iRow = -1; + mchit.iCol = -1; + ret = SendMessage(hwnd, MCM_HITTEST, 0, (LPARAM)&mchit); + if (ret == -1) + { + win_skip("Only MCHITTESTINFO_V1 supported\n"); + DestroyWindow(hwnd); + return; + } + todo_wine expect_hex(MCHT_NOWHERE, ret); + expect(-1, mchit.iOffset); + expect(-1, mchit.iRow); + expect(-1, mchit.iCol); + + MoveWindow(hwnd, 0, 0, r.right, r.bottom, FALSE); + mchit.pt.x = r.right / 2; + mchit.pt.y = r.bottom / 2; + mchit.iOffset = -1; + ret = SendMessage(hwnd, MCM_HITTEST, 0, (LPARAM)&mchit); + expect_hex(MCHT_CALENDARDATE, ret); + todo_wine expect(0, mchit.iOffset); + + /* over day area */ + mchit.pt.x = r.right / (7*2); + mchit.pt.y = r.bottom / 2; + mchit.iOffset = -1; + mchit.iCol = mchit.iRow = -1; + mchit.uHit = 0; + mchit.rc.left = mchit.rc.right = mchit.rc.top = mchit.rc.bottom = -1; + ret = SendMessage(hwnd, MCM_HITTEST, 0, (LPARAM)&mchit); + expect_hex(MCHT_CALENDARDATE, ret); + expect_hex(MCHT_CALENDARDATE, mchit.uHit); + todo_wine expect(0, mchit.iOffset); + todo_wine expect(2, mchit.iRow); + todo_wine expect(0, mchit.iCol); + /* returned a one day rectangle */ + todo_wine expect_d(r.right / 7, mchit.rc.right - mchit.rc.left); + todo_wine expect_d(r.bottom / 10, mchit.rc.bottom - mchit.rc.top); + + /* title */ + mchit.pt.x = 1; + mchit.pt.y = 1; + mchit.iOffset = -1; + mchit.iCol = mchit.iRow = -1; + mchit.uHit = 0; + mchit.rc.left = mchit.rc.right = mchit.rc.top = mchit.rc.bottom = -1; + ret = SendMessage(hwnd, MCM_HITTEST, 0, (LPARAM)&mchit); + expect_hex(MCHT_TITLE, ret); + expect_hex(MCHT_TITLE, mchit.uHit); + todo_wine expect(0, mchit.iOffset); + expect(-1, mchit.iRow); + expect(-1, mchit.iCol); + todo_wine expect(0, mchit.rc.left); + todo_wine expect(0, mchit.rc.top); + todo_wine expect_d(r.right, mchit.rc.right); + todo_wine ok(mchit.rc.bottom > 0, "got %d\n", mchit.rc.bottom); + + /* between two calendars */ + MoveWindow(hwnd, 0, 0, r.right * 5/2, r.bottom, FALSE); + mchit.pt.x = r.right / (5*4); + mchit.pt.y = r.bottom / 2; + mchit.iOffset = -2; + mchit.iCol = mchit.iRow = -2; + mchit.uHit = 0; + mchit.rc.left = mchit.rc.right = mchit.rc.top = mchit.rc.bottom = -1; + ret = SendMessage(hwnd, MCM_HITTEST, 0, (LPARAM)&mchit); + todo_wine expect_hex(MCHT_NOWHERE, ret); + todo_wine expect_hex(MCHT_NOWHERE, mchit.uHit); + expect(-2, mchit.iOffset); + expect(-2, mchit.iRow); + expect(-2, mchit.iCol); + todo_wine expect(0, mchit.rc.left); + todo_wine expect(0, mchit.rc.top); + todo_wine expect_d(r.right * 5/2, mchit.rc.right); + todo_wine expect_d(r.bottom, mchit.rc.bottom); + + DestroyWindow(hwnd); +} + +static void test_get_set_border(void) +{ + HWND hwnd; + DWORD ret; + + hwnd = create_monthcal_control(0); + + /* a non-default value */ + ret = SendMessage(hwnd, MCM_SETCALENDARBORDER, TRUE, 10); + expect(0, ret); + + ret = SendMessage(hwnd, MCM_GETCALENDARBORDER, 0, 0); + + if (ret != 10) + { + skip("MCM_GET/SETCALENDARBORDER not supported\n"); + DestroyWindow(hwnd); + return; + } + + expect(10, ret); + + DestroyWindow(hwnd); +} + START_TEST(monthcal) { - HMODULE hComctl32; BOOL (WINAPI *pInitCommonControlsEx)(const INITCOMMONCONTROLSEX*); INITCOMMONCONTROLSEX iccex; + HMODULE hComctl32; + HWND hwnd; + + ULONG_PTR ctx_cookie; + HANDLE hCtx; hComctl32 = GetModuleHandleA("comctl32.dll"); pInitCommonControlsEx = (void*)GetProcAddress(hComctl32, "InitCommonControlsEx"); @@ -1719,7 +1825,31 @@ START_TEST(monthcal) test_monthcal_selrange(); test_killfocus(); - flush_sequences(sequences, NUM_MSG_SEQUENCES); + if (!load_v6_module(&ctx_cookie, &hCtx)) + { + DestroyWindow(parent_wnd); + return; + } + + /* this is a XP SP3 failure workaround */ + hwnd = CreateWindowExA(0, MONTHCAL_CLASSA, "foo", + WS_CHILD | WS_BORDER | WS_VISIBLE, + 0, 0, 100, 100, + parent_wnd, NULL, GetModuleHandleA(NULL), NULL); + if (!IsWindow(hwnd)) + { + win_skip("FIXME: failed to create Monthcal window.\n"); + unload_v6_module(ctx_cookie, hCtx); + DestroyWindow(parent_wnd); + return; + } + else + DestroyWindow(hwnd); + + test_hittest_v6(); + test_get_set_border(); + + unload_v6_module(ctx_cookie, hCtx); + DestroyWindow(parent_wnd); - ok_sequence(sequences, PARENT_SEQ_INDEX, destroy_parent_seq, "Destroy parent window", FALSE); } diff --git a/include/commctrl.h b/include/commctrl.h index d3a4de1..fdd6951 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -4675,6 +4675,8 @@ static const WCHAR MONTHCAL_CLASSW[] = { 'S','y','s', #define MCM_GETMONTHDELTA (MCM_FIRST + 19) #define MCM_SETMONTHDELTA (MCM_FIRST + 20) #define MCM_GETMAXTODAYWIDTH (MCM_FIRST + 21) +#define MCM_SETCALENDARBORDER (MCM_FIRST + 30) +#define MCM_GETCALENDARBORDER (MCM_FIRST + 31) #define MCM_GETUNICODEFORMAT CCM_GETUNICODEFORMAT #define MCM_SETUNICODEFORMAT CCM_SETUNICODEFORMAT

1 0

Nikolay Sivov : comctl32/tests: Remove some noise from function names.
by Alexandre Julliard 04 Aug '10

04 Aug '10

Module: wine Branch: master Commit: 94dfbcaad52e44990efe03d4d9cc7b30d9e463d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=94dfbcaad52e44990efe03d4d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Aug 4 14:32:51 2010 +0400 comctl32/tests: Remove some noise from function names. Everything in this file is about Monthcal. --- dlls/comctl32/tests/monthcal.c | 56 ++++++++++++++++++++-------------------- 1 files changed, 28 insertions(+), 28 deletions(-) diff --git a/dlls/comctl32/tests/monthcal.c b/dlls/comctl32/tests/monthcal.c index 267b052..59dd0d5 100644 --- a/dlls/comctl32/tests/monthcal.c +++ b/dlls/comctl32/tests/monthcal.c @@ -611,7 +611,7 @@ static HWND create_monthcal_control(DWORD style) /* Setter and Getters Tests */ -static void test_monthcal_color(void) +static void test_color(void) { int res, temp; HWND hwnd; @@ -686,7 +686,7 @@ static void test_monthcal_color(void) DestroyWindow(hwnd); } -static void test_monthcal_currdate(void) +static void test_currdate(void) { SYSTEMTIME st_original, st_new, st_test; int res; @@ -816,7 +816,7 @@ static void test_monthcal_currdate(void) DestroyWindow(hwnd); } -static void test_monthcal_firstDay(void) +static void test_firstDay(void) { int res, fday, i, prev; CHAR b[128]; @@ -863,7 +863,7 @@ static void test_monthcal_firstDay(void) DestroyWindow(hwnd); } -static void test_monthcal_unicode(void) +static void test_unicode(void) { int res, temp; HWND hwnd; @@ -906,7 +906,7 @@ static void test_monthcal_unicode(void) DestroyWindow(hwnd); } -static void test_monthcal_hittest(void) +static void test_hittest(void) { typedef struct hittest_test { @@ -1157,7 +1157,7 @@ static void test_monthcal_hittest(void) DestroyWindow(hwnd); } -static void test_monthcal_todaylink(void) +static void test_todaylink(void) { MCHITTESTINFO mchit; SYSTEMTIME st_test, st_new; @@ -1212,7 +1212,7 @@ static void test_monthcal_todaylink(void) DestroyWindow(hwnd); } -static void test_monthcal_today(void) +static void test_today(void) { SYSTEMTIME st_test, st_new; int res; @@ -1267,7 +1267,7 @@ static void test_monthcal_today(void) DestroyWindow(hwnd); } -static void test_monthcal_scroll(void) +static void test_scroll(void) { int res; HWND hwnd; @@ -1305,7 +1305,7 @@ static void test_monthcal_scroll(void) DestroyWindow(hwnd); } -static void test_monthcal_monthrange(void) +static void test_monthrange(void) { int res; SYSTEMTIME st_visible[2], st_daystate[2], st; @@ -1398,7 +1398,7 @@ static void test_monthcal_monthrange(void) DestroyWindow(hwnd); } -static void test_monthcal_maxselday(void) +static void test_maxselday(void) { int res; HWND hwnd; @@ -1464,7 +1464,7 @@ static void test_monthcal_maxselday(void) DestroyWindow(hwnd); } -static void test_monthcal_size(void) +static void test_size(void) { int res; RECT r1, r2; @@ -1500,7 +1500,7 @@ static void test_monthcal_size(void) DestroyWindow(hwnd); } -static void test_monthcal_create(void) +static void test_create(void) { HWND hwnd; @@ -1517,7 +1517,7 @@ static void test_monthcal_create(void) DestroyWindow(hwnd); } -static void test_monthcal_destroy(void) +static void test_destroy(void) { HWND hwnd; @@ -1534,7 +1534,7 @@ static void test_monthcal_destroy(void) ok_sequence(sequences, MONTHCAL_SEQ_INDEX, destroy_monthcal_multi_sel_style_seq, "Destroy monthcal (multi sel style)", FALSE); } -static void test_monthcal_selrange(void) +static void test_selrange(void) { HWND hwnd; SYSTEMTIME st, range[2], range2[2]; @@ -1809,20 +1809,20 @@ START_TEST(monthcal) parent_wnd = create_parent_window(); - test_monthcal_create(); - test_monthcal_destroy(); - test_monthcal_color(); - test_monthcal_currdate(); - test_monthcal_firstDay(); - test_monthcal_unicode(); - test_monthcal_today(); - test_monthcal_scroll(); - test_monthcal_monthrange(); - test_monthcal_hittest(); - test_monthcal_todaylink(); - test_monthcal_size(); - test_monthcal_maxselday(); - test_monthcal_selrange(); + test_create(); + test_destroy(); + test_color(); + test_currdate(); + test_firstDay(); + test_unicode(); + test_today(); + test_scroll(); + test_monthrange(); + test_hittest(); + test_todaylink(); + test_size(); + test_maxselday(); + test_selrange(); test_killfocus(); if (!load_v6_module(&ctx_cookie, &hCtx))

1 0

David Hedberg : explorerframe: Implement InsertRoot and AppendRoot.
by Alexandre Julliard 04 Aug '10

04 Aug '10

Module: wine Branch: master Commit: f87891c36223325308e9c017e207a7c340559c88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f87891c36223325308e9c017e… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Wed Aug 4 03:57:47 2010 +0200 explorerframe: Implement InsertRoot and AppendRoot. --- dlls/explorerframe/Makefile.in | 2 +- dlls/explorerframe/nstc.c | 122 +++++++++++++++++++++++++++++++++++++- dlls/explorerframe/tests/nstc.c | 97 +++++++++++++++++++++++++++++++ 3 files changed, 216 insertions(+), 5 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f87891c36223325308e9c…

1 0

David Hedberg : explorerframe: Handle TVN_GETDISPINFO to get icons, filename and information about subfolders.
by Alexandre Julliard 04 Aug '10

04 Aug '10

Module: wine Branch: master Commit: 658ec55a9464cd44665b805accd50028d9d1c841 URL: http://source.winehq.org/git/wine.git/?a=commit;h=658ec55a9464cd44665b805ac… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Wed Aug 4 03:57:48 2010 +0200 explorerframe: Handle TVN_GETDISPINFO to get icons, filename and information about subfolders. --- dlls/explorerframe/nstc.c | 104 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 104 insertions(+), 0 deletions(-) diff --git a/dlls/explorerframe/nstc.c b/dlls/explorerframe/nstc.c index 153c4c9..9116f66 100644 --- a/dlls/explorerframe/nstc.c +++ b/dlls/explorerframe/nstc.c @@ -72,6 +72,20 @@ static const DWORD unsupported_styles2 = /************************************************************************* * NamespaceTree event wrappers */ +static HRESULT events_OnGetDefaultIconIndex(NSTC2Impl *This, IShellItem *psi, + int *piDefaultIcon, int *piOpenIcon) +{ + HRESULT ret; + LONG refcount; + if(!This->pnstce) return E_NOTIMPL; + + refcount = IShellItem_AddRef(psi); + ret = INameSpaceTreeControlEvents_OnGetDefaultIconIndex(This->pnstce, psi, piDefaultIcon, piOpenIcon); + if(IShellItem_Release(psi) < refcount - 1) + ERR("ShellItem was released by client - please file a bug.\n"); + return ret; +} + static HRESULT events_OnItemAdded(NSTC2Impl *This, IShellItem *psi, BOOL fIsRoot) { HRESULT ret; @@ -135,6 +149,28 @@ static DWORD treeview_style_from_nstcs(NSTC2Impl *This, NSTCSTYLE nstcs, return old_style^*new_style; } +static IShellItem *shellitem_from_treeitem(NSTC2Impl *This, HTREEITEM hitem) +{ + TVITEMEXW tvi; + + tvi.mask = TVIF_PARAM; + tvi.lParam = (LPARAM)NULL; + tvi.hItem = hitem; + + SendMessageW(This->hwnd_tv, TVM_GETITEMW, 0, (LPARAM)&tvi); + + TRACE("ShellItem: %p\n", (void*)tvi.lParam); + return (IShellItem*)tvi.lParam; +} + +static int get_icon(LPCITEMIDLIST lpi, UINT extra_flags) +{ + SHFILEINFOW sfi; + UINT flags = SHGFI_PIDL | SHGFI_SYSICONINDEX | SHGFI_SMALLICON; + SHGetFileInfoW((LPCWSTR)lpi, 0 ,&sfi, sizeof(SHFILEINFOW), flags | extra_flags); + return sfi.iIcon; +} + /* Insert a shellitem into the given place in the tree and return the resulting treeitem. */ static HTREEITEM insert_shellitem(NSTC2Impl *This, IShellItem *psi, @@ -239,16 +275,84 @@ static LRESULT destroy_namespacetree(NSTC2Impl *This) return TRUE; } +static LRESULT on_tvn_getdispinfow(NSTC2Impl *This, LPARAM lParam) +{ + NMTVDISPINFOW *dispinfo = (NMTVDISPINFOW*)lParam; + TVITEMEXW *item = (TVITEMEXW*)&dispinfo->item; + IShellItem *psi = shellitem_from_treeitem(This, item->hItem); + HRESULT hr; + + TRACE("%p, %p (mask: %x)\n", This, dispinfo, item->mask); + + if(item->mask & TVIF_CHILDREN) + { + SFGAOF sfgao; + + hr = IShellItem_GetAttributes(psi, SFGAO_HASSUBFOLDER, &sfgao); + if(SUCCEEDED(hr)) + item->cChildren = (sfgao & SFGAO_HASSUBFOLDER)?1:0; + else + item->cChildren = 1; + + item->mask |= TVIF_DI_SETITEM; + } + + if(item->mask & (TVIF_IMAGE|TVIF_SELECTEDIMAGE)) + { + LPITEMIDLIST pidl; + + hr = events_OnGetDefaultIconIndex(This, psi, &item->iImage, &item->iSelectedImage); + if(FAILED(hr)) + { + hr = SHGetIDListFromObject((IUnknown*)psi, &pidl); + if(SUCCEEDED(hr)) + { + item->iImage = item->iSelectedImage = get_icon(pidl, 0); + item->mask |= TVIF_DI_SETITEM; + ILFree(pidl); + } + else + ERR("Failed to get IDList (%08x).\n", hr); + } + } + + if(item->mask & TVIF_TEXT) + { + LPWSTR display_name; + + hr = IShellItem_GetDisplayName(psi, SIGDN_NORMALDISPLAY, &display_name); + if(SUCCEEDED(hr)) + { + lstrcpynW(item->pszText, display_name, MAX_PATH); + item->mask |= TVIF_DI_SETITEM; + CoTaskMemFree(display_name); + } + else + ERR("Failed to get display name (%08x).\n", hr); + } + + return TRUE; +} + static LRESULT CALLBACK NSTC2_WndProc(HWND hWnd, UINT uMessage, WPARAM wParam, LPARAM lParam) { NSTC2Impl *This = (NSTC2Impl*)GetWindowLongPtrW(hWnd, GWLP_USERDATA); + NMHDR *nmhdr; switch(uMessage) { case WM_NCCREATE: return create_namespacetree(hWnd, (CREATESTRUCTW*)lParam); case WM_SIZE: return resize_namespacetree(This); case WM_DESTROY: return destroy_namespacetree(This); + case WM_NOTIFY: + nmhdr = (NMHDR*)lParam; + switch(nmhdr->code) + { + case TVN_GETDISPINFOW: return on_tvn_getdispinfow(This, lParam); + default: break; + } + break; default: return DefWindowProcW(hWnd, uMessage, wParam, lParam); } return 0;

1 0