October 2011 - Wine-commits

Hans Leidekker : msi: Wait up to 30 seconds for services to start up.
by Alexandre Julliard 27 Oct '11

27 Oct '11

Module: wine Branch: master Commit: 319081cbf680b86e234c084942e130e99d72924e URL: http://source.winehq.org/git/wine.git/?a=commit;h=319081cbf680b86e234c08494… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Oct 27 13:35:29 2011 +0200 msi: Wait up to 30 seconds for services to start up. --- dlls/msi/action.c | 34 ++++++++++++++++++++++++++++++++-- 1 files changed, 32 insertions(+), 2 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 72d431a..6bc4fff 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -5649,8 +5649,10 @@ static UINT ITERATE_StartService(MSIRECORD *rec, LPVOID param) SC_HANDLE scm = NULL, service = NULL; LPCWSTR component, *vector = NULL; LPWSTR name, args, display_name = NULL; - DWORD event, numargs, len; + DWORD event, numargs, len, wait, dummy; UINT r = ERROR_FUNCTION_FAILED; + SERVICE_STATUS_PROCESS status; + ULONGLONG start_time; component = MSI_RecordGetString(rec, 6); comp = msi_get_loaded_component(package, component); @@ -5667,6 +5669,7 @@ static UINT ITERATE_StartService(MSIRECORD *rec, LPVOID param) deformat_string(package, MSI_RecordGetString(rec, 2), &name); deformat_string(package, MSI_RecordGetString(rec, 4), &args); event = MSI_RecordGetInteger(rec, 3); + wait = MSI_RecordGetInteger(rec, 5); if (!(event & msidbServiceControlEventStart)) { @@ -5689,7 +5692,7 @@ static UINT ITERATE_StartService(MSIRECORD *rec, LPVOID param) GetServiceDisplayNameW( scm, name, display_name, &len ); } - service = OpenServiceW(scm, name, SERVICE_START); + service = OpenServiceW(scm, name, SERVICE_START|SERVICE_QUERY_STATUS); if (!service) { ERR("Failed to open service %s (%u)\n", debugstr_w(name), GetLastError()); @@ -5706,6 +5709,33 @@ static UINT ITERATE_StartService(MSIRECORD *rec, LPVOID param) } r = ERROR_SUCCESS; + if (wait) + { + /* wait for at most 30 seconds for the service to be up and running */ + if (!QueryServiceStatusEx(service, SC_STATUS_PROCESS_INFO, + (BYTE *)&status, sizeof(SERVICE_STATUS_PROCESS), &dummy)) + { + TRACE("failed to query service status (%u)\n", GetLastError()); + goto done; + } + start_time = GetTickCount64(); + while (status.dwCurrentState == SERVICE_START_PENDING) + { + if (GetTickCount64() - start_time > 30000) break; + Sleep(1000); + if (!QueryServiceStatusEx(service, SC_STATUS_PROCESS_INFO, + (BYTE *)&status, sizeof(SERVICE_STATUS_PROCESS), &dummy)) + { + TRACE("failed to query service status (%u)\n", GetLastError()); + goto done; + } + } + if (status.dwCurrentState != SERVICE_RUNNING) + { + WARN("service failed to start %u\n", status.dwCurrentState); + r = ERROR_FUNCTION_FAILED; + } + } done: uirow = MSI_CreateRecord( 2 );

1 0

Hans Leidekker : msi/tests: Fix some test failures on win2k.
by Alexandre Julliard 27 Oct '11

27 Oct '11

Module: wine Branch: master Commit: 841a747409378c72ee7a158d6f6638c790da1030 URL: http://source.winehq.org/git/wine.git/?a=commit;h=841a747409378c72ee7a158d6… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Oct 27 13:35:57 2011 +0200 msi/tests: Fix some test failures on win2k. --- dlls/msi/tests/action.c | 20 ++++++++++++-------- 1 files changed, 12 insertions(+), 8 deletions(-) diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c index 95fc15c..6e35fe9 100644 --- a/dlls/msi/tests/action.c +++ b/dlls/msi/tests/action.c @@ -5891,14 +5891,16 @@ static void test_publish_assemblies(void) RegCloseKey(hkey); res = RegOpenKeyA(HKEY_CURRENT_USER, path_win32, &hkey); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); - CHECK_REG_STR(hkey, name_win32, "rcHQPHq?CA(a)Uv-XqMI1e>}NJjwR'%D9v1p!v{WV(%"); + ok(res == ERROR_SUCCESS || res == ERROR_FILE_NOT_FOUND /* win2k without sxs support */, + "Expected ERROR_SUCCESS, got %d\n", res); + if (res == ERROR_SUCCESS) CHECK_REG_STR(hkey, name_win32, "rcHQPHq?CA(a)Uv-XqMI1e>}NJjwR'%D9v1p!v{WV(%"); RegCloseKey(hkey); path = (is_wow64 || is_64bit) ? path_win32_local_wow64 : path_win32_local; res = RegOpenKeyA(HKEY_CURRENT_USER, path, &hkey); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); - CHECK_REG_STR(hkey, name_win32_local, "rcHQPHq?CA(a)Uv-XqMI1e>C)Uvlj*53A)u(QQ9=)X!"); + ok(res == ERROR_SUCCESS || res == ERROR_FILE_NOT_FOUND /* win2k without sxs support */, + "Expected ERROR_SUCCESS, got %d\n", res); + if (res == ERROR_SUCCESS) CHECK_REG_STR(hkey, name_win32_local, "rcHQPHq?CA(a)Uv-XqMI1e>C)Uvlj*53A)u(QQ9=)X!"); RegCloseKey(hkey); r = MsiInstallProductA(msifile, "REMOVE=ALL"); @@ -5952,14 +5954,16 @@ static void test_publish_assemblies(void) RegCloseKey(hkey); res = RegOpenKeyExA(HKEY_CLASSES_ROOT, classes_path_win32, 0, access, &hkey); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); - CHECK_REG_STR(hkey, name_win32, "rcHQPHq?CA(a)Uv-XqMI1e>}NJjwR'%D9v1p!v{WV(%"); + ok(res == ERROR_SUCCESS || res == ERROR_FILE_NOT_FOUND /* win2k without sxs support */, + "Expected ERROR_SUCCESS, got %d\n", res); + if (res == ERROR_SUCCESS) CHECK_REG_STR(hkey, name_win32, "rcHQPHq?CA(a)Uv-XqMI1e>}NJjwR'%D9v1p!v{WV(%"); RegCloseKey(hkey); path = (is_wow64 || is_64bit) ? classes_path_win32_local_wow64 : classes_path_win32_local; res = RegOpenKeyExA(HKEY_CLASSES_ROOT, path, 0, access, &hkey); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); - CHECK_REG_STR(hkey, name_win32_local, "rcHQPHq?CA(a)Uv-XqMI1e>C)Uvlj*53A)u(QQ9=)X!"); + ok(res == ERROR_SUCCESS || res == ERROR_FILE_NOT_FOUND /* win2k without sxs support */, + "Expected ERROR_SUCCESS, got %d\n", res); + if (res == ERROR_SUCCESS) CHECK_REG_STR(hkey, name_win32_local, "rcHQPHq?CA(a)Uv-XqMI1e>C)Uvlj*53A)u(QQ9=)X!"); RegCloseKey(hkey); r = MsiInstallProductA(msifile, "REMOVE=ALL ALLUSERS=1");

