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

Aaryaman Vasishta : d3drm/tests: Modify all QI tests to compare vtables.
by Alexandre Julliard June 20, 2016

June 20, 2016

Module: wine Branch: master Commit: 88f6c2aa2e09c13ae5915eaedc5c4631fed00801 URL: http://source.winehq.org/git/wine.git/?a=commit;h=88f6c2aa2e09c13ae5915eaed… Author: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Date: Sun Jun 19 04:17:11 2016 +0530 d3drm/tests: Modify all QI tests to compare vtables. Signed-off-by: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/device.c | 8 +- dlls/d3drm/tests/d3drm.c | 552 ++++++++++++++++++++++++----------------------- dlls/d3drm/texture.c | 10 +- 3 files changed, 290 insertions(+), 280 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=88f6c2aa2e09c13ae5915…

1 0

Aaryaman Vasishta : d3drm: Add stubs for IDirect3DRMFrame interface.
by Alexandre Julliard June 20, 2016

June 20, 2016

Module: wine Branch: master Commit: e6f11af27258dfe283e6e324ea58c8f5286ba2ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6f11af27258dfe283e6e324e… Author: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Date: Mon Jun 20 01:16:07 2016 +0530 d3drm: Add stubs for IDirect3DRMFrame interface. Signed-off-by: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/frame.c | 661 ++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 658 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e6f11af27258dfe283e6e…

1 0

Alexandre Julliard : gdi32: Don't modify the DC arc direction in AngleArc.
by Alexandre Julliard June 20, 2016

June 20, 2016

