October 2009 - Wine-commits

Alexandre Julliard : winex11: The xrender tile picture must be used only inside the critical section.
by Alexandre Julliard 14 Oct '09

14 Oct '09

Module: wine Branch: master Commit: af683e711c4441d7e95dd0bf58271e3fc6d94caf URL: http://source.winehq.org/git/wine.git/?a=commit;h=af683e711c4441d7e95dd0bf5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 14 14:24:17 2009 +0200 winex11: The xrender tile picture must be used only inside the critical section. --- dlls/winex11.drv/xrender.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index d83c53d..aac0411 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -2170,6 +2170,7 @@ BOOL X11DRV_XRender_GetSrcAreaStretch(X11DRV_PDEVICE *physDevSrc, X11DRV_PDEVICE mask_pict = get_xrender_picture_source(physDevSrc); /* Use backgroundPixel as the foreground color */ + EnterCriticalSection( &xrender_cs ); src_pict = get_tile_pict(dst_format, physDevDst->backgroundPixel); /* Create a destination picture and fill it with textPixel color as the background color */ @@ -2181,6 +2182,7 @@ BOOL X11DRV_XRender_GetSrcAreaStretch(X11DRV_PDEVICE *physDevSrc, X11DRV_PDEVICE if(dst_pict) pXRenderFreePicture(gdi_display, dst_pict); wine_tsx11_unlock(); + LeaveCriticalSection( &xrender_cs ); } else /* color -> color but with different depths */ {

1 0

Paul Vriens : kernel32/tests: Fix some test failures on Win9x/WinMe.
by Alexandre Julliard 14 Oct '09

14 Oct '09

Module: wine Branch: master Commit: d11df5126d5fb0fd641da2d43d71ed4ae627a946 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d11df5126d5fb0fd641da2d43… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Oct 14 13:34:06 2009 +0200 kernel32/tests: Fix some test failures on Win9x/WinMe. --- dlls/kernel32/tests/console.c | 23 +++++++++++++++++++++-- 1 files changed, 21 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index c3fa57c..33eab26 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -270,6 +270,7 @@ static void testWriteNotWrappedProcessed(HANDLE hCon, COORD sbSize) const int mylen = strlen(mytest); const int mylen2 = strchr(mytest, '\n') - mytest; int p; + WORD attr; ok(GetConsoleMode(hCon, &mode) && SetConsoleMode(hCon, (mode | ENABLE_PROCESSED_OUTPUT) & ~ENABLE_WRAP_AT_EOL_OUTPUT), "clearing wrap at EOL & setting processed output\n"); @@ -284,6 +285,15 @@ static void testWriteNotWrappedProcessed(HANDLE hCon, COORD sbSize) { okCHAR(hCon, c, mytest[c.X - sbSize.X + 5], TEST_ATTRIB); } + + ReadConsoleOutputAttribute(hCon, &attr, 1, c, &len); + /* Win9x and WinMe change the attribs for '\n' up to 'f' */ + if (attr == TEST_ATTRIB) + { + win_skip("Win9x/WinMe don't respect ~ENABLE_WRAP_AT_EOL_OUTPUT\n"); + return; + } + okCHAR(hCon, c, ' ', DEFAULT_ATTRIB); c.X = 0; c.Y++; @@ -381,6 +391,7 @@ static void testWriteWrappedProcessed(HANDLE hCon, COORD sbSize) const char* mytest = "abcd\nf\tg"; const int mylen = strlen(mytest); int p; + WORD attr; ok(GetConsoleMode(hCon, &mode) && SetConsoleMode(hCon, mode | (ENABLE_WRAP_AT_EOL_OUTPUT|ENABLE_PROCESSED_OUTPUT)), "setting wrap at EOL & processed output\n"); @@ -396,7 +407,11 @@ static void testWriteWrappedProcessed(HANDLE hCon, COORD sbSize) okCHAR(hCon, c, mytest[p], TEST_ATTRIB); } c.X = sbSize.X - 9 + p; - okCHAR(hCon, c, ' ', DEFAULT_ATTRIB); + ReadConsoleOutputAttribute(hCon, &attr, 1, c, &len); + if (attr == TEST_ATTRIB) + win_skip("Win9x/WinMe changes attribs for '\\n' up to 'f'\n"); + else + okCHAR(hCon, c, ' ', DEFAULT_ATTRIB); c.X = 0; c.Y++; okCHAR(hCon, c, mytest[5], TEST_ATTRIB); for (c.X = 1; c.X < 8; c.X++) @@ -419,7 +434,11 @@ static void testWriteWrappedProcessed(HANDLE hCon, COORD sbSize) c.X = 0; c.Y++; okCHAR(hCon, c, mytest[3], TEST_ATTRIB); c.X++; - okCHAR(hCon, c, ' ', DEFAULT_ATTRIB); + ReadConsoleOutputAttribute(hCon, &attr, 1, c, &len); + if (attr == TEST_ATTRIB) + win_skip("Win9x/WinMe changes attribs for '\\n' up to 'f'\n"); + else + okCHAR(hCon, c, ' ', DEFAULT_ATTRIB); c.X = 0; c.Y++; okCHAR(hCon, c, mytest[5], TEST_ATTRIB);

1 0

Paul Chitescu : netapi32: Add stub for NetFileEnum().
by Alexandre Julliard 14 Oct '09

14 Oct '09

