Merged revisions 7552,7664,7674,7688,7780,7791,7795,7809,7843 via svnmerge from

svn+ssh://[email protected]/FPC/svn/fpc/trunk

........
r7552 | florian | 2007-06-02 21:04:12 +0200 (Sat, 02 Jun 2007) | 1 line

* commctrl compiles, added to the makefile, resolves #8994
........
r7664 | florian | 2007-06-14 23:24:53 +0200 (Thu, 14 Jun 2007) | 2 lines

* several delphi compatibility stuff fixed

........
r7674 | florian | 2007-06-15 21:51:08 +0200 (Fri, 15 Jun 2007) | 2 lines

* fixed a lot of stuff to be delphi compatible

........
r7688 | florian | 2007-06-16 19:04:50 +0200 (Sat, 16 Jun 2007) | 2 lines

* fixing continued

........
r7780 | florian | 2007-06-23 11:21:28 +0200 (Sat, 23 Jun 2007) | 2 lines

+ some missing functions added

........
r7791 | florian | 2007-06-24 15:36:46 +0200 (Sun, 24 Jun 2007) | 2 lines

* fixed more windows types

........
r7795 | florian | 2007-06-24 17:16:25 +0200 (Sun, 24 Jun 2007) | 2 lines

+ some new functions and consts added

........
r7809 | florian | 2007-06-25 20:06:24 +0200 (Mon, 25 Jun 2007) | 2 lines

* fixed win64 compilation

........
r7843 | florian | 2007-06-28 19:49:35 +0200 (Thu, 28 Jun 2007) | 2 lines

* fixed dll name

........

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

packages/base/winunits/Makefile.fpc

@@ -8,7 +8,7 @@ version=2.1.4
 
 [target]
 units=buildjwa
-implicitunits=winver mmsystem comobj comconst ole2 activex shellapi shlobj oleserver \
+implicitunits=winver mmsystem comobj comconst commctrl ole2 activex shellapi shlobj oleserver \
  jwawintype jwawinbase jwawinnt \
  jwalmerr jwalmmsg jwaaclui jwaadsdb jwalmerrlog jwalmjoin jwaauthz  \
  jwabits jwalmremutl jwalmrepl jwalmserver jwalmshare jwalmsname \

packages/base/winunits/activex.pp

@@ -3293,13 +3293,16 @@ type
     TDispIDList = array[0..65535] of TDispID;
     PDispIDList = ^TDispIDList;
 
+    REFIID = TIID;
+    TREFIID = TIID;
+
   function SetErrorInfo(dwReserved:ULONG;errinfo:IErrorInfo):HResult;stdcall; external 'ole32.dll' name 'SetErrorInfo';
   function GetErrorInfo(dwReserved:ULONG;out errinfo:IErrorInfo):HResult;stdcall; external 'ole32.dll' name 'GetErrorInfo';
   function CreateErrorInfo(out errinfo:ICreateErrorInfo):HResult;stdcall; external 'ole32.dll' name 'CreateErrorInfo';
-  
+
   const
     oleaut32dll   = 'oleaut32.dll';
-    
+
   function  SysAllocString(psz: pointer): Integer; external oleaut32dll name 'SysAllocString';
   function  SysAllocStringLen(psz: pointer; len:dword): Integer; external oleaut32dll name 'SysAllocStringLen';
   procedure SysFreeString(bstr:pointer); external oleaut32dll name 'SysFreeString';
@@ -3315,7 +3318,7 @@ type
 	function RegisterActiveObject(unk: IUnknown; const clsid: TCLSID; dwFlags: DWORD; out dwRegister: culong): HResult; external oleaut32dll name 'RegisterActiveObject';
 	function RevokeActiveObject(dwRegister: culong; pvReserved: Pointer) : HResult; external oleaut32dll name 'RevokeActiveObject';
 	function GetActiveObject(const clsid: TCLSID; pvReserved: Pointer; out unk: IUnknown) : HResult; external oleaut32dll name 'GetActiveObject';
-  
+
 function Succeeded(Res: HResult) : Boolean;inline;
 function Failed(Res: HResult) : Boolean;inline;
 function ResultCode(Res: HResult) : Longint;inline;

packages/base/winunits/buildjwa.pp

@@ -21,7 +21,7 @@ unit buildjwa;
 interface
 
 uses
-    winver, mmsystem, comconst, comobj, ole2, activex, shellapi, shlobj, oleserver,
+    winver, mmsystem, comconst, commctrl, comobj, ole2, activex, shellapi, shlobj, oleserver,
     jwawintype, jwawinbase, jwawinnt, shfolder, richedit,
     jwalmerr, jwalmmsg, jwaaclui, jwaadsdb, jwalmerrlog, jwalmjoin, jwaauthz,
     jwabits, jwalmremutl, jwalmrepl, jwalmserver, jwalmshare, jwalmsname,

packages/base/winunits/shellapi.pp

@@ -44,13 +44,9 @@ Uses Windows;
     shellapi.h -  SHELL.DLL functions, types, and definitions
     Copyright (c) Microsoft Corporation. All rights reserved.             }
 
-Type   HDROP    = THandle;
-       UINT_PTR = ^UINT;
-       DWORD_PTR= ^DWORD;
-       pHICON   = ^HICON;
-       pBool    = ^BOOL;
-
-
+  Type   
+     HDROP    = THandle;
+     PHIcon   = ^HIcon;
 
      STARTUPINFOW = record  // a guess. Omission should get fixed in Windows.
           cb : DWORD;

rtl/win/wininc/base.inc

@@ -82,6 +82,8 @@
      UINT_PTR = PtrUInt;
      LONG_PTR = PtrInt;
      ULONG_PTR = PtrUInt;
+     DWORD_PTR   = ULONG_PTR;
+     PDWORD_PTR  = ^DWORD_PTR;
 
      DWORDLONG  = qword;  { was unsigned long  }
      PDWORDLONG = ^DWORDLONG;