From fd8a4f682741c8663c3b0887ccae35c7f7f7e7f5 Mon Sep 17 00:00:00 2001 From: Tomas Hajny Date: Wed, 4 Aug 1999 15:51:05 +0000 Subject: [PATCH] * merging changes by RB and DM :-( --- rtl/os2/os2def.pas | 489 ++++++++++++++++++++++--------------------- rtl/os2/pmbitmap.pas | 78 ++++--- rtl/os2/pmgpi.pas | 115 +++++----- rtl/os2/pmwin.pas | 78 ++++++- 4 files changed, 434 insertions(+), 326 deletions(-) diff --git a/rtl/os2/os2def.pas b/rtl/os2/os2def.pas index 797f89416a..ea90b71c77 100644 --- a/rtl/os2/os2def.pas +++ b/rtl/os2/os2def.pas @@ -1,239 +1,250 @@ -{**************************************************************************** - - Copyright (c) 1993,94 by Florian Kl„mpfl - - ****************************************************************************} -unit os2def; - -interface - -const - SEVERITY_NOERROR = $0; - SEVERITY_WARNING = $4; - SEVERITY_ERROR = $8; - SEVERITY_SEVERE = $c; - SEVERITY_UNRECOVERABLE = $10; - - WINERR_BASE = $1000; - GPIERR_BASE = $2000; - DEVERR_BASE = $3000; - SPLERR_BASE = $4000; - - ADDRESS = 0; - DRIVER_NAME = 1; - DRIVER_DATA = 2; - DATA_TYPE = 3; - COMMENT = 4; - PROC_NAME = 5; - PROC_PARAMS = 6; - SPL_PARAMS = 7; - NETWORK_PARAMS = 8; - - PD_JOB_PROPERTY = $0001; - FATTR_SEL_ITALIC = $0001; - FATTR_SEL_UNDERSCORE = $0002; - FATTR_SEL_OUTLINE = $0008; - FATTR_SEL_STRIKEOUT = $0010; - FATTR_SEL_BOLD = $0020; - FATTR_TYPE_KERNING = $0004; - FATTR_TYPE_MBCS = $0008; - FATTR_TYPE_DBCS = $0010; - FATTR_TYPE_ANTIALIASED = $0020; - FATTR_FONTUSE_NOMIX = $0002; - FATTR_FONTUSE_OUTLINE = $0004; - FATTR_FONTUSE_TRANSFORMABLE = $0008; - FACESIZE = 32; - - FM_TYPE_FIXED = $0001; - FM_TYPE_LICENSED = $0002; - FM_TYPE_KERNING = $0004; - FM_TYPE_DBCS = $0010; - FM_TYPE_MBCS = $0018; - FM_TYPE_64K = $8000; - FM_TYPE_ATOMS = $4000; - FM_TYPE_FAMTRUNC = $2000; - FM_TYPE_FACETRUNC = $1000; - FM_DEFN_OUTLINE = $0001; - FM_DEFN_IFI = $0002; - FM_DEFN_WIN = $0004; - FM_DEFN_GENERIC = $8000; - FM_SEL_ITALIC = $0001; - FM_SEL_UNDERSCORE = $0002; - FM_SEL_NEGATIVE = $0004; - FM_SEL_OUTLINE = $0008; - FM_SEL_STRIKEOUT = $0010; - FM_SEL_BOLD = $0020; - FM_CAP_NOMIX = $0001; - - type - pcardinal = ^cardinal; - plongint = ^longint; - pinteger = ^integer; - pshortint = ^shortint; - ppointer = ^pointer; - pbyte = ^byte; - - POINTL = record - x : cardinal; - y : cardinal; - end; - - PPOINTL = ^POINTL; - - POINTS = record - x : integer; - y : integer; - end; - - PPOINTS = ^POINTS; - - RECTL = record - xLeft : longint; - yBottom : longint; - xRight : longint; - yTop : longint; - end; - - PRECTL = ^RECTL; - - NPRECTL = ^RECTL; - - STR8 = array[0..7] of CHAR; - - PSTR8 = ^STR8; - - DRIVDATA = record - cb : longint; - lVersion : longint; - szDeviceName : array[0..32-1] of CHAR; - abGeneralData : array[0..1-1] of CHAR; - end; - - PDRIVDATA = ^DRIVDATA; - - PDEVOPENDATA = pshortint; {Initially, ^PSZ} - - DEVOPENSTRUC = record - pszLogAddress : pchar; - pszDriverName : pchar; - pdriv : PDRIVDATA; - pszDataType : pchar; - pszComment : pchar; - pszQueueProcName : pchar; - pszQueueProcParams : pchar; - pszSpoolerParams : pchar; - pszNetworkParams : pchar; - end; - - PDEVOPENSTRUC = ^DEVOPENSTRUC; - - PRINTDEST = record - cb : cardinal; - lType : longint; - pszToken : pchar; - lCount : longint; - pdopData : PDEVOPENDATA; - fl : cardinal; - pszPrinter : pchar; - end; - - PPRINTDEST = ^PRINTDEST; - - FATTRS = record - usRecordLength : word; - fsSelection : word; - lMatch : longint; - szFacename : array[0..FACESIZE-1] of CHAR; - idRegistry : word; - usCodePage : word; - lMaxBaselineExt : longint; - lAveCharWidth : longint; - fsType : word; - fsFontUse : word; - end; - - PFATTRS = ^FATTRS; - - PANOSE = record - bFamilyType : BYTE; - bSerifStyle : BYTE; - bWeight : BYTE; - bProportion : BYTE; - bContrast : BYTE; - bStrokeVariation : BYTE; - bArmStyle : BYTE; - bLetterform : BYTE; - bMidline : BYTE; - bXHeight : BYTE; - abReserved : array[0..2-1] of BYTE; - end; - - FONTMETRICS = record - szFamilyname : array[0..FACESIZE-1] of CHAR; - szFacename : array[0..FACESIZE-1] of CHAR; - idRegistry : word; - usCodePage : word; - lEmHeight : longint; - lXHeight : longint; - lMaxAscender : longint; - lMaxDescender : longint; - lLowerCaseAscent : longint; - lLowerCaseDescent : longint; - lInternalLeading : longint; - lExternalLeading : longint; - lAveCharWidth : longint; - lMaxCharInc : longint; - lEmInc : longint; - lMaxBaselineExt : longint; - sCharSlope : integer; - sInlineDir : integer; - sCharRot : integer; - usWeightClass : word; - usWidthClass : word; - sXDeviceRes : integer; - sYDeviceRes : integer; - sFirstChar : integer; - sLastChar : integer; - sDefaultChar : integer; - sBreakChar : integer; - sNominalPointSize : integer; - sMinimumPointSize : integer; - sMaximumPointSize : integer; - fsType : word; - fsDefn : word; - fsSelection : word; - fsCapabilities : word; - lSubscriptXSize : longint; - lSubscriptYSize : longint; - lSubscriptXOffset : longint; - lSubscriptYOffset : longint; - lSuperscriptXSize : longint; - lSuperscriptYSize : longint; - lSuperscriptXOffset : longint; - lSuperscriptYOffset : longint; - lUnderscoreSize : longint; - lUnderscorePosition : longint; - lStrikeoutSize : longint; - lStrikeoutPosition : longint; - sKerningPairs : integer; - sFamilyClass : integer; - lMatch : longint; - FamilyNameAtom : longint; - FaceNameAtom : longint; - panose : PANOSE; - end; - - PFONTMETRICS = ^FONTMETRICS; - - { Nun folgen einige FPKPascal-spezifische Typen: } - - { null. term. Strings sind in den Header Dateien oft als } - { array[0..0] of byte deklariert, der folgende Typ er- } - { m”glich eine Typkonvertierung } - CHARARRAY = array[0..0] of char; - - - - implementation - -end. +{**************************************************************************** + + Copyright (c) 1993,94,99 by FK, RB + + ****************************************************************************} +unit os2def; + +interface + +const + SEVERITY_NOERROR = $0; + SEVERITY_WARNING = $4; + SEVERITY_ERROR = $8; + SEVERITY_SEVERE = $c; + SEVERITY_UNRECOVERABLE = $10; + + WINERR_BASE = $1000; + GPIERR_BASE = $2000; + DEVERR_BASE = $3000; + SPLERR_BASE = $4000; + + ADDRESS = 0; + DRIVER_NAME = 1; + DRIVER_DATA = 2; + DATA_TYPE = 3; + COMMENT = 4; + PROC_NAME = 5; + PROC_PARAMS = 6; + SPL_PARAMS = 7; + NETWORK_PARAMS = 8; + + PD_JOB_PROPERTY = $0001; + FATTR_SEL_ITALIC = $0001; + FATTR_SEL_UNDERSCORE = $0002; + FATTR_SEL_OUTLINE = $0008; + FATTR_SEL_STRIKEOUT = $0010; + FATTR_SEL_BOLD = $0020; + FATTR_TYPE_KERNING = $0004; + FATTR_TYPE_MBCS = $0008; + FATTR_TYPE_DBCS = $0010; + FATTR_TYPE_ANTIALIASED = $0020; + FATTR_FONTUSE_NOMIX = $0002; + FATTR_FONTUSE_OUTLINE = $0004; + FATTR_FONTUSE_TRANSFORMABLE = $0008; + FACESIZE = 32; + + FM_TYPE_FIXED = $0001; + FM_TYPE_LICENSED = $0002; + FM_TYPE_KERNING = $0004; + FM_TYPE_DBCS = $0010; + FM_TYPE_MBCS = $0018; + FM_TYPE_64K = $8000; + FM_TYPE_ATOMS = $4000; + FM_TYPE_FAMTRUNC = $2000; + FM_TYPE_FACETRUNC = $1000; + FM_DEFN_OUTLINE = $0001; + FM_DEFN_IFI = $0002; + FM_DEFN_WIN = $0004; + FM_DEFN_GENERIC = $8000; + FM_SEL_ITALIC = $0001; + FM_SEL_UNDERSCORE = $0002; + FM_SEL_NEGATIVE = $0004; + FM_SEL_OUTLINE = $0008; + FM_SEL_STRIKEOUT = $0010; + FM_SEL_BOLD = $0020; + FM_CAP_NOMIX = $0001; + + type + pcardinal = ^cardinal; + plongint = ^longint; + pinteger = ^integer; + pshortint = ^shortint; + ppointer = ^pointer; + pbyte = ^byte; + + POINTL = record + x : cardinal; + y : cardinal; + end; + + PPOINTL = ^POINTL; + + POINTS = record + x : integer; + y : integer; + end; + + PPOINTS = ^POINTS; + + RECTL = record + xLeft : longint; + yBottom : longint; + xRight : longint; + yTop : longint; + end; + + PRECTL = ^RECTL; + + NPRECTL = ^RECTL; + + STR8 = array[0..7] of CHAR; + + PSTR8 = ^STR8; + + DRIVDATA = record + cb : longint; + lVersion : longint; + szDeviceName : array[0..32-1] of CHAR; + abGeneralData : array[0..1-1] of CHAR; + end; + + PDRIVDATA = ^DRIVDATA; + + PDEVOPENDATA = PDevOpenStruc; + + DEVOPENSTRUC = record + pszLogAddress : pchar; + pszDriverName : pchar; + pdriv : PDRIVDATA; + pszDataType : pchar; + pszComment : pchar; + pszQueueProcName : pchar; + pszQueueProcParams : pchar; + pszSpoolerParams : pchar; + pszNetworkParams : pchar; + end; + + PDEVOPENSTRUC = ^DEVOPENSTRUC; + + PRINTDEST = record + cb : cardinal; + lType : longint; + pszToken : pchar; + lCount : longint; + pdopData : PDEVOPENDATA; + fl : cardinal; + pszPrinter : pchar; + end; + + PPRINTDEST = ^PRINTDEST; + + FATTRS = record + usRecordLength : word; + fsSelection : word; + lMatch : longint; + szFacename : array[0..FACESIZE-1] of CHAR; + idRegistry : word; + usCodePage : word; + lMaxBaselineExt : longint; + lAveCharWidth : longint; + fsType : word; + fsFontUse : word; + end; + + PFATTRS = ^FATTRS; + + PANOSE = record + bFamilyType : BYTE; + bSerifStyle : BYTE; + bWeight : BYTE; + bProportion : BYTE; + bContrast : BYTE; + bStrokeVariation : BYTE; + bArmStyle : BYTE; + bLetterform : BYTE; + bMidline : BYTE; + bXHeight : BYTE; + abReserved : array[0..2-1] of BYTE; + end; + + FONTMETRICS = record + szFamilyname : array[0..FACESIZE-1] of CHAR; + szFacename : array[0..FACESIZE-1] of CHAR; + idRegistry : word; + usCodePage : word; + lEmHeight : longint; + lXHeight : longint; + lMaxAscender : longint; + lMaxDescender : longint; + lLowerCaseAscent : longint; + lLowerCaseDescent : longint; + lInternalLeading : longint; + lExternalLeading : longint; + lAveCharWidth : longint; + lMaxCharInc : longint; + lEmInc : longint; + lMaxBaselineExt : longint; + sCharSlope : integer; + sInlineDir : integer; + sCharRot : integer; + usWeightClass : word; + usWidthClass : word; + sXDeviceRes : integer; + sYDeviceRes : integer; + sFirstChar : integer; + sLastChar : integer; + sDefaultChar : integer; + sBreakChar : integer; + sNominalPointSize : integer; + sMinimumPointSize : integer; + sMaximumPointSize : integer; + fsType : word; + fsDefn : word; + fsSelection : word; + fsCapabilities : word; + lSubscriptXSize : longint; + lSubscriptYSize : longint; + lSubscriptXOffset : longint; + lSubscriptYOffset : longint; + lSuperscriptXSize : longint; + lSuperscriptYSize : longint; + lSuperscriptXOffset : longint; + lSuperscriptYOffset : longint; + lUnderscoreSize : longint; + lUnderscorePosition : longint; + lStrikeoutSize : longint; + lStrikeoutPosition : longint; + sKerningPairs : integer; + sFamilyClass : integer; + lMatch : longint; + FamilyNameAtom : longint; + FaceNameAtom : longint; + panose : PANOSE; + end; + + PFONTMETRICS = ^FONTMETRICS; + + { Nun folgen einige FPKPascal-spezifische Typen: } + + { null. term. Strings sind in den Header Dateien oft als } + { array[0..0] of byte deklariert, der folgende Typ er- } + { m”glich eine Typkonvertierung } + CHARARRAY = array[0..0] of char; + +{Names beginning with T for compatibility} + TPOINTL = POINTL; + TPOINTS = POINTS; + TRECTL = RECTL; + TSTR8 = STR8; + TDRIVDATA = DRIVDATA; + TDEVOPENSTRUC = DEVOPENSTRUC; + TPRINTDEST = PRINTDEST; + TFATTRS = FATTRS; + TPANOSE = PANOSE; + TFONTMETRICS = FONTMETRICS; + TCHARARRAY = CHARARRAY; + + implementation + +end. diff --git a/rtl/os2/pmbitmap.pas b/rtl/os2/pmbitmap.pas index 670ff3e46e..f119c9c207 100644 --- a/rtl/os2/pmbitmap.pas +++ b/rtl/os2/pmbitmap.pas @@ -38,32 +38,36 @@ interface {$PACKRECORDS 1} -type Tbitmapinfoheader=record +type TBitmapInfoHeader=record cbFix:cardinal; cx:word; cy:word; cPlanes:word; cBitCount:word; end; - Pbitmapinfoheader = ^Tbitmapinfoheader; + PBitmapInfoHeader=^TBitmapInfoHeader; + BitmapInfoHeader=TBitmapInfoHeader; - Trgb=record + TRgb=record bBlue, bGreen, - bRed:BYTE; + bRed:byte; end; + PRgb=^TRgb; + Rgb=TRgb; - Tbitmapinfo=record + TBitmapInfo=record cbFix:cardinal; cx:word; cy:word; cPlanes:word; cBitCount:word; - argbColor:array[0..1-1] of Trgb; + aRgbColor:array[0..1-1] of TRgb; end; - Pbitmapinfo=^Tbitmapinfo; + PBitmapInfo=^TBitmapInfo; + BitmapInfo=TBitmapInfo; - Tbitmapinfoheader2=record + TBitmapInfoHeader2=record cbFix:cardinal; cx:cardinal; cy:cardinal; @@ -73,8 +77,8 @@ type Tbitmapinfoheader=record cbImage:cardinal; cxResolution:cardinal; cyResolution:cardinal; - cclrUsed:cardinal; - cclrImportant:cardinal; + cClrUsed:cardinal; + cClrImportant:cardinal; usUnits:word; usReserved:word; usRecording:word; @@ -84,17 +88,19 @@ type Tbitmapinfoheader=record ulColorEncoding:cardinal; ulIdentifier:cardinal; end; - Pbitmapinfoheader2=^Tbitmapinfoheader2; + PBitmapInfoHeader2=^TBitmapInfoHeader2; + BitmapInfoHeader2=TBitmapInfoHeader2; - Trgb2=record + TRgb2=record bBlue, bGreen, bRed, fcOptions:byte; end; - Prgb2=^Trgb2; + PRgb2=^TRgb2; + Rgb2=TRgb2; - Tbitmapinfo2=record + TBitmapInfo2=record cbFix:cardinal; cx:cardinal; cy:cardinal; @@ -104,8 +110,8 @@ type Tbitmapinfoheader=record cbImage:cardinal; cxResolution:cardinal; cyResolution:cardinal; - cclrUsed:cardinal; - cclrImportant:cardinal; + cClrUsed:cardinal; + cClrImportant:cardinal; usUnits:word; usReserved:word; usRecording:word; @@ -114,51 +120,54 @@ type Tbitmapinfoheader=record cSize2:cardinal; ulColorEncoding:cardinal; ulIdentifier:cardinal; - argbColor:array[0..1-1] of Trgb2; + aRgbColor:array[0..1-1] of TRgb2; end; - Pbitmapinfo2=^Tbitmapinfo2; + PBitmapInfo2=^TBitmapInfo2; + BitmapInfo2=TBitmapInfo2; - Tbitmapfileheader=record + TBitmapFileHeader=record usType:word; cbSize:cardinal; xHotspot:integer; yHotspot:integer; offBits:cardinal; - bmp:Tbitmapinfoheader; + bmp:TBitmapInfoHeader; end; + PBitmapFileHeader=^TBitmapFileHeader; + BitmapFileHeader=TBitmapFileHeader; - Pbitmapfileheader=^Tbitmapfileheader; - - Tbitmaparrayfileheader=record + TBitmapArrayFileHeader=record usType:word; cbSize:cardinal; offNext:cardinal; cxDisplay:word; cyDisplay:word; - bfh:Tbitmapfileheader; + bfh:TBitmapFileHeader; end; - Pbitmaparrayfileheader=^Tbitmaparrayfileheader; + PBitmapArrayFileHeader=^TBitmapArrayFileHeader; + BitmapArrayFileHeader=TBitmapArrayFileHeader; - Tbitmapfileheader2=record + TBitmapFileHeader2=record usType:word; cbSize:cardinal; xHotspot:integer; yHotspot:integer; offBits:cardinal; - bmp2:Tbitmapinfoheader2; + bmp2:TBitmapInfoHeader2; end; - Pbitmapfileheader2=^Tbitmapfileheader2; + PBitmapFileHeader2=^TBitmapFileHeader2; + BitmapFileHeader2=TBitmapFileHeader2; - Tbitmaparrayfileheader2=record + TBitmapArrayFileHeader2=record usType:word; cbSize:cardinal; offNext:cardinal; cxDisplay:word; cyDisplay:word; - bfh2:Tbitmapfileheader2; + bfh2:TBitmapFileHeader2; end; - - Pbitmaparrayfileheader2=^Tbitmaparrayfileheader2; + PBitmapArrayFileHeader2=^TBitmapArrayFileHeader2; + BitmapArrayFileHeader2=^BitmapArrayFileHeader2; const CBD_COMPRESSION = 1; CBD_DECOMPRESSION = 2; @@ -191,7 +200,10 @@ implementation end. { $Log$ - Revision 1.4 1999-06-11 13:16:21 daniel + Revision 1.5 1999-08-04 15:51:10 hajny + * merging changes by RB and DM :-( + + Revision 1.4 1999/06/11 13:16:21 daniel * Layout and copyright updates. Revision 1.3 1999/06/02 16:01:31 hajny diff --git a/rtl/os2/pmgpi.pas b/rtl/os2/pmgpi.pas index 397edc296c..680ea8e50f 100644 --- a/rtl/os2/pmgpi.pas +++ b/rtl/os2/pmgpi.pas @@ -2,8 +2,6 @@ $Id$ - Copyright (c) 1993,94,99 by FK, RB - PMGPI interface unit FPC Pascal Runtime Library for OS/2 Copyright (c) 1993,94 by Florian Kl„mpfl @@ -544,41 +542,45 @@ const GPI_ERROR = 0; POLYGON_EXCL = 0; POLYGON_INCL = $0008; -type sizel=record +type SizeL=record cx,cy:longint; end; - Psizel=^sizel; + PSizeL=^SizeL; + TSizeL=SizeL; - matrixlf=record - fxm11 : longint; - fxm12 : longint; - lm13 : longint; - fxm21 : longint; - fxm22 : longint; - lm23 : longint; - lm31 : longint; - lm32 : longint; - lm33 : longint; + MatrixLF=record + fxm11:longint; + fxm12:longint; + lm13:longint; + fxm21:longint; + fxm22:longint; + lm23:longint; + lm31:longint; + lm32:longint; + lm33:longint; end; + PMatrixLF=^MatrixLF; + TMatrixLF=MatrixLF; - Pmatrixlf=^matrixlf; - - arcparams=record + ArcParams=record lp,lq,lr,ls:longint; end; - Parcparams=^arcparams; + PArcParams=^ArcParams; + TArcParams=ArcParams; - sizef=record + SizeF=record cx,cy:longint; end; - Psizef=^sizef; + PSizeF=^SizeF; + TSizeF=SizeF; - gradientl=record + GradientL=record x,y:longint; end; - Pgradientl=^gradientl; + PGradientL=^GradientL; + TGradientL=GradientL; - linebundle=record + LineBundle=record lColor:longint; lBackColor:longint; usMixMode:word; @@ -590,9 +592,10 @@ type sizel=record usJoin:word; usReserved:word; end; - Plinebundle=^linebundle; + PLineBundle=^LineBundle; + TLineBundle=LineBundle; - charbundle=record + CharBundle=record lColor:longint; lBackColor:longint; usMixMode:word; @@ -607,20 +610,22 @@ type sizel=record fxExtra:longint; fxBreakExtra:longint; end; - Pcharbundle=^charbundle; + PCharBundle=^CharBundle; + TCharBundle=CharBundle; - markerbundle=record + MarkerBundle=record lColor:longint; lBackColor:longint; usMixMode:word; usBackMixMode:word; usSet:word; usSymbol:word; - sizfxCell:sizef; + sizFxCell:SizeF; end; - Pmarkerbundle=^markerbundle; + PMarkerBundle=^MarkerBundle; + TMarkerBundle=MarkerBundle; - areabundle=record + AreaBundle=record lColor:longint; lBackColor:longint; usMixMode:word; @@ -629,61 +634,70 @@ type sizel=record usSymbol:word; ptlRefPoint:pointl; end; - Pareabundle=^areabundle; + PAreaBundle=^AreaBundle; + TAreaBundle=AreaBundle; - imagebundle=record + ImageBundle=record lColor:longint; lBackColor:longint; usMixMode:word; usBackMixMode:word; end; - Pimagebundle=^imagebundle; + PImageBundle=^ImageBundle; + TImageBundle=ImageBundle; - kerningpairs=record + KerningPairs=record sFirstChar:integer; sSecondChar:integer; lKerningAmount:longint; end; - Pkerningpairs=^kerningpairs; + PKerningPairs=^KerningPairs; + TKerningPairs=KerningPairs; - facenamedesc=record + FaceNameDesc=record usSize:word; usWeightClass:word; usWidthClass:word; usReserved:word; flOptions:cardinal; end; - Pfacenamedesc=^facenamedesc; + PFaceNameDesc=^FaceNameDesc; + TFaceNameDesc=FaceNameDesc; - ffdescs=array[0..1,0..facesize-1] of char; - Pffdescs=^ffdescs; + FFDescs=array[0..1,0..FaceSize-1] of char; + PFFDescs=^FFDescs; + TFFDescs = FFDescs; - ffdescs2=record + FFDescs2=record cbLength:cardinal; cbFacenameOffset:cardinal; abFamilyName:array[0..1-1] of byte; end; - Pffdescs2=^ffdescs2; + PFFDescs2=^FFDescs2; + TFFDescs2=FFDescs2; - rgnrect=record + RgnRect=record ircStart:cardinal; crc:cardinal; crcReturned:cardinal; ulDirection:cardinal; end; - Prgnrect=^rgnrect; + PRgnRect=^RgnRect; + TRgnRect=RgnRect; - polygon=record + Polygon=record ulPoints:cardinal; aPointl:Ppointl; end; - Ppolygon=^polygon; + PPolygon=^Polygon; + TPolygon=Polygon; - polyset=record + Polyset=record ulPolys:cardinal; - aPolygon:array[0..1-1] of polygon; + aPolygon:array[0..1-1] of TPolygon; end; - Ppolyset=^polyset; + PPolyset=^Polyset; + TPolyset=Polyset; function GpiCreatePS(hab,hdc : cardinal;var psizlSize : SIZEL;flOptions : cardinal) : cardinal;cdecl; function GpiDestroyPS(hps : cardinal) : longbool;cdecl; @@ -1214,7 +1228,10 @@ function GpiPolygons(hps,ulCount : cardinal;var paplgn : POLYGON;flOptions,flMod end. { $Log$ - Revision 1.5 1999-06-11 13:16:19 daniel + Revision 1.6 1999-08-04 15:51:07 hajny + * merging changes by RB and DM :-( + + Revision 1.5 1999/06/11 13:16:19 daniel * Layout and copyright updates. Revision 1.4 1999/06/02 16:01:33 hajny diff --git a/rtl/os2/pmwin.pas b/rtl/os2/pmwin.pas index 13162eb022..bb9a2513fd 100644 --- a/rtl/os2/pmwin.pas +++ b/rtl/os2/pmwin.pas @@ -2,9 +2,39 @@ $Id$ - Copyright (c) 1993,94,99 by FK, RB - + PMWIN interface unit + FPC Pascal Runtime Library for OS/2 + Copyright (c) 1993,94 by Florian Kl„mpfl + Copyright (c) 1999 by Ramon Bosque + + The FPK-Pascal runtime library is distributed under the Library GNU Public + License v2. So is this unit. The Library GNU Public License requires you to + distribute the source code of this unit with any product that uses it. + Because the EMX library isn't under the LGPL, we grant you an exception to + this, and that is, when you compile a program with the FPK Pascal compiler, + you do not need to ship source code with that program, AS LONG AS YOU ARE + USING UNMODIFIED CODE! If you modify this code, you MUST change the next + line: + + + + Send us your modified files, we can work together if you want! + + FPK-Pascal is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + Library GNU General Public License for more details. + + You should have received a copy of the Library GNU General Public License + along with FPK-Pascal; see the file COPYING.LIB. If not, write to + the Free Software Foundation, 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. + ****************************************************************************} + +{Warning: This code is alfa. Future versions of this unit will propably + not be compatible.} + unit pmwin; interface @@ -320,7 +350,42 @@ unit pmwin; PCPTEXT = ^CPTEXT; {$PACKRECORDS NORMAL} +{Names beginning with T for compatibility} + TQVERSDATA = QVERSDATA; + TSWP = SWP; + TCREATESTRUCT = CREATESTRUCT; + TCLASSINFO = CLASSINFO; + TQMSQ = QMSG; + TMQINFO = MQINFO; + TWNDPARAMS = WNDPARAMS; + TUSERBUTTON = USERBUTTON; + TOWNERITEM = OWNERITEM; + TPARAM = PARAM; + TPRESPARAMS = PRESPARAMS; + TTRACKINFO = TRACKINFO; + TCURSORINFO = CURSORINFO; + TPOINTERINFO = POINTERINFO; + TSMHSTRUCT = SMHSTRUCT; + TERRINFO = ERRINFO; + TCONVCONTEXT = CONVCONTEXT; + TDDEINIT = DDEINIT; + TDDESTRUCT = DDESTRUCT; + TDESKTOP = DESKTOP; + TCMDMSG = CMDMSG; + TMSEMSG = MSEMSG; + TCHRMSG = CHRMSG; + TDLGTITEM = DLGTITEM; + TDLGTEMPLATE = DLGTEMPLATE; + TBTNCDATA = BTNCDATA; + TENTRYFDATA = ENTRYFDATA; + TMENUITEM = MENUITEM; + TSBCDATA = SBCDATA; + TFRAMECDATA = FRAMECDATA; + TACCEL = ACCEL; + TACCELTABLE = ACCELTABLE; + TMPF = MFP; + TCPTEXT = CPTEXT; const WS_VISIBLE = $80000000; WS_DISABLED = $40000000; @@ -2085,16 +2150,19 @@ const end; function integer1FROMMP(mp : pointer) : word;cdecl; begin - integer1FROMMP:=lo(cardinal(mp)); + {integer1FROMMP:=lo(cardinal(mp)); RBP} end; function integer2FROMMP(mp : pointer) : word;cdecl; begin - integer2FROMMP:=hi(cardinal(mp)) + {integer2FROMMP:=hi(cardinal(mp)) RBP} end; end. { $Log$ - Revision 1.5 1999-06-02 16:01:29 hajny + Revision 1.6 1999-08-04 15:51:05 hajny + * merging changes by RB and DM :-( + + Revision 1.5 1999/06/02 16:01:29 hajny * changes by Ramon Bosque }