Merged revisions 9421,9563-9565,9569,9607-9608 via svnmerge from

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

........
  r9421 | marco | 2007-12-09 11:51:03 +0100 (Sun, 09 Dec 2007) | 2 lines
  
   * export + datadict also for fpc
........
  r9563 | marco | 2007-12-29 14:11:23 +0100 (Sat, 29 Dec 2007) | 2 lines
  
   * Fix for 10491, pdatetime now defined.
........
  r9564 | marco | 2007-12-29 14:12:10 +0100 (Sat, 29 Dec 2007) | 2 lines
  
   * D7 compat, neginfinity (bug 10490)
........
  r9565 | marco | 2007-12-29 14:27:48 +0100 (Sat, 29 Dec 2007) | 2 lines
  
   * GUID_NULL constant added. Delphi compat, bug10494
........
  r9569 | marco | 2007-12-29 16:30:57 +0100 (Sat, 29 Dec 2007) | 2 lines
  
   * TContainedObject 10496. First implementation copied from TInterfacedObject
........
  r9607 | marco | 2008-01-01 18:28:54 +0100 (Tue, 01 Jan 2008) | 2 lines
  
   * DFCS_* constants for win2000+. Part of #10522
........
  r9608 | marco | 2008-01-01 18:41:15 +0100 (Tue, 01 Jan 2008) | 2 lines
  
   * More fixes for 10522
........

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

packages/base/winunits/activex.pp

@@ -42,6 +42,9 @@ TYPE
      OleChar             = WChar;
      LPOLESTR            = ^OLECHAR;
 
+CONST 
+   GUID_NULL  : TGUID =  '{00000000-0000-0000-0000-000000000000}';
+
      // bit flags for IExternalConnection
 CONST
     EXTCONN_STRONG              = $0001;   // strong connection

packages/fcl-db/Makefile.fpc

@@ -9,7 +9,7 @@ version=2.2.1
 [target]
 dirs=src/sdf src/memds src/sqldb 
 dirs_linux=src/dbase src/sqlite
-dirs_freebsd=src/dbase src/sqlite
+dirs_freebsd=src/dbase src/sqlite src/export src/datadict
 dirs_darwin=src/sqlite
 dirs_solaris=src/sqlite
 dirs_netbsd=src/sqlite

rtl/inc/objpas.inc

@@ -786,6 +786,19 @@
          Result := IUnknown(fcontroller);
       end;
 
