diff --git a/ide/fp.pas b/ide/fp.pas
index c43d643671..2ad3ab82e3 100644
--- a/ide/fp.pas
+++ b/ide/fp.pas
@@ -305,7 +305,7 @@ BEGIN
   HistorySize:=16384;
   writeln('þ Free Pascal IDE  Version '+VersionStr);
 {$ifdef win32}
-  Win32ShowMouse;
+  // Win32ShowMouse;
 {$endif win32}
 {$ifdef WITH_GDB}
 {$ifdef win32}
@@ -501,7 +501,10 @@ BEGIN
 END.
 {
   $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
 
   Revision 1.21  2003/01/29 00:30:53  pierre
diff --git a/ide/fpcalc.pas b/ide/fpcalc.pas
index e1a37f10fd..9aefa1dbea 100644
--- a/ide/fpcalc.pas
+++ b/ide/fpcalc.pas
@@ -290,7 +290,7 @@ begin
 {$endif HasSignal}
     begin
 {$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}
       if (Status = csError) and (Key <> 'C') then Key := ' ';
       if HexShown then
@@ -380,7 +380,7 @@ begin
         else CalcKey:=false;
       end;
 {$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}
       DrawView;
 {$ifdef HasSignal}
@@ -572,7 +572,10 @@ end;
 end.
 {
   $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
 
   Revision 1.7  2002/09/13 08:13:07  pierre
diff --git a/ide/fpcatch.pas b/ide/fpcatch.pas
index b43b607b13..160673e062 100644
--- a/ide/fpcatch.pas
+++ b/ide/fpcatch.pas
@@ -205,10 +205,10 @@ begin
 {$else TP}
   NewSignal:=SignalHandler(CatchSignal);
 {$endif TP}
-  OldSigSegm:={$ifdef ver1_0}signal{$else}fpsignal{$endif}(SIGSEGV,NewSignal);
-  OldSigInt:={$ifdef ver1_0}signal{$else}fpsignal{$endif}(SIGINT,NewSignal);
-  OldSigFPE:={$ifdef ver1_0}signal{$else}fpsignal{$endif}(SIGFPE,NewSignal);
-  OldSigILL:={$ifdef ver1_0}signal{$else}fpsignal{$endif}(SIGILL,NewSignal);
+  OldSigSegm:={$ifdef unix}{$ifdef ver1_0}Signal{$else}fpSignal{$endif}{$else}Signal{$endif}(SIGSEGV,NewSignal);
+  OldSigInt:={$ifdef unix}{$ifdef ver1_0}Signal{$else}fpSignal{$endif}{$else}Signal{$endif}(SIGINT,NewSignal);
+  OldSigFPE:={$ifdef unix}{$ifdef ver1_0}Signal{$else}fpSignal{$endif}{$else}Signal{$endif}(SIGFPE,NewSignal);
+  OldSigILL:={$ifdef unix}{$ifdef ver1_0}Signal{$else}fpSignal{$endif}{$else}Signal{$endif}(SIGILL,NewSignal);
   CatchSignalsEnabled:=true;
 {$endif}
 end;
@@ -218,10 +218,10 @@ begin
 {$ifdef HasSignal}
   if not CatchSignalsEnabled then
     exit;
-  {$ifdef ver1_0}signal{$else}fpsignal{$endif}(SIGSEGV,OldSigSegm);
-  {$ifdef ver1_0}signal{$else}fpsignal{$endif}(SIGINT,OldSigInt);
-  {$ifdef ver1_0}signal{$else}fpsignal{$endif}(SIGFPE,OldSigFPE);
-  {$ifdef ver1_0}signal{$else}fpsignal{$endif}(SIGILL,OldSigILL);
+  {$ifdef unix}{$ifdef ver1_0}Signal{$else}fpSignal{$endif}{$else}Signal{$endif}(SIGSEGV,OldSigSegm);
+  {$ifdef unix}{$ifdef ver1_0}Signal{$else}fpSignal{$endif}{$else}Signal{$endif}(SIGINT,OldSigInt);
+  {$ifdef unix}{$ifdef ver1_0}Signal{$else}fpSignal{$endif}{$else}Signal{$endif}(SIGFPE,OldSigFPE);
+  {$ifdef unix}{$ifdef ver1_0}Signal{$else}fpSignal{$endif}{$else}Signal{$endif}(SIGILL,OldSigILL);
   CatchSignalsEnabled:=false;
 {$endif}
 end;
@@ -230,7 +230,10 @@ end.
 
 {
   $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
 
   Revision 1.7  2003/04/23 09:49:26  peter
diff --git a/ide/fpide.pas b/ide/fpide.pas
index 1c5321c6ef..c91a94a273 100644
--- a/ide/fpide.pas
+++ b/ide/fpide.pas
@@ -868,7 +868,7 @@ begin
   Message(Application,evBroadcast,cmUpdate,nil);
 {$endif win32}
 {$ifdef win32}
-  Win32ShowMouse;
+  // Win32ShowMouse;
 {$endif win32}
 
   if Assigned(UserScreen) then
@@ -1254,7 +1254,10 @@ end;
 END.
 {
   $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
 
   Revision 1.24  2002/12/12 00:06:41  pierre
diff --git a/ide/fpredir.pas b/ide/fpredir.pas
index 9d0a47118d..3d442a8c1f 100644
--- a/ide/fpredir.pas
+++ b/ide/fpredir.pas
@@ -192,7 +192,7 @@ begin
     If (Regs.Flags and fCarry)=0 then
       nh:=Regs.Ax
     else
-      fpdup:=false;
+      dup:=false;
 end;
 
 function dup2(fh,nh : longint) : boolean;
@@ -229,38 +229,38 @@ end;
 {$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;
 begin
   Regs.Eax := $3e00;
   Regs.Ebx := Handle;
   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;
 
 {$endif def go32v2}
 
 {$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
   { Do we need this ?? }
-  {$ifdef ver1_0}fdclose{$else}fpclose{$endif}(:=true;
+  {$ifdef ver1_0}fdclose{$else}fpclose{$endif}:=true;
 end;
 {$endif}
 
 {$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
   { Do we need this ?? }
-  {$ifdef ver1_0}fdclose{$else}fpclose{$endif}(:=true;
+  {$ifdef ver1_0}fdclose{$else}fpclose{$endif}:=true;
 end;
 {$endif}
 
 {$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
   { 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;
 
 {$endif}
@@ -970,7 +970,10 @@ finalization
 End.
 {
   $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
 
   Revision 1.3  2003/09/25 16:49:08  peter
diff --git a/tests/utils/redir.pp b/tests/utils/redir.pp
index 0f31abfd12..a0ec3632a9 100644
--- a/tests/utils/redir.pp
+++ b/tests/utils/redir.pp
@@ -192,7 +192,7 @@ begin
     If (Regs.Flags and fCarry)=0 then
       nh:=Regs.Ax
     else
-      fpdup:=false;
+      dup:=false;
 end;
 
 function dup2(fh,nh : longint) : boolean;
@@ -229,38 +229,38 @@ end;
 {$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;
 begin
   Regs.Eax := $3e00;
   Regs.Ebx := Handle;
   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;
 
 {$endif def go32v2}
 
 {$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
   { Do we need this ?? }
-  {$ifdef ver1_0}fdclose{$else}fpclose{$endif}(:=true;
+  {$ifdef ver1_0}fdclose{$else}fpclose{$endif}:=true;
 end;
 {$endif}
 
 {$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
   { Do we need this ?? }
-  {$ifdef ver1_0}fdclose{$else}fpclose{$endif}(:=true;
+  {$ifdef ver1_0}fdclose{$else}fpclose{$endif}:=true;
 end;
 {$endif}
 
 {$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
   { 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;
 
 {$endif}
@@ -970,7 +970,10 @@ finalization
 End.
 {
   $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
 
   Revision 1.13  2003/06/05 20:03:22  peter