paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-04-22 19:29:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

bug fix for #39380 in typelib.pas

Browse Source
This commit is contained in:
Frank Freeman 2021-10-30 18:39:53 +00:00 committed by Sven Barth
parent 6dcb2dffab
commit c6723ed2c4
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
packages/winunits-base/src/typelib.pas
View File

@ -1074,7 +1074,7 @@ Procedure TTypeLibImporter.ImportEnums(Const TL : ITypeLib; TICount : Integer);
Var
i,j : integer;
sl ,senum: string;
sl ,senum, stype: string;
BstrName, BstrDocString, BstrHelpFile : WideString;
dwHelpContext: DWORD;
TI:ITypeInfo;
@ -1099,14 +1099,18 @@ begin
bDuplicate:=false;
if not MakeValidId(BstrName,senum) then
AddToHeader('// Warning: renamed enum type ''%s'' to ''%s''',[BstrName,senum],True);
if (InterfaceSection.IndexOf(Format(' %s =LongWord;',[senum]))<>-1) then // duplicate enums fe. AXVCL.dll 1.0
if TA^.cbSizeInstance > 2 then
stype:='Integer' // https://docs.microsoft.com/en-us/windows/win32/midl/enum
else
stype:='Word';
if (InterfaceSection.IndexOf(Format(' %s = %s;',[senum,stype]))<>-1) then // duplicate enums fe. AXVCL.dll 1.0
begin
senum:=senum+IntToStr(i); // index is unique in this typelib
AddToHeader('// Warning: duplicate enum ''%s''. Renamed to ''%s''. consts appended with %d',[BstrName,senum,i]);
bDuplicate:=true;
end;
AddToInterface('Type');
AddToInterface(' %s =LongWord;',[senum]);
AddToInterface(' %s = %s;',[senum,stype]);
FTypes.Add(senum);
FDeclared.Add(senum);
AddToInterface('Const');