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

Jacek Caban : wininet: Ignore unknown attributes in get_cookie.
by Alexandre Julliard 21 Jun '16

21 Jun '16

Module: wine Branch: master Commit: 0d9dcf5c8f97bf86790d9a49b2e65441622de2a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d9dcf5c8f97bf86790d9a49b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 20 21:32:48 2016 +0200 wininet: Ignore unknown attributes in get_cookie. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/cookie.c | 5 ++++- dlls/wininet/tests/internet.c | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/cookie.c b/dlls/wininet/cookie.c index 5de2304..38f69e0 100644 --- a/dlls/wininet/cookie.c +++ b/dlls/wininet/cookie.c @@ -911,6 +911,7 @@ DWORD set_cookie(substr_t domain, substr_t path, substr_t name, substr_t data, D static const WCHAR szSecure[] = {'s','e','c','u','r','e'}; static const WCHAR szHttpOnly[] = {'h','t','t','p','o','n','l','y'}; static const WCHAR szVersion[] = {'v','e','r','s','i','o','n','='}; + static const WCHAR max_ageW[] = {'m','a','x','-','a','g','e','='}; /* Skip ';' */ if(data.len) @@ -976,9 +977,11 @@ DWORD set_cookie(substr_t domain, substr_t path, substr_t name, substr_t data, D substr_skip(&data, len); FIXME("version not handled (%s)\n",debugstr_wn(data.str, data.len)); + }else if(data.len >= (len = sizeof(max_ageW)/sizeof(WCHAR)) && !strncmpiW(data.str, max_ageW, len)) { + /* Native doesn't support Max-Age attribute. */ + WARN("Max-Age ignored\n"); }else if(data.len) { FIXME("Unknown additional option %s\n", debugstr_wn(data.str, data.len)); - break; } substr_skip(&data, end_ptr - data.str); diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index db662a2..9b0a2e7 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -388,7 +388,7 @@ static void test_complicated_cookie(void) /* Technically illegal! domain should require 2 dots, but native wininet accepts it */ ret = InternetSetCookieA("http://www.example.com",NULL,"E=F; domain=example.com"); ok(ret == TRUE,"InternetSetCookie failed\n"); - ret = InternetSetCookieA("http://www.example.com",NULL,"G=H; domain=.example.com; path=/foo"); + ret = InternetSetCookieA("http://www.example.com",NULL,"G=H; domain=.example.com; invalid=attr; path=/foo"); ok(ret == TRUE,"InternetSetCookie failed\n"); ret = InternetSetCookieA("http://www.example.com/bar.html",NULL,"I=J; domain=.example.com"); ok(ret == TRUE,"InternetSetCookie failed\n");

1 0

Jacek Caban : wininet: Use INTERNET_SendCallback in ftp.c.
by Alexandre Julliard 21 Jun '16

21 Jun '16

Module: wine Branch: master Commit: 86d14ad17ec702f9cbf67fb4ae802c02134c0f6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=86d14ad17ec702f9cbf67fb4a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 20 21:54:44 2016 +0200 wininet: Use INTERNET_SendCallback in ftp.c. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/ftp.c | 44 +++++++++++++++++++------------------- dlls/wininet/internet.h | 4 ---- dlls/wininet/utility.c | 57 ------------------------------------------------- 3 files changed, 22 insertions(+), 83 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=86d14ad17ec702f9cbf67…

1 0

Alexandre Julliard : gdi32: Implement DeleteDC in the path driver.
by Alexandre Julliard 21 Jun '16

21 Jun '16

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

Alexandre Julliard : gdi32: Add a helper function to return the metafile device.
by Alexandre Julliard 21 Jun '16

21 Jun '16

Module: wine Branch: master Commit: 6bab6ad40d28c05661d2b3638a749b1a5c03eba7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6bab6ad40d28c05661d2b3638… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 21 14:52:43 2016 +0900 gdi32: Add a helper function to return the metafile device. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/enhmfdrv/dc.c | 10 +++++----- dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 4 ++++ dlls/gdi32/enhmfdrv/graphics.c | 18 +++++++++--------- dlls/gdi32/enhmfdrv/init.c | 14 +++++++------- dlls/gdi32/enhmfdrv/objects.c | 18 +++++++++--------- 5 files changed, 34 insertions(+), 30 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6bab6ad40d28c05661d2b…

1 0

Alexandre Julliard : gdi32: Implement a path driver for enhanced metafiles.
by Alexandre Julliard 21 Jun '16

21 Jun '16

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 bounds for FillPath, StrokeAndFillPath and StrokePath in enhanced metafiles.
by Alexandre Julliard 21 Jun '16

21 Jun '16

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

Michael Stefaniuc : user32/tests: Use the stricter !IsRectEmpty() check.
by Alexandre Julliard 20 Jun '16

20 Jun '16

Module: wine Branch: master Commit: 827cd8f332a23dc6b70a05e5f222818e09059591 URL: http://source.winehq.org/git/wine.git/?a=commit;h=827cd8f332a23dc6b70a05e5f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jun 20 12:07:20 2016 +0200 user32/tests: Use the stricter !IsRectEmpty() check. The EMPTY macro is much stricter than IsRectEmpty() as it checks for zero heigth AND width aka rect has the size of a point. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/text.c | 96 ++++++++++++++++++++---------------------------- 1 file changed, 40 insertions(+), 56 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=827cd8f332a23dc6b70a0…

1 0

Michael Stefaniuc : user32/tests: Finish the move to use wine_dbgstr_rect( ).
by Alexandre Julliard 20 Jun '16

20 Jun '16

Module: wine Branch: master Commit: c03ccff2ba4e8eb69f2a7492ab4b956e811c8a0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c03ccff2ba4e8eb69f2a7492a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jun 20 12:08:13 2016 +0200 user32/tests: Finish the move to use wine_dbgstr_rect(). Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/text.c | 34 ++++++++++++---------------------- 1 file changed, 12 insertions(+), 22 deletions(-) diff --git a/dlls/user32/tests/text.c b/dlls/user32/tests/text.c index e04f1e3..8438f10 100644 --- a/dlls/user32/tests/text.c +++ b/dlls/user32/tests/text.c @@ -130,15 +130,12 @@ static void test_DrawTextCalcRect(void) SetRect( &rect, 10,10, 100, 100); SetLastError( 0); heightcheck = textheight = DrawTextExA(hdc, emptystring, -1, &rect, DT_CALCRECT, NULL ); - ok( EMPTY(rect), - "rectangle should be empty got %d,%d-%d,%d\n", rect.left, rect.top, rect.right, rect.bottom ); + ok(EMPTY(rect), "rectangle should be empty got %s\n", wine_dbgstr_rect(&rect)); ok(textheight!=0,"Failed to get textheight from DrawTextExA\n"); SetRect( &rect, 10,10, 100, 100); textheight = DrawTextA(hdc, emptystring, -1, &rect, DT_CALCRECT); - ok( EMPTY(rect), - "rectangle should be empty got %d,%d-%d,%d\n", - rect.left, rect.top, rect.right, rect.bottom ); + ok(EMPTY(rect), "rectangle should be empty got %s\n", wine_dbgstr_rect(&rect)); ok(textheight!=0,"Failed to get textheight from DrawTextA\n"); ok(textheight == heightcheck,"DrawTextEx and DrawText differ in return\n"); @@ -197,15 +194,14 @@ static void test_DrawTextCalcRect(void) SetRect( &rect, 10,10, 100, 100); SetLastError( 0); heightcheck = textheight = DrawTextExA(hdc, emptystring, -1, &rect, DT_CALCRECT|DT_SINGLELINE, NULL ); - ok( !EMPTY(rect) && MODIFIED(rect), - "rectangle should be modified got %d,%d-%d,%d\n", rect.left, rect.top, rect.right, rect.bottom ); + ok(!EMPTY(rect) && MODIFIED(rect), "rectangle should be modified got %s\n", + wine_dbgstr_rect(&rect)); ok(textheight!=0,"Failed to get textheight from DrawTextExA\n"); SetRect( &rect, 10,10, 100, 100); textheight = DrawTextA(hdc, emptystring, -1, &rect, DT_CALCRECT|DT_SINGLELINE); - ok( !EMPTY(rect) && MODIFIED (rect), - "rectangle should be modified got %d,%d-%d,%d\n", - rect.left, rect.top, rect.right, rect.bottom ); + ok(!EMPTY(rect) && MODIFIED (rect), "rectangle should be modified got %s\n", + wine_dbgstr_rect(&rect)); ok(textheight!=0,"Failed to get textheight from DrawTextA\n"); ok(textheight == heightcheck,"DrawTextEx and DrawText differ in return\n"); @@ -339,16 +335,12 @@ static void test_DrawTextCalcRect(void) SetRect( &rect, 10,10, 100, 100); heightcheck = textheight = DrawTextExW(hdc, emptystringW, -1, &rect, DT_CALCRECT, NULL ); - ok( EMPTY(rect), - "rectangle should be empty got %d,%d-%d,%d\n", - rect.left, rect.top, rect.right, rect.bottom ); + ok(EMPTY(rect), "rectangle should be empty got %s\n", wine_dbgstr_rect(&rect)); ok(textheight!=0,"Failed to get textheight from DrawTextExW\n"); SetRect( &rect, 10,10, 100, 100); textheight = DrawTextW(hdc, emptystringW, -1, &rect, DT_CALCRECT); - ok( EMPTY(rect), - "rectangle should be empty got %d,%d-%d,%d\n", - rect.left, rect.top, rect.right, rect.bottom ); + ok(EMPTY(rect), "rectangle should be empty got %s\n", wine_dbgstr_rect(&rect)); ok(textheight!=0,"Failed to get textheight from DrawTextW\n"); ok(textheight == heightcheck,"DrawTextEx and DrawText differ in return\n"); @@ -406,16 +398,14 @@ static void test_DrawTextCalcRect(void) SetRect( &rect, 10,10, 100, 100); heightcheck = textheight = DrawTextExW(hdc, emptystringW, -1, &rect, DT_CALCRECT|DT_SINGLELINE, NULL ); - ok( !EMPTY(rect) && MODIFIED(rect), - "rectangle should be modified got %d,%d-%d,%d\n", - rect.left, rect.top, rect.right, rect.bottom ); + ok(!EMPTY(rect) && MODIFIED(rect), "rectangle should be modified got %s\n", + wine_dbgstr_rect(&rect)); ok(textheight!=0,"Failed to get textheight from DrawTextExW\n"); SetRect( &rect, 10,10, 100, 100); textheight = DrawTextW(hdc, emptystringW, -1, &rect, DT_CALCRECT|DT_SINGLELINE); - ok( !EMPTY(rect) && MODIFIED(rect), - "rectangle should be modified got %d,%d-%d,%d\n", - rect.left, rect.top, rect.right, rect.bottom ); + ok(!EMPTY(rect) && MODIFIED(rect), "rectangle should be modified got %s\n", + wine_dbgstr_rect(&rect)); ok(textheight!=0,"Failed to get textheight from DrawTextW\n"); ok(textheight == heightcheck,"DrawTextEx and DrawText differ in return\n");

1 0

Nikolay Sivov : msscript: Implement FindConnectionPoint().
by Alexandre Julliard 20 Jun '16

20 Jun '16

Module: wine Branch: master Commit: e9fa3f427a1b8160e4bfd7722aee56275f50ccc7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9fa3f427a1b8160e4bfd7722… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jun 20 14:00:27 2016 +0300 msscript: Implement FindConnectionPoint(). 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 | 145 ++++++++++++++++++++++++++++++++++++- dlls/msscript.ocx/tests/msscript.c | 9 +++ 2 files changed, 152 insertions(+), 2 deletions(-) diff --git a/dlls/msscript.ocx/msscript.c b/dlls/msscript.ocx/msscript.c index 6465104..c307c26 100644 --- a/dlls/msscript.ocx/msscript.c +++ b/dlls/msscript.ocx/msscript.c @@ -29,6 +29,16 @@ WINE_DEFAULT_DEBUG_CHANNEL(msscript); +struct ScriptControl; +typedef struct ConnectionPoint ConnectionPoint; + +struct ConnectionPoint { + IConnectionPoint IConnectionPoint_iface; + ScriptControl *control; + const IID *riid; + ConnectionPoint *next; +}; + struct ScriptControl { IScriptControl IScriptControl_iface; IPersistStreamInit IPersistStreamInit_iface; @@ -38,6 +48,11 @@ struct ScriptControl { LONG ref; IOleClientSite *site; SIZEL extent; + + /* connection points */ + ConnectionPoint *cp_list; + ConnectionPoint cp_scsource; + ConnectionPoint cp_propnotif; }; static HINSTANCE msscript_instance; @@ -146,6 +161,11 @@ static inline ScriptControl *impl_from_IConnectionPointContainer(IConnectionPoin return CONTAINING_RECORD(iface, ScriptControl, IConnectionPointContainer_iface); } +static inline ConnectionPoint *impl_from_IConnectionPoint(IConnectionPoint *iface) +{ + return CONTAINING_RECORD(iface, ConnectionPoint, IConnectionPoint_iface); +} + static HRESULT WINAPI ScriptControl_QueryInterface(IScriptControl *iface, REFIID riid, void **ppv) { ScriptControl *This = impl_from_IScriptControl(iface); @@ -895,10 +915,24 @@ static HRESULT WINAPI ConnectionPointContainer_EnumConnectionPoints(IConnectionP static HRESULT WINAPI ConnectionPointContainer_FindConnectionPoint(IConnectionPointContainer *iface, REFIID riid, IConnectionPoint **cp) { ScriptControl *This = impl_from_IConnectionPointContainer(iface); + ConnectionPoint *iter; - FIXME("(%p)->(%s %p)\n", This, debugstr_guid(riid), cp); + TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), cp); - return E_NOTIMPL; + *cp = NULL; + + for (iter = This->cp_list; iter; iter = iter->next) { + if (IsEqualIID(iter->riid, riid)) + *cp = &iter->IConnectionPoint_iface; + } + + if (*cp) { + IConnectionPoint_AddRef(*cp); + return S_OK; + } + + FIXME("unsupported connection point %s\n", debugstr_guid(riid)); + return CONNECT_E_NOCONNECTION; } static const IConnectionPointContainerVtbl ConnectionPointContainerVtbl = { @@ -909,6 +943,109 @@ static const IConnectionPointContainerVtbl ConnectionPointContainerVtbl = { ConnectionPointContainer_FindConnectionPoint }; +static HRESULT WINAPI ConnectionPoint_QueryInterface(IConnectionPoint *iface, + REFIID riid, void **ppv) +{ + ConnectionPoint *This = impl_from_IConnectionPoint(iface); + + if(IsEqualGUID(&IID_IUnknown, riid)) { + TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); + *ppv = &This->IConnectionPoint_iface; + }else if(IsEqualGUID(&IID_IConnectionPoint, riid)) { + TRACE("(%p)->(IID_IDispatch %p)\n", This, ppv); + *ppv = &This->IConnectionPoint_iface; + }else { + FIXME("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); + *ppv = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI ConnectionPoint_AddRef(IConnectionPoint *iface) +{ + ConnectionPoint *This = impl_from_IConnectionPoint(iface); + return IConnectionPointContainer_AddRef(&This->control->IConnectionPointContainer_iface); +} + +static ULONG WINAPI ConnectionPoint_Release(IConnectionPoint *iface) +{ + ConnectionPoint *This = impl_from_IConnectionPoint(iface); + return IConnectionPointContainer_Release(&This->control->IConnectionPointContainer_iface); +} + +static HRESULT WINAPI ConnectionPoint_GetConnectionInterface(IConnectionPoint *iface, IID *iid) +{ + ConnectionPoint *This = impl_from_IConnectionPoint(iface); + + FIXME("(%p)->(%p)\n", This, iid); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ConnectionPoint_GetConnectionPointContainer(IConnectionPoint *iface, + IConnectionPointContainer **container) +{ + ConnectionPoint *This = impl_from_IConnectionPoint(iface); + + FIXME("(%p)->(%p)\n", This, container); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ConnectionPoint_Advise(IConnectionPoint *iface, IUnknown *unk_sink, + DWORD *cookie) +{ + ConnectionPoint *This = impl_from_IConnectionPoint(iface); + + FIXME("(%p)->(%p %p)\n", This, unk_sink, cookie); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ConnectionPoint_Unadvise(IConnectionPoint *iface, DWORD cookie) +{ + ConnectionPoint *This = impl_from_IConnectionPoint(iface); + + FIXME("(%p)->(%d)\n", This, cookie); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ConnectionPoint_EnumConnections(IConnectionPoint *iface, + IEnumConnections **ppEnum) +{ + ConnectionPoint *This = impl_from_IConnectionPoint(iface); + + FIXME("(%p)->(%p): stub\n", This, ppEnum); + + return E_NOTIMPL; +} + +static const IConnectionPointVtbl ConnectionPointVtbl = +{ + ConnectionPoint_QueryInterface, + ConnectionPoint_AddRef, + ConnectionPoint_Release, + ConnectionPoint_GetConnectionInterface, + ConnectionPoint_GetConnectionPointContainer, + ConnectionPoint_Advise, + ConnectionPoint_Unadvise, + ConnectionPoint_EnumConnections +}; + +static void ConnectionPoint_Init(ConnectionPoint *cp, ScriptControl *sc, REFIID riid) +{ + cp->IConnectionPoint_iface.lpVtbl = &ConnectionPointVtbl; + cp->control = sc; + cp->riid = riid; + + cp->next = sc->cp_list; + sc->cp_list = cp; +} + static HRESULT WINAPI ScriptControl_CreateInstance(IClassFactory *iface, IUnknown *outer, REFIID riid, void **ppv) { ScriptControl *script_control; @@ -929,6 +1066,10 @@ static HRESULT WINAPI ScriptControl_CreateInstance(IClassFactory *iface, IUnknow script_control->IConnectionPointContainer_iface.lpVtbl = &ConnectionPointContainerVtbl; script_control->ref = 1; script_control->site = NULL; + script_control->cp_list = NULL; + + ConnectionPoint_Init(&script_control->cp_scsource, script_control, &DIID_DScriptControlSource); + ConnectionPoint_Init(&script_control->cp_propnotif, script_control, &IID_IPropertyNotifySink); hdc = GetDC(0); dpi_x = GetDeviceCaps(hdc, LOGPIXELSX); diff --git a/dlls/msscript.ocx/tests/msscript.c b/dlls/msscript.ocx/tests/msscript.c index be5fee2..89fd197 100644 --- a/dlls/msscript.ocx/tests/msscript.c +++ b/dlls/msscript.ocx/tests/msscript.c @@ -783,6 +783,7 @@ if (hr == S_OK) static void test_connectionpoints(void) { IConnectionPointContainer *container; + IConnectionPoint *cp; IScriptControl *sc; HRESULT hr; @@ -796,6 +797,14 @@ static void test_connectionpoints(void) EXPECT_REF(sc, 2); EXPECT_REF(container, 2); + hr = IConnectionPointContainer_FindConnectionPoint(container, &IID_IPropertyNotifySink, &cp); + ok(hr == S_OK, "got 0x%08x\n", hr); + IConnectionPoint_Release(cp); + + hr = IConnectionPointContainer_FindConnectionPoint(container, &DIID_DScriptControlSource, &cp); + ok(hr == S_OK, "got 0x%08x\n", hr); + IConnectionPoint_Release(cp); + IConnectionPointContainer_Release(container); IScriptControl_Release(sc); }

1 0

Nikolay Sivov : msscript: Added IQuickActivate stub.
by Alexandre Julliard 20 Jun '16

20 Jun '16

Module: wine Branch: master Commit: fc9ecfe04d68145d694b14a7bc936b3f38d4b2f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc9ecfe04d68145d694b14a7b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jun 20 14:00:28 2016 +0300 msscript: Added IQuickActivate stub. 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 | 64 ++++++++++++++++++++++++++++++++++++++ dlls/msscript.ocx/tests/msscript.c | 18 +++++++++++ 2 files changed, 82 insertions(+) diff --git a/dlls/msscript.ocx/msscript.c b/dlls/msscript.ocx/msscript.c index c307c26..f072dba 100644 --- a/dlls/msscript.ocx/msscript.c +++ b/dlls/msscript.ocx/msscript.c @@ -44,6 +44,7 @@ struct ScriptControl { IPersistStreamInit IPersistStreamInit_iface; IOleObject IOleObject_iface; IOleControl IOleControl_iface; + IQuickActivate IQuickActivate_iface; IConnectionPointContainer IConnectionPointContainer_iface; LONG ref; IOleClientSite *site; @@ -156,6 +157,11 @@ static inline ScriptControl *impl_from_IOleControl(IOleControl *iface) return CONTAINING_RECORD(iface, ScriptControl, IOleControl_iface); } +static inline ScriptControl *impl_from_IQuickActivate(IQuickActivate *iface) +{ + return CONTAINING_RECORD(iface, ScriptControl, IQuickActivate_iface); +} + static inline ScriptControl *impl_from_IConnectionPointContainer(IConnectionPointContainer *iface) { return CONTAINING_RECORD(iface, ScriptControl, IConnectionPointContainer_iface); @@ -191,6 +197,9 @@ static HRESULT WINAPI ScriptControl_QueryInterface(IScriptControl *iface, REFIID }else if(IsEqualGUID(&IID_IOleControl, riid)) { TRACE("(%p)->(IID_IOleControl %p)\n", This, ppv); *ppv = &This->IOleControl_iface; + }else if(IsEqualGUID(&IID_IQuickActivate, riid)) { + TRACE("(%p)->(IID_IQuickActivate %p)\n", This, ppv); + *ppv = &This->IQuickActivate_iface; }else if(IsEqualGUID(&IID_IConnectionPointContainer, riid)) { TRACE("(%p)->(IID_IConnectionPointContainer %p)\n", This, ppv); *ppv = &This->IConnectionPointContainer_iface; @@ -885,6 +894,60 @@ static const IOleControlVtbl OleControlVtbl = { OleControl_FreezeEvents }; +static HRESULT WINAPI QuickActivate_QueryInterface(IQuickActivate *iface, REFIID riid, void **obj) +{ + ScriptControl *This = impl_from_IQuickActivate(iface); + return IScriptControl_QueryInterface(&This->IScriptControl_iface, riid, obj); +} + +static ULONG WINAPI QuickActivate_AddRef(IQuickActivate *iface) +{ + ScriptControl *This = impl_from_IQuickActivate(iface); + return IScriptControl_AddRef(&This->IScriptControl_iface); +} + +static ULONG WINAPI QuickActivate_Release(IQuickActivate *iface) +{ + ScriptControl *This = impl_from_IQuickActivate(iface); + return IScriptControl_Release(&This->IScriptControl_iface); +} + +static HRESULT WINAPI QuickActivate_QuickActivate(IQuickActivate *iface, QACONTAINER *container, QACONTROL *control) +{ + ScriptControl *This = impl_from_IQuickActivate(iface); + + FIXME("(%p)->(%p %p)\n", This, container, control); + + return E_NOTIMPL; +} + +static HRESULT WINAPI QuickActivate_SetContentExtent(IQuickActivate *iface, SIZEL *size) +{ + ScriptControl *This = impl_from_IQuickActivate(iface); + + FIXME("(%p)->(%p)\n", This, size); + + return E_NOTIMPL; +} + +static HRESULT WINAPI QuickActivate_GetContentExtent(IQuickActivate *iface, SIZEL *size) +{ + ScriptControl *This = impl_from_IQuickActivate(iface); + + FIXME("(%p)->(%p)\n", This, size); + + return E_NOTIMPL; +} + +static const IQuickActivateVtbl QuickActivateVtbl = { + QuickActivate_QueryInterface, + QuickActivate_AddRef, + QuickActivate_Release, + QuickActivate_QuickActivate, + QuickActivate_SetContentExtent, + QuickActivate_GetContentExtent +}; + static HRESULT WINAPI ConnectionPointContainer_QueryInterface(IConnectionPointContainer *iface, REFIID riid, void **obj) { ScriptControl *This = impl_from_IConnectionPointContainer(iface); @@ -1063,6 +1126,7 @@ static HRESULT WINAPI ScriptControl_CreateInstance(IClassFactory *iface, IUnknow script_control->IPersistStreamInit_iface.lpVtbl = &PersistStreamInitVtbl; script_control->IOleObject_iface.lpVtbl = &OleObjectVtbl; script_control->IOleControl_iface.lpVtbl = &OleControlVtbl; + script_control->IQuickActivate_iface.lpVtbl = &QuickActivateVtbl; script_control->IConnectionPointContainer_iface.lpVtbl = &ConnectionPointContainerVtbl; script_control->ref = 1; script_control->site = NULL; diff --git a/dlls/msscript.ocx/tests/msscript.c b/dlls/msscript.ocx/tests/msscript.c index 89fd197..5300c93 100644 --- a/dlls/msscript.ocx/tests/msscript.c +++ b/dlls/msscript.ocx/tests/msscript.c @@ -809,6 +809,23 @@ static void test_connectionpoints(void) IScriptControl_Release(sc); } +static void test_quickactivate(void) +{ + IScriptControl *sc; + IQuickActivate *qa; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_ScriptControl, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, + &IID_IScriptControl, (void**)&sc); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IScriptControl_QueryInterface(sc, &IID_IQuickActivate, (void**)&qa); + ok(hr == S_OK, "got 0x%08x\n", hr); + + IQuickActivate_Release(qa); + IScriptControl_Release(sc); +} + START_TEST(msscript) { IUnknown *unk; @@ -829,6 +846,7 @@ START_TEST(msscript) test_olecontrol(); test_Language(); test_connectionpoints(); + test_quickactivate(); CoUninitialize(); }

1 0