* better hint about abstract methods (fixes 5098)

+ code generation for invoking dispinterface methods
* small dispinterface problems fixed

git-svn-id: trunk@5798 -

compiler/defcmp.pas

@@ -1033,7 +1033,7 @@ implementation
                        can be assigned to void pointers, but it is less
                        preferred than assigning to a related objectdef }
                      if (
-                         is_class_or_interface(def_from) or
+                         is_class_or_interface_or_dispinterface(def_from) or
                          (def_from.typ=classrefdef)
                         ) and
                         (tpointerdef(def_to).pointeddef.typ=orddef) and
@@ -1129,7 +1129,7 @@ implementation
                 end
                else
                { Class/interface specific }
-                if is_class_or_interface(def_to) then
+                if is_class_or_interface_or_dispinterface(def_to) then
                  begin
                    { void pointer also for delphi mode }
                    if (m_delphi in current_settings.modeswitches) and

compiler/defutil.pas

@@ -1007,6 +1007,8 @@ implementation
             result:=true;
           arraydef:
             result:=(ado_IsConstString in tarraydef(p).arrayoptions);
+          objectdef:
+            result:=tobjectdef(p).objecttype in [odt_interfacecom,odt_dispinterface,odt_interfacecorba];
         end;
       end;
 

compiler/msg/errore.msg

@@ -1537,7 +1537,9 @@ sym_h_function_result_uninitialized=05060_H_Function result variable does not se
 sym_w_identifier_only_read=05061_W_Variable "$1" read but nowhere assigned
 % You have read the value of a variable, but nowhere assigned a value to
 % it.
-
+sym_h_abstract_method_list=05062_H_Found abstract method: $1
+% When getting a warning about constructing a class/object with abstract methods
+% you get this hint to find the affected method.
 % \end{description}
 #
 # Codegenerator

compiler/msgidx.inc

@@ -431,6 +431,7 @@ const
   sym_w_function_result_uninitialized=05059;
   sym_h_function_result_uninitialized=05060;
   sym_w_identifier_only_read=05061;
+  sym_h_abstract_method_list=05062;
   cg_e_parasize_too_big=06009;
   cg_e_file_must_call_by_reference=06012;
   cg_e_cant_use_far_pointer_there=06013;
@@ -712,9 +713,9 @@ const
   option_info=11024;
   option_help_pages=11025;
 
-  MsgTxtSize = 42291;
+  MsgTxtSize = 42325;
 
   MsgIdxMax : array[1..20] of longint=(
-    24,82,230,79,62,47,106,22,135,60,
+    24,82,230,79,63,47,106,22,135,60,
     41,1,1,1,1,1,1,1,1,1
   );

compiler/msgtxt.inc