Module: wine Branch: master Commit: dfa3c6885421fc5511ed2f3903d524642cb558cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfa3c6885421fc5511ed2f390… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 20 20:00:04 2016 +0900 gdi32: Don't modify the DC arc direction in AngleArc. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/path.c | 35 +++++++++++++++++------------------ 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/dlls/gdi32/path.c b/dlls/gdi32/path.c index 985d4e5..32a340f 100644 --- a/dlls/gdi32/path.c +++ b/dlls/gdi32/path.c @@ -968,7 +968,7 @@ static BOOL pathdrv_Rectangle( PHYSDEV dev, INT x1, INT y1, INT x2, INT y2 ) * else FALSE. */ static BOOL PATH_Arc( PHYSDEV dev, INT x1, INT y1, INT x2, INT y2, - INT xStart, INT yStart, INT xEnd, INT yEnd, INT lines ) + INT xStart, INT yStart, INT xEnd, INT yEnd, int direction, int lines ) { struct path_physdev *physdev = get_path_physdev( dev ); double angleStart, angleEnd, angleStartQuadrant, angleEndQuadrant=0.0; @@ -977,7 +977,7 @@ static BOOL PATH_Arc( PHYSDEV dev, INT x1, INT y1, INT x2, INT y2, FLOAT_POINT corners[2], pointStart, pointEnd; POINT centre; BOOL start, end; - INT temp, direction = GetArcDirection(dev->hdc); + INT temp; /* FIXME: Do we have to respect newStroke? */ @@ -1111,17 +1111,12 @@ static BOOL PATH_Arc( PHYSDEV dev, INT x1, INT y1, INT x2, INT y2, */ static BOOL pathdrv_AngleArc( PHYSDEV dev, INT x, INT y, DWORD radius, FLOAT eStartAngle, FLOAT eSweepAngle) { - INT x1, y1, x2, y2, arcdir; - BOOL ret; - - x1 = GDI_ROUND( x + cos(eStartAngle*M_PI/180) * radius ); - y1 = GDI_ROUND( y - sin(eStartAngle*M_PI/180) * radius ); - x2 = GDI_ROUND( x + cos((eStartAngle+eSweepAngle)*M_PI/180) * radius ); - y2 = GDI_ROUND( y - sin((eStartAngle+eSweepAngle)*M_PI/180) * radius ); - arcdir = SetArcDirection( dev->hdc, eSweepAngle >= 0 ? AD_COUNTERCLOCKWISE : AD_CLOCKWISE); - ret = PATH_Arc( dev, x-radius, y-radius, x+radius, y+radius, x1, y1, x2, y2, -1 ); - SetArcDirection( dev->hdc, arcdir ); - return ret; + int x1 = GDI_ROUND( x + cos(eStartAngle*M_PI/180) * radius ); + int y1 = GDI_ROUND( y - sin(eStartAngle*M_PI/180) * radius ); + int x2 = GDI_ROUND( x + cos((eStartAngle+eSweepAngle)*M_PI/180) * radius ); + int y2 = GDI_ROUND( y - sin((eStartAngle+eSweepAngle)*M_PI/180) * radius ); + return PATH_Arc( dev, x-radius, y-radius, x+radius, y+radius, x1, y1, x2, y2, + eSweepAngle >= 0 ? AD_COUNTERCLOCKWISE : AD_CLOCKWISE, -1 ); } @@ -1131,7 +1126,8 @@ static BOOL pathdrv_AngleArc( PHYSDEV dev, INT x, INT y, DWORD radius, FLOAT eSt static BOOL pathdrv_Arc( PHYSDEV dev, INT left, INT top, INT right, INT bottom, INT xstart, INT ystart, INT xend, INT yend ) { - return PATH_Arc( dev, left, top, right, bottom, xstart, ystart, xend, yend, 0 ); + return PATH_Arc( dev, left, top, right, bottom, xstart, ystart, xend, yend, + GetArcDirection( dev->hdc ), 0 ); } @@ -1141,7 +1137,8 @@ static BOOL pathdrv_Arc( PHYSDEV dev, INT left, INT top, INT right, INT bottom, static BOOL pathdrv_ArcTo( PHYSDEV dev, INT left, INT top, INT right, INT bottom, INT xstart, INT ystart, INT xend, INT yend ) { - return PATH_Arc( dev, left, top, right, bottom, xstart, ystart, xend, yend, -1 ); + return PATH_Arc( dev, left, top, right, bottom, xstart, ystart, xend, yend, + GetArcDirection( dev->hdc ), -1 ); } @@ -1151,7 +1148,8 @@ static BOOL pathdrv_ArcTo( PHYSDEV dev, INT left, INT top, INT right, INT bottom static BOOL pathdrv_Chord( PHYSDEV dev, INT left, INT top, INT right, INT bottom, INT xstart, INT ystart, INT xend, INT yend ) { - return PATH_Arc( dev, left, top, right, bottom, xstart, ystart, xend, yend, 1); + return PATH_Arc( dev, left, top, right, bottom, xstart, ystart, xend, yend, + GetArcDirection( dev->hdc ), 1 ); } @@ -1161,7 +1159,8 @@ static BOOL pathdrv_Chord( PHYSDEV dev, INT left, INT top, INT right, INT bottom static BOOL pathdrv_Pie( PHYSDEV dev, INT left, INT top, INT right, INT bottom, INT xstart, INT ystart, INT xend, INT yend ) { - return PATH_Arc( dev, left, top, right, bottom, xstart, ystart, xend, yend, 2 ); + return PATH_Arc( dev, left, top, right, bottom, xstart, ystart, xend, yend, + GetArcDirection( dev->hdc ), 2 ); } @@ -1170,7 +1169,7 @@ static BOOL pathdrv_Pie( PHYSDEV dev, INT left, INT top, INT right, INT bottom, */ static BOOL pathdrv_Ellipse( PHYSDEV dev, INT x1, INT y1, INT x2, INT y2 ) { - return PATH_Arc( dev, x1, y1, x2, y2, x1, (y1+y2)/2, x1, (y1+y2)/2, 0 ) && CloseFigure( dev->hdc ); + return PATH_Arc( dev, x1, y1, x2, y2, x1, (y1+y2)/2, x1, (y1+y2)/2, GetArcDirection( dev->hdc ), 1 ); }

1 0

Alexandre Julliard : gdi32: Keep track of the last move position in a path.
by Alexandre Julliard June 20, 2016

June 20, 2016

