ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix the PolyPolygon function so it really generates a polypolygon and 

not multiple sets of polygons.
This commit is contained in:
Warren Baird 2003-05-12 03:27:24 +00:00 committed by Alexandre Julliard
parent ee3e98653a
commit 2711374bc5
1 changed files with 44 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
dlls/gdi/mfdrv/graphics.c
View File

@ -190,23 +190,53 @@ MFDRV_Polygon( PHYSDEV dev, const POINT* pt, INT count )
BOOL BOOL
MFDRV_PolyPolygon( PHYSDEV dev, const POINT* pt, const INT* counts, UINT polygons) MFDRV_PolyPolygon( PHYSDEV dev, const POINT* pt, const INT* counts, UINT polygons)
{ {
BOOL ret;
DWORD len;
METARECORD *mr;
int i,j; int i,j;
LPPOINT16 pt16; LPPOINT16 pt16;
const POINT* curpt=pt; INT16 totalpoint16 = 0;
BOOL ret; INT16 * pointcounts;
for (i=0;i<polygons;i++) { for (i=0;i<polygons;i++) {
pt16=(LPPOINT16)HeapAlloc( GetProcessHeap(), 0, totalpoint16 += counts[i];
sizeof(POINT16) * counts[i] );
if(!pt16) return FALSE;
for (j=counts[i];j--;) CONV_POINT32TO16(&(curpt[j]),&(pt16[j]));
ret = MFDRV_MetaPoly(dev, META_POLYGON, pt16, counts[i]);
HeapFree( GetProcessHeap(), 0, pt16 );
if (!ret)
return FALSE;
curpt+=counts[i];
} }
return TRUE;
/* allocate space for all points */
pt16=(LPPOINT16)HeapAlloc( GetProcessHeap(), 0,
sizeof(POINT16) * totalpoint16 );
pointcounts = (INT16*)HeapAlloc( GetProcessHeap(), 0,
sizeof(INT16) * totalpoint16 );
/* copy point counts */
for (i=0;i<polygons;i++) {
pointcounts[i] = counts[i];
}
/* convert all points */
for (j = totalpoint16; j--;){
CONV_POINT32TO16(&(pt[j]),&(pt16[j]));
}
len = sizeof(METARECORD) + sizeof(WORD) + polygons*sizeof(INT16) + totalpoint16*sizeof(POINT16);
if (!(mr = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, len ))) {
HeapFree( GetProcessHeap(), 0, pt16 );
HeapFree( GetProcessHeap(), 0, pointcounts );
return FALSE;
}
mr->rdSize = len /2;
mr->rdFunction = META_POLYPOLYGON;
*(mr->rdParm) = polygons;
memcpy(mr->rdParm + 1, pointcounts, polygons*sizeof(INT16));
memcpy(mr->rdParm + 1+polygons, pt16 , totalpoint16*sizeof(POINT16));
ret = MFDRV_WriteRecord( dev, mr, mr->rdSize * 2);
HeapFree( GetProcessHeap(), 0, pt16 );
HeapFree( GetProcessHeap(), 0, pointcounts );
HeapFree( GetProcessHeap(), 0, mr);
return ret;
} }