diff options
| author | marco <marco@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2008-01-05 17:01:56 +0000 |
|---|---|---|
| committer | marco <marco@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2008-01-05 17:01:56 +0000 |
| commit | eb03fc933887dd9f447c220f05e1ec69990a5a30 (patch) | |
| tree | 00344520984bdedb23852168aa999addec3e0f1f /packages | |
| parent | 76d8c9752f81ebe5a33cb4926f56166018499323 (diff) | |
| download | fpc-eb03fc933887dd9f447c220f05e1ec69990a5a30.tar.gz | |
Merged revisions 9611-9612,9616,9618 via svnmerge from
svn+ssh://marco@svn.freepascal.org/FPC/svn/fpc/trunk
........
r9611 | marco | 2008-01-02 10:43:55 +0100 (Wed, 02 Jan 2008) | 2 lines
* patch from KMS, resolves 10147
........
r9612 | marco | 2008-01-02 11:41:42 +0100 (Wed, 02 Jan 2008) | 2 lines
* fix for 10535 IProvideClassinfo + -2
........
r9616 | marco | 2008-01-02 20:50:02 +0100 (Wed, 02 Jan 2008) | 2 lines
* Fix for 10534. tagstatstg now aliased in activex.pp to types.pp
........
r9618 | marco | 2008-01-02 21:45:09 +0100 (Wed, 02 Jan 2008) | 2 lines
* Fix for 10482, iinterfacecomponentreference
........
git-svn-id: http://svn.freepascal.org/svn/fpc/branches/fixes_2_2@9636 3ad0048d-3df7-0310-abae-a5850022a9f2
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/base/winunits/activex.pp | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/packages/base/winunits/activex.pp b/packages/base/winunits/activex.pp index c723d4cdef..7c79775dbc 100644 --- a/packages/base/winunits/activex.pp +++ b/packages/base/winunits/activex.pp @@ -1125,22 +1125,10 @@ TYPE - tagSTATSTG = record - pwcsName : POleStr; - dwType : DWord; - cbSize : ULarge_integer; - mtime : TFileTime; - ctime : TFileTime; - atime : TFileTime; - grfMode : DWord; - grfLocksSupported : DWord; - clsid : TCLSID; - grfStateBits : DWord; - reserved : DWord; - end; + tagSTATSTG = types.tagSTATSTG; TStatStg = tagSTATSTG; - PStatStg = ^TStatStg; + PStatStg = types.PStatStg; STATSTG = TStatStg; { TagRemSNB = Record @@ -2724,6 +2712,15 @@ TYPE POleMenuGroupWidths = LPOLEMENUGROUPWIDTHS; + IProvideClassInfo = Interface (IUnknown) + ['{B196B283-BAB4-101A-B69C-00AA00341D07}'] + function GetClassInfo(out pptti : ITypeInfo):HResult; StdCall; + end; + IProvideClassInfo2 = Interface (IProvideClassInfo) + ['{A6BC3AC0-DBAA-11CE-9DE3-00AA004BB851}'] + function GetGUID(dwguid:DWord;out pguid:TGUID):HResult; StdCall; + end; + { ****************************************************************************************************************** stuff from objbase.h ****************************************************************************************************************** } |