wine-commits February 2015

wine-commits@winehq.org

2 participants
411 discussions

Jacek Caban : jscript: Pass 'this' as jsdisp_t to getters.
by Alexandre Julliard 06 Feb '15

06 Feb '15

Module: wine Branch: master Commit: d541b525e40b9ff0c1f654dff95c6f70ae2de02b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d541b525e40b9ff0c1f654dff… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 6 12:09:40 2015 +0100 jscript: Pass 'this' as jsdisp_t to getters. --- dlls/jscript/array.c | 21 +++++++++++++-------- dlls/jscript/date.c | 11 ++++++++--- dlls/jscript/dispex.c | 6 +----- dlls/jscript/function.c | 24 +++++++++++++----------- dlls/jscript/jscript.h | 4 ++-- dlls/jscript/jsregexp.c | 45 ++++++++++++++++++++++++--------------------- dlls/jscript/number.c | 11 ++++++++--- dlls/jscript/object.c | 2 +- dlls/jscript/string.c | 15 ++++++++++----- 9 files changed, 80 insertions(+), 59 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d541b525e40b9ff0c1f65…

1 0

Stefan Dösinger : wined3d: Check the d3d buffer to find converted attributes.
by Alexandre Julliard 06 Feb '15

06 Feb '15

Module: wine Branch: master Commit: da5041eb4b3fc4bab7f6aef2a4b091a58c39f36a URL: http://source.winehq.org/git/wine.git/?a=commit;h=da5041eb4b3fc4bab7f6aef2a… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Feb 6 10:46:48 2015 +0100 wined3d: Check the d3d buffer to find converted attributes. This fixes some tests with ARB shaders that were broken since 1360af6adcbc5c77a7b3c5e32f3c886e450456f5. When buffer_internal_preload is called by context_update_stream_info, si->elements[i].data is not yet set. --- dlls/wined3d/buffer.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 2fba83b..f2a22b0 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -266,7 +266,7 @@ static BOOL buffer_process_converted_attribute(struct wined3d_buffer *This, #define WINED3D_BUFFER_FIXUP_XYZRHW 0x02 static BOOL buffer_check_attribute(struct wined3d_buffer *This, const struct wined3d_stream_info *si, - UINT attrib_idx, DWORD fixup_flags, DWORD *stride_this_run) + const struct wined3d_state *state, UINT attrib_idx, DWORD fixup_flags, DWORD *stride_this_run) { const struct wined3d_stream_info_element *attrib = &si->elements[attrib_idx]; enum wined3d_format_id format; @@ -276,7 +276,7 @@ static BOOL buffer_check_attribute(struct wined3d_buffer *This, const struct win * there, on nonexistent attribs the vbo is 0. */ if (!(si->use_map & (1 << attrib_idx)) - || attrib->data.buffer_object != This->buffer_object) + || state->streams[attrib->stream_idx].buffer != This) return FALSE; format = attrib->format->id; @@ -304,7 +304,7 @@ static BOOL buffer_check_attribute(struct wined3d_buffer *This, const struct win } static BOOL buffer_find_decl(struct wined3d_buffer *This, const struct wined3d_stream_info *si, - DWORD fixup_flags) + const struct wined3d_state *state, DWORD fixup_flags) { UINT stride_this_run = 0; BOOL ret = FALSE; @@ -378,31 +378,31 @@ static BOOL buffer_find_decl(struct wined3d_buffer *This, const struct wined3d_s * texcoord needs no conversion while a FLOAT4 positiont needs one */ - ret = buffer_check_attribute(This, si, WINED3D_FFP_POSITION, + ret = buffer_check_attribute(This, si, state, WINED3D_FFP_POSITION, fixup_flags, &stride_this_run) || ret; fixup_flags &= ~WINED3D_BUFFER_FIXUP_XYZRHW; - ret = buffer_check_attribute(This, si, WINED3D_FFP_NORMAL, + ret = buffer_check_attribute(This, si, state, WINED3D_FFP_NORMAL, fixup_flags, &stride_this_run) || ret; - ret = buffer_check_attribute(This, si, WINED3D_FFP_DIFFUSE, + ret = buffer_check_attribute(This, si, state, WINED3D_FFP_DIFFUSE, fixup_flags, &stride_this_run) || ret; - ret = buffer_check_attribute(This, si, WINED3D_FFP_SPECULAR, + ret = buffer_check_attribute(This, si, state, WINED3D_FFP_SPECULAR, fixup_flags, &stride_this_run) || ret; - ret = buffer_check_attribute(This, si, WINED3D_FFP_TEXCOORD0, + ret = buffer_check_attribute(This, si, state, WINED3D_FFP_TEXCOORD0, fixup_flags, &stride_this_run) || ret; - ret = buffer_check_attribute(This, si, WINED3D_FFP_TEXCOORD1, + ret = buffer_check_attribute(This, si, state, WINED3D_FFP_TEXCOORD1, fixup_flags, &stride_this_run) || ret; - ret = buffer_check_attribute(This, si, WINED3D_FFP_TEXCOORD2, + ret = buffer_check_attribute(This, si, state, WINED3D_FFP_TEXCOORD2, fixup_flags, &stride_this_run) || ret; - ret = buffer_check_attribute(This, si, WINED3D_FFP_TEXCOORD3, + ret = buffer_check_attribute(This, si, state, WINED3D_FFP_TEXCOORD3, fixup_flags, &stride_this_run) || ret; - ret = buffer_check_attribute(This, si, WINED3D_FFP_TEXCOORD4, + ret = buffer_check_attribute(This, si, state, WINED3D_FFP_TEXCOORD4, fixup_flags, &stride_this_run) || ret; - ret = buffer_check_attribute(This, si, WINED3D_FFP_TEXCOORD5, + ret = buffer_check_attribute(This, si, state, WINED3D_FFP_TEXCOORD5, fixup_flags, &stride_this_run) || ret; - ret = buffer_check_attribute(This, si, WINED3D_FFP_TEXCOORD6, + ret = buffer_check_attribute(This, si, state, WINED3D_FFP_TEXCOORD6, fixup_flags, &stride_this_run) || ret; - ret = buffer_check_attribute(This, si, WINED3D_FFP_TEXCOORD7, + ret = buffer_check_attribute(This, si, state, WINED3D_FFP_TEXCOORD7, fixup_flags, &stride_this_run) || ret; if (!stride_this_run && This->conversion_map) @@ -767,7 +767,7 @@ void buffer_internal_preload(struct wined3d_buffer *buffer, struct wined3d_conte fixup_flags |= WINED3D_BUFFER_FIXUP_XYZRHW; } - decl_changed = buffer_find_decl(buffer, &context->stream_info, fixup_flags); + decl_changed = buffer_find_decl(buffer, &context->stream_info, state, fixup_flags); buffer->flags |= WINED3D_BUFFER_HASDESC; }