Module: wine Branch: master Commit: 4ea71903619dfffcfcdf65c8af722a0f873a4ae3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ea71903619dfffcfcdf65c8a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 20 19:56:57 2016 +0900 gdi32: Keep track of the last move position in a path. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/path.c | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/path.c b/dlls/gdi32/path.c index 156ceb6..985d4e5 100644 --- a/dlls/gdi32/path.c +++ b/dlls/gdi32/path.c @@ -88,6 +88,7 @@ struct gdi_path int count; int allocated; BOOL newStroke; + POINT pos; /* current cursor position */ }; struct path_physdev @@ -129,6 +130,7 @@ static struct gdi_path *alloc_gdi_path( int count ) path->count = 0; path->allocated = count; path->newStroke = TRUE; + path->pos.x = path->pos.y = 0; return path; } @@ -143,6 +145,7 @@ static struct gdi_path *copy_gdi_path( const struct gdi_path *src_path ) } path->count = path->allocated = src_path->count; path->newStroke = src_path->newStroke; + path->pos = src_path->pos; path->points = HeapAlloc( GetProcessHeap(), 0, path->count * sizeof(*path->points) ); path->flags = HeapAlloc( GetProcessHeap(), 0, path->count * sizeof(*path->flags) ); if (!path->points || !path->flags) @@ -276,7 +279,6 @@ static BYTE *add_points( struct gdi_path *path, const POINT *points, DWORD count /* start a new path stroke if necessary */ static BOOL start_new_stroke( struct path_physdev *physdev ) { - POINT pos; struct gdi_path *path = physdev->path; if (!path->newStroke && path->count && @@ -284,8 +286,14 @@ static BOOL start_new_stroke( struct path_physdev *physdev ) return TRUE; path->newStroke = FALSE; - GetCurrentPositionEx( physdev->dev.hdc, &pos ); - return add_log_points( physdev, &pos, 1, PT_MOVETO ) != NULL; + return add_points( physdev->path, &path->pos, 1, PT_MOVETO ) != NULL; +} + +/* set current position to the last point that was added to the path */ +static void update_current_pos( struct gdi_path *path ) +{ + assert( path->count ); + path->pos = path->points[path->count - 1]; } /* close the current figure */ @@ -301,6 +309,7 @@ static BOOL add_log_points_new_stroke( struct path_physdev *physdev, const POINT { if (!start_new_stroke( physdev )) return FALSE; if (!add_log_points( physdev, points, count, type )) return FALSE; + update_current_pos( physdev->path ); return TRUE; } @@ -850,6 +859,9 @@ static BOOL pathdrv_MoveTo( PHYSDEV dev, INT x, INT y ) { struct path_physdev *physdev = get_path_physdev( dev ); physdev->path->newStroke = TRUE; + physdev->path->pos.x = x; + physdev->path->pos.y = y; + LPtoDP( physdev->dev.hdc, &physdev->path->pos, 1 ); return TRUE; } @@ -1077,6 +1089,9 @@ static BOOL PATH_Arc( PHYSDEV dev, INT x1, INT y1, INT x2, INT y2, /* chord: close figure. pie: add line and close figure */ switch (lines) { + case -1: + update_current_pos( physdev->path ); + break; case 1: close_figure( physdev->path ); break; @@ -1907,6 +1922,9 @@ BOOL nulldrv_BeginPath( PHYSDEV dev ) } physdev = get_path_physdev( find_dc_driver( dc, &path_driver )); physdev->path = path; + path->pos.x = dc->CursPosX; + path->pos.y = dc->CursPosY; + LPtoDP( dev->hdc, &path->pos, 1 ); if (dc->path) free_gdi_path( dc->path ); dc->path = NULL; return TRUE;

1 0

Alexandre Julliard : gdi32: Add path helper functions to add points and close figures.
by Alexandre Julliard June 20, 2016

June 20, 2016

Module: wine Branch: master Commit: 3c63993f7e3f12bff0fb7265859d534313dc0a07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c63993f7e3f12bff0fb72658… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 20 19:55:10 2016 +0900 gdi32: Add path helper functions to add points and close figures. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/path.c | 147 +++++++++++++++++++++++++++++------------------------- 1 file changed, 80 insertions(+), 67 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3c63993f7e3f12bff0fb7…

1 0

Marcus Meissner : ole32: Allocate more for FmtIdToPropStgName (Coverity).
by Alexandre Julliard June 20, 2016

June 20, 2016

Module: wine Branch: master Commit: 113b290dbabb7139ec6b301d2a70ddb66fb1fef7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=113b290dbabb7139ec6b301d2… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Jun 18 09:58:09 2016 +0200 ole32: Allocate more for FmtIdToPropStgName (Coverity). Signed-off-by: Marcus Meissner <marcus(a)jet.franken.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/stg_prop.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ole32/stg_prop.c b/dlls/ole32/stg_prop.c index 8e1aaef..a259883 100644 --- a/dlls/ole32/stg_prop.c +++ b/dlls/ole32/stg_prop.c @@ -2178,7 +2178,7 @@ static HRESULT WINAPI IPropertySetStorage_fnCreate( IPropertyStorage** ppprstg) { StorageImpl *This = impl_from_IPropertySetStorage(ppstg); - WCHAR name[CCH_MAX_PROPSTG_NAME]; + WCHAR name[CCH_MAX_PROPSTG_NAME + 1]; IStream *stm = NULL; HRESULT r; @@ -2236,7 +2236,7 @@ static HRESULT WINAPI IPropertySetStorage_fnOpen( { StorageImpl *This = impl_from_IPropertySetStorage(ppstg); IStream *stm = NULL; - WCHAR name[CCH_MAX_PROPSTG_NAME]; + WCHAR name[CCH_MAX_PROPSTG_NAME + 1]; HRESULT r; TRACE("%p %s %08x %p\n", This, debugstr_guid(rfmtid), grfMode, ppprstg); @@ -2280,7 +2280,7 @@ static HRESULT WINAPI IPropertySetStorage_fnDelete( REFFMTID rfmtid) { StorageImpl *This = impl_from_IPropertySetStorage(ppstg); - WCHAR name[CCH_MAX_PROPSTG_NAME]; + WCHAR name[CCH_MAX_PROPSTG_NAME + 1]; HRESULT r; TRACE("%p %s\n", This, debugstr_guid(rfmtid));

1 0

Alexandre Julliard : gdi32: Fix updating the current position in PolyDraw.
by Alexandre Julliard June 20, 2016

June 20, 2016

Module: wine Branch: master Commit: c500713dd3ceedc8334f97f0245203736858d56a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c500713dd3ceedc8334f97f02… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 20 20:00:30 2016 +0900 gdi32: Fix updating the current position in PolyDraw. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/painting.c | 6 ++- dlls/gdi32/path.c | 42 ++++++++--------- dlls/gdi32/tests/path.c | 117 ++++++++++++++++++++++++++++++++++++------------ 3 files changed, 113 insertions(+), 52 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c500713dd3ceedc8334f9…

1 0

Bruno Jesus : ws2_32: Ensure default route IP addresses are returned first in gethostbyname.
by Alexandre Julliard June 20, 2016

June 20, 2016

Module: wine Branch: master Commit: 134bf22b8c7b291717f9717f0515dc485f489aaa URL: http://source.winehq.org/git/wine.git/?a=commit;h=134bf22b8c7b291717f9717f0… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sun Jun 19 15:59:59 2016 -0300 ws2_32: Ensure default route IP addresses are returned first in gethostbyname. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 23 +++++++++++++++++------ dlls/ws2_32/tests/sock.c | 1 - 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index a2e6912..b0af3d7 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -596,7 +596,7 @@ struct per_thread_data struct route { struct in_addr addr; IF_INDEX interface; - DWORD metric; + DWORD metric, default_route; }; static INT num_startup; /* reference counter */ @@ -6044,7 +6044,14 @@ struct WS_hostent* WINAPI WS_gethostbyaddr(const char *addr, int len, int type) */ static int WS_compare_routes_by_metric_asc(const void *left, const void *right) { - return ((const struct route*)left)->metric - ((const struct route*)right)->metric; + const struct route *a = left, *b = right; + if (a->default_route && b->default_route) + return a->default_route - b->default_route; + if (a->default_route && !b->default_route) + return -1; + if (b->default_route && !a->default_route) + return 1; + return a->metric - b->metric; } /*********************************************************************** @@ -6061,7 +6068,7 @@ static int WS_compare_routes_by_metric_asc(const void *left, const void *right) */ static struct WS_hostent* WS_get_local_ips( char *hostname ) { - int numroutes = 0, i, j; + int numroutes = 0, i, j, default_routes = 0; DWORD n; PIP_ADAPTER_INFO adapters = NULL, k; struct WS_hostent *hostlist = NULL; @@ -6088,10 +6095,13 @@ static struct WS_hostent* WS_get_local_ips( char *hostname ) for (n = 0; n < routes->dwNumEntries; n++) { IF_INDEX ifindex; - DWORD ifmetric; + DWORD ifmetric, ifdefault = 0; BOOL exists = FALSE; - if (routes->table[n].u1.ForwardType != MIB_IPROUTE_TYPE_DIRECT) + /* Check if this is a default route (there may be more than one) */ + if (!routes->table[n].dwForwardDest) + ifdefault = ++default_routes; + else if (routes->table[n].u1.ForwardType != MIB_IPROUTE_TYPE_DIRECT) continue; ifindex = routes->table[n].dwForwardIfIndex; ifmetric = routes->table[n].dwForwardMetric1; @@ -6112,13 +6122,14 @@ static struct WS_hostent* WS_get_local_ips( char *hostname ) goto cleanup; /* Memory allocation error, fail gracefully */ route_addrs[numroutes].interface = ifindex; route_addrs[numroutes].metric = ifmetric; + route_addrs[numroutes].default_route = ifdefault; /* If no IP is found in the next step (for whatever reason) * then fall back to the magic loopback address. */ memcpy(&(route_addrs[numroutes].addr.s_addr), magic_loopback_addr, 4); numroutes++; } - if (numroutes == 0) + if (numroutes == 0) goto cleanup; /* No routes, fall back to the Magic IP */ /* Find the IP address associated with each found interface */ for (i = 0; i < numroutes; i++) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 9e0c2f9..6853279 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -4556,7 +4556,6 @@ static void test_gethostbyname(void) } } } -todo_wine ok (found_default, "failed to find the first IP from gethostbyname!\n"); cleanup:

1 0

Akihiro Sagawa : kernel32: Fix typo of i386 macro name in GetLargePageMinimum().
by Alexandre Julliard June 20, 2016

June 20, 2016

Module: wine Branch: master Commit: 7a9b36ca1130a515fb79aae3635ce6178ab47f46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a9b36ca1130a515fb79aae36… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sun Jun 19 22:08:11 2016 +0900 kernel32: Fix typo of i386 macro name in GetLargePageMinimum(). Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/cpu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/cpu.c b/dlls/kernel32/cpu.c index 72a9d13..756d8f9 100644 --- a/dlls/kernel32/cpu.c +++ b/dlls/kernel32/cpu.c @@ -297,7 +297,7 @@ err: */ SIZE_T WINAPI GetLargePageMinimum(void) { -#if defined(__i386___) || defined(__x86_64__) || defined(__arm__) +#if defined(__i386__) || defined(__x86_64__) || defined(__arm__) return 2 * 1024 * 1024; #endif FIXME("Not implemented on your platform/architecture.\n");

1 0

Michael Stefaniuc : gdi32/tests: Compare RECTs with EqualRect instead of memcmp.
by Alexandre Julliard June 20, 2016

June 20, 2016

Module: wine Branch: master Commit: 27f80dab77ce5f80b53029b9bafe18fe4ce3ff90 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27f80dab77ce5f80b53029b9b… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jun 17 17:23:25 2016 +0200 gdi32/tests: Compare RECTs with EqualRect instead of memcmp. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/dib.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/tests/dib.c b/dlls/gdi32/tests/dib.c index 693df4a..a5ec539 100644 --- a/dlls/gdi32/tests/dib.c +++ b/dlls/gdi32/tests/dib.c @@ -1275,10 +1275,8 @@ static void compare_bounds( HDC hdc, const char *info ) return; } - ok( !memcmp( current_bounds, &rect, sizeof(RECT) ), - "%s: %s: expected bounds %d,%d,%d,%d got %d,%d,%d,%d\n", dst_format, info, - current_bounds->left, current_bounds->top, current_bounds->right, current_bounds->bottom, - rect.left, rect.top, rect.right, rect.bottom ); + ok( EqualRect( current_bounds, &rect ), "%s: %s: expected bounds %s got %s\n", dst_format, info, + wine_dbgstr_rect( current_bounds ), wine_dbgstr_rect( &rect )); current_bounds++; }

1 0