November 2011 - Wine-Commits

Piotr Caban : msvcp90: Added _Timevec class implementation.
by Alexandre Julliard Nov. 25, 2011

Nov. 25, 2011

Module: wine Branch: master Commit: 913b075b079fd117d533a6e197a2c8b58ab37148 URL: http://source.winehq.org/git/wine.git/?a=commit;h=913b075b079fd117d533a6e19… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Nov 25 10:46:18 2011 +0100 msvcp90: Added _Timevec class implementation. --- dlls/msvcp90/locale.c | 32 ++++++++++++++++++++------------ 1 files changed, 20 insertions(+), 12 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 29069e7..e928d3e 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -653,11 +653,14 @@ basic_string_char __thiscall locale_name(const locale *this) /* ??0_Timevec(a)std@@QAE(a)ABV01@@Z */ /* ??0_Timevec(a)std@@QEAA(a)AEBV01@@Z */ +/* This copy constructor modifies copied object */ DEFINE_THISCALL_WRAPPER(_Timevec_copy_ctor, 8) -_Timevec* __thiscall _Timevec_copy_ctor(_Timevec *this, const _Timevec *copy) +_Timevec* __thiscall _Timevec_copy_ctor(_Timevec *this, _Timevec *copy) { - FIXME("(%p %p) stub\n", this, copy); - return NULL; + TRACE("(%p %p)\n", this, copy); + this->timeptr = copy->timeptr; + copy->timeptr = NULL; + return this; } /* ??0_Timevec(a)std@@QAE(a)PAX@Z */ @@ -665,8 +668,9 @@ _Timevec* __thiscall _Timevec_copy_ctor(_Timevec *this, const _Timevec *copy) DEFINE_THISCALL_WRAPPER(_Timevec_ctor_timeptr, 8) _Timevec* __thiscall _Timevec_ctor_timeptr(_Timevec *this, void *timeptr) { - FIXME("(%p %p) stub\n", this, timeptr); - return NULL; + TRACE("(%p %p)\n", this, timeptr); + this->timeptr = timeptr; + return this; } /* ??_F_Timevec(a)std@@QAEXXZ */ @@ -674,8 +678,9 @@ _Timevec* __thiscall _Timevec_ctor_timeptr(_Timevec *this, void *timeptr) DEFINE_THISCALL_WRAPPER(_Timevec_ctor, 4) _Timevec* __thiscall _Timevec_ctor(_Timevec *this) { - FIXME("(%p) stub\n", this); - return NULL; + TRACE("(%p)\n", this); + this->timeptr = NULL; + return this; } /* ??1_Timevec(a)std@@QAE(a)XZ */ @@ -683,7 +688,8 @@ _Timevec* __thiscall _Timevec_ctor(_Timevec *this) DEFINE_THISCALL_WRAPPER(_Timevec_dtor, 4) void __thiscall _Timevec_dtor(_Timevec *this) { - FIXME("(%p) stub\n", this); + TRACE("(%p)\n", this); + MSVCRT_operator_delete(this->timeptr); } /* ??4_Timevec(a)std@@QAEAAV01(a)ABV01@@Z */ @@ -691,8 +697,10 @@ void __thiscall _Timevec_dtor(_Timevec *this) DEFINE_THISCALL_WRAPPER(_Timevec_op_assign, 8) _Timevec* __thiscall _Timevec_op_assign(_Timevec *this, _Timevec *right) { - FIXME("(%p %p) stub\n", this, right); - return NULL; + TRACE("(%p %p)\n", this, right); + this->timeptr = right->timeptr; + right->timeptr = NULL; + return this; } /* ?_Getptr(a)_Timevec@std@@QBEPAXXZ */ @@ -700,8 +708,8 @@ _Timevec* __thiscall _Timevec_op_assign(_Timevec *this, _Timevec *right) DEFINE_THISCALL_WRAPPER(_Timevec__Getptr, 4) void* __thiscall _Timevec__Getptr(_Timevec *this) { - FIXME("(%p) stub\n", this); - return NULL; + TRACE("(%p)\n", this); + return this->timeptr; } /* ?_Locinfo_ctor(a)_Locinfo@std@@SAXPAV12(a)ABV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@2@@Z */

1 0

Henri Verbeet : wined3d: Get rid of the WINED3DCLIPSTATUS typedef.
by Alexandre Julliard Nov. 25, 2011

Nov. 25, 2011

