From: <ou...@us...> - 2010-11-15 10:23:14
|
Revision: 3419 http://jcl.svn.sourceforge.net/jcl/?rev=3419&view=rev Author: outchy Date: 2010-11-15 09:50:37 +0000 (Mon, 15 Nov 2010) Log Message: ----------- Compatibility with RAD Studio XE and C++Builder XE update 1. Modified Paths: -------------- branches/JCL_2.2/jcl/source/windows/MSTask.pas Modified: branches/JCL_2.2/jcl/source/windows/MSTask.pas =================================================================== --- branches/JCL_2.2/jcl/source/windows/MSTask.pas 2010-11-15 09:47:16 UTC (rev 3418) +++ branches/JCL_2.2/jcl/source/windows/MSTask.pas 2010-11-15 09:50:37 UTC (rev 3419) @@ -33,12 +33,8 @@ unit MSTask; -{$ALIGN ON} -{$MINENUMSIZE 4} - -interface - {$I jcl.inc} +{$I windowsonly.inc} {$IFDEF SUPPORTS_WEAKPACKAGEUNIT} {$IFDEF UNITVERSIONING} @@ -48,6 +44,11 @@ {$ENDIF ~UNITVERSIONING} {$ENDIF SUPPORTS_WEAKPACKAGEUNIT} +{$ALIGN ON} +{$MINENUMSIZE 4} + +interface + uses {$IFDEF UNITVERSIONING} JclUnitVersioning, @@ -55,6 +56,7 @@ ActiveX, Windows; +//DOM-IGNORE-BEGIN (*$HPPEMIT '#include <MSTask.h>' *) @@ -340,11 +342,6 @@ end; {$EXTERNALSYM TASK_TRIGGER} - {$IFDEF COMPILER15_UP} - (*$HPPEMIT 'namespace Mstask {'*) - (*$HPPEMIT 'typedef struct _TAST_TRIGGER _TASK_TRIGGER;'*) - (*$HPPEMIT '}'*) - {$ENDIF COMPILER15_UP} TASK_TRIGGER = _TASK_TRIGGER; TTaskTrigger = _TASK_TRIGGER; @@ -387,11 +384,6 @@ function GetTriggerString(out ppwszTrigger: LPWSTR): HRESULT; stdcall; (*| Parameter(s) was/were [CPP]: {out} LPWSTR * ppwszTrigger |*) end; - {$IFDEF COMPILER15_UP} - (*$HPPEMIT 'namespace Mstask {'*) - (*$HPPEMIT 'typedef interface ITaskTrigger ITaskTrigger;'*) - (*$HPPEMIT '}'*) - {$ENDIF COMPILER15_UP} //+---------------------------------------------------------------------------- // @@ -472,11 +464,6 @@ function GetAccountInformation(out ppwszAccountName: LPWSTR): HRESULT; stdcall; (*| Parameter(s) was/were [CPP]: {out} LPWSTR * ppwszAccountName |*) end; - {$IFDEF COMPILER15_UP} - (*$HPPEMIT 'namespace Mstask {'*) - (*$HPPEMIT 'typedef interface IScheduledWorkItem IScheduledWorkItem;'*) - (*$HPPEMIT '}'*) - {$ENDIF COMPILER15_UP} //+---------------------------------------------------------------------------- // @@ -524,11 +511,6 @@ function GetMaxRunTime(out pdwMaxRunTimeMS: DWORD): HRESULT; stdcall; (*| Parameter(s) was/were [CPP]: {out} DWORD * pdwMaxRunTimeMS |*) end; - {$IFDEF COMPILER15_UP} - (*$HPPEMIT 'namespace Mstask {'*) - (*$HPPEMIT 'typedef interface ITask ITask;'*) - (*$HPPEMIT '}'*) - {$ENDIF COMPILER15_UP} //+---------------------------------------------------------------------------- // @@ -597,11 +579,6 @@ function IsOfType(pwszName: LPCWSTR; const riid: TIID): HRESULT; stdcall; (*| Parameter(s) was/were [CPP]: {in} LPCWSTR pwszName, {in} REFIID riid |*) end; - {$IFDEF COMPILER15_UP} - (*$HPPEMIT 'namespace Mstask {'*) - (*$HPPEMIT 'typedef interface ITaskScheduler ITaskScheduler;'*) - (*$HPPEMIT '}'*) - {$ENDIF COMPILER15_UP} // EXTERN_C const CLSID CLSID_CTask; // EXTERN_C const CLSID CLSID_CTaskScheduler; @@ -691,6 +668,8 @@ {$EXTERNALSYM CLSID_CSchedulingAgent} CLSID_CSchedulingAgent: TCLSID = (D1: $148BD52A; D2: $A2AB; D3: $11CE; D4: ($B1, $1F, $00, $AA, $00, $53, $05, $03)); +//DOM-IGNORE-END + {$IFDEF UNITVERSIONING} const UnitVersioning: TUnitVersionInfo = ( This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |