--- Merging r41262 into '.':

C    rtl/win/wininc/defines.inc  -> manually fixed order to match trunk
U    rtl/win/wininc/struct.inc
U    rtl/win/wininc/func.inc
--- Recording mergeinfo for merge of r41262 into '.':
 U   .
Summary of conflicts:
  Text conflicts: 1

# revisions: 41262
r41262 | marco | 2019-02-09 13:07:30 +0100 (Sat, 09 Feb 2019) | 2 lines
Changed paths:
   M /trunk/rtl/win/wininc/defines.inc
   M /trunk/rtl/win/wininc/func.inc
   M /trunk/rtl/win/wininc/struct.inc

 * flashwindowex, mantis #35048, patch by 440bx

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

rtl/win/wininc/defines.inc

@@ -5417,6 +5417,13 @@ Type
 
      C3_LEXICAL     = 1024;
 
+     FLASHW_STOP         = $00000000;
+     FLASHW_CAPTION      = $00000001;
+     FLASHW_TRAY         = $00000002;
+     FLASHW_ALL          = (FLASHW_CAPTION or FLASHW_TRAY);
+     FLASHW_TIMER        = $00000004;
+     FLASHW_TIMERNOFG    = $0000000C;
+
      CLASS_E_NOTLICENSED   = DWORD($80040112);
 
   { --------------------- old stuff, need to organize! ---------------  }

rtl/win/wininc/func.inc

@@ -1061,6 +1061,7 @@ procedure SHFreeNameMappings(_para1:HANDLE); external 'shell32' name 'SHFreeName
 function SHGetFileInfo(_para1:LPCTSTR; _para2:DWORD; var _para3:SHFILEINFO; _para4:UINT; _para5:UINT):DWORD_PTR; external 'shell32' name 'SHGetFileInfo';
 function SHGetPathFromIDList(_para1:LPCITEMIDLIST; _para2:LPTSTR):WINBOOL; external 'shell32' name 'SHGetPathFromIDList';
 function SHGetSpecialFolderLocation(_para1:HWND; _para2:longint; var _para3:LPITEMIDLIST):HRESULT; external 'shell32' name 'SHGetSpecialFolderLocation';
+function FlashWindowEx(pfwi : PFLASHWINFO) : BOOL; stdcall; external 'user32' name 'FlashWindowEx';
 
 { was missing, bug report 1808 PM }
 {

rtl/win/wininc/struct.inc

@@ -821,6 +821,16 @@ Const
      TDCB = DCB;
      PDCB = ^DCB;
 
+     FLASHWINFO = record
+         cbSize    : UINT;
+         hwnd      : HWND;
+         dwFlags   : DWORD;
+         uCount    : UINT;
+         dwTimeOut : DWORD;
+     end;
+    TFLASHWINFO  = FLASHWINFO;
+    PFLASHWINFO  = ^FLASHWINFO;
+
   const
      bm_DCB_fBinary = $1;
      bp_DCB_fBinary = 0;