paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-16 02:49:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

* more clx compilation fixed

Browse Source
This commit is contained in:
florian 2005-02-03 18:41:12 +00:00
parent 8f571abbb9
commit a10b9c05d9
2 changed files with 57 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
rtl/win32/activex.pp
View File

@ -1151,6 +1151,7 @@ TYPE
LPCLIPFORMAT = ^TCLIPFORMAT; LPCLIPFORMAT = ^TCLIPFORMAT;
TCLIPFORMAT = Word; TCLIPFORMAT = Word;
CLIPFORMAT = TCLIPFORMAT; CLIPFORMAT = TCLIPFORMAT;
PClipFormat = LPCLIPFORMAT;
tagFORMATETC = Record tagFORMATETC = Record
CfFormat : Word {TCLIPFORMAT}; CfFormat : Word {TCLIPFORMAT};
@ -1162,6 +1163,7 @@ TYPE
FORMATETC = TagFORMATETC; FORMATETC = TagFORMATETC;
TFORMATETC = FORMATETC; TFORMATETC = FORMATETC;
LPFORMATETC = ^FORMATETC; LPFORMATETC = ^FORMATETC;
PFormatEtc = LPFORMATETC;
// Stats for data; used by several enumerations and by at least one // Stats for data; used by several enumerations and by at least one
// implementation of IDataAdviseHolder; if a field is not used, it // implementation of IDataAdviseHolder; if a field is not used, it
@ -1192,6 +1194,8 @@ TYPE
End; End;
USTGMEDIUM = TagSTGMEDIUM; USTGMEDIUM = TagSTGMEDIUM;
STGMEDIUM = USTGMEDIUM; STGMEDIUM = USTGMEDIUM;
TStgMedium = TagSTGMEDIUM;
PStgMedium = ^TStgMedium;
// //
// wireSTGMEDIUM // wireSTGMEDIUM
@ -2656,8 +2660,23 @@ TYPE
Function RequestNewObjectLayout:HResult;StdCall; Function RequestNewObjectLayout:HResult;StdCall;
End; End;
IOleWindow = interface(IUnknown)
['{00000114-0000-0000-C000-000000000046}']
function GetWindow(out wnd: HWnd): HResult; stdcall;
function ContextSensitiveHelp(fEnterMode: BOOL): HResult; stdcall;
end;
{$ENDIF} {$ENDIF}
tagOleMenuGroupWidths = record
width : array[0..5] Of LONG;
end;
OLEMENUGROUPWIDTHS = tagOleMenuGroupWidths;
TOleMenuGroupWidths = tagOleMenuGroupWidths;
LPOLEMENUGROUPWIDTHS = ^OLEMENUGROUPWIDTHS;
POleMenuGroupWidths = LPOLEMENUGROUPWIDTHS;
{ ****************************************************************************************************************** { ******************************************************************************************************************
stuff from objbase.h stuff from objbase.h
****************************************************************************************************************** } ****************************************************************************************************************** }
@ -2684,7 +2703,10 @@ end.
{ {
$Log$ $Log$
Revision 1.12 2004-05-07 13:26:31 marco Revision 1.13 2005-02-03 18:41:12 florian
* more clx compilation fixed
Revision 1.12 2004/05/07 13:26:31 marco
* COM related fixes from bug 3090 * COM related fixes from bug 3090
Revision 1.11 2003/10/05 20:30:09 florian Revision 1.11 2003/10/05 20:30:09 florian

36
rtl/win32/wininc/struct.inc
View File

@ -657,8 +657,8 @@
TLOGFONT = LOGFONT; TLOGFONT = LOGFONT;
TLOGFONTA = LOGFONT; TLOGFONTA = LOGFONT;
PLOGFONT = ^LOGFONT; PLOGFONT = ^LOGFONT;
PLOGFONTA = PLOGFONT;
PLogFontW = ^TLogFontW;
LOGFONTW = record LOGFONTW = record
lfHeight: LONG; lfHeight: LONG;
lfWidth: LONG; lfWidth: LONG;
@ -678,6 +678,7 @@
LPLOGFONTW = ^LOGFONTW; LPLOGFONTW = ^LOGFONTW;
NPLOGFONTW = ^LOGFONTW; NPLOGFONTW = ^LOGFONTW;
TLogFontW = LOGFONTW; TLogFontW = LOGFONTW;
PLogFontW = ^TLogFontW;
{CHOOSEFONT = record conflicts with ChosseFont function } {CHOOSEFONT = record conflicts with ChosseFont function }
TCHOOSEFONT = record TCHOOSEFONT = record
@ -4653,6 +4654,34 @@
TTEXTMETRIC = TEXTMETRIC; TTEXTMETRIC = TEXTMETRIC;
PTEXTMETRIC = ^TEXTMETRIC; PTEXTMETRIC = ^TEXTMETRIC;
TEXTMETRICW = record
tmHeight : LONG;
tmAscent : LONG;
tmDescent : LONG;
tmInternalLeading : LONG;
tmExternalLeading : LONG;
tmAveCharWidth : LONG;
tmMaxCharWidth : LONG;
tmWeight : LONG;
tmOverhang : LONG;
tmDigitizedAspectX : LONG;
tmDigitizedAspectY : LONG;
tmFirstChar : WCHAR;
tmLastChar : WCHAR;
tmDefaultChar : WCHAR;
tmBreakChar : WCHAR;
tmItalic : BYTE;
tmUnderlined : BYTE;
tmStruckOut : BYTE;
tmPitchAndFamily : BYTE;
tmCharSet : BYTE;
end;
LPTEXTMETRICW = ^TEXTMETRICW;
tagTEXTMETRICW = TEXTMETRICW;
TTEXTMETRICW = TEXTMETRICW;
PTEXTMETRICW = ^TEXTMETRICW;
OUTLINETEXTMETRIC = record OUTLINETEXTMETRIC = record
otmSize : UINT; otmSize : UINT;
otmTextMetrics : TEXTMETRIC; otmTextMetrics : TEXTMETRIC;
@ -7168,7 +7197,10 @@ type
{ {
$Log$ $Log$
Revision 1.32 2005-01-19 14:24:46 marco Revision 1.33 2005-02-03 18:41:12 florian
* more clx compilation fixed
Revision 1.32 2005/01/19 14:24:46 marco
* some comments about COMSTAT added * some comments about COMSTAT added
Revision 1.31 2005/01/08 14:43:34 florian Revision 1.31 2005/01/08 14:43:34 florian