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

Dmitry Timoshkov : user32: Protect from setting as a window owner one of its successors.
by Alexandre Julliard Aug. 4, 2010

Aug. 4, 2010

Module: wine Branch: master Commit: dfe6ae58afdebd830fa491a4dec1bed9ee6527eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfe6ae58afdebd830fa491a4d… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed Aug 4 23:00:34 2010 +0900 user32: Protect from setting as a window owner one of its successors. --- dlls/user32/tests/win.c | 9 +++++++++ server/window.c | 13 ++++++++++++- 2 files changed, 21 insertions(+), 1 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 632e382..3af8d75 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -380,6 +380,15 @@ static void test_parent_owner(void) check_parents( test, desktop, 0, desktop, 0, test, desktop ); /* window is now child of desktop so GWLP_HWNDPARENT changes owner from now on */ + if (!is_win9x) + { + ret = (HWND)SetWindowLongPtrA( test, GWLP_HWNDPARENT, (LONG_PTR)test ); + ok( ret == 0, "GWL_HWNDPARENT return value %p expected 0\n", ret ); + check_parents( test, desktop, 0, desktop, 0, test, desktop ); + } + else + win_skip("Test creates circular window tree under Win9x/WinMe\n" ); + ret = (HWND)SetWindowLongPtrA( test, GWLP_HWNDPARENT, (LONG_PTR)child ); ok( ret == 0, "GWL_HWNDPARENT return value %p expected 0\n", ret ); check_parents( test, desktop, child, desktop, child, test, desktop ); diff --git a/server/window.c b/server/window.c index 3b912b0..5fdfd13 100644 --- a/server/window.c +++ b/server/window.c @@ -1834,7 +1834,7 @@ DECL_HANDLER(get_desktop_window) DECL_HANDLER(set_window_owner) { struct window *win = get_window( req->handle ); - struct window *owner = NULL; + struct window *owner = NULL, *ptr; if (!win) return; if (req->owner && !(owner = get_window( req->owner ))) return; @@ -1843,6 +1843,17 @@ DECL_HANDLER(set_window_owner) set_error( STATUS_ACCESS_DENIED ); return; } + + /* make sure owner is not a successor of window */ + for (ptr = owner; ptr; ptr = ptr->owner ? get_window( ptr->owner ) : NULL) + { + if (ptr == win) + { + set_error( STATUS_INVALID_PARAMETER ); + return; + } + } + reply->prev_owner = win->owner; reply->full_owner = win->owner = owner ? owner->handle : 0; }

1 0

Alexandre Julliard : d3dx9: Fix some incorrect const typecasts.
by Alexandre Julliard Aug. 4, 2010

Aug. 4, 2010

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

Tony Wasserka : d3dx9: Move pixel sampling and recombination in copy_simple_data to separate helper functions .
by Alexandre Julliard Aug. 4, 2010

Aug. 4, 2010

