* made RT_* simple constants, fixes #8584

git-svn-id: trunk@7052 -

rtl/win/wininc/base.inc

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

rtl/win/wininc/defines.inc

@@ -1139,61 +1139,37 @@
   { EnumPrinters  }
   { EnumProtocols  }
   { 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;
-      { return type might be wrong }
-
-    { was #define dname def_expr }
-    function RT_FONT : LPTSTR;
-      { return type might be wrong }
-
-    { was #define dname def_expr }
-    function RT_FONTDIR : LPTSTR;
-      { return type might be wrong }
-
-    { 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 }
+  //
+  // Predefined Resource Types
+  //
+  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);
+
+    DIFFERENCE = 11;
+
+    RT_GROUP_CURSOR = MAKEINTRESOURCE(ULONG_PTR(RT_CURSOR) + DIFFERENCE);
+    RT_GROUP_ICON = MAKEINTRESOURCE(ULONG_PTR(RT_ICON) + DIFFERENCE);
+    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_VERSION : LPTSTR;
-      { return type might be wrong }
 
   { EnumServicesStatus  }
 
@@ -2534,7 +2510,7 @@ Const
      LOCALE_RETURN_NUMBER  = $20000000;   // return number instead
      LOCALE_SISO639LANGNAME = $59;
      LOCALE_SISO3166CTRYNAME = $5A;
- 
+
   { Calendar Type Information  }
      CAL_ICALINTVALUE = 1;
      CAL_IYEAROFFSETRANGE = 3;
@@ -5400,8 +5376,8 @@ Const
   DECLARE_HANDLE(HANDLE);
   #endif
    *)
-   
-   
+
+
   const
      EXCEPTION_READ_FAULT    = 0; // Access violation was caused by a read
      EXCEPTION_WRITE_FAULT   = 1; // Access violation was caused by a write
@@ -5567,104 +5543,6 @@ const
          UNICODE_NULL:=#0;
       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 }
     function IDC_ARROW : LPTSTR;
       { return type might be wrong }

rtl/wince/wininc/defines.inc

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