September 2009 - Wine-commits

Henri Verbeet : d3d10core: Mark internal symbols hidden.
by Alexandre Julliard 22 Sep '09

22 Sep '09

Module: wine Branch: master Commit: 802674e078546d400a0b8fd6efa9ac8fcff0a705 URL: http://source.winehq.org/git/wine.git/?a=commit;h=802674e078546d400a0b8fd6e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Sep 20 20:09:27 2009 +0200 d3d10core: Mark internal symbols hidden. --- dlls/d3d10core/d3d10core_private.h | 41 ++++++++++++++++++----------------- 1 files changed, 21 insertions(+), 20 deletions(-) diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h index ad03b47..42fe735 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -49,11 +49,11 @@ struct d3d10_shader_info }; /* TRACE helper functions */ -const char *debug_d3d10_primitive_topology(D3D10_PRIMITIVE_TOPOLOGY topology); -const char *debug_dxgi_format(DXGI_FORMAT format); +const char *debug_d3d10_primitive_topology(D3D10_PRIMITIVE_TOPOLOGY topology) DECLSPEC_HIDDEN; +const char *debug_dxgi_format(DXGI_FORMAT format) DECLSPEC_HIDDEN; -DXGI_FORMAT dxgi_format_from_wined3dformat(WINED3DFORMAT format); -WINED3DFORMAT wined3dformat_from_dxgi_format(DXGI_FORMAT format); +DXGI_FORMAT dxgi_format_from_wined3dformat(WINED3DFORMAT format) DECLSPEC_HIDDEN; +WINED3DFORMAT wined3dformat_from_dxgi_format(DXGI_FORMAT format) DECLSPEC_HIDDEN; static inline void read_dword(const char **ptr, DWORD *d) { @@ -61,15 +61,15 @@ static inline void read_dword(const char **ptr, DWORD *d) *ptr += sizeof(*d); } -void skip_dword_unknown(const char **ptr, unsigned int count); +void skip_dword_unknown(const char **ptr, unsigned int count) DECLSPEC_HIDDEN; HRESULT parse_dxbc(const char *data, SIZE_T data_size, - HRESULT (*chunk_handler)(const char *data, DWORD data_size, DWORD tag, void *ctx), void *ctx); + HRESULT (*chunk_handler)(const char *data, DWORD data_size, DWORD tag, void *ctx), void *ctx) DECLSPEC_HIDDEN; /* IDirect3D10Device */ -extern const struct ID3D10DeviceVtbl d3d10_device_vtbl; -extern const struct IUnknownVtbl d3d10_device_inner_unknown_vtbl; -extern const struct IWineD3DDeviceParentVtbl d3d10_wined3d_device_parent_vtbl; +extern const struct ID3D10DeviceVtbl d3d10_device_vtbl DECLSPEC_HIDDEN; +extern const struct IUnknownVtbl d3d10_device_inner_unknown_vtbl DECLSPEC_HIDDEN; +extern const struct IWineD3DDeviceParentVtbl d3d10_wined3d_device_parent_vtbl DECLSPEC_HIDDEN; struct d3d10_device { const struct ID3D10DeviceVtbl *vtbl; @@ -93,7 +93,7 @@ struct d3d10_texture2d }; HRESULT d3d10_texture2d_init(struct d3d10_texture2d *texture, struct d3d10_device *device, - const D3D10_TEXTURE2D_DESC *desc); + const D3D10_TEXTURE2D_DESC *desc) DECLSPEC_HIDDEN; /* ID3D10Buffer */ struct d3d10_buffer @@ -105,10 +105,10 @@ struct d3d10_buffer }; HRESULT d3d10_buffer_init(struct d3d10_buffer *buffer, struct d3d10_device *device, - const D3D10_BUFFER_DESC *desc, const D3D10_SUBRESOURCE_DATA *data); + const D3D10_BUFFER_DESC *desc, const D3D10_SUBRESOURCE_DATA *data) DECLSPEC_HIDDEN; /* ID3D10RenderTargetView */ -extern const struct ID3D10RenderTargetViewVtbl d3d10_rendertarget_view_vtbl; +extern const struct ID3D10RenderTargetViewVtbl d3d10_rendertarget_view_vtbl DECLSPEC_HIDDEN; struct d3d10_rendertarget_view { const struct ID3D10RenderTargetViewVtbl *vtbl; @@ -119,7 +119,7 @@ struct d3d10_rendertarget_view }; /* ID3D10InputLayout */ -extern const struct ID3D10InputLayoutVtbl d3d10_input_layout_vtbl; +extern const struct ID3D10InputLayoutVtbl d3d10_input_layout_vtbl DECLSPEC_HIDDEN; struct d3d10_input_layout { const struct ID3D10InputLayoutVtbl *vtbl; @@ -130,10 +130,10 @@ struct d3d10_input_layout HRESULT d3d10_input_layout_to_wined3d_declaration(const D3D10_INPUT_ELEMENT_DESC *element_descs, UINT element_count, const void *shader_byte_code, SIZE_T shader_byte_code_length, - WINED3DVERTEXELEMENT **wined3d_elements, UINT *wined3d_element_count); + WINED3DVERTEXELEMENT **wined3d_elements, UINT *wined3d_element_count) DECLSPEC_HIDDEN; /* ID3D10VertexShader */ -extern const struct ID3D10VertexShaderVtbl d3d10_vertex_shader_vtbl; +extern const struct ID3D10VertexShaderVtbl d3d10_vertex_shader_vtbl DECLSPEC_HIDDEN; struct d3d10_vertex_shader { const struct ID3D10VertexShaderVtbl *vtbl; @@ -144,7 +144,7 @@ struct d3d10_vertex_shader }; /* ID3D10GeometryShader */ -extern const struct ID3D10GeometryShaderVtbl d3d10_geometry_shader_vtbl; +extern const struct ID3D10GeometryShaderVtbl d3d10_geometry_shader_vtbl DECLSPEC_HIDDEN; struct d3d10_geometry_shader { const struct ID3D10GeometryShaderVtbl *vtbl; @@ -152,7 +152,7 @@ struct d3d10_geometry_shader }; /* ID3D10PixelShader */ -extern const struct ID3D10PixelShaderVtbl d3d10_pixel_shader_vtbl; +extern const struct ID3D10PixelShaderVtbl d3d10_pixel_shader_vtbl DECLSPEC_HIDDEN; struct d3d10_pixel_shader { const struct ID3D10PixelShaderVtbl *vtbl; @@ -162,9 +162,10 @@ struct d3d10_pixel_shader struct wined3d_shader_signature output_signature; }; -HRESULT shader_extract_from_dxbc(const void *dxbc, SIZE_T dxbc_length, struct d3d10_shader_info *shader_info); -HRESULT shader_parse_signature(const char *data, DWORD data_size, struct wined3d_shader_signature *s); -void shader_free_signature(struct wined3d_shader_signature *s); +HRESULT shader_extract_from_dxbc(const void *dxbc, SIZE_T dxbc_length, + struct d3d10_shader_info *shader_info) DECLSPEC_HIDDEN; +HRESULT shader_parse_signature(const char *data, DWORD data_size, struct wined3d_shader_signature *s) DECLSPEC_HIDDEN; +void shader_free_signature(struct wined3d_shader_signature *s) DECLSPEC_HIDDEN; /* Layered device */ enum dxgi_device_layer_id

