June 2016 - Wine-Commits - list.winehq.org

Piotr Caban : ucrtbase: Add _set_thread_local_invalid_parameter_handler implementation.
by Alexandre Julliard June 21, 2016

June 21, 2016

Module: wine Branch: master Commit: c35d07fcd146826d05203a5746f2918d5b3d0bc6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c35d07fcd146826d05203a574… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jun 20 17:48:19 2016 +0200 ucrtbase: Add _set_thread_local_invalid_parameter_handler implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/errno.c | 25 ++++++++++-- dlls/msvcrt/msvcrt.h | 3 ++ dlls/ucrtbase/tests/misc.c | 95 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 119 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/errno.c b/dlls/msvcrt/errno.c index 75e211e..641ca35 100644 --- a/dlls/msvcrt/errno.c +++ b/dlls/msvcrt/errno.c @@ -433,6 +433,16 @@ void CDECL _seterrormode(int mode) void __cdecl MSVCRT__invalid_parameter(const MSVCRT_wchar_t *expr, const MSVCRT_wchar_t *func, const MSVCRT_wchar_t *file, unsigned int line, MSVCRT_uintptr_t arg) { +#if _MSVCR_VER >= 140 + thread_data_t *data = msvcrt_get_thread_data(); + + if (data->invalid_parameter_handler) + { + data->invalid_parameter_handler( expr, func, file, line, arg ); + return; + } +#endif + if (invalid_parameter_handler) invalid_parameter_handler( expr, func, file, line, arg ); else { @@ -474,13 +484,14 @@ MSVCRT_invalid_parameter_handler CDECL _set_invalid_parameter_handler( return old; } +#if _MSVCR_VER >= 140 /********************************************************************* * _get_thread_local_invalid_parameter_handler (UCRTBASE.@) */ MSVCRT_invalid_parameter_handler CDECL _get_thread_local_invalid_parameter_handler(void) { - FIXME(" stub\n"); - return NULL; + TRACE("\n"); + return msvcrt_get_thread_data()->invalid_parameter_handler; } /********************************************************************* @@ -489,6 +500,12 @@ MSVCRT_invalid_parameter_handler CDECL _get_thread_local_invalid_parameter_handl MSVCRT_invalid_parameter_handler CDECL _set_thread_local_invalid_parameter_handler( MSVCRT_invalid_parameter_handler handler) { - FIXME("(%p) stub\n", handler); - return NULL; + thread_data_t *data = msvcrt_get_thread_data(); + MSVCRT_invalid_parameter_handler old = data->invalid_parameter_handler; + + TRACE("(%p)\n", handler); + + data->invalid_parameter_handler = handler; + return old; } +#endif diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 2d3fc94..6c2ab42 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -266,6 +266,9 @@ struct __thread_data { DWORD cached_cp; char cached_locale[131]; void *unk10[100]; +#if _MSVCR_VER >= 140 + MSVCRT_invalid_parameter_handler invalid_parameter_handler; +#endif }; typedef struct __thread_data thread_data_t; diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c index d427bb5..0111d2b 100644 --- a/dlls/ucrtbase/tests/misc.c +++ b/dlls/ucrtbase/tests/misc.c @@ -27,6 +27,33 @@ #include <winbase.h> #include "wine/test.h" +#define DEFINE_EXPECT(func) \ + static BOOL expect_ ## func = FALSE, called_ ## func = FALSE + +#define SET_EXPECT(func) \ + expect_ ## func = TRUE + +#define CHECK_EXPECT2(func) \ + do { \ + ok(expect_ ##func, "unexpected call " #func "\n"); \ + called_ ## func = TRUE; \ + }while(0) + +#define CHECK_EXPECT(func) \ + do { \ + CHECK_EXPECT2(func); \ + expect_ ## func = FALSE; \ + }while(0) + +#define CHECK_CALLED(func) \ + do { \ + ok(called_ ## func, "expected " #func "\n"); \ + expect_ ## func = called_ ## func = FALSE; \ + }while(0) + +DEFINE_EXPECT(global_invalid_parameter_handler); +DEFINE_EXPECT(thread_invalid_parameter_handler); + typedef int (CDECL *MSVCRT__onexit_t)(void); typedef struct MSVCRT__onexit_table_t @@ -41,6 +68,11 @@ static int (CDECL *p_register_onexit_function)(MSVCRT__onexit_table_t *table, MS static int (CDECL *p_execute_onexit_table)(MSVCRT__onexit_table_t *table); static int (CDECL *p___fpe_flt_rounds)(void); static unsigned int (CDECL *p__controlfp)(unsigned int, unsigned int); +static _invalid_parameter_handler (CDECL *p__set_invalid_parameter_handler)(_invalid_parameter_handler); +static _invalid_parameter_handler (CDECL *p__get_invalid_parameter_handler)(void); +static _invalid_parameter_handler (CDECL *p__set_thread_local_invalid_parameter_handler)(_invalid_parameter_handler); +static _invalid_parameter_handler (CDECL *p__get_thread_local_invalid_parameter_handler)(void); +static int (CDECL *p__ltoa_s)(LONG, char*, size_t, int); static void test__initialize_onexit_table(void) { @@ -223,6 +255,63 @@ static void test___fpe_flt_rounds(void) ok(ret == 0, "__fpe_flt_rounds returned %d\n", ret); } +static void __cdecl global_invalid_parameter_handler( + const wchar_t *expression, const wchar_t *function, + const wchar_t *file, unsigned line, uintptr_t arg) +{ + CHECK_EXPECT(global_invalid_parameter_handler); +} + +static void __cdecl thread_invalid_parameter_handler( + const wchar_t *expression, const wchar_t *function, + const wchar_t *file, unsigned line, uintptr_t arg) +{ + CHECK_EXPECT(thread_invalid_parameter_handler); +} + +static void test_invalid_parameter_handler(void) +{ + _invalid_parameter_handler ret; + + ret = p__get_invalid_parameter_handler(); + ok(!ret, "ret != NULL\n"); + + ret = p__get_thread_local_invalid_parameter_handler(); + ok(!ret, "ret != NULL\n"); + + ret = p__set_thread_local_invalid_parameter_handler(thread_invalid_parameter_handler); + ok(!ret, "ret != NULL\n"); + + ret = p__get_thread_local_invalid_parameter_handler(); + ok(ret == thread_invalid_parameter_handler, "ret = %p\n", ret); + + ret = p__get_invalid_parameter_handler(); + ok(!ret, "ret != NULL\n"); + + ret = p__set_invalid_parameter_handler(global_invalid_parameter_handler); + ok(!ret, "ret != NULL\n"); + + ret = p__get_invalid_parameter_handler(); + ok(ret == global_invalid_parameter_handler, "ret = %p\n", ret); + + ret = p__get_thread_local_invalid_parameter_handler(); + ok(ret == thread_invalid_parameter_handler, "ret = %p\n", ret); + + SET_EXPECT(thread_invalid_parameter_handler); + p__ltoa_s(0, NULL, 0, 0); + CHECK_CALLED(thread_invalid_parameter_handler); + + ret = p__set_thread_local_invalid_parameter_handler(NULL); + ok(ret == thread_invalid_parameter_handler, "ret = %p\n", ret); + + SET_EXPECT(global_invalid_parameter_handler); + p__ltoa_s(0, NULL, 0, 0); + CHECK_CALLED(global_invalid_parameter_handler); + + ret = p__set_invalid_parameter_handler(NULL); + ok(ret == global_invalid_parameter_handler, "ret = %p\n", ret); +} + static BOOL init(void) { HMODULE module = LoadLibraryA("ucrtbase.dll"); @@ -237,6 +326,11 @@ static BOOL init(void) p_execute_onexit_table = (void*)GetProcAddress(module, "_execute_onexit_table"); p___fpe_flt_rounds = (void*)GetProcAddress(module, "__fpe_flt_rounds"); p__controlfp = (void*)GetProcAddress(module, "_controlfp"); + p__set_invalid_parameter_handler = (void*)GetProcAddress(module, "_set_invalid_parameter_handler"); + p__get_invalid_parameter_handler = (void*)GetProcAddress(module, "_get_invalid_parameter_handler"); + p__set_thread_local_invalid_parameter_handler = (void*)GetProcAddress(module, "_set_thread_local_invalid_parameter_handler"); + p__get_thread_local_invalid_parameter_handler = (void*)GetProcAddress(module, "_get_thread_local_invalid_parameter_handler"); + p__ltoa_s = (void*)GetProcAddress(module, "_ltoa_s"); return TRUE; } @@ -246,6 +340,7 @@ START_TEST(misc) if(!init()) return; + test_invalid_parameter_handler(); test__initialize_onexit_table(); test__register_onexit_function(); test__execute_onexit_table();

1 0

Alexandre Julliard : gdi32: Implement bounds for FillPath, StrokeAndFillPath and StrokePath in enhanced metafiles.
by Alexandre Julliard June 21, 2016

June 21, 2016

Module: wine Branch: master Commit: c7bbc83062bad9dbd095e52988eedc0a9a096405 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7bbc83062bad9dbd095e5298… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 21 15:16:04 2016 +0900 gdi32: Implement bounds for FillPath, StrokeAndFillPath and StrokePath in enhanced metafiles. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/enhmfdrv/dc.c | 42 ----------------------------------- dlls/gdi32/enhmfdrv/graphics.c | 50 ++++++++++++++++++++++++++++++++++++++++++ dlls/gdi32/tests/metafile.c | 23 ++++++++++++++----- 3 files changed, 67 insertions(+), 48 deletions(-) diff --git a/dlls/gdi32/enhmfdrv/dc.c b/dlls/gdi32/enhmfdrv/dc.c index 12f03f4..00f4d65 100644 --- a/dlls/gdi32/enhmfdrv/dc.c +++ b/dlls/gdi32/enhmfdrv/dc.c @@ -471,20 +471,6 @@ BOOL EMFDRV_EndPath( PHYSDEV dev ) return FALSE; /* always fails without a path */ } -BOOL EMFDRV_FillPath( PHYSDEV dev ) -{ - EMRFILLPATH emr; - - emr.emr.iType = EMR_FILLPATH; - emr.emr.nSize = sizeof(emr); - FIXME("Bounds\n"); - emr.rclBounds.left = 0; - emr.rclBounds.top = 0; - emr.rclBounds.right = 0; - emr.rclBounds.bottom = 0; - return EMFDRV_WriteRecord( dev, &emr.emr ); -} - BOOL EMFDRV_FlattenPath( PHYSDEV dev ) { EMRFLATTENPATH emr; @@ -508,34 +494,6 @@ BOOL EMFDRV_SelectClipPath( PHYSDEV dev, INT iMode ) return next->funcs->pSelectClipPath( next, iMode ); } -BOOL EMFDRV_StrokeAndFillPath( PHYSDEV dev ) -{ - EMRSTROKEANDFILLPATH emr; - - emr.emr.iType = EMR_STROKEANDFILLPATH; - emr.emr.nSize = sizeof(emr); - FIXME("Bounds\n"); - emr.rclBounds.left = 0; - emr.rclBounds.top = 0; - emr.rclBounds.right = 0; - emr.rclBounds.bottom = 0; - return EMFDRV_WriteRecord( dev, &emr.emr ); -} - -BOOL EMFDRV_StrokePath( PHYSDEV dev ) -{ - EMRSTROKEPATH emr; - - emr.emr.iType = EMR_STROKEPATH; - emr.emr.nSize = sizeof(emr); - FIXME("Bounds\n"); - emr.rclBounds.left = 0; - emr.rclBounds.top = 0; - emr.rclBounds.right = 0; - emr.rclBounds.bottom = 0; - return EMFDRV_WriteRecord( dev, &emr.emr ); -} - BOOL EMFDRV_WidenPath( PHYSDEV dev ) { EMRWIDENPATH emr; diff --git a/dlls/gdi32/enhmfdrv/graphics.c b/dlls/gdi32/enhmfdrv/graphics.c index fb0ac9c..d905490 100644 --- a/dlls/gdi32/enhmfdrv/graphics.c +++ b/dlls/gdi32/enhmfdrv/graphics.c @@ -96,6 +96,32 @@ static void get_points_bounds( RECTL *bounds, const POINT *pts, UINT count, HDC } } +/* helper for path stroke and fill functions */ +static BOOL emfdrv_stroke_and_fill_path( PHYSDEV dev, INT type ) +{ + EMRSTROKEANDFILLPATH emr; + int count; + POINT *points; + BYTE *flags; + + emr.emr.iType = type; + emr.emr.nSize = sizeof(emr); + + count = get_gdi_flat_path( dev->hdc, &points, &flags, NULL ); + if (count >= 0) + { + get_points_bounds( &emr.rclBounds, points, count, 0 ); + HeapFree( GetProcessHeap(), 0, points ); + HeapFree( GetProcessHeap(), 0, flags ); + } + else emr.rclBounds = empty_bounds; + + if (!EMFDRV_WriteRecord( dev, &emr.emr )) return FALSE; + if (count < 0) return FALSE; + EMFDRV_UpdateBBox( dev, &emr.rclBounds ); + return TRUE; +} + /********************************************************************** * EMFDRV_MoveTo */ @@ -961,3 +987,27 @@ BOOL EMFDRV_GradientFill( PHYSDEV dev, TRIVERTEX *vert_array, ULONG nvert, HeapFree( GetProcessHeap(), 0, emr ); return ret; } + +/********************************************************************** + * EMFDRV_FillPath + */ +BOOL EMFDRV_FillPath( PHYSDEV dev ) +{ + return emfdrv_stroke_and_fill_path( dev, EMR_FILLPATH ); +} + +/********************************************************************** + * EMFDRV_StrokeAndFillPath + */ +BOOL EMFDRV_StrokeAndFillPath( PHYSDEV dev ) +{ + return emfdrv_stroke_and_fill_path( dev, EMR_STROKEANDFILLPATH ); +} + +/********************************************************************** + * EMFDRV_MoveTo + */ +BOOL EMFDRV_StrokePath( PHYSDEV dev ) +{ + return emfdrv_stroke_and_fill_path( dev, EMR_STROKEPATH ); +} diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index f655d01..bcd085c 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -3583,12 +3583,12 @@ static void test_emf_polybezier(void) static const unsigned char EMF_PATH_BITS[] = { 0x01, 0x00, 0x00, 0x00, 0x6c, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0xd8, 0xff, 0xff, 0xff, 0xd8, 0xff, 0xff, 0xff, + 0x0a, 0x00, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00, + 0x96, 0x00, 0x00, 0x00, 0x96, 0x00, 0x00, 0x00, + 0x90, 0x01, 0x00, 0x00, 0x90, 0x01, 0x00, 0x00, + 0x70, 0x17, 0x00, 0x00, 0x70, 0x17, 0x00, 0x00, 0x20, 0x45, 0x4d, 0x46, 0x00, 0x00, 0x01, 0x00, - 0xc8, 0x02, 0x00, 0x00, 0x15, 0x00, 0x00, 0x00, + 0xf8, 0x02, 0x00, 0x00, 0x17, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x03, 0x00, 0x00, 0x58, 0x02, 0x00, 0x00, @@ -3668,7 +3668,13 @@ static const unsigned char EMF_PATH_BITS[] = 0x25, 0x00, 0x00, 0x00, 0x24, 0x00, 0x00, 0x00, 0x17, 0x00, 0x00, 0x00, 0x00, 0x00, 0xb4, 0x42, 0x00, 0x00, 0x34, 0x43, 0x3c, 0x00, 0x00, 0x00, - 0x08, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, + 0x08, 0x00, 0x00, 0x00, 0x3f, 0x00, 0x00, 0x00, + 0x18, 0x00, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00, + 0x0a, 0x00, 0x00, 0x00, 0x96, 0x00, 0x00, 0x00, + 0x96, 0x00, 0x00, 0x00, 0x3f, 0x00, 0x00, 0x00, + 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0x0e, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00 }; @@ -3745,6 +3751,11 @@ static void test_emf_paths(void) size = GetPath(hdcMetafile, NULL, NULL, 0); todo_wine ok( size == 112, "GetPath returned %d.\n", size); + ret = StrokeAndFillPath( hdcMetafile ); + ok( ret, "StrokeAndFillPath failed err %d\n", GetLastError() ); + ret = StrokeAndFillPath( hdcMetafile ); + ok( !ret, "StrokeAndFillPath succeeded\n" ); + hemf = CloseEnhMetaFile(hdcMetafile); ok(hemf != 0, "CloseEnhMetaFile error %d\n", GetLastError());

