Browse Source

+ several missing constants, functions and structures added

git-svn-id: trunk@7801 -
florian 18 years ago
parent
commit
40fde13aa4
3 changed files with 123 additions and 98 deletions
  1. 8 7
      rtl/win/wininc/defines.inc
  2. 106 88
      rtl/win/wininc/messages.inc
  3. 9 3
      rtl/win/wininc/redef.inc

+ 8 - 7
rtl/win/wininc/defines.inc

@@ -487,10 +487,10 @@
      MEM_RELEASE = 32768;
      MEM_TOP_DOWN = 1048576;
      MEM_RESET        = $80000;
-     MEM_WRITE_WATCH  = $200000;     
-     MEM_PHYSICAL     = $400000;     
-     MEM_LARGE_PAGES  = $20000000;     
-     MEM_4MB_PAGES    = dword($80000000); 
+     MEM_WRITE_WATCH  = $200000;
+     MEM_PHYSICAL     = $400000;
+     MEM_LARGE_PAGES  = $20000000;
+     MEM_4MB_PAGES    = dword($80000000);
 
      EXCEPTION_GUARD_PAGE = $80000001;
      SECTION_EXTEND_SIZE = $10;
@@ -2270,7 +2270,7 @@
      HKEY_LOCAL_MACHINE = HKEY($80000002);
      HKEY_USERS = HKEY($80000003);
      HKEY_PERFORMANCE_DATA = HKEY($80000004);
-     HKEY_CURRENT_CONFIG = HKEY($80000005);	 
+     HKEY_CURRENT_CONFIG = HKEY($80000005);	
      HKEY_DYN_DATA = HKEY($80000006);
 
   { RegCreateKeyEx  }
@@ -2819,6 +2819,7 @@
      HELP_CONTEXTMENU = $a;
      HELP_FINDER = $b;
      HELP_WM_HELP = $c;
+     HELP_SETPOPUP_POS = $d;
      HELP_TCARD = $8000;
      HELP_TCARD_DATA = $10;
      HELP_TCARD_OTHER_CALLER = $11;
@@ -3050,7 +3051,7 @@
      WIZ_CXDLG = 276;
      WIZ_CYDLG = 140;
   { VX_FIXEDFILEINFO structure  }
-     VS_FILE_INFO = MAKEINTRESOURCE(16);  
+     VS_FILE_INFO = MAKEINTRESOURCE(16);
 
 
   const
@@ -3579,7 +3580,7 @@
      HHT_TOLEFT = 2048;
      HHT_TORIGHT = 1024;
   { TBADDBITMAP structure  }
-     HINST_COMMCTRL = HINST(-1);  
+     HINST_COMMCTRL = HINST(-1);
 
   const
      IDB_STD_LARGE_COLOR = 1;

+ 106 - 88
rtl/win/wininc/messages.inc

@@ -1139,6 +1139,7 @@
      WM_SYSKEYDOWN = 260;
      WM_SYSKEYUP = 261;
      WM_TCARD = 82;
+     WM_THEMECHANGED = $031A;
      WM_TIMECHANGE = 30;
      WM_TIMER = 275;
      WM_UNDO = 772;
@@ -1180,6 +1181,7 @@
     TWMSetFont          = Windows.TWMSetFont;
     TWMShowWindow       = Windows.TWMShowWindow;
     TWMEraseBkgnd       = Windows.TWMEraseBkgnd;
+    TWMIconEraseBkgnd   = TWMEraseBkgnd;
     LPMSG               = Windows.MSG;
     tagMSG              = Windows.tagMSG;
     TMSG                = Windows.TMSG;
@@ -1647,7 +1649,7 @@
     TWMNCPaint = record
       Msg : UINT;
       RGN : HRGN;
-      Unused : Longint;
+      Unused : WPARAM;
       Result : LRESULT;
     end;
 
@@ -1658,93 +1660,109 @@
       Result : LRESULT;
     end;
 