Module: wine Branch: master Commit: b462e34cf80a22b4f140f108e2241cdde9efa6a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b462e34cf80a22b4f140f108e… Author: Paul Chitescu <paulc(a)voip.null.ro> Date: Wed Oct 14 15:21:14 2009 +0300 netapi32: Add stub for NetFileEnum(). --- dlls/netapi32/netapi32.spec | 2 +- dlls/netapi32/share.c | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletions(-) diff --git a/dlls/netapi32/netapi32.spec b/dlls/netapi32/netapi32.spec index 900d475..eb3b841 100644 --- a/dlls/netapi32/netapi32.spec +++ b/dlls/netapi32/netapi32.spec @@ -88,7 +88,7 @@ @ stub NetErrorLogRead @ stub NetErrorLogWrite @ stub NetFileClose -@ stub NetFileEnum +@ stdcall NetFileEnum(wstr wstr wstr long ptr long ptr ptr ptr) @ stub NetFileGetInfo @ stub NetGetAnyDCName @ stdcall NetGetDCName(wstr wstr ptr) diff --git a/dlls/netapi32/share.c b/dlls/netapi32/share.c index f19f732..344bf0d 100644 --- a/dlls/netapi32/share.c +++ b/dlls/netapi32/share.c @@ -113,3 +113,16 @@ NET_API_STATUS WINAPI NetShareAdd(LMSTR servername, FIXME("Stub (%s %d %p %p)\n", debugstr_w(servername), level, buf, parm_err); return ERROR_NOT_SUPPORTED; } + +/************************************************************ + * NetFileEnum (NETAPI32.@) + */ +NET_API_STATUS WINAPI NetFileEnum( + LPWSTR ServerName, LPWSTR BasePath, LPWSTR UserName, + DWORD Level, LPBYTE* BufPtr, DWORD PrefMaxLen, + LPDWORD EntriesRead, LPDWORD TotalEntries, PDWORD_PTR ResumeHandle) +{ + FIXME("(%s, %s, %s, %u): stub\n", debugstr_w(ServerName), debugstr_w(BasePath), + debugstr_w(UserName), Level); + return ERROR_NOT_SUPPORTED; +}

1 0

Jacek Caban : jscript: Don't use VARTYPE as is in literal_t.
by Alexandre Julliard 14 Oct '09

14 Oct '09

Module: wine Branch: master Commit: fa3e6917b49075ac7662a3a8517357497e6d278f URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa3e6917b49075ac7662a3a85… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 14 14:41:50 2009 +0200 jscript: Don't use VARTYPE as is in literal_t. --- dlls/jscript/engine.c | 30 ++++++++++++++++-------------- dlls/jscript/engine.h | 12 +++++++++++- dlls/jscript/lex.c | 6 +++--- dlls/jscript/parser.y | 8 ++++---- 4 files changed, 34 insertions(+), 22 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index cecfd62..fa14fd9 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -349,31 +349,33 @@ static HRESULT equal2_values(VARIANT *lval, VARIANT *rval, BOOL *ret) static HRESULT literal_to_var(literal_t *literal, VARIANT *v) { - V_VT(v) = literal->vt; - - switch(V_VT(v)) { - case VT_EMPTY: - case VT_NULL: + switch(literal->type) { + case LT_UNDEFINED: + V_VT(v) = VT_EMPTY; break; - case VT_I4: + case LT_NULL: + V_VT(v) = VT_NULL; + break; + case LT_INT: + V_VT(v) = VT_I4; V_I4(v) = literal->u.lval; break; - case VT_R8: + case LT_DOUBLE: + V_VT(v) = VT_R8; V_R8(v) = literal->u.dval; break; - case VT_BSTR: + case LT_STRING: + V_VT(v) = VT_BSTR; V_BSTR(v) = SysAllocString(literal->u.wstr); break; - case VT_BOOL: + case LT_BOOL: + V_VT(v) = VT_BOOL; V_BOOL(v) = literal->u.bval; break; - case VT_DISPATCH: + case LT_DISPATCH: + V_VT(v) = VT_DISPATCH; IDispatch_AddRef(literal->u.disp); V_DISPATCH(v) = literal->u.disp; - break; - default: - ERR("wrong type %d\n", V_VT(v)); - return E_NOTIMPL; } return S_OK; diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index 386f38b..e1952a9 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -126,8 +126,18 @@ typedef struct _parameter_t parameter_t; HRESULT create_source_function(parser_ctx_t*,parameter_t*,source_elements_t*,scope_chain_t*, const WCHAR*,DWORD,DispatchEx**); +typedef enum { + LT_INT, + LT_DOUBLE, + LT_STRING, + LT_BOOL, + LT_DISPATCH, + LT_UNDEFINED, + LT_NULL +}literal_type_t; + typedef struct { - VARTYPE vt; + literal_type_t type; union { LONG lval; double dval; diff --git a/dlls/jscript/lex.c b/dlls/jscript/lex.c index 43089d3..cd53bd9 100644 --- a/dlls/jscript/lex.c +++ b/dlls/jscript/lex.c @@ -369,7 +369,7 @@ static literal_t *alloc_int_literal(parser_ctx_t *ctx, LONG l) { literal_t *ret = parser_alloc(ctx, sizeof(literal_t)); - ret->vt = VT_I4; + ret->type = LT_INT; ret->u.lval = l; return ret; @@ -447,7 +447,7 @@ static int parse_double_literal(parser_ctx_t *ctx, LONG int_part, literal_t **li } *literal = parser_alloc(ctx, sizeof(literal_t)); - (*literal)->vt = VT_R8; + (*literal)->type = LT_DOUBLE; (*literal)->u.dval = (double)d*pow(10, exp); return tNumericLiteral; @@ -801,7 +801,7 @@ literal_t *parse_regexp(parser_ctx_t *ctx) add_object_literal(ctx, regexp); ret = parser_alloc(ctx, sizeof(literal_t)); - ret->vt = VT_DISPATCH; + ret->type = LT_DISPATCH; ret->u.disp = (IDispatch*)_IDispatchEx_(regexp); return ret; } diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index d4b4908..ee3d100 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -841,7 +841,7 @@ static literal_t *new_string_literal(parser_ctx_t *ctx, const WCHAR *str) { literal_t *ret = parser_alloc(ctx, sizeof(literal_t)); - ret->vt = VT_BSTR; + ret->type = LT_STRING; ret->u.wstr = str; return ret; @@ -851,7 +851,7 @@ static literal_t *new_null_literal(parser_ctx_t *ctx) { literal_t *ret = parser_alloc(ctx, sizeof(literal_t)); - ret->vt = VT_NULL; + ret->type = LT_NULL; return ret; } @@ -860,7 +860,7 @@ static literal_t *new_undefined_literal(parser_ctx_t *ctx) { literal_t *ret = parser_alloc(ctx, sizeof(literal_t)); - ret->vt = VT_EMPTY; + ret->type = LT_UNDEFINED; return ret; } @@ -869,7 +869,7 @@ static literal_t *new_boolean_literal(parser_ctx_t *ctx, VARIANT_BOOL bval) { literal_t *ret = parser_alloc(ctx, sizeof(literal_t)); - ret->vt = VT_BOOL; + ret->type = LT_BOOL; ret->u.bval = bval; return ret;

