wine-commits August 2016

wine-commits@winehq.org

2 participants
777 discussions

Vincent Povirk : gdiplus/tests: Add test for ScaleWorldTransform in metafiles.
by Alexandre Julliard 03 Aug '16

03 Aug '16

Module: wine Branch: master Commit: 1816698f824bfebaaf060719aa2cd7bbb5f6be6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=1816698f824bfebaaf060719a… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Aug 3 16:19:37 2016 -0500 gdiplus/tests: Add test for ScaleWorldTransform in metafiles. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/tests/metafile.c | 126 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 126 insertions(+) diff --git a/dlls/gdiplus/tests/metafile.c b/dlls/gdiplus/tests/metafile.c index e8281ba..354e880 100644 --- a/dlls/gdiplus/tests/metafile.c +++ b/dlls/gdiplus/tests/metafile.c @@ -1267,6 +1267,131 @@ static void test_pagetransform(void) expect(Ok, stat); } +static const emfplus_record worldtransform_records[] = { + {0, EMR_HEADER}, + {0, EmfPlusRecordTypeHeader}, + {0, EmfPlusRecordTypeFillRects}, + {0, EmfPlusRecordTypeScaleWorldTransform}, + {0, EmfPlusRecordTypeFillRects}, + {0, EmfPlusRecordTypeEndOfFile}, + {0, EMR_EOF}, + {0} +}; + +static void test_worldtransform(void) +{ + GpStatus stat; + GpMetafile *metafile; + GpGraphics *graphics; + HDC hdc; + static const GpRectF frame = {0.0, 0.0, 5.0, 5.0}; + static const GpPointF dst_points[3] = {{0.0,0.0},{100.0,0.0},{0.0,100.0}}; + static const WCHAR description[] = {'w','i','n','e','t','e','s','t',0}; + GpBitmap *bitmap; + ARGB color; + GpBrush *brush; + GpMatrix *transform; + BOOL identity; + REAL elements[6]; + + hdc = CreateCompatibleDC(0); + + stat = GdipRecordMetafile(hdc, EmfTypeEmfPlusOnly, &frame, MetafileFrameUnitPixel, description, &metafile); + expect(Ok, stat); + + DeleteDC(hdc); + + if (stat != Ok) + return; + + stat = GdipCreateMatrix(&transform); + expect(Ok, stat); + + stat = GdipGetImageGraphicsContext((GpImage*)metafile, &graphics); + expect(Ok, stat); + + /* initial transform */ + stat = GdipGetWorldTransform(graphics, transform); + expect(Ok, stat); + + stat = GdipIsMatrixIdentity(transform, &identity); + expect(Ok, stat); + expect(TRUE, identity); + + stat = GdipCreateSolidFill((ARGB)0xff0000ff, (GpSolidFill**)&brush); + expect(Ok, stat); + + stat = GdipFillRectangleI(graphics, brush, 0, 0, 1, 1); + expect(Ok, stat); + + stat = GdipDeleteBrush(brush); + expect(Ok, stat); + + /* scale transform */ + stat = GdipScaleWorldTransform(graphics, 2.0, 4.0, MatrixOrderPrepend); + expect(Ok, stat); + + stat = GdipGetWorldTransform(graphics, transform); + expect(Ok, stat); + + stat = GdipGetMatrixElements(transform, elements); + expect(Ok, stat); + expectf(2.0, elements[0]); + expectf(0.0, elements[1]); + expectf(0.0, elements[2]); + expectf(4.0, elements[3]); + expectf(0.0, elements[4]); + expectf(0.0, elements[5]); + + stat = GdipCreateSolidFill((ARGB)0xff00ff00, (GpSolidFill**)&brush); + expect(Ok, stat); + + stat = GdipFillRectangle(graphics, brush, 0.5, 0.5, 0.5, 0.25); + expect(Ok, stat); + + stat = GdipDeleteBrush(brush); + expect(Ok, stat); + + stat = GdipDeleteMatrix(transform); + expect(Ok, stat); + + stat = GdipDeleteGraphics(graphics); + expect(Ok, stat); + + check_metafile(metafile, worldtransform_records, "worldtransform metafile", dst_points, &frame, UnitPixel); + + save_metafile(metafile, "worldtransform.emf"); + + stat = GdipCreateBitmapFromScan0(100, 100, 0, PixelFormat32bppARGB, NULL, &bitmap); + expect(Ok, stat); + + stat = GdipGetImageGraphicsContext((GpImage*)bitmap, &graphics); + expect(Ok, stat); + + play_metafile(metafile, graphics, worldtransform_records, "worldtransform playback", dst_points, &frame, UnitPixel); + + stat = GdipBitmapGetPixel(bitmap, 80, 80, &color); + expect(Ok, stat); + expect(0, color); + + stat = GdipBitmapGetPixel(bitmap, 10, 10, &color); + expect(Ok, stat); + expect(0xff0000ff, color); + + stat = GdipBitmapGetPixel(bitmap, 30, 50, &color); + expect(Ok, stat); + expect(0xff00ff00, color); + + stat = GdipDeleteGraphics(graphics); + expect(Ok, stat); + + stat = GdipDisposeImage((GpImage*)bitmap); + expect(Ok, stat); + + stat = GdipDisposeImage((GpImage*)metafile); + expect(Ok, stat); +} + static void test_converttoemfplus(void) { GpStatus (WINAPI *pGdipConvertToEmfPlus)( const GpGraphics *graphics, GpMetafile *metafile, BOOL *succ, @@ -1437,6 +1562,7 @@ START_TEST(metafile) test_clear(); test_nullframerect(); test_pagetransform(); + test_worldtransform(); test_converttoemfplus(); test_frameunit();

1 0

Vincent Povirk : gdiplus: Implement metafile playback for ScaleWorldTransform.
by Alexandre Julliard 03 Aug '16

03 Aug '16

Module: wine Branch: master Commit: 136d9e8c184bb7cb7de7416e51d6276edfdddac5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=136d9e8c184bb7cb7de7416e5… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Aug 3 16:19:36 2016 -0500 gdiplus: Implement metafile playback for ScaleWorldTransform. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/metafile.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index 0f03041..09ecd39 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -923,6 +923,18 @@ GpStatus WINGDIPAPI GdipPlayMetafileRecord(GDIPCONST GpMetafile *metafile, return METAFILE_PlaybackUpdateWorldTransform(real_metafile); } + case EmfPlusRecordTypeScaleWorldTransform: + { + EmfPlusScaleWorldTransform *record = (EmfPlusScaleWorldTransform*)header; + MatrixOrder order = (flags & 0x4) ? MatrixOrderAppend : MatrixOrderPrepend; + + if (dataSize + sizeof(EmfPlusRecordHeader) < sizeof(EmfPlusScaleWorldTransform)) + return InvalidParameter; + + GdipScaleMatrix(real_metafile->world_transform, record->Sx, record->Sy, order); + + return METAFILE_PlaybackUpdateWorldTransform(real_metafile); + } default: FIXME("Not implemented for record type %x\n", recordType); return NotImplemented;

1 0

Vincent Povirk : gdiplus: Implement metafile recording for ScaleWorldTransform.
by Alexandre Julliard 03 Aug '16

03 Aug '16

Module: wine Branch: master Commit: 271c2bd62c6e428a5e20f9756d054a9e418ee62b URL: http://source.winehq.org/git/wine.git/?a=commit;h=271c2bd62c6e428a5e20f9756… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Aug 3 16:19:35 2016 -0500 gdiplus: Implement metafile recording for ScaleWorldTransform. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/gdiplus_private.h | 1 + dlls/gdiplus/graphics.c | 9 +++++++++ dlls/gdiplus/metafile.c | 31 +++++++++++++++++++++++++++++++ 3 files changed, 41 insertions(+) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 25ae5ee..e4056b4 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -90,6 +90,7 @@ extern GpStatus METAFILE_GraphicsClear(GpMetafile* metafile, ARGB color) DECLSPE extern GpStatus METAFILE_FillRectangles(GpMetafile* metafile, GpBrush* brush, GDIPCONST GpRectF* rects, INT count) DECLSPEC_HIDDEN; extern GpStatus METAFILE_SetPageTransform(GpMetafile* metafile, GpUnit unit, REAL scale) DECLSPEC_HIDDEN; +extern GpStatus METAFILE_ScaleWorldTransform(GpMetafile* metafile, REAL sx, REAL sy, MatrixOrder order) DECLSPEC_HIDDEN; extern GpStatus METAFILE_GraphicsDeleted(GpMetafile* metafile) DECLSPEC_HIDDEN; extern void calc_curve_bezier(const GpPointF *pts, REAL tension, REAL *x1, diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 37990cf..febb60d 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -5242,6 +5242,8 @@ GpStatus WINGDIPAPI GdipEndContainer(GpGraphics *graphics, GraphicsContainer sta GpStatus WINGDIPAPI GdipScaleWorldTransform(GpGraphics *graphics, REAL sx, REAL sy, GpMatrixOrder order) { + GpStatus stat; + TRACE("(%p, %.2f, %.2f, %d)\n", graphics, sx, sy, order); if(!graphics) @@ -5250,6 +5252,13 @@ GpStatus WINGDIPAPI GdipScaleWorldTransform(GpGraphics *graphics, REAL sx, if(graphics->busy) return ObjectBusy; + if (graphics->image && graphics->image->type == ImageTypeMetafile) { + stat = METAFILE_ScaleWorldTransform((GpMetafile*)graphics->image, sx, sy, order); + + if (stat != Ok) + return stat; + } + return GdipScaleMatrix(&graphics->worldtrans, sx, sy, order); } diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index 022af38..0f03041 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -84,6 +84,13 @@ typedef struct EmfPlusRect SHORT Height; } EmfPlusRect; +typedef struct EmfPlusScaleWorldTransform +{ + EmfPlusRecordHeader Header; + REAL Sx; + REAL Sy; +} EmfPlusScaleWorldTransform; + static GpStatus METAFILE_AllocateRecord(GpMetafile *metafile, DWORD size, void **result) { DWORD size_needed; @@ -555,6 +562,30 @@ GpStatus METAFILE_SetPageTransform(GpMetafile* metafile, GpUnit unit, REAL scale return Ok; } +GpStatus METAFILE_ScaleWorldTransform(GpMetafile* metafile, REAL sx, REAL sy, MatrixOrder order) +{ + if (metafile->metafile_type == MetafileTypeEmfPlusOnly || metafile->metafile_type == MetafileTypeEmfPlusDual) + { + EmfPlusScaleWorldTransform *record; + GpStatus stat; + + stat = METAFILE_AllocateRecord(metafile, + sizeof(EmfPlusScaleWorldTransform), + (void**)&record); + if (stat != Ok) + return stat; + + record->Header.Type = EmfPlusRecordTypeScaleWorldTransform; + record->Header.Flags = (order == MatrixOrderAppend ? 4 : 0); + record->Sx = sx; + record->Sy = sy; + + METAFILE_WriteRecords(metafile); + } + + return Ok; +} + GpStatus METAFILE_ReleaseDC(GpMetafile* metafile, HDC hdc) { if (hdc != metafile->record_dc)

1 0

Sebastian Lackner : ntoskrnl.exe: Fix leak of ServiceKeyName if DriverInit fails.
by Alexandre Julliard 03 Aug '16

03 Aug '16

Module: wine Branch: master Commit: 272ebf862d1cb080397cb97bdae0ae80ba4f5106 URL: http://source.winehq.org/git/wine.git/?a=commit;h=272ebf862d1cb080397cb97bd… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Aug 3 18:41:42 2016 +0200 ntoskrnl.exe: Fix leak of ServiceKeyName if DriverInit fails. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index e21039e..25187d3 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -929,6 +929,7 @@ NTSTATUS WINAPI IoCreateDriver( UNICODE_STRING *name, PDRIVER_INITIALIZE init ) if (status) { RtlFreeUnicodeString( &driver->driver_obj.DriverName ); + RtlFreeUnicodeString( &driver->driver_extension.ServiceKeyName ); RtlFreeHeap( GetProcessHeap(), 0, driver ); } else

1 0

Aric Stewart : ntoskrnl.exe: Track drivers created with IoCreateDriver.
by Alexandre Julliard 03 Aug '16

03 Aug '16

Module: wine Branch: master Commit: 79cd0d870dac1c26e7c0f63963d5fb406c582eb4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=79cd0d870dac1c26e7c0f6396… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Aug 3 18:41:30 2016 +0200 ntoskrnl.exe: Track drivers created with IoCreateDriver. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 99 ++++++++++++++++++++++++++++++++++++-------- 1 file changed, 81 insertions(+), 18 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 9acfeaa..e21039e 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -39,9 +39,10 @@ #include "ddk/wdm.h" #include "wine/unicode.h" #include "wine/server.h" -#include "wine/list.h" #include "wine/debug.h" +#include "wine/rbtree.h" + WINE_DEFAULT_DEBUG_CHANNEL(ntoskrnl); WINE_DECLARE_DEBUG_CHANNEL(relay); @@ -72,6 +73,56 @@ static DWORD request_thread; static DWORD client_tid; static DWORD client_pid; +struct wine_driver +{ + struct wine_rb_entry entry; + + DRIVER_OBJECT driver_obj; + DRIVER_EXTENSION driver_extension; +}; + +static struct wine_rb_tree wine_drivers; + +static CRITICAL_SECTION drivers_cs; +static CRITICAL_SECTION_DEBUG critsect_debug = +{ + 0, 0, &drivers_cs, + { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": drivers_cs") } +}; +static CRITICAL_SECTION drivers_cs = { &critsect_debug, -1, 0, 0, 0, 0 }; + +static void *wine_drivers_rb_alloc( size_t size ) +{ + return HeapAlloc( GetProcessHeap(), 0, size ); +} + +static void *wine_drivers_rb_realloc( void *ptr, size_t size ) +{ + return HeapReAlloc( GetProcessHeap(), 0, ptr, size ); +} + +static void wine_drivers_rb_free( void *ptr ) +{ + HeapFree( GetProcessHeap(), 0, ptr ); +} + +static int wine_drivers_rb_compare( const void *key, const struct wine_rb_entry *entry ) +{ + const struct wine_driver *driver = WINE_RB_ENTRY_VALUE( entry, const struct wine_driver, entry ); + const UNICODE_STRING *k = key; + + return RtlCompareUnicodeString( k, &driver->driver_obj.DriverName, FALSE ); +} + +static const struct wine_rb_functions wine_drivers_rb_functions = +{ + wine_drivers_rb_alloc, + wine_drivers_rb_realloc, + wine_drivers_rb_free, + wine_drivers_rb_compare, +}; + #ifdef __i386__ #define DEFINE_FASTCALL1_ENTRYPOINT( name ) \ __ASM_STDCALL_FUNC( name, 4, \ @@ -846,41 +897,48 @@ static void build_driver_keypath( const WCHAR *name, UNICODE_STRING *keypath ) RtlInitUnicodeString( keypath, str ); } + /*********************************************************************** * IoCreateDriver (NTOSKRNL.EXE.@) */ NTSTATUS WINAPI IoCreateDriver( UNICODE_STRING *name, PDRIVER_INITIALIZE init ) { - DRIVER_OBJECT *driver; - DRIVER_EXTENSION *extension; + struct wine_driver *driver; NTSTATUS status; TRACE("(%s, %p)\n", debugstr_us(name), init); if (!(driver = RtlAllocateHeap( GetProcessHeap(), HEAP_ZERO_MEMORY, - sizeof(*driver) + sizeof(*extension) ))) + sizeof(*driver) ))) return STATUS_NO_MEMORY; - if ((status = RtlDuplicateUnicodeString( 1, name, &driver->DriverName ))) + if ((status = RtlDuplicateUnicodeString( 1, name, &driver->driver_obj.DriverName ))) { RtlFreeHeap( GetProcessHeap(), 0, driver ); return status; } - extension = (DRIVER_EXTENSION *)(driver + 1); - driver->Size = sizeof(*driver); - driver->DriverInit = init; - driver->DriverExtension = extension; - extension->DriverObject = driver; - build_driver_keypath( driver->DriverName.Buffer, &extension->ServiceKeyName ); + driver->driver_obj.Size = sizeof(driver->driver_obj); + driver->driver_obj.DriverInit = init; + driver->driver_obj.DriverExtension = &driver->driver_extension; + driver->driver_extension.DriverObject = &driver->driver_obj; + build_driver_keypath( driver->driver_obj.DriverName.Buffer, &driver->driver_extension.ServiceKeyName ); - status = driver->DriverInit( driver, &extension->ServiceKeyName ); + status = driver->driver_obj.DriverInit( &driver->driver_obj, &driver->driver_extension.ServiceKeyName ); if (status) { - RtlFreeUnicodeString( &driver->DriverName ); + RtlFreeUnicodeString( &driver->driver_obj.DriverName ); RtlFreeHeap( GetProcessHeap(), 0, driver ); } + else + { + EnterCriticalSection( &drivers_cs ); + if (wine_rb_put( &wine_drivers, &driver->driver_obj.DriverName, &driver->entry )) + ERR( "failed to insert driver %s in tree\n", debugstr_us(name) ); + LeaveCriticalSection( &drivers_cs ); + } + return status; } @@ -888,13 +946,17 @@ NTSTATUS WINAPI IoCreateDriver( UNICODE_STRING *name, PDRIVER_INITIALIZE init ) /*********************************************************************** * IoDeleteDriver (NTOSKRNL.EXE.@) */ -void WINAPI IoDeleteDriver( DRIVER_OBJECT *driver ) +void WINAPI IoDeleteDriver( DRIVER_OBJECT *driver_object ) { - TRACE("(%p)\n", driver); + TRACE( "(%p)\n", driver_object ); + + EnterCriticalSection( &drivers_cs ); + wine_rb_remove( &wine_drivers, &driver_object->DriverName ); + LeaveCriticalSection( &drivers_cs ); - RtlFreeUnicodeString( &driver->DriverName ); - RtlFreeUnicodeString( &driver->DriverExtension->ServiceKeyName ); - RtlFreeHeap( GetProcessHeap(), 0, driver ); + RtlFreeUnicodeString( &driver_object->DriverName ); + RtlFreeUnicodeString( &driver_object->DriverExtension->ServiceKeyName ); + RtlFreeHeap( GetProcessHeap(), 0, CONTAINING_RECORD( driver_object, struct wine_driver, driver_obj ) ); } @@ -2344,6 +2406,7 @@ BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) { case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls( inst ); + if (wine_rb_init( &wine_drivers, &wine_drivers_rb_functions )) return FALSE; #if defined(__i386__) || defined(__x86_64__) handler = RtlAddVectoredExceptionHandler( TRUE, vectored_handler ); #endif

1 0

Jacek Caban : jscript: More arguments object tests.
by Alexandre Julliard 03 Aug '16

03 Aug '16

Module: wine Branch: master Commit: 1857cdf57d7bf5ec1c285c96943d22061a271ee3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1857cdf57d7bf5ec1c285c969… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 3 16:28:32 2016 +0200 jscript: More arguments object tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/tests/lang.js | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index ee30836..4990826 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -101,6 +101,10 @@ function testFunc1(x, y) { ok(tmp === false, "arguments deleted"); ok(typeof(arguments) === "object", "typeof(arguments) = " + typeof(arguments)); + x = 2; + ok(x === 2, "x = " + x); + ok(arguments[0] === 2, "arguments[0] = " + arguments[0]); + return true; } @@ -211,6 +215,38 @@ function argumentsTest() { argumentsTest(); +// arguments object detached from its execution context +(function() { + var args, get_x, set_x; + + function test_args(detached) { + ok(args[0] === 1, "args[0] = " + args[0]); + set_x(2); + ok(args[0] === (detached ? 1 : 2), "args[0] = " + args[0] + " expected " + (detached ? 1 : 2)); + args[0] = 3; + ok(get_x() === (detached ? 2 : 3), "get_x() = " + get_x()); + ok(args[0] === 3, "args[0] = " + args[0]); + } + + (function(x) { + args = arguments; + get_x = function() { return x; }; + set_x = function(v) { x = v; }; + + test_args(false); + x = 1; + })(1); + + test_args(true); +})(); + +// arguments is a regular variable, it may be overwritten +(function() { + ok(typeof(arguments) === "object", "typeof(arguments) = " + typeof(arguments)); + arguments = 1; + ok(arguments === 1, "arguments = " + arguments); +})(); + (function callAsExprTest() { ok(callAsExprTest.arguments === null, "callAsExprTest.arguments = " + callAsExprTest.arguments); })(1,2);

1 0

Jacek Caban : jscript: Delay arguments object until it' s accessed and properly detach it after function exits.
by Alexandre Julliard 03 Aug '16

03 Aug '16

Module: wine Branch: master Commit: 2f63a1e009006e23e7fbd3b093625d4b4dbe775d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f63a1e009006e23e7fbd3b09… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 3 16:28:26 2016 +0200 jscript: Delay arguments object until it's accessed and properly detach it after function exits. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/engine.c | 20 +++++++++++++++++--- dlls/jscript/engine.h | 3 ++- dlls/jscript/function.c | 14 ++++++++++---- 3 files changed, 29 insertions(+), 8 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index b82a290..1b90c32 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -558,6 +558,12 @@ static HRESULT detach_variable_object(script_ctx_t *ctx, call_frame_t *frame) assert(frame == frame->base_scope->frame); assert(frame->variable_obj == frame->base_scope->jsobj); + if(!frame->arguments_obj) { + hres = setup_arguments_object(ctx, frame); + if(FAILED(hres)) + return hres; + } + frame->base_scope->frame = NULL; for(i = 0; i < frame->function->param_cnt; i++) { @@ -609,12 +615,19 @@ static HRESULT identifier_eval(script_ctx_t *ctx, BSTR identifier, exprval_t *re if(scope->frame) { function_code_t *func = scope->frame->function; local_ref_t *ref = bsearch(identifier, func->locals, func->locals_cnt, sizeof(*func->locals), local_ref_cmp); + static const WCHAR argumentsW[] = {'a','r','g','u','m','e','n','t','s',0}; if(ref) { ret->type = EXPRVAL_STACK_REF; ret->u.off = scope->frame->arguments_off - ref->ref - 1; return S_OK; } + + if(!strcmpW(identifier, argumentsW)) { + hres = detach_variable_object(ctx, scope->frame); + if(FAILED(hres)) + return hres; + } } if(scope->jsobj) hres = jsdisp_get_id(scope->jsobj, identifier, fdexNameImplicit, &id); @@ -2701,7 +2714,7 @@ static HRESULT bind_event_target(script_ctx_t *ctx, function_code_t *func, jsdis return hres; } -static HRESULT setup_scope(script_ctx_t *ctx, call_frame_t *frame, unsigned argc, jsval_t *argv, jsdisp_t *function_instance) +static HRESULT setup_scope(script_ctx_t *ctx, call_frame_t *frame, unsigned argc, jsval_t *argv) { const unsigned orig_stack = ctx->stack_top; unsigned i; @@ -2736,7 +2749,7 @@ static HRESULT setup_scope(script_ctx_t *ctx, call_frame_t *frame, unsigned argc frame->pop_locals = ctx->stack_top - orig_stack; frame->base_scope->frame = frame; - return setup_arguments_object(ctx, frame, argc, function_instance); + return S_OK; } HRESULT exec_source(script_ctx_t *ctx, DWORD flags, bytecode_t *bytecode, function_code_t *function, scope_chain_t *scope, @@ -2799,12 +2812,13 @@ HRESULT exec_source(script_ctx_t *ctx, DWORD flags, bytecode_t *bytecode, functi frame->function = function; frame->ret = jsval_undefined(); + frame->argc = argc; if(scope) { frame->base_scope = frame->scope = scope_addref(scope); if(!(flags & (EXEC_GLOBAL|EXEC_EVAL))) { - hres = setup_scope(ctx, frame, argc, argv, function_instance); + hres = setup_scope(ctx, frame, argc, argv); if(FAILED(hres)) { heap_free(frame); return hres; diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index e5f27bc..81be179 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -217,6 +217,7 @@ typedef struct _call_frame_t { jsdisp_t *arguments_obj; DWORD flags; + unsigned argc; unsigned pop_locals; unsigned arguments_off; @@ -235,5 +236,5 @@ HRESULT exec_source(script_ctx_t*,DWORD,bytecode_t*,function_code_t*,scope_chain jsdisp_t*,jsdisp_t*,unsigned,jsval_t*,jsval_t*) DECLSPEC_HIDDEN; HRESULT create_source_function(script_ctx_t*,bytecode_t*,function_code_t*,scope_chain_t*,jsdisp_t**) DECLSPEC_HIDDEN; -HRESULT setup_arguments_object(script_ctx_t*,call_frame_t*,unsigned,jsdisp_t*) DECLSPEC_HIDDEN; +HRESULT setup_arguments_object(script_ctx_t*,call_frame_t*) DECLSPEC_HIDDEN; void detach_arguments_object(jsdisp_t*) DECLSPEC_HIDDEN; diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index bdf8af3..2475908 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -159,7 +159,7 @@ static const builtin_info_t Arguments_info = { Arguments_idx_put }; -HRESULT setup_arguments_object(script_ctx_t *ctx, call_frame_t *frame, unsigned argc, jsdisp_t *function_instance) +HRESULT setup_arguments_object(script_ctx_t *ctx, call_frame_t *frame) { ArgumentsInstance *args; HRESULT hres; @@ -176,11 +176,11 @@ HRESULT setup_arguments_object(script_ctx_t *ctx, call_frame_t *frame, unsigned return hres; } - args->function = function_from_jsdisp(jsdisp_addref(function_instance)); - args->argc = argc; + args->function = function_from_jsdisp(jsdisp_addref(frame->function_instance)); + args->argc = frame->argc; args->frame = frame; - hres = jsdisp_propput_dontenum(&args->jsdisp, lengthW, jsval_number(argc)); + hres = jsdisp_propput_dontenum(&args->jsdisp, lengthW, jsval_number(args->argc)); if(SUCCEEDED(hres)) hres = jsdisp_propput_dontenum(&args->jsdisp, caleeW, jsval_disp(to_disp(&args->function->dispex))); if(SUCCEEDED(hres)) @@ -561,11 +561,17 @@ static HRESULT Function_get_arguments(script_ctx_t *ctx, jsdisp_t *jsthis, jsval { FunctionInstance *function = function_from_jsdisp(jsthis); call_frame_t *frame; + HRESULT hres; TRACE("\n"); for(frame = ctx->call_ctx; frame; frame = frame->prev_frame) { if(frame->function_instance == &function->dispex) { + if(!frame->arguments_obj) { + hres = setup_arguments_object(ctx, frame); + if(FAILED(hres)) + return hres; + } *r = jsval_obj(jsdisp_addref(frame->arguments_obj)); return S_OK; }

1 0

Jacek Caban : jscript: Setup arguments object by interpreter and store all arguments inside the object on call exit.
by Alexandre Julliard 03 Aug '16

03 Aug '16

Module: wine Branch: master Commit: 5a7327d21d424f9a3c07f38d6b568c9b4a342686 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a7327d21d424f9a3c07f38d6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 3 16:28:19 2016 +0200 jscript: Setup arguments object by interpreter and store all arguments inside the object on call exit. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/engine.c | 20 +++----- dlls/jscript/engine.h | 4 +- dlls/jscript/function.c | 129 ++++++++++++++++++++++++++++-------------------- dlls/jscript/global.c | 2 +- dlls/jscript/jscript.c | 4 +- 5 files changed, 88 insertions(+), 71 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5a7327d21d424f9a3c07f…

1 0

Jacek Caban : jscript: Access arguments directly from stack in arguments object if possible.
by Alexandre Julliard 03 Aug '16

03 Aug '16

Module: wine Branch: master Commit: 9daafa87bc94364d9401b40286d2104c9b4ad29e URL: http://source.winehq.org/git/wine.git/?a=commit;h=9daafa87bc94364d9401b4028… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 3 16:27:49 2016 +0200 jscript: Access arguments directly from stack in arguments object if possible. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/engine.c | 2 +- dlls/jscript/engine.h | 2 -- dlls/jscript/function.c | 33 ++++++++++++++++++++++----------- 3 files changed, 23 insertions(+), 14 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 187a8b7..2c6a9a3 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -545,7 +545,7 @@ static HRESULT equal2_values(jsval_t lval, jsval_t rval, BOOL *ret) * Transfers local variables from stack to variable object. * It's slow, so we want to avoid it as much as possible. */ -HRESULT detach_variable_object(script_ctx_t *ctx, call_frame_t *frame) +static HRESULT detach_variable_object(script_ctx_t *ctx, call_frame_t *frame) { unsigned i; HRESULT hres; diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index 1aebfd7..89a09fa 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -226,8 +226,6 @@ typedef struct _call_frame_t { struct _call_frame_t *prev_frame; } call_frame_t; -HRESULT detach_variable_object(script_ctx_t*,call_frame_t*) DECLSPEC_HIDDEN; - #define EXEC_GLOBAL 0x0001 #define EXEC_CONSTRUCTOR 0x0002 #define EXEC_RETURN_TO_INTERP 0x0004 diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index 006ec39..191976d 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -89,34 +89,45 @@ static unsigned Arguments_idx_length(jsdisp_t *jsdisp) return arguments->function->length; } -static HRESULT Arguments_idx_get(jsdisp_t *jsdisp, unsigned idx, jsval_t *res) +static jsval_t *get_argument_ref(ArgumentsInstance *arguments, unsigned idx) +{ + call_frame_t *frame = arguments->scope->frame; + return frame + ? arguments->jsdisp.ctx->stack + frame->arguments_off + idx + : NULL; +} + +static HRESULT Arguments_idx_get(jsdisp_t *jsdisp, unsigned idx, jsval_t *r) { ArgumentsInstance *arguments = (ArgumentsInstance*)jsdisp; + jsval_t *ref; TRACE("%p[%u]\n", arguments, idx); - if(arguments->scope->frame) { - HRESULT hres; - hres = detach_variable_object(jsdisp->ctx, arguments->scope->frame); - if(FAILED(hres)) - return hres; - } + if((ref = get_argument_ref(arguments, idx))) + return jsval_copy(*ref, r); /* FIXME: Accessing by name won't work for duplicated argument names */ - return jsdisp_propget_name(arguments->scope->jsobj, arguments->function->func_code->params[idx], res); + return jsdisp_propget_name(arguments->scope->jsobj, arguments->function->func_code->params[idx], r); } static HRESULT Arguments_idx_put(jsdisp_t *jsdisp, unsigned idx, jsval_t val) { ArgumentsInstance *arguments = (ArgumentsInstance*)jsdisp; + jsval_t *ref; + HRESULT hres; TRACE("%p[%u] = %s\n", arguments, idx, debugstr_jsval(val)); - if(arguments->scope->frame) { - HRESULT hres; - hres = detach_variable_object(jsdisp->ctx, arguments->scope->frame); + if((ref = get_argument_ref(arguments, idx))) { + jsval_t copy; + hres = jsval_copy(val, &copy); if(FAILED(hres)) return hres; + + jsval_release(*ref); + *ref = copy; + return S_OK; } /* FIXME: Accessing by name won't work for duplicated argument names */

1 0

Jacek Caban : jscript: Build local references map in compiler and use it to search the scope.
by Alexandre Julliard 03 Aug '16

03 Aug '16

Module: wine Branch: master Commit: b652a9787ca7d1e7d441cfe8754ef1c24ad83f18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b652a9787ca7d1e7d441cfe87… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 3 16:27:35 2016 +0200 jscript: Build local references map in compiler and use it to search the scope. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/compile.c | 99 +++++++++++++++++++++++++++++++++++++++----------- dlls/jscript/engine.c | 19 ++++++---- dlls/jscript/engine.h | 8 ++++ 3 files changed, 97 insertions(+), 29 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index 77bbc89..7b844b7 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -54,6 +54,10 @@ typedef struct { unsigned labels_size; unsigned labels_cnt; + local_ref_t *locals_buf; + unsigned locals_buf_size; + unsigned locals_cnt; + statement_ctx_t *stat_ctx; function_code_t *func; @@ -1782,6 +1786,46 @@ static HRESULT compile_statement(compiler_ctx_t *ctx, statement_ctx_t *stat_ctx, return hres; } +static int local_cmp(const void *key, const void *ref) +{ + return strcmpW((const WCHAR*)key, ((const local_ref_t*)ref)->name); +} + +static inline local_ref_t *find_local(compiler_ctx_t *ctx, BSTR name) +{ + return bsearch(name, ctx->locals_buf, ctx->locals_cnt, sizeof(*ctx->locals_buf), local_cmp); +} + +static BOOL alloc_local(compiler_ctx_t *ctx, BSTR name, int ref) +{ + unsigned i; + + if(!ctx->locals_buf_size) { + ctx->locals_buf = heap_alloc(4 * sizeof(*ctx->locals_buf)); + if(!ctx->locals_buf) + return FALSE; + ctx->locals_buf_size = 4; + }else if(ctx->locals_buf_size == ctx->locals_cnt) { + local_ref_t *new_buf = heap_realloc(ctx->locals_buf, ctx->locals_buf_size * 2 * sizeof(*ctx->locals_buf)); + if(!new_buf) + return FALSE; + ctx->locals_buf = new_buf; + ctx->locals_buf_size *= 2; + } + + for(i = 0; i < ctx->locals_cnt; i++) { + if(strcmpW(ctx->locals_buf[i].name, name) > 0) { + memmove(ctx->locals_buf + i+1, ctx->locals_buf + i, (ctx->locals_cnt - i) * sizeof(*ctx->locals_buf)); + break; + } + } + + ctx->locals_buf[i].name = name; + ctx->locals_buf[i].ref = ref; + ctx->locals_cnt++; + return TRUE; +} + static void resolve_labels(compiler_ctx_t *ctx, unsigned off) { instr_t *instr; @@ -1856,9 +1900,35 @@ static HRESULT compile_function(compiler_ctx_t *ctx, source_elements_t *source, ctx->var_head = ctx->var_tail = NULL; ctx->func_head = ctx->func_tail = NULL; ctx->from_eval = from_eval; + ctx->func = func; + ctx->locals_cnt = 0; + + if(func_expr) { + parameter_t *param_iter; + + func->source = func_expr->src_str; + func->source_len = func_expr->src_len; + + for(param_iter = func_expr->parameter_list; param_iter; param_iter = param_iter->next) + func->param_cnt++; + + func->params = compiler_alloc(ctx->code, func->param_cnt * sizeof(*func->params)); + if(!func->params) + return E_OUTOFMEMORY; + + for(param_iter = func_expr->parameter_list, i=0; param_iter; param_iter = param_iter->next, i++) { + func->params[i] = compiler_alloc_bstr(ctx, param_iter->identifier); + if(!func->params[i]) + return E_OUTOFMEMORY; + } + } + + for(i = 0; i < func->param_cnt; i++) { + if(!find_local(ctx, func->params[i]) && !alloc_local(ctx, func->params[i], -i-1)) + return E_OUTOFMEMORY; + } off = ctx->code_off; - ctx->func = func; hres = compile_block_statement(ctx, source->statement); if(FAILED(hres)) return hres; @@ -1888,26 +1958,6 @@ static HRESULT compile_function(compiler_ctx_t *ctx, source_elements_t *source, } } - if(func_expr) { - parameter_t *param_iter; - - func->source = func_expr->src_str; - func->source_len = func_expr->src_len; - - for(param_iter = func_expr->parameter_list; param_iter; param_iter = param_iter->next) - func->param_cnt++; - - func->params = compiler_alloc(ctx->code, func->param_cnt * sizeof(*func->params)); - if(!func->params) - return E_OUTOFMEMORY; - - for(param_iter = func_expr->parameter_list, i=0; param_iter; param_iter = param_iter->next, i++) { - func->params[i] = compiler_alloc_bstr(ctx, param_iter->identifier); - if(!func->params[i]) - return E_OUTOFMEMORY; - } - } - func->variables = compiler_alloc(ctx->code, func->var_cnt * sizeof(*func->variables)); if(!func->variables) return E_OUTOFMEMORY; @@ -1920,6 +1970,12 @@ static HRESULT compile_function(compiler_ctx_t *ctx, source_elements_t *source, assert(i == func->var_cnt); + func->locals = compiler_alloc(ctx->code, ctx->locals_cnt * sizeof(*func->locals)); + if(!func->locals) + return E_OUTOFMEMORY; + func->locals_cnt = ctx->locals_cnt; + memcpy(func->locals, ctx->locals_buf, func->locals_cnt * sizeof(*func->locals)); + func->funcs = compiler_alloc(ctx->code, func->func_cnt * sizeof(*func->funcs)); if(!func->funcs) return E_OUTOFMEMORY; @@ -2038,6 +2094,7 @@ HRESULT compile_script(script_ctx_t *ctx, const WCHAR *code, const WCHAR *args, hres = compile_function(&compiler, compiler.parser->source, NULL, from_eval, &compiler.code->global_code); parser_release(compiler.parser); + heap_free(compiler.locals_buf); if(FAILED(hres)) { release_bytecode(compiler.code); return hres; diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 11b5618..187a8b7 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -589,6 +589,11 @@ static BOOL lookup_global_members(script_ctx_t *ctx, BSTR identifier, exprval_t return FALSE; } +static int local_ref_cmp(const void *key, const void *ref) +{ + return strcmpW((const WCHAR*)key, ((const local_ref_t*)ref)->name); +} + /* ECMA-262 3rd Edition 10.1.4 */ static HRESULT identifier_eval(script_ctx_t *ctx, BSTR identifier, exprval_t *ret) { @@ -603,14 +608,12 @@ static HRESULT identifier_eval(script_ctx_t *ctx, BSTR identifier, exprval_t *re for(scope = ctx->call_ctx->scope; scope; scope = scope->next) { if(scope->frame) { function_code_t *func = scope->frame->function; - int i; - - for(i = 0; i < func->param_cnt; i++) { - if(!strcmpW(identifier, func->params[i])) { - ret->type = EXPRVAL_STACK_REF; - ret->u.off = scope->frame->arguments_off+i; - return S_OK; - } + local_ref_t *ref = bsearch(identifier, func->locals, func->locals_cnt, sizeof(*func->locals), local_ref_cmp); + + if(ref) { + ret->type = EXPRVAL_STACK_REF; + ret->u.off = scope->frame->arguments_off - ref->ref - 1; + return S_OK; } } if(scope->jsobj) diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index 3a3f37b..1aebfd7 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -126,6 +126,11 @@ typedef struct { } u; } instr_t; +typedef struct { + BSTR name; + int ref; +} local_ref_t; + typedef struct _function_code_t { BSTR name; BSTR event_target; @@ -142,6 +147,9 @@ typedef struct _function_code_t { unsigned param_cnt; BSTR *params; + + unsigned locals_cnt; + local_ref_t *locals; } function_code_t; typedef struct _bytecode_t {

1 0

← Newer
1
...
65
66
67
68
69
70
71
...
78
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 August 2016