wine-commits December 2011

wine-commits@winehq.org

2 participants
810 discussions

Jacek Caban : jscript: Get rid of no longer needed expression eval entry.
by Alexandre Julliard 16 Dec '11

16 Dec '11

Module: wine Branch: master Commit: fecc2fcb5ef22e5b1f75010a3990a47f0169d53c URL: http://source.winehq.org/git/wine.git/?a=commit;h=fecc2fcb5ef22e5b1f75010a3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Dec 16 11:44:03 2011 +0100 jscript: Get rid of no longer needed expression eval entry. --- dlls/jscript/compile.c | 1 - dlls/jscript/engine.c | 15 +++++------ dlls/jscript/engine.h | 3 -- dlls/jscript/parser.y | 63 +----------------------------------------------- 4 files changed, 8 insertions(+), 74 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index daa1846..f2e2ead 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -829,7 +829,6 @@ static HRESULT compile_expression_noret(compiler_ctx_t *ctx, expression_t *expr, case EXPR_BXOR: return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_xor); default: - assert(expr->eval != compiled_expression_eval); return compile_interp_fallback(ctx, expr); } diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 210cdf7..424659f 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -56,7 +56,7 @@ static inline HRESULT stat_eval(script_ctx_t *ctx, statement_t *stat, return_typ static inline HRESULT expr_eval(script_ctx_t *ctx, expression_t *expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) { - return expr->eval(ctx, expr, flags, ei, ret); + return compiled_expression_eval(ctx, expr, flags, ei, ret); } static HRESULT stack_push(exec_ctx_t *ctx, VARIANT *v) @@ -3168,12 +3168,11 @@ HRESULT compiled_expression_eval(script_ctx_t *ctx, expression_t *expr, DWORD fl TRACE("\n"); - hres = compile_subscript(ctx->exec_ctx->parser, expr, !(flags & EXPR_NOVAL), &expr->instr_off); - if(FAILED(hres)) - return hres; - - if(expr->eval == compiled_expression_eval) - expr->eval = interp_expression_eval; + if(expr->instr_off == -1) { + hres = compile_subscript(ctx->exec_ctx->parser, expr, !(flags & EXPR_NOVAL), &expr->instr_off); + if(FAILED(hres)) + return hres; + } - return expr->eval(ctx, expr, flags, ei, ret); + return interp_expression_eval(ctx, expr, flags, ei, ret); } diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index 6c1acad..323e9e3 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -469,11 +469,8 @@ typedef enum { EXPR_LITERAL } expression_type_t; -typedef HRESULT (*expression_eval_t)(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*); - struct _expression_t { expression_type_t type; - expression_eval_t eval; unsigned instr_off; }; diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index ab5ebff..1524713 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -1303,73 +1303,12 @@ static expression_t *new_function_expression(parser_ctx_t *ctx, const WCHAR *ide return &ret->expr; } -static const expression_eval_t expression_eval_table[] = { - compiled_expression_eval, - compiled_expression_eval, - compiled_expression_eval, - compiled_expression_eval, - compiled_expression_eval, - compiled_expression_eval, - compiled_expression_eval, - compiled_expression_eval, - compiled_expression_eval, - compiled_expression_eval, - compiled_expression_eval, - compiled_expression_eval, - compiled_expression_eval, - compiled_expression_eval, - compiled_expression_eval, - compiled_expression_eval, - compiled_expression_eval, - compiled_expression_eval, - compiled_expression_eval, - compiled_expression_eval, - compiled_expression_eval, - compiled_expression_eval, - compiled_expression_eval, - compiled_expression_eval, - compiled_expression_eval, - compiled_expression_eval, - compiled_expression_eval, - compiled_expression_eval, - compiled_expression_eval, - compiled_expression_eval, - compiled_expression_eval, - compiled_expression_eval, - compiled_expression_eval, - compiled_expression_eval, - compiled_expression_eval, - compiled_expression_eval, - compiled_expression_eval, - compiled_expression_eval, - compiled_expression_eval, - compiled_expression_eval, - compiled_expression_eval, - compiled_expression_eval, - compiled_expression_eval, - compiled_expression_eval, - compiled_expression_eval, - compiled_expression_eval, - compiled_expression_eval, - compiled_expression_eval, - compiled_expression_eval, - compiled_expression_eval, - compiled_expression_eval, - compiled_expression_eval, - compiled_expression_eval, - compiled_expression_eval, - compiled_expression_eval, - compiled_expression_eval, - compiled_expression_eval, - compiled_expression_eval -}; - static void *new_expression(parser_ctx_t *ctx, expression_type_t type, size_t size) { expression_t *ret = parser_alloc(ctx, size ? size : sizeof(*ret)); ret->type = type; - ret->eval = expression_eval_table[type]; + ret->instr_off = -1; return ret; }