1 0

Alexandre Julliard : gdi32: Implement a path driver for enhanced metafiles.
by Alexandre Julliard June 21, 2016

June 21, 2016

Module: wine Branch: master Commit: 625ff9b528a5aa11e31df2ed467ccc2f115c7ff8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=625ff9b528a5aa11e31df2ed4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 21 14:38:19 2016 +0900 gdi32: Implement a path driver for enhanced metafiles. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/enhmfdrv/dc.c | 473 ++++++++++++++++++++++++++++++++++- dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 1 + dlls/gdi32/tests/metafile.c | 75 +++++- 3 files changed, 535 insertions(+), 14 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=625ff9b528a5aa11e31df…

1 0

Alexandre Julliard : gdi32: Implement DeleteDC in the path driver.
by Alexandre Julliard June 21, 2016

June 21, 2016

Module: wine Branch: master Commit: 234daa752270899a13bd12bc01fbca63c05c7486 URL: http://source.winehq.org/git/wine.git/?a=commit;h=234daa752270899a13bd12bc0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 21 14:46:04 2016 +0900 gdi32: Implement DeleteDC in the path driver. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/path.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/dlls/gdi32/path.c b/dlls/gdi32/path.c index de4193f..c6b87d4 100644 --- a/dlls/gdi32/path.c +++ b/dlls/gdi32/path.c @@ -99,7 +99,7 @@ struct path_physdev static inline struct path_physdev *get_path_physdev( PHYSDEV dev ) { - return (struct path_physdev *)dev; + return CONTAINING_RECORD( dev, struct path_physdev, dev ); } void free_gdi_path( struct gdi_path *path ) @@ -750,13 +750,9 @@ static BOOL pathdrv_BeginPath( PHYSDEV dev ) */ static BOOL pathdrv_AbortPath( PHYSDEV dev ) { - struct path_physdev *physdev = get_path_physdev( dev ); DC *dc = get_dc_ptr( dev->hdc ); - if (!dc) return FALSE; - free_gdi_path( physdev->path ); - pop_dc_driver( dc, &path_driver ); - HeapFree( GetProcessHeap(), 0, physdev ); + path_driver.pDeleteDC( pop_dc_driver( dc, &path_driver )); release_dc_ptr( dc ); return TRUE; } @@ -770,7 +766,6 @@ static BOOL pathdrv_EndPath( PHYSDEV dev ) struct path_physdev *physdev = get_path_physdev( dev ); DC *dc = get_dc_ptr( dev->hdc ); - if (!dc) return FALSE; dc->path = physdev->path; pop_dc_driver( dc, &path_driver ); HeapFree( GetProcessHeap(), 0, physdev ); @@ -801,7 +796,10 @@ static BOOL pathdrv_CreateDC( PHYSDEV *dev, LPCWSTR driver, LPCWSTR device, */ static BOOL pathdrv_DeleteDC( PHYSDEV dev ) { - assert( 0 ); /* should never be called */ + struct path_physdev *physdev = get_path_physdev( dev ); + + free_gdi_path( physdev->path ); + HeapFree( GetProcessHeap(), 0, physdev ); return TRUE; }