+{****************************************************************************
+                               TContainedOBJECT
+****************************************************************************}
+
+    function TContainedObject.QueryInterface(
+            const iid : tguid;out obj) : longint; stdcall;
+
+    begin
+      if getinterface(iid,obj) then
+        result:=0
+      else
+        result:=longint(E_NOINTERFACE); 
+    end;
 
 {****************************************************************************
                              Exception Support

rtl/inc/objpash.inc

@@ -242,6 +242,11 @@
           property Controller : IUnknown read GetController;
        end;
 
+       TContainedObject = class(TObject)
+         protected 
+           function QueryInterface(const iid : tguid;out obj) : longint;virtual; stdcall;
+         end;
+
        { some pointer definitions }
        PUnknown = ^IUnknown;
        PPUnknown = ^PUnknown;

rtl/inc/systemh.inc

@@ -271,6 +271,7 @@ Type
   PAnsiString         = ^AnsiString;
 
   PDate               = ^TDateTime;
+  PDateTime	      = ^TDateTime;
   PError              = ^TError;
   PVariant            = ^Variant;
   POleVariant         = ^OleVariant;

rtl/objpas/math.pp

@@ -118,6 +118,7 @@ interface
 {$endif opt Q+}
        NaN = 0.0/0.0;
        Infinity = 1.0/0.0;
+       NegInfinity = -1.0/0.0;
 {$ifdef RangeCheckWasOn}
 {$R+}
 {$undef RangeCheckWasOn}

rtl/win/wininc/defines.inc

@@ -1000,6 +1000,8 @@
      DFCS_INACTIVE = 256;
      DFCS_MONO = 32768;
      DFCS_PUSHED = 512;
+     DFCS_TRANSPARENT =  2048;
+     DFCS_HOT         =  4096;
   { DrawIconEx  }
      DI_COMPAT = 4;
      DI_DEFAULTSIZE = 8;

rtl/win/wininc/messages.inc

@@ -1195,6 +1195,68 @@
     TWMHScroll          = TWMScroll;
     TWMVScroll          = TWMScroll;
     TWMGetTextLength    = TWMNoParams;
+    TWMUIState          = Windows.TWMUIState;
+    TWMNCHitTest        = Windows.TWMNCHitTest;
+    TWMMouse            = Windows.TWMMouse;
+    TWMMouseWheel       = Windows.TWMMouseWheel;
+    TWMNCHitMessage     = Windows.TWMNCHitMessage;
+    TWMPaint            = Windows.TWMPaint;
+    TWMCommand          = Windows.TWMCommand;
+    TWMNotify           = Windows.TWMNotify;
+    TWMPrint            = Windows.TWMPrint;
+    TWMWinIniChange     = Windows.TWMWinIniChange;
+    TWMContextMenu      = Windows.TWMContextMenu;
+    TWMNCCalcSize       = Windows.TWMNCCalcSize;
+    TWMCharToItem       = Windows.TWMCharToItem;
+    TWMParentNotify     = Windows.TWMParentNotify;
+    TWMSysCommand       = Windows.TWMSysCommand;
+    TWMMove             = Windows.TWMMove;
+    TWMWindowPosMsg     = Windows.TWMWindowPosMsg;
+    TWMCompareItem      = Windows.TWMCompareItem;
+    TWMDeleteItem       = Windows.TWMDeleteItem;
+    TWMDrawItem         = Windows.TWMDrawItem;
+    TWMMeasureItem      = Windows.TWMMeasureItem;
+    TWMNCCreate         = Windows.TWMNCCreate;
+    TWMInitMenuPopup    = Windows.TWMInitMenuPopup;
+    TWMMenuSelect       = Windows.TWMMenuSelect;
+    TWMActivate         = Windows.TWMActivate;
+    TWMQueryEndSession  = Windows.TWMQueryEndSession;
+    TWMMDIActivate      = Windows.TWMMDIActivate;
+    TWMNextDlgCtl       = Windows.TWMNextDlgCtl;
+    TWMHelp             = Windows.TWMHelp;
+    TWMGetMinMaxInfo    = Windows.TWMGetMinMaxInfo;
+    TWMSettingChange    = Windows.TWMSettingChange;
+    TWMCreate           = Windows.TWMCreate;
+    TWMCtlColor         = Windows.TWMCtlColor;
+    TWMInitDialog       = Windows.TWMInitDialog;
+    TWMNCPaint          = Windows.TWMNCPaint;
+    TWMSetText          = Windows.TWMSetText;
+    TWMSizeClipboard    = Windows.TWMSizeClipboard;
+    TWMSpoolerStatus    = Windows.TWMSpoolerStatus;
+    TWMStyleChange      = Windows.TWMStyleChange;
+    TWMSysDeadChar      = Windows.TWMSysDeadChar;
+    TWMSystemError      = Windows.TWMSystemError;
+    TWMTimer            = Windows.TWMTimer;
+    TWMVScrollClipboard = Windows.TWMVScrollClipboard;
+    TWMDisplayChange    = Windows.TWMDisplayChange;
+    TWMDropFiles        = Windows.TWMDropFiles;
+    TWMEnable           = Windows.TWMEnable;
+    TWMMouseActivate    = Windows.TWMMouseActivate;
+    TWMEndSession       = Windows.TWMEndSession;
+    TWMActivateApp      = Windows.TWMActivateApp;
+    TWMCancelMode       = Windows.TWMCancelMode;
+    TWMNCDestroy        = Windows.TWMNCDestroy;
+    TWMDestroy          = Windows.TWMDestroy;
+    TWMClose            = Windows.TWMClose;
+    TWMQueryUIState     = Windows.TWMQueryUIState;
+    TWMSysColorChange   = Windows.TWMSysColorChange;
+    TWMQueryDragIcon    = Windows.TWMQueryDragIcon;
+    TWMTimeChange       = Windows.TWMTimeChange;
+    TWMUndo             = Windows.TWMUndo;
+
+    TWMPaste            = Windows.TWMPaste;
+    TWMCut 	        = Windows.TWMCut;	
+    TWMCopy	        = Windows.TWMCopy;
 
 {$else}
 
@@ -1262,6 +1324,10 @@
     TWMClose         = TWMNoParams;
     TWMQueryUIState  = TWMNoParams;
 
+    TWMPaste         = TWMNoParams;
+    TWMCut 	     = TWMNoParams;	
+    TWMCopy	     = TWMNoParams;
+
     TWMUIState = record
       Msg : UINT;
       Action : Word;
@@ -1766,6 +1832,7 @@
       Result: LRESULT;
     end;
 {$endif messagesunit}
+    
 
 {$endif read_interface}