1 0

Henri Verbeet : d3d9: Properly destroy vertex declarations.
by Alexandre Julliard 22 Sep '09

22 Sep '09

Module: wine Branch: master Commit: 85ab52a48d608ba8021bc2268ba1a89c265d6077 URL: http://source.winehq.org/git/wine.git/?a=commit;h=85ab52a48d608ba8021bc2268… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Sep 20 20:09:26 2009 +0200 d3d9: Properly destroy vertex declarations. --- dlls/d3d9/vertexdeclaration.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/vertexdeclaration.c b/dlls/d3d9/vertexdeclaration.c index 4ae4751..e6dc0a3 100644 --- a/dlls/d3d9/vertexdeclaration.c +++ b/dlls/d3d9/vertexdeclaration.c @@ -248,7 +248,7 @@ static ULONG WINAPI IDirect3DVertexDeclaration9Impl_Release(LPDIRECT3DVERTEXDECL IDirect3DDevice9Ex *parentDevice = This->parentDevice; if(!This->convFVF) { - IDirect3DVertexDeclaration9Impl_Release(iface); + IDirect3DVertexDeclaration9Impl_Destroy(iface); } IDirect3DDevice9Ex_Release(parentDevice); }

1 0

Henri Verbeet : d3d9: Limit "NumSimultaneousRTs" to 4.
by Alexandre Julliard 22 Sep '09

