paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-09-07 15:50:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

--- Merging r41264 into '.':

Browse Source 
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 -
This commit is contained in:
marco 2019-02-11 10:15:49 +00:00
parent e22ca656c5
commit ad69839b34
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/winunits-base/src/activex.pp
View File

@ -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;

6
rtl/win/wininc/base.inc
View File

@ -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 }

2
rtl/win/wininc/defines.inc
View File

@ -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