Merged revisions 12677,12683,12733-12734 via svnmerge from

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

........
  r12677 | marco | 2009-02-03 21:38:27 +0100 (Tue, 03 Feb 2009) | 2 lines
  
   * polybezierto and polydraw corrected as per Mantis 13112
........
  r12683 | marco | 2009-02-04 10:11:25 +0100 (Wed, 04 Feb 2009) | 2 lines
  
   * comment added previous commit
........
  r12733 | marco | 2009-02-11 17:26:45 +0100 (Wed, 11 Feb 2009) | 2 lines
  
   * getactiveobject (and friends) missed stdcall, Mantis #13126
........
  r12734 | marco | 2009-02-11 17:49:15 +0100 (Wed, 11 Feb 2009) | 2 lines
  
   * Added sem_timedwait for [BSD]-[Darwin]. Mantis 13148
........

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

packages/pthreads/src/pthrbsd.inc

@@ -334,7 +334,6 @@ function pthread_attr_getfloatstate(_para1:Ppthread_attr_t; _para2:Pcint):cint;c
 
 { semaphore.h }
 
-
   function sem_init(__sem:Psem_t; __pshared:cint;__value:dword):cint;cdecl; external;
   function sem_destroy(__sem:Psem_t):cint;cdecl;external ;
   function sem_close(__sem:Psem_t):cint;cdecl;external ;
@@ -344,7 +343,6 @@ function pthread_attr_getfloatstate(_para1:Ppthread_attr_t; _para2:Pcint):cint;c
   function sem_post(__sem:Psem_t):cint;cdecl;external ;
   function sem_getvalue(__sem:Psem_t; __sval:Pcint):cint;cdecl;external;
 
-
   function sem_init(var __sem: sem_t; __pshared:cint; __value:dword):cint cdecl;external;
   function sem_destroy(var __sem: sem_t):cint;cdecl;external;
   function sem_close(var __sem: sem_t):cint;cdecl;external;
@@ -353,4 +351,8 @@ function pthread_attr_getfloatstate(_para1:Ppthread_attr_t; _para2:Pcint):cint;c
   function sem_post(var __sem: sem_t):cint;cdecl;external;
   function sem_getvalue(var __sem: sem_t; var __sval:cint):cint;cdecl;external;
 
+  {$Ifndef Darwin}
+   function sem_timedwait(__sem: Psem_t; __abstime: Ptimespec):cint;cdecl; external;
+   function sem_timedwait(var __sem: sem_t; var __abstime: timespec):cint;cdecl; external;
+  {$endif}
 

packages/winunits-base/src/activex.pp

@@ -3919,9 +3919,9 @@ type
 	  ACTIVEOBJECT_STRONG = 0;
 	  ACTIVEOBJECT_WEAK = 1;
 	
-	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 RegisterActiveObject(unk: IUnknown; const clsid: TCLSID; dwFlags: DWORD; out dwRegister: culong): HResult; stdcall; external oleaut32dll name 'RegisterActiveObject';
+	function RevokeActiveObject(dwRegister: culong; pvReserved: Pointer) : HResult; stdcall; external oleaut32dll name 'RevokeActiveObject';
+	function GetActiveObject(const clsid: TCLSID; pvReserved: Pointer; out unk: IUnknown) : HResult; stdcall; external oleaut32dll name 'GetActiveObject';
 
 function Succeeded(Res: HResult) : Boolean;inline;
 function Failed(Res: HResult) : Boolean;inline;

rtl/win/wininc/defines.inc

@@ -1245,7 +1245,7 @@
      SETXON = 2;
      SETBREAK = 8;
      CLRBREAK = 9;
-
+  { WM_QUERYENDSESSION/WM_ENDSESSION }
      ENDSESSION_LOGOFF   = dword($80000000);  // all winver >= 0x400
      ENDSESSION_CRITICAL = dword($40000000);
      ENDSESSION_CLOSEAPP = dword($00000001);

rtl/win/wininc/func.inc

@@ -840,7 +840,7 @@ function FillPath(_para1:HDC):WINBOOL; external 'gdi32' name 'FillPath';
 function FlattenPath(_para1:HDC):WINBOOL; external 'gdi32' name 'FlattenPath';
 function GetPath(_para1:HDC; _para2:LPPOINT; _para3:LPBYTE; _para4:longint):longint; external 'gdi32' name 'GetPath';
 function PathToRegion(_para1:HDC):HRGN; external 'gdi32' name 'PathToRegion';
-function PolyDraw(_para1:HDC; var _para2:POINT; var _para3:BYTE; _para4:longint):WINBOOL; external 'gdi32' name 'PolyDraw';
+function PolyDraw(_para1:HDC;  _para2:LPPOINT;_para3:LPBYTE; _para4:longint):WINBOOL; external 'gdi32' name 'PolyDraw';
 function SelectClipPath(_para1:HDC; _para2:longint):WINBOOL; external 'gdi32' name 'SelectClipPath';
 function SetArcDirection(_para1:HDC; _para2:longint):longint; external 'gdi32' name 'SetArcDirection';
 function SetMiterLimit(_para1:HDC; _para2:Single; _para3:PSingle):WINBOOL; external 'gdi32' name 'SetMiterLimit';
@@ -857,7 +857,7 @@ function LPtoDP(_para1:HDC; _para2:LPPOINT; _para3:longint):WINBOOL; external 'g
 function Polygon(_para1:HDC; _para2:LPPOINT; _para3:longint):WINBOOL; external 'gdi32' name 'Polygon';
 function Polyline(_para1:HDC; _para2:LPPOINT; _para3:longint):WINBOOL; external 'gdi32' name 'Polyline';
 function PolyBezier(_para1:HDC; _para2:LPPOINT; _para3:DWORD):WINBOOL; external 'gdi32' name 'PolyBezier';
-function PolyBezierTo(_para1:HDC; _para2:POINT; _para3:DWORD):WINBOOL; external 'gdi32' name 'PolyBezierTo';
+function PolyBezierTo(_para1:HDC; _para2:LPPOINT; _para3:DWORD):WINBOOL; external 'gdi32' name 'PolyBezierTo';
 function PolylineTo(_para1:HDC; _para2:LPPOINT; _para3:DWORD):WINBOOL; external 'gdi32' name 'PolylineTo';
 function SetViewportExtEx(_para1:HDC; _para2:longint; _para3:longint; _para4:LPSIZE):WINBOOL; external 'gdi32' name 'SetViewportExtEx';
 function SetViewportOrgEx(_para1:HDC; _para2:longint; _para3:longint; _para4:LPPOINT):WINBOOL; external 'gdi32' name 'SetViewportOrgEx';