22 Sep '09

Module: wine Branch: master Commit: 359acf2461b62373827f6c4e617646718175352e URL: http://source.winehq.org/git/wine.git/?a=commit;h=359acf2461b62373827f6c4e6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Sep 20 21:58:45 2009 +0200 d3d9: Limit "NumSimultaneousRTs" to 4. --- dlls/d3d9/d3d9_private.h | 1 + dlls/d3d9/device.c | 12 ++++++++++++ dlls/d3d9/directx.c | 1 + 3 files changed, 14 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index bea76d9..c9b3581 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -529,6 +529,7 @@ typedef struct IDirect3DVertexShader9Impl { } IDirect3DVertexShader9Impl; #define D3D9_MAX_VERTEX_SHADER_CONSTANTF 256 +#define D3D9_MAX_SIMULTANEOUS_RENDERTARGETS 4 /* --------------------- */ /* IDirect3DPixelShader9 */ diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 86890ff..f3b2e5e 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -992,6 +992,12 @@ static HRESULT WINAPI IDirect3DDevice9Impl_SetRenderTarget(LPDIRECT3DDEVICE9EX HRESULT hr; TRACE("(%p) Relay\n" , This); + if (RenderTargetIndex >= D3D9_MAX_SIMULTANEOUS_RENDERTARGETS) + { + WARN("Invalid index %u specified.\n", RenderTargetIndex); + return D3DERR_INVALIDCALL; + } + wined3d_mutex_lock(); hr = IWineD3DDevice_SetRenderTarget(This->WineD3DDevice, RenderTargetIndex, pSurface ? pSurface->wineD3DSurface : NULL); wined3d_mutex_unlock(); @@ -1010,6 +1016,12 @@ static HRESULT WINAPI IDirect3DDevice9Impl_GetRenderTarget(LPDIRECT3DDEVICE9EX return D3DERR_INVALIDCALL; } + if (RenderTargetIndex >= D3D9_MAX_SIMULTANEOUS_RENDERTARGETS) + { + WARN("Invalid index %u specified.\n", RenderTargetIndex); + return D3DERR_INVALIDCALL; + } + wined3d_mutex_lock(); hr=IWineD3DDevice_GetRenderTarget(This->WineD3DDevice,RenderTargetIndex,&pRenderTarget); diff --git a/dlls/d3d9/directx.c b/dlls/d3d9/directx.c index aba3362..301f901 100644 --- a/dlls/d3d9/directx.c +++ b/dlls/d3d9/directx.c @@ -337,6 +337,7 @@ void filter_caps(D3DCAPS9* pCaps) D3DPTEXTURECAPS_CUBEMAP_POW2 | D3DPTEXTURECAPS_VOLUMEMAP_POW2| D3DPTEXTURECAPS_NOPROJECTEDBUMPENV; pCaps->MaxVertexShaderConst = min(D3D9_MAX_VERTEX_SHADER_CONSTANTF, pCaps->MaxVertexShaderConst); + pCaps->NumSimultaneousRTs = min(D3D9_MAX_SIMULTANEOUS_RENDERTARGETS, pCaps->NumSimultaneousRTs); } static HRESULT WINAPI IDirect3D9Impl_GetDeviceCaps(LPDIRECT3D9EX iface, UINT Adapter, D3DDEVTYPE DeviceType, D3DCAPS9* pCaps) {

1 0

Henri Verbeet : wined3d: Cleanup vertex declaration initialization.
by Alexandre Julliard 22 Sep '09

22 Sep '09

Module: wine Branch: master Commit: 5b8b97a73714b33df38c9f2cf419c48eb1364a52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b8b97a73714b33df38c9f2cf… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Sep 20 20:09:24 2009 +0200 wined3d: Cleanup vertex declaration initialization. --- dlls/wined3d/device.c | 63 ++++++++++++------------- dlls/wined3d/vertexdeclaration.c | 96 +++++++++++++++++++------------------- dlls/wined3d/wined3d_private.h | 6 +-- 3 files changed, 80 insertions(+), 85 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5b8b97a73714b33df38c9…

1 0

Henri Verbeet : wined3d: Revert 4ba16b84a9e60ffcc98fc4b4c303c975589b59e2.
by Alexandre Julliard 22 Sep '09

22 Sep '09

