marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Move EMR*16 definitions to wingdi.h, as they're part of the WIN32 API.

oldstable
Mike McCormack 2004-03-29 23:04:11 +00:00 committed by Alexandre Julliard
parent d687ed2e28
commit 23d036719d
3 changed files with 49 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
include/wine/wingdi16.h
View File

@ -311,35 +311,6 @@ typedef struct
HMETAFILE16 hMF;
} METAFILEPICT16, *LPMETAFILEPICT16;
typedef struct {
EMR emr;
RECTL rclBounds;
DWORD cpts;
POINT16 apts[1];
} EMRPOLYLINE16, *PEMRPOLYLINE16,
EMRPOLYBEZIER16, *PEMRPOLYBEZIER16,
EMRPOLYGON16, *PEMRPOLYGON16,
EMRPOLYBEZIERTO16, *PEMRPOLYBEZIERTO16,
EMRPOLYLINETO16, *PEMRPOLYLINETO16;
typedef struct {
EMR emr;
RECTL rclBounds;
DWORD cpts;
POINT16 apts[1];
BYTE abTypes[1];
} EMRPOLYDRAW16, *PEMRPOLYDRAW16;
typedef struct {
EMR emr;
RECTL rclBounds;
DWORD nPolys;
DWORD cpts;
DWORD aPolyCounts[1];
POINT16 apts[1];
} EMRPOLYPOLYLINE16, *PEMRPOLYPOLYLINE16,
EMRPOLYPOLYGON16, *PEMRPOLYPOLYGON16;
typedef INT16 (CALLBACK *MFENUMPROC16)(HDC16,HANDLETABLE16*,METARECORD*,
INT16,LPARAM);
typedef struct

29
include/wingdi.h
View File

@ -2332,6 +2332,35 @@ typedef struct {
EMRPOLYBEZIERTO, *PEMRPOLYBEZIERTO,
EMRPOLYLINETO, *PEMRPOLYLINETO;
typedef struct {
EMR emr;
RECTL rclBounds;
DWORD cpts;
POINTS apts[1];
} EMRPOLYLINE16, *PEMRPOLYLINE16,
EMRPOLYBEZIER16, *PEMRPOLYBEZIER16,
EMRPOLYGON16, *PEMRPOLYGON16,
EMRPOLYBEZIERTO16, *PEMRPOLYBEZIERTO16,
EMRPOLYLINETO16, *PEMRPOLYLINETO16;
typedef struct {
EMR emr;
RECTL rclBounds;
DWORD cpts;
POINTS apts[1];
BYTE abTypes[1];
} EMRPOLYDRAW16, *PEMRPOLYDRAW16;
typedef struct {
EMR emr;
RECTL rclBounds;
DWORD nPolys;
DWORD cpts;
DWORD aPolyCounts[1];
POINTS apts[1];
} EMRPOLYPOLYLINE16, *PEMRPOLYPOLYLINE16,
EMRPOLYPOLYGON16, *PEMRPOLYPOLYGON16;
typedef struct {
EMR emr;
RECTL rclBounds;

25
objects/enhmetafile.c
View File

@ -869,7 +869,10 @@ BOOL WINAPI PlayEnhMetaFileRecord(
pPoly->cpts * sizeof(POINT) );
DWORD i;
for(i = 0; i < pPoly->cpts; i++)
CONV_POINT16TO32(pPoly->apts + i, pts + i);
{
pts[i].x = pPoly->apts[i].x;
pts[i].y = pPoly->apts[i].y;
}
Polygon(hdc, pts, pPoly->cpts);
HeapFree( GetProcessHeap(), 0, pts );
break;
@ -882,7 +885,10 @@ BOOL WINAPI PlayEnhMetaFileRecord(
pPoly->cpts * sizeof(POINT) );
DWORD i;
for(i = 0; i < pPoly->cpts; i++)
CONV_POINT16TO32(pPoly->apts + i, pts + i);
{
pts[i].x = pPoly->apts[i].x;
pts[i].y = pPoly->apts[i].y;
}
Polyline(hdc, pts, pPoly->cpts);
HeapFree( GetProcessHeap(), 0, pts );
break;
@ -895,7 +901,10 @@ BOOL WINAPI PlayEnhMetaFileRecord(
pPoly->cpts * sizeof(POINT) );
DWORD i;
for(i = 0; i < pPoly->cpts; i++)
CONV_POINT16TO32(pPoly->apts + i, pts + i);
{
pts[i].x = pPoly->apts[i].x;
pts[i].y = pPoly->apts[i].y;
}
PolylineTo(hdc, pts, pPoly->cpts);
HeapFree( GetProcessHeap(), 0, pts );
break;
@ -908,7 +917,10 @@ BOOL WINAPI PlayEnhMetaFileRecord(
pPoly->cpts * sizeof(POINT) );
DWORD i;
for(i = 0; i < pPoly->cpts; i++)
CONV_POINT16TO32(pPoly->apts + i, pts + i);
{
pts[i].x = pPoly->apts[i].x;
pts[i].y = pPoly->apts[i].y;
}
PolyBezier(hdc, pts, pPoly->cpts);
HeapFree( GetProcessHeap(), 0, pts );
break;
@ -921,7 +933,10 @@ BOOL WINAPI PlayEnhMetaFileRecord(
pPoly->cpts * sizeof(POINT) );
DWORD i;
for(i = 0; i < pPoly->cpts; i++)
CONV_POINT16TO32(pPoly->apts + i, pts + i);
{
pts[i].x = pPoly->apts[i].x;
pts[i].y = pPoly->apts[i].y;
}
PolyBezierTo(hdc, pts, pPoly->cpts);
HeapFree( GetProcessHeap(), 0, pts );
break;