-	  TWMSizeClipboard = record
-	    Msg: UINT;
-	    Viewer: HWND;
-	    RC: THandle;
-	    Result: LRESULT;
-	  end;
-	
-	  TWMSpoolerStatus = record
-            Msg: UINT;
-	    JobStatus: LPARAM;
-	    JobsLeft: WPARAM;
-	    Unused: WPARAM;
-	    Result: LRESULT;
-	  end;
-	
-	  TWMStyleChange = record
-	    Msg: UINT;
-	    StyleType: LPARAM;
-	    StyleStruct: PStyleStruct;
-	    Result: LRESULT;
-	  end;
-	
-	  TWMStyleChanged = TWMStyleChange;
-	  TWMStyleChanging = TWMStyleChange;
-	
-	
-	  TWMSysDeadChar = record
-	    Msg: UINT;
-	    CharCode: WPARAM;
-	    Unused: WPARAM;
-	    KeyData: LPARAM;
-	    Result: LRESULT;
-	  end;
-	
-	  TWMSystemError = record
-	    Msg: UINT;
-	    ErrSpec: WPARAM;
-	    Unused: LPARAM;
-	    Result: LRESULT;
-	  end;
-	
-	  TWMTimeChange = TWMNoParams;
-	
-	  TWMTimer = record
-	    Msg: UINT;
-	    TimerID: LPARAM;
-	    TimerProc: TFarProc;
-	    Result: LRESULT;
-	  end;
-	
-	  TWMUndo = TWMNoParams;
-	
-	  TWMVScrollClipboard = record
-	    Msg: UINT;
-	    Viewer: HWND;
-	    ScollCode: WPARAM;
-	    ThumbPos: WPARAM;
-	    Result: LRESULT;
-	  end;
-	
-	  TWMDisplayChange = record
-	    Msg: UINT;
-	    BitsPerPixel: Integer;
-	    Width: WPARAM;
-	    Height: WPARAM;
-	    Result: LRESULT;
-	  end;
-	
-	  TWMDropFiles = record
-	     Msg: UINT;
-	     Drop: THANDLE;
-	     Unused: LPARAM;
-	     Result: LRESULT;
-	  end;
-	  TWMEnable = packed record
-	     Msg: Cardinal;
-	     Enabled: LongBool;
-	     Unused: Longint;
-	     Result: Longint;
-	  end;
-	  TWMMouseActivate = packed record
-	     Msg: Cardinal;
-	     TopLevel: HWND;
-	     HitTestCode: Word;
-	     MouseMsg: Word;
-	     Result: Longint;
-	  end;
+    TWMSizeClipboard = record
+      Msg: UINT;
+      Viewer: HWND;
+      RC: THandle;
+      Result: LRESULT;
+    end;
+
+    TWMSpoolerStatus = record
+      Msg: UINT;
+      JobStatus: LPARAM;
+      JobsLeft: WPARAM;
+      Unused: WPARAM;
+      Result: LRESULT;
+    end;
+  
+    TWMStyleChange = record
+      Msg: UINT;
+      StyleType: LPARAM;
+      StyleStruct: PStyleStruct;
+      Result: LRESULT;
+    end;
+  
+    TWMStyleChanged = TWMStyleChange;
+    TWMStyleChanging = TWMStyleChange;
+  
+  
+    TWMSysDeadChar = record
+      Msg: UINT;
+      CharCode: WPARAM;
+      Unused: WPARAM;
+      KeyData: LPARAM;
+      Result: LRESULT;
+    end;
+  
+    TWMSystemError = record
+      Msg: UINT;
+      ErrSpec: WPARAM;
+      Unused: LPARAM;
+      Result: LRESULT;
+    end;
+  
+    TWMTimeChange = TWMNoParams;
+  
+    TWMTimer = record
+      Msg: UINT;
+      TimerID: LPARAM;
+      TimerProc: TFarProc;
+      Result: LRESULT;
+    end;
+  
+    TWMUndo = TWMNoParams;
+  
+    TWMVScrollClipboard = record
+      Msg: UINT;
+      Viewer: HWND;
+      ScollCode: WPARAM;
+      ThumbPos: WPARAM;
+      Result: LRESULT;
+    end;
+  
+    TWMDisplayChange = record
+      Msg: UINT;
+      BitsPerPixel: Integer;
+      Width: WPARAM;
+      Height: WPARAM;
+      Result: LRESULT;
+    end;
+
+    TWMDropFiles = record
+      Msg: UINT;
+      Drop: THANDLE;
+      Unused: LPARAM;
+      Result: LRESULT;
+    end;
+
+    TWMEnable = record
+      Msg: UINT;
+      Enabled: BOOL;
+      Unused: LPARAM;
+      Result: LRESULT;
+    end;
+
+    TWMMouseActivate = record
+      Msg: UINT;
+      TopLevel: HWND;
+      HitTestCode: Word;
+      MouseMsg: Word;
+      Result: LRESULT;
+    end;
+
+    TWMEndSession = record
+      Msg: UINT;
+      EndSession: BOOL;
+      Unused: LPARAM;
+      Result: LRESULT;
+    end;
+    
+    TWMActivateApp = record
+      Msg: UINT;
+      Active: BOOL;
+      ThreadId: WPARAM;
+      Result: LRESULT;
+    end;
 {$endif messagesunit}
 
 {$endif read_interface}