1 0

Jacek Caban : jscript: Separate flags parsing from regexp creating.
by Alexandre Julliard 14 Oct '09

14 Oct '09

Module: wine Branch: master Commit: 98b5a1c6e81601435838d676d91abc7a7b5c74f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=98b5a1c6e81601435838d676d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 14 14:42:30 2009 +0200 jscript: Separate flags parsing from regexp creating. --- dlls/jscript/jscript.h | 3 +- dlls/jscript/lex.c | 12 +++++++--- dlls/jscript/regexp.c | 51 +++++++++++++++++++++++++---------------------- dlls/jscript/string.c | 2 +- 4 files changed, 38 insertions(+), 30 deletions(-) diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index cde1e1b..af1c1c3 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -225,7 +225,7 @@ HRESULT throw_uri_error(script_ctx_t*,jsexcept_t*,UINT,const WCHAR*); HRESULT create_object(script_ctx_t*,DispatchEx*,DispatchEx**); HRESULT create_math(script_ctx_t*,DispatchEx**); HRESULT create_array(script_ctx_t*,DWORD,DispatchEx**); -HRESULT create_regexp_str(script_ctx_t*,const WCHAR*,DWORD,const WCHAR*,DWORD,DispatchEx**); +HRESULT create_regexp(script_ctx_t*,const WCHAR *,int,DWORD,DispatchEx**); HRESULT create_string(script_ctx_t*,const WCHAR*,DWORD,DispatchEx**); HRESULT create_bool(script_ctx_t*,VARIANT_BOOL,DispatchEx**); HRESULT create_number(script_ctx_t*,VARIANT*,DispatchEx**); @@ -319,6 +319,7 @@ typedef struct { HRESULT regexp_match_next(script_ctx_t*,DispatchEx*,BOOL,const WCHAR*,DWORD,const WCHAR**,match_result_t**, DWORD*,DWORD*,match_result_t*); HRESULT regexp_match(script_ctx_t*,DispatchEx*,const WCHAR*,DWORD,BOOL,match_result_t**,DWORD*); +HRESULT parse_regexp_flags(const WCHAR*,DWORD,DWORD*); static inline VARIANT *get_arg(DISPPARAMS *dp, DWORD i) { diff --git a/dlls/jscript/lex.c b/dlls/jscript/lex.c index cd53bd9..efb1782 100644 --- a/dlls/jscript/lex.c +++ b/dlls/jscript/lex.c @@ -766,10 +766,10 @@ static void add_object_literal(parser_ctx_t *ctx, DispatchEx *obj) literal_t *parse_regexp(parser_ctx_t *ctx) { - const WCHAR *re, *flags; + const WCHAR *re, *flags_ptr; + DWORD re_len, flags; DispatchEx *regexp; literal_t *ret; - DWORD re_len; HRESULT hres; TRACE("\n"); @@ -790,11 +790,15 @@ literal_t *parse_regexp(parser_ctx_t *ctx) re_len = ctx->ptr-re; - flags = ++ctx->ptr; + flags_ptr = ++ctx->ptr; while(ctx->ptr < ctx->end && isalnumW(*ctx->ptr)) ctx->ptr++; - hres = create_regexp_str(ctx->script, re, re_len, flags, ctx->ptr-flags, &regexp); + hres = parse_regexp_flags(flags_ptr, ctx->ptr-flags_ptr, &flags); + if(FAILED(hres)) + return NULL; + + hres = create_regexp(ctx->script, re, re_len, flags, &regexp); if(FAILED(hres)) return NULL; diff --git a/dlls/jscript/regexp.c b/dlls/jscript/regexp.c index fa5672f..6c4af84 100644 --- a/dlls/jscript/regexp.c +++ b/dlls/jscript/regexp.c @@ -3737,7 +3737,7 @@ static HRESULT alloc_regexp(script_ctx_t *ctx, DispatchEx *object_prototype, Reg return S_OK; } -static HRESULT create_regexp(script_ctx_t *ctx, const WCHAR *exp, int len, DWORD flags, DispatchEx **ret) +HRESULT create_regexp(script_ctx_t *ctx, const WCHAR *exp, int len, DWORD flags, DispatchEx **ret) { RegExpInstance *regexp; HRESULT hres; @@ -3773,6 +3773,7 @@ static HRESULT regexp_constructor(script_ctx_t *ctx, DISPPARAMS *dp, VARIANT *re const WCHAR *opt = emptyW, *src; DispatchEx *ret; VARIANT *arg; + DWORD flags; HRESULT hres; if(!arg_cnt(dp)) { @@ -3820,7 +3821,11 @@ static HRESULT regexp_constructor(script_ctx_t *ctx, DISPPARAMS *dp, VARIANT *re opt = V_BSTR(arg); } - hres = create_regexp_str(ctx, src, -1, opt, strlenW(opt), &ret); + hres = parse_regexp_flags(opt, strlenW(opt), &flags); + if(FAILED(hres)) + return hres; + + hres = create_regexp(ctx, src, -1, flags, &ret); if(FAILED(hres)) return hres; @@ -3892,33 +3897,31 @@ HRESULT create_regexp_constr(script_ctx_t *ctx, DispatchEx *object_prototype, Di return hres; } -HRESULT create_regexp_str(script_ctx_t *ctx, const WCHAR *exp, DWORD exp_len, const WCHAR *opt, - DWORD opt_len, DispatchEx **ret) +HRESULT parse_regexp_flags(const WCHAR *str, DWORD str_len, DWORD *ret) { const WCHAR *p; DWORD flags = 0; - if(opt) { - for (p = opt; p < opt+opt_len; p++) { - switch (*p) { - case 'g': - flags |= JSREG_GLOB; - break; - case 'i': - flags |= JSREG_FOLD; - break; - case 'm': - flags |= JSREG_MULTILINE; - break; - case 'y': - flags |= JSREG_STICKY; - break; - default: - WARN("wrong flag %c\n", *p); - return E_FAIL; - } + for (p = str; p < str+str_len; p++) { + switch (*p) { + case 'g': + flags |= JSREG_GLOB; + break; + case 'i': + flags |= JSREG_FOLD; + break; + case 'm': + flags |= JSREG_MULTILINE; + break; + case 'y': + flags |= JSREG_STICKY; + break; + default: + WARN("wrong flag %c\n", *p); + return E_FAIL; } } - return create_regexp(ctx, exp, exp_len, flags, ret); + *ret = flags; + return S_OK; } diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index b78de0b..2e48d5b 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -656,7 +656,7 @@ static HRESULT String_match(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISP if(FAILED(hres)) return hres; - hres = create_regexp_str(ctx, match_str, SysStringLen(match_str), NULL, 0, &regexp); + hres = create_regexp(ctx, match_str, SysStringLen(match_str), 0, &regexp); SysFreeString(match_str); if(FAILED(hres)) return hres;

1 0

Jacek Caban : jscript: Create regexp object when evaluating regexp literal.
by Alexandre Julliard 14 Oct '09

14 Oct '09

Module: wine Branch: master Commit: e52115d67329c60187c273de22fc47d38e4850bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=e52115d67329c60187c273de2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 14 14:43:01 2009 +0200 jscript: Create regexp object when evaluating regexp literal. --- dlls/jscript/engine.c | 29 +++++++++++++++++++++-------- dlls/jscript/engine.h | 15 +++++++-------- dlls/jscript/lex.c | 22 ++++------------------ dlls/jscript/parser.y | 5 ----- dlls/jscript/tests/lang.js | 5 +++++ 5 files changed, 37 insertions(+), 39 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index fa14fd9..0cb7851 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -347,7 +347,7 @@ static HRESULT equal2_values(VARIANT *lval, VARIANT *rval, BOOL *ret) return S_OK; } -static HRESULT literal_to_var(literal_t *literal, VARIANT *v) +static HRESULT literal_to_var(script_ctx_t *ctx, literal_t *literal, VARIANT *v) { switch(literal->type) { case LT_UNDEFINED: @@ -364,18 +364,31 @@ static HRESULT literal_to_var(literal_t *literal, VARIANT *v) V_VT(v) = VT_R8; V_R8(v) = literal->u.dval; break; - case LT_STRING: + case LT_STRING: { + BSTR str = SysAllocString(literal->u.wstr); + if(!str) + return E_OUTOFMEMORY; + V_VT(v) = VT_BSTR; - V_BSTR(v) = SysAllocString(literal->u.wstr); + V_BSTR(v) = str; break; + } case LT_BOOL: V_VT(v) = VT_BOOL; V_BOOL(v) = literal->u.bval; break; - case LT_DISPATCH: + case LT_REGEXP: { + DispatchEx *regexp; + HRESULT hres; + + hres = create_regexp(ctx, literal->u.regexp.str, literal->u.regexp.str_len, + literal->u.regexp.flags, &regexp); + if(FAILED(hres)) + return hres; + V_VT(v) = VT_DISPATCH; - IDispatch_AddRef(literal->u.disp); - V_DISPATCH(v) = literal->u.disp; + V_DISPATCH(v) = (IDispatch*)_IDispatchEx_(regexp); + } } return S_OK; @@ -1656,7 +1669,7 @@ HRESULT literal_expression_eval(exec_ctx_t *ctx, expression_t *_expr, DWORD flag TRACE("\n"); - hres = literal_to_var(expr->literal, &var); + hres = literal_to_var(ctx->parser->script, expr->literal, &var); if(FAILED(hres)) return hres; @@ -1735,7 +1748,7 @@ HRESULT property_value_expression_eval(exec_ctx_t *ctx, expression_t *_expr, DWO return hres; for(iter = expr->property_list; iter; iter = iter->next) { - hres = literal_to_var(iter->name, &tmp); + hres = literal_to_var(ctx->parser->script, iter->name, &tmp); if(FAILED(hres)) break; diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index e1952a9..0cd4c40 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -19,11 +19,6 @@ typedef struct _source_elements_t source_elements_t; typedef struct _function_expression_t function_expression_t; -typedef struct _obj_literal_t { - DispatchEx *obj; - struct _obj_literal_t *next; -} obj_literal_t; - typedef struct _function_declaration_t { function_expression_t *expr; @@ -61,7 +56,6 @@ typedef struct _parser_ctx_t { jsheap_t heap; - obj_literal_t *obj_literals; func_stack_t *func_stack; struct _parser_ctx_t *next; @@ -131,9 +125,9 @@ typedef enum { LT_DOUBLE, LT_STRING, LT_BOOL, - LT_DISPATCH, LT_UNDEFINED, - LT_NULL + LT_NULL, + LT_REGEXP }literal_type_t; typedef struct { @@ -144,6 +138,11 @@ typedef struct { const WCHAR *wstr; VARIANT_BOOL bval; IDispatch *disp; + struct { + const WCHAR *str; + DWORD str_len; + DWORD flags; + } regexp; } u; } literal_t; diff --git a/dlls/jscript/lex.c b/dlls/jscript/lex.c index efb1782..4e04dea 100644 --- a/dlls/jscript/lex.c +++ b/dlls/jscript/lex.c @@ -755,20 +755,10 @@ int parser_lex(void *lval, parser_ctx_t *ctx) return 0; } -static void add_object_literal(parser_ctx_t *ctx, DispatchEx *obj) -{ - obj_literal_t *literal = parser_alloc(ctx, sizeof(obj_literal_t)); - - literal->obj = obj; - literal->next = ctx->obj_literals; - ctx->obj_literals = literal; -} - literal_t *parse_regexp(parser_ctx_t *ctx) { const WCHAR *re, *flags_ptr; DWORD re_len, flags; - DispatchEx *regexp; literal_t *ret; HRESULT hres; @@ -798,14 +788,10 @@ literal_t *parse_regexp(parser_ctx_t *ctx) if(FAILED(hres)) return NULL; - hres = create_regexp(ctx->script, re, re_len, flags, &regexp); - if(FAILED(hres)) - return NULL; - - add_object_literal(ctx, regexp); - ret = parser_alloc(ctx, sizeof(literal_t)); - ret->type = LT_DISPATCH; - ret->u.disp = (IDispatch*)_IDispatchEx_(regexp); + ret->type = LT_REGEXP; + ret->u.regexp.str = re; + ret->u.regexp.str_len = re_len; + ret->u.regexp.flags = flags; return ret; } diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index ee3d100..9cae524 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -1591,14 +1591,9 @@ static void program_parsed(parser_ctx_t *ctx, source_elements_t *source) void parser_release(parser_ctx_t *ctx) { - obj_literal_t *iter; - if(--ctx->ref) return; - for(iter = ctx->obj_literals; iter; iter = iter->next) - jsdisp_release(iter->obj); - jsheap_free(&ctx->heap); heap_free(ctx); } diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index 353dcd7..db08b21 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -934,6 +934,11 @@ ok((function (){return 1;})() === 1, "(function (){return 1;})() = " + (function var re = /=(\?|%3F)/g; ok(re.source === "=(\\?|%3F)", "re.source = " + re.source); +tmp = new Array(); +for(var i=0; i<2; i++) + tmp[i] = /b/; +ok(tmp[0] != tmp[1], "tmp[0] == tmp [1]"); + ok(createNullBSTR() === '', "createNullBSTR() !== ''"); ok(getVT(nullDisp) === "VT_DISPATCH", "getVT(nullDisp) = " + getVT(nullDisp));

1 0

Stefan Dösinger : d3d9: Make some functions hookable.
by Alexandre Julliard 14 Oct '09

14 Oct '09

Module: wine Branch: master Commit: dcacd83a82019b117cf628cb338231822961aa0d URL: http://source.winehq.org/git/wine.git/?a=commit;h=dcacd83a82019b117cf628cb3… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Sep 12 14:19:25 2009 +0200 d3d9: Make some functions hookable. --- dlls/d3d9/d3d9_main.c | 4 ++-- dlls/d3d9/device.c | 10 +++++----- dlls/d3d9/directx.c | 10 +++++----- dlls/d3d9/swapchain.c | 6 +++--- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/d3d9/d3d9_main.c b/dlls/d3d9/d3d9_main.c index f59fc46..e8b4a97 100644 --- a/dlls/d3d9/d3d9_main.c +++ b/dlls/d3d9/d3d9_main.c @@ -33,7 +33,7 @@ void WINAPI DebugSetMute(void) { /* nothing to do */ } -IDirect3D9* WINAPI Direct3DCreate9(UINT SDKVersion) { +IDirect3D9* WINAPI DECLSPEC_HOTPATCH Direct3DCreate9(UINT SDKVersion) { IDirect3D9Impl* object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirect3D9Impl)); object->lpVtbl = &Direct3D9_Vtbl; @@ -53,7 +53,7 @@ IDirect3D9* WINAPI Direct3DCreate9(UINT SDKVersion) { return (IDirect3D9*) object; } -HRESULT WINAPI Direct3DCreate9Ex(UINT SDKVersion, IDirect3D9Ex **direct3d9ex) { +HRESULT WINAPI DECLSPEC_HOTPATCH Direct3DCreate9Ex(UINT SDKVersion, IDirect3D9Ex **direct3d9ex) { IDirect3D9 *ret; IDirect3D9Impl* object; diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 5a37f81..7899a19 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -235,7 +235,7 @@ static ULONG WINAPI IDirect3DDevice9Impl_AddRef(LPDIRECT3DDEVICE9EX iface) { return ref; } -static ULONG WINAPI IDirect3DDevice9Impl_Release(LPDIRECT3DDEVICE9EX iface) { +static ULONG WINAPI DECLSPEC_HOTPATCH IDirect3DDevice9Impl_Release(LPDIRECT3DDEVICE9EX iface) { IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; ULONG ref; @@ -490,7 +490,7 @@ static HRESULT WINAPI reset_enum_callback(IWineD3DResource *resource, void *data return ret; } -static HRESULT WINAPI IDirect3DDevice9Impl_Reset(LPDIRECT3DDEVICE9EX iface, D3DPRESENT_PARAMETERS* pPresentationParameters) { +static HRESULT WINAPI DECLSPEC_HOTPATCH IDirect3DDevice9Impl_Reset(LPDIRECT3DDEVICE9EX iface, D3DPRESENT_PARAMETERS* pPresentationParameters) { IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; WINED3DPRESENT_PARAMETERS localParameters; HRESULT hr; @@ -568,7 +568,7 @@ static HRESULT WINAPI IDirect3DDevice9Impl_Reset(LPDIRECT3DDEVICE9EX iface, D3 return hr; } -static HRESULT WINAPI IDirect3DDevice9Impl_Present(LPDIRECT3DDEVICE9EX iface, CONST RECT* pSourceRect,CONST RECT* pDestRect,HWND hDestWindowOverride,CONST RGNDATA* +static HRESULT WINAPI DECLSPEC_HOTPATCH IDirect3DDevice9Impl_Present(LPDIRECT3DDEVICE9EX iface, CONST RECT* pSourceRect,CONST RECT* pDestRect,HWND hDestWindowOverride,CONST RGNDATA* pDirtyRegion) { IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; HRESULT hr; @@ -1288,7 +1288,7 @@ static HRESULT WINAPI IDirect3DDevice9Impl_GetClipPlane(LPDIRECT3DDEVICE9EX if return hr; } -static HRESULT WINAPI IDirect3DDevice9Impl_SetRenderState(LPDIRECT3DDEVICE9EX iface, D3DRENDERSTATETYPE State, DWORD Value) { +static HRESULT WINAPI DECLSPEC_HOTPATCH IDirect3DDevice9Impl_SetRenderState(LPDIRECT3DDEVICE9EX iface, D3DRENDERSTATETYPE State, DWORD Value) { IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; HRESULT hr; TRACE("(%p) Relay\n" , This); @@ -1451,7 +1451,7 @@ static HRESULT WINAPI IDirect3DDevice9Impl_GetSamplerState(IDirect3DDevice9Ex *i return hr; } -static HRESULT WINAPI IDirect3DDevice9Impl_SetSamplerState(LPDIRECT3DDEVICE9EX iface, DWORD Sampler, D3DSAMPLERSTATETYPE Type, DWORD Value) { +static HRESULT WINAPI DECLSPEC_HOTPATCH IDirect3DDevice9Impl_SetSamplerState(LPDIRECT3DDEVICE9EX iface, DWORD Sampler, D3DSAMPLERSTATETYPE Type, DWORD Value) { IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; HRESULT hr; TRACE("(%p) Relay\n" , This); diff --git a/dlls/d3d9/directx.c b/dlls/d3d9/directx.c index 301f901..b1c5459 100644 --- a/dlls/d3d9/directx.c +++ b/dlls/d3d9/directx.c @@ -394,10 +394,10 @@ ULONG WINAPI D3D9CB_DestroySwapChain(IWineD3DSwapChain *pSwapChain) { return IDirect3DSwapChain9_Release((IDirect3DSwapChain9*) swapChainParent); } -static HRESULT WINAPI IDirect3D9Impl_CreateDevice(LPDIRECT3D9EX iface, UINT Adapter, D3DDEVTYPE DeviceType, - HWND hFocusWindow, DWORD BehaviourFlags, - D3DPRESENT_PARAMETERS* pPresentationParameters, - IDirect3DDevice9** ppReturnedDeviceInterface) { +static HRESULT WINAPI DECLSPEC_HOTPATCH IDirect3D9Impl_CreateDevice(LPDIRECT3D9EX iface, UINT Adapter, D3DDEVTYPE DeviceType, + HWND hFocusWindow, DWORD BehaviourFlags, + D3DPRESENT_PARAMETERS* pPresentationParameters, + IDirect3DDevice9** ppReturnedDeviceInterface) { IDirect3D9Impl *This = (IDirect3D9Impl *)iface; IDirect3DDevice9Impl *object = NULL; @@ -524,7 +524,7 @@ static HRESULT WINAPI IDirect3D9ExImpl_GetAdapterDisplayModeEx(IDirect3D9Ex *ifa return D3DERR_DRIVERINTERNALERROR; } -static HRESULT WINAPI IDirect3D9ExImpl_CreateDeviceEx(IDirect3D9Ex *iface, UINT Adapter, D3DDEVTYPE DeviceType, HWND hFocusWindow, DWORD BehaviorFlags, D3DPRESENT_PARAMETERS* pPresentationParameters, D3DDISPLAYMODEEX* pFullscreenDisplayMode, struct IDirect3DDevice9Ex **ppReturnedDeviceInterface) { +static HRESULT WINAPI DECLSPEC_HOTPATCH IDirect3D9ExImpl_CreateDeviceEx(IDirect3D9Ex *iface, UINT Adapter, D3DDEVTYPE DeviceType, HWND hFocusWindow, DWORD BehaviorFlags, D3DPRESENT_PARAMETERS* pPresentationParameters, D3DDISPLAYMODEEX* pFullscreenDisplayMode, struct IDirect3DDevice9Ex **ppReturnedDeviceInterface) { IDirect3D9Impl *This = (IDirect3D9Impl *)iface; FIXME("(%p)->(%d, %d, %p, 0x%08x, %p, %p, %p): Stub!\n", This, Adapter, DeviceType, hFocusWindow, BehaviorFlags, pPresentationParameters, pFullscreenDisplayMode, ppReturnedDeviceInterface); *ppReturnedDeviceInterface = NULL; diff --git a/dlls/d3d9/swapchain.c b/dlls/d3d9/swapchain.c index 461db37..5a7e4a2 100644 --- a/dlls/d3d9/swapchain.c +++ b/dlls/d3d9/swapchain.c @@ -77,7 +77,7 @@ static ULONG WINAPI IDirect3DSwapChain9Impl_Release(LPDIRECT3DSWAPCHAIN9 iface) } /* IDirect3DSwapChain9 parts follow: */ -static HRESULT WINAPI IDirect3DSwapChain9Impl_Present(LPDIRECT3DSWAPCHAIN9 iface, CONST RECT* pSourceRect, CONST RECT* pDestRect, HWND hDestWindowOverride, CONST RGNDATA* pDirtyRegion, DWORD dwFlags) { +static HRESULT WINAPI DECLSPEC_HOTPATCH IDirect3DSwapChain9Impl_Present(LPDIRECT3DSWAPCHAIN9 iface, CONST RECT* pSourceRect, CONST RECT* pDestRect, HWND hDestWindowOverride, CONST RGNDATA* pDirtyRegion, DWORD dwFlags) { IDirect3DSwapChain9Impl *This = (IDirect3DSwapChain9Impl *)iface; HRESULT hr; @@ -211,7 +211,7 @@ static const IDirect3DSwapChain9Vtbl Direct3DSwapChain9_Vtbl = /* IDirect3DDevice9 IDirect3DSwapChain9 Methods follow: */ -HRESULT WINAPI IDirect3DDevice9Impl_CreateAdditionalSwapChain(LPDIRECT3DDEVICE9EX iface, D3DPRESENT_PARAMETERS* pPresentationParameters, IDirect3DSwapChain9** pSwapChain) { +HRESULT WINAPI DECLSPEC_HOTPATCH IDirect3DDevice9Impl_CreateAdditionalSwapChain(LPDIRECT3DDEVICE9EX iface, D3DPRESENT_PARAMETERS* pPresentationParameters, IDirect3DSwapChain9** pSwapChain) { IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; IDirect3DSwapChain9Impl* object; HRESULT hrc = D3D_OK; @@ -282,7 +282,7 @@ HRESULT WINAPI IDirect3DDevice9Impl_CreateAdditionalSwapChain(LPDIRECT3DDEVICE return hrc; } -HRESULT WINAPI IDirect3DDevice9Impl_GetSwapChain(LPDIRECT3DDEVICE9EX iface, UINT iSwapChain, IDirect3DSwapChain9** pSwapChain) { +HRESULT WINAPI DECLSPEC_HOTPATCH IDirect3DDevice9Impl_GetSwapChain(LPDIRECT3DDEVICE9EX iface, UINT iSwapChain, IDirect3DSwapChain9** pSwapChain) { IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; HRESULT hrc = D3D_OK; IWineD3DSwapChain *swapchain = NULL;

1 0

Stefan Dösinger : ddraw: Make directdraw create functions hookable.
by Alexandre Julliard 14 Oct '09

14 Oct '09

Module: wine Branch: master Commit: 64367542d0dfb143ec5076b2f2d6f53d4d040dbb URL: http://source.winehq.org/git/wine.git/?a=commit;h=64367542d0dfb143ec5076b2f… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Sep 12 14:15:31 2009 +0200 ddraw: Make directdraw create functions hookable. --- dlls/ddraw/main.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/main.c b/dlls/ddraw/main.c index 2a0d8f0..24de0a2 100644 --- a/dlls/ddraw/main.c +++ b/dlls/ddraw/main.c @@ -303,7 +303,7 @@ err_out: * Arguments, return values: See DDRAW_Create * ***********************************************************************/ -HRESULT WINAPI +HRESULT WINAPI DECLSPEC_HOTPATCH DirectDrawCreate(GUID *GUID, LPDIRECTDRAW *DD, IUnknown *UnkOuter) @@ -326,7 +326,7 @@ DirectDrawCreate(GUID *GUID, * Arguments, return values: See DDRAW_Create * ***********************************************************************/ -HRESULT WINAPI +HRESULT WINAPI DECLSPEC_HOTPATCH DirectDrawCreateEx(GUID *GUID, LPVOID *DD, REFIID iid,

1 0

Stefan Dösinger : dinput: Make the creation functions hookable.
by Alexandre Julliard 14 Oct '09

14 Oct '09

Module: wine Branch: master Commit: 024dcba89a834004264910b079d33177a279ccf5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=024dcba89a834004264910b07… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Sep 12 14:18:32 2009 +0200 dinput: Make the creation functions hookable. --- dlls/dinput/dinput_main.c | 4 ++-- dlls/dinput8/dinput8_main.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index 9769d74..78a5e26 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -162,7 +162,7 @@ HRESULT WINAPI DirectInputCreateEx( /****************************************************************************** * DirectInputCreateA (DINPUT.@) */ -HRESULT WINAPI DirectInputCreateA(HINSTANCE hinst, DWORD dwVersion, LPDIRECTINPUTA *ppDI, LPUNKNOWN punkOuter) +HRESULT WINAPI DECLSPEC_HOTPATCH DirectInputCreateA(HINSTANCE hinst, DWORD dwVersion, LPDIRECTINPUTA *ppDI, LPUNKNOWN punkOuter) { return DirectInputCreateEx(hinst, dwVersion, &IID_IDirectInput7A, (LPVOID *)ppDI, punkOuter); } @@ -170,7 +170,7 @@ HRESULT WINAPI DirectInputCreateA(HINSTANCE hinst, DWORD dwVersion, LPDIRECTINPU /****************************************************************************** * DirectInputCreateW (DINPUT.@) */ -HRESULT WINAPI DirectInputCreateW(HINSTANCE hinst, DWORD dwVersion, LPDIRECTINPUTW *ppDI, LPUNKNOWN punkOuter) +HRESULT WINAPI DECLSPEC_HOTPATCH DirectInputCreateW(HINSTANCE hinst, DWORD dwVersion, LPDIRECTINPUTW *ppDI, LPUNKNOWN punkOuter) { return DirectInputCreateEx(hinst, dwVersion, &IID_IDirectInput7W, (LPVOID *)ppDI, punkOuter); } diff --git a/dlls/dinput8/dinput8_main.c b/dlls/dinput8/dinput8_main.c index c855caf..77f7f64 100644 --- a/dlls/dinput8/dinput8_main.c +++ b/dlls/dinput8/dinput8_main.c @@ -50,7 +50,7 @@ static void UnlockModule(void) /****************************************************************************** * DirectInput8Create (DINPUT8.@) */ -HRESULT WINAPI DirectInput8Create(HINSTANCE hinst, DWORD dwVersion, REFIID riid, LPVOID *ppDI, LPUNKNOWN punkOuter) { +HRESULT WINAPI DECLSPEC_HOTPATCH DirectInput8Create(HINSTANCE hinst, DWORD dwVersion, REFIID riid, LPVOID *ppDI, LPUNKNOWN punkOuter) { HRESULT hr; TRACE("hInst (%p), dwVersion: %d, riid (%s), punkOuter (%p))\n", hinst, dwVersion, debugstr_guid(riid), punkOuter);

1 0

Stefan Dösinger : d3d: Make EndScene calls hookable.
by Alexandre Julliard 14 Oct '09

14 Oct '09

Module: wine Branch: master Commit: e80144c403cf9cc06301c499e96405eaa53e4511 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e80144c403cf9cc06301c499e… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Sep 13 01:25:23 2009 +0200 d3d: Make EndScene calls hookable. --- dlls/d3d8/device.c | 2 +- dlls/d3d9/device.c | 2 +- dlls/ddraw/device.c | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 0ec2e07..7993fac 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1056,7 +1056,7 @@ static HRESULT WINAPI IDirect3DDevice8Impl_BeginScene(LPDIRECT3DDEVICE8 iface) { return hr; } -static HRESULT WINAPI IDirect3DDevice8Impl_EndScene(LPDIRECT3DDEVICE8 iface) { +static HRESULT WINAPI DECLSPEC_HOTPATCH IDirect3DDevice8Impl_EndScene(LPDIRECT3DDEVICE8 iface) { IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; HRESULT hr; TRACE("(%p) Relay\n" , This); diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 7899a19..7dcff3d 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1097,7 +1097,7 @@ static HRESULT WINAPI IDirect3DDevice9Impl_BeginScene(LPDIRECT3DDEVICE9EX ifac return hr; } -static HRESULT WINAPI IDirect3DDevice9Impl_EndScene(LPDIRECT3DDEVICE9EX iface) { +static HRESULT WINAPI DECLSPEC_HOTPATCH IDirect3DDevice9Impl_EndScene(LPDIRECT3DDEVICE9EX iface) { IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; HRESULT hr; TRACE("(%p) Relay\n" , This); diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 2db5aa2..1883a5d 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -1704,13 +1704,13 @@ IDirect3DDeviceImpl_7_EndScene(IDirect3DDevice7 *iface) else return D3DERR_SCENE_NOT_IN_SCENE; } -static HRESULT WINAPI +static HRESULT WINAPI DECLSPEC_HOTPATCH IDirect3DDeviceImpl_7_EndScene_FPUSetup(IDirect3DDevice7 *iface) { return IDirect3DDeviceImpl_7_EndScene(iface); } -static HRESULT WINAPI +static HRESULT WINAPI DECLSPEC_HOTPATCH IDirect3DDeviceImpl_7_EndScene_FPUPreserve(IDirect3DDevice7 *iface) { HRESULT hr; @@ -1723,7 +1723,7 @@ IDirect3DDeviceImpl_7_EndScene_FPUPreserve(IDirect3DDevice7 *iface) return hr; } -static HRESULT WINAPI +static HRESULT WINAPI DECLSPEC_HOTPATCH Thunk_IDirect3DDeviceImpl_3_EndScene(IDirect3DDevice3 *iface) { IDirect3DDeviceImpl *This = device_from_device3(iface); @@ -1731,7 +1731,7 @@ Thunk_IDirect3DDeviceImpl_3_EndScene(IDirect3DDevice3 *iface) return IDirect3DDevice7_EndScene((IDirect3DDevice7 *)This); } -static HRESULT WINAPI +static HRESULT WINAPI DECLSPEC_HOTPATCH Thunk_IDirect3DDeviceImpl_2_EndScene(IDirect3DDevice2 *iface) { IDirect3DDeviceImpl *This = device_from_device2(iface); @@ -1739,7 +1739,7 @@ Thunk_IDirect3DDeviceImpl_2_EndScene(IDirect3DDevice2 *iface) return IDirect3DDevice7_EndScene((IDirect3DDevice7 *)This); } -static HRESULT WINAPI +static HRESULT WINAPI DECLSPEC_HOTPATCH Thunk_IDirect3DDeviceImpl_1_EndScene(IDirect3DDevice *iface) { IDirect3DDeviceImpl *This = device_from_device1(iface);

1 0