1 0

Henri Verbeet : d2d1: Implement d2d_d3d_render_target_DrawBitmap().
by Alexandre Julliard 06 Feb '15

06 Feb '15

Module: wine Branch: master Commit: 2f2e1b98fd285e76352a4d9b922d1eeb17535fcb URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f2e1b98fd285e76352a4d9b9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 6 09:57:02 2015 +0100 d2d1: Implement d2d_d3d_render_target_DrawBitmap(). --- dlls/d2d1/render_target.c | 56 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 55 insertions(+), 1 deletion(-) diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index 3d9abb8..f109849 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -709,8 +709,62 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_DrawBitmap(ID2D1RenderTarget ID2D1Bitmap *bitmap, const D2D1_RECT_F *dst_rect, float opacity, D2D1_BITMAP_INTERPOLATION_MODE interpolation_mode, const D2D1_RECT_F *src_rect) { - FIXME("iface %p, bitmap %p, dst_rect %p, opacity %.8e, interpolation_mode %#x, src_rect %p stub!\n", + D2D1_BITMAP_BRUSH_PROPERTIES bitmap_brush_desc; + D2D1_BRUSH_PROPERTIES brush_desc; + ID2D1BitmapBrush *brush; + D2D1_RECT_F s, d; + HRESULT hr; + + TRACE("iface %p, bitmap %p, dst_rect %p, opacity %.8e, interpolation_mode %#x, src_rect %p.\n", iface, bitmap, dst_rect, opacity, interpolation_mode, src_rect); + + if (src_rect) + { + s = *src_rect; + } + else + { + D2D1_SIZE_F size; + + size = ID2D1Bitmap_GetSize(bitmap); + s.left = 0.0f; + s.top = 0.0f; + s.right = size.width; + s.bottom = size.height; + } + + if (dst_rect) + { + d = *dst_rect; + } + else + { + d.left = 0.0f; + d.top = 0.0f; + d.right = s.right - s.left; + d.bottom = s.bottom - s.top; + } + + bitmap_brush_desc.extendModeX = D2D1_EXTEND_MODE_CLAMP; + bitmap_brush_desc.extendModeY = D2D1_EXTEND_MODE_CLAMP; + bitmap_brush_desc.interpolationMode = interpolation_mode; + + brush_desc.opacity = opacity; + brush_desc.transform._11 = (d.right - d.left) / (s.right - s.left); + brush_desc.transform._21 = 0.0f; + brush_desc.transform._31 = d.left; + brush_desc.transform._12 = 0.0f; + brush_desc.transform._22 = (d.bottom - d.top) / (s.bottom - s.top); + brush_desc.transform._32 = d.top; + + if (FAILED(hr = ID2D1RenderTarget_CreateBitmapBrush(iface, bitmap, &bitmap_brush_desc, &brush_desc, &brush))) + { + ERR("Failed to create bitmap brush, hr %#x.\n", hr); + return; + } + + ID2D1RenderTarget_FillRectangle(iface, &d, (ID2D1Brush *)brush); + ID2D1BitmapBrush_Release(brush); } static void STDMETHODCALLTYPE d2d_d3d_render_target_DrawText(ID2D1RenderTarget *iface,

1 0

Henri Verbeet : d2d1: Implement bitmap brush support for d2d_d3d_render_target_FillRectangle().
by Alexandre Julliard 06 Feb '15

06 Feb '15

Module: wine Branch: master Commit: 287f751ae2a139755945ae766ea8bcea0500366c URL: http://source.winehq.org/git/wine.git/?a=commit;h=287f751ae2a139755945ae766… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 6 09:57:01 2015 +0100 d2d1: Implement bitmap brush support for d2d_d3d_render_target_FillRectangle(). --- dlls/d2d1/bitmap.c | 51 +++++++++++++++++- dlls/d2d1/brush.c | 45 ++++++++++++++-- dlls/d2d1/d2d1_private.h | 17 ++++-- dlls/d2d1/render_target.c | 128 ++++++++++++++++++++++++++++++++++++++++------ 4 files changed, 216 insertions(+), 25 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=287f751ae2a139755945a…

1 0

Henri Verbeet : d2d1: Implement d2d_bitmap_GetSize().
by Alexandre Julliard 06 Feb '15

06 Feb '15

Module: wine Branch: master Commit: 7df055f17fdc3f5b7bdaafc5436cb21b6170d16f URL: http://source.winehq.org/git/wine.git/?a=commit;h=7df055f17fdc3f5b7bdaafc54… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 6 09:57:00 2015 +0100 d2d1: Implement d2d_bitmap_GetSize(). --- dlls/d2d1/bitmap.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/d2d1/bitmap.c b/dlls/d2d1/bitmap.c index fd7a7a7..e827e46 100644 --- a/dlls/d2d1/bitmap.c +++ b/dlls/d2d1/bitmap.c @@ -79,10 +79,12 @@ static void STDMETHODCALLTYPE d2d_bitmap_GetFactory(ID2D1Bitmap *iface, ID2D1Fac static D2D1_SIZE_F * STDMETHODCALLTYPE d2d_bitmap_GetSize(ID2D1Bitmap *iface, D2D1_SIZE_F *size) { - FIXME("iface %p, size %p stub!\n", iface, size); + struct d2d_bitmap *bitmap = impl_from_ID2D1Bitmap(iface); + + TRACE("iface %p, size %p.\n", iface, size); - size->width = 0.0f; - size->height = 0.0f; + size->width = bitmap->pixel_size.width / (bitmap->dpi_x / 96.0f); + size->height = bitmap->pixel_size.height / (bitmap->dpi_y / 96.0f); return size; }

1 0

Henri Verbeet : d2d1: Implement d2d_bitmap_GetDpi().
by Alexandre Julliard 06 Feb '15

06 Feb '15

Module: wine Branch: master Commit: 4b0f47cdbc7827b1a263156dba0cb88b57d84824 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b0f47cdbc7827b1a263156db… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 6 09:56:59 2015 +0100 d2d1: Implement d2d_bitmap_GetDpi(). --- dlls/d2d1/bitmap.c | 16 +++++++++++++--- dlls/d2d1/d2d1_private.h | 2 ++ 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/dlls/d2d1/bitmap.c b/dlls/d2d1/bitmap.c index b3ba570..fd7a7a7 100644 --- a/dlls/d2d1/bitmap.c +++ b/dlls/d2d1/bitmap.c @@ -107,10 +107,12 @@ static D2D1_PIXEL_FORMAT * STDMETHODCALLTYPE d2d_bitmap_GetPixelFormat(ID2D1Bitm static void STDMETHODCALLTYPE d2d_bitmap_GetDpi(ID2D1Bitmap *iface, float *dpi_x, float *dpi_y) { - FIXME("iface %p, dpi_x %p, dpi_y %p stub!\n", iface, dpi_x, dpi_y); + struct d2d_bitmap *bitmap = impl_from_ID2D1Bitmap(iface); + + TRACE("iface %p, dpi_x %p, dpi_y %p.\n", iface, dpi_x, dpi_y); - *dpi_x = 96.0f; - *dpi_y = 96.0f; + *dpi_x = bitmap->dpi_x; + *dpi_y = bitmap->dpi_y; } static HRESULT STDMETHODCALLTYPE d2d_bitmap_CopyFromBitmap(ID2D1Bitmap *iface, @@ -161,4 +163,12 @@ void d2d_bitmap_init(struct d2d_bitmap *bitmap, D2D1_SIZE_U size, const void *sr bitmap->refcount = 1; bitmap->pixel_size = size; + bitmap->dpi_x = desc->dpiX; + bitmap->dpi_y = desc->dpiY; + + if (bitmap->dpi_x == 0.0f && bitmap->dpi_y == 0.0f) + { + bitmap->dpi_x = 96.0f; + bitmap->dpi_y = 96.0f; + } } diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 039612b..0402c8d 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -154,6 +154,8 @@ struct d2d_bitmap LONG refcount; D2D1_SIZE_U pixel_size; + float dpi_x; + float dpi_y; }; void d2d_bitmap_init(struct d2d_bitmap *bitmap, D2D1_SIZE_U size, const void *src_data,

1 0

Henri Verbeet : d2d1: Implement d2d_bitmap_GetPixelSize().
by Alexandre Julliard 06 Feb '15

06 Feb '15

Module: wine Branch: master Commit: b270384dfb213b058cce72395d93909afe058c34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b270384dfb213b058cce72395… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 6 09:56:58 2015 +0100 d2d1: Implement d2d_bitmap_GetPixelSize(). --- dlls/d2d1/bitmap.c | 9 ++++++--- dlls/d2d1/d2d1_private.h | 2 ++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/d2d1/bitmap.c b/dlls/d2d1/bitmap.c index 43c4881..b3ba570 100644 --- a/dlls/d2d1/bitmap.c +++ b/dlls/d2d1/bitmap.c @@ -88,10 +88,11 @@ static D2D1_SIZE_F * STDMETHODCALLTYPE d2d_bitmap_GetSize(ID2D1Bitmap *iface, D2 static D2D1_SIZE_U * STDMETHODCALLTYPE d2d_bitmap_GetPixelSize(ID2D1Bitmap *iface, D2D1_SIZE_U *pixel_size) { - FIXME("iface %p, pixel_size %p stub!\n", iface, pixel_size); + struct d2d_bitmap *bitmap = impl_from_ID2D1Bitmap(iface); + + TRACE("iface %p, pixel_size %p.\n", iface, pixel_size); - pixel_size->width = 0; - pixel_size->height = 0; + *pixel_size = bitmap->pixel_size; return pixel_size; } @@ -158,4 +159,6 @@ void d2d_bitmap_init(struct d2d_bitmap *bitmap, D2D1_SIZE_U size, const void *sr bitmap->ID2D1Bitmap_iface.lpVtbl = &d2d_bitmap_vtbl; bitmap->refcount = 1; + + bitmap->pixel_size = size; } diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index e3cb98a..039612b 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -152,6 +152,8 @@ struct d2d_bitmap { ID2D1Bitmap ID2D1Bitmap_iface; LONG refcount; + + D2D1_SIZE_U pixel_size; }; void d2d_bitmap_init(struct d2d_bitmap *bitmap, D2D1_SIZE_U size, const void *src_data,

1 0

Jacek Caban : jscript: Use separated functions for implementing builtin call, get and set operation.
by Alexandre Julliard 05 Feb '15

05 Feb '15

Module: wine Branch: master Commit: b7fae52964e53ab9d4250da8f5d09fe2bce40c80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7fae52964e53ab9d4250da8f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 5 14:49:01 2015 +0100 jscript: Use separated functions for implementing builtin call, get and set operation. --- dlls/jscript/array.c | 73 ++++++-------- dlls/jscript/date.c | 21 +--- dlls/jscript/dispex.c | 46 ++++++--- dlls/jscript/function.c | 85 ++++++---------- dlls/jscript/jscript.h | 11 ++- dlls/jscript/jsregexp.c | 250 ++++++++++++++++++++---------------------------- dlls/jscript/number.c | 20 +--- dlls/jscript/object.c | 27 ++---- dlls/jscript/string.c | 50 ++++------ 9 files changed, 242 insertions(+), 341 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b7fae52964e53ab9d4250…

1 0

Jacek Caban : jscript: Don't use builtin property for *Error constructors.
by Alexandre Julliard 05 Feb '15

05 Feb '15

Module: wine Branch: master Commit: 90d3569c6292f18096d4306317d8fff3890990cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=90d3569c6292f18096d430631… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 5 14:47:51 2015 +0100 jscript: Don't use builtin property for *Error constructors. --- dlls/jscript/global.c | 100 ++++++++++++++------------------------------------ 1 file changed, 28 insertions(+), 72 deletions(-) diff --git a/dlls/jscript/global.c b/dlls/jscript/global.c index 1d1ec5b..dbfb95b 100644 --- a/dlls/jscript/global.c +++ b/dlls/jscript/global.c @@ -112,71 +112,6 @@ static WCHAR int_to_char(int i) return 'A'+i-10; } -static HRESULT constructor_call(jsdisp_t *constr, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) -{ - if(flags != DISPATCH_PROPERTYGET) - return jsdisp_call_value(constr, NULL, flags, argc, argv, r); - - *r = jsval_obj(jsdisp_addref(constr)); - return S_OK; -} - -static HRESULT JSGlobal_EvalError(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, - jsval_t *r) -{ - TRACE("\n"); - - return constructor_call(ctx->eval_error_constr, flags, argc, argv, r); -} - -static HRESULT JSGlobal_RangeError(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, - jsval_t *r) -{ - TRACE("\n"); - - return constructor_call(ctx->range_error_constr, flags, argc, argv, r); -} - -static HRESULT JSGlobal_RegExpError(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, - jsval_t *r) -{ - TRACE("\n"); - - return constructor_call(ctx->regexp_error_constr, flags, argc, argv, r); -} - -static HRESULT JSGlobal_ReferenceError(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, - jsval_t *r) -{ - TRACE("\n"); - - return constructor_call(ctx->reference_error_constr, flags, argc, argv, r); -} - -static HRESULT JSGlobal_SyntaxError(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, - jsval_t *r) -{ - TRACE("\n"); - - return constructor_call(ctx->syntax_error_constr, flags, argc, argv, r); -} - -static HRESULT JSGlobal_TypeError(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, - jsval_t *r) -{ - TRACE("\n"); - - return constructor_call(ctx->type_error_constr, flags, argc, argv, r); -} - -static HRESULT JSGlobal_URIError(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, - jsval_t *r) -{ - TRACE("\n"); - - return constructor_call(ctx->uri_error_constr, flags, argc, argv, r); -} - static HRESULT JSGlobal_Enumerator(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { @@ -1001,18 +936,11 @@ static HRESULT JSGlobal_decodeURIComponent(script_ctx_t *ctx, vdisp_t *jsthis, W static const builtin_prop_t JSGlobal_props[] = { {CollectGarbageW, JSGlobal_CollectGarbage, PROPF_METHOD}, {EnumeratorW, JSGlobal_Enumerator, PROPF_METHOD|7}, - {EvalErrorW, JSGlobal_EvalError, PROPF_CONSTR|1}, {_GetObjectW, JSGlobal_GetObject, PROPF_METHOD|2}, - {RangeErrorW, JSGlobal_RangeError, PROPF_CONSTR|1}, - {ReferenceErrorW, JSGlobal_ReferenceError, PROPF_CONSTR|1}, - {RegExpErrorW, JSGlobal_RegExpError, PROPF_CONSTR|1}, {ScriptEngineW, JSGlobal_ScriptEngine, PROPF_METHOD}, {ScriptEngineBuildVersionW, JSGlobal_ScriptEngineBuildVersion, PROPF_METHOD}, {ScriptEngineMajorVersionW, JSGlobal_ScriptEngineMajorVersion, PROPF_METHOD}, {ScriptEngineMinorVersionW, JSGlobal_ScriptEngineMinorVersion, PROPF_METHOD}, - {SyntaxErrorW, JSGlobal_SyntaxError, PROPF_CONSTR|1}, - {TypeErrorW, JSGlobal_TypeError, PROPF_CONSTR|1}, - {URIErrorW, JSGlobal_URIError, PROPF_CONSTR|1}, {decodeURIW, JSGlobal_decodeURI, PROPF_METHOD|1}, {decodeURIComponentW, JSGlobal_decodeURIComponent, PROPF_METHOD|1}, {encodeURIW, JSGlobal_encodeURI, PROPF_METHOD|1}, @@ -1087,6 +1015,34 @@ static HRESULT init_constructors(script_ctx_t *ctx, jsdisp_t *object_prototype) if(FAILED(hres)) return hres; + hres = jsdisp_propput_dontenum(ctx->global, EvalErrorW, jsval_obj(ctx->eval_error_constr)); + if(FAILED(hres)) + return hres; + + hres = jsdisp_propput_dontenum(ctx->global, RangeErrorW, jsval_obj(ctx->range_error_constr)); + if(FAILED(hres)) + return hres; + + hres = jsdisp_propput_dontenum(ctx->global, ReferenceErrorW, jsval_obj(ctx->reference_error_constr)); + if(FAILED(hres)) + return hres; + + hres = jsdisp_propput_dontenum(ctx->global, RegExpErrorW, jsval_obj(ctx->regexp_error_constr)); + if(FAILED(hres)) + return hres; + + hres = jsdisp_propput_dontenum(ctx->global, SyntaxErrorW, jsval_obj(ctx->syntax_error_constr)); + if(FAILED(hres)) + return hres; + + hres = jsdisp_propput_dontenum(ctx->global, TypeErrorW, jsval_obj(ctx->type_error_constr)); + if(FAILED(hres)) + return hres; + + hres = jsdisp_propput_dontenum(ctx->global, URIErrorW, jsval_obj(ctx->uri_error_constr)); + if(FAILED(hres)) + return hres; + hres = create_number_constr(ctx, object_prototype, &ctx->number_constr); if(FAILED(hres)) return hres;

1 0

Jacek Caban : jscript: Don' t use builtin property for a few more constructors.
by Alexandre Julliard 05 Feb '15

05 Feb '15

Module: wine Branch: master Commit: b7a27333e322ab37e21d790a7f46a723826e243f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7a27333e322ab37e21d790a7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 5 14:47:44 2015 +0100 jscript: Don't use builtin property for a few more constructors. --- dlls/jscript/global.c | 133 +++++++++++++++------------------------------ dlls/jscript/tests/lang.js | 12 ++++ 2 files changed, 56 insertions(+), 89 deletions(-) diff --git a/dlls/jscript/global.c b/dlls/jscript/global.c index 774ed05..1d1ec5b 100644 --- a/dlls/jscript/global.c +++ b/dlls/jscript/global.c @@ -121,30 +121,6 @@ static HRESULT constructor_call(jsdisp_t *constr, WORD flags, unsigned argc, jsv return S_OK; } -static HRESULT JSGlobal_Array(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, - jsval_t *r) -{ - TRACE("\n"); - - return constructor_call(ctx->array_constr, flags, argc, argv, r); -} - -static HRESULT JSGlobal_Date(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, - jsval_t *r) -{ - TRACE("\n"); - - return constructor_call(ctx->date_constr, flags, argc, argv, r); -} - -static HRESULT JSGlobal_Error(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, - jsval_t *r) -{ - TRACE("\n"); - - return constructor_call(ctx->error_constr, flags, argc, argv, r); -} - static HRESULT JSGlobal_EvalError(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { @@ -201,54 +177,6 @@ static HRESULT JSGlobal_URIError(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, return constructor_call(ctx->uri_error_constr, flags, argc, argv, r); } -static HRESULT JSGlobal_Function(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, - jsval_t *r) -{ - TRACE("\n"); - - return constructor_call(ctx->function_constr, flags, argc, argv, r); -} - -static HRESULT JSGlobal_Number(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, - jsval_t *r) -{ - TRACE("\n"); - - return constructor_call(ctx->number_constr, flags, argc, argv, r); -} - -static HRESULT JSGlobal_Object(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, - jsval_t *r) -{ - TRACE("\n"); - - return constructor_call(ctx->object_constr, flags, argc, argv, r); -} - -static HRESULT JSGlobal_String(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, - jsval_t *r) -{ - TRACE("\n"); - - return constructor_call(ctx->string_constr, flags, argc, argv, r); -} - -static HRESULT JSGlobal_RegExp(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, - jsval_t *r) -{ - TRACE("\n"); - - return constructor_call(ctx->regexp_constr, flags, argc, argv, r); -} - -static HRESULT JSGlobal_VBArray(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, - jsval_t *r) -{ - TRACE("\n"); - - return constructor_call(ctx->vbarray_constr, flags, argc, argv, r); -} - static HRESULT JSGlobal_Enumerator(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { @@ -1071,29 +999,20 @@ static HRESULT JSGlobal_decodeURIComponent(script_ctx_t *ctx, vdisp_t *jsthis, W } static const builtin_prop_t JSGlobal_props[] = { - {ArrayW, JSGlobal_Array, PROPF_CONSTR|1}, {CollectGarbageW, JSGlobal_CollectGarbage, PROPF_METHOD}, - {DateW, JSGlobal_Date, PROPF_CONSTR|7}, {EnumeratorW, JSGlobal_Enumerator, PROPF_METHOD|7}, - {ErrorW, JSGlobal_Error, PROPF_CONSTR|1}, {EvalErrorW, JSGlobal_EvalError, PROPF_CONSTR|1}, - {FunctionW, JSGlobal_Function, PROPF_CONSTR|1}, {_GetObjectW, JSGlobal_GetObject, PROPF_METHOD|2}, - {NumberW, JSGlobal_Number, PROPF_CONSTR|1}, - {ObjectW, JSGlobal_Object, PROPF_CONSTR|1}, {RangeErrorW, JSGlobal_RangeError, PROPF_CONSTR|1}, {ReferenceErrorW, JSGlobal_ReferenceError, PROPF_CONSTR|1}, - {RegExpW, JSGlobal_RegExp, PROPF_CONSTR|2}, {RegExpErrorW, JSGlobal_RegExpError, PROPF_CONSTR|1}, {ScriptEngineW, JSGlobal_ScriptEngine, PROPF_METHOD}, {ScriptEngineBuildVersionW, JSGlobal_ScriptEngineBuildVersion, PROPF_METHOD}, {ScriptEngineMajorVersionW, JSGlobal_ScriptEngineMajorVersion, PROPF_METHOD}, {ScriptEngineMinorVersionW, JSGlobal_ScriptEngineMinorVersion, PROPF_METHOD}, - {StringW, JSGlobal_String, PROPF_CONSTR|1}, {SyntaxErrorW, JSGlobal_SyntaxError, PROPF_CONSTR|1}, {TypeErrorW, JSGlobal_TypeError, PROPF_CONSTR|1}, {URIErrorW, JSGlobal_URIError, PROPF_CONSTR|1}, - {VBArrayW, JSGlobal_VBArray, PROPF_CONSTR|1}, {decodeURIW, JSGlobal_decodeURI, PROPF_METHOD|1}, {decodeURIComponentW, JSGlobal_decodeURIComponent, PROPF_METHOD|1}, {encodeURIW, JSGlobal_encodeURI, PROPF_METHOD|1}, @@ -1124,42 +1043,82 @@ static HRESULT init_constructors(script_ctx_t *ctx, jsdisp_t *object_prototype) if(FAILED(hres)) return hres; + hres = jsdisp_propput_dontenum(ctx->global, FunctionW, jsval_obj(ctx->function_constr)); + if(FAILED(hres)) + return hres; + hres = create_object_constr(ctx, object_prototype, &ctx->object_constr); if(FAILED(hres)) return hres; + hres = jsdisp_propput_dontenum(ctx->global, ObjectW, jsval_obj(ctx->object_constr)); + if(FAILED(hres)) + return hres; + hres = create_array_constr(ctx, object_prototype, &ctx->array_constr); if(FAILED(hres)) return hres; + hres = jsdisp_propput_dontenum(ctx->global, ArrayW, jsval_obj(ctx->array_constr)); + if(FAILED(hres)) + return hres; + hres = create_bool_constr(ctx, object_prototype, &ctx->bool_constr); if(FAILED(hres)) return hres; + hres = jsdisp_propput_dontenum(ctx->global, BooleanW, jsval_obj(ctx->bool_constr)); + if(FAILED(hres)) + return hres; + hres = create_date_constr(ctx, object_prototype, &ctx->date_constr); if(FAILED(hres)) return hres; + hres = jsdisp_propput_dontenum(ctx->global, DateW, jsval_obj(ctx->date_constr)); + if(FAILED(hres)) + return hres; + hres = init_error_constr(ctx, object_prototype); if(FAILED(hres)) return hres; + hres = jsdisp_propput_dontenum(ctx->global, ErrorW, jsval_obj(ctx->error_constr)); + if(FAILED(hres)) + return hres; + hres = create_number_constr(ctx, object_prototype, &ctx->number_constr); if(FAILED(hres)) return hres; + hres = jsdisp_propput_dontenum(ctx->global, NumberW, jsval_obj(ctx->number_constr)); + if(FAILED(hres)) + return hres; + hres = create_regexp_constr(ctx, object_prototype, &ctx->regexp_constr); if(FAILED(hres)) return hres; + hres = jsdisp_propput_dontenum(ctx->global, RegExpW, jsval_obj(ctx->regexp_constr)); + if(FAILED(hres)) + return hres; + hres = create_string_constr(ctx, object_prototype, &ctx->string_constr); if(FAILED(hres)) return hres; + hres = jsdisp_propput_dontenum(ctx->global, StringW, jsval_obj(ctx->string_constr)); + if(FAILED(hres)) + return hres; + hres = create_vbarray_constr(ctx, object_prototype, &ctx->vbarray_constr); if(FAILED(hres)) return hres; + hres = jsdisp_propput_dontenum(ctx->global, VBArrayW, jsval_obj(ctx->vbarray_constr)); + if(FAILED(hres)) + return hres; + return S_OK; } @@ -1171,16 +1130,16 @@ HRESULT init_global(script_ctx_t *ctx) if(ctx->global) return S_OK; - hres = create_object_prototype(ctx, &object_prototype); + hres = create_dispex(ctx, &JSGlobal_info, NULL, &ctx->global); if(FAILED(hres)) return hres; - hres = init_constructors(ctx, object_prototype); - jsdisp_release(object_prototype); + hres = create_object_prototype(ctx, &object_prototype); if(FAILED(hres)) return hres; - hres = create_dispex(ctx, &JSGlobal_info, NULL, &ctx->global); + hres = init_constructors(ctx, object_prototype); + jsdisp_release(object_prototype); if(FAILED(hres)) return hres; @@ -1197,10 +1156,6 @@ HRESULT init_global(script_ctx_t *ctx) if(FAILED(hres)) return hres; - hres = jsdisp_propput_dontenum(ctx->global, BooleanW, jsval_obj(ctx->bool_constr)); - if(FAILED(hres)) - return hres; - hres = jsdisp_propput_dontenum(ctx->global, ActiveXObjectW, jsval_obj(constr)); jsdisp_release(constr); if(FAILED(hres)) diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index b846eb2..3e60aba 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -1456,6 +1456,18 @@ ok(ActiveXObject === 1, "ActiveXObject = " + ActiveXObject); Boolean = 1; ok(Boolean === 1, "Boolean = " + Boolean); +Object = 1; +ok(Object === 1, "Object = " + Object); + +Array = 1; +ok(Array === 1, "Array = " + Array); + +Date = 1; +ok(Date === 1, "Date = " + Date); + +Error = 1; +ok(Error === 1, "Error = " + Error); + /* Keep this test in the end of file */ undefined = 6; ok(undefined === 6, "undefined = " + undefined);

1 0

← Newer
1
...
32
33
34
35
36
37
38
...
42
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2015