1 0

Jacek Caban : jscript: Properly handle arguments in Object constructor.
by Alexandre Julliard June 21, 2016

June 21, 2016

Module: wine Branch: master Commit: 68dddd8d8963bb7551abfbe8601d82138063feb6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68dddd8d8963bb7551abfbe86… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 20 20:54:48 2016 +0200 jscript: Properly handle arguments in Object constructor. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/object.c | 6 +++--- dlls/jscript/tests/api.js | 15 +++++++++++++++ 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/object.c b/dlls/jscript/object.c index 71bed7b..827040b 100644 --- a/dlls/jscript/object.c +++ b/dlls/jscript/object.c @@ -261,6 +261,9 @@ static HRESULT ObjectConstr_value(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags switch(flags) { case DISPATCH_METHOD: + case DISPATCH_CONSTRUCT: { + jsdisp_t *obj; + if(argc) { if(!is_undefined(argv[0]) && !is_null(argv[0]) && (!is_object_instance(argv[0]) || get_object(argv[0]))) { IDispatch *disp; @@ -276,9 +279,6 @@ static HRESULT ObjectConstr_value(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags return S_OK; } } - /* fall through */ - case DISPATCH_CONSTRUCT: { - jsdisp_t *obj; hres = create_object(ctx, NULL, &obj); if(FAILED(hres)) diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index ca6131b..1ca974d 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -350,12 +350,27 @@ ok(Object(1) instanceof Number, "Object(1) is not instance of Number"); ok(Object("") instanceof String, "Object('') is not instance of String"); ok(Object(false) instanceof Boolean, "Object(false) is not instance of Boolean"); +ok(new Object(1) instanceof Number, "Object(1) is not instance of Number"); +ok(new Object("") instanceof String, "Object('') is not instance of String"); +ok(new Object(false) instanceof Boolean, "Object(false) is not instance of Boolean"); + obj = new Object(); ok(Object(obj) === obj, "Object(obj) !== obj"); ok(typeof(Object()) === "object", "typeof(Object()) !== 'object'"); ok(typeof(Object(undefined)) === "object", "typeof(Object(undefined)) !== 'object'"); ok(typeof(Object(null)) === "object", "typeof(Object(null)) !== 'object'"); +ok(typeof(Object(nullDisp)) === "object", "typeof(Object(nullDisp)) !== 'object'"); + +ok(Object(nullDisp) != nullDisp, "Object(nullDisp) == nullDisp"); +ok(new Object(nullDisp) != nullDisp, "new Object(nullDisp) == nullDisp"); + +ok(Object(testObj) === testObj, "Object(testObj) != testObj\n"); +ok(new Object(testObj) === testObj, "new Object(testObj) != testObj\n"); + +tmp = new Object(); +ok(Object(tmp) === tmp, "Object(tmp) != tmp"); +ok(new Object(tmp) === tmp, "new Object(tmp) != tmp"); var obj = new Object(); obj.toString = function (x) {

1 0

Michael Stefaniuc : comctl32/tests: Use EqualRect() instead of memcmp() to compare RECTs.
by Alexandre Julliard June 21, 2016

June 21, 2016

Module: wine Branch: master Commit: cbca4b3f511b5fbc5380a61b433890b5af082327 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cbca4b3f511b5fbc5380a61b4… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jun 20 13:42:15 2016 +0200 comctl32/tests: Use EqualRect() instead of memcmp() to compare RECTs. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/listview.c | 2 +- dlls/comctl32/tests/toolbar.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index ed5d9f9..1444a9f 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -908,7 +908,7 @@ static void test_images(void) r = SendMessageA(hwnd, LVM_GETITEMRECT, 0, (LPARAM) &r2); expect(1, r); - ok(!memcmp(&r1, &r2, sizeof r1), "rectangle should be the same\n"); + ok(EqualRect(&r1, &r2), "rectangle should be the same\n"); DestroyWindow(hwnd); } diff --git a/dlls/comctl32/tests/toolbar.c b/dlls/comctl32/tests/toolbar.c index d825e18..efad00a 100644 --- a/dlls/comctl32/tests/toolbar.c +++ b/dlls/comctl32/tests/toolbar.c @@ -1232,7 +1232,7 @@ static DWORD tbsize_alt_numtests = 0; for (i=0; i<min(buttonCount, res->nButtons); i++) { \ ok(SendMessageA(hToolbar, TB_GETITEMRECT, i, (LPARAM)&rc) == 1, "TB_GETITEMRECT\n"); \ if (broken(tbsize_alt_numtests < sizeof(tbsize_alt_results)/sizeof(tbsize_alt_results[0]) && \ - memcmp(&rc, &tbsize_alt_results[tbsize_alt_numtests].rcButton, sizeof(RECT)) == 0)) { \ + EqualRect(&rc, &tbsize_alt_results[tbsize_alt_numtests].rcButton))) { \ win_skip("Alternate rect found\n"); \ tbsize_alt_numtests++; \ } else if (!(mask&1)) { \

1 0

Nikolay Sivov : msscript: Implement GetActivationPolicy().
by Alexandre Julliard June 20, 2016

June 20, 2016

Module: wine Branch: master Commit: d62974a508d7427d3189cf2c3fba4ae41d4c1d4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d62974a508d7427d3189cf2c3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jun 20 14:00:31 2016 +0300 msscript: Implement GetActivationPolicy(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msscript.ocx/msscript.c | 8 ++++++-- dlls/msscript.ocx/tests/msscript.c | 9 +++++++++ 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/msscript.ocx/msscript.c b/dlls/msscript.ocx/msscript.c index db4d901..66018d3 100644 --- a/dlls/msscript.ocx/msscript.c +++ b/dlls/msscript.ocx/msscript.c @@ -1078,9 +1078,13 @@ static HRESULT WINAPI PointerInactive_GetActivationPolicy(IPointerInactive *ifac { ScriptControl *This = impl_from_IPointerInactive(iface); - FIXME("(%p)->(%p)\n", This, policy); + TRACE("(%p)->(%p)\n", This, policy); - return E_NOTIMPL; + if (!policy) + return E_POINTER; + + *policy = 0; + return S_OK; } static HRESULT WINAPI PointerInactive_OnInactiveMouseMove(IPointerInactive *iface, const RECT *bounds, diff --git a/dlls/msscript.ocx/tests/msscript.c b/dlls/msscript.ocx/tests/msscript.c index 287daf9..9043361 100644 --- a/dlls/msscript.ocx/tests/msscript.c +++ b/dlls/msscript.ocx/tests/msscript.c @@ -847,6 +847,7 @@ static void test_pointerinactive(void) { IPointerInactive *pi; IScriptControl *sc; + DWORD policy; HRESULT hr; hr = CoCreateInstance(&CLSID_ScriptControl, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, @@ -856,6 +857,14 @@ static void test_pointerinactive(void) hr = IScriptControl_QueryInterface(sc, &IID_IPointerInactive, (void**)&pi); ok(hr == S_OK, "got 0x%08x\n", hr); + if (0) /* crashes w2k3 */ + hr = IPointerInactive_GetActivationPolicy(pi, NULL); + + policy = 123; + hr = IPointerInactive_GetActivationPolicy(pi, &policy); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(policy == 0, "got %#x\n", policy); + IPointerInactive_Release(pi); IScriptControl_Release(sc); }

1 0

Michael Stefaniuc : gdi32/tests: Use wine_dbgstr_rect() to print RECTs.
by Alexandre Julliard June 20, 2016

June 20, 2016

Module: wine Branch: master Commit: 75426bb92645168b921235c7a1ec12a4f6a5a6fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=75426bb92645168b921235c7a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jun 20 11:56:26 2016 +0200 gdi32/tests: Use wine_dbgstr_rect() to print RECTs. Two old (win95 and winnt) broken() removed en passant. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/clipping.c | 60 +++++++++-------------- dlls/gdi32/tests/dc.c | 114 ++++++++++++++++++-------------------------- dlls/gdi32/tests/dib.c | 2 +- dlls/gdi32/tests/mapping.c | 27 ++++------- dlls/gdi32/tests/metafile.c | 47 +++++++----------- 5 files changed, 96 insertions(+), 154 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=75426bb92645168b92123…

1 0

Iván Matellanes : msvcirt: Fix implementation of strstreambuf::underflow.
by Alexandre Julliard June 20, 2016

June 20, 2016

Module: wine Branch: master Commit: 025c54344230ca8b32e80f08b9af13a16dfd2445 URL: http://source.winehq.org/git/wine.git/?a=commit;h=025c54344230ca8b32e80f08b… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Mon Jun 20 13:32:09 2016 +0100 msvcirt: Fix implementation of strstreambuf::underflow. Spotted while testing for ostream printing. Signed-off-by: Iván Matellanes <matellanes.ivan(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcirt/msvcirt.c | 5 ++++- dlls/msvcirt/tests/msvcirt.c | 28 ++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 1 deletion(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index fe5901a..e4fb3fb 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -1469,8 +1469,11 @@ int __thiscall strstreambuf_underflow(strstreambuf *this) if (this->base.gptr < this->base.egptr) return *this->base.gptr; /* extend the get area to include the characters written */ - if (this->base.egptr < this->base.pptr) + if (this->base.egptr < this->base.pptr) { + this->base.gptr = this->base.base + (this->base.gptr - this->base.eback); + this->base.eback = this->base.base; this->base.egptr = this->base.pptr; + } return (this->base.gptr < this->base.egptr) ? *this->base.gptr : EOF; } diff --git a/dlls/msvcirt/tests/msvcirt.c b/dlls/msvcirt/tests/msvcirt.c index a6916c1..428ddf3 100644 --- a/dlls/msvcirt/tests/msvcirt.c +++ b/dlls/msvcirt/tests/msvcirt.c @@ -1745,8 +1745,36 @@ static void test_strstreambuf(void) ssb2.base.pbase = ssb2.base.pptr = ssb2.base.epptr = NULL; ret = (int) call_func1(p_strstreambuf_underflow, &ssb2); ok(ret == EOF, "expected EOF got %d\n", ret); + ssb2.base.pbase = ssb2.base.pptr = ssb2.base.base; + ret = (int) call_func1(p_strstreambuf_underflow, &ssb2); + ok(ret == EOF, "expected EOF got %d\n", ret); + ok(ssb2.base.eback == ssb2.base.base, "wrong get base, expected %p got %p\n", ssb2.base.base, ssb2.base.eback); + ok(ssb2.base.gptr == ssb2.base.base, "wrong get pointer, expected %p got %p\n", ssb2.base.base, ssb2.base.gptr); + ok(ssb2.base.egptr == ssb2.base.base, "wrong get end, expected %p got %p\n", ssb2.base.base, ssb2.base.egptr); + ssb2.base.pptr = ssb2.base.base + 3; + ret = (int) call_func1(p_strstreambuf_underflow, &ssb2); + ok(ret == 'C', "expected 'C' got %d\n", ret); + ok(ssb2.base.eback == ssb2.base.base, "wrong get base, expected %p got %p\n", ssb2.base.base, ssb2.base.eback); + ok(ssb2.base.gptr == ssb2.base.base, "wrong get pointer, expected %p got %p\n", ssb2.base.base, ssb2.base.gptr); + ok(ssb2.base.egptr == ssb2.base.base + 3, "wrong get end, expected %p got %p\n", ssb2.base.base + 3, ssb2.base.egptr); + ssb2.base.gptr = ssb2.base.base + 2; + ssb2.base.egptr = NULL; + ret = (int) call_func1(p_strstreambuf_underflow, &ssb2); + ok(ret == 'e', "expected 'e' got %d\n", ret); + ok(ssb2.base.eback == ssb2.base.base, "wrong get base, expected %p got %p\n", ssb2.base.base, ssb2.base.eback); + ok(ssb2.base.gptr == ssb2.base.base + 2, "wrong get pointer, expected %p got %p\n", ssb2.base.base, ssb2.base.gptr); + ok(ssb2.base.egptr == ssb2.base.base + 3, "wrong get end, expected %p got %p\n", ssb2.base.base + 3, ssb2.base.egptr); + ssb2.base.eback = ssb2.base.egptr = ssb2.base.base + 1; + ssb2.base.gptr = ssb2.base.base + 3; + ssb2.base.pptr = ssb2.base.base + 5; + ret = (int) call_func1(p_strstreambuf_underflow, &ssb2); + ok(ret == 'e', "expected 'e' got %d\n", ret); + ok(ssb2.base.eback == ssb2.base.base, "wrong get base, expected %p got %p\n", ssb2.base.base, ssb2.base.eback); + ok(ssb2.base.gptr == ssb2.base.base + 2, "wrong get pointer, expected %p got %p\n", ssb2.base.base, ssb2.base.gptr); + ok(ssb2.base.egptr == ssb2.base.base + 5, "wrong get end, expected %p got %p\n", ssb2.base.base + 5, ssb2.base.egptr); ssb2.base.eback = ssb2.base.base; ssb2.base.gptr = ssb2.base.egptr = ssb2.base.ebuf; + ssb2.base.pbase = ssb2.base.pptr = NULL; ret = (int) call_func1(p_strstreambuf_underflow, &ssb2); ok(ret == EOF, "expected EOF got %d\n", ret);

1 0

Alistair Leslie-Hughes : vcruntime140: Forward _set_se_translator.
by Alexandre Julliard June 20, 2016

June 20, 2016

Module: wine Branch: master Commit: eeec1b1a64b81dc3c771bf7f83123109f290b616 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eeec1b1a64b81dc3c771bf7f8… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Jun 19 05:57:25 2016 +0000 vcruntime140: Forward _set_se_translator. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec | 2 +- dlls/ucrtbase/ucrtbase.spec | 2 +- dlls/vcruntime140/vcruntime140.spec | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec index c85a998..06ef550 100644 --- a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec +++ b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec @@ -1149,7 +1149,7 @@ @ stdcall -arch=i386 _seh_longjmp_unwind(ptr) ucrtbase._seh_longjmp_unwind @ stdcall -arch=i386 _seh_longjmp_unwind4(ptr) ucrtbase._seh_longjmp_unwind4 @ cdecl _set_purecall_handler(ptr) ucrtbase._set_purecall_handler -@ stub _set_se_translator +@ cdecl _set_se_translator(ptr) ucrtbase._set_se_translator @ cdecl -arch=i386 -norelay _setjmp3(ptr long) ucrtbase._setjmp3 @ cdecl -arch=i386,x86_64,arm longjmp(ptr long) ucrtbase.longjmp @ cdecl memchr(ptr long long) ucrtbase.memchr diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 64f6276..da03fd1 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -1892,7 +1892,7 @@ @ cdecl _set_new_mode(long) MSVCRT__set_new_mode @ cdecl _set_printf_count_output(long) MSVCRT__set_printf_count_output @ cdecl _set_purecall_handler(ptr) -@ stub _set_se_translator +@ cdecl _set_se_translator(ptr) MSVCRT__set_se_translator @ cdecl _set_thread_local_invalid_parameter_handler(ptr) @ cdecl _seterrormode(long) @ cdecl -arch=i386 -norelay _setjmp3(ptr long) MSVCRT__setjmp3 diff --git a/dlls/vcruntime140/vcruntime140.spec b/dlls/vcruntime140/vcruntime140.spec index ea8c93b..a49e7b9 100644 --- a/dlls/vcruntime140/vcruntime140.spec +++ b/dlls/vcruntime140/vcruntime140.spec @@ -69,7 +69,7 @@ @ stdcall -arch=i386 _seh_longjmp_unwind4(ptr) ucrtbase._seh_longjmp_unwind4 @ stdcall -arch=i386 _seh_longjmp_unwind(ptr) ucrtbase._seh_longjmp_unwind @ cdecl _set_purecall_handler(ptr) ucrtbase._set_purecall_handler -@ stub _set_se_translator +@ cdecl _set_se_translator(ptr) ucrtbase._set_se_translator @ cdecl -arch=i386 -norelay _setjmp3(ptr long) ucrtbase._setjmp3 @ cdecl -arch=i386,x86_64,arm longjmp(ptr long) ucrtbase.longjmp @ cdecl memchr(ptr long long) ucrtbase.memchr

1 0