Module: wine Branch: master Commit: 295d2a67772ef537bdb16eba877872a0f1c53f0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=295d2a67772ef537bdb16eba8… Author: Tony Wasserka <tony.wasserka(a)freenet.de> Date: Wed Jul 28 21:33:14 2010 +0200 d3dx9: Move pixel sampling and recombination in copy_simple_data to separate helper functions. --- dlls/d3dx9_36/surface.c | 129 ++++++++++++++++++++++++++++++---------------- 1 files changed, 84 insertions(+), 45 deletions(-) diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index 7504811..c39ec57 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009 Tony Wasserka + * Copyright (C) 2009-2010 Tony Wasserka * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -446,45 +446,100 @@ HRESULT WINAPI D3DXLoadSurfaceFromResourceW(LPDIRECT3DSURFACE9 pDestSurface, /************************************************************ - * copy_simple_data - * - * Copies the source buffer to the destination buffer, performing - * any necessary format conversion and color keying. - * Works only for ARGB formats with 1 - 4 bytes per pixel. + * helper functions for D3DXLoadSurfaceFromMemory */ -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, - DWORD dwFilter) +struct argb_conversion_info { + CONST PixelFormatDesc *srcformat; + CONST PixelFormatDesc *destformat; DWORD srcshift[4], destshift[4]; DWORD srcmask[4], destmask[4]; BOOL process_channel[4]; - DWORD channels[4]; - DWORD channelmask = 0; + DWORD channelmask; +}; - UINT minwidth, minheight; - BYTE *srcptr, *destptr; - UINT i, x, y; +static void init_argb_conversion_info(CONST PixelFormatDesc *srcformat, CONST PixelFormatDesc *destformat, struct argb_conversion_info *info) +{ + UINT i; + ZeroMemory(info->process_channel, 4 * sizeof(BOOL)); + info->channelmask = 0; - ZeroMemory(channels, sizeof(channels)); - ZeroMemory(process_channel, sizeof(process_channel)); + info->srcformat = srcformat; + info->destformat = destformat; for(i = 0;i < 4;i++) { /* srcshift is used to extract the _relevant_ components */ - srcshift[i] = srcformat->shift[i] + max( srcformat->bits[i] - destformat->bits[i], 0); + info->srcshift[i] = srcformat->shift[i] + max( srcformat->bits[i] - destformat->bits[i], 0); /* destshift is used to move the components to the correct position */ - destshift[i] = destformat->shift[i] + max(destformat->bits[i] - srcformat->bits[i], 0); + info->destshift[i] = destformat->shift[i] + max(destformat->bits[i] - srcformat->bits[i], 0); - srcmask[i] = ((1 << srcformat->bits[i]) - 1) << srcformat->shift[i]; - destmask[i] = ((1 << destformat->bits[i]) - 1) << destformat->shift[i]; + info->srcmask[i] = ((1 << srcformat->bits[i]) - 1) << srcformat->shift[i]; + info->destmask[i] = ((1 << destformat->bits[i]) - 1) << destformat->shift[i]; /* channelmask specifies bits which aren't used in the source format but in the destination one */ if(destformat->bits[i]) { - if(srcformat->bits[i]) process_channel[i] = TRUE; - else channelmask |= destmask[i]; + if(srcformat->bits[i]) info->process_channel[i] = TRUE; + else info->channelmask |= info->destmask[i]; } } +} + +/************************************************************ + * get_relevant_argb_components + * + * Extracts the relevant components from the source color and + * drops the less significant bits if they aren't used by the destination format. + */ +static void get_relevant_argb_components(CONST struct argb_conversion_info *info, CONST DWORD col, DWORD *out) +{ + UINT i = 0; + for(;i < 4;i++) + if(info->process_channel[i]) + out[i] = (col & info->srcmask[i]) >> info->srcshift[i]; +} + +/************************************************************ + * make_argb_color + * + * Recombines the output of get_relevant_argb_components and converts + * it to the destination format. + */ +static void make_argb_color(CONST struct argb_conversion_info *info, CONST DWORD *in, DWORD *out) +{ + UINT i; + *out = 0; + + for(i = 0;i < 4;i++) { + if(info->process_channel[i]) { + /* necessary to make sure that e.g. an X4R4G4B4 white maps to an R8G8B8 white instead of 0xf0f0f0 */ + signed int shift; + for(shift = info->destshift[i]; shift > info->destformat->shift[i]; shift -= info->srcformat->bits[i]) *out |= in[i] << shift; + *out |= (in[i] >> (info->destformat->shift[i] - shift)) << info->destformat->shift[i]; + } + } + *out |= info->channelmask; /* new channels are set to their maximal value */ +} + +/************************************************************ + * copy_simple_data + * + * Copies the source buffer to the destination buffer, performing + * any necessary format conversion and color keying. + * 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) +{ + struct argb_conversion_info conv_info; + DWORD channels[4]; + + UINT minwidth, minheight; + BYTE *srcptr, *destptr; + 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; @@ -494,32 +549,16 @@ static void copy_simple_data(CONST BYTE *src, UINT srcpitch, POINT srcsize, C destptr = (BYTE*)(dest + y * destpitch); for(x = 0;x < minwidth;x++) { /* extract source color components */ - if(srcformat->type == FORMAT_ARGB) { - const DWORD col = *(DWORD*)srcptr; - for(i = 0;i < 4;i++) - if(process_channel[i]) - channels[i] = (col & srcmask[i]) >> srcshift[i]; - } + if(srcformat->type == FORMAT_ARGB) get_relevant_argb_components(&conv_info, *(DWORD*)srcptr, channels); /* recombine the components */ - if(destformat->type == FORMAT_ARGB) { - DWORD* const pixel = (DWORD*)destptr; - *pixel = 0; - - for(i = 0;i < 4;i++) { - if(process_channel[i]) { - /* necessary to make sure that e.g. an X4R4G4B4 white maps to an R8G8B8 white instead of 0xf0f0f0 */ - signed int shift; - for(shift = destshift[i]; shift > destformat->shift[i]; shift -= srcformat->bits[i]) *pixel |= channels[i] << shift; - *pixel |= (channels[i] >> (destformat->shift[i] - shift)) << destformat->shift[i]; - } - } - *pixel |= channelmask; /* new channels are set to their maximal value */ - } + if(destformat->type == FORMAT_ARGB) make_argb_color(&conv_info, channels, (DWORD*)destptr); + srcptr += srcformat->bytes_per_pixel; destptr += destformat->bytes_per_pixel; } } + /* TODO: Black out unused pixels */ } /************************************************************ @@ -576,7 +615,8 @@ 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 != D3DX_FILTER_NONE) return E_NOTIMPL; + if((dwFilter & 0xF) != D3DX_FILTER_NONE) return E_NOTIMPL; + if(dwFilter == D3DX_DEFAULT) dwFilter = D3DX_FILTER_TRIANGLE | D3DX_FILTER_DITHER; IDirect3DSurface9_GetDesc(pDestSurface, &surfdesc); @@ -599,8 +639,7 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(LPDIRECT3DSURFACE9 pDestSurface, if(FAILED(hr)) return D3DXERR_INVALIDDATA; copy_simple_data((CONST BYTE*)pSrcMemory, SrcPitch, srcsize, srcformatdesc, - (CONST BYTE*)lockrect.pBits, lockrect.Pitch, destsize, destformatdesc, - dwFilter); + (CONST BYTE*)lockrect.pBits, lockrect.Pitch, destsize, destformatdesc); IDirect3DSurface9_UnlockRect(pDestSurface); return D3D_OK;

1 0

Jacek Caban : jscript: Fixed Error. toString implementation for non-Error this.
by Alexandre Julliard Aug. 4, 2010

Aug. 4, 2010

Module: wine Branch: master Commit: ae8cb5a1e6b63741ecfd41b4c7c79bfcaef6050d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae8cb5a1e6b63741ecfd41b4c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 4 15:32:59 2010 +0200 jscript: Fixed Error.toString implementation for non-Error this. --- dlls/jscript/error.c | 43 ++++++++++++++++++++++++++++--------------- dlls/jscript/tests/api.js | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 61 insertions(+), 15 deletions(-) diff --git a/dlls/jscript/error.c b/dlls/jscript/error.c index 672a078..a440a41 100644 --- a/dlls/jscript/error.c +++ b/dlls/jscript/error.c @@ -47,39 +47,45 @@ static inline ErrorInstance *error_this(vdisp_t *jsthis) } /* ECMA-262 3rd Edition 15.11.4.4 */ -static HRESULT Error_toString(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, +static HRESULT Error_toString(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { - ErrorInstance *error; - BSTR name, msg = NULL, ret = NULL; + DispatchEx *jsthis; + BSTR name = NULL, msg = NULL, ret = NULL; VARIANT v; HRESULT hres; - static const WCHAR str[] = {'[','o','b','j','e','c','t',' ','E','r','r','o','r',']',0}; + static const WCHAR object_errorW[] = {'[','o','b','j','e','c','t',' ','E','r','r','o','r',']',0}; TRACE("\n"); - error = error_this(jsthis); - if(ctx->version < 2 || !error) { + jsthis = get_jsdisp(vthis); + if(!jsthis || ctx->version < 2) { if(retv) { V_VT(retv) = VT_BSTR; - V_BSTR(retv) = SysAllocString(str); + V_BSTR(retv) = SysAllocString(object_errorW); if(!V_BSTR(retv)) return E_OUTOFMEMORY; } return S_OK; } - hres = jsdisp_propget_name(&error->dispex, nameW, &v, ei, caller); + hres = jsdisp_propget_name(jsthis, nameW, &v, ei, caller); if(FAILED(hres)) return hres; - hres = to_string(ctx, &v, ei, &name); - VariantClear(&v); - if(FAILED(hres)) - return hres; + if(V_VT(&v) != VT_EMPTY) { + hres = to_string(ctx, &v, ei, &name); + VariantClear(&v); + if(FAILED(hres)) + return hres; + if(!*name) { + SysFreeString(name); + name = NULL; + } + } - hres = jsdisp_propget_name(&error->dispex, messageW, &v, ei, caller); + hres = jsdisp_propget_name(jsthis, messageW, &v, ei, caller); if(SUCCEEDED(hres)) { if(V_VT(&v) != VT_EMPTY) { hres = to_string(ctx, &v, ei, &msg); @@ -92,7 +98,7 @@ static HRESULT Error_toString(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, } if(SUCCEEDED(hres)) { - if(msg) { + if(name && msg) { DWORD name_len, msg_len; name_len = SysStringLen(name); @@ -105,9 +111,16 @@ static HRESULT Error_toString(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, ret[name_len+1] = ' '; memcpy(ret+name_len+2, msg, msg_len*sizeof(WCHAR)); } - }else { + }else if(name) { ret = name; name = NULL; + }else if(msg) { + ret = msg; + msg = NULL; + }else { + ret = SysAllocString(object_errorW); + if(!V_BSTR(retv)) + hres = E_OUTOFMEMORY; } } diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index f794244..c57666d 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -1780,6 +1780,12 @@ ok(err.message === "message", "err.message = " + err.message); ok(err.description === "message", "err.description = " + err.description); err = new Error(); ok(err.number === 0, "err.number = " + err.number); +ok(err.description === "", "err.description = " + err.description); +err.description = 5; +ok(err.description === 5, "err.description = " + err.description); +ok(err.message === "", "err.message = " + err.message); +err.message = 4; +ok(err.message === 4, "err.message = " + err.message); ok(!("number" in Error), "number is in Error"); @@ -1789,6 +1795,33 @@ tmp.toString = function() { return "test"; }; tmp = Error.prototype.toString.call(tmp); ok(tmp === "[object Error]", "Error.prototype.toString.call(tmp) = " + tmp); +if(invokeVersion >= 2) { + obj = new Object(); + obj.name = "test"; + tmp = Error.prototype.toString.call(obj); + ok(tmp === "test", "Error.prototype.toString.call(obj) = " + tmp); + + obj = new Object(); + obj.name = 6; + obj.message = false; + tmp = Error.prototype.toString.call(obj); + ok(tmp === "6: false", "Error.prototype.toString.call(obj) = " + tmp); + + obj = new Object(); + obj.message = "test"; + tmp = Error.prototype.toString.call(obj); + ok(tmp === "test", "Error.prototype.toString.call(obj) = " + tmp); + + obj = new Object(); + obj.name = ""; + obj.message = "test"; + tmp = Error.prototype.toString.call(obj); + ok(tmp === "test", "Error.prototype.toString.call(obj) = " + tmp); +} + +tmp = Error.prototype.toString.call(testObj); +ok(tmp === "[object Error]", "Error.prototype.toString.call(testObj) = " + tmp); + err = new Error(); err.name = null; ok(err.name === null, "err.name = " + err.name + " expected null");

1 0

David Hedberg : explorerframe: Implement GetRootItems.
by Alexandre Julliard Aug. 4, 2010

Aug. 4, 2010

Module: wine Branch: master Commit: 2761b0ded649147cba0398ba3fd65edcb45f96aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=2761b0ded649147cba0398ba3… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Wed Aug 4 03:57:50 2010 +0200 explorerframe: Implement GetRootItems. --- dlls/explorerframe/nstc.c | 31 ++++++- dlls/explorerframe/tests/nstc.c | 205 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 234 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2761b0ded649147cba039…

1 0

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

Aug. 4, 2010

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

Nikolay Sivov : comctl32/monthcal: Add some tests for post-V1 hittest fields.
by Alexandre Julliard Aug. 4, 2010

Aug. 4, 2010

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

Henri Verbeet : wined3d: Make some lookup tables const.
by Alexandre Julliard Aug. 4, 2010

Aug. 4, 2010

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/tests: Remove some noise from function names.
by Alexandre Julliard Aug. 4, 2010

Aug. 4, 2010

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

Jacek Caban : jscript: Use generic property for Error.description.
by Alexandre Julliard Aug. 4, 2010

Aug. 4, 2010

Module: wine Branch: master Commit: 96990cfa8ea450f856621c76ccd60075d76adbfe URL: http://source.winehq.org/git/wine.git/?a=commit;h=96990cfa8ea450f856621c76c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 4 15:32:11 2010 +0200 jscript: Use generic property for Error.description. --- dlls/jscript/error.c | 31 ++++++------------------------- 1 files changed, 6 insertions(+), 25 deletions(-) diff --git a/dlls/jscript/error.c b/dlls/jscript/error.c index 2465c77..593244d 100644 --- a/dlls/jscript/error.c +++ b/dlls/jscript/error.c @@ -29,7 +29,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(jscript); typedef struct { DispatchEx dispex; - VARIANT description; VARIANT message; } ErrorInstance; @@ -49,24 +48,6 @@ static inline ErrorInstance *error_this(vdisp_t *jsthis) return is_vclass(jsthis, JSCLASS_ERROR) ? error_from_vdisp(jsthis) : NULL; } -static HRESULT Error_description(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, - DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) -{ - ErrorInstance *This = error_from_vdisp(jsthis); - - TRACE("\n"); - - switch(flags) { - case DISPATCH_PROPERTYGET: - return VariantCopy(retv, &This->description); - case DISPATCH_PROPERTYPUT: - return VariantCopy(&This->description, get_arg(dp, 0)); - default: - FIXME("unimplemented flags %x\n", flags); - return E_NOTIMPL; - } -} - /* ECMA-262 3rd Edition 15.11.4.3 */ static HRESULT Error_message(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) @@ -184,13 +165,11 @@ static void Error_destructor(DispatchEx *dispex) { ErrorInstance *This = (ErrorInstance*)dispex; - VariantClear(&This->description); VariantClear(&This->message); heap_free(This); } static const builtin_prop_t Error_props[] = { - {descriptionW, Error_description, 0}, {messageW, Error_message, 0}, {toStringW, Error_toString, PROPF_METHOD} }; @@ -205,7 +184,6 @@ static const builtin_info_t Error_info = { }; static const builtin_prop_t ErrorInst_props[] = { - {descriptionW, Error_description, 0}, {messageW, Error_message, 0}, }; @@ -264,14 +242,17 @@ static HRESULT create_error(script_ctx_t *ctx, DispatchEx *constr, V_VT(&err->message) = VT_BSTR; if(msg) V_BSTR(&err->message) = SysAllocString(msg); else V_BSTR(&err->message) = SysAllocStringLen(NULL, 0); - - VariantCopy(&err->description, &err->message); - if(!V_BSTR(&err->message)) { heap_free(err); return E_OUTOFMEMORY; } + hres = jsdisp_propput_name(&err->dispex, descriptionW, &err->message, NULL/*FIXME*/, NULL/*FIXME*/); + if(FAILED(hres)) { + jsdisp_release(&err->dispex); + return hres; + } + *ret = &err->dispex; return S_OK; }

1 0