Merge of commits 42696, 42745, 42761 and 42762

------------------------------------------------------------------------
r42696 | svenbarth | 2019-08-15 11:41:36 +0000 (Thu, 15 Aug 2019) | 3 lines

* fix for Mantis #35964: reestablish pre r42594 behavior for WinCE as at least Windows Mobile does not support the required COM functions

Note: in theory Windows CE *can* support these functions, but it dependends on the provider whether they're indeed supported (e.g. Windows Mobile does not). Probably this should be revisited once we support the "delayed" directive.
------------------------------------------------------------------------
--- Merging r42696 into '.':
U    packages/winunits-base/src/comobj.pp
--- Recording mergeinfo for merge of r42696 into '.':
 U   .
------------------------------------------------------------------------
r42745 | pierre | 2019-08-20 12:11:17 +0000 (Tue, 20 Aug 2019) | 1 line

 Add x86_64-aros and m68k-macos to OSCPUSupported table
------------------------------------------------------------------------
--- Merging r42745 into '.':
C    packages/fpmkunit/src/fpmkunit.pp
--- Recording mergeinfo for merge of r42745 into '.':
 G   .
Summary of conflicts:
  Text conflicts: 1
------------------------------------------------------------------------
r42761 | pierre | 2019-08-22 13:01:08 +0000 (Thu, 22 Aug 2019) | 1 line

 Also use ACPU and AOS parameters to call GetUnitConfigOutputFilename
------------------------------------------------------------------------
--- Merging r42761 into '.':
G    packages/fpmkunit/src/fpmkunit.pp
--- Recording mergeinfo for merge of r42761 into '.':
 G   .
------------------------------------------------------------------------
r42762 | pierre | 2019-08-22 15:33:45 +0000 (Thu, 22 Aug 2019) | 6 lines

  * Fix errors in sourcezip generation:
    in fcl-process, by adding src subdirectory also as include dir.
    in winceunits, by removing activex from implicit unit list for wince target,
    as it already is in the explicit unit list.

------------------------------------------------------------------------
--- Merging r42762 into '.':
U    packages/fcl-process/fpmake.pp
U    packages/winceunits/fpmake.pp
--- Recording mergeinfo for merge of r42762 into '.':
 G   .

git-svn-id: branches/fixes_3_2@43036 -

packages/fcl-process/fpmake.pp

@@ -30,6 +30,7 @@ begin
       P.OSes := P.OSes - [java,android];
 
     P.SourcePath.Add('src');
+    P.IncludePath.Add('src',AllOSes);
     P.IncludePath.Add('src/unix',AllUnixOSes);
     P.IncludePath.Add('src/winall',AllWindowsOSes);
     P.IncludePath.Add('src/win',[win32,win64]);

packages/fpmkunit/src/fpmkunit.pp

@@ -203,7 +203,7 @@ Const
     { openbsd } ( false, true,  true,  false, false, true,  false, false, false, false, false, false, false, false, false, false),
     { wdosx }   ( false, true,  false, false, false, false, false, false, false, false, false, false, false, false, false, false),
     { palmos }  ( false, false, true,  false, false, false, true,  false, false, false, false, false, false, false, false, false),
-    { macos }   ( false, false, false, true,  false, false, false, false, false, false, false, false, false, false, false, false),
+    { macos }   ( false, false, true,  true,  false, false, false, false, false, false, false, false, false, false, false, false),
     { darwin }  ( false, true,  false, true,  false, true,  true,  true,  false, false, false, false, false, false, true , false),
     { emx }     ( false, true,  false, false, false, false, false, false, false, false, false, false, false, false, false, false),
     { watcom }  ( false, true,  false, false, false ,false, false, false, false, false, false, false, false, false, false, false),
@@ -223,7 +223,7 @@ Const
     { nativent }( false, true,  false, false, false, false, false, false, false, false, false, false, false, false, false, false),
     { msdos }   ( false, false, false, false, false, false, false, false, false, false, false, false, false, true , false, false),
     { wii }     ( false, false, false, true , false, false, false, false, false, false, false, false, false, false, false, false),
-    { aros }    ( false, true,  false, false, false, false, true,  false, false, false, false, false, false, false, false, false),
+    { aros }    ( false, true,  false, false, false, true,  true,  false, false, false, false, false, false, false, false, false),
     { dragonfly}( false, false, false, false, false, true,  false, false, false, false, false, false, false, false, false, false),
     { win16 }   ( false, false, false, false, false, false, false, false, false, false, false, false, false, true , false, false)
   );
@@ -3767,7 +3767,7 @@ Var
 begin
   OB:=IncludeTrailingPathDelimiter(GetBinOutputDir(ACPU,AOS));
   OU:=IncludeTrailingPathDelimiter(GetUnitsOutputDir(ACPU,AOS));
-  List.Add(GetUnitConfigOutputFilename(Defaults.CPU,Defaults.OS));
+  List.Add(GetUnitConfigOutputFilename(ACPU,AOS));
   List.Add(ManifestFile);
   AddConditionalStrings(Self, List,CleanFiles,ACPU,AOS);
   For I:=0 to FTargets.Count-1 do

packages/winceunits/fpmake.pp

@@ -94,7 +94,6 @@ begin
     T:=P.Targets.AddImplicitUnit('tsp.pp', [wince]);
     T:=P.Targets.AddImplicitUnit('extapi.pp', [wince]);
     T:=P.Targets.AddImplicitUnit('imm.pp', [wince]);
-    T:=P.Targets.AddImplicitUnit('activex.pp', [wince]);
     T:=P.Targets.AddImplicitUnit('pnp.pas', [wince]);
     T:=P.Targets.AddImplicitUnit('storemgr.pas', [wince]);
 

packages/winunits-base/src/comobj.pp

@@ -946,8 +946,13 @@ implementation
          if printcom then 
         WriteLn('LockServer: ', fLock);
 {$endif}
+{$ifndef wince}
           Result := CoLockObjectExternal(Self, fLock, True);
           ComServer.CountObject(fLock);
+{$else}
+          RunError(217);
+          Result:=0;
+{$endif}
       end;
 
 
@@ -1018,7 +1023,9 @@ implementation
 
     destructor TComObjectFactory.Destroy;
       begin
+{$ifndef wince}
         if fIsRegistered <> dword(-1) then CoRevokeClassObject(fIsRegistered);
+{$endif}
         ComClassManager.RemoveObjectFactory(Self);
       end;
 
@@ -1050,9 +1057,13 @@ implementation
          if printcom then 
         WriteLn('TComObjectFactory.RegisterClassObject');
       {$endif}
+{$ifndef wince}
       if FInstancing <> ciInternal then
       OleCheck(CoRegisterClassObject(FClassID, Self, CLSCTX_LOCAL_SERVER,
          reg_flags(), @FIsRegistered));
+{$else}
+      RunError(217);
+{$endif}
     end;