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

* Reverted STD_xxx_HANDLE constants back to DWORD type (issue introduced in r15824). These are not handles, and are 32-bit even in Win64. See http://msdn.microsoft.com/en-us/library/ms683231.aspx

Browse Source 
+ added a test to help detecting this happening again.

git-svn-id: trunk@17333 -
This commit is contained in:
sergei 2011-04-17 22:27:56 +00:00
parent d3e0105ba8
commit 62e11742bf
3 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitattributes vendored
View File

@ -10204,6 +10204,7 @@ tests/test/tstatic2.pp svneol=native#text/pascal
tests/test/tstatic3.pp svneol=native#text/pascal
tests/test/tstatic4.pp svneol=native#text/pascal
tests/test/tstatic5.pp svneol=native#text/pascal
tests/test/tstdhandle.pp svneol=native#text/plain
tests/test/tstprocv.pp svneol=native#text/plain
tests/test/tstring1.pp svneol=native#text/plain
tests/test/tstring10.pp svneol=native#text/plain

7
rtl/win/wininc/defines.inc
View File

@ -1696,9 +1696,10 @@
SIF_RANGE = 1;
SIF_DISABLENOSCROLL = 8;
{ GetStdHandle }
STD_INPUT_HANDLE = HANDLE(-10);
STD_OUTPUT_HANDLE = HANDLE(-11);
STD_ERROR_HANDLE = HANDLE(-12);
{ !!! The 3 following constants are NOT handles. They remain 32-bit on Win64. }
STD_INPUT_HANDLE = DWORD(-10);
STD_OUTPUT_HANDLE = DWORD(-11);
STD_ERROR_HANDLE = DWORD(-12);

12
tests/test/tstdhandle.pp Normal file
View File

@ -0,0 +1,12 @@
{ %TARGET=win64 }
uses
Windows;
{ The STD_xxx_HANDLE constants remain 32-bit in 64-bit Windows. }
{$warnings off} // unreachable code warnings when things are correct.
begin
if STD_INPUT_HANDLE > High(DWORD) then Halt(1);
if STD_OUTPUT_HANDLE > High(DWORD) then Halt(2);
if STD_ERROR_HANDLE > High(DWORD) then Halt(3);
Halt(0);
end.