--- Merging r17174 into '.':

U    packages/winunits-base/src/activex.pp

# revisions: 17174
------------------------------------------------------------------------
r17174 | sergei | 2011-03-24 21:24:54 +0100 (Thu, 24 Mar 2011) | 2 lines
Changed paths:
   M /trunk/packages/winunits-base/src/activex.pp

+ added TOleStrList and POleStrList types (same as TBStrList, Delphi compatibility).
* ICatInformation.EnumCategories second parameter must have type IEnumCategoryInfo, fixed.
------------------------------------------------------------------------

git-svn-id: branches/fixes_2_4@17635 -

packages/winunits-base/src/activex.pp

@@ -31,6 +31,9 @@ type
    TBStr = POleStr;
    TBStrList = array[0..(high(integer) div sizeof(TBSTR))-1] of TBstr;
    PBStrList = ^TBStrList;
+   POleStrList = ^TOleStrList;
+   TOleStrList = array[0..(high(integer) div sizeof(POleStr))-1] of POleStr;
+
    PBStr = ^TBStr;
    TOleEnum = type LongWord;
    LargeInt = Types.LargeInt;
@@ -3394,7 +3397,7 @@ Type
 
    ICatInformation = interface(IUnknown)
      ['{0002E013-0000-0000-C000-000000000046}']
-     function EnumCategories(lcid:lcid;out ppenumCategoryInfo : ICatInformation):HResult; StdCall;
+     function EnumCategories(lcid:lcid;out ppenumCategoryInfo : IEnumCategoryInfo):HResult; StdCall;
      function GetCategoryDesc(rcatid:PCATID;lcid:LCID;out pszdesc:lpwstr):HResult; StdCall;
      function EnumClassesOfCategories(cImplemented : ULong; rgcatidImpl:PCATID;cRequired:ULong; rgcatidreq:PCATID; out ppenumclsid : IEnumClsID):HResult; StdCall;
      function ISClassOfCategories(rclsid:pclsid;cImplemented:ULong;rgcatidimpl:PCATID;CRequired:ULONG;rgcatidreq : pcatid):HResult; StdCall;