Module: wine Branch: master Commit: 1c74172a28586e408d6224638cc1311f28f9238f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c74172a28586e408d6224638… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 24 22:52:35 2011 +0100 wined3d: Get rid of the WINED3DCLIPSTATUS typedef. --- dlls/d3d8/device.c | 6 +++--- dlls/d3d9/device.c | 4 ++-- dlls/wined3d/device.c | 6 ++++-- include/wine/wined3d.h | 14 ++++++++------ 4 files changed, 17 insertions(+), 13 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index eb398ab..c003993 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1648,10 +1648,10 @@ static HRESULT WINAPI IDirect3DDevice8Impl_SetClipStatus(IDirect3DDevice8 *iface HRESULT hr; TRACE("iface %p, clip_status %p.\n", iface, pClipStatus); -/* FIXME: Verify that D3DCLIPSTATUS8 ~= WINED3DCLIPSTATUS */ + /* FIXME: Verify that D3DCLIPSTATUS8 ~= struct wined3d_clip_status. */ wined3d_mutex_lock(); - hr = wined3d_device_set_clip_status(This->wined3d_device, (const WINED3DCLIPSTATUS *)pClipStatus); + hr = wined3d_device_set_clip_status(This->wined3d_device, (const struct wined3d_clip_status *)pClipStatus); wined3d_mutex_unlock(); return hr; @@ -1666,7 +1666,7 @@ static HRESULT WINAPI IDirect3DDevice8Impl_GetClipStatus(IDirect3DDevice8 *iface TRACE("iface %p, clip_status %p.\n", iface, pClipStatus); wined3d_mutex_lock(); - hr = wined3d_device_get_clip_status(This->wined3d_device, (WINED3DCLIPSTATUS *)pClipStatus); + hr = wined3d_device_get_clip_status(This->wined3d_device, (struct wined3d_clip_status *)pClipStatus); wined3d_mutex_unlock(); return hr; diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 32215c5..49a3215 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1580,7 +1580,7 @@ static HRESULT WINAPI IDirect3DDevice9Impl_SetClipStatus(IDirect3DDevice9Ex *ifa TRACE("iface %p, clip_status %p.\n", iface, pClipStatus); wined3d_mutex_lock(); - hr = wined3d_device_set_clip_status(This->wined3d_device, (const WINED3DCLIPSTATUS *)pClipStatus); + hr = wined3d_device_set_clip_status(This->wined3d_device, (const struct wined3d_clip_status *)pClipStatus); wined3d_mutex_unlock(); return hr; @@ -1595,7 +1595,7 @@ static HRESULT WINAPI IDirect3DDevice9Impl_GetClipStatus(IDirect3DDevice9Ex *ifa TRACE("iface %p, clip_status %p.\n", iface, pClipStatus); wined3d_mutex_lock(); - hr = wined3d_device_get_clip_status(This->wined3d_device, (WINED3DCLIPSTATUS *)pClipStatus); + hr = wined3d_device_get_clip_status(This->wined3d_device, (struct wined3d_clip_status *)pClipStatus); wined3d_mutex_unlock(); return hr; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index e12f48a..6e35c0a 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2260,7 +2260,8 @@ HRESULT CDECL wined3d_device_get_clip_plane(const struct wined3d_device *device, return WINED3D_OK; } -HRESULT CDECL wined3d_device_set_clip_status(struct wined3d_device *device, const WINED3DCLIPSTATUS *clip_status) +HRESULT CDECL wined3d_device_set_clip_status(struct wined3d_device *device, + const struct wined3d_clip_status *clip_status) { FIXME("device %p, clip_status %p stub!\n", device, clip_status); @@ -2270,7 +2271,8 @@ HRESULT CDECL wined3d_device_set_clip_status(struct wined3d_device *device, cons return WINED3D_OK; } -HRESULT CDECL wined3d_device_get_clip_status(const struct wined3d_device *device, WINED3DCLIPSTATUS *clip_status) +HRESULT CDECL wined3d_device_get_clip_status(const struct wined3d_device *device, + struct wined3d_clip_status *clip_status) { FIXME("device %p, clip_status %p stub!\n", device, clip_status); diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 5bcc35b..a68e0d3 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1667,11 +1667,11 @@ struct wined3d_resource_desc UINT size; }; -typedef struct _WINED3DCLIPSTATUS +struct wined3d_clip_status { - DWORD ClipUnion; - DWORD ClipIntersection; -} WINED3DCLIPSTATUS; + DWORD clip_union; + DWORD clip_intersection; +}; typedef struct _WINED3DVERTEXELEMENT { @@ -2200,7 +2200,8 @@ HRESULT __cdecl wined3d_device_get_back_buffer(const struct wined3d_device *devi UINT backbuffer_idx, WINED3DBACKBUFFER_TYPE backbuffer_type, struct wined3d_surface **backbuffer); INT __cdecl wined3d_device_get_base_vertex_index(const struct wined3d_device *device); HRESULT __cdecl wined3d_device_get_clip_plane(const struct wined3d_device *device, UINT plane_idx, float *plane); -HRESULT __cdecl wined3d_device_get_clip_status(const struct wined3d_device *device, WINED3DCLIPSTATUS *clip_status); +HRESULT __cdecl wined3d_device_get_clip_status(const struct wined3d_device *device, + struct wined3d_clip_status *clip_status); HRESULT __cdecl wined3d_device_get_creation_parameters(const struct wined3d_device *device, WINED3DDEVICE_CREATION_PARAMETERS *creation_parameters); HRESULT __cdecl wined3d_device_get_depth_stencil(const struct wined3d_device *device, @@ -2280,7 +2281,8 @@ HRESULT __cdecl wined3d_device_reset(struct wined3d_device *device, void __cdecl wined3d_device_restore_fullscreen_window(struct wined3d_device *device, HWND window); HRESULT __cdecl wined3d_device_set_base_vertex_index(struct wined3d_device *device, INT base_index); HRESULT __cdecl wined3d_device_set_clip_plane(struct wined3d_device *device, UINT plane_idx, const float *plane); -HRESULT __cdecl wined3d_device_set_clip_status(struct wined3d_device *device, const WINED3DCLIPSTATUS *clip_status); +HRESULT __cdecl wined3d_device_set_clip_status(struct wined3d_device *device, + const struct wined3d_clip_status *clip_status); void __cdecl wined3d_device_set_cursor_position(struct wined3d_device *device, int x_screen_space, int y_screen_space, DWORD flags); HRESULT __cdecl wined3d_device_set_cursor_properties(struct wined3d_device *device,

1 0

Jacek Caban : jscript: Use bytecode for unary '-' expression.
by Alexandre Julliard Nov. 25, 2011

Nov. 25, 2011

Module: wine Branch: master Commit: 413fe9a46200f9477d1b6bf2ba7a55b4f76b0760 URL: http://source.winehq.org/git/wine.git/?a=commit;h=413fe9a46200f9477d1b6bf2b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 25 12:06:30 2011 +0100 jscript: Use bytecode for unary '-' expression. --- dlls/jscript/compile.c | 2 ++ dlls/jscript/engine.c | 22 ++++------------------ dlls/jscript/engine.h | 1 + dlls/jscript/parser.y | 2 +- 4 files changed, 8 insertions(+), 19 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index 12dd04f..17c949b 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -236,6 +236,8 @@ static HRESULT compile_expression(compiler_ctx_t *ctx, expression_t *expr) return compile_literal(ctx, ((literal_expression_t*)expr)->literal); case EXPR_LOGNEG: return compile_unary_expression(ctx, (unary_expression_t*)expr, OP_neg); + case EXPR_MINUS: + return compile_unary_expression(ctx, (unary_expression_t*)expr, OP_minus); case EXPR_NOTEQEQ: return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_neq2); case EXPR_PLUS: diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index a004326..c4889f5 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -2574,32 +2574,18 @@ HRESULT typeof_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD fla } /* ECMA-262 3rd Edition 11.4.7 */ -HRESULT minus_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) +HRESULT interp_minus(exec_ctx_t *ctx) { - unary_expression_t *expr = (unary_expression_t*)_expr; - exprval_t exprval; - VARIANT val, num; + VARIANT n; HRESULT hres; TRACE("\n"); - hres = expr_eval(ctx, expr->expression, 0, ei, &exprval); + hres = stack_pop_number(ctx, &n); if(FAILED(hres)) return hres; - hres = exprval_to_value(ctx, &exprval, ei, &val); - exprval_release(&exprval); - if(FAILED(hres)) - return hres; - - hres = to_number(ctx, &val, ei, &num); - VariantClear(&val); - if(FAILED(hres)) - return hres; - - ret->type = EXPRVAL_VARIANT; - num_set_val(&ret->u.var, -num_val(&num)); - return S_OK; + return stack_push_number(ctx, -num_val(&n)); } /* ECMA-262 3rd Edition 11.4.6 */ diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index 736fe5a..dd31909 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -49,6 +49,7 @@ typedef struct _func_stack { X(eq2, 1, 0,0) \ X(in, 1, 0,0) \ X(int, 1, ARG_INT, 0) \ + X(minus, 1, 0,0) \ X(neg, 1, 0,0) \ X(neq2, 1, 0,0) \ X(null, 1, 0,0) \ diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index 2e8c0d8..3e7f0fe 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -1321,7 +1321,7 @@ static const expression_eval_t expression_eval_table[] = { delete_expression_eval, compiled_expression_eval, typeof_expression_eval, - minus_expression_eval, + compiled_expression_eval, compiled_expression_eval, post_increment_expression_eval, post_decrement_expression_eval,

1 0

Piotr Caban : msvcp90: Reorganize __ASM_EXCEPTION_VTABLE macro.
by Alexandre Julliard Nov. 25, 2011

Nov. 25, 2011

Module: wine Branch: master Commit: 1c04cbfd336cc8867162468c8027f31492938a0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c04cbfd336cc8867162468c8… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Nov 25 10:46:30 2011 +0100 msvcp90: Reorganize __ASM_EXCEPTION_VTABLE macro. --- dlls/msvcp90/exception.c | 26 +++++++++----------------- 1 files changed, 9 insertions(+), 17 deletions(-) diff --git a/dlls/msvcp90/exception.c b/dlls/msvcp90/exception.c index 00fb0f0..77e1e60 100644 --- a/dlls/msvcp90/exception.c +++ b/dlls/msvcp90/exception.c @@ -64,20 +64,12 @@ void WINAPI _CxxThrowException(exception*,const cxx_exception_type*); #ifdef _WIN64 -#define __ASM_EXCEPTION_VTABLE(name) \ - __ASM_VTABLE(name, "\t.quad " THISCALL_NAME(MSVCP_what_exception) ) - -#define __ASM_EXCEPTION_STRING_VTABLE(name) \ - __ASM_VTABLE(name, "\t.quad " THISCALL_NAME(MSVCP_logic_error_what) ) - +#define __ASM_EXCEPTION_VTABLE(name, what_func) \ + __ASM_VTABLE(name, "\t.quad " THISCALL_NAME(what_func) ) #else -#define __ASM_EXCEPTION_VTABLE(name) \ - __ASM_VTABLE(name, "\t.long " THISCALL_NAME(MSVCP_what_exception) ) - -#define __ASM_EXCEPTION_STRING_VTABLE(name) \ - __ASM_VTABLE(name, "\t.long " THISCALL_NAME(MSVCP_logic_error_what) ) - +#define __ASM_EXCEPTION_VTABLE(name, what_func) \ + __ASM_VTABLE(name, "\t.long " THISCALL_NAME(what_func) ) #endif /* _WIN64 */ extern const vtable_ptr MSVCP_bad_alloc_vtable; @@ -688,11 +680,11 @@ static const cxx_exception_type invalid_argument_cxx_type = { #ifndef __GNUC__ void __asm_dummy_vtables(void) { #endif - __ASM_EXCEPTION_VTABLE(bad_alloc); - __ASM_EXCEPTION_STRING_VTABLE(logic_error); - __ASM_EXCEPTION_STRING_VTABLE(length_error); - __ASM_EXCEPTION_STRING_VTABLE(out_of_range); - __ASM_EXCEPTION_STRING_VTABLE(invalid_argument); + __ASM_EXCEPTION_VTABLE(bad_alloc, MSVCP_what_exception); + __ASM_EXCEPTION_VTABLE(logic_error, MSVCP_logic_error_what); + __ASM_EXCEPTION_VTABLE(length_error, MSVCP_logic_error_what); + __ASM_EXCEPTION_VTABLE(out_of_range, MSVCP_logic_error_what); + __ASM_EXCEPTION_VTABLE(invalid_argument, MSVCP_logic_error_what); #ifndef __GNUC__ } #endif

1 0

Piotr Caban : msvcp90: Added locale::_Addfac implementation.
by Alexandre Julliard Nov. 25, 2011

Nov. 25, 2011

Module: wine Branch: master Commit: 2e449eba0851bef828039dd129bbeb1ca2deae36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e449eba0851bef828039dd12… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Nov 25 10:45:55 2011 +0100 msvcp90: Added locale::_Addfac implementation. --- dlls/msvcp90/locale.c | 23 +++++++++++++++++++++-- 1 files changed, 21 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 61a3353..f985136 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -579,8 +579,27 @@ MSVCP_bool __thiscall locale_operator_not_equal(const locale *this, locale const DEFINE_THISCALL_WRAPPER(locale__Addfac, 16) locale* __thiscall locale__Addfac(locale *this, locale_facet *facet, MSVCP_size_t id, MSVCP_size_t catmask) { - FIXME("(%p %p %lu %lu) stub\n", this, facet, id, catmask); - return NULL; + TRACE("(%p %p %lu %lu)\n", this, facet, id, catmask); + + if(this->ptr->facet.refs > 1) { + locale__Locimp *new_ptr = MSVCRT_operator_new(sizeof(locale__Locimp)); + if(!new_ptr) { + ERR("Out of memory\n"); + throw_exception(EXCEPTION_BAD_ALLOC, NULL); + return NULL; + } + locale__Locimp_copy_ctor(new_ptr, this->ptr); + locale_facet__Decref(&this->ptr->facet); + this->ptr = new_ptr; + } + + locale__Locimp__Addfac(this->ptr, facet, id); + + if(catmask) { + MSVCP_basic_string_char_dtor(&this->ptr->name); + MSVCP_basic_string_char_ctor_cstr(&this->ptr->name, "*"); + } + return this; } /* ?_Getfacet(a)locale@std@@QBEPBVfacet(a)12@I(a)Z */

1 0

Piotr Caban : msvcp90: Added locale copy based constructors implementation.
by Alexandre Julliard Nov. 25, 2011

Nov. 25, 2011

Module: wine Branch: master Commit: 1263b618d7945e817b70a85560c69850e5a881e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1263b618d7945e817b70a8556… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Nov 25 10:45:41 2011 +0100 msvcp90: Added locale copy based constructors implementation. --- dlls/msvcp90/locale.c | 29 ++++++++++++++++++++++------- 1 files changed, 22 insertions(+), 7 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index f05cc79..61a3353 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -274,15 +274,18 @@ locale__Locimp* __thiscall locale__Locimp_ctor(locale__Locimp *this) DEFINE_THISCALL_WRAPPER(locale__Locimp_copy_ctor, 8) locale__Locimp* __thiscall locale__Locimp_copy_ctor(locale__Locimp *this, const locale__Locimp *copy) { + _Lockit lock; MSVCP_size_t i; TRACE("(%p %p)\n", this, copy); + _Lockit_ctor_locktype(&lock, _LOCK_LOCALE); memcpy(this, copy, sizeof(locale__Locimp)); locale_facet_ctor_refs(&this->facet, 1); if(copy->facetvec) { this->facetvec = MSVCRT_operator_new(copy->facet_cnt*sizeof(locale_facet*)); if(!this->facetvec) { + _Lockit_dtor(&lock); ERR("Out of memory\n"); throw_exception(EXCEPTION_BAD_ALLOC, NULL); return NULL; @@ -292,6 +295,7 @@ locale__Locimp* __thiscall locale__Locimp_copy_ctor(locale__Locimp *this, const locale_facet__Incref(this->facetvec[i]); } MSVCP_basic_string_char_copy_ctor(&this->name, &copy->name); + _Lockit_dtor(&lock); return this; } @@ -351,8 +355,11 @@ locale__Locimp* __thiscall MSVCP_locale__Locimp_vector_dtor(locale__Locimp *this /* ?_Locimp_Addfac(a)_Locimp@locale(a)std@@CAXPEAV123(a)PEAVfacet@23(a)_K@Z */ void __cdecl locale__Locimp__Locimp_Addfac(locale__Locimp *locimp, locale_facet *facet, MSVCP_size_t id) { + _Lockit lock; + TRACE("(%p %p %lu)\n", locimp, facet, id); + _Lockit_ctor_locktype(&lock, _LOCK_LOCALE); if(id >= locimp->facet_cnt) { MSVCP_size_t new_size = id+1; locale_facet **new_facetvec; @@ -362,6 +369,7 @@ void __cdecl locale__Locimp__Locimp_Addfac(locale__Locimp *locimp, locale_facet new_facetvec = MSVCRT_operator_new(sizeof(locale_facet*)*new_size); if(!new_facetvec) { + _Lockit_dtor(&lock); ERR("Out of memory\n"); throw_exception(EXCEPTION_BAD_ALLOC, NULL); return; @@ -380,6 +388,7 @@ void __cdecl locale__Locimp__Locimp_Addfac(locale__Locimp *locimp, locale_facet locimp->facetvec[id] = facet; if(facet) locale_facet__Incref(facet); + _Lockit_dtor(&lock); } /* ?_Addfac(a)_Locimp@locale(a)std@@AAEXPAVfacet(a)23@I(a)Z */ @@ -437,8 +446,10 @@ const vtable_ptr MSVCP_locale__Locimp_vtable[] = { DEFINE_THISCALL_WRAPPER(locale_ctor_locimp, 8) locale* __thiscall locale_ctor_locimp(locale *this, locale__Locimp *locimp) { - FIXME("(%p %p) stub\n", this, locimp); - return NULL; + TRACE("(%p %p)\n", this, locimp); + /* Don't change locimp reference counter */ + this->ptr = locimp; + return this; } /* ??0locale(a)std@@QAE(a)ABV01@0H(a)Z */ @@ -455,8 +466,10 @@ locale* __thiscall locale_ctor_locale_locale(locale *this, const locale *loc, co DEFINE_THISCALL_WRAPPER(locale_copy_ctor, 8) locale* __thiscall locale_copy_ctor(locale *this, const locale *copy) { - FIXME("(%p %p) stub\n", this, copy); - return NULL; + TRACE("(%p %p)\n", this, copy); + this->ptr = copy->ptr; + locale_facet__Incref(&this->ptr->facet); + return this; } /* ??0locale(a)std@@QAE(a)ABV01@PBDH(a)Z */ @@ -482,8 +495,9 @@ locale* __thiscall locale_ctor_cstr(locale *this, const char *locname, category DEFINE_THISCALL_WRAPPER(locale_ctor_uninitialized, 8) locale* __thiscall locale_ctor_uninitialized(locale *this, int uninitialized) { - FIXME("(%p %d) stub\n", this, uninitialized); - return NULL; + TRACE("(%p)\n", this); + this->ptr = NULL; + return this; } /* ??0locale(a)std@@QAE(a)XZ */ @@ -509,7 +523,8 @@ DEFINE_THISCALL_WRAPPER(locale_dtor, 4) void __thiscall locale_dtor(locale *this) { TRACE("(%p)\n", this); - locale__Locimp_dtor(this->ptr); + if(this->ptr) + locale__Locimp_dtor(this->ptr); } DEFINE_THISCALL_WRAPPER(MSVCP_locale_vector_dtor, 8)

1 0

Jacek Caban : jscript: Use bytecode for '==' and '!=' expression.
by Alexandre Julliard Nov. 25, 2011

Nov. 25, 2011

Module: wine Branch: master Commit: 58952a07d045cecacd12f222da0be49f8748528b URL: http://source.winehq.org/git/wine.git/?a=commit;h=58952a07d045cecacd12f222d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 25 12:07:30 2011 +0100 jscript: Use bytecode for '==' and '!=' expression. --- dlls/jscript/compile.c | 4 +++ dlls/jscript/engine.c | 52 ++++++++++++++++++++++------------------------- dlls/jscript/engine.h | 4 +- dlls/jscript/parser.y | 4 +- 4 files changed, 32 insertions(+), 32 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index 17c949b..65d6861 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -228,6 +228,8 @@ static HRESULT compile_expression(compiler_ctx_t *ctx, expression_t *expr) return compile_unary_expression(ctx, (unary_expression_t*)expr, OP_bneg); case EXPR_COMMA: return compile_comma_expression(ctx, (binary_expression_t*)expr); + case EXPR_EQ: + return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_eq); case EXPR_EQEQ: return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_eq2); case EXPR_IN: @@ -238,6 +240,8 @@ static HRESULT compile_expression(compiler_ctx_t *ctx, expression_t *expr) return compile_unary_expression(ctx, (unary_expression_t*)expr, OP_neg); case EXPR_MINUS: return compile_unary_expression(ctx, (unary_expression_t*)expr, OP_minus); + case EXPR_NOTEQ: + return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_neq); case EXPR_NOTEQEQ: return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_neq2); case EXPR_PLUS: diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index c4889f5..9e26e93 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -2842,70 +2842,66 @@ static HRESULT equal_values(script_ctx_t *ctx, VARIANT *lval, VARIANT *rval, jse } /* ECMA-262 3rd Edition 11.9.1 */ -HRESULT equal_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) +HRESULT interp_eq(exec_ctx_t *ctx) { - binary_expression_t *expr = (binary_expression_t*)_expr; - VARIANT rval, lval; + VARIANT *l, *r; BOOL b; HRESULT hres; - TRACE("\n"); + r = stack_pop(ctx); + l = stack_pop(ctx); - hres = get_binary_expr_values(ctx, expr, ei, &rval, &lval); - if(FAILED(hres)) - return hres; + TRACE("%s == %s\n", debugstr_variant(l), debugstr_variant(r)); - hres = equal_values(ctx, &rval, &lval, ei, &b); - VariantClear(&lval); - VariantClear(&rval); + hres = equal_values(ctx->parser->script, l, r, &ctx->ei, &b); + VariantClear(l); + VariantClear(r); if(FAILED(hres)) return hres; - return return_bool(ret, b); + return stack_push_bool(ctx, b); } -/* ECMA-262 3rd Edition 11.9.4 */ -static HRESULT interp_eq2(exec_ctx_t *ctx) +/* ECMA-262 3rd Edition 11.9.2 */ +HRESULT interp_neq(exec_ctx_t *ctx) { VARIANT *l, *r; BOOL b; HRESULT hres; - TRACE("\n"); - r = stack_pop(ctx); l = stack_pop(ctx); - hres = equal2_values(r, l, &b); + TRACE("%s != %s\n", debugstr_variant(l), debugstr_variant(r)); + + hres = equal_values(ctx->parser->script, l, r, &ctx->ei, &b); VariantClear(l); VariantClear(r); if(FAILED(hres)) return hres; - return stack_push_bool(ctx, b); + return stack_push_bool(ctx, !b); } -/* ECMA-262 3rd Edition 11.9.2 */ -HRESULT not_equal_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) +/* ECMA-262 3rd Edition 11.9.4 */ +static HRESULT interp_eq2(exec_ctx_t *ctx) { - binary_expression_t *expr = (binary_expression_t*)_expr; - VARIANT rval, lval; + VARIANT *l, *r; BOOL b; HRESULT hres; TRACE("\n"); - hres = get_binary_expr_values(ctx, expr, ei, &lval, &rval); - if(FAILED(hres)) - return hres; + r = stack_pop(ctx); + l = stack_pop(ctx); - hres = equal_values(ctx, &lval, &rval, ei, &b); - VariantClear(&lval); - VariantClear(&rval); + hres = equal2_values(r, l, &b); + VariantClear(l); + VariantClear(r); if(FAILED(hres)) return hres; - return return_bool(ret, !b); + return stack_push_bool(ctx, b); } /* ECMA-262 3rd Edition 11.9.5 */ diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index dd31909..d74d57c 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -46,11 +46,13 @@ typedef struct _func_stack { X(bool, 1, ARG_INT, 0) \ X(bneg, 1, 0,0) \ X(double, 1, ARG_SBL, 0) \ + X(eq, 1, 0,0) \ X(eq2, 1, 0,0) \ X(in, 1, 0,0) \ X(int, 1, ARG_INT, 0) \ X(minus, 1, 0,0) \ X(neg, 1, 0,0) \ + X(neq, 1, 0,0) \ X(neq2, 1, 0,0) \ X(null, 1, 0,0) \ X(pop, 1, 0,0) \ @@ -553,8 +555,6 @@ HRESULT post_increment_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcep HRESULT post_decrement_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT pre_increment_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT pre_decrement_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; -HRESULT equal_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; -HRESULT not_equal_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT less_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT lesseq_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT greater_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index 3e7f0fe..3c953eb 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -1327,9 +1327,9 @@ static const expression_eval_t expression_eval_table[] = { post_decrement_expression_eval, pre_increment_expression_eval, pre_decrement_expression_eval, - equal_expression_eval, compiled_expression_eval, - not_equal_expression_eval, + compiled_expression_eval, + compiled_expression_eval, compiled_expression_eval, less_expression_eval, lesseq_expression_eval,

1 0

Henri Verbeet : wined3d: Handle changing the backbuffer format in wined3d_device_reset().
by Alexandre Julliard Nov. 25, 2011

Nov. 25, 2011

Module: wine Branch: master Commit: 094f64c823ed65629ebbec78a4b1f5e4583c0142 URL: http://source.winehq.org/git/wine.git/?a=commit;h=094f64c823ed65629ebbec78a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 24 22:52:34 2011 +0100 wined3d: Handle changing the backbuffer format in wined3d_device_reset(). --- dlls/wined3d/device.c | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index d165806..e12f48a 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5241,6 +5241,8 @@ static HRESULT updateSurfaceDesc(struct wined3d_surface *surface, while (surface->pow2Height < pPresentationParameters->BackBufferHeight) surface->pow2Height <<= 1; } + if (!(surface->resource.usage & WINED3DUSAGE_DEPTHSTENCIL)) + surface->resource.format = wined3d_get_format(gl_info, pPresentationParameters->BackBufferFormat); surface->resource.multisample_type = pPresentationParameters->MultiSampleType; surface->resource.multisample_quality = pPresentationParameters->MultiSampleQuality; @@ -5498,10 +5500,6 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, && present_parameters->BackBufferCount != swapchain->presentParms.BackBufferCount) FIXME("Cannot change the back buffer count yet.\n"); - if (present_parameters->BackBufferFormat != WINED3DFMT_UNKNOWN - && present_parameters->BackBufferFormat != swapchain->presentParms.BackBufferFormat) - FIXME("Cannot change the back buffer format yet.\n"); - if (present_parameters->hDeviceWindow && present_parameters->hDeviceWindow != swapchain->presentParms.hDeviceWindow) FIXME("Cannot change the device window yet.\n"); @@ -5572,6 +5570,13 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, update_desc = TRUE; } + if (present_parameters->BackBufferFormat != WINED3DFMT_UNKNOWN + && present_parameters->BackBufferFormat != swapchain->presentParms.BackBufferFormat) + { + swapchain->presentParms.BackBufferFormat = present_parameters->BackBufferFormat; + update_desc = TRUE; + } + if (present_parameters->MultiSampleType != swapchain->presentParms.MultiSampleType || present_parameters->MultiSampleQuality != swapchain->presentParms.MultiSampleQuality) {

1 0

Henri Verbeet : wined3d: Don't apply fixups to converted surfaces.
by Alexandre Julliard Nov. 25, 2011

Nov. 25, 2011

Module: wine Branch: master Commit: 24775459c8892b8e92f42ac9a66946f50b0b1190 URL: http://source.winehq.org/git/wine.git/?a=commit;h=24775459c8892b8e92f42ac9a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 24 22:52:32 2011 +0100 wined3d: Don't apply fixups to converted surfaces. --- dlls/wined3d/arb_program_shader.c | 9 +++++++++ dlls/wined3d/surface.c | 3 ++- 2 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 451d34a..b2fa29c 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7137,6 +7137,15 @@ static HRESULT arbfp_blit_set(void *blit_priv, struct wined3d_context *context, GLenum textype = surface->texture_target; const struct wined3d_gl_info *gl_info = context->gl_info; + if (surface->flags & SFLAG_CONVERTED) + { + ENTER_GL(); + glEnable(textype); + checkGLcall("glEnable(textype)"); + LEAVE_GL(); + return WINED3D_OK; + } + if (!is_complex_fixup(surface->resource.format->color_fixup)) { TRACE("Fixup:\n"); diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 865f83e..4c9cc84 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -6229,7 +6229,8 @@ static HRESULT ffp_blit_set(void *blit_priv, struct wined3d_context *context, co /* When EXT_PALETTED_TEXTURE is around, palette conversion is done by the GPU * else the surface is converted in software at upload time in LoadLocation. */ - if(fixup == COMPLEX_FIXUP_P8 && context->gl_info->supported[EXT_PALETTED_TEXTURE]) + if (!(surface->flags & SFLAG_CONVERTED) && fixup == COMPLEX_FIXUP_P8 + && context->gl_info->supported[EXT_PALETTED_TEXTURE]) ffp_blit_p8_upload_palette(surface, context->gl_info); ENTER_GL();

1 0

Henri Verbeet : wined3d: Use the correct backbuffer format in wined3d_device_reset().
by Alexandre Julliard Nov. 25, 2011

Nov. 25, 2011

Module: wine Branch: master Commit: f51bf61d2fa3fc1ba6a9f9da9a365a9c7415b850 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f51bf61d2fa3fc1ba6a9f9da9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 24 22:52:33 2011 +0100 wined3d: Use the correct backbuffer format in wined3d_device_reset(). --- dlls/wined3d/device.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 3737abb..d165806 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5556,7 +5556,7 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, mode.width = present_parameters->BackBufferWidth; mode.height = present_parameters->BackBufferHeight; mode.refresh_rate = present_parameters->FullScreen_RefreshRateInHz; - mode.format_id = swapchain->presentParms.BackBufferFormat; + mode.format_id = present_parameters->BackBufferFormat; } /* Should Width == 800 && Height == 0 set 800x600? */

1 0