Merged revisions 10116-10120,10122-10126 via svnmerge from

http://svn.freepascal.org/svn/fpc/trunk

........
  r10116 | marco | 2008-01-30 17:29:04 +0100 (Wed, 30 Jan 2008) | 2 lines
  
   * patch from sergei to fix alignment
........
  r10117 | marco | 2008-01-30 20:53:08 +0100 (Wed, 30 Jan 2008) | 2 lines
  
   * comcat headers, needed for JCL
........
  r10118 | marco | 2008-01-30 21:12:33 +0100 (Wed, 30 Jan 2008) | 2 lines
  
   * corrected some declarations to be more Delphi compat. (jclshell.pas)
........
  r10119 | marco | 2008-01-30 21:32:08 +0100 (Wed, 30 Jan 2008) | 2 lines
  
   * some constants adeed
........
  r10120 | marco | 2008-01-30 22:42:33 +0100 (Wed, 30 Jan 2008) | 2 lines
  
   * added some constants
........
  r10122 | marco | 2008-01-30 23:58:55 +0100 (Wed, 30 Jan 2008) | 2 lines
  
   * some interfaces added.
........
  r10123 | marco | 2008-01-31 12:30:10 +0100 (Thu, 31 Jan 2008) | 2 lines
  
   * some enhancements to shlobj
........
  r10124 | marco | 2008-01-31 14:33:29 +0100 (Thu, 31 Jan 2008) | 2 lines
  
   * ishellbrowser + deps
........
  r10125 | marco | 2008-01-31 21:26:00 +0100 (Thu, 31 Jan 2008) | 1 line
  
   * slightly expanded shlobj
........
  r10126 | marco | 2008-01-31 22:10:31 +0100 (Thu, 31 Jan 2008) | 2 lines
  
   * IID_IExtractIconW
........

git-svn-id: branches/fixes_2_2@10146 -

packages/hash/src/md5.pp

@@ -461,10 +461,11 @@ begin
         Length := 8 * (Context.Length + Context.BufCnt);
 
         // 2. Append padding bits
-        Pads := (120 - Context.BufCnt) mod 64;
-        if Pads > 0 then
-          MDUpdate(Context, PADDING_MD45, Pads) else
-          MDUpdate(Context, PADDING_MD45, 56);
+        if Context.BufCnt >= 56 then
+          Pads := 120 - Context.BufCnt
+        else
+          Pads := 56 - Context.BufCnt;
+        MDUpdate(Context, PADDING_MD45, Pads);
 
         // 3. Append length of the stream
         Invert(@Length, @Length, 8);

packages/winunits-base/src/activex.pp

@@ -2955,6 +2955,56 @@ type
     function GetExtent(dwDrawAspect:dword;lindex:DWord;ptd:pDVTARGETDEVICE;lpsizel:LPSIZEL):HRESULT;stdcall;
     end;
 
+
+
+{ COMCAT}
+
+Const CATDESC_MAX = 128;
+
+Type 
+    CATID  = TGUID;
+    TCATID = TGUID;
+    PCATID = PGUID;
+    tagCATEGORYINFO = packed record
+	catid : CATID;
+	LCID  : lcid;
+        szDescription : array[0..CATDESC_MAX-1] of WideChar;
+        end;
+  
+   CATEGORYINFO   = tagCATEGORYINFO;
+   TCATEGORYINFO  = tagCATEGORYINFO;
+   LPCATEGORYINFO = ^tagCATEGORYINFO;
+   PCATEGORYINFO  = LPCATEGORYINFO;
+
+   IEnumCLSID = IEnumGUID;
+   IEnumCategoryInfo = interface(IUnknown)
+          ['{0002E011-0000-0000-C000-000000000046}'] 
+          function Next(celt: ULONG; out rgelt: TCategoryInfo; out pceltFetched: ULONG): HResult; stdcall;      
+          function Skip(celt:ULONG):HResult; StdCall;
+          function Reset:HResult; StdCall;
+          function CLone(Out ppenum : IEnumCategoryInfo):HResult;StdCall;
+          end;
+
+   ICatRegister = interface (IUnknown)
+     ['{0002E012-0000-0000-C000-000000000046}']
+     function RegisterCategories   (cCategories:ULONG;rgCategoryInfo : PCategoryInfo):HResult;Stdcall;
+     function UnRegisterCategories (cCategories:ULONG;PCatid :PCATID):HResult;Stdcall;
+     function RegisterClassImplCategories (const rclsid:TGUID;cCategories:ULONG; rgCatid :PCATID):HResult;Stdcall;     
+     function UnRegisterClassImplCategories (const rclsid:TGUID;cCategories:ULONG; rgCatid :PCATID):HResult;Stdcall;       
+     function RegisterClassReqCategories  (const rclsid:TGUID;cCategories:ULONG; rgCatid :PCATID):HResult;Stdcall;     
+     function UnRegisterClassReqCategories  (const rclsid:TGUID;cCategories:ULONG; rgCatid :PCATID):HResult;Stdcall;       
+    end;
+         
+   ICatInformation = interface(IUnknown)
+     ['{0002E013-0000-0000-C000-000000000046}']
+     function EnumCategories(lcid:lcid;out ppenumCategoryInfo : ICatInformation):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;
+     function EnumImplCategoriesOfClass(rclsid:pclsid;out ppenumclsid : IEnumClsID):HResult; StdCall;
+     function EnumReqCategoriesOfClass(rclsid:pclsid;out ppenumclsid : IEnumClsID):HResult; StdCall;
+     end;
+
 { ole2.h }
 
   type