+ 9 - 3
rtl/win/wininc/redef.inc

@@ -202,6 +202,8 @@ function HResultFromNT(x : Longint) : HRESULT;
 function SmallPointToPoint(const P: TSmallPoint): TPoint;
 function PointToSmallPoint(const P: TPoint): TSmallPoint;
 
+function GetCurrentTime: Longint;inline;
+
 procedure InitializeCriticalSection(var CriticalSection : TRTLCriticalSection); external 'kernel32' name 'InitializeCriticalSection';
 procedure EnterCriticalSection(var CriticalSection : TRTLCriticalSection); external 'kernel32' name 'EnterCriticalSection';
 procedure LeaveCriticalSection(var CriticalSection : TRTLCriticalSection); external 'kernel32' name 'LeaveCriticalSection';
@@ -389,9 +391,9 @@ function EnumDisplaySettings(lpszDeviceName: PChar; iModeNum: DWORD; var lpDevMo
 function EnumDisplaySettingsA(lpszDeviceName: LPCSTR; iModeNum: DWORD; var lpDevMode: TDeviceModeA): BOOL; external 'user32' name 'EnumDisplaySettingsA';
 function EnumDisplaySettingsW(lpszDeviceName: LPWSTR; iModeNum: DWORD; var lpDevMode: TDeviceModeW): BOOL; external 'user32' name 'EnumDisplaySettingsW';
 //function EnumEnhMetaFile(DC: HDC; p2: HENHMETAFILE; p3: TFNEnhMFEnumProc; p4: Pointer; const p5: TRect): BOOL; external 'gdi32' name 'EnumEnhMetaFile';
-//function EnumFontFamiliesEx(DC: HDC; var p2: TLogFont; p3: TFNFontEnumProc; p4: LPARAM; p5: DWORD): BOOL;external 'gdi32' name 'EnumFontFamiliesExA';
-//function EnumFontFamiliesExA(DC: HDC; var p2: TLogFontA; p3: TFNFontEnumProcA; p4: LPARAM; p5: DWORD): BOOL; external 'gdi32' name 'EnumFontFamiliesExA';
-//function EnumFontFamiliesExW(DC: HDC; var p2: TLogFontW; p3: TFNFontEnumProcW; p4: LPARAM; p5: DWORD): BOOL; external 'gdi32' name 'EnumFontFamiliesExW';
+function EnumFontFamiliesEx(DC: HDC; var p2: TLogFont; p3: FONTENUMEXPROC; p4: LPARAM; p5: DWORD): BOOL;external 'gdi32' name 'EnumFontFamiliesExA';
+function EnumFontFamiliesExA(DC: HDC; var p2: TLogFontA; p3: FONTENUMEXPROC; p4: LPARAM; p5: DWORD): BOOL; external 'gdi32' name 'EnumFontFamiliesExA';
+function EnumFontFamiliesExW(DC: HDC; var p2: TLogFontW; p3: FONTENUMEXPROC; p4: LPARAM; p5: DWORD): BOOL; external 'gdi32' name 'EnumFontFamiliesExW';
 //function EqualRect(const lprc1, lprc2: TRect): BOOL; external 'user32' name 'EqualRect';
 function ExtCreatePen(PenStyle, Width: DWORD; const Brush: TLogBrush; StyleCount: DWORD; Style: Pointer): HPEN; external 'gdi32' name 'ExtCreatePen';
 function ExtCreateRegion(p1: PXForm; p2: DWORD; const p3: TRgnData): HRGN; external 'gdi32' name 'ExtCreateRegion';
@@ -1112,5 +1114,9 @@ begin
   Result.Y:=P.Y;
 end;
 
+function GetCurrentTime: Longint;inline;
+begin
+  Result:=GetTickCount;
+end;
 {$endif read_implementation}