paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-04-16 17:19:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

* patch from Yury Sidorov to fix WinCE console I/O

Browse Source 
git-svn-id: trunk@850 -
This commit is contained in:
florian 2005-08-13 16:34:44 +00:00
parent 1a8051f993
commit 84fe2c604d
2 changed files with 35 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
compiler/systems/t_win.pas
View File

@ -1037,8 +1037,12 @@ begin
AsBinStr:=FindUtil(utilsprefix+'as');
if RelocSection then
RelocStr:='--base-file base.$$$';
if target_info.system in [system_arm_wince,system_i386_wince] then
AppTypeStr:='--subsystem wince'
if target_info.system in [system_arm_wince,system_i386_wince] then
begin
AppTypeStr:='--subsystem wince';
if apptype <> app_gui then
AppTypeStr:=AppTypeStr + ' --entry=mainCRTStartup';
end
else
if apptype=app_gui then
AppTypeStr:='--subsystem windows';

52
rtl/wince/system.pp
View File

@ -301,18 +301,15 @@ var
function GetCommandFile:pchar;
var
buf: PWideChar;
buf: array[0..MaxPathLen] of WideChar;
begin
if ModuleName[0] = #0 then begin
GetMem(buf, SizeOf(ModuleName)*2);
GetModuleFileName(0,buf,SizeOf(ModuleName)*2);
GetModuleFileName(0, @buf, SizeOf(buf));
WideToAnsiBuf(buf, -1, @ModuleName, SizeOf(ModuleName));
FreeMem(buf);
end;
GetCommandFile:=@ModuleName;
end;
procedure setup_arguments;
var
arglen,
@ -546,13 +543,11 @@ begin
This crashes Win95 at least PM }
if IsLibrary then
ExitDLL(ExitCode);
if not IsConsole then
begin
Close(stderr);
Close(stdout);
{ what about Input and Output ?? PM }
end;
if not IsConsole then begin
Close(stderr);
Close(stdout);
{ what about Input and Output ?? PM }
end;
{ call exitprocess, with cleanup as required }
asm_exit(exitcode);
end;
@ -704,11 +699,7 @@ const
STATUS_FLOAT_MULTIPLE_FAULTS = $C00002B4;
STATUS_FLOAT_MULTIPLE_TRAPS = $C00002B5;
STATUS_REG_NAT_CONSUMPTION = $C00002C9;
{
EXCEPTION_EXECUTE_HANDLER = 1;
EXCEPTION_CONTINUE_EXECUTION = -1;
EXCEPTION_CONTINUE_SEARCH = 0;
}
const
ExceptionContinueExecution = 0;
ExceptionContinueSearch = 1;
@ -1334,16 +1325,31 @@ begin
Rewrite(T);
end;
function _getstdfilex(fd: integer): pointer; cdecl; external 'coredll';
function _fileno(fd: pointer): THandle; cdecl; external 'coredll';
procedure SysInitStdIO;
begin
{ Setup stdin, stdout and stderr, for GUI apps redirect stderr,stdout to be
displayed in and messagebox }
AssignError(stderr);
AssignError(stdout);
Assign(Output,'');
Assign(Input,'');
Assign(ErrOutput,'');
StdInputHandle:=_fileno(_getstdfilex(0));
StdOutputHandle:=_fileno(_getstdfilex(1));
StdErrorHandle:=_fileno(_getstdfilex(3));
if not IsConsole then begin
AssignError(stderr);
AssignError(stdout);
Assign(Output,'');
Assign(Input,'');
Assign(ErrOutput,'');
end
else begin
OpenStdIO(Input,fmInput,StdInputHandle);
OpenStdIO(Output,fmOutput,StdOutputHandle);
OpenStdIO(ErrOutput,fmOutput,StdErrorHandle);
OpenStdIO(StdOut,fmOutput,StdOutputHandle);
OpenStdIO(StdErr,fmOutput,StdErrorHandle);
end;
end;
(* ProcessID cached to avoid repeated calls to GetCurrentProcess. *)
@ -1371,7 +1377,7 @@ const
begin
StackLength := InitialStkLen;
StackBottom := Sptr - StackLength;
{ some misc Win32 stuff }
{ some misc stuff }
hprevinst:=0;
if not IsLibrary then
GetLibraryInstance;