diff --git a/packages/winunits-base/src/activex.pp b/packages/winunits-base/src/activex.pp index 04d6875586..d2a73656a0 100644 --- a/packages/winunits-base/src/activex.pp +++ b/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; diff --git a/rtl/win/wininc/base.inc b/rtl/win/wininc/base.inc index d33f7bc43b..e9c31a810c 100644 --- a/rtl/win/wininc/base.inc +++ b/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 } diff --git a/rtl/win/wininc/defines.inc b/rtl/win/wininc/defines.inc index 8cbf7683f1..4f82e34f33 100644 --- a/rtl/win/wininc/defines.inc +++ b/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