From 807fc6e948edb9b5ecd03b513f7ffdc14d46f0e7 Mon Sep 17 00:00:00 2001
From: florian <florian@freepascal.org>
Date: Mon, 17 Apr 2006 08:50:59 +0000
Subject: [PATCH] * basic file io fixed for win64

git-svn-id: trunk@3241 -
---
 rtl/win/sysfile.inc | 22 ++++++++++++----------
 rtl/win/sysos.inc   |  4 ++--
 rtl/win64/system.pp |  2 +-
 3 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/rtl/win/sysfile.inc b/rtl/win/sysfile.inc
index a934563b7c..de9b20b6df 100644
--- a/rtl/win/sysfile.inc
+++ b/rtl/win/sysfile.inc
@@ -209,7 +209,7 @@ Var
   security : TSecurityAttributes;
 begin
   AllowSlash(p);
-{ close first if opened }
+  { close first if opened }
   if ((flags and $10000)=0) then
    begin
      case filerec(f).mode of
@@ -223,9 +223,9 @@ begin
       end;
      end;
    end;
-{ reset file handle }
+  { reset file handle }
   filerec(f).handle:=UnusedHandle;
-{ convert filesharing }
+  { convert filesharing }
   shflags:=0;
   if ((filemode and fmshareExclusive) = fmshareExclusive) then
     { no sharing }
@@ -238,7 +238,7 @@ begin
   else
     if ((filemode and fmshareDenyNone) = fmshareDenyNone) then
       shflags := file_Share_Read + file_Share_Write;
-{ convert filemode to filerec modes }
+  { convert filemode to filerec modes }
   case (flags and 3) of
    0 : begin
          filerec(f).mode:=fminput;
@@ -253,13 +253,13 @@ begin
          oflags:=longint(GENERIC_WRITE or GENERIC_READ);
        end;
   end;
-{ create it ? }
+  { create it ? }
   if (flags and $1000)<>0 then
-   cd:=CREATE_ALWAYS
-{ or Append/Open ? }
+    cd:=CREATE_ALWAYS
+  { or Append/Open ? }
   else
     cd:=OPEN_EXISTING;
-{ empty name is special }
+  { empty name is special }
   if p[0]=#0 then
    begin
      case FileRec(f).mode of
@@ -280,7 +280,8 @@ begin
   security.bInheritHandle:=true;
   security.lpSecurityDescriptor:=nil;
   filerec(f).handle:=CreateFile(p,oflags,shflags,@security,cd,FILE_ATTRIBUTE_NORMAL,0);
-{ append mode }
+
+  { append mode }
   if ((flags and $100)<>0) and
      (filerec(f).handle<>0) and
      (filerec(f).handle<>UnusedHandle) then
@@ -288,7 +289,8 @@ begin
      do_seekend(filerec(f).handle);
      filerec(f).mode:=fmoutput; {fool fmappend}
    end;
-{ get errors }
+
+  { get errors }
   { handle -1 is returned sometimes !! (PM) }
   if (filerec(f).handle=0) or (filerec(f).handle=UnusedHandle) then
     begin
diff --git a/rtl/win/sysos.inc b/rtl/win/sysos.inc
index 5e623a4e9e..8833fd12bb 100644
--- a/rtl/win/sysos.inc
+++ b/rtl/win/sysos.inc
@@ -132,7 +132,7 @@ type
    PLPWSTR = ^LPWSTR;
 
   PSecurityAttributes = ^TSecurityAttributes;
-  TSecurityAttributes = packed record
+  TSecurityAttributes = record
     nLength : DWORD;
     lpSecurityDescriptor : Pointer;
     bInheritHandle : BOOL;
@@ -235,7 +235,7 @@ threadvar
      stdcall;external KernelDLL name 'MoveFileA';
    function CreateFile(lpFileName:pchar; dwDesiredAccess:DWORD; dwShareMode:DWORD;
                        lpSecurityAttributes:PSECURITYATTRIBUTES; dwCreationDisposition:DWORD;
-                       dwFlagsAndAttributes:DWORD; hTemplateFile:DWORD):longint;
+                       dwFlagsAndAttributes:DWORD; hTemplateFile:DWORD):THandle;
      stdcall;external KernelDLL name 'CreateFileA';
    function GetProcAddress(hModule:THandle; lpProcName:pchar):pointer; stdcall; external KernelDLL name 'GetProcAddress';
 
diff --git a/rtl/win64/system.pp b/rtl/win64/system.pp
index 1354d8ef7b..32d9d9d650 100644
--- a/rtl/win64/system.pp
+++ b/rtl/win64/system.pp
@@ -42,7 +42,7 @@ type
 
 const
 { Default filehandles }
-  UnusedHandle    : THandle = -1;
+  UnusedHandle    : THandle = THandle(-1);
   StdInputHandle  : THandle = 0;
   StdOutputHandle : THandle = 0;
   StdErrorHandle  : THandle = 0;