1 0

Jacek Caban : jscript: Use bytecode for object literal implementation.
by Alexandre Julliard 16 Dec '11

16 Dec '11

Module: wine Branch: master Commit: 5e6faaea12130b61641f0d2efd3c81fd68f7faa6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e6faaea12130b61641f0d2ef… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Dec 16 11:43:31 2011 +0100 jscript: Use bytecode for object literal implementation. --- dlls/jscript/compile.c | 49 ++++++++++++++++++++++++ dlls/jscript/dispex.c | 8 ++++ dlls/jscript/engine.c | 98 ++++++++++-------------------------------------- dlls/jscript/engine.h | 4 +- dlls/jscript/jscript.h | 5 ++ dlls/jscript/jsutils.c | 47 ++++++++++++++--------- dlls/jscript/parser.y | 2 +- 7 files changed, 113 insertions(+), 100 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5e6faaea12130b61641f0…

1 0

Jacek Caban : jscript: Use bytecode for function expression implementation.
by Alexandre Julliard 16 Dec '11

16 Dec '11

Module: wine Branch: master Commit: b268e41da6367ea6cb9b24b4450ee94ddb6222a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b268e41da6367ea6cb9b24b44… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Dec 16 11:42:57 2011 +0100 jscript: Use bytecode for function expression implementation. --- dlls/jscript/compile.c | 17 +++++++++++++++++ dlls/jscript/engine.c | 30 ++++++++++-------------------- dlls/jscript/engine.h | 4 +++- dlls/jscript/parser.y | 2 +- dlls/jscript/tests/lang.js | 6 ++++++ dlls/jscript/tests/run.c | 2 ++ 6 files changed, 39 insertions(+), 22 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index 9718c69..9331910 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -646,6 +646,21 @@ static HRESULT compile_array_literal(compiler_ctx_t *ctx, array_literal_expressi return push_instr_uint(ctx, OP_carray, elem_cnt); } +static HRESULT compile_function_expression(compiler_ctx_t *ctx, function_expression_t *expr) +{ + unsigned instr; + + /* FIXME: not exactly right */ + if(expr->identifier) + return push_instr_bstr(ctx, OP_ident, expr->identifier); + + instr = push_instr(ctx, OP_func); + if(instr == -1) + return E_OUTOFMEMORY; + + instr_ptr(ctx, instr)->arg1.func = expr; + return S_OK; +} static HRESULT compile_expression_noret(compiler_ctx_t *ctx, expression_t *expr, BOOL *no_ret) { @@ -702,6 +717,8 @@ static HRESULT compile_expression_noret(compiler_ctx_t *ctx, expression_t *expr, 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_FUNC: + return compile_function_expression(ctx, (function_expression_t*)expr); case EXPR_GREATER: return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_gt); case EXPR_GREATEREQ: diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 98e4158..23f457d 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -1420,32 +1420,22 @@ HRESULT try_statement_eval(script_ctx_t *ctx, statement_t *_stat, return_type_t } /* ECMA-262 3rd Edition 13 */ -HRESULT function_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) +static HRESULT interp_func(exec_ctx_t *ctx) { - function_expression_t *expr = (function_expression_t*)_expr; - VARIANT var; + function_expression_t *expr = ctx->parser->code->instrs[ctx->ip].arg1.func; + jsdisp_t *dispex; + VARIANT v; HRESULT hres; TRACE("\n"); - if(expr->identifier) { - hres = jsdisp_propget_name(ctx->exec_ctx->var_disp, expr->identifier, &var, ei, NULL/*FIXME*/); - if(FAILED(hres)) - return hres; - }else { - jsdisp_t *dispex; - - hres = create_source_function(ctx->exec_ctx->parser, expr->parameter_list, expr->source_elements, ctx->exec_ctx->scope_chain, - expr->src_str, expr->src_len, &dispex); - if(FAILED(hres)) - return hres; - - var_set_jsdisp(&var, dispex); - } + hres = create_source_function(ctx->parser, expr->parameter_list, expr->source_elements, ctx->scope_chain, + expr->src_str, expr->src_len, &dispex); + if(FAILED(hres)) + return hres; - ret->type = EXPRVAL_VARIANT; - ret->u.var = var; - return S_OK; + var_set_jsdisp(&v, dispex); + return stack_push(ctx, &v); } /* ECMA-262 3rd Edition 11.2.1 */ diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index 2cea63d..fcdc093 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -57,6 +57,7 @@ typedef struct _func_stack { X(double, 1, ARG_SBL, 0) \ X(eq, 1, 0,0) \ X(eq2, 1, 0,0) \ + X(func, 1, ARG_FUNC, 0) \ X(gt, 1, 0,0) \ X(gteq, 1, 0,0) \ X(ident, 1, ARG_BSTR, 0) \ @@ -117,6 +118,7 @@ typedef union { LONG lng; WCHAR *str; unsigned uint; + function_expression_t *func; /* FIXME */ } instr_arg_t; typedef enum { @@ -124,6 +126,7 @@ typedef enum { ARG_ADDR, ARG_BSTR, ARG_EXPR, + ARG_FUNC, ARG_INT, ARG_STR } instr_arg_type_t; @@ -565,7 +568,6 @@ typedef struct { prop_val_t *property_list; } property_value_expression_t; -HRESULT function_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT property_value_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT compiled_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 c791e9c..41481ab 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -1357,7 +1357,7 @@ static const expression_eval_t expression_eval_table[] = { compiled_expression_eval, compiled_expression_eval, compiled_expression_eval, - function_expression_eval, + compiled_expression_eval, compiled_expression_eval, compiled_expression_eval, property_value_expression_eval, diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index 165e70e..13c90fa 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -1110,6 +1110,12 @@ ok(newValue === 1, "newValue = " + newValue); obj = {undefined: 3}; +ok(typeof(name_override_func) === "function", "typeof(name_override_func) = " + typeof(name_override_func)); +name_override_func = 3; +ok(name_override_func === 3, "name_override_func = " + name_override_func); +function name_override_func() {}; +ok(name_override_func === 3, "name_override_func = " + name_override_func); + /* Keep this test in the end of file */ undefined = 6; ok(undefined === 6, "undefined = " + undefined); diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c index 890809c..5626bd8 100644 --- a/dlls/jscript/tests/run.c +++ b/dlls/jscript/tests/run.c @@ -1487,6 +1487,8 @@ static void run_tests(void) CHECK_CALLED(global_propdelete_d); CHECK_CALLED(DeleteMemberByDispID); + parse_script_a("(function reportSuccess() {})()"); + parse_script_a("ok(typeof(test) === 'object', \"typeof(test) != 'object'\");"); parse_script_a("function reportSuccess() {}; reportSuccess();");

1 0

Nikolay Sivov : msxml3: Remove redundant type specifiers.
by Alexandre Julliard 16 Dec '11

16 Dec '11

Module: wine Branch: master Commit: f999f4ae69dc4788723ca803e558b8e2865aaa2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f999f4ae69dc4788723ca803e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Dec 16 14:33:32 2011 +0300 msxml3: Remove redundant type specifiers. --- dlls/msxml3/saxreader.c | 30 +++++++++++++++--------------- 1 files changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index 6765aef..924a979 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -49,7 +49,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(msxml); #ifdef HAVE_LIBXML2 -enum ReaderFeatures +typedef enum { ExhaustiveErrors = 1 << 1, ExternalGeneralEntities = 1 << 2, @@ -66,7 +66,7 @@ enum ReaderFeatures UseInlineSchema = 1 << 13, UseSchemaLocation = 1 << 14, LexicalHandlerParEntities = 1 << 15 -}; +} saxreader_features; struct bstrpool { @@ -75,28 +75,28 @@ struct bstrpool unsigned int len; }; -typedef struct _saxreader +typedef struct { DispatchEx dispex; IVBSAXXMLReader IVBSAXXMLReader_iface; ISAXXMLReader ISAXXMLReader_iface; LONG ref; - struct ISAXContentHandler *contentHandler; - struct IVBSAXContentHandler *vbcontentHandler; - struct ISAXErrorHandler *errorHandler; - struct IVBSAXErrorHandler *vberrorHandler; - struct ISAXLexicalHandler *lexicalHandler; - struct IVBSAXLexicalHandler *vblexicalHandler; - struct ISAXDeclHandler *declHandler; - struct IVBSAXDeclHandler *vbdeclHandler; + ISAXContentHandler *contentHandler; + IVBSAXContentHandler *vbcontentHandler; + ISAXErrorHandler *errorHandler; + IVBSAXErrorHandler *vberrorHandler; + ISAXLexicalHandler *lexicalHandler; + IVBSAXLexicalHandler *vblexicalHandler; + ISAXDeclHandler *declHandler; + IVBSAXDeclHandler *vbdeclHandler; xmlSAXHandler sax; BOOL isParsing; struct bstrpool pool; - enum ReaderFeatures features; + saxreader_features features; MSXML_VERSION version; } saxreader; -typedef struct _saxlocator +typedef struct { IVBSAXLocator IVBSAXLocator_iface; ISAXLocator ISAXLocator_iface; @@ -231,7 +231,7 @@ static const WCHAR FeatureNamespacesW[] = { '/','n','a','m','e','s','p','a','c','e','s',0 }; -static inline HRESULT set_feature_value(saxreader *reader, enum ReaderFeatures feature, VARIANT_BOOL value) +static inline HRESULT set_feature_value(saxreader *reader, saxreader_features feature, VARIANT_BOOL value) { if (value == VARIANT_TRUE) reader->features |= feature; @@ -241,7 +241,7 @@ static inline HRESULT set_feature_value(saxreader *reader, enum ReaderFeatures f return S_OK; } -static inline HRESULT get_feature_value(const saxreader *reader, enum ReaderFeatures feature, VARIANT_BOOL *value) +static inline HRESULT get_feature_value(const saxreader *reader, saxreader_features feature, VARIANT_BOOL *value) { *value = reader->features & feature ? VARIANT_TRUE : VARIANT_FALSE; return S_OK;

1 0

Nikolay Sivov : msxml3: Don't use libxml2 encoding helpers.
by Alexandre Julliard 16 Dec '11

16 Dec '11

Module: wine Branch: master Commit: 35c7c694294d5461b84e18b17b65a99068050e8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=35c7c694294d5461b84e18b17… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Dec 16 02:36:53 2011 +0300 msxml3: Don't use libxml2 encoding helpers. --- dlls/msxml3/mxwriter.c | 143 +++++++++++++++++------------------------ dlls/msxml3/tests/saxreader.c | 59 ++++++++++++++++- 2 files changed, 115 insertions(+), 87 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=35c7c694294d5461b84e1…

1 0

Piotr Caban : msvcp90: Added ctype<unsigned short> class stub.
by Alexandre Julliard 16 Dec '11

16 Dec '11

Module: wine Branch: master Commit: d481bf61dc791d7ee3de610fc23c45fdeb0a8cf5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d481bf61dc791d7ee3de610fc… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Dec 16 11:32:33 2011 +0100 msvcp90: Added ctype<unsigned short> class stub. --- dlls/msvcp90/locale.c | 177 +++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp90/msvcp90.spec | 156 ++++++++++++++++++++-------------------- 2 files changed, 255 insertions(+), 78 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d481bf61dc791d7ee3de6…

1 0

Piotr Caban : msvcp90: Added ctype<wchar_t> class stub.
by Alexandre Julliard 16 Dec '11

16 Dec '11

Module: wine Branch: master Commit: 04266052fe18c60f6368d573d4592a95727969a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=04266052fe18c60f6368d573d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Dec 16 11:32:18 2011 +0100 msvcp90: Added ctype<wchar_t> class stub. --- dlls/msvcp90/locale.c | 435 +++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp90/msvcp90.spec | 152 ++++++++-------- 2 files changed, 511 insertions(+), 76 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=04266052fe18c60f6368d…

1 0

Piotr Caban : msvcp90: Added ctype<char> class stub.
by Alexandre Julliard 16 Dec '11

16 Dec '11

Module: wine Branch: master Commit: ee13a2f8af3a55fdeea085faa0d82bc100d15aa7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee13a2f8af3a55fdeea085faa… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Dec 16 11:32:03 2011 +0100 msvcp90: Added ctype<char> class stub. --- dlls/msvcp90/locale.c | 396 +++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp90/msvcp90.spec | 144 ++++++++-------- 2 files changed, 468 insertions(+), 72 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ee13a2f8af3a55fdeea08…

1 0

Piotr Caban : msvcp90: Added ctype_base class implementation.
by Alexandre Julliard 16 Dec '11

16 Dec '11

Module: wine Branch: master Commit: 3cc08032fc36162d3faca6a8c11bc5df4769a770 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3cc08032fc36162d3faca6a8c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Dec 16 11:31:45 2011 +0100 msvcp90: Added ctype_base class implementation. --- dlls/msvcp90/locale.c | 101 +++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp90/msvcp90.spec | 16 ++++---- 2 files changed, 109 insertions(+), 8 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 03b325d..a3c54dc 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -86,6 +86,10 @@ typedef struct { _Collvec coll; } collate; +typedef struct { + locale_facet facet; +} ctype_base; + /* ?_Id_cnt@id@locale@std@@0HA */ int locale_id__Id_cnt = 0; @@ -628,6 +632,65 @@ basic_string_wchar __thiscall collate_wchar_transform(const collate *this, return ret; } +/* ??_7ctype_base@std@@6B@ */ +extern const vtable_ptr MSVCP_ctype_base_vtable; + +/* ??0ctype_base@std@@QAE@I@Z */ +/* ??0ctype_base@std@@QEAA@_K@Z */ +DEFINE_THISCALL_WRAPPER(ctype_base_ctor_refs, 8) +ctype_base* __thiscall ctype_base_ctor_refs(ctype_base *this, MSVCP_size_t refs) +{ + TRACE("(%p %lu)\n", this, refs); + locale_facet_ctor_refs(&this->facet, refs); + this->facet.vtable = &MSVCP_ctype_base_vtable; + return this; +} + +/* ??_Fctype_base@std@@QAEXXZ */ +/* ??_Fctype_base@std@@QEAAXXZ */ +DEFINE_THISCALL_WRAPPER(ctype_base_ctor, 4) +ctype_base* __thiscall ctype_base_ctor(ctype_base *this) +{ + TRACE("(%p)\n", this); + locale_facet_ctor_refs(&this->facet, 0); + this->facet.vtable = &MSVCP_ctype_base_vtable; + return this; +} + +/* ??1ctype_base@std@@UAE@XZ */ +/* ??1ctype_base@std@@UEAA@XZ */ +DEFINE_THISCALL_WRAPPER(ctype_base_dtor, 4) +void __thiscall ctype_base_dtor(ctype_base *this) +{ + TRACE("(%p)\n", this); +} + +DEFINE_THISCALL_WRAPPER(MSVCP_ctype_base_vector_dtor, 8) +ctype_base* __thiscall MSVCP_ctype_base_vector_dtor(ctype_base *this, unsigned int flags) +{ + TRACE("(%p %x)\n", this, flags); + if(flags & 2) { + /* we have an array, with the number of elements stored before the first object */ + int i, *ptr = (int *)this-1; + + for(i=*ptr-1; i>=0; i--) + ctype_base_dtor(this+i); + MSVCRT_operator_delete(ptr); + } else { + ctype_base_dtor(this); + if(flags & 1) + MSVCRT_operator_delete(this); + } + + return this; +} + +/* ?_Xran@ctype_base@std@@KAXXZ */ +void __cdecl ctype_base__Xran(void) +{ + throw_exception(EXCEPTION_OUT_OF_RANGE, "out of range in ctype<T>"); +} + /* ??0_Locimp@locale@std@@AAE@_N@Z */ /* ??0_Locimp@locale@std@@AEAA@_N@Z */ DEFINE_THISCALL_WRAPPER(locale__Locimp_ctor_transparent, 8) @@ -1525,6 +1588,43 @@ const rtti_object_locator collate_short_rtti = { &collate_short_hierarchy }; +static const type_info ctype_base_type_info = { + &MSVCP_ctype_base_vtable, + NULL, + ".?AUctype_base@std@@" +}; + +static const rtti_base_descriptor ctype_base_rtti_base_descriptor = { + &ctype_base_type_info, + 1, + { 0, -1, 0}, + 64 +}; + +static const rtti_base_array ctype_base_rtti_base_array = { + { + &ctype_base_rtti_base_descriptor, + &locale_facet_rtti_base_descriptor, + NULL, + NULL + } +}; + +static const rtti_object_hierarchy ctype_base_hierarchy = { + 0, + 0, + 2, + &ctype_base_rtti_base_array +}; + +const rtti_object_locator ctype_base_rtti = { + 0, + 0, + 0, + &ctype_base_type_info, + &ctype_base_hierarchy +}; + #ifndef __GNUC__ void __asm_dummy_vtables(void) { #endif @@ -1540,6 +1640,7 @@ void __asm_dummy_vtables(void) { VTABLE_ADD_FUNC(collate_wchar_do_compare) VTABLE_ADD_FUNC(collate_wchar_do_transform) VTABLE_ADD_FUNC(collate_wchar_do_hash)); + __ASM_VTABLE(ctype_base, ""); #ifndef __GNUC__ } #endif diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index 0608d9a..64d2e94 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -1094,8 +1094,8 @@ @ stub -arch=win64 ??0_Winit@std@@QEAA@XZ @ stub -arch=win32 ??0codecvt_base@std@@QAE@I@Z @ stub -arch=win64 ??0codecvt_base@std@@QEAA@_K@Z -@ stub -arch=win32 ??0ctype_base@std@@QAE@I@Z -@ stub -arch=win64 ??0ctype_base@std@@QEAA@_K@Z +@ thiscall -arch=win32 ??0ctype_base@std@@QAE@I@Z(ptr long) ctype_base_ctor_refs +@ cdecl -arch=win64 ??0ctype_base@std@@QEAA@_K@Z(ptr long) ctype_base_ctor_refs @ thiscall -arch=win32 ??0facet@locale@std@@IAE@I@Z(ptr long) locale_facet_ctor_refs @ cdecl -arch=win64 ??0facet@locale@std@@IEAA@_K@Z(ptr long) locale_facet_ctor_refs @ thiscall -arch=win32 ??0id@locale@std@@QAE@I@Z(ptr long) locale_id_ctor_id @@ -1328,8 +1328,8 @@ @ stub -arch=win64 ??1_Winit@std@@QEAA@XZ @ stub -arch=win32 ??1codecvt_base@std@@UAE@XZ @ stub -arch=win64 ??1codecvt_base@std@@UEAA@XZ -@ stub -arch=win32 ??1ctype_base@std@@UAE@XZ -@ stub -arch=win64 ??1ctype_base@std@@UEAA@XZ +@ thiscall -arch=win32 ??1ctype_base@std@@UAE@XZ(ptr) ctype_base_dtor +@ cdecl -arch=win64 ??1ctype_base@std@@UEAA@XZ(ptr) ctype_base_dtor @ thiscall -arch=win32 ??1facet@locale@std@@UAE@XZ(ptr) locale_facet_dtor @ cdecl -arch=win64 ??1facet@locale@std@@UEAA@XZ(ptr) locale_facet_dtor @ thiscall -arch=win32 ??1ios_base@std@@UAE@XZ(ptr) ios_base_dtor @@ -1859,7 +1859,7 @@ # extern ??_7?$time_put@_WV?$ostreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@6B@ @ extern ??_7_Locimp@locale@std@@6B@ MSVCP_locale__Locimp_vtable # extern ??_7codecvt_base@std@@6B@ -# extern ??_7ctype_base@std@@6B@ +@ extern ??_7ctype_base@std@@6B@ MSVCP_ctype_base_vtable @ extern ??_7ios_base@std@@6B@ MSVCP_ios_base_vtable # extern ??_7messages_base@std@@6B@ # extern ??_7money_base@std@@6B@ @@ -2083,8 +2083,8 @@ @ cdecl -arch=win64 ??_F_Timevec@std@@QEAAXXZ(ptr) _Timevec_ctor @ stub -arch=win32 ??_Fcodecvt_base@std@@QAEXXZ @ stub -arch=win64 ??_Fcodecvt_base@std@@QEAAXXZ -@ stub -arch=win32 ??_Fctype_base@std@@QAEXXZ -@ stub -arch=win64 ??_Fctype_base@std@@QEAAXXZ +@ thiscall -arch=win32 ??_Fctype_base@std@@QAEXXZ(ptr) ctype_base_ctor +@ cdecl -arch=win64 ??_Fctype_base@std@@QEAAXXZ(ptr) ctype_base_ctor @ thiscall -arch=win32 ??_Ffacet@locale@std@@QAEXXZ(ptr) locale_facet_ctor @ cdecl -arch=win64 ??_Ffacet@locale@std@@QEAAXXZ(ptr) locale_facet_ctor @ thiscall -arch=win32 ??_Fid@locale@std@@QAEXXZ(ptr) locale_id_ctor @@ -2882,7 +2882,7 @@ @ stub ?_Xmem@tr1@std@@YAXXZ @ stub ?_Xoutrange@tr1@std@@YAXXZ @ cdecl ?_Xran@_String_base@std@@SAXXZ() MSVCP__String_base_Xran -@ stub ?_Xran@ctype_base@std@@KAXXZ +@ cdecl ?_Xran@ctype_base@std@@KAXXZ() ctype_base__Xran @ thiscall -arch=win32 ?_Xsgetn_s@?$basic_streambuf@DU?$char_traits@D@std@@@std@@MAEHPADIH@Z(ptr ptr long long) basic_streambuf_char__Xsgetn_s @ cdecl -arch=win64 ?_Xsgetn_s@?$basic_streambuf@DU?$char_traits@D@std@@@std@@MEAA_JPEAD_K_J@Z(ptr ptr long long) basic_streambuf_char__Xsgetn_s @ stub -arch=win32 ?_Xsgetn_s@?$basic_streambuf@GU?$char_traits@G@std@@@std@@MAEHPAGIH@Z

1 0

Alexandre Julliard : gdi32/tests: Add tests for device capabilities on memory DCs.
by Alexandre Julliard 16 Dec '11

16 Dec '11

Module: wine Branch: master Commit: 19fe3f0c77b69423e5c4ea3b1d5d71f31b2364d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=19fe3f0c77b69423e5c4ea3b1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 16 12:09:02 2011 +0100 gdi32/tests: Add tests for device capabilities on memory DCs. --- dlls/gdi32/tests/dc.c | 93 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 92 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/tests/dc.c b/dlls/gdi32/tests/dc.c index 26b7c61..8c92b5e 100644 --- a/dlls/gdi32/tests/dc.c +++ b/dlls/gdi32/tests/dc.c @@ -263,13 +263,98 @@ static void test_GdiConvertToDevmodeW(void) HeapFree(GetProcessHeap(), 0, dmW); } +static void test_device_caps( HDC hdc, HDC ref_dc, const char *descr ) +{ + static const int caps[] = + { + DRIVERVERSION, + TECHNOLOGY, + HORZSIZE, + VERTSIZE, + HORZRES, + VERTRES, + BITSPIXEL, + PLANES, + NUMBRUSHES, + NUMPENS, + NUMMARKERS, + NUMFONTS, + NUMCOLORS, + PDEVICESIZE, + CURVECAPS, + LINECAPS, + POLYGONALCAPS, + TEXTCAPS, + CLIPCAPS, + RASTERCAPS, + ASPECTX, + ASPECTY, + ASPECTXY, + LOGPIXELSX, + LOGPIXELSY, + SIZEPALETTE, + NUMRESERVED, + COLORRES, + PHYSICALWIDTH, + PHYSICALHEIGHT, + PHYSICALOFFSETX, + PHYSICALOFFSETY, + SCALINGFACTORX, + SCALINGFACTORY, + VREFRESH, + DESKTOPVERTRES, + DESKTOPHORZRES, + BLTALIGNMENT, + SHADEBLENDCAPS, + COLORMGMTCAPS + }; + unsigned int i; + + if (GetObjectType( hdc ) == OBJ_METADC) + for (i = 0; i < sizeof(caps)/sizeof(caps[0]); i++) + ok( GetDeviceCaps( hdc, caps[i] ) == (caps[i] == TECHNOLOGY ? DT_METAFILE : 0), + "wrong caps on %s for %u: %u\n", descr, caps[i], + GetDeviceCaps( hdc, caps[i] ) ); + else + for (i = 0; i < sizeof(caps)/sizeof(caps[0]); i++) + ok( GetDeviceCaps( hdc, caps[i] ) == GetDeviceCaps( ref_dc, caps[i] ), + "mismatched caps on %s for %u: %u/%u\n", descr, caps[i], + GetDeviceCaps( hdc, caps[i] ), GetDeviceCaps( ref_dc, caps[i] ) ); + + if (GetObjectType( hdc ) == OBJ_MEMDC) + { + char buffer[sizeof(BITMAPINFOHEADER) + 256 * sizeof(RGBQUAD)]; + BITMAPINFO *info = (BITMAPINFO *)buffer; + HBITMAP dib, old; + + memset( buffer, 0, sizeof(buffer) ); + info->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + info->bmiHeader.biWidth = 16; + info->bmiHeader.biHeight = 16; + info->bmiHeader.biPlanes = 1; + info->bmiHeader.biBitCount = 8; + info->bmiHeader.biCompression = BI_RGB; + dib = CreateDIBSection( ref_dc, info, DIB_RGB_COLORS, NULL, NULL, 0 ); + old = SelectObject( hdc, dib ); + + for (i = 0; i < sizeof(caps)/sizeof(caps[0]); i++) + ok( GetDeviceCaps( hdc, caps[i] ) == GetDeviceCaps( ref_dc, caps[i] ), + "mismatched caps on %s and DIB for %u: %u/%u\n", descr, caps[i], + GetDeviceCaps( hdc, caps[i] ), GetDeviceCaps( ref_dc, caps[i] ) ); + + SelectObject( hdc, old ); + DeleteObject( dib ); + } +} + static void test_CreateCompatibleDC(void) { BOOL bRet; - HDC hdc, hNewDC, hdcMetafile; + HDC hdc, hNewDC, hdcMetafile, screen_dc; HBITMAP bitmap; INT caps; + screen_dc = GetDC( 0 ); bitmap = CreateBitmap( 10, 10, 1, 1, NULL ); /* Create a DC compatible with the screen */ @@ -279,6 +364,8 @@ static void test_CreateCompatibleDC(void) caps = GetDeviceCaps( hdc, TECHNOLOGY ); ok( caps == DT_RASDISPLAY, "wrong caps %u\n", caps ); + test_device_caps( hdc, screen_dc, "display dc" ); + /* Delete this DC, this should succeed */ bRet = DeleteDC(hdc); ok(bRet == TRUE, "DeleteDC returned %u\n", bRet); @@ -307,9 +394,11 @@ static void test_CreateCompatibleDC(void) ok(hNewDC == NULL, "CreateCompatibleDC succeeded\n"); caps = GetDeviceCaps( hdcMetafile, TECHNOLOGY ); ok( caps == DT_METAFILE, "wrong caps %u\n", caps ); + test_device_caps( hdcMetafile, screen_dc, "metafile dc" ); DeleteMetaFile( CloseMetaFile( hdcMetafile )); DeleteObject( bitmap ); + ReleaseDC( 0, screen_dc ); } static void test_DC_bitmap(void) @@ -856,6 +945,8 @@ static void test_printer_dc(void) ret = GetDeviceCaps( display_memdc, TECHNOLOGY ); ok( ret == DT_RASDISPLAY, "wrong type %u\n", ret ); + test_device_caps( memdc, hdc, "printer dc" ); + bmp = CreateBitmap( 100, 100, 1, GetDeviceCaps( hdc, BITSPIXEL ), NULL ); orig = SelectObject( memdc, bmp ); ok( orig != NULL, "SelectObject failed\n" );

1 0

← Newer
1
...
34
35
36
37
38
39
40
...
81
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 December 2011