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

* change image_* macros to unsigned, half of bug #27674

Browse Source 
git-svn-id: trunk@30256 -
This commit is contained in:
marco 2015-03-17 22:30:31 +00:00
parent 09acd9b1ab
commit 882d42eb86
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -594,16 +594,16 @@
} }
function IMAGE_ORDINAL64(Ordinal : int64) : int64; function IMAGE_ORDINAL64(Ordinal : uint64) : uint64; inline;
function IMAGE_ORDINAL32(Ordinal : longint) : longint; function IMAGE_ORDINAL32(Ordinal : cardinal) : cardinal;inline;
function IMAGE_SNAP_BY_ORDINAL64(Ordinal : int64) : boolean; function IMAGE_SNAP_BY_ORDINAL64(Ordinal : uint64) : boolean; inline;
function IMAGE_SNAP_BY_ORDINAL32(Ordinal : longint) : boolean; function IMAGE_SNAP_BY_ORDINAL32(Ordinal : cardinal) : boolean; inline;
{$ifdef WIN64} {$ifdef WIN64}
function IMAGE_ORDINAL(Ordinal : int64) : int64; function IMAGE_ORDINAL(Ordinal : uint64) : uint64; inline;
function IMAGE_SNAP_BY_ORDINAL(Ordinal : int64) : boolean; function IMAGE_SNAP_BY_ORDINAL(Ordinal : uint64) : boolean; inline;
{$else} {$else}
function IMAGE_ORDINAL(Ordinal : longint) : longint; function IMAGE_ORDINAL(Ordinal : cardinal) : cardinal; inline;
function IMAGE_SNAP_BY_ORDINAL(Ordinal : longint) : boolean; function IMAGE_SNAP_BY_ORDINAL(Ordinal : cardinal) : boolean; inline;
{$endif} {$endif}
@ -1072,46 +1072,46 @@ type
PALETTERGB:=$02000000 or (RGB(r,g,b)); PALETTERGB:=$02000000 or (RGB(r,g,b));
end; end;
function IMAGE_ORDINAL64(Ordinal : int64) : int64; function IMAGE_ORDINAL64(Ordinal : uint64) : uint64;
begin begin
IMAGE_ORDINAL64:=Ordinal and $ffff; IMAGE_ORDINAL64:=Ordinal and $ffff;
end; end;
function IMAGE_ORDINAL32(Ordinal : longint) : longint; function IMAGE_ORDINAL32(Ordinal : cardinal) : cardinal;
begin begin
IMAGE_ORDINAL32:=Ordinal and $ffff; IMAGE_ORDINAL32:=Ordinal and $ffff;
end; end;
function IMAGE_SNAP_BY_ORDINAL64(Ordinal : int64) : boolean; function IMAGE_SNAP_BY_ORDINAL64(Ordinal : uint64) : boolean;
begin begin
IMAGE_SNAP_BY_ORDINAL64:=(Ordinal and IMAGE_ORDINAL_FLAG64)<>0; IMAGE_SNAP_BY_ORDINAL64:=(Ordinal and IMAGE_ORDINAL_FLAG64)<>0;
end; end;
function IMAGE_SNAP_BY_ORDINAL32(Ordinal : longint) : boolean; function IMAGE_SNAP_BY_ORDINAL32(Ordinal : cardinal) : boolean;
begin begin
IMAGE_SNAP_BY_ORDINAL32:=(Ordinal and IMAGE_ORDINAL_FLAG32)<>0; IMAGE_SNAP_BY_ORDINAL32:=(Ordinal and IMAGE_ORDINAL_FLAG32)<>0;
end; end;
{$ifdef win64} {$ifdef win64}
function IMAGE_ORDINAL(Ordinal : int64) : int64; function IMAGE_ORDINAL(Ordinal : uint64) : uint64;
begin begin
IMAGE_ORDINAL:=IMAGE_ORDINAL64(Ordinal); IMAGE_ORDINAL:=IMAGE_ORDINAL64(Ordinal);
end; end;
function IMAGE_SNAP_BY_ORDINAL(Ordinal : int64) : boolean; function IMAGE_SNAP_BY_ORDINAL(Ordinal : uint64) : boolean;
begin begin
IMAGE_SNAP_BY_ORDINAL:=IMAGE_SNAP_BY_ORDINAL64(Ordinal); IMAGE_SNAP_BY_ORDINAL:=IMAGE_SNAP_BY_ORDINAL64(Ordinal);
end; end;
{$else} {$else}
function IMAGE_ORDINAL(Ordinal : longint) : longint; function IMAGE_ORDINAL(Ordinal : cardinal) : cardinal;
begin begin
IMAGE_ORDINAL:=IMAGE_ORDINAL32(Ordinal); IMAGE_ORDINAL:=IMAGE_ORDINAL32(Ordinal);
end; end;
function IMAGE_SNAP_BY_ORDINAL(Ordinal : longint) : boolean; function IMAGE_SNAP_BY_ORDINAL(Ordinal : cardinal) : boolean;
begin begin
IMAGE_SNAP_BY_ORDINAL:=IMAGE_SNAP_BY_ORDINAL32(Ordinal); IMAGE_SNAP_BY_ORDINAL:=IMAGE_SNAP_BY_ORDINAL32(Ordinal);
end; end;