documentor, ecere: Fix for documentor closing when being debugged

[sdk] / ecere / src / sys / File.ec

diff --git a/ecere/src/sys/File.ec b/ecere/src/sys/File.ec
index c0c6e9c..68030c6 100644 (file)
--- a/ecere/src/sys/File.ec
+++ b/ecere/src/sys/File.ec
@@ -4,6 +4,7 @@ default:
 #define set _set
 #define uint _uint
 #define File _File
+#define strlen _strlen
 #undef __BLOCKS__
 #include <stdio.h>
 #include <stdarg.h>
@@ -40,7 +41,9 @@ default:
 
 #if defined(__WIN32__)
 #define WIN32_LEAN_AND_MEAN
+#define String String_
 #include <windows.h>
+#undef String
 #include <io.h>
 
 BOOL WINAPI GetVolumePathName(LPCTSTR lpszFileName,LPTSTR lpszVolumePathName,DWORD cchBufferLength);
@@ -70,6 +73,7 @@ private:
 #undef set
 #undef uint
 #undef File
+#undef strlen
 
 import "System"
 
@@ -82,6 +86,9 @@ import "dataTypes"
 // IMPLEMENTATION OF THESE IS IN _File.c
 default:
 
+FILE *eC_stdin(void);
+FILE *eC_stdout(void);
+
 uint FILE_GetSize(FILE * input);
 bool FILE_Lock(FILE * input, FILE * output, FileLock type, uint64 start, uint64 length, bool wait);
 void FILE_set_buffered(FILE * input, FILE * output, bool value);
@@ -284,7 +291,7 @@ public class File : IOChannel
       Window editData = class::OnEdit(dataBox, obsolete, x + 24, y, w - 48, h, userData);
       Button load
       { 
-         dataBox, inactive = true, text = $"Imp", hotKey = f2,
+         dataBox, inactive = true, text = $"Import"."Imp", hotKey = f2,
          position = { Max(x + 24, x + w - 24), y }, size = { 24, h };
 
          bool DataBox::NotifyClicked(Button button, int x, int y, Modifiers mods)
@@ -308,7 +315,7 @@ public class File : IOChannel
       };
       Button save
       { 
-         dataBox, inactive = true, text = $"Exp", hotKey = f2,
+         dataBox, inactive = true, text = $"Export"."Exp", hotKey = f2,
          position = { Max(x + 24, x + w - 48), y }, size = { 24, h };
 
          bool DataBox::NotifyClicked(Button button, int x, int y, Modifiers mods)
@@ -463,7 +470,7 @@ public:
 
    virtual uint Tell(void)
    {
-      return input ? ftell(input) : ftell(output);
+      return (uint)(input ? ftell(input) : ftell(output));
    }
 
    virtual int Read(void * buffer, uint size, uint count)
@@ -571,9 +578,9 @@ public:
       {
          char text[MAX_F_STRING];
          va_list args;
-         text[sizeof(text)-1] = 0;
          va_start(args, format);
          vsnprintf(text, sizeof(text), format, args);
+         text[sizeof(text)-1] = 0;
          if(Puts(text))
             result = strlen(text);
          va_end(args);
@@ -696,7 +703,7 @@ public:
    {
       char string[32];
       GetString(string, sizeof(string));
-      return strtoul(string, null, 16);
+      return (uint)strtoul(string, null, 16);
    }
 
    float GetFloat(void)
@@ -814,10 +821,28 @@ public:
    }
 }
 
+#if defined(__WIN32__)
+default extern intptr_t stdinHandle;
+default extern intptr_t stdoutHandle;
+#endif
+
 public class ConsoleFile : File
 {
-   input = stdin;
-   output = stdout;
+   input = eC_stdin();
+   output = eC_stdout();
+
+#if defined(__WIN32__)
+   void CloseInput()
+   {
+      CloseHandle((HANDLE)stdinHandle);
+   }
+   /*
+   void CloseOutput()
+   {
+      CloseHandle((HANDLE)stdoutHandle);
+   }*/
+#endif
+
    ~ConsoleFile()
    {
       input = null;
@@ -1388,7 +1413,7 @@ static FileDesc FileFind(char * path, char * extensions)
                if(!stat(file.path, &s))
                {
                   file.stats.attribs = (s.st_mode&S_IFDIR) ? FileAttribs { isDirectory = true } : FileAttribs { isFile = true };
-                  file.stats.size = s.st_size;
+                  file.stats.size = (FileSize)s.st_size;
                   file.stats.accessed = s.st_atime;
                   file.stats.modified = s.st_mtime;
                   file.stats.created = s.st_ctime;
@@ -1664,7 +1689,7 @@ private class FileDesc : struct
                {
                   stats.attribs = FileAttribs { };
                   stats.attribs = (s.st_mode&S_IFDIR) ? FileAttribs { isDirectory = true } : FileAttribs { isFile = true };
-                  stats.size = s.st_size;
+                  stats.size = (FileSize)s.st_size;
                   stats.accessed = s.st_atime;
                   stats.modified = s.st_mtime;
                   stats.created = s.st_ctime;