wine-commits September 2008

wine-commits@winehq.org

3 participants
1215 discussions

Jacek Caban : jscript: Added regular expression compiler based on Mozilla regexp implementation.
by Alexandre Julliard 16 Sep '08

16 Sep '08

Module: wine Branch: master Commit: 5670ca52ae50eba30775b20e65b48e6de39db5cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=5670ca52ae50eba30775b20e6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 15 20:39:58 2008 +0200 jscript: Added regular expression compiler based on Mozilla regexp implementation. --- dlls/jscript/regexp.c | 3216 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 3213 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5670ca52ae50eba30775b…

1 0

Alexandre Julliard : ntdll: Hardcode the filesystem cluster size to avoid trouble on NFS.
by Alexandre Julliard 16 Sep '08

16 Sep '08

Module: wine Branch: master Commit: b0192cfed382c470e67aaac744de56011fe27bfb URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0192cfed382c470e67aaac74… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 16 11:32:38 2008 +0200 ntdll: Hardcode the filesystem cluster size to avoid trouble on NFS. --- dlls/ntdll/file.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 5746023..ffc2399 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -2244,6 +2244,7 @@ NTSTATUS WINAPI NtQueryVolumeInformationFile( HANDLE handle, PIO_STATUS_BLOCK io } else { + ULONGLONG bsize; /* Linux's fstatvfs is buggy */ #if !defined(linux) || !defined(HAVE_FSTATFS) struct statvfs stfs; @@ -2253,7 +2254,7 @@ NTSTATUS WINAPI NtQueryVolumeInformationFile( HANDLE handle, PIO_STATUS_BLOCK io io->u.Status = FILE_GetNtStatus(); break; } - info->BytesPerSector = stfs.f_frsize; + bsize = stfs.f_frsize; #else struct statfs stfs; if (fstatfs( fd, &stfs ) < 0) @@ -2261,11 +2262,12 @@ NTSTATUS WINAPI NtQueryVolumeInformationFile( HANDLE handle, PIO_STATUS_BLOCK io io->u.Status = FILE_GetNtStatus(); break; } - info->BytesPerSector = stfs.f_bsize; + bsize = stfs.f_bsize; #endif - info->TotalAllocationUnits.QuadPart = stfs.f_blocks; - info->AvailableAllocationUnits.QuadPart = stfs.f_bavail; - info->SectorsPerAllocationUnit = 1; + info->BytesPerSector = 512; + info->SectorsPerAllocationUnit = 8; + info->TotalAllocationUnits.QuadPart = bsize * stfs.f_blocks / (512 * 8); + info->AvailableAllocationUnits.QuadPart = bsize * stfs.f_bavail / (512 * 8); io->Information = sizeof(*info); io->u.Status = STATUS_SUCCESS; }

1 0

Mikołaj Zalewski : oleaut32: VT_USERDEFINED records are passed by value.
by Alexandre Julliard 16 Sep '08

16 Sep '08

Module: wine Branch: master Commit: 5c2fd1b192380fb741781db55b8fb93c2a336810 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c2fd1b192380fb741781db55… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Mon Sep 15 21:22:25 2008 +0200 oleaut32: VT_USERDEFINED records are passed by value. --- dlls/oleaut32/tests/tmarshal.c | 35 +++++++++++++++++++++++++++++- dlls/oleaut32/tests/tmarshal.idl | 9 +++++++ dlls/oleaut32/tests/tmarshal_dispids.h | 1 + dlls/oleaut32/tmarshal.c | 37 ++++++++++++++++++++++++++++--- 4 files changed, 77 insertions(+), 5 deletions(-) diff --git a/dlls/oleaut32/tests/tmarshal.c b/dlls/oleaut32/tests/tmarshal.c index f705722..04f0d4d 100644 --- a/dlls/oleaut32/tests/tmarshal.c +++ b/dlls/oleaut32/tests/tmarshal.c @@ -24,13 +24,26 @@ #include <ocidl.h> #include <stdio.h> -#include <wine/test.h> +#include "wine/test.h" #include "tmarshal.h" #include "tmarshal_dispids.h" #define ok_ole_success(hr, func) ok(hr == S_OK, #func " failed with error 0x%08lx\n", (unsigned long int)hr) +/* ULL suffix is not portable */ +#define ULL_CONST(dw1, dw2) ((((ULONGLONG)dw1) << 32) | (ULONGLONG)dw2) + +const MYSTRUCT MYSTRUCT_BYVAL = {0x12345678, ULL_CONST(0xdeadbeef, 0x98765432)}; +const MYSTRUCT MYSTRUCT_BYPTR = {0x91827364, ULL_CONST(0x88776655, 0x44332211)}; +const MYSTRUCT MYSTRUCT_ARRAY[5] = { + {0x1a1b1c1d, ULL_CONST(0x1e1f1011, 0x12131415)}, + {0x2a2b2c2d, ULL_CONST(0x2e2f2021, 0x22232425)}, + {0x3a3b3c3d, ULL_CONST(0x3e3f3031, 0x32333435)}, + {0x4a4b4c4d, ULL_CONST(0x4e4f4041, 0x42434445)}, + {0x5a5b5c5d, ULL_CONST(0x5e5f5051, 0x52535455)}, +}; + /* Debugging functions from wine/libs/wine/debug.c */ /* allocate some tmp string space */ @@ -575,6 +588,18 @@ void WINAPI Widget_VarArg( ok(hr == S_OK, "SafeArrayUnaccessData failed with %x\n", hr); } +void WINAPI Widget_StructArgs( + IWidget * iface, + MYSTRUCT byval, + MYSTRUCT *byptr, + MYSTRUCT arr[5]) +{ + ok(memcmp(&byval, &MYSTRUCT_BYVAL, sizeof(MYSTRUCT))==0, "Struct parameter passed by value corrupted\n"); + ok(memcmp(byptr, &MYSTRUCT_BYPTR, sizeof(MYSTRUCT))==0, "Struct parameter passed by pointer corrupted\n"); + ok(memcmp(arr, MYSTRUCT_ARRAY, sizeof(MYSTRUCT_ARRAY))==0, "Array of structs corrupted\n"); +} + + HRESULT WINAPI Widget_Error( IWidget __RPC_FAR * iface) { @@ -616,6 +641,7 @@ static const struct IWidgetVtbl Widget_VTable = Widget_VariantArrayPtr, Widget_Variant, Widget_VarArg, + Widget_StructArgs, Widget_Error, Widget_CloneInterface }; @@ -932,6 +958,8 @@ static void test_typelibmarshal(void) DWORD tid; BSTR bstr; ITypeInfo *pTypeInfo; + MYSTRUCT mystruct; + MYSTRUCT mystructArray[5]; ok(pKEW != NULL, "Widget creation failed\n"); @@ -1071,6 +1099,11 @@ static void test_typelibmarshal(void) ok_ole_success(hr, IDispatch_Invoke); VariantClear(&varresult); + /* call StructArgs (direct) */ + mystruct = MYSTRUCT_BYPTR; + memcpy(mystructArray, MYSTRUCT_ARRAY, sizeof(mystructArray)); + IWidget_StructArgs(pWidget, MYSTRUCT_BYVAL, &mystruct, mystructArray); + /* call Clone */ dispparams.cNamedArgs = 0; dispparams.cArgs = 0; diff --git a/dlls/oleaut32/tests/tmarshal.idl b/dlls/oleaut32/tests/tmarshal.idl index 2367f28..ea10797 100644 --- a/dlls/oleaut32/tests/tmarshal.idl +++ b/dlls/oleaut32/tests/tmarshal.idl @@ -35,6 +35,12 @@ library TestTypelib STATE_WIDGETIFIED } STATE; + typedef struct tagMYSTRUCT + { + INT field1; + ULONGLONG field2; + } MYSTRUCT; + coclass ApplicationObject2; [ @@ -111,6 +117,9 @@ library TestTypelib [vararg, id(DISPID_TM_VARARG)] void VarArg([in] int numexpect, [in] SAFEARRAY(VARIANT) values); + [id(DISPID_TM_STRUCTARGS)] + void StructArgs([in] MYSTRUCT byval, [in] MYSTRUCT *byptr, [in] MYSTRUCT arr[5]); + [id(DISPID_TM_ERROR)] HRESULT Error(); diff --git a/dlls/oleaut32/tests/tmarshal_dispids.h b/dlls/oleaut32/tests/tmarshal_dispids.h index 803b94b..8fcf109 100644 --- a/dlls/oleaut32/tests/tmarshal_dispids.h +++ b/dlls/oleaut32/tests/tmarshal_dispids.h @@ -33,5 +33,6 @@ #define DISPID_TM_ERROR 14 #define DISPID_TM_CLONEINTERFACE 15 #define DISPID_TM_TESTDUAL 16 +#define DISPID_TM_STRUCTARGS 17 #define DISPID_NOA_BSTRRET 1 diff --git a/dlls/oleaut32/tmarshal.c b/dlls/oleaut32/tmarshal.c index 0123e52..fdfe07c 100644 --- a/dlls/oleaut32/tmarshal.c +++ b/dlls/oleaut32/tmarshal.c @@ -524,6 +524,22 @@ _argsize(TYPEDESC *tdesc, ITypeInfo *tinfo) { return (sizeof(DECIMAL)+3)/sizeof(DWORD); case VT_VARIANT: return (sizeof(VARIANT)+3)/sizeof(DWORD); + case VT_USERDEFINED: + { + ITypeInfo *tinfo2; + TYPEATTR *tattr; + HRESULT hres; + DWORD ret; + + hres = ITypeInfo_GetRefTypeInfo(tinfo,tdesc->u.hreftype,&tinfo2); + if (FAILED(hres)) + return 0; /* should fail critically in serialize_param */ + ITypeInfo_GetTypeAttr(tinfo2,&tattr); + ret = (tattr->cbSizeInstance+3)/sizeof(DWORD); + ITypeInfo_ReleaseTypeAttr(tinfo2, tattr); + ITypeInfo_Release(tinfo2); + return ret; + } default: return 1; } @@ -558,6 +574,22 @@ _xsize(const TYPEDESC *td, ITypeInfo *tinfo) { case VT_UI1: case VT_I1: return 1; + case VT_USERDEFINED: + { + ITypeInfo *tinfo2; + TYPEATTR *tattr; + HRESULT hres; + DWORD ret; + + hres = ITypeInfo_GetRefTypeInfo(tinfo,td->u.hreftype,&tinfo2); + if (FAILED(hres)) + return 0; + ITypeInfo_GetTypeAttr(tinfo2,&tattr); + ret = tattr->cbSizeInstance; + ITypeInfo_ReleaseTypeAttr(tinfo2, tattr); + ITypeInfo_Release(tinfo2); + return ret; + } default: return 4; } @@ -1149,9 +1181,6 @@ deserialize_param( case TKIND_RECORD: { int i; - if (alloc) - *arg = (DWORD)HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,tattr->cbSizeInstance); - if (debugout) TRACE_(olerelay)("{"); for (i=0;i<tattr->cVars;i++) { VARDESC *vdesc; @@ -1169,7 +1198,7 @@ deserialize_param( debugout, alloc, &vdesc->elemdescVar.tdesc, - (DWORD*)(((LPBYTE)*arg)+vdesc->u.oInst), + (DWORD*)(((LPBYTE)arg)+vdesc->u.oInst), buf ); ITypeInfo2_ReleaseVarDesc(tinfo2, vdesc);

1 0

Jacek Caban : jscript: Reuse temporary heap.
by Alexandre Julliard 16 Sep '08

16 Sep '08

Module: wine Branch: master Commit: 4ac24dc2bf9dc6cf783405968162461867a36aeb URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ac24dc2bf9dc6cf783405968… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 15 20:38:46 2008 +0200 jscript: Reuse temporary heap. --- dlls/jscript/engine.h | 3 +-- dlls/jscript/jscript.c | 2 ++ dlls/jscript/jscript.h | 31 ++++++++++++++++++------------- dlls/jscript/jsutils.c | 25 +++++++++++++++++++++++++ dlls/jscript/parser.y | 5 +++-- 5 files changed, 49 insertions(+), 17 deletions(-) diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index 0d75716..c37bc24 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -35,7 +35,6 @@ typedef struct _parser_ctx_t { BOOL nl; HRESULT hres; - jsheap_t tmp_heap; jsheap_t heap; obj_literal_t *obj_literals; @@ -60,7 +59,7 @@ static inline void *parser_alloc(parser_ctx_t *ctx, DWORD size) static inline void *parser_alloc_tmp(parser_ctx_t *ctx, DWORD size) { - return jsheap_alloc(&ctx->tmp_heap, size); + return jsheap_alloc(&ctx->script->tmp_heap, size); } typedef struct _scope_chain_t { diff --git a/dlls/jscript/jscript.c b/dlls/jscript/jscript.c index 899f59d..7c7def0 100644 --- a/dlls/jscript/jscript.c +++ b/dlls/jscript/jscript.c @@ -54,6 +54,7 @@ void script_release(script_ctx_t *ctx) if(--ctx->ref) return; + jsheap_free(&ctx->tmp_heap); heap_free(ctx); } @@ -507,6 +508,7 @@ static HRESULT WINAPI JScriptParse_InitNew(IActiveScriptParse *iface) ctx->ref = 1; ctx->state = SCRIPTSTATE_UNINITIALIZED; + jsheap_init(&ctx->tmp_heap); ctx = InterlockedCompareExchangePointer((void**)&This->ctx, ctx, NULL); if(ctx) { diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index ec42011..8e6fe3c 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -40,6 +40,22 @@ typedef struct { VARIANT var; } jsexcept_t; +typedef struct { + void **blocks; + DWORD block_cnt; + DWORD last_block; + DWORD offset; + BOOL mark; + struct list custom_blocks; +} jsheap_t; + +void jsheap_init(jsheap_t*); +void *jsheap_alloc(jsheap_t*,DWORD); +void *jsheap_grow(jsheap_t*,void*,DWORD,DWORD); +void jsheap_clear(jsheap_t*); +void jsheap_free(jsheap_t*); +jsheap_t *jsheap_mark(jsheap_t*); + typedef struct DispatchEx DispatchEx; #define PROPF_ARGMASK 0x00ff @@ -139,6 +155,8 @@ struct _script_ctx_t { named_item_t *named_items; LCID lcid; + jsheap_t tmp_heap; + DispatchEx *script_disp; DispatchEx *global; DispatchEx *array_constr; @@ -179,19 +197,6 @@ const char *debugstr_variant(const VARIANT*); HRESULT WINAPI JScriptFactory_CreateInstance(IClassFactory*,IUnknown*,REFIID,void**); -typedef struct { - void **blocks; - DWORD block_cnt; - DWORD last_block; - DWORD offset; - struct list custom_blocks; -} jsheap_t; - -void jsheap_init(jsheap_t*); -void *jsheap_alloc(jsheap_t*,DWORD); -void jsheap_clear(jsheap_t*); -void jsheap_free(jsheap_t*); - extern LONG module_ref; static inline void lock_module(void) diff --git a/dlls/jscript/jsutils.c b/dlls/jscript/jsutils.c index a193b9e..ae39218 100644 --- a/dlls/jscript/jsutils.c +++ b/dlls/jscript/jsutils.c @@ -110,14 +110,30 @@ void *jsheap_alloc(jsheap_t *heap, DWORD size) return list+1; } +void *jsheap_grow(jsheap_t *heap, void *mem, DWORD size, DWORD inc) +{ + if(mem == (BYTE*)heap->blocks[heap->last_block] + heap->offset-size + && heap->offset+inc < block_size(heap->last_block)) { + heap->offset += inc; + return mem; + } + + return jsheap_alloc(heap, size+inc); +} + void jsheap_clear(jsheap_t *heap) { struct list *tmp; + if(!heap) + return; + while((tmp = list_next(&heap->custom_blocks, &heap->custom_blocks))) { list_remove(tmp); heap_free(tmp); } + + heap->last_block = heap->offset = 0; } void jsheap_free(jsheap_t *heap) @@ -133,6 +149,15 @@ void jsheap_free(jsheap_t *heap) jsheap_init(heap); } +jsheap_t *jsheap_mark(jsheap_t *heap) +{ + if(heap->mark) + return NULL; + + heap->mark = TRUE; + return heap; +} + /* ECMA-262 3rd Edition 9.1 */ HRESULT to_primitive(script_ctx_t *ctx, VARIANT *v, jsexcept_t *ei, VARIANT *ret) { diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index ec5f4bd..f721a8e 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -1525,6 +1525,7 @@ void parser_release(parser_ctx_t *ctx) HRESULT script_parse(script_ctx_t *ctx, const WCHAR *code, parser_ctx_t **ret) { parser_ctx_t *parser_ctx; + jsheap_t *mark; HRESULT hres; parser_ctx = heap_alloc_zero(sizeof(parser_ctx_t)); @@ -1540,11 +1541,11 @@ HRESULT script_parse(script_ctx_t *ctx, const WCHAR *code, parser_ctx_t **ret) script_addref(ctx); parser_ctx->script = ctx; - jsheap_init(&parser_ctx->tmp_heap); + mark = jsheap_mark(&ctx->tmp_heap); jsheap_init(&parser_ctx->heap); parser_parse(parser_ctx); - jsheap_free(&parser_ctx->tmp_heap); + jsheap_clear(mark); if(FAILED(parser_ctx->hres)) { hres = parser_ctx->hres; parser_release(parser_ctx);

1 0

Jacek Caban : jscript: Added parser support for regular expressions.
by Alexandre Julliard 16 Sep '08

16 Sep '08

Module: wine Branch: master Commit: cf1863ed09d2e2930b873f75c9aa696883a48237 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf1863ed09d2e2930b873f75c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 15 20:38:18 2008 +0200 jscript: Added parser support for regular expressions. --- dlls/jscript/engine.h | 9 +++++++++ dlls/jscript/jscript.h | 1 + dlls/jscript/lex.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/jscript/parser.y | 8 +++++++- dlls/jscript/regexp.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 105 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index 57a68c2..0d75716 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -18,6 +18,11 @@ typedef struct _source_elements_t source_elements_t; +typedef struct _obj_literal_t { + DispatchEx *obj; + struct _obj_literal_t *next; +} obj_literal_t; + typedef struct _parser_ctx_t { LONG ref; @@ -33,6 +38,8 @@ typedef struct _parser_ctx_t { jsheap_t tmp_heap; jsheap_t heap; + obj_literal_t *obj_literals; + struct _parser_ctx_t *next; } parser_ctx_t; @@ -105,6 +112,8 @@ typedef struct { } u; } literal_t; +literal_t *parse_regexp(parser_ctx_t*); + typedef struct _variable_declaration_t { const WCHAR *identifier; expression_t *expr; diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index a3c5c0a..ec42011 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -116,6 +116,7 @@ HRESULT create_builtin_function(script_ctx_t*,builtin_invoke_t,DWORD,DispatchEx* 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 to_primitive(script_ctx_t*,VARIANT*,jsexcept_t*,VARIANT*); HRESULT to_boolean(VARIANT*,VARIANT_BOOL*); diff --git a/dlls/jscript/lex.c b/dlls/jscript/lex.c index 8ae15d3..0aea118 100644 --- a/dlls/jscript/lex.c +++ b/dlls/jscript/lex.c @@ -684,3 +684,49 @@ int parser_lex(void *lval, parser_ctx_t *ctx) WARN("unexpected char '%c' %d\n", *ctx->ptr, *ctx->ptr); 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; + DispatchEx *regexp; + literal_t *ret; + DWORD re_len; + HRESULT hres; + + TRACE("\n"); + + re = ctx->ptr; + while(ctx->ptr < ctx->end && (*ctx->ptr != '/' || *(ctx->ptr-1) == '\\')) + ctx->ptr++; + + if(ctx->ptr == ctx->end) { + WARN("unexpected end of file\n"); + return NULL; + } + + re_len = ctx->ptr-re; + + flags = ++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); + if(FAILED(hres)) + return NULL; + + add_object_literal(ctx, regexp); + + ret = parser_alloc(ctx, sizeof(literal_t)); + ret->vt = VT_DISPATCH; + ret->u.disp = (IDispatch*)_IDispatchEx_(regexp); + return ret; +} diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index cc4ee7b..ec5f4bd 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -775,7 +775,8 @@ Literal | BooleanLiteral { $$ = $1; } | tNumericLiteral { $$ = $1; } | tStringLiteral { $$ = new_string_literal(ctx, $1); } - | '/' { FIXME("RegExp literal\n"); YYABORT; } + | '/' { $$ = parse_regexp(ctx); + if(!$$) YYABORT; } /* ECMA-262 3rd Edition 7.8.2 */ BooleanLiteral @@ -1509,9 +1510,14 @@ 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/regexp.c b/dlls/jscript/regexp.c index 88f7c3b..7c352ef 100644 --- a/dlls/jscript/regexp.c +++ b/dlls/jscript/regexp.c @@ -22,6 +22,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(jscript); +#define JSREG_FOLD 0x01 /* fold uppercase to lowercase */ +#define JSREG_GLOB 0x02 /* global exec, creates array of matches */ +#define JSREG_MULTILINE 0x04 /* treat ^ and $ as begin and end of line */ +#define JSREG_STICKY 0x08 /* only match starting at lastIndex */ + typedef struct { DispatchEx dispex; } RegExpInstance; @@ -174,6 +179,12 @@ static HRESULT alloc_regexp(script_ctx_t *ctx, BOOL use_constr, RegExpInstance * return S_OK; } +static HRESULT create_regexp(script_ctx_t *ctx, const WCHAR *exp, int len, DWORD flags, DispatchEx **ret) +{ + FIXME("\n"); + return E_NOTIMPL; +} + static HRESULT RegExpConstr_value(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { @@ -195,3 +206,34 @@ HRESULT create_regexp_constr(script_ctx_t *ctx, DispatchEx **ret) jsdisp_release(&regexp->dispex); return hres; } + +HRESULT create_regexp_str(script_ctx_t *ctx, const WCHAR *exp, DWORD exp_len, const WCHAR *opt, + DWORD opt_len, DispatchEx **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; + } + } + } + + return create_regexp(ctx, exp, exp_len, flags, ret); +}

1 0

Jacek Caban : jscript: Added ArrayInstance::on_put implementation.
by Alexandre Julliard 16 Sep '08

16 Sep '08

Module: wine Branch: master Commit: f2e7626c7a24c1c927b9469fa29cef55689ef894 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2e7626c7a24c1c927b9469fa… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 15 20:37:46 2008 +0200 jscript: Added ArrayInstance::on_put implementation. --- dlls/jscript/array.c | 18 +++++++++++++++++- dlls/jscript/tests/api.js | 3 +++ 2 files changed, 20 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/array.c b/dlls/jscript/array.c index 65097be..c131865 100644 --- a/dlls/jscript/array.c +++ b/dlls/jscript/array.c @@ -194,7 +194,23 @@ static void Array_destructor(DispatchEx *dispex) static void Array_on_put(DispatchEx *dispex, const WCHAR *name) { - FIXME("\n"); + ArrayInstance *array = (ArrayInstance*)dispex; + const WCHAR *ptr = name; + DWORD id = 0; + + if(!isdigitW(*ptr)) + return; + + while(*ptr && isdigitW(*ptr)) { + id = id*10 + (*ptr-'0'); + ptr++; + } + + if(*ptr) + return; + + if(id >= array->length) + array->length = id+1; } static const builtin_prop_t Array_props[] = { diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index e874027..eed48dc 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -28,6 +28,9 @@ ok(arr["0"] === 1, "arr[0] is not 1"); ok(arr["1"] === 2, "arr[1] is not 2"); ok(arr["2"] === "test", "arr[2] is not \"test\""); +arr["7"] = true; +ok((arr.length === 8), "arr.length is not 8"); + var arr = new Array(6); ok(typeof(arr) === "object", "arr (6) is not object"); ok((arr.length === 6), "arr.length is not 6");

1 0

Jacek Caban : jscript: Added Array.length implementation.
by Alexandre Julliard 16 Sep '08

16 Sep '08

Module: wine Branch: master Commit: 06d19171be21fde7bff7b7551c1b56baba301cdb URL: http://source.winehq.org/git/wine.git/?a=commit;h=06d19171be21fde7bff7b7551… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 15 20:37:29 2008 +0200 jscript: Added Array.length implementation. --- dlls/jscript/array.c | 17 +++++++++++++++-- dlls/jscript/tests/api.js | 3 +++ 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/array.c b/dlls/jscript/array.c index 764633d..65097be 100644 --- a/dlls/jscript/array.c +++ b/dlls/jscript/array.c @@ -51,8 +51,21 @@ static const WCHAR isPrototypeOfW[] = {'i','s','P','r','o','t','o','t','y','p',' static HRESULT Array_length(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { - FIXME("\n"); - return E_NOTIMPL; + ArrayInstance *This = (ArrayInstance*)dispex; + + TRACE("%p %d\n", This, This->length); + + switch(flags) { + case DISPATCH_PROPERTYGET: + V_VT(retv) = VT_I4; + V_I4(retv) = This->length; + break; + default: + FIXME("unimplemented flags %x\n", flags); + return E_NOTIMPL; + } + + return S_OK; } static HRESULT Array_concat(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 7a7b48f..e874027 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -18,16 +18,19 @@ var arr = new Array(); ok(typeof(arr) === "object", "arr () is not object"); +ok((arr.length === 0), "arr.length is not 0"); ok(arr["0"] === undefined, "arr[0] is not undefined"); var arr = new Array(1, 2, "test"); ok(typeof(arr) === "object", "arr (1,2,test) is not object"); +ok((arr.length === 3), "arr.length is not 3"); ok(arr["0"] === 1, "arr[0] is not 1"); ok(arr["1"] === 2, "arr[1] is not 2"); ok(arr["2"] === "test", "arr[2] is not \"test\""); var arr = new Array(6); ok(typeof(arr) === "object", "arr (6) is not object"); +ok((arr.length === 6), "arr.length is not 6"); ok(arr["0"] === undefined, "arr[0] is not undefined"); reportSuccess();

1 0

Jacek Caban : jscript: Added Array constructor implementation.
by Alexandre Julliard 16 Sep '08

16 Sep '08

Module: wine Branch: master Commit: 9c25917e5d94fd89a192d23a42032ce3d0354be5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c25917e5d94fd89a192d23a4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 15 20:37:10 2008 +0200 jscript: Added Array constructor implementation. --- dlls/jscript/array.c | 69 ++++++++++++++++++++++++++++++++++++++++++-- dlls/jscript/jscript.h | 11 +++++++ dlls/jscript/tests/api.js | 33 +++++++++++++++++++++ dlls/jscript/tests/rsrc.rc | 3 ++ dlls/jscript/tests/run.c | 1 + 5 files changed, 114 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/array.c b/dlls/jscript/array.c index 31249f0..764633d 100644 --- a/dlls/jscript/array.c +++ b/dlls/jscript/array.c @@ -24,6 +24,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(jscript); typedef struct { DispatchEx dispex; + + DWORD length; } ArrayInstance; static const WCHAR lengthW[] = {'l','e','n','g','t','h',0}; @@ -212,10 +214,56 @@ static const builtin_info_t Array_info = { }; static HRESULT ArrayConstr_value(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, - VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) + VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { - FIXME("\n"); - return E_NOTIMPL; + DispatchEx *obj; + VARIANT *arg_var; + DWORD i; + HRESULT hres; + + TRACE("\n"); + + switch(flags) { + case DISPATCH_CONSTRUCT: { + if(arg_cnt(dp) == 1 && V_VT((arg_var = get_arg(dp, 0))) == VT_I4) { + if(V_I4(arg_var) < 0) { + FIXME("throw RangeError\n"); + return E_FAIL; + } + + hres = create_array(dispex->ctx, V_I4(arg_var), &obj); + if(FAILED(hres)) + return hres; + + V_VT(retv) = VT_DISPATCH; + V_DISPATCH(retv) = (IDispatch*)_IDispatchEx_(obj); + return S_OK; + } + + hres = create_array(dispex->ctx, arg_cnt(dp), &obj); + if(FAILED(hres)) + return hres; + + for(i=0; i < arg_cnt(dp); i++) { + hres = jsdisp_propput_idx(obj, i, lcid, get_arg(dp, i), ei, caller); + if(FAILED(hres)) + break; + } + if(FAILED(hres)) { + jsdisp_release(obj); + return hres; + } + + V_VT(retv) = VT_DISPATCH; + V_DISPATCH(retv) = (IDispatch*)_IDispatchEx_(obj); + break; + } + default: + FIXME("unimplemented flags: %x\n", flags); + return E_NOTIMPL; + } + + return S_OK; } static HRESULT alloc_array(script_ctx_t *ctx, BOOL use_constr, ArrayInstance **ret) @@ -251,3 +299,18 @@ HRESULT create_array_constr(script_ctx_t *ctx, DispatchEx **ret) IDispatchEx_Release(_IDispatchEx_(&array->dispex)); return hres; } + +HRESULT create_array(script_ctx_t *ctx, DWORD length, DispatchEx **ret) +{ + ArrayInstance *array; + HRESULT hres; + + hres = alloc_array(ctx, TRUE, &array); + if(FAILED(hres)) + return hres; + + array->length = length; + + *ret = &array->dispex; + return S_OK; +} diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index ee1215e..a3c5c0a 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -115,6 +115,7 @@ HRESULT create_builtin_function(script_ctx_t*,builtin_invoke_t,DWORD,DispatchEx* HRESULT create_object(script_ctx_t*,DispatchEx*,DispatchEx**); HRESULT create_math(script_ctx_t*,DispatchEx**); +HRESULT create_array(script_ctx_t*,DWORD,DispatchEx**); HRESULT to_primitive(script_ctx_t*,VARIANT*,jsexcept_t*,VARIANT*); HRESULT to_boolean(VARIANT*,VARIANT_BOOL*); @@ -163,6 +164,16 @@ HRESULT create_object_constr(script_ctx_t*,DispatchEx**); HRESULT create_regexp_constr(script_ctx_t*,DispatchEx**); HRESULT create_string_constr(script_ctx_t*,DispatchEx**); +static inline VARIANT *get_arg(DISPPARAMS *dp, DWORD i) +{ + return dp->rgvarg + dp->cArgs-i-1; +} + +static inline DWORD arg_cnt(const DISPPARAMS *dp) +{ + return dp->cArgs - dp->cNamedArgs; +} + const char *debugstr_variant(const VARIANT*); HRESULT WINAPI JScriptFactory_CreateInstance(IClassFactory*,IUnknown*,REFIID,void**); diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js new file mode 100644 index 0000000..7a7b48f --- /dev/null +++ b/dlls/jscript/tests/api.js @@ -0,0 +1,33 @@ +/* + * Copyright 2008 Jacek Caban for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +var arr = new Array(); +ok(typeof(arr) === "object", "arr () is not object"); +ok(arr["0"] === undefined, "arr[0] is not undefined"); + +var arr = new Array(1, 2, "test"); +ok(typeof(arr) === "object", "arr (1,2,test) is not object"); +ok(arr["0"] === 1, "arr[0] is not 1"); +ok(arr["1"] === 2, "arr[1] is not 2"); +ok(arr["2"] === "test", "arr[2] is not \"test\""); + +var arr = new Array(6); +ok(typeof(arr) === "object", "arr (6) is not object"); +ok(arr["0"] === undefined, "arr[0] is not undefined"); + +reportSuccess(); diff --git a/dlls/jscript/tests/rsrc.rc b/dlls/jscript/tests/rsrc.rc index ba7a460..407ef2c 100644 --- a/dlls/jscript/tests/rsrc.rc +++ b/dlls/jscript/tests/rsrc.rc @@ -16,5 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +/* @makedep: api.js */ +api.js 40 "api.js" + /* @makedep: lang.js */ lang.js 40 "lang.js" diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c index 3409b7e..e4ecbd7 100644 --- a/dlls/jscript/tests/run.c +++ b/dlls/jscript/tests/run.c @@ -582,6 +582,7 @@ static void run_tests(void) CHECK_CALLED(global_success_i); run_from_res("lang.js"); + run_from_res("api.js"); } START_TEST(run)

1 0

Nicolas Le Cam : comctl32/tests: Fix a failing test for some platforms.
by Alexandre Julliard 16 Sep '08

16 Sep '08

Module: wine Branch: master Commit: 47bcdc32a430e9940634b05a78c2c6af5f593026 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47bcdc32a430e9940634b05a7… Author: Nicolas Le Cam <niko.lecam(a)gmail.com> Date: Mon Sep 15 20:24:46 2008 +0200 comctl32/tests: Fix a failing test for some platforms. --- dlls/comctl32/tests/trackbar.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/tests/trackbar.c b/dlls/comctl32/tests/trackbar.c index d82cd98..00f7024 100644 --- a/dlls/comctl32/tests/trackbar.c +++ b/dlls/comctl32/tests/trackbar.c @@ -38,9 +38,9 @@ static const struct message create_parent_wnd_seq[] = { { WM_NCCREATE, sent }, { WM_NCCALCSIZE, sent|wparam, 0 }, { WM_CREATE, sent }, - { WM_QUERYNEWPALETTE, sent|optional }, { WM_SHOWWINDOW, sent|wparam, 1 }, { WM_WINDOWPOSCHANGING, sent|wparam, 0 }, + { WM_QUERYNEWPALETTE, sent|optional }, { WM_WINDOWPOSCHANGING, sent|wparam, 0 }, { WM_ACTIVATEAPP, sent|wparam, 1 }, { WM_NCACTIVATE, sent|wparam, 1 }, @@ -394,8 +394,9 @@ static LRESULT WINAPI parent_wnd_proc(HWND hwnd, UINT message, WPARAM wParam, LP LRESULT ret; struct message msg; - /* do not log painting messages */ - if (message != WM_PAINT && + /* log system messages, except for painting */ + if (message < WM_USER && + message != WM_PAINT && message != WM_ERASEBKGND && message != WM_NCPAINT && message != WM_NCHITTEST &&

1 0

Jacek Caban : jscript: Added missing RegExp properties.
by Alexandre Julliard 16 Sep '08

16 Sep '08

Module: wine Branch: master Commit: 199952bf5590d1acff24445d6f9479aa8aa8b432 URL: http://source.winehq.org/git/wine.git/?a=commit;h=199952bf5590d1acff24445d6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 15 20:36:48 2008 +0200 jscript: Added missing RegExp properties. --- dlls/jscript/regexp.c | 54 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 54 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/regexp.c b/dlls/jscript/regexp.c index 8bbaa6c..88f7c3b 100644 --- a/dlls/jscript/regexp.c +++ b/dlls/jscript/regexp.c @@ -26,12 +26,53 @@ typedef struct { DispatchEx dispex; } RegExpInstance; +static const WCHAR sourceW[] = {'s','o','u','r','c','e',0}; +static const WCHAR globalW[] = {'g','l','o','b','a','l',0}; +static const WCHAR ignoreCaseW[] = {'i','g','n','o','r','e','C','a','s','e',0}; +static const WCHAR multilineW[] = {'m','u','l','t','i','l','i','n','e',0}; +static const WCHAR lastIndexW[] = {'l','a','s','t','I','n','d','e','x',0}; static const WCHAR toStringW[] = {'t','o','S','t','r','i','n','g',0}; static const WCHAR toLocaleStringW[] = {'t','o','L','o','c','a','l','e','S','t','r','i','n','g',0}; static const WCHAR hasOwnPropertyW[] = {'h','a','s','O','w','n','P','r','o','p','e','r','t','y',0}; static const WCHAR propertyIsEnumerableW[] = {'p','r','o','p','e','r','t','y','I','s','E','n','u','m','e','r','a','b','l','e',0}; static const WCHAR isPrototypeOfW[] = {'i','s','P','r','o','t','o','t','y','p','e','O','f',0}; +static const WCHAR execW[] = {'e','x','e','c',0}; + +static HRESULT RegExp_source(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, + VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT RegExp_global(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, + VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT RegExp_ignoreCase(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, + VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT RegExp_multiline(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, + VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT RegExp_lastIndex(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, + VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) +{ + FIXME("\n"); + return E_NOTIMPL; +} static HRESULT RegExp_toString(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) @@ -68,6 +109,13 @@ static HRESULT RegExp_isPrototypeOf(DispatchEx *dispex, LCID lcid, WORD flags, D return E_NOTIMPL; } +static HRESULT RegExp_exec(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, + VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) +{ + FIXME("\n"); + return E_NOTIMPL; +} + static HRESULT RegExp_value(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { @@ -81,9 +129,15 @@ static void RegExp_destructor(DispatchEx *dispex) } static const builtin_prop_t RegExp_props[] = { + {execW, RegExp_exec, PROPF_METHOD}, + {globalW, RegExp_global, 0}, {hasOwnPropertyW, RegExp_hasOwnProperty, PROPF_METHOD}, + {ignoreCaseW, RegExp_ignoreCase, 0}, {isPrototypeOfW, RegExp_isPrototypeOf, PROPF_METHOD}, + {lastIndexW, RegExp_lastIndex, 0}, + {multilineW, RegExp_multiline, 0}, {propertyIsEnumerableW, RegExp_propertyIsEnumerable, PROPF_METHOD}, + {sourceW, RegExp_source, 0}, {toLocaleStringW, RegExp_toLocaleString, PROPF_METHOD}, {toStringW, RegExp_toString, PROPF_METHOD} };

1 0

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 September 2008