1 0

Hans Leidekker : msi/tests: Fix a skip message.
by Alexandre Julliard 27 Oct '11

27 Oct '11

Module: wine Branch: master Commit: 392bd2b7a23f17d31d3609e8c57ea543d2a4175e URL: http://source.winehq.org/git/wine.git/?a=commit;h=392bd2b7a23f17d31d3609e8c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Oct 27 13:36:21 2011 +0200 msi/tests: Fix a skip message. --- dlls/msi/tests/action.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c index 6e35fe9..3743e50 100644 --- a/dlls/msi/tests/action.c +++ b/dlls/msi/tests/action.c @@ -4802,7 +4802,7 @@ static void test_start_services(void) ret = StartService(service, 0, NULL); if (!ret && (error = GetLastError()) != ERROR_SERVICE_ALREADY_RUNNING) { - skip("Terminal service not available, skipping test\n"); + skip("Spooler service not available, skipping test\n"); CloseServiceHandle(service); CloseServiceHandle(scm); return;

1 0

Alexandre Julliard : gdi32: Implement the LineTo entry point in the path driver.
by Alexandre Julliard 27 Oct '11

27 Oct '11

Module: wine Branch: master Commit: fc5e29486dafefaaf3167c60ea1be4e36791a96e URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc5e29486dafefaaf3167c60e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 26 19:58:51 2011 +0200 gdi32: Implement the LineTo entry point in the path driver. --- dlls/gdi32/gdi_private.h | 1 - dlls/gdi32/painting.c | 11 +++------ dlls/gdi32/path.c | 54 ++++++++++++++++++--------------------------- 3 files changed, 26 insertions(+), 40 deletions(-) diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index e0b3b76..79fb082 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -325,7 +325,6 @@ extern void PATH_DestroyGdiPath(GdiPath *pPath) DECLSPEC_HIDDEN; extern BOOL PATH_SavePath( DC *dst, DC *src ) DECLSPEC_HIDDEN; extern BOOL PATH_RestorePath( DC *dst, DC *src ) DECLSPEC_HIDDEN; -extern BOOL PATH_LineTo(DC *dc, INT x, INT y) DECLSPEC_HIDDEN; extern BOOL PATH_Rectangle(DC *dc, INT x1, INT y1, INT x2, INT y2) DECLSPEC_HIDDEN; extern BOOL PATH_ExtTextOut(DC *dc, INT x, INT y, UINT flags, const RECT *lprc, LPCWSTR str, UINT count, const INT *dx) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/painting.c b/dlls/gdi32/painting.c index 5eb5654..7e88219 100644 --- a/dlls/gdi32/painting.c +++ b/dlls/gdi32/painting.c @@ -232,18 +232,15 @@ BOOL nulldrv_PolylineTo( PHYSDEV dev, const POINT *points, INT count ) BOOL WINAPI LineTo( HDC hdc, INT x, INT y ) { DC * dc = get_dc_ptr( hdc ); + PHYSDEV physdev; BOOL ret; if(!dc) return FALSE; update_dc( dc ); - if(PATH_IsPathOpen(dc->path)) - ret = PATH_LineTo(dc, x, y); - else - { - PHYSDEV physdev = GET_DC_PHYSDEV( dc, pLineTo ); - ret = physdev->funcs->pLineTo( physdev, x, y ); - } + physdev = GET_DC_PHYSDEV( dc, pLineTo ); + ret = physdev->funcs->pLineTo( physdev, x, y ); + if(ret) { dc->CursPosX = x; dc->CursPosY = y; diff --git a/dlls/gdi32/path.c b/dlls/gdi32/path.c index 25e1d52..11be17c 100644 --- a/dlls/gdi32/path.c +++ b/dlls/gdi32/path.c @@ -895,42 +895,32 @@ static BOOL pathdrv_MoveTo( PHYSDEV dev, INT x, INT y ) return TRUE; } -/* PATH_LineTo - * - * Should be called when a LineTo is performed on a DC that has an - * open path. This adds a PT_LINETO entry to the path (and possibly - * a PT_MOVETO entry, if this is the first LineTo in a stroke). - * Returns TRUE if successful, else FALSE. + +/************************************************************* + * pathdrv_LineTo */ -BOOL PATH_LineTo(DC *dc, INT x, INT y) +static BOOL pathdrv_LineTo( PHYSDEV dev, INT x, INT y ) { - GdiPath *pPath = &dc->path; - POINT point, pointCurPos; - - /* Check that path is open */ - if(pPath->state!=PATH_Open) - return FALSE; + struct path_physdev *physdev = get_path_physdev( dev ); + POINT point, pointCurPos; - /* Convert point to device coordinates */ - point.x=x; - point.y=y; - if(!LPtoDP(dc->hSelf, &point, 1)) - return FALSE; + /* Convert point to device coordinates */ + point.x = x; + point.y = y; + LPtoDP( dev->hdc, &point, 1 ); - /* Add a PT_MOVETO if necessary */ - if(pPath->newStroke) - { - pPath->newStroke=FALSE; - pointCurPos.x = dc->CursPosX; - pointCurPos.y = dc->CursPosY; - if(!LPtoDP(dc->hSelf, &pointCurPos, 1)) - return FALSE; - if(!PATH_AddEntry(pPath, &pointCurPos, PT_MOVETO)) - return FALSE; - } + /* Add a PT_MOVETO if necessary */ + if(physdev->path->newStroke) + { + physdev->path->newStroke = FALSE; + GetCurrentPositionEx( dev->hdc, &pointCurPos ); + LPtoDP( dev->hdc, &pointCurPos, 1 ); + if(!PATH_AddEntry(physdev->path, &pointCurPos, PT_MOVETO)) + return FALSE; + } - /* Add a PT_LINETO entry */ - return PATH_AddEntry(pPath, &point, PT_LINETO); + /* Add a PT_LINETO entry */ + return PATH_AddEntry(physdev->path, &point, PT_LINETO); } /* PATH_RoundRect @@ -2360,7 +2350,7 @@ const struct gdi_dc_funcs path_driver = NULL, /* pGetTextMetrics */ NULL, /* pIntersectClipRect */ NULL, /* pInvertRgn */ - NULL, /* pLineTo */ + pathdrv_LineTo, /* pLineTo */ NULL, /* pModifyWorldTransform */ pathdrv_MoveTo, /* pMoveTo */ NULL, /* pOffsetClipRgn */

1 0

Alexandre Julliard : gdi32: Add a helper function to start a new path stroke.
by Alexandre Julliard 27 Oct '11

27 Oct '11

Module: wine Branch: master Commit: 364e216462620b1bf15f472abb1833346a9f6314 URL: http://source.winehq.org/git/wine.git/?a=commit;h=364e216462620b1bf15f472ab… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 26 20:02:10 2011 +0200 gdi32: Add a helper function to start a new path stroke. --- dlls/gdi32/path.c | 25 ++++++++++++++----------- 1 files changed, 14 insertions(+), 11 deletions(-) diff --git a/dlls/gdi32/path.c b/dlls/gdi32/path.c index 11be17c..8ddff53 100644 --- a/dlls/gdi32/path.c +++ b/dlls/gdi32/path.c @@ -230,6 +230,18 @@ static BOOL PATH_AddEntry(GdiPath *pPath, const POINT *pPoint, BYTE flags) return TRUE; } +/* start a new path stroke if necessary */ +static BOOL start_new_stroke( struct path_physdev *physdev ) +{ + POINT pos; + + if (!physdev->path->newStroke) return TRUE; + physdev->path->newStroke = FALSE; + GetCurrentPositionEx( physdev->dev.hdc, &pos ); + LPtoDP( physdev->dev.hdc, &pos, 1 ); + return PATH_AddEntry( physdev->path, &pos, PT_MOVETO ); +} + /* PATH_AssignGdiPath * * Copies the GdiPath structure "pPathSrc" to "pPathDest". A deep copy is @@ -902,24 +914,15 @@ static BOOL pathdrv_MoveTo( PHYSDEV dev, INT x, INT y ) static BOOL pathdrv_LineTo( PHYSDEV dev, INT x, INT y ) { struct path_physdev *physdev = get_path_physdev( dev ); - POINT point, pointCurPos; + POINT point; /* Convert point to device coordinates */ point.x = x; point.y = y; LPtoDP( dev->hdc, &point, 1 ); - /* Add a PT_MOVETO if necessary */ - if(physdev->path->newStroke) - { - physdev->path->newStroke = FALSE; - GetCurrentPositionEx( dev->hdc, &pointCurPos ); - LPtoDP( dev->hdc, &pointCurPos, 1 ); - if(!PATH_AddEntry(physdev->path, &pointCurPos, PT_MOVETO)) - return FALSE; - } + if (!start_new_stroke( physdev )) return FALSE; - /* Add a PT_LINETO entry */ return PATH_AddEntry(physdev->path, &point, PT_LINETO); }

1 0

Alexandre Julliard : gdi32: Implement the Rectangle and RoundRect entry points in the path driver.
by Alexandre Julliard 27 Oct '11

27 Oct '11

Module: wine Branch: master Commit: f8040958f58da824711b3becf3156df01172cc98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8040958f58da824711b3becf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 25 15:03:04 2011 +0200 gdi32: Implement the Rectangle and RoundRect entry points in the path driver. --- dlls/gdi32/gdi_private.h | 2 - dlls/gdi32/painting.c | 18 ++------ dlls/gdi32/path.c | 101 +++++++++++++++------------------------------ 3 files changed, 38 insertions(+), 83 deletions(-) diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 79fb082..039807d 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -325,7 +325,6 @@ extern void PATH_DestroyGdiPath(GdiPath *pPath) DECLSPEC_HIDDEN; extern BOOL PATH_SavePath( DC *dst, DC *src ) DECLSPEC_HIDDEN; extern BOOL PATH_RestorePath( DC *dst, DC *src ) DECLSPEC_HIDDEN; -extern BOOL PATH_Rectangle(DC *dc, INT x1, INT y1, INT x2, INT y2) DECLSPEC_HIDDEN; extern BOOL PATH_ExtTextOut(DC *dc, INT x, INT y, UINT flags, const RECT *lprc, LPCWSTR str, UINT count, const INT *dx) DECLSPEC_HIDDEN; extern BOOL PATH_Ellipse(DC *dc, INT x1, INT y1, INT x2, INT y2) DECLSPEC_HIDDEN; @@ -339,7 +338,6 @@ extern BOOL PATH_Polyline(DC *dc, const POINT *pt, DWORD cbCount) DECLSPEC_HIDDE extern BOOL PATH_Polygon(DC *dc, const POINT *pt, DWORD cbCount) DECLSPEC_HIDDEN; extern BOOL PATH_PolyPolyline(DC *dc, const POINT *pt, const DWORD *counts, DWORD polylines) DECLSPEC_HIDDEN; extern BOOL PATH_PolyPolygon(DC *dc, const POINT *pt, const INT *counts, UINT polygons) DECLSPEC_HIDDEN; -extern BOOL PATH_RoundRect(DC *dc, INT x1, INT y1, INT x2, INT y2, INT ell_width, INT ell_height) DECLSPEC_HIDDEN; /* painting.c */ extern POINT *GDI_Bezier( const POINT *Points, INT count, INT *nPtsOut ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/painting.c b/dlls/gdi32/painting.c index 7e88219..b60046d 100644 --- a/dlls/gdi32/painting.c +++ b/dlls/gdi32/painting.c @@ -422,14 +422,9 @@ BOOL WINAPI Rectangle( HDC hdc, INT left, INT top, if (dc) { + PHYSDEV physdev = GET_DC_PHYSDEV( dc, pRectangle ); update_dc( dc ); - if(PATH_IsPathOpen(dc->path)) - ret = PATH_Rectangle(dc, left, top, right, bottom); - else - { - PHYSDEV physdev = GET_DC_PHYSDEV( dc, pRectangle ); - ret = physdev->funcs->pRectangle( physdev, left, top, right, bottom ); - } + ret = physdev->funcs->pRectangle( physdev, left, top, right, bottom ); release_dc_ptr( dc ); } return ret; @@ -447,14 +442,9 @@ BOOL WINAPI RoundRect( HDC hdc, INT left, INT top, INT right, if (dc) { + PHYSDEV physdev = GET_DC_PHYSDEV( dc, pRoundRect ); update_dc( dc ); - if(PATH_IsPathOpen(dc->path)) - ret = PATH_RoundRect(dc,left,top,right,bottom,ell_width,ell_height); - else - { - PHYSDEV physdev = GET_DC_PHYSDEV( dc, pRoundRect ); - ret = physdev->funcs->pRoundRect( physdev, left, top, right, bottom, ell_width, ell_height ); - } + ret = physdev->funcs->pRoundRect( physdev, left, top, right, bottom, ell_width, ell_height ); release_dc_ptr( dc ); } return ret; diff --git a/dlls/gdi32/path.c b/dlls/gdi32/path.c index 8ddff53..a5f39f6 100644 --- a/dlls/gdi32/path.c +++ b/dlls/gdi32/path.c @@ -273,9 +273,9 @@ static BOOL PATH_AssignGdiPath(GdiPath *pPathDest, const GdiPath *pPathSrc) /* PATH_CheckCorners * - * Helper function for PATH_RoundRect() and PATH_Rectangle() + * Helper function for RoundRect() and Rectangle() */ -static BOOL PATH_CheckCorners(DC *dc, POINT corners[], INT x1, INT y1, INT x2, INT y2) +static void PATH_CheckCorners( HDC hdc, POINT corners[], INT x1, INT y1, INT x2, INT y2 ) { INT temp; @@ -284,8 +284,7 @@ static BOOL PATH_CheckCorners(DC *dc, POINT corners[], INT x1, INT y1, INT x2, I corners[0].y=y1; corners[1].x=x2; corners[1].y=y2; - if(!LPtoDP(dc->hSelf, corners, 2)) - return FALSE; + LPtoDP( hdc, corners, 2 ); /* Make sure first corner is top left and second corner is bottom right */ if(corners[0].x>corners[1].x) @@ -302,13 +301,11 @@ static BOOL PATH_CheckCorners(DC *dc, POINT corners[], INT x1, INT y1, INT x2, I } /* In GM_COMPATIBLE, don't include bottom and right edges */ - if(dc->GraphicsMode==GM_COMPATIBLE) + if (GetGraphicsMode( hdc ) == GM_COMPATIBLE) { corners[1].x--; corners[1].y--; } - - return TRUE; } /* PATH_AddFlatBezier @@ -926,115 +923,85 @@ static BOOL pathdrv_LineTo( PHYSDEV dev, INT x, INT y ) return PATH_AddEntry(physdev->path, &point, PT_LINETO); } -/* PATH_RoundRect - * - * Should be called when a call to RoundRect is performed on a DC that has - * an open path. Returns TRUE if successful, else FALSE. + +/************************************************************* + * pathdrv_RoundRect * * FIXME: it adds the same entries to the path as windows does, but there * is an error in the bezier drawing code so that there are small pixel-size * gaps when the resulting path is drawn by StrokePath() */ -BOOL PATH_RoundRect(DC *dc, INT x1, INT y1, INT x2, INT y2, INT ell_width, INT ell_height) +static BOOL pathdrv_RoundRect( PHYSDEV dev, INT x1, INT y1, INT x2, INT y2, INT ell_width, INT ell_height ) { - GdiPath *pPath = &dc->path; - POINT corners[2], pointTemp; - FLOAT_POINT ellCorners[2]; - - /* Check that path is open */ - if(pPath->state!=PATH_Open) - return FALSE; + struct path_physdev *physdev = get_path_physdev( dev ); + POINT corners[2], pointTemp; + FLOAT_POINT ellCorners[2]; - if(!PATH_CheckCorners(dc,corners,x1,y1,x2,y2)) - return FALSE; + PATH_CheckCorners(dev->hdc,corners,x1,y1,x2,y2); /* Add points to the roundrect path */ ellCorners[0].x = corners[1].x-ell_width; ellCorners[0].y = corners[0].y; ellCorners[1].x = corners[1].x; ellCorners[1].y = corners[0].y+ell_height; - if(!PATH_DoArcPart(pPath, ellCorners, 0, -M_PI_2, PT_MOVETO)) + if(!PATH_DoArcPart(physdev->path, ellCorners, 0, -M_PI_2, PT_MOVETO)) return FALSE; pointTemp.x = corners[0].x+ell_width/2; pointTemp.y = corners[0].y; - if(!PATH_AddEntry(pPath, &pointTemp, PT_LINETO)) + if(!PATH_AddEntry(physdev->path, &pointTemp, PT_LINETO)) return FALSE; ellCorners[0].x = corners[0].x; ellCorners[1].x = corners[0].x+ell_width; - if(!PATH_DoArcPart(pPath, ellCorners, -M_PI_2, -M_PI, FALSE)) + if(!PATH_DoArcPart(physdev->path, ellCorners, -M_PI_2, -M_PI, FALSE)) return FALSE; pointTemp.x = corners[0].x; pointTemp.y = corners[1].y-ell_height/2; - if(!PATH_AddEntry(pPath, &pointTemp, PT_LINETO)) + if(!PATH_AddEntry(physdev->path, &pointTemp, PT_LINETO)) return FALSE; ellCorners[0].y = corners[1].y-ell_height; ellCorners[1].y = corners[1].y; - if(!PATH_DoArcPart(pPath, ellCorners, M_PI, M_PI_2, FALSE)) + if(!PATH_DoArcPart(physdev->path, ellCorners, M_PI, M_PI_2, FALSE)) return FALSE; pointTemp.x = corners[1].x-ell_width/2; pointTemp.y = corners[1].y; - if(!PATH_AddEntry(pPath, &pointTemp, PT_LINETO)) + if(!PATH_AddEntry(physdev->path, &pointTemp, PT_LINETO)) return FALSE; ellCorners[0].x = corners[1].x-ell_width; ellCorners[1].x = corners[1].x; - if(!PATH_DoArcPart(pPath, ellCorners, M_PI_2, 0, FALSE)) + if(!PATH_DoArcPart(physdev->path, ellCorners, M_PI_2, 0, FALSE)) return FALSE; /* Close the roundrect figure */ - if(!CloseFigure(dc->hSelf)) - return FALSE; - - return TRUE; + return CloseFigure( dev->hdc ); } -/* PATH_Rectangle - * - * Should be called when a call to Rectangle is performed on a DC that has - * an open path. Returns TRUE if successful, else FALSE. + +/************************************************************* + * pathdrv_Rectangle */ -BOOL PATH_Rectangle(DC *dc, INT x1, INT y1, INT x2, INT y2) +static BOOL pathdrv_Rectangle( PHYSDEV dev, INT x1, INT y1, INT x2, INT y2 ) { - GdiPath *pPath = &dc->path; - POINT corners[2], pointTemp; - - /* Check that path is open */ - if(pPath->state!=PATH_Open) - return FALSE; + struct path_physdev *physdev = get_path_physdev( dev ); + POINT corners[2], pointTemp; - if(!PATH_CheckCorners(dc,corners,x1,y1,x2,y2)) - return FALSE; - - /* Close any previous figure */ - if(!CloseFigure(dc->hSelf)) - { - /* The CloseFigure call shouldn't have failed */ - assert(FALSE); - return FALSE; - } + PATH_CheckCorners(dev->hdc,corners,x1,y1,x2,y2); /* Add four points to the path */ pointTemp.x=corners[1].x; pointTemp.y=corners[0].y; - if(!PATH_AddEntry(pPath, &pointTemp, PT_MOVETO)) + if(!PATH_AddEntry(physdev->path, &pointTemp, PT_MOVETO)) return FALSE; - if(!PATH_AddEntry(pPath, corners, PT_LINETO)) + if(!PATH_AddEntry(physdev->path, corners, PT_LINETO)) return FALSE; pointTemp.x=corners[0].x; pointTemp.y=corners[1].y; - if(!PATH_AddEntry(pPath, &pointTemp, PT_LINETO)) + if(!PATH_AddEntry(physdev->path, &pointTemp, PT_LINETO)) return FALSE; - if(!PATH_AddEntry(pPath, corners+1, PT_LINETO)) + if(!PATH_AddEntry(physdev->path, corners+1, PT_LINETO)) return FALSE; /* Close the rectangle figure */ - if(!CloseFigure(dc->hSelf)) - { - /* The CloseFigure call shouldn't have failed */ - assert(FALSE); - return FALSE; - } - - return TRUE; + return CloseFigure( dev->hdc ); } /* PATH_Ellipse @@ -2373,10 +2340,10 @@ const struct gdi_dc_funcs path_driver = NULL, /* pPutImage */ NULL, /* pRealizeDefaultPalette */ NULL, /* pRealizePalette */ - NULL, /* pRectangle */ + pathdrv_Rectangle, /* pRectangle */ NULL, /* pResetDC */ NULL, /* pRestoreDC */ - NULL, /* pRoundRect */ + pathdrv_RoundRect, /* pRoundRect */ NULL, /* pSaveDC */ NULL, /* pScaleViewportExt */ NULL, /* pScaleWindowExt */

1 0

Alexandre Julliard : gdi32: Implement the arc entry points in the path driver.
by Alexandre Julliard 27 Oct '11

27 Oct '11

Module: wine Branch: master Commit: 4d9cc241287bb716b1d6fd8ebba9e02ad6f678b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d9cc241287bb716b1d6fd8eb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 25 15:21:59 2011 +0200 gdi32: Implement the arc entry points in the path driver. --- dlls/gdi32/gdi_private.h | 3 - dlls/gdi32/painting.c | 84 +++++++---------------- dlls/gdi32/path.c | 171 +++++++++++++++++++++++++++++----------------- 3 files changed, 132 insertions(+), 126 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4d9cc241287bb716b1d6f…

1 0

Alexandre Julliard : gdi32: Implement the Bezier entry points in the path driver.
by Alexandre Julliard 27 Oct '11

27 Oct '11

Module: wine Branch: master Commit: ac00dfc984fd4366982b01abd9673df9dcd5d732 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac00dfc984fd4366982b01abd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 26 20:13:57 2011 +0200 gdi32: Implement the Bezier entry points in the path driver. --- dlls/gdi32/gdi_private.h | 3 - dlls/gdi32/painting.c | 34 ++++++--------- dlls/gdi32/path.c | 109 ++++++++++++++++++++-------------------------- 3 files changed, 60 insertions(+), 86 deletions(-) diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 23249f9..68b5abf 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -327,9 +327,6 @@ extern BOOL PATH_RestorePath( DC *dst, DC *src ) DECLSPEC_HIDDEN; extern BOOL PATH_ExtTextOut(DC *dc, INT x, INT y, UINT flags, const RECT *lprc, LPCWSTR str, UINT count, const INT *dx) DECLSPEC_HIDDEN; -extern BOOL PATH_PolyBezierTo(DC *dc, const POINT *pt, DWORD cbCount) DECLSPEC_HIDDEN; -extern BOOL PATH_PolyBezier(DC *dc, const POINT *pt, DWORD cbCount) DECLSPEC_HIDDEN; -extern BOOL PATH_PolyDraw(DC *dc, const POINT *pts, const BYTE *types, DWORD cbCount) DECLSPEC_HIDDEN; extern BOOL PATH_PolylineTo(DC *dc, const POINT *pt, DWORD cbCount) DECLSPEC_HIDDEN; extern BOOL PATH_Polyline(DC *dc, const POINT *pt, DWORD cbCount) DECLSPEC_HIDDEN; extern BOOL PATH_Polygon(DC *dc, const POINT *pt, DWORD cbCount) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/painting.c b/dlls/gdi32/painting.c index 239fe58..d0c2955 100644 --- a/dlls/gdi32/painting.c +++ b/dlls/gdi32/painting.c @@ -881,7 +881,8 @@ BOOL WINAPI FloodFill( HDC hdc, INT x, INT y, COLORREF color ) */ BOOL WINAPI PolyBezier( HDC hdc, const POINT* lppt, DWORD cPoints ) { - BOOL ret = FALSE; + PHYSDEV physdev; + BOOL ret; DC * dc; /* cPoints must be 3 * n + 1 (where n>=1) */ @@ -891,12 +892,8 @@ BOOL WINAPI PolyBezier( HDC hdc, const POINT* lppt, DWORD cPoints ) if(!dc) return FALSE; update_dc( dc ); - if(PATH_IsPathOpen(dc->path)) ret = PATH_PolyBezier(dc, lppt, cPoints); - else - { - PHYSDEV physdev = GET_DC_PHYSDEV( dc, pPolyBezier ); - ret = physdev->funcs->pPolyBezier( physdev, lppt, cPoints ); - } + physdev = GET_DC_PHYSDEV( dc, pPolyBezier ); + ret = physdev->funcs->pPolyBezier( physdev, lppt, cPoints ); release_dc_ptr( dc ); return ret; } @@ -917,7 +914,8 @@ BOOL WINAPI PolyBezier( HDC hdc, const POINT* lppt, DWORD cPoints ) BOOL WINAPI PolyBezierTo( HDC hdc, const POINT* lppt, DWORD cPoints ) { DC * dc; - BOOL ret = FALSE; + BOOL ret; + PHYSDEV physdev; /* cbPoints must be 3 * n (where n>=1) */ if (!cPoints || (cPoints % 3) != 0) return FALSE; @@ -926,12 +924,9 @@ BOOL WINAPI PolyBezierTo( HDC hdc, const POINT* lppt, DWORD cPoints ) if(!dc) return FALSE; update_dc( dc ); - if(PATH_IsPathOpen(dc->path)) ret = PATH_PolyBezierTo(dc, lppt, cPoints); - else - { - PHYSDEV physdev = GET_DC_PHYSDEV( dc, pPolyBezierTo ); - ret = physdev->funcs->pPolyBezierTo( physdev, lppt, cPoints ); - } + physdev = GET_DC_PHYSDEV( dc, pPolyBezierTo ); + ret = physdev->funcs->pPolyBezierTo( physdev, lppt, cPoints ); + if(ret) { dc->CursPosX = lppt[cPoints-1].x; dc->CursPosY = lppt[cPoints-1].y; @@ -974,17 +969,14 @@ BOOL WINAPI PolyDraw(HDC hdc, const POINT *lppt, const BYTE *lpbTypes, DWORD cCount) { DC *dc = get_dc_ptr( hdc ); - BOOL result = FALSE; + PHYSDEV physdev; + BOOL result; if(!dc) return FALSE; update_dc( dc ); - if( PATH_IsPathOpen( dc->path ) ) result = PATH_PolyDraw(dc, lppt, lpbTypes, cCount); - else - { - PHYSDEV physdev = GET_DC_PHYSDEV( dc, pPolyDraw ); - result = physdev->funcs->pPolyDraw( physdev, lppt, lpbTypes, cCount ); - } + physdev = GET_DC_PHYSDEV( dc, pPolyDraw ); + result = physdev->funcs->pPolyDraw( physdev, lppt, lpbTypes, cCount ); release_dc_ptr( dc ); return result; } diff --git a/dlls/gdi32/path.c b/dlls/gdi32/path.c index 6cdc8ec..896d145 100644 --- a/dlls/gdi32/path.c +++ b/dlls/gdi32/path.c @@ -1224,75 +1224,60 @@ static BOOL pathdrv_Ellipse( PHYSDEV dev, INT x1, INT y1, INT x2, INT y2 ) } -BOOL PATH_PolyBezierTo(DC *dc, const POINT *pts, DWORD cbPoints) +/************************************************************* + * pathdrv_PolyBezierTo + */ +static BOOL pathdrv_PolyBezierTo( PHYSDEV dev, const POINT *pts, DWORD cbPoints ) { - GdiPath *pPath = &dc->path; - POINT pt; - UINT i; - - /* Check that path is open */ - if(pPath->state!=PATH_Open) - return FALSE; + struct path_physdev *physdev = get_path_physdev( dev ); + POINT pt; + UINT i; - /* Add a PT_MOVETO if necessary */ - if(pPath->newStroke) - { - pPath->newStroke=FALSE; - pt.x = dc->CursPosX; - pt.y = dc->CursPosY; - if(!LPtoDP(dc->hSelf, &pt, 1)) - return FALSE; - if(!PATH_AddEntry(pPath, &pt, PT_MOVETO)) - return FALSE; - } + if (!start_new_stroke( physdev )) return FALSE; - for(i = 0; i < cbPoints; i++) { - pt = pts[i]; - if(!LPtoDP(dc->hSelf, &pt, 1)) - return FALSE; - PATH_AddEntry(pPath, &pt, PT_BEZIERTO); - } - return TRUE; + for(i = 0; i < cbPoints; i++) { + pt = pts[i]; + LPtoDP( dev->hdc, &pt, 1 ); + PATH_AddEntry(physdev->path, &pt, PT_BEZIERTO); + } + return TRUE; } -BOOL PATH_PolyBezier(DC *dc, const POINT *pts, DWORD cbPoints) -{ - GdiPath *pPath = &dc->path; - POINT pt; - UINT i; - /* Check that path is open */ - if(pPath->state!=PATH_Open) - return FALSE; +/************************************************************* + * pathdrv_PolyBezier + */ +static BOOL pathdrv_PolyBezier( PHYSDEV dev, const POINT *pts, DWORD cbPoints ) +{ + struct path_physdev *physdev = get_path_physdev( dev ); + POINT pt; + UINT i; - for(i = 0; i < cbPoints; i++) { - pt = pts[i]; - if(!LPtoDP(dc->hSelf, &pt, 1)) - return FALSE; - PATH_AddEntry(pPath, &pt, (i == 0) ? PT_MOVETO : PT_BEZIERTO); - } - return TRUE; + for(i = 0; i < cbPoints; i++) { + pt = pts[i]; + LPtoDP( dev->hdc, &pt, 1 ); + PATH_AddEntry(physdev->path, &pt, (i == 0) ? PT_MOVETO : PT_BEZIERTO); + } + return TRUE; } -/* PATH_PolyDraw - * - * Should be called when a call to PolyDraw is performed on a DC that has - * an open path. Returns TRUE if successful, else FALSE. + +/************************************************************* + * pathdrv_PolyDraw */ -BOOL PATH_PolyDraw(DC *dc, const POINT *pts, const BYTE *types, - DWORD cbPoints) +static BOOL pathdrv_PolyDraw( PHYSDEV dev, const POINT *pts, const BYTE *types, DWORD cbPoints ) { - GdiPath *pPath = &dc->path; + struct path_physdev *physdev = get_path_physdev( dev ); POINT lastmove, orig_pos; INT i; - GetCurrentPositionEx( dc->hSelf, &orig_pos ); + GetCurrentPositionEx( dev->hdc, &orig_pos ); lastmove = orig_pos; - for(i = pPath->numEntriesUsed - 1; i >= 0; i--){ - if(pPath->pFlags[i] == PT_MOVETO){ - lastmove = pPath->pPoints[i]; - DPtoLP(dc->hSelf, &lastmove, 1); + for(i = physdev->path->numEntriesUsed - 1; i >= 0; i--){ + if(physdev->path->pFlags[i] == PT_MOVETO){ + lastmove = physdev->path->pPoints[i]; + DPtoLP(dev->hdc, &lastmove, 1); break; } } @@ -1302,17 +1287,17 @@ BOOL PATH_PolyDraw(DC *dc, const POINT *pts, const BYTE *types, switch (types[i]) { case PT_MOVETO: - MoveToEx( dc->hSelf, pts[i].x, pts[i].y, NULL ); + MoveToEx( dev->hdc, pts[i].x, pts[i].y, NULL ); break; case PT_LINETO: case PT_LINETO | PT_CLOSEFIGURE: - LineTo( dc->hSelf, pts[i].x, pts[i].y ); + LineTo( dev->hdc, pts[i].x, pts[i].y ); break; case PT_BEZIERTO: if ((i + 2 < cbPoints) && (types[i + 1] == PT_BEZIERTO) && (types[i + 2] & ~PT_CLOSEFIGURE) == PT_BEZIERTO) { - PolyBezierTo( dc->hSelf, &pts[i], 3 ); + PolyBezierTo( dev->hdc, &pts[i], 3 ); i += 2; break; } @@ -1322,14 +1307,14 @@ BOOL PATH_PolyDraw(DC *dc, const POINT *pts, const BYTE *types, { if (!(types[i - 1] & PT_CLOSEFIGURE)) lastmove = pts[i - 1]; if (lastmove.x != orig_pos.x || lastmove.y != orig_pos.y) - MoveToEx( dc->hSelf, orig_pos.x, orig_pos.y, NULL ); + MoveToEx( dev->hdc, orig_pos.x, orig_pos.y, NULL ); } return FALSE; } if(types[i] & PT_CLOSEFIGURE){ - pPath->pFlags[pPath->numEntriesUsed-1] |= PT_CLOSEFIGURE; - MoveToEx( dc->hSelf, lastmove.x, lastmove.y, NULL ); + physdev->path->pFlags[physdev->path->numEntriesUsed-1] |= PT_CLOSEFIGURE; + MoveToEx( dev->hdc, lastmove.x, lastmove.y, NULL ); } } @@ -2374,9 +2359,9 @@ const struct gdi_dc_funcs path_driver = NULL, /* pPaintRgn */ NULL, /* pPatBlt */ pathdrv_Pie, /* pPie */ - NULL, /* pPolyBezier */ - NULL, /* pPolyBezierTo */ - NULL, /* pPolyDraw */ + pathdrv_PolyBezier, /* pPolyBezier */ + pathdrv_PolyBezierTo, /* pPolyBezierTo */ + pathdrv_PolyDraw, /* pPolyDraw */ NULL, /* pPolyPolygon */ NULL, /* pPolyPolyline */ NULL, /* pPolygon */

1 0

Alexandre Julliard : gdi32: Implement the polygon entry points in the path driver.
by Alexandre Julliard 27 Oct '11

27 Oct '11

Module: wine Branch: master Commit: d4889bef47331f556cc1bfdbecfb8a65ccd513cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4889bef47331f556cc1bfdbe… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 25 15:40:42 2011 +0200 gdi32: Implement the polygon entry points in the path driver. --- dlls/gdi32/gdi_private.h | 2 - dlls/gdi32/painting.c | 16 ++------- dlls/gdi32/path.c | 80 ++++++++++++++++++++++------------------------ 3 files changed, 42 insertions(+), 56 deletions(-) diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 68b5abf..73b7db5 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -329,9 +329,7 @@ extern BOOL PATH_ExtTextOut(DC *dc, INT x, INT y, UINT flags, const RECT *lprc, LPCWSTR str, UINT count, const INT *dx) DECLSPEC_HIDDEN; extern BOOL PATH_PolylineTo(DC *dc, const POINT *pt, DWORD cbCount) DECLSPEC_HIDDEN; extern BOOL PATH_Polyline(DC *dc, const POINT *pt, DWORD cbCount) DECLSPEC_HIDDEN; -extern BOOL PATH_Polygon(DC *dc, const POINT *pt, DWORD cbCount) DECLSPEC_HIDDEN; extern BOOL PATH_PolyPolyline(DC *dc, const POINT *pt, const DWORD *counts, DWORD polylines) DECLSPEC_HIDDEN; -extern BOOL PATH_PolyPolygon(DC *dc, const POINT *pt, const INT *counts, UINT polygons) DECLSPEC_HIDDEN; /* painting.c */ extern POINT *GDI_Bezier( const POINT *Points, INT count, INT *nPtsOut ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/painting.c b/dlls/gdi32/painting.c index d0c2955..87b5302 100644 --- a/dlls/gdi32/painting.c +++ b/dlls/gdi32/painting.c @@ -777,13 +777,9 @@ BOOL WINAPI Polygon( HDC hdc, const POINT* pt, INT count ) if (dc) { + PHYSDEV physdev = GET_DC_PHYSDEV( dc, pPolygon ); update_dc( dc ); - if (PATH_IsPathOpen(dc->path)) ret = PATH_Polygon(dc, pt, count); - else - { - PHYSDEV physdev = GET_DC_PHYSDEV( dc, pPolygon ); - ret = physdev->funcs->pPolygon( physdev, pt, count ); - } + ret = physdev->funcs->pPolygon( physdev, pt, count ); release_dc_ptr( dc ); } return ret; @@ -801,13 +797,9 @@ BOOL WINAPI PolyPolygon( HDC hdc, const POINT* pt, const INT* counts, if (dc) { + PHYSDEV physdev = GET_DC_PHYSDEV( dc, pPolyPolygon ); update_dc( dc ); - if (PATH_IsPathOpen(dc->path)) ret = PATH_PolyPolygon(dc, pt, counts, polygons); - else - { - PHYSDEV physdev = GET_DC_PHYSDEV( dc, pPolyPolygon ); - ret = physdev->funcs->pPolyPolygon( physdev, pt, counts, polygons ); - } + ret = physdev->funcs->pPolyPolygon( physdev, pt, counts, polygons ); release_dc_ptr( dc ); } return ret; diff --git a/dlls/gdi32/path.c b/dlls/gdi32/path.c index 896d145..c7dde62 100644 --- a/dlls/gdi32/path.c +++ b/dlls/gdi32/path.c @@ -1373,51 +1373,47 @@ BOOL PATH_PolylineTo(DC *dc, const POINT *pts, DWORD cbPoints) } -BOOL PATH_Polygon(DC *dc, const POINT *pts, DWORD cbPoints) +/************************************************************* + * pathdrv_Polygon + */ +static BOOL pathdrv_Polygon( PHYSDEV dev, const POINT *pts, INT cbPoints ) { - GdiPath *pPath = &dc->path; - POINT pt; - UINT i; - - /* Check that path is open */ - if(pPath->state!=PATH_Open) - return FALSE; + struct path_physdev *physdev = get_path_physdev( dev ); + POINT pt; + INT i; - for(i = 0; i < cbPoints; i++) { - pt = pts[i]; - if(!LPtoDP(dc->hSelf, &pt, 1)) - return FALSE; - PATH_AddEntry(pPath, &pt, (i == 0) ? PT_MOVETO : - ((i == cbPoints-1) ? PT_LINETO | PT_CLOSEFIGURE : - PT_LINETO)); - } - return TRUE; + for(i = 0; i < cbPoints; i++) { + pt = pts[i]; + LPtoDP( dev->hdc, &pt, 1 ); + PATH_AddEntry(physdev->path, &pt, (i == 0) ? PT_MOVETO : + ((i == cbPoints-1) ? PT_LINETO | PT_CLOSEFIGURE : + PT_LINETO)); + } + return TRUE; } -BOOL PATH_PolyPolygon( DC *dc, const POINT* pts, const INT* counts, - UINT polygons ) -{ - GdiPath *pPath = &dc->path; - POINT pt, startpt; - UINT poly, i; - INT point; - /* Check that path is open */ - if(pPath->state!=PATH_Open) - return FALSE; - - for(i = 0, poly = 0; poly < polygons; poly++) { - for(point = 0; point < counts[poly]; point++, i++) { - pt = pts[i]; - if(!LPtoDP(dc->hSelf, &pt, 1)) - return FALSE; - if(point == 0) startpt = pt; - PATH_AddEntry(pPath, &pt, (point == 0) ? PT_MOVETO : PT_LINETO); - } - /* win98 adds an extra line to close the figure for some reason */ - PATH_AddEntry(pPath, &startpt, PT_LINETO | PT_CLOSEFIGURE); - } - return TRUE; +/************************************************************* + * pathdrv_PolyPolygon + */ +static BOOL pathdrv_PolyPolygon( PHYSDEV dev, const POINT* pts, const INT* counts, UINT polygons ) +{ + struct path_physdev *physdev = get_path_physdev( dev ); + POINT pt, startpt; + UINT poly, i; + INT point; + + for(i = 0, poly = 0; poly < polygons; poly++) { + for(point = 0; point < counts[poly]; point++, i++) { + pt = pts[i]; + LPtoDP( dev->hdc, &pt, 1 ); + if(point == 0) startpt = pt; + PATH_AddEntry(physdev->path, &pt, (point == 0) ? PT_MOVETO : PT_LINETO); + } + /* win98 adds an extra line to close the figure for some reason */ + PATH_AddEntry(physdev->path, &startpt, PT_LINETO | PT_CLOSEFIGURE); + } + return TRUE; } BOOL PATH_PolyPolyline( DC *dc, const POINT* pts, const DWORD* counts, @@ -2362,9 +2358,9 @@ const struct gdi_dc_funcs path_driver = pathdrv_PolyBezier, /* pPolyBezier */ pathdrv_PolyBezierTo, /* pPolyBezierTo */ pathdrv_PolyDraw, /* pPolyDraw */ - NULL, /* pPolyPolygon */ + pathdrv_PolyPolygon, /* pPolyPolygon */ NULL, /* pPolyPolyline */ - NULL, /* pPolygon */ + pathdrv_Polygon, /* pPolygon */ NULL, /* pPolyline */ NULL, /* pPolylineTo */ NULL, /* pPutImage */

1 0

Alexandre Julliard : gdi32: Implement the polyline entry points in the path driver.
by Alexandre Julliard 27 Oct '11

27 Oct '11

Module: wine Branch: master Commit: 613972efe5dc54e3259a59f8faae24a33476e235 URL: http://source.winehq.org/git/wine.git/?a=commit;h=613972efe5dc54e3259a59f8f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 26 20:20:24 2011 +0200 gdi32: Implement the polyline entry points in the path driver. --- dlls/gdi32/gdi_private.h | 3 - dlls/gdi32/painting.c | 28 ++++-------- dlls/gdi32/path.c | 110 ++++++++++++++++++++-------------------------- 3 files changed, 57 insertions(+), 84 deletions(-) diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 73b7db5..9682531 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -327,9 +327,6 @@ extern BOOL PATH_RestorePath( DC *dst, DC *src ) DECLSPEC_HIDDEN; extern BOOL PATH_ExtTextOut(DC *dc, INT x, INT y, UINT flags, const RECT *lprc, LPCWSTR str, UINT count, const INT *dx) DECLSPEC_HIDDEN; -extern BOOL PATH_PolylineTo(DC *dc, const POINT *pt, DWORD cbCount) DECLSPEC_HIDDEN; -extern BOOL PATH_Polyline(DC *dc, const POINT *pt, DWORD cbCount) DECLSPEC_HIDDEN; -extern BOOL PATH_PolyPolyline(DC *dc, const POINT *pt, const DWORD *counts, DWORD polylines) DECLSPEC_HIDDEN; /* painting.c */ extern POINT *GDI_Bezier( const POINT *Points, INT count, INT *nPtsOut ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/painting.c b/dlls/gdi32/painting.c index 87b5302..183cdfa 100644 --- a/dlls/gdi32/painting.c +++ b/dlls/gdi32/painting.c @@ -728,13 +728,9 @@ BOOL WINAPI Polyline( HDC hdc, const POINT* pt, INT count ) if (dc) { + PHYSDEV physdev = GET_DC_PHYSDEV( dc, pPolyline ); update_dc( dc ); - if (PATH_IsPathOpen(dc->path)) ret = PATH_Polyline(dc, pt, count); - else - { - PHYSDEV physdev = GET_DC_PHYSDEV( dc, pPolyline ); - ret = physdev->funcs->pPolyline( physdev, pt, count ); - } + ret = physdev->funcs->pPolyline( physdev, pt, count ); release_dc_ptr( dc ); } return ret; @@ -746,17 +742,15 @@ BOOL WINAPI Polyline( HDC hdc, const POINT* pt, INT count ) BOOL WINAPI PolylineTo( HDC hdc, const POINT* pt, DWORD cCount ) { DC * dc = get_dc_ptr( hdc ); - BOOL ret = FALSE; + PHYSDEV physdev; + BOOL ret; if(!dc) return FALSE; update_dc( dc ); - if(PATH_IsPathOpen(dc->path)) ret = PATH_PolylineTo(dc, pt, cCount); - else - { - PHYSDEV physdev = GET_DC_PHYSDEV( dc, pPolylineTo ); - ret = physdev->funcs->pPolylineTo( physdev, pt, cCount ); - } + physdev = GET_DC_PHYSDEV( dc, pPolylineTo ); + ret = physdev->funcs->pPolylineTo( physdev, pt, cCount ); + if (ret && cCount) { dc->CursPosX = pt[cCount-1].x; @@ -816,13 +810,9 @@ BOOL WINAPI PolyPolyline( HDC hdc, const POINT* pt, const DWORD* counts, if (dc) { + PHYSDEV physdev = GET_DC_PHYSDEV( dc, pPolyPolyline ); update_dc( dc ); - if (PATH_IsPathOpen(dc->path)) ret = PATH_PolyPolyline(dc, pt, counts, polylines); - else - { - PHYSDEV physdev = GET_DC_PHYSDEV( dc, pPolyPolyline ); - ret = physdev->funcs->pPolyPolyline( physdev, pt, counts, polylines ); - } + ret = physdev->funcs->pPolyPolyline( physdev, pt, counts, polylines ); release_dc_ptr( dc ); } return ret; diff --git a/dlls/gdi32/path.c b/dlls/gdi32/path.c index c7dde62..956eaa2 100644 --- a/dlls/gdi32/path.c +++ b/dlls/gdi32/path.c @@ -1321,55 +1321,43 @@ static BOOL pathdrv_PolyDraw( PHYSDEV dev, const POINT *pts, const BYTE *types, return TRUE; } -BOOL PATH_Polyline(DC *dc, const POINT *pts, DWORD cbPoints) -{ - GdiPath *pPath = &dc->path; - POINT pt; - UINT i; - /* Check that path is open */ - if(pPath->state!=PATH_Open) - return FALSE; +/************************************************************* + * pathdrv_Polyline + */ +static BOOL pathdrv_Polyline( PHYSDEV dev, const POINT *pts, INT cbPoints ) +{ + struct path_physdev *physdev = get_path_physdev( dev ); + POINT pt; + INT i; - for(i = 0; i < cbPoints; i++) { - pt = pts[i]; - if(!LPtoDP(dc->hSelf, &pt, 1)) - return FALSE; - PATH_AddEntry(pPath, &pt, (i == 0) ? PT_MOVETO : PT_LINETO); - } - return TRUE; + for(i = 0; i < cbPoints; i++) { + pt = pts[i]; + LPtoDP( dev->hdc, &pt, 1 ); + PATH_AddEntry(physdev->path, &pt, (i == 0) ? PT_MOVETO : PT_LINETO); + } + return TRUE; } -BOOL PATH_PolylineTo(DC *dc, const POINT *pts, DWORD cbPoints) -{ - GdiPath *pPath = &dc->path; - POINT pt; - UINT i; - /* Check that path is open */ - if(pPath->state!=PATH_Open) - return FALSE; +/************************************************************* + * pathdrv_PolylineTo + */ +static BOOL pathdrv_PolylineTo( PHYSDEV dev, const POINT *pts, INT cbPoints ) +{ + struct path_physdev *physdev = get_path_physdev( dev ); + POINT pt; + INT i; - /* Add a PT_MOVETO if necessary */ - if(pPath->newStroke) - { - pPath->newStroke=FALSE; - pt.x = dc->CursPosX; - pt.y = dc->CursPosY; - if(!LPtoDP(dc->hSelf, &pt, 1)) - return FALSE; - if(!PATH_AddEntry(pPath, &pt, PT_MOVETO)) - return FALSE; - } + if (!start_new_stroke( physdev )) return FALSE; - for(i = 0; i < cbPoints; i++) { - pt = pts[i]; - if(!LPtoDP(dc->hSelf, &pt, 1)) - return FALSE; - PATH_AddEntry(pPath, &pt, PT_LINETO); - } + for(i = 0; i < cbPoints; i++) { + pt = pts[i]; + LPtoDP( dev->hdc, &pt, 1 ); + PATH_AddEntry(physdev->path, &pt, PT_LINETO); + } - return TRUE; + return TRUE; } @@ -1416,26 +1404,24 @@ static BOOL pathdrv_PolyPolygon( PHYSDEV dev, const POINT* pts, const INT* count return TRUE; } -BOOL PATH_PolyPolyline( DC *dc, const POINT* pts, const DWORD* counts, - DWORD polylines ) -{ - GdiPath *pPath = &dc->path; - POINT pt; - UINT poly, point, i; - /* Check that path is open */ - if(pPath->state!=PATH_Open) - return FALSE; +/************************************************************* + * pathdrv_PolyPolyline + */ +static BOOL pathdrv_PolyPolyline( PHYSDEV dev, const POINT* pts, const DWORD* counts, DWORD polylines ) +{ + struct path_physdev *physdev = get_path_physdev( dev ); + POINT pt; + UINT poly, point, i; - for(i = 0, poly = 0; poly < polylines; poly++) { - for(point = 0; point < counts[poly]; point++, i++) { - pt = pts[i]; - if(!LPtoDP(dc->hSelf, &pt, 1)) - return FALSE; - PATH_AddEntry(pPath, &pt, (point == 0) ? PT_MOVETO : PT_LINETO); - } - } - return TRUE; + for(i = 0, poly = 0; poly < polylines; poly++) { + for(point = 0; point < counts[poly]; point++, i++) { + pt = pts[i]; + LPtoDP( dev->hdc, &pt, 1 ); + PATH_AddEntry(physdev->path, &pt, (point == 0) ? PT_MOVETO : PT_LINETO); + } + } + return TRUE; } @@ -2359,10 +2345,10 @@ const struct gdi_dc_funcs path_driver = pathdrv_PolyBezierTo, /* pPolyBezierTo */ pathdrv_PolyDraw, /* pPolyDraw */ pathdrv_PolyPolygon, /* pPolyPolygon */ - NULL, /* pPolyPolyline */ + pathdrv_PolyPolyline, /* pPolyPolyline */ pathdrv_Polygon, /* pPolygon */ - NULL, /* pPolyline */ - NULL, /* pPolylineTo */ + pathdrv_Polyline, /* pPolyline */ + pathdrv_PolylineTo, /* pPolylineTo */ NULL, /* pPutImage */ NULL, /* pRealizeDefaultPalette */ NULL, /* pRealizePalette */

1 0