@@ -483,202 +483,203 @@ const msgtxt : array[0..000176,1..240] of char=(
   '05059_W_Function ','result variable does not seem to initialized'#000+
   '05060_H_Function result variable does not seem to be initialized'#000+
   '05061_W_Variable "$1" read but nowhere assigned'#000+
-  '06009_E_Parameter list size exceeds 65535 bytes'#000+
-  '06012_E_File types must be var par','ameters'#000+
+  '05062_H_Found abstract method: $1'#000+
+  '06009_E_Parameter list size exceeds 65535 bytes'#000,
+  '06012_E_File types must be var parameters'#000+
   '06013_E_The use of a far pointer isn'#039't allowed there'#000+
   '06015_E_EXPORT declared functions can'#039't be called'#000+
   '06016_W_Possible illegal call of constructor or destructor'#000+
   '06017_N_Inefficient code'#000+
-  '06018_W_unreachable code'#000+
-  '06020_E_Abstract met','hods can'#039't be called directly'#000+
+  '06018_W_unr','eachable code'#000+
+  '06020_E_Abstract methods can'#039't be called directly'#000+
   '06027_DL_Register $1 weight $2 $3'#000+
   '06029_DL_Stack frame is omitted'#000+
   '06031_E_Object or class methods can'#039't be inline.'#000+
   '06032_E_Procvar calls cannot be inline.'#000+
-  '06033_E_No code for inline procedure stored'#000+
-  '06035_E_Ele','ment zero of an ansi/wide- or longstring can'#039't be acc'+
-  'essed, use (set)length instead'#000+
+  '06033_E_No code for i','nline procedure stored'#000+
+  '06035_E_Element zero of an ansi/wide- or longstring can'#039't be acces'+
+  'sed, use (set)length instead'#000+
   '06037_E_Constructors or destructors can not be called inside a '#039'wi'+
   'th'#039' clause'#000+
-  '06038_E_Cannot call message handler methods directly'#000+
-  '06039_E_Jump in or outside',' of an exception block'#000+
+  '06038_E_Cannot call message handler methods d','irectly'#000+
+  '06039_E_Jump in or outside of an exception block'#000+
   '06040_E_Control flow statements aren'#039't allowed in a finally block'#000+
   '06041_W_Parameters size exceeds limit for certain cpu'#039's'#000+
   '06042_W_Local variable size exceed limit for certain cpu'#039's'#000+
-  '06043_E_Local variables size exceeds',' supported limit'#000+
+  '06','043_E_Local variables size exceeds supported limit'#000+
   '06044_E_BREAK not allowed'#000+
   '06045_E_CONTINUE not allowed'#000+
   '06046_F_Unknown compilerproc "$1". Check if you use the correct run ti'+
   'me library.'#000+
   '07000_DL_Starting $1 styled assembler parsing'#000+
-  '07001_DL_Finished $1 styled assembler pa','rsing'#000+
+  '07001_','DL_Finished $1 styled assembler parsing'#000+
   '07002_E_Non-label pattern contains @'#000+
   '07004_E_Error building record offset'#000+
   '07005_E_OFFSET used without identifier'#000+
   '07006_E_TYPE used without identifier'#000+
-  '07007_E_Cannot use local variable or parameters here'#000+
-  '07008_E_need to use OFFSET here',#000+
+  '07007_E_Cannot use local variable or parameters he','re'#000+
+  '07008_E_need to use OFFSET here'#000+
   '07009_E_need to use $ here'#000+
   '07010_E_Cannot use multiple relocatable symbols'#000+
   '07011_E_Relocatable symbol can only be added'#000+
   '07012_E_Invalid constant expression'#000+
   '07013_E_Relocatable symbol is not allowed'#000+
-  '07014_E_Invalid reference syntax'#000+
-  '07015_E_','You can not reach $1 from that code'#000+
+  '07014_E','_Invalid reference syntax'#000+
+  '07015_E_You can not reach $1 from that code'#000+
   '07016_E_Local symbols/labels aren'#039't allowed as references'#000+
   '07017_E_Invalid base and index register usage'#000+
   '07018_W_Possible error in object field handling'#000+
-  '07019_E_Wrong scale factor specified'#000+
-  '07020_E_Multipl','e index register usage'#000+
+  '07019_E_Wrong scal','e factor specified'#000+
+  '07020_E_Multiple index register usage'#000+
   '07021_E_Invalid operand type'#000+
   '07022_E_Invalid string as opcode operand: $1'#000+
   '07023_W_@CODE and @DATA not supported'#000+
   '07024_E_Null label references are not allowed'#000+
-  '07025_E_Divide by zero in asm evaluator'#000+
-  '07026_E_Illegal exp','ression'#000+
+  '07025_E_Divide by zero in',' asm evaluator'#000+
+  '07026_E_Illegal expression'#000+
   '07027_E_escape sequence ignored: $1'#000+
   '07028_E_Invalid symbol reference'#000+
   '07029_W_Fwait can cause emulation problems with emu387'#000+
   '07030_W_$1 without operand translated into $1P'#000+
-  '07031_W_ENTER instruction is not supported by Linux kernel'#000+
-  '07','032_W_Calling an overload function in assembler'#000+
+  '07031_W_ENTER instruction i','s not supported by Linux kernel'#000+
+  '07032_W_Calling an overload function in assembler'#000+
   '07033_E_Unsupported symbol type for operand'#000+
   '07034_E_Constant value out of bounds'#000+
   '07035_E_Error converting decimal $1'#000+
   '07036_E_Error converting octal $1'#000+
-  '07037_E_Error converting binary $1'#000+
-  '07038_','E_Error converting hexadecimal $1'#000+
+  '07037_E','_Error converting binary $1'#000+
+  '07038_E_Error converting hexadecimal $1'#000+
   '07039_H_$1 translated to $2'#000+
   '07040_W_$1 is associated to an overloaded function'#000+
   '07041_E_Cannot use SELF outside a method'#000+
-  '07042_E_Cannot use OLDEBP outside a nested procedure'#000+
-  '07043_W_Procedures can'#039't return a','ny value in asm code'#000+
+  '07042_E_Cannot use OLDEBP outside a nested procedure',#000+
+  '07043_W_Procedures can'#039't return any value in asm code'#000+
   '07044_E_SEG not supported'#000+
   '07045_E_Size suffix and destination or source size do not match'#000+
   '07046_W_Size suffix and destination or source size do not match'#000+
-  '07047_E_Assembler syntax error'#000+
-  '07048_E_Invalid combination of opc','ode and operands'#000+
+  '07047_E_Assembler syntax error'#000,
+  '07048_E_Invalid combination of opcode and operands'#000+
   '07049_E_Assembler syntax error in operand'#000+
   '07050_E_Assembler syntax error in constant'#000+
   '07051_E_Invalid String expression'#000+
-  '07052_W_constant with symbol $1 for address which is not on a pointer'#000+
+  '07052_W_constant with symbol $1 for address which is not on a pointer'#000,
   '07053_E_Unrecognized opcode $1'#000+
-  '070','54_E_Invalid or missing opcode'#000+
+  '07054_E_Invalid or missing opcode'#000+
   '07055_E_Invalid combination of prefix and opcode: $1'#000+
   '07056_E_Invalid combination of override and opcode: $1'#000+
   '07057_E_Too many operands on line'#000+
   '07058_W_NEAR ignored'#000+
-  '07059_W_FAR ignored'#000+
-  '07060_E_Duplicate local sy','mbol $1'#000+
+  '07059_W_FAR ','ignored'#000+
+  '07060_E_Duplicate local symbol $1'#000+
   '07061_E_Undefined local symbol $1'#000+
   '07062_E_Unknown label identifier $1'#000+
   '07063_E_Invalid register name'#000+
   '07064_E_Invalid floating point register name'#000+
   '07066_W_Modulo not supported'#000+
-  '07067_E_Invalid floating point constant $1'#000+
-  '07068_E_Invalid',' floating point expression'#000+
+  '07067_E_Invalid floating',' point constant $1'#000+
+  '07068_E_Invalid floating point expression'#000+
   '07069_E_Wrong symbol type'#000+
   '07070_E_Cannot index a local var or parameter with a register'#000+
   '07071_E_Invalid segment override expression'#000+
   '07072_W_Identifier $1 supposed external'#000+
-  '07073_E_Strings not allowed as constants'#000,
+  '07073_E','_Strings not allowed as constants'#000+
   '07074_No type of variable specified'#000+
   '07075_E_assembler code not returned to text section'#000+
   '07076_E_Not a directive or local symbol $1'#000+
   '07077_E_Using a defined name as a local label'#000+
-  '07078_E_Dollar token is used without an identifier'#000+
-  '07079_W_32bi','t constant created for address'#000+
+  '07078_E_Dollar token is used ','without an identifier'#000+
+  '07079_W_32bit constant created for address'#000+
   '07080_N_.align is target specific, use .balign or .p2align'#000+
   '07081_E_Can'#039't access fields directly for parameters'#000+
   '07082_E_Can'#039't access fields of objects/classes directly'#000+
-  '07083_E_No size specified and unable to de','termine the size of the op'+
+  '07083_E_','No size specified and unable to determine the size of the op'+
   'erands'#000+
   '07084_E_Cannot use RESULT in this function'#000+
   '07086_W_"$1" without operand translated into "$1 %st,%st(1)"'#000+
   '07087_W_"$1 %st(n)" translated into "$1 %st,%st(n)"'#000+
-  '07088_W_"$1 %st(n)" translated into "$1 %st(n),%st"',#000+
+  '07088_W_"$1 %st(n',')" translated into "$1 %st(n),%st"'#000+
   '07089_E_Char < not allowed here'#000+
   '07090_E_Char > not allowed here'#000+
   '07093_W_ALIGN not supported'#000+
   '07094_E_Inc and Dec cannot be together'#000+
   '07095_E_Invalid reglist for movem'#000+
   '07096_E_Reglist invalid for opcode'#000+
-  '07097_E_Higher cpu mode required ($1)'#000+
-  '0','7098_W_No size specified and unable to determine the size of the op'+
-  'erands, using DWORD as default'#000+
+  '07097','_E_Higher cpu mode required ($1)'#000+
+  '07098_W_No size specified and unable to determine the size of the oper'+
+  'ands, using DWORD as default'#000+
   '07099_E_Syntax error while trying to parse a shifter operand'#000+
-  '07100_E_Address of packed component is not at a byte boundary'#000+
-  '07101_W_No size spe','cified and unable to determine the size of the op'+
-  'erands, using BYTE as default'#000+
+  '07100_E_Address of packed component is not at a',' byte boundary'#000+
+  '07101_W_No size specified and unable to determine the size of the oper'+
+  'ands, using BYTE as default'#000+
   '07102_W_Use of +offset(%ebp) for parameters invalid here'#000+
-  '07103_W_Use of +offset(%ebp) is not compatible with regcall convention'+
+  '07103_W_Use of +offset(%ebp) is not compatible with regcall convention',
   #000+
-  '07104_W_Use of -offset(%ebp) is n','ot recommanded for local variable a'+
-  'ccess'#000+
+  '07104_W_Use of -offset(%ebp) is not recommanded for local variable acc'+
+  'ess'#000+
   '07105_W_Use of -offset(%esp), value may be crashed'#000+
   '08000_F_Too many assembler files'#000+
   '08001_F_Selected assembler output not supported'#000+
   '08002_F_Comp not supported'#000+
-  '08003_F_Direct not support for binary wr','iters'#000+
+  '08003_','F_Direct not support for binary writers'#000+
   '08004_E_Allocating of data is only allowed in bss section'#000+
   '08005_F_No binary writer selected'#000+
   '08006_E_Asm: Opcode $1 not in table'#000+
   '08007_E_Asm: $1 invalid combination of opcode and operands'#000+
-  '08008_E_Asm: 16 Bit references not supported'#000+
-  '08','009_E_Asm: Invalid effective address'#000+
+  '08008_E_Asm: ','16 Bit references not supported'#000+
+  '08009_E_Asm: Invalid effective address'#000+
   '08010_E_Asm: Immediate or reference expected'#000+
   '08011_E_Asm: $1 value exceeds bounds $2'#000+
   '08012_E_Asm: Short jump is out of range $1'#000+
   '08013_E_Asm: Undefined label $1'#000+
-  '08014_E_Asm: Comp type not supported for th','is target'#000+
+  '08014_E_A','sm: Comp type not supported for this target'#000+
   '08015_E_Asm: Extended type not supported for this target'#000+
   '08016_E_Asm: Duplicate label $1'#000+
   '08017_E_Asm: Redefined label $1'#000+
   '08018_E_Asm: First defined here'#000+
   '08019_E_Asm: Invalid register $1'#000+
-  '08020_E_Asm: 16 or 32 Bit references not sup','ported'#000+
+  '08020_E_As','m: 16 or 32 Bit references not supported'#000+
   '08021_E_Asm: 64 Bit operands not supported'#000+
   '09000_W_Source operating system redefined'#000+
   '09001_I_Assembling (pipe) $1'#000+
   '09002_E_Can'#039't create assembler file: $1'#000+
   '09003_E_Can'#039't create object file: $1'#000+
-  '09004_E_Can'#039't create archive file: $1'#000+
-  '0900','5_E_Assembler $1 not found, switching to external assembling'#000+
+  '09004_E_','Can'#039't create archive file: $1'#000+
+  '09005_E_Assembler $1 not found, switching to external assembling'#000+
   '09006_T_Using assembler: $1'#000+
   '09007_E_Error while assembling exitcode $1'#000+
   '09008_E_Can'#039't call the assembler, error $1 switching to external a'+
-  'ssembling'#000+
+  'ssemblin','g'#000+
   '09009_I_Assembling $1'#000+
-  '09010_I_As','sembling with smartlinking $1'#000+
+  '09010_I_Assembling with smartlinking $1'#000+
   '09011_W_Object $1 not found, Linking may fail !'#000+
   '09012_W_Library $1 not found, Linking may fail !'#000+
   '09013_E_Error while linking'#000+
-  '09014_E_Can'#039't call the linker, switching to external linking'#000+
+  '09014_E_Can'#039't call the linker, switching to externa','l linking'#000+
   '09015_I_Linking $1'#000+
-  '09016','_E_Util $1 not found, switching to external linking'#000+
+  '09016_E_Util $1 not found, switching to external linking'#000+
   '09017_T_Using util $1'#000+
   '09018_E_Creation of Executables not supported'#000+
   '09019_E_Creation of Dynamic/Shared Libraries not supported'#000+
   '09020_I_Closing script $1'#000+
-  '09021_E_resource compiler not found',', switching to external mode'#000+
+  '0','9021_E_resource compiler not found, switching to external mode'#000+
   '09022_I_Compiling resource $1'#000+
   '09023_T_unit $1 can'#039't be statically linked, switching to smart lin'+
   'king'#000+
   '09024_T_unit $1 can'#039't be smart linked, switching to static linking'+
   #000+
-  '09025_T_unit $1 can'#039't be shared linked, swi','tching to static link'+
+  '09025_T_u','nit $1 can'#039't be shared linked, switching to static link'+
   'ing'#000+
   '09026_E_unit $1 can'#039't be smart or static linked'#000+
   '09027_E_unit $1 can'#039't be shared or static linked'#000+
   '09028_D_Calling resource compiler "$1" with "$2" as command line'#000+
-  '09128_F_Can'#039't post process executable $1'#000+
-  '09129_F_Can'#039,'t open executable $1'#000+
+  '09128_F_Can'#039't post ','process executable $1'#000+
+  '09129_F_Can'#039't open executable $1'#000+
   '09130_X_Size of Code: $1 bytes'#000+
   '09131_X_Size of initialized data: $1 bytes'#000+
   '09132_X_Size of uninitialized data: $1 bytes'#000+
   '09133_X_Stack space reserved: $1 bytes'#000+
-  '09134_X_Stack space committed: $1 bytes'#000+
-  '10000_T_Unitsearch: $','1'#000+
+  '09134_X_Stack space committ','ed: $1 bytes'#000+
+  '10000_T_Unitsearch: $1'#000+
   '10001_T_PPU Loading $1'#000+
   '10002_U_PPU Name: $1'#000+
   '10003_U_PPU Flags: $1'#000+
@@ -686,100 +687,101 @@ const msgtxt : array[0..000176,1..240] of char=(
   '10005_U_PPU Time: $1'#000+
   '10006_U_PPU File too short'#000+
   '10007_U_PPU Invalid Header (no PPU at the begin)'#000+
-  '10008_U_PPU Invalid Version $1'#000+
-  '10009_U_PPU is compiled ','for another processor'#000+
+  '10008_U_PPU Invalid V','ersion $1'#000+
+  '10009_U_PPU is compiled for another processor'#000+
   '10010_U_PPU is compiled for an other target'#000+
   '10011_U_PPU Source: $1'#000+
   '10012_U_Writing $1'#000+
   '10013_F_Can'#039't Write PPU-File'#000+
   '10014_F_Error reading PPU-File'#000+
   '10015_F_unexpected end of PPU-File'#000+
-  '10016_F_Invalid PPU-File entry: $1'#000+
-  '10','017_F_PPU Dbx count problem'#000+
+  '100','16_F_Invalid PPU-File entry: $1'#000+
+  '10017_F_PPU Dbx count problem'#000+
   '10018_E_Illegal unit name: $1'#000+
   '10019_F_Too much units'#000+
   '10020_F_Circular unit reference between $1 and $2'#000+
   '10021_F_Can'#039't compile unit $1, no sources available'#000+
-  '10022_F_Can'#039't find unit $1'#000+
-  '10023_W_Unit $1 was not found ','but $2 exists'#000+
+  '10022_F_Can'#039't find unit',' $1'#000+
+  '10023_W_Unit $1 was not found but $2 exists'#000+
   '10024_F_Unit $1 searched but $2 found'#000+
   '10025_W_Compiling the system unit requires the -Us switch'#000+
   '10026_F_There were $1 errors compiling module, stopping'#000+
   '10027_U_Load from $1 ($2) unit $3'#000+
-  '10028_U_Recompiling $1, checksum changed',' for $2'#000+
+  '10028_','U_Recompiling $1, checksum changed for $2'#000+
   '10029_U_Recompiling $1, source found only'#000+
   '10030_U_Recompiling unit, static lib is older than ppufile'#000+
   '10031_U_Recompiling unit, shared lib is older than ppufile'#000+
-  '10032_U_Recompiling unit, obj and asm are older than ppufile'#000+
-  '10033_U_Rec','ompiling unit, obj is older than asm'#000+
+  '10032_U_Recompiling unit, obj and asm ','are older than ppufile'#000+
+  '10033_U_Recompiling unit, obj is older than asm'#000+
   '10034_U_Parsing interface of $1'#000+
   '10035_U_Parsing implementation of $1'#000+
   '10036_U_Second load for unit $1'#000+
   '10037_U_PPU Check file $1 time $2'#000+
-  '10040_W_Can'#039't recompile unit $1, but found modifed include files'#000+
-  '100','41_U_File $1 is newer than PPU file $2'#000+
+  '10040_W_Can'#039't recompile unit $1, b','ut found modifed include files'+
+  #000+
+  '10041_U_File $1 is newer than PPU file $2'#000+
   '10042_U_Using a unit which was not compiled with correct FPU mode'#000+
   '10043_U_Loading interface units from $1'#000+
   '10044_U_Loading implementation units from $1'#000+
-  '10045_U_Interface CRC changed for unit $1'#000+
-  '10046_U_','Implementation CRC changed for unit $1'#000+
+  '10045_U_Interfac','e CRC changed for unit $1'#000+
+  '10046_U_Implementation CRC changed for unit $1'#000+
   '10047_U_Finished compiling unit $1'#000+
   '10048_U_Add dependency of $1 to $2'#000+
   '10049_U_No reload, is caller: $1'#000+
   '10050_U_No reload, already in second compile: $1'#000+
-  '10051_U_Flag for reload: $1'#000+
-  '10052_U_Forced reload','ing'#000+
+  '10051_U_Flag fo','r reload: $1'#000+
+  '10052_U_Forced reloading'#000+
   '10053_U_Previous state of $1: $2'#000+
   '10054_U_Already compiling $1, setting second compile'#000+
   '10055_U_Loading unit $1'#000+
   '10056_U_Finished loading unit $1'#000+
   '10057_U_Registering new unit $1'#000+
-  '10058_U_Re-resolving unit $1'#000+
-  '10059_U_Skipping re-resolving un','it $1, still loading used units'#000+
+  '10058_U_Re-resolving unit $','1'#000+
+  '10059_U_Skipping re-resolving unit $1, still loading used units'#000+
   '11000_O_$1 [options] <inputfile> [options]'#000+
   '11001_W_Only one source file supported'#000+
   '11002_W_DEF file can be created only for OS/2'#000+
-  '11003_E_nested response files are not supported'#000+
-  '11004_F_No source file name in c','ommand line'#000+
+  '11003_E_nested response files are not supporte','d'#000+
+  '11004_F_No source file name in command line'#000+
   '11005_N_No option inside $1 config file'#000+
   '11006_E_Illegal parameter: $1'#000+
   '11007_H_-? writes help pages'#000+
   '11008_F_Too many config files nested'#000+
   '11009_F_Unable to open file $1'#000+
-  '11010_D_Reading further options from $1'#000+
-  '11011_W_Target is alr','eady set to: $1'#000+
+  '11010_D_Reading further opt','ions from $1'#000+
+  '11011_W_Target is already set to: $1'#000+
   '11012_W_Shared libs not supported on DOS platform, reverting to static'+
   #000+
   '11013_F_too many IF(N)DEFs'#000+
   '11014_F_too many ENDIFs'#000+
   '11015_F_open conditional at the end of the file'#000+
-  '11016_W_Debug information generation is not supported ','by this execut'+
+  '11016_W_Debug inform','ation generation is not supported by this execut'+
   'able'#000+
   '11017_H_Try recompiling with -dGDB'#000+
   '11018_W_You are using the obsolete switch $1'#000+
   '11019_W_You are using the obsolete switch $1, please use $2'#000+
-  '11020_N_Switching assembler to default source writing assembler'#000+
-  '11021_W_Assembler',' output selected "$1" is not compatible with "$2"'#000+
+  '11020_N_Switching assembler to default source w','riting assembler'#000+
+  '11021_W_Assembler output selected "$1" is not compatible with "$2"'#000+
   '11022_W_"$1" assembler use forced'#000+
   '11026_T_Reading options from file $1'#000+
   '11027_T_Reading options from environment $1'#000+
   '11028_D_Handling option "$1"'#000+
-  '11029__*** press enter ***'#000+
-  '11030_H_Start of re','ading config file $1'#000+
+  '11029__*** p','ress enter ***'#000+
+  '11030_H_Start of reading config file $1'#000+
   '11031_H_End of reading config file $1'#000+
   '11032_D_interpreting option "$1"'#000+
   '11036_D_interpreting firstpass option "$1"'#000+
   '11033_D_interpreting file option "$1"'#000+
-  '11034_D_Reading config file "$1"'#000+
-  '11035_D_found source file name "$1','"'#000+
+  '11034_D_Reading config file "$1"'#000,
+  '11035_D_found source file name "$1"'#000+
   '11039_E_Unknown code page'#000+
   '11040_F_Config file $1 is a directory'#000+
   '11023_Free Pascal Compiler version $FPCFULLVERSION [$FPCDATE] for $FPC'+
   'CPU'#010+
   'Copyright (c) 1993-2006 by Florian Klaempfl'#000+
-  '11024_Free Pascal Compiler version $FPCVERSION'#010+
+  '11024_Free Pascal Comp','iler version $FPCVERSION'#010+
   #010+
-  'Compiler',' Date      : $FPCDATE'#010+
+  'Compiler Date      : $FPCDATE'#010+
   'Compiler CPU Target: $FPCCPU'#010+
   #010+
   'Supported targets:'#010+
@@ -791,172 +793,172 @@ const msgtxt : array[0..000176,1..240] of char=(
   'Supported FPU instruction sets:'#010+
   '  $FPUINSTRUCTIONSETS'#010+
   #010+
-  'Supported Optimizations:'#010+
+  'Supported Opti','mizations:'#010+
   '  $OPTIMIZATIONS'#010+
   #010+
-  'This ','program comes under the GNU General Public Licence'#010+
+  'This program comes under the GNU General Public Licence'#010+
   'For more information read COPYING.FPC'#010+
   #010+
   'Report bugs,suggestions etc to:'#010+
   '                 [email protected]'#000+
-  '11025_**0*_put + after a boolean switch option to enable it, - to disa'+
-  'ble it'#010+
-  '**1a','_the compiler doesn'#039't delete the generated assembler file'#010+
+  '11025_**0*_put + after a boolean switch option ','to enable it, - to di'+
+  'sable it'#010+
+  '**1a_the compiler doesn'#039't delete the generated assembler file'#010+
   '**2al_list sourcecode lines in assembler file'#010+
   '**2an_list node info in assembler file'#010+
   '*L2ap_use pipes instead of creating temporary assembler files'#010+
-  '**2ar_list register allocation/rele','ase info in assembler file'#010+
+  '*','*2ar_list register allocation/release info in assembler file'#010+
   '**2at_list temp allocation/release info in assembler file'#010+
   '**1A<x>_output format:'#010+
   '**2Adefault_use default assembler'#010+
   '3*2Aas_assemble using GNU AS'#010+
-  '3*2Anasmcoff_coff (Go32v2) file using Nasm'#010+
-  '3*2Anasmelf_elf32 (Linux) ','file using Nasm'#010+
+  '3*2Anasmcoff_coff (Go32v2) file usi','ng Nasm'#010+
+  '3*2Anasmelf_elf32 (Linux) file using Nasm'#010+
   '3*2Anasmwin32_Win32 object file using Nasm'#010+
   '3*2Anasmwdosx_Win32/WDOSX object file using Nasm'#010+
   '3*2Awasm_obj file using Wasm (Watcom)'#010+
   '3*2Anasmobj_obj file using Nasm'#010+
-  '3*2Amasm_obj file using Masm (Microsoft)'#010+
-  '3*2Atasm_obj file usi','ng Tasm (Borland)'#010+
+  '3*2Amasm_obj file using Masm',' (Microsoft)'#010+
+  '3*2Atasm_obj file using Tasm (Borland)'#010+
   '3*2Aelf_elf32 (Linux) using internal writer'#010+
   '3*2Acoff_coff (Go32v2) using internal writer'#010+
   '3*2Apecoff_pecoff (Win32) using internal writer'#010+
   '4*2Aas_assemble using GNU AS'#010+
-  '6*2Aas_Unix o-file using GNU AS'#010+
-  '6*2Agas_GNU Motorola ass','embler'#010+
+  '6*2Aas_Unix o-file usi','ng GNU AS'#010+
+  '6*2Agas_GNU Motorola assembler'#010+
   '6*2Amit_MIT Syntax (old GAS)'#010+
   '6*2Amot_Standard Motorola assembler'#010+
   'A*2Aas_assemble using GNU AS'#010+
   'P*2Aas_assemble using GNU AS'#010+
   'S*2Aas_assemble using GNU AS'#010+
   '**1b_generate browser info'#010+
-  '**2bl_generate local symbol info'#010+
-  '**1B_build all module','s'#010+
+  '**2bl_generate local',' symbol info'#010+
+  '**1B_build all modules'#010+
   '**1C<x>_code generation options:'#010+
   '**2Cc<x>_set default calling convention to <x>'#010+
   '**2CD_create also dynamic library (not supported)'#010+
   '**2Ce_Compilation with emulated floating point opcodes'#010+
-  '**2Cf<x>_Select fpu instruction set to use, see fpc -','i for possible '+
+  '**2Cf<x>_Select fpu',' instruction set to use, see fpc -i for possible '+
   'values'#010+
   '**2Cg_Generate PIC code'#010+
   '**2Ch<n>_<n> bytes heap (between 1023 and 67107840)'#010+
   '**2Ci_IO-checking'#010+
   '**2Cn_omit linking stage'#010+
   '**2Co_check overflow of integer operations'#010+
-  '**2Cp<x>_select instruction set, see fpc -i for possible',' values'#010+
+  '**2Cp<x>_select instru','ction set, see fpc -i for possible values'#010+
   '**2CP<x>=<y>_ packing settings'#010+
   '**3CPPACKSET=<y>_ <y> set allocation: 0, 1 or DEFAULT or NORMAL, 2, 4 '+
   'and 8'#010+
   '**2Cr_range checking'#010+
   '**2CR_verify object method call validity'#010+
-  '**2Cs<n>_set stack size to <n>'#010+
+  '**2Cs<n>_set stack size to <n','>'#010+
   '**2Ct_stack checking'#010+
-  '**2CX_creat','e also smartlinked library'#010+
+  '**2CX_create also smartlinked library'#010+
   '**1d<x>_defines the symbol <x>'#010+
   '**1D_generate a DEF file'#010+
   '**2Dd<x>_set description to <x>'#010+
   '**2Dv<x>_set DLL version to <x>'#010+
   '*O2Dw_PM application'#010+
   '**1e<x>_set path to executable'#010+
-  '**1E_same as -Cn'#010+
-  '**1F<x>_set file names a','nd paths:'#010+
+  '**1E_sa','me as -Cn'#010+
+  '**1F<x>_set file names and paths:'#010+
   '**2Fa<x>[,y]_for a program load first units <x> and [y] before uses is'+
   ' parsed'#010+
   '**2Fc<x>_sets input codepage to <x>'#010+
   '**2FD<x>_sets the directory where to search for compiler utilities'#010+
-  '**2Fe<x>_redirect error output to <x>'#010+
-  '**2FE<x>_se','t exe/unit output path to <x>'#010+
+  '**2Fe<x>_redire','ct error output to <x>'#010+
+  '**2FE<x>_set exe/unit output path to <x>'#010+
   '**2Fi<x>_adds <x> to include path'#010+
   '**2Fl<x>_adds <x> to library path'#010+
   '**2FL<x>_uses <x> as dynamic linker'#010+
   '**2Fo<x>_adds <x> to object path'#010+
   '**2Fr<x>_load error message file <x>'#010+
-  '**2Fu<x>_adds <x> to unit path'#010+
-  '**2FU','<x>_set unit output path to <x>, overrides -FE'#010+
+  '**','2Fu<x>_adds <x> to unit path'#010+
+  '**2FU<x>_set unit output path to <x>, overrides -FE'#010+
   '*g1g_generate debugger information:'#010+
   '*g2gc_generate checks for pointers'#010+
   '*g2gd_use dbx'#010+
   '*g2gg_use gsym'#010+
   '*g2gh_use heap trace unit (for memory leak debugging)'#010+
-  '*g2gl_use line info unit to show more i','nfo for backtraces'#010+
+  '*g2gl','_use line info unit to show more info for backtraces'#010+
   '*g2gt_trash local variables (to detect uninitialized uses)'#010+
   '*g2gv_generates programs traceable with valgrind'#010+
   '*g2gw_generate dwarf debugging info'#010+
   '**1i_information'#010+
-  '**2iD_return compiler date'#010+
+  '**2iD_return compiler date',#010+
   '**2iV_return compiler version'#010+
-  '**2','iW_return full compiler version'#010+
+  '**2iW_return full compiler version'#010+
   '**2iSO_return compiler OS'#010+
   '**2iSP_return compiler processor'#010+
   '**2iTO_return target OS'#010+
   '**2iTP_return target processor'#010+
   '**1I<x>_adds <x> to include path'#010+
-  '**1k<x>_Pass <x> to the linker'#010+
+  '**1k<x>_Pass <x> to the lin','ker'#010+
   '**1l_write logo'#010+
-  '**1M<x>_set la','nguage mode to <x>'#010+
+  '**1M<x>_set language mode to <x>'#010+
   '**2Mfpc_free pascal dialect (default)'#010+
   '**2Mobjfpc_switch some Delphi 2 extensions on'#010+
   '**2Mdelphi_tries to be Delphi compatible'#010+
   '**2Mtp_tries to be TP/BP 7.0 compatible'#010+
-  '**2Mgpc_tries to be gpc compatible'#010+
-  '**2Mmacpas_tries to b','e compatible to the macintosh pascal dialects'#010+
+  '**2Mgpc_tries to be gp','c compatible'#010+
+  '**2Mmacpas_tries to be compatible to the macintosh pascal dialects'#010+
   '**1n_don'#039't read the default config file'#010+
   '**1N<x>_node tree optimizations'#010+
   '**2Nu_unroll loops'#010+
   '**1o<x>_change the name of the executable produced to <x>'#010+
-  '**1O<x>_optimizations:'#010+
-  '**2O-_disable optimiza','tions'#010+
+  '**1O<x>_opt','imizations:'#010+
+  '**2O-_disable optimizations'#010+
   '**2O1_level 1 optimizations (quick and debugger friendly)'#010+
   '**2O2_level 2 optimizations (-O1 + quick optimizations)'#010+
   '**2O3_level 3 optimizations (-O2 + slow optimizations)'#010+
   '**2Oa<x>=<y>_set alignment'#010+
-  '**2Oo[NO]<x>_enable or disable optimiz','ations, see fpc -i for possibl'+
+  '**2O','o[NO]<x>_enable or disable optimizations, see fpc -i for possibl'+
   'e values'#010+
   '**2Op<x>_set target cpu for optimizing, see fpc -i for possible values'+
   #010+
   '**2Os_generate smaller code'#010+
   '**1pg_generate profile code for gprof (defines FPC_PROFILE)'#010+
-  '**1R<x>_assembler reading style:'#010+
-  '**2Rdefau','lt_use default assembler'#010+
+  '**1R<x>_','assembler reading style:'#010+
+  '**2Rdefault_use default assembler'#010+
   '3*2Ratt_read AT&T style assembler'#010+
   '3*2Rintel_read Intel style assembler'#010+
   '6*2RMOT_read motorola style assembler'#010+
   '**1S<x>_syntax options:'#010+
   '**2S2_same as -Mobjfpc'#010+
-  '**2Sc_supports operators like C (*=,+=,/= and -=)'#010+
-  '**2Sa_inc','lude assertion code.'#010+
+  '**2Sc_supports operators ','like C (*=,+=,/= and -=)'#010+
+  '**2Sa_include assertion code.'#010+
   '**2Sd_same as -Mdelphi'#010+
   '**2Se<x>_error options. <x> is a combination of the following:'#010+
   '**3*_<n> : compiler stops after the <n> errors (default is 1)'#010+
-  '**3*_w : compiler stops also after warnings'#010+
-  '**3*_n : compiler stops als','o after notes'#010+
+  '**3*_w : compiler stops also after wa','rnings'#010+
+  '**3*_n : compiler stops also after notes'#010+
   '**3*_h : compiler stops also after hints'#010+
   '**2Sg_allow LABEL and GOTO'#010+
   '**2Sh_Use ansistrings'#010+
   '**2Si_support C++ styled INLINE'#010+
   '**2Sk_load fpcylix unit'#010+
   '**2SI<x>_set interface style to <x>'#010+
-  '**3SIcom_COM compatible interface (default)'#010,
+  '**3SIcom_C','OM compatible interface (default)'#010+
   '**3SIcorba_CORBA compatible interface'#010+
   '**2Sm_support macros like C (global)'#010+
   '**2So_same as -Mtp'#010+
   '**2Sp_same as -Mgpc'#010+
   '**2Ss_constructor name must be init (destructor must be done)'#010+
-  '**2St_allow static keyword in objects'#010+
-  '**2Sx_enable exception key','words (default in Delphi/ObjFPC modes)'#010+
+  '**2St_allow static keyword in ','objects'#010+
+  '**2Sx_enable exception keywords (default in Delphi/ObjFPC modes)'#010+
   '**1s_don'#039't call assembler and linker'#010+
   '**2sh_Generate script to link on host'#010+
   '**2st_Generate script to link on target'#010+
-  '**2sr_Skip register allocation phase (use with -alr)'#010+
-  '**1T<x>_Target operating system:'#010,
+  '**2sr_Skip register allocation phase (use with -alr)',#010+
+  '**1T<x>_Target operating system:'#010+
   '3*2Temx_OS/2 via EMX (including EMX/RSX extender)'#010+
   '3*2Tfreebsd_FreeBSD'#010+
   '3*2Tgo32v2_Version 2 of DJ Delorie DOS extender'#010+
   '3*2Tlinux_Linux'#010+
   '3*2Tnetbsd_NetBSD'#010+
   '3*2Tnetware_Novell Netware Module (clib)'#010+
-  '3*2Tnetwlibc_Novell Netware Module (libc)'#010+
-  '3*2To','penbsd_OpenBSD'#010+
+  '3*2Tnetwlibc_','Novell Netware Module (libc)'#010+
+  '3*2Topenbsd_OpenBSD'#010+
   '3*2Tos2_OS/2 / eComStation'#010+
   '3*2Tsunos_SunOS/Solaris'#010+
   '3*2Twatcom_Watcom compatible DOS extender'#010+
@@ -964,8 +966,8 @@ const msgtxt : array[0..000176,1..240] of char=(
   '3*2Twin32_Windows 32 Bit'#010+
   '3*2Twince_Windows CE'#010+
   '4*2Tlinux_Linux'#010+
-  '6*2Tamiga_Commodore Amiga'#010+
-  '6*2Tatari_Atari',' ST/STe/TT'#010+
+  '6*2Tami','ga_Commodore Amiga'#010+
+  '6*2Tatari_Atari ST/STe/TT'#010+
   '6*2Tlinux_Linux/m68k'#010+
   '6*2Tmacos_Macintosh m68k (not supported)'#010+
   '6*2Tpalmos_PalmOS'#010+
@@ -973,8 +975,8 @@ const msgtxt : array[0..000176,1..240] of char=(
   'A*2Twince_Windows CE'#010+
   'P*2Tamiga_AmigaOS on PowerPC'#010+
   'P*2Tdarwin_Darwin and MacOS X on PowerPC'#010+
-  'P*2Tlinux_Linux on PowerPC'#010+
-  'P*2Tmacos_MacOS',' (classic) on PowerPC'#010+
+  'P*2Tlinu','x_Linux on PowerPC'#010+
+  'P*2Tmacos_MacOS (classic) on PowerPC'#010+
   'P*2Tmorphos_MorphOS'#010+
   'S*2Tlinux_Linux'#010+
   '**1u<x>_undefines the symbol <x>'#010+
@@ -982,47 +984,48 @@ const msgtxt : array[0..000176,1..240] of char=(
   '**2Un_don'#039't check the unit name'#010+
   '**2Ur_generate release unit files'#010+
   '**2Us_compile a system unit'#010+
-  '**1v<x>_Be verbose. <x> is a combina','tion of the following letters:'#010+
+  '**','1v<x>_Be verbose. <x> is a combination of the following letters:'#010+
   '**2*_e : Show errors (default)       0 : Show nothing (except errors)'#010+
   '**2*_w : Show warnings               u : Show unit info'#010+
-  '**2*_n : Show notes                  t : Show tried/used files'#010+
-  '**2*_h : Show hints ','                 c : Show conditionals'#010+
+  '**2*_n : Show notes                  t : Show tri','ed/used files'#010+
+  '**2*_h : Show hints                  c : Show conditionals'#010+
   '**2*_i : Show general info           d : Show debug info'#010+
   '**2*_l : Show linenumbers            r : Rhide/GCC compatibility mode'#010+
-  '**2*_a : Show everything             x : Executable info (Win32 only)'#010+
-  '**2*','_b : Write file names messages with full path'#010+
+  '**2*_a : Show everything             x :',' Executable info (Win32 only'+
+  ')'#010+
+  '**2*_b : Write file names messages with full path'#010+
   '**2*_v : write fpcdebug.txt with     p : Write tree.log with parse tre'+
   'e'#010+
   '**2*_    lots of debugging info'#010+
   '3*1W<x>_Win32-like target options'#010+
-  '3*2WB_Create a relocatable image'#010+
-  '3*2WB<x>_Set Image base',' to Hexadecimal <x> value'#010+
+  '3*2WB_Create a relocat','able image'#010+
+  '3*2WB<x>_Set Image base to Hexadecimal <x> value'#010+
   '3*2WC_Specify console type application'#010+
   '3*2WD_Use DEFFILE to export functions of DLL or EXE'#010+
   '3*2WF_Specify full-screen type application (OS/2 only)'#010+
-  '3*2WG_Specify graphic type application'#010+
-  '3*2WN_Do not generate relocat','ion code (necessary for debugging)'#010+
+  '3*2WG_Specify graphic type applica','tion'#010+
+  '3*2WN_Do not generate relocation code (necessary for debugging)'#010+
   '3*2WR_Generate relocation code'#010+
   'P*2WC_Specify console type application (MacOS only)'#010+
   'P*2WG_Specify graphic type application (MacOS only)'#010+
-  'P*2WT_Specify tool type application (MPW tool, MacOS only)'#010+
-  '**1X_execut','able options:'#010+
+  'P*2WT_Specify tool type application ','(MPW tool, MacOS only)'#010+
+  '**1X_executable options:'#010+
   '**2Xc_pass --shared to the linker (Unix only)'#010+
   '**2Xd_don'#039't use standard library search path (needed for cross com'+
   'pile)'#010+
   '**2Xe_use external linker'#010+
-  '**2XD_try to link units dynamic          (defines FPC_LINK_DYNAMIC)'#010+
-  '**2Xi_use inte','rnal linker'#010+
+  '**2XD_try to link units dynamic          (define','s FPC_LINK_DYNAMIC)'#010+
+  '**2Xi_use internal linker'#010+
   '**2Xm_generate link map'#010+
   '**2XM<x>_set the name of the '#039'main'#039' program routine (default i'+
   's '#039'main'#039')'#010+
   '**2XP<x>_prepend the binutils names with the prefix <x>'#010+
-  '**2Xr<x>_set library search path to <x> (needed for cross compile)'#010+
-  '**2Xs_str','ip all symbols from executable'#010+
+  '**2Xr<x>_set library search path to <x> (n','eeded for cross compile)'#010+
+  '**2Xs_strip all symbols from executable'#010+
   '**2XS_try to link units static (default) (defines FPC_LINK_STATIC)'#010+
   '**2Xt_link with static libraries (-static is passed to linker)'#010+
-  '**2XX_try to link units smart            (defines FPC_LINK_SMART)'#010+
+  '**2XX_try to link units smart            (def','ines FPC_LINK_SMART)'#010+
   '**1*_'#010+
-  '**1?_sh','ows this help'#010+
+  '**1?_shows this help'#010+
   '**1h_shows this help without waiting'#000
 );

compiler/ncal.pas

@@ -133,6 +133,7 @@ interface
           { checks if there are any parameters which end up at the stack, i.e.
             which have LOC_REFERENCE and set pi_has_stackparameter if this applies }
           procedure check_stack_parameters;
+          property parameters : tnode read left write left;
        private
           AbstractMethodsList : TStringList;
        end;
@@ -172,7 +173,7 @@ interface
        tcallparanodeclass = class of tcallparanode;
 
     function reverseparameters(p: tcallparanode): tcallparanode;
-    function translate_vardisp_call(p1,p2 : tnode;methodname : ansistring) : tnode;
+    function translate_disp_call(selfnode,parametersnode : tnode;methodname : ansistring = '';dispid : longint = 0) : tnode;
 
     var
       ccallnode : tcallnodeclass;
@@ -224,7 +225,7 @@ implementation
       end;
 
 
-    function translate_vardisp_call(p1,p2 : tnode;methodname : ansistring) : tnode;
+    function translate_disp_call(selfnode,parametersnode : tnode;methodname : ansistring = '';dispid : longint = 0) : tnode;
       const
         DISPATCH_METHOD = $1;
         DISPATCH_PROPERTYGET = $2;
@@ -256,6 +257,8 @@ implementation
             }
         end;
         names : ansistring;
+        dispintfinvoke,
+        variantdispatch : boolean;
 
       procedure increase_paramssize;
         begin
@@ -272,6 +275,9 @@ implementation
         end;
 
       begin
+        variantdispatch:=selfnode.resultdef.typ=variantdef;
+        dispintfinvoke:=not(variantdispatch);
+
         result:=internalstatements(statements);
         fillchar(calldesc,sizeof(calldesc),0);
 
@@ -284,7 +290,7 @@ implementation
         { first, count and check parameters }
         // p2:=reverseparameters(tcallparanode(p2));
 
-        para:=tcallparanode(p2);
+        para:=tcallparanode(parametersnode);
         paracount:=0;
         namedparacount:=0;
         paramssize:=0;
@@ -336,8 +342,11 @@ implementation
 
         calldescnode:=cdataconstnode.create;
 
+        if dispintfinvoke then
+          calldescnode.append(dispid,sizeof(dispid));
+
         { build up parameters and description }
-        para:=tcallparanode(p2);
+        para:=tcallparanode(parametersnode);
         currargpos:=0;
         paramssize:=0;
         names := '';
@@ -389,27 +398,42 @@ implementation
 //        printnode(output,statements);
 
         { old argument list skeleton isn't needed anymore }
-        p2.free;
+        parametersnode.free;
 
         calldescnode.append(calldesc,3+calldesc.argcount);
-        methodname:=methodname+#0;
-        calldescnode.append(pointer(methodname)^,length(methodname));
-        calldescnode.append(pointer(names)^,length(names));
 
-        { actual call }
-        vardatadef:=trecorddef(search_system_type('TVARDATA').typedef);
         pvardatadef:=tpointerdef(search_system_type('PVARDATA').typedef);
-
-        addstatement(statements,ccallnode.createintern('fpc_dispinvoke_variant',
-          { parameters are passed always reverted, i.e. the last comes first }
-          ccallparanode.create(caddrnode.create(ctemprefnode.create(params)),
-          ccallparanode.create(caddrnode.create(calldescnode),
-          ccallparanode.create(ctypeconvnode.create_internal(p1,vardatadef),
-          ccallparanode.create(ctypeconvnode.create_internal(caddrnode.create(
-              ctemprefnode.create(result_data)
-            ),pvardatadef),nil)))))
-        );
-
+        if variantdispatch then
+          begin
+            methodname:=methodname+#0;
+            calldescnode.append(pointer(methodname)^,length(methodname));
+            calldescnode.append(pointer(names)^,length(names));
+
+            { actual call }
+            vardatadef:=trecorddef(search_system_type('TVARDATA').typedef);
+
+            addstatement(statements,ccallnode.createintern('fpc_dispinvoke_variant',
+              { parameters are passed always reverted, i.e. the last comes first }
+              ccallparanode.create(caddrnode.create(ctemprefnode.create(params)),
+              ccallparanode.create(caddrnode.create(calldescnode),
+              ccallparanode.create(ctypeconvnode.create_internal(selfnode,vardatadef),
+              ccallparanode.create(ctypeconvnode.create_internal(caddrnode.create(
+                  ctemprefnode.create(result_data)
+                ),pvardatadef),nil)))))
+            );
+          end
+        else
+          begin
+            addstatement(statements,ccallnode.createintern('fpc_dispatch_by_id',
+              { parameters are passed always reverted, i.e. the last comes first }
+              ccallparanode.create(caddrnode.create(ctemprefnode.create(params)),
+              ccallparanode.create(caddrnode.create(calldescnode),
+              ccallparanode.create(ctypeconvnode.create_internal(selfnode,voidpointertype),
+              ccallparanode.create(ctypeconvnode.create_internal(caddrnode.create(
+                  ctemprefnode.create(result_data)
+                ),pvardatadef),nil)))))
+            );
+          end;
         { clean up }
         addstatement(statements,ctempdeletenode.create_normal_temp(result_data));
         addstatement(statements,ctemprefnode.create(result_data));
@@ -1413,8 +1437,8 @@ implementation
         while assigned(stritem) do
          begin
            if assigned(stritem.fpstr) then
-             Message1(sym_h_param_list,stritem.str);
-           stritem := tstringlistitem(stritem.next);
+             Message1(sym_h_abstract_method_list,stritem.str);
+           stritem:=tstringlistitem(stritem.next);
          end;
         if assigned(AbstractMethodsList) then
           AbstractMethodsList.Free;
@@ -1772,6 +1796,8 @@ implementation
         cand_cnt : integer;
         i : longint;
         is_const : boolean;
+        statements : tstatementnode;
+        converted_result_data : ttempcreatenode;
       label
         errorexit;
       begin
@@ -2162,6 +2188,29 @@ implementation
          if assigned(left) then
            tcallparanode(left).insert_typeconv(true);
 
+         { dispinterface methode invoke? }
+         if assigned(methodpointer) and is_dispinterface(methodpointer.resultdef) then
+           begin
+             { if the result is used, we've to insert a call to convert the type to be on the "safe side" }
+             if cnf_return_value_used in callnodeflags then
+               begin
+                 result:=internalstatements(statements);
+                 converted_result_data:=ctempcreatenode.create(procdefinition.returndef,sizeof(procdefinition.returndef),tt_persistent,true);
+                 addstatement(statements,converted_result_data);
+                 addstatement(statements,cassignmentnode.create(ctemprefnode.create(converted_result_data),
+                   ctypeconvnode.create_internal(translate_disp_call(methodpointer,parameters,'',tprocdef(procdefinition).dispid),
+                   procdefinition.returndef)));
+                 addstatement(statements,ctempdeletenode.create_normal_temp(converted_result_data));
+                 addstatement(statements,ctemprefnode.create(converted_result_data));
+               end
+             else
+               result:=translate_disp_call(methodpointer,parameters,'',tprocdef(procdefinition).dispid);
+
+             { don't free reused nodes }
+             methodpointer:=nil;
+             parameters:=nil;
+           end;
+
       errorexit:
          aktcallnode:=oldcallnode;
       end;

compiler/ninl.pas

@@ -1,5 +1,5 @@
 {
-    Copyright (c) 1998-2002 by Florian Klaempfl
+    Copyright (c) 1998-2007 by Florian Klaempfl
 
     Type checking and register allocation for inline nodes
 

compiler/pdecsub.pas

@@ -1249,7 +1249,7 @@ begin
     internalerror(200604301);
   pt:=comp_expr(true);
   if is_constintnode(pt) then
-    tprocdef(pd).extnumber:=tordconstnode(pt).value
+    tprocdef(pd).dispid:=tordconstnode(pt).value
   else
     Message(parser_e_dispid_must_be_ord_const);
   pt.free;
@@ -1627,7 +1627,7 @@ const
       pd_flags : [pd_dispinterface];
       handler  : @pd_dispid;
       pocall   : pocall_none;
-      pooption : [];
+      pooption : [po_dispid];
       mutexclpocall : [pocall_internproc];
       mutexclpotype : [potype_constructor,potype_destructor,potype_operator];
       mutexclpo     : [po_interrupt,po_external,po_inline]

compiler/pexpr.pas

@@ -2053,7 +2053,7 @@ implementation
                                  begin
                                    p2:=parse_paras(false,true,_RKLAMMER);
                                    consume(_RKLAMMER);
-                                   p1:=translate_vardisp_call(p1,p2,dispatchstring);
+                                   p1:=translate_disp_call(p1,p2,dispatchstring);
                                  end
                                else
                                  p2:=nil;

compiler/symconst.pas

@@ -271,7 +271,8 @@ type
     { importing }
     po_has_importdll,
     po_has_importname,
-    po_kylixlocal
+    po_kylixlocal,
+    po_dispid
   );
   tprocoptions=set of tprocoption;
 

compiler/symdef.pas

@@ -413,8 +413,9 @@ interface
        private
           _mangledname : pshortstring;
        public
-          extnumber      : word;
           messageinf : tmessageinf;
+          dispid : longint;
+          extnumber      : word;
 {$ifndef EXTDEBUG}
           { where is this function defined and what were the symbol
             flags, needed here because there
@@ -2883,6 +2884,8 @@ implementation
            messageinf.i:=ppufile.getlongint;
          if (po_msgstr in procoptions) then
            messageinf.str:=stringdup(ppufile.getstring);
+         if (po_dispid in procoptions) then
+           dispid:=ppufile.getlongint;
          { inline stuff }
          if (po_has_inlininginfo in procoptions) then
            begin
@@ -3001,6 +3004,8 @@ implementation
            ppufile.putlongint(messageinf.i);
          if (po_msgstr in procoptions) then
            ppufile.putstring(messageinf.str^);
+         if (po_dispid in procoptions) then
+           ppufile.putlongint(dispid);
          { inline stuff }
          oldintfcrc:=ppufile.do_crc;
          ppufile.do_crc:=false;

rtl/inc/compproc.inc

@@ -313,7 +313,7 @@ procedure fpc_intf_assign(var D: pointer; const S: pointer); compilerproc;
 procedure fpc_intf_assign_by_iid(var D: pointer; const S: pointer; const iid: TGUID); compilerproc;
 function  fpc_intf_as(const S: pointer; const iid: TGUID): IInterface; compilerproc;
 function fpc_class_as_intf(const S: pointer; const iid: TGUID): IInterface; compilerproc;
-procedure fpc_dispatch_by_id(Result: Pointer; const Dispatch: IDispatch;DispDesc: Pointer; Params: Pointer); compilerproc;
+procedure fpc_dispatch_by_id(Result: Pointer; const Dispatch: pointer;DispDesc: Pointer; Params: Pointer); compilerproc;
 {$endif FPC_HAS_FEATURE_CLASSES}
 
 

rtl/inc/objpas.inc

@@ -19,12 +19,12 @@
       end;
 
 
-    procedure fpc_dispatch_by_id(Result: Pointer; const Dispatch: IDispatch;
+    procedure fpc_dispatch_by_id(Result: Pointer; const Dispatch: pointer;
       DispDesc: Pointer; Params: Pointer); compilerproc;
       type
         TDispProc = procedure(res : Pointer; const disp : IDispatch;desc : PDispDesc; params : Pointer);
       begin
-        TDispProc(DispCallByIDProc)(Result,Dispatch,DispDesc,Params);
+        TDispProc(DispCallByIDProc)(Result,IDispatch(Dispatch),DispDesc,Params);
       end;
 
 {****************************************************************************

rtl/inc/varianth.inc

@@ -128,6 +128,7 @@ type
    pdispdesc = ^tdispdesc;
    tdispdesc = packed record
       dispid : longint;
+      { not used by fpc }
       restype : byte;
       calldesc : tcalldesc;
    end;