Module: wine Branch: master Commit: 0a4fa886a7a447f20105086b43a2175ea42f5149 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a4fa886a7a447f20105086b4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Sep 20 20:09:23 2009 +0200 wined3d: Revert 4ba16b84a9e60ffcc98fc4b4c303c975589b59e2. Unfortunately surface_can_stretch_rect() doesn't check just for WINED3DFMT_FLAG_FBO_ATTACHABLE. --- dlls/wined3d/surface.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index fffa28f..6a5e66d 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3581,7 +3581,8 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *This, const * FBO support, so it doesn't really make sense to try and make it work with different offscreen rendering * backends. */ - if (GL_SUPPORT(EXT_FRAMEBUFFER_BLIT) && surface_can_stretch_rect(Src, This)) + if (wined3d_settings.offscreen_rendering_mode == ORM_FBO && GL_SUPPORT(EXT_FRAMEBUFFER_BLIT) + && surface_can_stretch_rect(Src, This)) { stretch_rect_fbo((IWineD3DDevice *)myDevice, SrcSurface, &srect, (IWineD3DSurface *)This, &rect, Filter, upsideDown); @@ -3644,8 +3645,9 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *This, const Src->palette = This->palette; } - if (GL_SUPPORT(EXT_FRAMEBUFFER_BLIT) && surface_can_stretch_rect(Src, This) - && !(Flags & (WINEDDBLT_KEYSRC | WINEDDBLT_KEYSRCOVERRIDE))) + if (wined3d_settings.offscreen_rendering_mode == ORM_FBO && GL_SUPPORT(EXT_FRAMEBUFFER_BLIT) + && !(Flags & (WINEDDBLT_KEYSRC | WINEDDBLT_KEYSRCOVERRIDE)) + && surface_can_stretch_rect(Src, This)) { TRACE("Using stretch_rect_fbo\n"); /* The source is always a texture, but never the currently active render target, and the texture

1 0

Henri Verbeet : winedos: Avoid comparing BOOLs against TRUE.
by Alexandre Julliard 22 Sep '09

22 Sep '09

Module: wine Branch: master Commit: 1d1b07b95b9144fad4201a78acb26150d10464f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d1b07b95b9144fad4201a78a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Sep 20 20:09:22 2009 +0200 winedos: Avoid comparing BOOLs against TRUE. --- dlls/winedos/vga.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winedos/vga.c b/dlls/winedos/vga.c index 66b6fd6..86737bc 100644 --- a/dlls/winedos/vga.c +++ b/dlls/winedos/vga.c @@ -1158,7 +1158,7 @@ void VGA_ShowMouse( BOOL show ) void VGA_UpdatePalette(void) { /* Figure out which palette is used now */ - if(vga_fb_bright == TRUE) + if(vga_fb_bright) { if(vga_fb_palette_index == 0) { @@ -1210,7 +1210,7 @@ static void VGA_SetEnabled(BOOL enabled) TRACE("%i\n", enabled); /* Check if going from enabled to disabled */ - if(vga_fb_enabled == TRUE && enabled == FALSE) + if(vga_fb_enabled && !enabled) { /* Clear frame buffer */ memset(vga_fb_window_data, 0x00, vga_fb_window_size);

1 0

Marcus Meissner : jscript: Initialize this_obj with NULL (Coverity).
by Alexandre Julliard 22 Sep '09

22 Sep '09

Module: wine Branch: master Commit: e0a769b2a9ed233cc94fb0a2c44e238857461d3e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0a769b2a9ed233cc94fb0a2c… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Sep 20 19:00:09 2009 +0200 jscript: Initialize this_obj with NULL (Coverity). --- dlls/jscript/function.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index e2f1b37..1b1b4e7 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -408,7 +408,7 @@ static HRESULT Function_apply(DispatchEx *dispex, LCID lcid, WORD flags, DISPPAR FunctionInstance *function; DISPPARAMS args = {NULL,NULL,0,0}; DWORD argc, i; - IDispatch *this_obj; + IDispatch *this_obj = NULL; HRESULT hres = S_OK; TRACE("\n");

1 0

Jacek Caban : jscript: Added arguments.callee implementation.
by Alexandre Julliard 22 Sep '09

22 Sep '09

Module: wine Branch: master Commit: 02615bb45f626b72e31c30368c96dabeb6744cf2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=02615bb45f626b72e31c30368… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Sep 20 20:58:27 2009 +0200 jscript: Added arguments.callee implementation. --- dlls/jscript/function.c | 13 +++++++++++-- dlls/jscript/tests/lang.js | 3 +++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index 83de7ca..e2f1b37 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -100,7 +100,7 @@ static const builtin_info_t Arguments_info = { NULL }; -static HRESULT create_arguments(script_ctx_t *ctx, LCID lcid, DISPPARAMS *dp, +static HRESULT create_arguments(script_ctx_t *ctx, IDispatch *calee, LCID lcid, DISPPARAMS *dp, jsexcept_t *ei, IServiceProvider *caller, DispatchEx **ret) { DispatchEx *args; @@ -108,6 +108,8 @@ static HRESULT create_arguments(script_ctx_t *ctx, LCID lcid, DISPPARAMS *dp, DWORD i; HRESULT hres; + static const WCHAR caleeW[] = {'c','a','l','l','e','e',0}; + args = heap_alloc_zero(sizeof(DispatchEx)); if(!args) return E_OUTOFMEMORY; @@ -128,6 +130,12 @@ static HRESULT create_arguments(script_ctx_t *ctx, LCID lcid, DISPPARAMS *dp, V_VT(&var) = VT_I4; V_I4(&var) = arg_cnt(dp); hres = jsdisp_propput_name(args, lengthW, lcid, &var, ei, caller); + + if(SUCCEEDED(hres)) { + V_VT(&var) = VT_DISPATCH; + V_DISPATCH(&var) = calee; + hres = jsdisp_propput_name(args, caleeW, lcid, &var, ei, caller); + } } if(FAILED(hres)) { @@ -151,7 +159,8 @@ static HRESULT create_var_disp(FunctionInstance *function, LCID lcid, DISPPARAMS if(FAILED(hres)) return hres; - hres = create_arguments(function->dispex.ctx, lcid, dp, ei, caller, &arg_disp); + hres = create_arguments(function->dispex.ctx, (IDispatch*)_IDispatchEx_(&function->dispex), + lcid, dp, ei, caller, &arg_disp); if(SUCCEEDED(hres)) { VARIANT var; diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index bc77110..b6458d4 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -68,6 +68,7 @@ function testFunc1(x, y) { ok(arguments.length === 2, "arguments.length is not 2"); ok(arguments["0"] === true, "arguments[0] is not true"); ok(arguments["1"] === "test", "arguments[1] is not \"test\""); + ok(arguments.callee === testFunc1, "arguments.calee !== testFunc1"); return true; } @@ -116,6 +117,7 @@ obj1.func = function () { ok(this.test === true, "this.test is not true"); ok(arguments.length === 1, "arguments.length is not 1"); ok(arguments["0"] === true, "arguments[0] is not true"); + ok(typeof(arguments.callee) === "function", "typeof(arguments.calee) = " + typeof(arguments.calee)); return "test"; }; @@ -128,6 +130,7 @@ function testConstr1() { ok(this !== undefined, "this is undefined"); ok(arguments.length === 1, "arguments.length is not 1"); ok(arguments["0"] === true, "arguments[0] is not 1"); + ok(arguments.callee === testConstr1, "arguments.calee !== testConstr1"); return false; }

1 0

Jacek Caban : jscript: Added Array.shift implementation.
by Alexandre Julliard 22 Sep '09

22 Sep '09

Module: wine Branch: master Commit: 86ad4c977c6a10f48add8eb7702f0667d64c22af URL: http://source.winehq.org/git/wine.git/?a=commit;h=86ad4c977c6a10f48add8eb77… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Sep 20 20:58:05 2009 +0200 jscript: Added Array.shift implementation. --- dlls/jscript/array.c | 53 ++++++++++++++++++++++++++++++++++++++++++-- dlls/jscript/tests/api.js | 29 ++++++++++++++++++++++++ 2 files changed, 79 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/array.c b/dlls/jscript/array.c index 34a5372..1186249 100644 --- a/dlls/jscript/array.c +++ b/dlls/jscript/array.c @@ -450,13 +450,60 @@ static HRESULT Array_reverse(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARA return E_NOTIMPL; } +/* ECMA-262 3rd Edition 15.4.4.9 */ static HRESULT Array_shift(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, - VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) + VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { - FIXME("\n"); - return E_NOTIMPL; + DWORD length = 0, i; + VARIANT v, ret; + HRESULT hres; + + TRACE("\n"); + + if(is_class(dispex, JSCLASS_ARRAY)) { + length = ((ArrayInstance*)dispex)->length; + }else { + hres = get_jsdisp_length(dispex, lcid, ei, &length); + if(SUCCEEDED(hres) && !length) + hres = set_jsdisp_length(dispex, lcid, ei, 0); + if(FAILED(hres)) + return hres; + } + + if(!length) { + if(retv) + V_VT(retv) = VT_EMPTY; + return S_OK; + } + + hres = jsdisp_propget_idx(dispex, 0, lcid, &ret, ei, caller); + if(hres == DISP_E_UNKNOWNNAME) { + V_VT(&ret) = VT_EMPTY; + hres = S_OK; + } + + for(i=1; SUCCEEDED(hres) && i<length; i++) { + hres = jsdisp_propget_idx(dispex, i, lcid, &v, ei, caller); + if(hres == DISP_E_UNKNOWNNAME) + hres = jsdisp_delete_idx(dispex, i-1); + else if(SUCCEEDED(hres)) + hres = jsdisp_propput_idx(dispex, i-1, lcid, &v, ei, caller); + } + + if(SUCCEEDED(hres)) { + hres = jsdisp_delete_idx(dispex, length-1); + if(SUCCEEDED(hres)) + hres = set_jsdisp_length(dispex, lcid, ei, length-1); + } + + if(SUCCEEDED(hres) && retv) + *retv = ret; + else + VariantClear(&ret); + return hres; } +/* ECMA-262 3rd Edition 15.4.4.10 */ static HRESULT Array_slice(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 291154c..7a39d0f 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -646,6 +646,35 @@ ok(tmp === undefined, "unshift returned " +tmp); ok(arr.length === 3, "arr.length = " + arr.length); ok(arr[0] === 0 && arr[1] === 1 && arr[2] === 2, "unexpected array"); +arr = [1,2,,4]; +tmp = arr.shift(); +ok(tmp === 1, "[1,2,,4].shift() = " + tmp); +ok(arr.toString() === "2,,4", "arr = " + arr.toString()); + +arr = []; +tmp = arr.shift(); +ok(tmp === undefined, "[].shift() = " + tmp); +ok(arr.toString() === "", "arr = " + arr.toString()); + +arr = [1,2,,4]; +tmp = arr.shift(2); +ok(tmp === 1, "[1,2,,4].shift(2) = " + tmp); +ok(arr.toString() === "2,,4", "arr = " + arr.toString()); + +arr = [1,]; +tmp = arr.shift(); +ok(tmp === 1, "[1,].shift() = " + tmp); +ok(arr.toString() === "", "arr = " + arr.toString()); + +obj = new Object(); +obj[0] = "test"; +obj[2] = 3; +obj.length = 3; +tmp = Array.prototype.shift.call(obj); +ok(tmp === "test", "obj.shift() = " + tmp); +ok(obj.length == 2, "obj.length = " + obj.length); +ok(obj[1] === 3, "obj[1] = " + obj[1]); + var num = new Number(6); arr = [0,1,2]; tmp = arr.concat(3, [4,5], num);

1 0

Jacek Caban : mshtml: Added IHTMLDOMNode2::get_ownerDocument tests.
by Alexandre Julliard 22 Sep '09

22 Sep '09

Module: wine Branch: master Commit: 5d281947caded174507aab026635653ef109d60f URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d281947caded174507aab026… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Sep 20 19:00:23 2009 +0200 mshtml: Added IHTMLDOMNode2::get_ownerDocument tests. Also fixes typo in iface_cmp. --- dlls/mshtml/tests/dom.c | 63 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 61 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index d6747d2..604ead5 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -412,7 +412,7 @@ static BOOL iface_cmp(IUnknown *iface1, IUnknown *iface2) IUnknown_QueryInterface(iface1, &IID_IUnknown, (void**)&unk1); IUnknown_Release(unk1); - IUnknown_QueryInterface(iface1, &IID_IUnknown, (void**)&unk2); + IUnknown_QueryInterface(iface2, &IID_IUnknown, (void**)&unk2); IUnknown_Release(unk2); return unk1 == unk2; @@ -584,6 +584,17 @@ static IHTMLDOMNode *_get_node_iface(unsigned line, IUnknown *unk) return node; } +#define get_node2_iface(u) _get_node2_iface(__LINE__,u) +static IHTMLDOMNode2 *_get_node2_iface(unsigned line, IUnknown *unk) +{ + IHTMLDOMNode2 *node; + HRESULT hres; + + hres = IUnknown_QueryInterface(unk, &IID_IHTMLDOMNode2, (void**)&node); + ok_(__FILE__,line) (hres == S_OK, "Could not get IHTMLDOMNode2: %08x\n", hres); + return node; +} + #define get_img_iface(u) _get_img_iface(__LINE__,u) static IHTMLImgElement *_get_img_iface(unsigned line, IUnknown *unk) { @@ -610,6 +621,26 @@ static void _test_node_name(unsigned line, IUnknown *unk, const char *exname) SysFreeString(name); } +#define get_owner_doc(u) _get_owner_doc(__LINE__,u) +static IHTMLDocument2 *_get_owner_doc(unsigned line, IUnknown *unk) +{ + IHTMLDOMNode2 *node = _get_node2_iface(line, unk); + IDispatch *disp = (void*)0xdeadbeef; + IHTMLDocument2 *doc; + HRESULT hres; + + hres = IHTMLDOMNode2_get_ownerDocument(node, &disp); + IHTMLDOMNode2_Release(node); + ok_(__FILE__,line)(hres == S_OK, "get_ownerDocument failed: %08x\n", hres); + ok_(__FILE__,line)(disp != NULL, "disp = NULL\n"); + + hres = IDispatch_QueryInterface(disp, &IID_IHTMLDocument2, (void**)&doc); + IDispatch_Release(disp); + ok_(__FILE__,line)(hres == S_OK, "Could not get IHTMLDocument2 iface: %08x\n", hres); + + return doc; +} + #define test_elem_tag(u,n) _test_elem_tag(__LINE__,u,n) static void _test_elem_tag(unsigned line, IUnknown *unk, const char *extag) { @@ -730,8 +761,26 @@ static void _test_elem_offset(unsigned line, IUnknown *unk) IHTMLElement_Release(elem); } +#define get_doc_node(d) _get_doc_node(__LINE__,d) +static IHTMLDocument2 *_get_doc_node(unsigned line, IHTMLDocument2 *doc) +{ + IHTMLWindow2 *window; + IHTMLDocument2 *ret; + HRESULT hres; + + hres = IHTMLDocument2_get_parentWindow(doc, &window); + ok_(__FILE__,line)(hres == S_OK, "get_parentWindow failed: %08x\n", hres); + + hres = IHTMLWindow2_get_document(window, &ret); + ok_(__FILE__,line)(hres == S_OK, "get_document failed: %08x\n", hres); + ok_(__FILE__,line)(ret != NULL, "document = NULL\n"); + + return ret; +} + static void test_doc_elem(IHTMLDocument2 *doc) { + IHTMLDocument2 *doc_node, *owner_doc; IHTMLElement *elem; IHTMLDocument3 *doc3; HRESULT hres; @@ -746,6 +795,12 @@ static void test_doc_elem(IHTMLDocument2 *doc) test_node_name((IUnknown*)elem, "HTML"); test_elem_tag((IUnknown*)elem, "HTML"); + doc_node = get_doc_node(doc); + owner_doc = get_owner_doc((IUnknown*)elem); + ok(iface_cmp((IUnknown *)doc_node, (IUnknown *)owner_doc), "doc_node != owner_doc\n"); + IHTMLDocument2_Release(doc_node); + IHTMLDocument2_Release(owner_doc); + IHTMLElement_Release(elem); } @@ -4659,6 +4714,7 @@ static void test_elems(IHTMLDocument2 *doc) elem = get_elem_by_id(doc, "s", TRUE); if(elem) { IHTMLSelectElement *select; + IHTMLDocument2 *doc_node; hres = IHTMLElement_QueryInterface(elem, &IID_IHTMLSelectElement, (void**)&select); ok(hres == S_OK, "Could not get IHTMLSelectElement interface: %08x\n", hres); @@ -4684,7 +4740,10 @@ static void test_elems(IHTMLDocument2 *doc) hres = IHTMLElement_get_document(elem, &disp); ok(hres == S_OK, "get_document failed: %08x\n", hres); - ok(iface_cmp((IUnknown*)disp, (IUnknown*)doc), "disp != doc\n"); + + doc_node = get_doc_node(doc); + ok(iface_cmp((IUnknown*)disp, (IUnknown*)doc_node), "disp != doc\n"); + IHTMLDocument2_Release(doc_node); IHTMLElement_Release(elem); }

1 0