mirror of
https://gitlab.com/freepascal.org/fpc/source.git
synced 2025-08-14 10:09:20 +02:00
* objpas.integer=smallint fixes in several tests
git-svn-id: trunk@27054 -
This commit is contained in:
parent
ad1cc67eb2
commit
0621dd523a
@ -14,7 +14,7 @@ type
|
|||||||
function GetP(Index : integer) : Pointer;
|
function GetP(Index : integer) : Pointer;
|
||||||
constructor create;
|
constructor create;
|
||||||
public
|
public
|
||||||
property P[Index: LongInt]: Pointer read GetP;
|
property P[Index: Integer]: Pointer read GetP;
|
||||||
end;
|
end;
|
||||||
|
|
||||||
var a : TRgbArray;
|
var a : TRgbArray;
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
type
|
type
|
||||||
TMyClass = class
|
TMyClass = class
|
||||||
i, i2 :Integer;
|
i, i2 :LongInt;
|
||||||
end;
|
end;
|
||||||
|
|
||||||
begin
|
begin
|
||||||
|
@ -11,8 +11,8 @@ type
|
|||||||
|
|
||||||
timpclass = class(tobject,itest)
|
timpclass = class(tobject,itest)
|
||||||
protected
|
protected
|
||||||
function _addref: integer; virtual; {$IFNDEF WINDOWS}cdecl{$ELSE}stdcall{$ENDIF};
|
function _addref: longint; virtual; {$IFNDEF WINDOWS}cdecl{$ELSE}stdcall{$ENDIF};
|
||||||
function _release: integer; virtual; {$IFNDEF WINDOWS}cdecl{$ELSE}stdcall{$ENDIF};
|
function _release: longint; virtual; {$IFNDEF WINDOWS}cdecl{$ELSE}stdcall{$ENDIF};
|
||||||
function QueryInterface(constref IID: TGUID; out Obj): HResult; {$IFNDEF WINDOWS}cdecl{$ELSE}stdcall{$ENDIF};
|
function QueryInterface(constref IID: TGUID; out Obj): HResult; {$IFNDEF WINDOWS}cdecl{$ELSE}stdcall{$ENDIF};
|
||||||
public
|
public
|
||||||
function test: longint;
|
function test: longint;
|
||||||
@ -35,12 +35,12 @@ begin
|
|||||||
result:=123456;
|
result:=123456;
|
||||||
end;
|
end;
|
||||||
|
|
||||||
function timpclass._addref: integer; {$IFNDEF WINDOWS}cdecl{$ELSE}stdcall{$ENDIF};
|
function timpclass._addref: longint; {$IFNDEF WINDOWS}cdecl{$ELSE}stdcall{$ENDIF};
|
||||||
begin
|
begin
|
||||||
result:= -1;
|
result:= -1;
|
||||||
end;
|
end;
|
||||||
|
|
||||||
function timpclass._release: integer; {$IFNDEF WINDOWS}cdecl{$ELSE}stdcall{$ENDIF};
|
function timpclass._release: longint; {$IFNDEF WINDOWS}cdecl{$ELSE}stdcall{$ENDIF};
|
||||||
begin
|
begin
|
||||||
result:= -1;
|
result:= -1;
|
||||||
end;
|
end;
|
||||||
@ -51,7 +51,7 @@ begin
|
|||||||
Result:=0
|
Result:=0
|
||||||
end
|
end
|
||||||
else begin
|
else begin
|
||||||
result:= integer(e_nointerface);
|
result:= HResult(e_nointerface);
|
||||||
end;
|
end;
|
||||||
end;
|
end;
|
||||||
|
|
||||||
|
@ -8,7 +8,7 @@ type
|
|||||||
public
|
public
|
||||||
constructor Create(Val: _T);
|
constructor Create(Val: _T);
|
||||||
|
|
||||||
function Bug: Integer;
|
function Bug: LongInt;
|
||||||
end;
|
end;
|
||||||
|
|
||||||
{--- TGen.Create ---}
|
{--- TGen.Create ---}
|
||||||
@ -19,7 +19,7 @@ begin
|
|||||||
end;
|
end;
|
||||||
|
|
||||||
{--- TGen.Bug ---}
|
{--- TGen.Bug ---}
|
||||||
function TGen.Bug : Integer;
|
function TGen.Bug : LongInt;
|
||||||
begin
|
begin
|
||||||
Result := 100000 div SizeOf(_T); // *** DIVISION BY ZERO ***
|
Result := 100000 div SizeOf(_T); // *** DIVISION BY ZERO ***
|
||||||
|
|
||||||
|
@ -16,25 +16,25 @@ type
|
|||||||
|
|
||||||
Twii= class(TObject, ii)
|
Twii= class(TObject, ii)
|
||||||
s: string;
|
s: string;
|
||||||
function QueryInterface(constref IID: TGUID; out Obj): Integer; {$IFNDEF WINDOWS}cdecl{$ELSE}stdcall{$ENDIF};
|
function QueryInterface(constref IID: TGUID; out Obj): Longint; {$IFNDEF WINDOWS}cdecl{$ELSE}stdcall{$ENDIF};
|
||||||
function _AddRef: Integer; {$IFNDEF WINDOWS}cdecl{$ELSE}stdcall{$ENDIF};
|
function _AddRef: Longint; {$IFNDEF WINDOWS}cdecl{$ELSE}stdcall{$ENDIF};
|
||||||
function _Release: Integer; {$IFNDEF WINDOWS}cdecl{$ELSE}stdcall{$ENDIF};
|
function _Release: Longint; {$IFNDEF WINDOWS}cdecl{$ELSE}stdcall{$ENDIF};
|
||||||
|
|
||||||
procedure Show;stdcall;
|
procedure Show;stdcall;
|
||||||
end;
|
end;
|
||||||
|
|
||||||
{________doomy interfaces______}
|
{________doomy interfaces______}
|
||||||
function Twii.QueryInterface(constref IID: TGUID; out Obj): Integer; {$IFNDEF WINDOWS}cdecl{$ELSE}stdcall{$ENDIF};
|
function Twii.QueryInterface(constref IID: TGUID; out Obj): Longint; {$IFNDEF WINDOWS}cdecl{$ELSE}stdcall{$ENDIF};
|
||||||
begin
|
begin
|
||||||
result:= -1;
|
result:= -1;
|
||||||
end;
|
end;
|
||||||
|
|
||||||
function Twii._AddRef: Integer; {$IFNDEF WINDOWS}cdecl{$ELSE}stdcall{$ENDIF};
|
function Twii._AddRef: Longint; {$IFNDEF WINDOWS}cdecl{$ELSE}stdcall{$ENDIF};
|
||||||
begin
|
begin
|
||||||
result:= -1;
|
result:= -1;
|
||||||
end;
|
end;
|
||||||
|
|
||||||
function Twii._Release: Integer; {$IFNDEF WINDOWS}cdecl{$ELSE}stdcall{$ENDIF};
|
function Twii._Release: Longint; {$IFNDEF WINDOWS}cdecl{$ELSE}stdcall{$ENDIF};
|
||||||
begin
|
begin
|
||||||
result:= -1;
|
result:= -1;
|
||||||
end;
|
end;
|
||||||
|
@ -6,7 +6,7 @@ program Test1;
|
|||||||
{$mode delphi}
|
{$mode delphi}
|
||||||
|
|
||||||
var
|
var
|
||||||
AnInt : Integer;
|
AnInt : Longint;
|
||||||
|
|
||||||
begin
|
begin
|
||||||
|
|
||||||
|
@ -17,7 +17,7 @@ type
|
|||||||
locateoptionsty = set of locateoptionty;
|
locateoptionsty = set of locateoptionty;
|
||||||
|
|
||||||
imselocate = interface(inullinterface)['{2680958F-F954-DA11-9015-00C0CA1308FF}']
|
imselocate = interface(inullinterface)['{2680958F-F954-DA11-9015-00C0CA1308FF}']
|
||||||
function locate(const key: integer; const field: tfield;
|
function locate(const key: longint; const field: tfield;
|
||||||
const options: locateoptionsty = []): locateresultty;
|
const options: locateoptionsty = []): locateresultty;
|
||||||
end;
|
end;
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user