Anubis / Anubis

Commit 7110c712a9b8b9211e6e1b5242e879f4c0497a02

Authored by David René
1 parent 9263e56f

[*] Now use real std in/out/err file descriptor. No need to use Alloc console anymore

Showing 5 changed files with 19 additions and 8 deletions   Show diff stats
Inline Side-by-side
anubis_dev/vm/doc/history.txt
  Show/Hide comments   View file @7110c71
... ... @@ -7,6 +7,11 @@
7 7 ************************************************
8 8  
9 9 *********************************
  10 +* Version 1.204 (17/01/2005) DR *
  11 +*********************************
  12 +[*] Now use real std in/out/err file descriptor. No need to use Alloc console anymore
  13 +
  14 +*********************************
10 15 * Version 1.203 (16/01/2005) DR *
11 16 *********************************
12 17 [*] Replace some fprintf by LOGINFO or LOGERROR
... ...
anubis_dev/vm/proj/win32/vm.dsp
  Show/Hide comments   View file @7110c71
... ... @@ -53,7 +53,8 @@ BSC32=bscmake.exe
53 53 # ADD BSC32 /nologo
54 54 LINK32=link.exe
55 55 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
56   -# ADD LINK32 libjpeg.lib ssleay32.lib libeay32.lib ws2_32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386 /out:"Release/anbexec.exe" /libpath:"../../../../third_dev/openssl/lib/win32" /libpath:"../../../../third_dev/libjpeg/lib/win32"
  56 +# ADD LINK32 libjpeg.lib ssleay32.lib libeay32.lib ws2_32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /out:"Release/anbexec.exe" /libpath:"../../../../third_dev/openssl/lib/win32" /libpath:"../../../../third_dev/libjpeg/lib/win32"
  57 +# SUBTRACT LINK32 /pdb:none
57 58 # Begin Special Build Tool
58 59 SOURCE="$(InputPath)"
59 60 PostBuild_Desc=copy to bin
... ... @@ -85,7 +86,8 @@ BSC32=bscmake.exe
85 86 # ADD BSC32 /nologo
86 87 LINK32=link.exe
87 88 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
88   -# ADD LINK32 libjpeg.lib ssleay32.lib libeay32.lib ws2_32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /out:"Debug/anbexecd.exe" /pdbtype:sept /libpath:"../../../../third_dev/openssl/lib/win32" /libpath:"../../../../third_dev/libjpeg/lib/win32"
  89 +# ADD LINK32 libjpeg.lib ssleay32.lib libeay32.lib ws2_32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /out:"Debug/anbexecd.exe" /pdbtype:sept /libpath:"../../../../third_dev/openssl/lib/win32" /libpath:"../../../../third_dev/libjpeg/lib/win32"
  90 +# SUBTRACT LINK32 /pdb:none
89 91 # Begin Special Build Tool
90 92 SOURCE="$(InputPath)"
91 93 PostBuild_Desc=copy to bin
... ...
anubis_dev/vm/src/anbexec.c
  Show/Hide comments   View file @7110c71
... ... @@ -816,7 +816,7 @@ void load_configuration_file(void)
816 816  
817 817  
818 818 /* 'main' function, executing a module */
819   -#ifdef WIN32
  819 +#ifdef WIN32_OLD
820 820 int argc;
821 821 char **argv;
822 822 char *args;
... ... @@ -840,7 +840,7 @@ int main(int argc, char **argv)
840 840 //here we make all host OS dependencies init, before entering in kernel land
841 841 kernelInit();
842 842  
843   -#ifdef WIN32
  843 +#ifdef WIN32_OLD
844 844 lpCmdLine = GetCommandLine();
845 845 make_command_line(lpCmdLine);
846 846 #endif
... ... @@ -1125,7 +1125,7 @@ int main(int argc, char **argv)
1125 1125 return 0;
1126 1126 }
1127 1127  
1128   -#ifdef WIN32
  1128 +#ifdef WIN32_OLD
1129 1129 void make_command_line(LPSTR cmdLine)
1130 1130 {
1131 1131 // int n = 0;
... ...
anubis_dev/vm/src/debug_log.c
  Show/Hide comments   View file @7110c71
... ... @@ -42,12 +42,12 @@ void LogError(const char *format, ...)
42 42 void Log(FILE * output, char *logString)
43 43 {
44 44 //Ecris sur la console fenetre
45   -#if defined (__BEOS__) || (_LINUX_)
  45 +#if defined (__BEOS__) || (_LINUX_) || (WIN32)
46 46 fprintf(output, "%s", logString);
47 47 if(output == stderr)
48 48 fflush(output);
49 49 #endif
50   -#ifdef WIN32
  50 +#ifdef WIN32_OLD
51 51 {
52 52 DWORD result;
53 53 static char new_msg[512];
... ...
anubis_dev/vm/src/syscalls.c
  Show/Hide comments   View file @7110c71
... ... @@ -670,6 +670,8 @@ switch (get16(1))
670 670  
671 671 case sc_anb_stdout:
672 672 {
  673 + FILE * tmpFd;
  674 +
673 675 if ((R = allocate_data_segment(conn_word_size,allocator)) == 0)
674 676 {
675 677 machine->status = need_more_memory;
... ... @@ -677,7 +679,9 @@ switch (get16(1))
677 679 }
678 680 *(((U8 *)R)+4) = (U8)conn_file;
679 681 *(((U8 *)R)+5) = (U8)conn_write;
680   - *((U32 *)(((U8 *)R)+8)) = (U32)stdout;
  682 +
  683 + tmpFd = (FILE*)(stdout);
  684 + *((U32 *)(((U8 *)R)+8)) = (U32)(tmpFd);
681 685 }
682 686 IP += 1+2;
683 687 goto do_computing;
... ...