paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-09-04 03:50:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

* win32 fixed

Browse Source
This commit is contained in:
peter 2003-09-29 14:36:39 +00:00
parent bc1f8c842c
commit d9cbef4323
6 changed files with 54 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ide/fp.pas
View File

@ -305,7 +305,7 @@ BEGIN
HistorySize:=16384; HistorySize:=16384;
writeln('þ Free Pascal IDE Version '+VersionStr); writeln('þ Free Pascal IDE Version '+VersionStr);
{$ifdef win32} {$ifdef win32}
Win32ShowMouse; // Win32ShowMouse;
{$endif win32} {$endif win32}
{$ifdef WITH_GDB} {$ifdef WITH_GDB}
{$ifdef win32} {$ifdef win32}
@ -501,7 +501,10 @@ BEGIN
END. END.
{ {
$Log$ $Log$
Revision 1.22 2003-06-04 15:06:14 peter Revision 1.23 2003-09-29 14:36:59 peter
* win32 fixed
Revision 1.22 2003/06/04 15:06:14 peter
* histsize increased * histsize increased
Revision 1.21 2003/01/29 00:30:53 pierre Revision 1.21 2003/01/29 00:30:53 pierre

9
ide/fpcalc.pas
View File

@ -290,7 +290,7 @@ begin
{$endif HasSignal} {$endif HasSignal}
begin begin
{$ifdef HasSignal} {$ifdef HasSignal}
StoreSigFPE:={$ifdef ver1_0}Signal{$else}fpSignal{$endif}(SIGFPE,@CalcSigFPE); StoreSigFPE:={$ifdef unix}{$ifdef ver1_0}Signal{$else}fpSignal{$endif}{$else}Signal{$endif}(SIGFPE,@CalcSigFPE);
{$endif HasSignal} {$endif HasSignal}
if (Status = csError) and (Key <> 'C') then Key := ' '; if (Status = csError) and (Key <> 'C') then Key := ' ';
if HexShown then if HexShown then
@ -380,7 +380,7 @@ begin
else CalcKey:=false; else CalcKey:=false;
end; end;
{$ifdef HasSignal} {$ifdef HasSignal}
{$ifdef ver1_0}Signal{$else}fpSignal{$endif}(SIGFPE,StoreSigFPE); {$ifdef unix}{$ifdef ver1_0}Signal{$else}fpSignal{$endif}{$else}Signal{$endif}(SIGFPE,StoreSigFPE);
{$endif HasSignal} {$endif HasSignal}
DrawView; DrawView;
{$ifdef HasSignal} {$ifdef HasSignal}
@ -572,7 +572,10 @@ end;
end. end.
{ {
$Log$ $Log$
Revision 1.8 2003-09-27 14:03:45 peter Revision 1.9 2003-09-29 14:36:59 peter
* win32 fixed
Revision 1.8 2003/09/27 14:03:45 peter
* fixed for unix * fixed for unix
Revision 1.7 2002/09/13 08:13:07 pierre Revision 1.7 2002/09/13 08:13:07 pierre

21
ide/fpcatch.pas
View File

@ -205,10 +205,10 @@ begin
{$else TP} {$else TP}
NewSignal:=SignalHandler(CatchSignal); NewSignal:=SignalHandler(CatchSignal);
{$endif TP} {$endif TP}
OldSigSegm:={$ifdef ver1_0}signal{$else}fpsignal{$endif}(SIGSEGV,NewSignal); OldSigSegm:={$ifdef unix}{$ifdef ver1_0}Signal{$else}fpSignal{$endif}{$else}Signal{$endif}(SIGSEGV,NewSignal);
OldSigInt:={$ifdef ver1_0}signal{$else}fpsignal{$endif}(SIGINT,NewSignal); OldSigInt:={$ifdef unix}{$ifdef ver1_0}Signal{$else}fpSignal{$endif}{$else}Signal{$endif}(SIGINT,NewSignal);
OldSigFPE:={$ifdef ver1_0}signal{$else}fpsignal{$endif}(SIGFPE,NewSignal); OldSigFPE:={$ifdef unix}{$ifdef ver1_0}Signal{$else}fpSignal{$endif}{$else}Signal{$endif}(SIGFPE,NewSignal);
OldSigILL:={$ifdef ver1_0}signal{$else}fpsignal{$endif}(SIGILL,NewSignal); OldSigILL:={$ifdef unix}{$ifdef ver1_0}Signal{$else}fpSignal{$endif}{$else}Signal{$endif}(SIGILL,NewSignal);
CatchSignalsEnabled:=true; CatchSignalsEnabled:=true;
{$endif} {$endif}
end; end;
@ -218,10 +218,10 @@ begin
{$ifdef HasSignal} {$ifdef HasSignal}
if not CatchSignalsEnabled then if not CatchSignalsEnabled then
exit; exit;
{$ifdef ver1_0}signal{$else}fpsignal{$endif}(SIGSEGV,OldSigSegm); {$ifdef unix}{$ifdef ver1_0}Signal{$else}fpSignal{$endif}{$else}Signal{$endif}(SIGSEGV,OldSigSegm);
{$ifdef ver1_0}signal{$else}fpsignal{$endif}(SIGINT,OldSigInt); {$ifdef unix}{$ifdef ver1_0}Signal{$else}fpSignal{$endif}{$else}Signal{$endif}(SIGINT,OldSigInt);
{$ifdef ver1_0}signal{$else}fpsignal{$endif}(SIGFPE,OldSigFPE); {$ifdef unix}{$ifdef ver1_0}Signal{$else}fpSignal{$endif}{$else}Signal{$endif}(SIGFPE,OldSigFPE);
{$ifdef ver1_0}signal{$else}fpsignal{$endif}(SIGILL,OldSigILL); {$ifdef unix}{$ifdef ver1_0}Signal{$else}fpSignal{$endif}{$else}Signal{$endif}(SIGILL,OldSigILL);
CatchSignalsEnabled:=false; CatchSignalsEnabled:=false;
{$endif} {$endif}
end; end;
@ -230,7 +230,10 @@ end.
{ {
$Log$ $Log$
Revision 1.8 2003-09-27 14:03:45 peter Revision 1.9 2003-09-29 14:36:59 peter
* win32 fixed
Revision 1.8 2003/09/27 14:03:45 peter
* fixed for unix * fixed for unix
Revision 1.7 2003/04/23 09:49:26 peter Revision 1.7 2003/04/23 09:49:26 peter

7
ide/fpide.pas
View File

@ -868,7 +868,7 @@ begin
Message(Application,evBroadcast,cmUpdate,nil); Message(Application,evBroadcast,cmUpdate,nil);
{$endif win32} {$endif win32}
{$ifdef win32} {$ifdef win32}
Win32ShowMouse; // Win32ShowMouse;
{$endif win32} {$endif win32}
if Assigned(UserScreen) then if Assigned(UserScreen) then
@ -1254,7 +1254,10 @@ end;
END. END.
{ {
$Log$ $Log$
Revision 1.25 2003-01-31 11:01:00 pierre Revision 1.26 2003-09-29 14:36:59 peter
* win32 fixed
Revision 1.25 2003/01/31 11:01:00 pierre
* fix a bug in cmQuitApp handling * fix a bug in cmQuitApp handling
Revision 1.24 2002/12/12 00:06:41 pierre Revision 1.24 2002/12/12 00:06:41 pierre

23
ide/fpredir.pas
View File

@ -192,7 +192,7 @@ begin
If (Regs.Flags and fCarry)=0 then If (Regs.Flags and fCarry)=0 then
nh:=Regs.Ax nh:=Regs.Ax
else else
fpdup:=false; dup:=false;
end; end;
function dup2(fh,nh : longint) : boolean; function dup2(fh,nh : longint) : boolean;
@ -229,38 +229,38 @@ end;
{$endif ver1_0} {$endif ver1_0}
Function {$ifdef ver1_0}fdclose{$else}fpclose{$endif}( (Handle : Longint) : boolean; Function {$ifdef ver1_0}fdclose{$else}fpclose{$endif} (Handle : Longint) : boolean;
var Regs: registers; var Regs: registers;
begin begin
Regs.Eax := $3e00; Regs.Eax := $3e00;
Regs.Ebx := Handle; Regs.Ebx := Handle;
MsDos(Regs); MsDos(Regs);
{$ifdef ver1_0}fdclose{$else}fpclose{$endif}(:=(Regs.Flags and fCarry)=0; {$ifdef ver1_0}fdclose{$else}fpclose{$endif}:=(Regs.Flags and fCarry)=0;
end; end;
{$endif def go32v2} {$endif def go32v2}
{$ifdef win32} {$ifdef win32}
Function {$ifdef ver1_0}fdclose{$else}fpclose{$endif}( (Handle : Longint) : boolean; Function {$ifdef ver1_0}fdclose{$else}fpclose{$endif} (Handle : Longint) : boolean;
begin begin
{ Do we need this ?? } { Do we need this ?? }
{$ifdef ver1_0}fdclose{$else}fpclose{$endif}(:=true; {$ifdef ver1_0}fdclose{$else}fpclose{$endif}:=true;
end; end;
{$endif} {$endif}
{$ifdef os2} {$ifdef os2}
Function {$ifdef ver1_0}fdclose{$else}fpclose{$endif}( (Handle : Longint) : boolean; Function {$ifdef ver1_0}fdclose{$else}fpclose{$endif} (Handle : Longint) : boolean;
begin begin
{ Do we need this ?? } { Do we need this ?? }
{$ifdef ver1_0}fdclose{$else}fpclose{$endif}(:=true; {$ifdef ver1_0}fdclose{$else}fpclose{$endif}:=true;
end; end;
{$endif} {$endif}
{$ifdef TP} {$ifdef TP}
Function {$ifdef ver1_0}fdclose{$else}fpclose{$endif}( (Handle : Longint) : boolean; Function {$ifdef ver1_0}fdclose{$else}fpclose{$endif} (Handle : Longint) : boolean;
begin begin
{ if executed as under GO32 this hangs the DOS-prompt } { if executed as under GO32 this hangs the DOS-prompt }
{$ifdef ver1_0}fdclose{$else}fpclose{$endif}(:=true; {$ifdef ver1_0}fdclose{$else}fpclose{$endif}:=true;
end; end;
{$endif} {$endif}
@ -970,7 +970,10 @@ finalization
End. End.
{ {
$Log$ $Log$
Revision 1.4 2003-09-27 14:03:45 peter Revision 1.5 2003-09-29 14:36:59 peter
* win32 fixed
Revision 1.4 2003/09/27 14:03:45 peter
* fixed for unix * fixed for unix
Revision 1.3 2003/09/25 16:49:08 peter Revision 1.3 2003/09/25 16:49:08 peter

23
tests/utils/redir.pp
View File

@ -192,7 +192,7 @@ begin
If (Regs.Flags and fCarry)=0 then If (Regs.Flags and fCarry)=0 then
nh:=Regs.Ax nh:=Regs.Ax
else else
fpdup:=false; dup:=false;
end; end;
function dup2(fh,nh : longint) : boolean; function dup2(fh,nh : longint) : boolean;
@ -229,38 +229,38 @@ end;
{$endif ver1_0} {$endif ver1_0}
Function {$ifdef ver1_0}fdclose{$else}fpclose{$endif}( (Handle : Longint) : boolean; Function {$ifdef ver1_0}fdclose{$else}fpclose{$endif} (Handle : Longint) : boolean;
var Regs: registers; var Regs: registers;
begin begin
Regs.Eax := $3e00; Regs.Eax := $3e00;
Regs.Ebx := Handle; Regs.Ebx := Handle;
MsDos(Regs); MsDos(Regs);
{$ifdef ver1_0}fdclose{$else}fpclose{$endif}(:=(Regs.Flags and fCarry)=0; {$ifdef ver1_0}fdclose{$else}fpclose{$endif}:=(Regs.Flags and fCarry)=0;
end; end;
{$endif def go32v2} {$endif def go32v2}
{$ifdef win32} {$ifdef win32}
Function {$ifdef ver1_0}fdclose{$else}fpclose{$endif}( (Handle : Longint) : boolean; Function {$ifdef ver1_0}fdclose{$else}fpclose{$endif} (Handle : Longint) : boolean;
begin begin
{ Do we need this ?? } { Do we need this ?? }
{$ifdef ver1_0}fdclose{$else}fpclose{$endif}(:=true; {$ifdef ver1_0}fdclose{$else}fpclose{$endif}:=true;
end; end;
{$endif} {$endif}
{$ifdef os2} {$ifdef os2}
Function {$ifdef ver1_0}fdclose{$else}fpclose{$endif}( (Handle : Longint) : boolean; Function {$ifdef ver1_0}fdclose{$else}fpclose{$endif} (Handle : Longint) : boolean;
begin begin
{ Do we need this ?? } { Do we need this ?? }
{$ifdef ver1_0}fdclose{$else}fpclose{$endif}(:=true; {$ifdef ver1_0}fdclose{$else}fpclose{$endif}:=true;
end; end;
{$endif} {$endif}
{$ifdef TP} {$ifdef TP}
Function {$ifdef ver1_0}fdclose{$else}fpclose{$endif}( (Handle : Longint) : boolean; Function {$ifdef ver1_0}fdclose{$else}fpclose{$endif} (Handle : Longint) : boolean;
begin begin
{ if executed as under GO32 this hangs the DOS-prompt } { if executed as under GO32 this hangs the DOS-prompt }
{$ifdef ver1_0}fdclose{$else}fpclose{$endif}(:=true; {$ifdef ver1_0}fdclose{$else}fpclose{$endif}:=true;
end; end;
{$endif} {$endif}
@ -970,7 +970,10 @@ finalization
End. End.
{ {
$Log$ $Log$
Revision 1.14 2003-09-25 16:48:18 peter Revision 1.15 2003-09-29 14:36:39 peter
* win32 fixed
Revision 1.14 2003/09/25 16:48:18 peter
* fixed for 1.1 unix * fixed for 1.1 unix
Revision 1.13 2003/06/05 20:03:22 peter Revision 1.13 2003/06/05 20:03:22 peter