--- Merging r41264 into '.':

U    packages/winunits-base/src/activex.pp
--- Recording mergeinfo for merge of r41264 into '.':
 U   .
--- Merging r41265 into '.':
U    rtl/win/wininc/defines.inc
--- Recording mergeinfo for merge of r41265 into '.':
 G   .
--- Merging r41266 into '.':
G    rtl/win/wininc/defines.inc
--- Recording mergeinfo for merge of r41266 into '.':
 G   .
--- Merging r41269 into '.':
U    rtl/win/wininc/base.inc
--- Recording mergeinfo for merge of r41269 into '.':
 G   .

# revisions: 41264,41265,41266,41269
r41264 | marco | 2019-02-09 14:29:14 +0100 (Sat, 09 Feb 2019) | 2 lines
Changed paths:
   M /trunk/packages/winunits-base/src/activex.pp

 * regcls constants from MSDN
r41265 | marco | 2019-02-09 14:34:52 +0100 (Sat, 09 Feb 2019) | 2 lines
Changed paths:
   M /trunk/rtl/win/wininc/defines.inc

 * some _E_ and _S_ constants from winerror.h used in activex patch.
r41266 | marco | 2019-02-09 14:41:22 +0100 (Sat, 09 Feb 2019) | 1 line
Changed paths:
   M /trunk/rtl/win/wininc/defines.inc

 * _S_ and _E_ first and last were already there, just in an unexpected winerror. Found after testing ->revert all but the last line.
r41269 | marco | 2019-02-09 18:53:05 +0100 (Sat, 09 Feb 2019) | 2 lines
Changed paths:
   M /trunk/rtl/win/wininc/base.inc

 * makerop to dword mantis #34712

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

packages/winunits-base/src/activex.pp

@@ -1115,6 +1115,12 @@ Const
     XFORMCOORDS_CONTAINERTOHIMETRIC       = $8;
     XFORMCOORDS_EVENTCOMPAT               = $10;
 
+    REGCLS_SINGLEUSE      = 0;  // class object only generates one instance
+    REGCLS_MULTIPLEUSE    = 1;  // same class object genereates multiple inst.
+    REGCLS_MULTI_SEPARATE = 2;  // multiple use, but separate control over each
+    REGCLS_SUSPENDED      = 4;  // register is as suspended, will be activated
+    REGCLS_SURROGATE      = 8;  // must be used when a surrogate process
+
 TYPE
     TVarType            = USHORT;
 

rtl/win/wininc/base.inc

@@ -543,7 +543,7 @@
    }
   { was #define dname(params) def_expr }
   { argument types are unknown }
-  function MAKEROP4(fore,back : longint) : DWORD; inline;
+  function MAKEROP4(fore,back : DWord ) : DWORD; inline;
 
   { was #define dname(params) def_expr }
   { argument types are unknown }
@@ -1025,9 +1025,9 @@ type
 
   { was #define dname(params) def_expr }
   { argument types are unknown }
-  function MAKEROP4(fore,back : longint) : DWORD;
+  function MAKEROP4(fore,back : DWOrd ) : DWORD;
     begin
-       MAKEROP4:=DWORD((DWORD(back shl 8) and $FF000000) or DWORD(fore));
+       MAKEROP4:=((back shl 8) and $FF000000) or fore;
     end;
 
   { was #define dname(params) def_expr }

rtl/win/wininc/defines.inc

@@ -5417,6 +5417,8 @@ Type
 
      C3_LEXICAL     = 1024;
 
+     CLASS_E_NOTLICENSED   = DWORD($80040112);
+
   { --------------------- old stuff, need to organize! ---------------  }
   { BEGINNING of windowsx.h stuff from old headers:  }
   {  Not convertable by H2PAS