paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-11-04 09:19:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

* made RT_* simple constants, fixes #8584

Browse Source 
git-svn-id: trunk@7052 -
This commit is contained in:
florian 2007-04-01 15:39:45 +00:00
parent f2c81869a1
commit 8d371e3f97
3 changed files with 40 additions and 168 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -337,6 +337,10 @@
Macros Macros
} }
MakeIntResourceA = PAnsiChar;
MakeIntResourceW = PWideChar;
MakeIntResource = MakeIntResourceA;
{ was #define dname(params) def_expr } { was #define dname(params) def_expr }
{ argument types are unknown } { argument types are unknown }
function GetBValue(rgb : longint) : BYTE; function GetBValue(rgb : longint) : BYTE;
@ -415,10 +419,6 @@
{ argument types are unknown } { argument types are unknown }
function MAKEINTATOM(i : longint) : LPTSTR; function MAKEINTATOM(i : longint) : LPTSTR;
{ was #define dname(params) def_expr }
{ argument types are unknown }
function MAKEINTRESOURCE(i : longint) : LPTSTR;
{ was #define dname(params) def_expr } { was #define dname(params) def_expr }
{ argument types are unknown } { argument types are unknown }
{ return type might be wrong } { return type might be wrong }
@ -825,12 +825,6 @@ type
MAKEINTATOM:=LPTSTR(ULONG_PTR(WORD(i))); MAKEINTATOM:=LPTSTR(ULONG_PTR(WORD(i)));
end; end;
{ was #define dname(params) def_expr }
{ argument types are unknown }
function MAKEINTRESOURCE(i : longint) : LPTSTR;
begin
MAKEINTRESOURCE:=LPTSTR(ULONG_PTR(WORD(i)));
end;
{ was #define dname(params) def_expr } { was #define dname(params) def_expr }
{ argument types are unknown } { argument types are unknown }

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

@ -1139,61 +1139,37 @@
{ EnumPrinters } { EnumPrinters }
{ EnumProtocols } { EnumProtocols }
{ EnumResLangProc } { EnumResLangProc }
{ was #define dname def_expr }
function RT_ACCELERATOR : LPTSTR;
{ return type might be wrong }
{ was #define dname def_expr }
function RT_BITMAP : LPTSTR;
{ return type might be wrong }
{ was #define dname def_expr } //
function RT_DIALOG : LPTSTR; // Predefined Resource Types
{ return type might be wrong } //
const
RT_CURSOR = MAKEINTRESOURCE(1);
RT_BITMAP = MAKEINTRESOURCE(2);
RT_ICON = MAKEINTRESOURCE(3);
RT_MENU = MAKEINTRESOURCE(4);
RT_DIALOG = MAKEINTRESOURCE(5);
RT_STRING = MAKEINTRESOURCE(6);
RT_FONTDIR = MAKEINTRESOURCE(7);
RT_FONT = MAKEINTRESOURCE(8);
RT_ACCELERATOR = MAKEINTRESOURCE(9);
RT_RCDATA = MAKEINTRESOURCE(10);
RT_MESSAGETABLE = MAKEINTRESOURCE(11);
{ was #define dname def_expr } DIFFERENCE = 11;
function RT_FONT : LPTSTR;
{ return type might be wrong }
{ was #define dname def_expr } RT_GROUP_CURSOR = MAKEINTRESOURCE(ULONG_PTR(RT_CURSOR) + DIFFERENCE);
function RT_FONTDIR : LPTSTR; RT_GROUP_ICON = MAKEINTRESOURCE(ULONG_PTR(RT_ICON) + DIFFERENCE);
{ return type might be wrong } RT_VERSION = MAKEINTRESOURCE(16);
RT_DLGINCLUDE = MAKEINTRESOURCE(17);
RT_PLUGPLAY = MAKEINTRESOURCE(19);
RT_VXD = MAKEINTRESOURCE(20);
RT_ANICURSOR = MAKEINTRESOURCE(21);
RT_ANIICON = MAKEINTRESOURCE(22);
RT_HTML = MAKEINTRESOURCE(23);
RT_MANIFEST = MAKEINTRESOURCE(24);
{ was #define dname def_expr }
function RT_MENU : LPTSTR;
{ return type might be wrong }
{ was #define dname def_expr }
function RT_RCDATA : LPTSTR;
{ return type might be wrong }
{ was #define dname def_expr }
function RT_STRING : LPTSTR;
{ return type might be wrong }
{ was #define dname def_expr }
function RT_MESSAGETABLE : LPTSTR;
{ return type might be wrong }
{ was #define dname def_expr }
function RT_CURSOR : LPTSTR;
{ return type might be wrong }
{ was #define dname def_expr }
function RT_GROUP_CURSOR : LPTSTR;
{ return type might be wrong }
{ was #define dname def_expr }
function RT_ICON : LPTSTR;
{ return type might be wrong }
{ was #define dname def_expr }
function RT_GROUP_ICON : LPTSTR;
{ return type might be wrong }
{ was #define dname def_expr }
function RT_VERSION : LPTSTR;
{ return type might be wrong }
{ EnumServicesStatus } { EnumServicesStatus }
@ -2534,7 +2510,7 @@ Const
LOCALE_RETURN_NUMBER = $20000000; // return number instead LOCALE_RETURN_NUMBER = $20000000; // return number instead
LOCALE_SISO639LANGNAME = $59; LOCALE_SISO639LANGNAME = $59;
LOCALE_SISO3166CTRYNAME = $5A; LOCALE_SISO3166CTRYNAME = $5A;
{ Calendar Type Information } { Calendar Type Information }
CAL_ICALINTVALUE = 1; CAL_ICALINTVALUE = 1;
CAL_IYEAROFFSETRANGE = 3; CAL_IYEAROFFSETRANGE = 3;
@ -5400,8 +5376,8 @@ Const
DECLARE_HANDLE(HANDLE); DECLARE_HANDLE(HANDLE);
#endif #endif
*) *)
const const
EXCEPTION_READ_FAULT = 0; // Access violation was caused by a read EXCEPTION_READ_FAULT = 0; // Access violation was caused by a read
EXCEPTION_WRITE_FAULT = 1; // Access violation was caused by a write EXCEPTION_WRITE_FAULT = 1; // Access violation was caused by a write
@ -5567,104 +5543,6 @@ const
UNICODE_NULL:=#0; UNICODE_NULL:=#0;
end; end;
{ was #define dname def_expr }
function RT_ACCELERATOR : LPTSTR;
{ return type might be wrong }
begin
RT_ACCELERATOR:=MAKEINTRESOURCE(9);
end;
{ was #define dname def_expr }
function RT_BITMAP : LPTSTR;
{ return type might be wrong }
begin
RT_BITMAP:=MAKEINTRESOURCE(2);
end;
{ was #define dname def_expr }
function RT_DIALOG : LPTSTR;
{ return type might be wrong }
begin
RT_DIALOG:=MAKEINTRESOURCE(5);
end;
{ was #define dname def_expr }
function RT_FONT : LPTSTR;
{ return type might be wrong }
begin
RT_FONT:=MAKEINTRESOURCE(8);
end;
{ was #define dname def_expr }
function RT_FONTDIR : LPTSTR;
{ return type might be wrong }
begin
RT_FONTDIR:=MAKEINTRESOURCE(7);
end;
{ was #define dname def_expr }
function RT_MENU : LPTSTR;
{ return type might be wrong }
begin
RT_MENU:=MAKEINTRESOURCE(4);
end;
{ was #define dname def_expr }
function RT_RCDATA : LPTSTR;
{ return type might be wrong }
begin
RT_RCDATA:=MAKEINTRESOURCE(10);
end;
{ was #define dname def_expr }
function RT_STRING : LPTSTR;
{ return type might be wrong }
begin
RT_STRING:=MAKEINTRESOURCE(6);
end;
{ was #define dname def_expr }
function RT_MESSAGETABLE : LPTSTR;
{ return type might be wrong }
begin
RT_MESSAGETABLE:=MAKEINTRESOURCE(11);
end;
{ was #define dname def_expr }
function RT_CURSOR : LPTSTR;
{ return type might be wrong }
begin
RT_CURSOR:=MAKEINTRESOURCE(1);
end;
{ was #define dname def_expr }
function RT_GROUP_CURSOR : LPTSTR;
{ return type might be wrong }
begin
RT_GROUP_CURSOR:=MAKEINTRESOURCE(12);
end;
{ was #define dname def_expr }
function RT_ICON : LPTSTR;
{ return type might be wrong }
begin
RT_ICON:=MAKEINTRESOURCE(3);
end;
{ was #define dname def_expr }
function RT_GROUP_ICON : LPTSTR;
{ return type might be wrong }
begin
RT_GROUP_ICON:=MAKEINTRESOURCE(13);
end;
{ was #define dname def_expr }
function RT_VERSION : LPTSTR;
{ return type might be wrong }
begin
RT_VERSION:=MAKEINTRESOURCE(16);
end;
{ was #define dname def_expr } { was #define dname def_expr }
function IDC_ARROW : LPTSTR; function IDC_ARROW : LPTSTR;
{ return type might be wrong } { return type might be wrong }

14
rtl/wince/wininc/defines.inc
View File

@ -1155,8 +1155,8 @@
{ EnumProtocols } { EnumProtocols }
{ EnumResLangProc } { EnumResLangProc }
RT_ACCELERATOR = MAKEINTRESOURCE(9); RT_ACCELERATOR = MAKEINTRESOURCE(9);
RT_BITMAP = MAKEINTRESOURCE(2); RT_BITMAP = MAKEINTRESOURCE(2);
RT_DIALOG = MAKEINTRESOURCE(5); RT_DIALOG = MAKEINTRESOURCE(5);
RT_FONT = MAKEINTRESOURCE(8); RT_FONT = MAKEINTRESOURCE(8);
RT_FONTDIR = MAKEINTRESOURCE(7); RT_FONTDIR = MAKEINTRESOURCE(7);
RT_MENU = MAKEINTRESOURCE(4); RT_MENU = MAKEINTRESOURCE(4);
@ -2070,7 +2070,7 @@
ICC_TOOLTIP_CLASSES = $00001000; // Tooltip static & button ICC_TOOLTIP_CLASSES = $00001000; // Tooltip static & button
ICC_CAPEDIT_CLASS = $00002000; // All-caps edit control ICC_CAPEDIT_CLASS = $00002000; // All-caps edit control
ICC_FE_CLASSES = $40000000; // FE specific input subclasses ICC_FE_CLASSES = $40000000; // FE specific input subclasses
{ InitializeSecurityDescriptor } { InitializeSecurityDescriptor }
SECURITY_DESCRIPTOR_REVISION = 1; SECURITY_DESCRIPTOR_REVISION = 1;
{ IsTextUnicode } { IsTextUnicode }
@ -2860,7 +2860,7 @@
STILL_ACTIVE = $103; STILL_ACTIVE = $103;
{ kfuncs consts } //+kfuncs { kfuncs consts } //+kfuncs
{$ifdef CPUARM} {$ifdef CPUARM}
PUserKData = $FFFFC800; PUserKData = $FFFFC800;
{$else} {$else}
@ -2892,7 +2892,7 @@
TLS_FUNCALLOC = 0; TLS_FUNCALLOC = 0;
TLS_FUNCFREE = 1; TLS_FUNCFREE = 1;
{ COMMPROP structure } { COMMPROP structure }
SP_SERIALCOMM = $1; SP_SERIALCOMM = $1;
BAUD_075 = $1; BAUD_075 = $1;
@ -3813,7 +3813,7 @@
LVIS_SELECTED = 2; LVIS_SELECTED = 2;
LVIS_OVERLAYMASK = 3840; LVIS_OVERLAYMASK = 3840;
LVIS_STATEIMAGEMASK = 61440; LVIS_STATEIMAGEMASK = 61440;
// progress bar styles // progress bar styles
PBS_SMOOTH = 01; PBS_SMOOTH = 01;
PBS_VERTICAL = 04; PBS_VERTICAL = 04;
@ -4871,7 +4871,7 @@
VK_RMENU = 165; VK_RMENU = 165;
{ ImmGetVirtualKey } { ImmGetVirtualKey }
VK_PROCESSKEY = 229; VK_PROCESSKEY = 229;
// these constants are xda-specific: // these constants are xda-specific:
VK_TOUCHPAD = $01; // VK_LBUTTON VK_TOUCHPAD = $01; // VK_LBUTTON
VK_ANSWER = $72; // VK_F5 VK_ANSWER = $72; // VK_F5