* second batch Lazarus' win32extra merging. Basic migration done, though a few discussion items remain open.

git-svn-id: trunk@10269 -

rtl/win/wininc/base.inc

@@ -251,6 +251,7 @@
 
      SERVICE_STATUS_HANDLE = DWORD;
 
+
 {$ifdef UNICODE}
      TBYTE = word;
      TCHAR = widechar;
@@ -271,7 +272,7 @@
      WPARAM = LONG_PTR;
      PLPSTR = ^LPSTR;
      PLPWStr= ^LPWStr;
-
+     COLOR16 = ushort;
 {
   Enumerations
 }

rtl/win/wininc/defines.inc

@@ -890,6 +890,7 @@
      DC_EXTRA = 9;
      DC_FIELDS = 1;
      DC_FILEDEPENDENCIES = 14;
+      
      DC_MAXEXTENT = 5;
      DC_MINEXTENT = 4;
      DC_ORIENTATION = 17;
@@ -934,8 +935,13 @@
      IDANI_OPEN = 1;
      IDANI_CLOSE = 2;
   { DrawCaption  }
-     DC_ACTIVE = 1;
+     DC_ACTIVE   = 1;
      DC_SMALLCAP = 2;
+     DC_ICON     = 4;
+     DC_TEXT     = 8;
+     DC_INBUTTON = 16;
+     DC_GRADIENT = 32;
+     DC_BUTTONS  = $1000;
   { DrawEdge  }
      BDR_RAISEDINNER = 4;
      BDR_SUNKENINNER = 8;
@@ -5616,7 +5622,8 @@ const
   GA_ROOT       = 2;  { The window's root window }
   GA_ROOTOWNER  = 3;  { The window's owner }
 
-
+  AC_SRC_OVER = $00;     
+  AC_SRC_ALPHA = $01;     
 
 {$endif read_interface}
 

rtl/win/wininc/struct.inc

@@ -7389,6 +7389,37 @@ type
   PComboboxInfo = ^TComboboxInfo;
   LPComboboxInfo = PComboboxInfo;
 
+  _TRIVERTEX = record
+          x : LONG;
+          y : LONG;
+          Red : COLOR16;
+          Green : COLOR16;
+          Blue : COLOR16;
+          Alpha : COLOR16;
+       end;
+  TRIVERTEX = _TRIVERTEX;
+  PTRIVERTEX = ^_TRIVERTEX;
+  LPTRIVERTEX = PTRIVERTEX;
+
+  _GRADIENT_TRIANGLE = record
+          Vertex1 : ULONG;
+          Vertex2 : ULONG;
+          Vertex3 : ULONG;
+       end;
+  GRADIENT_TRIANGLE = _GRADIENT_TRIANGLE;
+  TGRADIENT_TRIANGLE = _GRADIENT_TRIANGLE;
+  PGRADIENT_TRIANGLE = ^_GRADIENT_TRIANGLE;
+  LPGRADIENT_TRIANGLE = PGRADIENT_TRIANGLE;
+
+  _GRADIENT_RECT = record
+          UpperLeft : ULONG;
+          LowerRight : ULONG;
+       end;
+  GRADIENT_RECT = _GRADIENT_RECT;
+  TGRADIENT_RECT = _GRADIENT_RECT;
+  PGRADIENT_RECT = ^_GRADIENT_RECT;
+  LPGRADIENT_RECT = PGRADIENT_RECT;
+
 {$endif read_interface}