From 37ffa5ebffb46b0565b4ca36c889f9af90db34ab Mon Sep 17 00:00:00 2001
From: Rick Parrish <github@rick.parrish>
Date: Thu, 7 Feb 2013 14:11:11 -0500
Subject: [PATCH] ASM blocks are now REETODOd

---
 README.md           |  2 +-
 SOURCE/BOOT.PAS     |  5 +++++
 SOURCE/COMMON.PAS   | 14 ++++++++++++++
 SOURCE/COMMON2.PAS  | 19 ++++++++++++++++++-
 SOURCE/COMMON3.PAS  |  8 ++++++++
 SOURCE/FILE0.PAS    | 11 ++++++++++-
 SOURCE/MYIO.PAS     |  8 ++++++++
 SOURCE/RENEMAIL.PAS |  8 ++++++++
 SOURCE/WFCMENU.PAS  | 11 ++++++++++-
 9 files changed, 82 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index a9a71c6..0d1dd8d 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,6 @@ Ported to Win32 by Rick Parrish<br />
 
 TODO list:<br />
 <ul>
-  <li>IFDEF out any ASM code blocks and handle the same as above</li>
   <li>WORD in RECORD to SMALLWORD</li>
   <li>INTEGER in RECORD to SMALLINT</li>
   <li>TYPEs of OF WORD to OF SMALLWORD (just in case they're used in a RECORD)</li>
@@ -27,4 +26,5 @@ TODO list:<br />
 Completed list<br />
 <ul>
   <li>IFDEF out anything that doesn't compile and make a WIN32 placeholder that does a "WriteLn('REETODO UNIT FUNCTION'); Halt;" (then you can grep the executables for REETODO to see which REETODOs actually need to be implemented)</li>
+  <li>IFDEF out any ASM code blocks and handle the same as above</li>
 </ul>
diff --git a/SOURCE/BOOT.PAS b/SOURCE/BOOT.PAS
index 81b011f..a14fa0d 100644
--- a/SOURCE/BOOT.PAS
+++ b/SOURCE/BOOT.PAS
@@ -817,12 +817,17 @@ FUNCTION SchareLoaded: Boolean;
 VAR
   T_Al: Byte;
 BEGIN
+{$IFDEF MSDOS}
   ASM
     Mov Ah,10h
     Mov Al,0h
     Int 2fh
     Mov T_Al,Al
   END;
+{$ENDIF}
+{$IFDEF WIN32}
+  T_Al := $FF;
+{$ENDIF}
   SchareLoaded := (T_Al = $FF);
 END;
 
diff --git a/SOURCE/COMMON.PAS b/SOURCE/COMMON.PAS
index f8cbaf3..cc07a9b 100644
--- a/SOURCE/COMMON.PAS
+++ b/SOURCE/COMMON.PAS
@@ -672,6 +672,7 @@ USES
   Vote
 {$IFDEF WIN32}
   ,VPUtils
+  ,Windows
 {$ENDIF}
   ;
 
@@ -2810,6 +2811,7 @@ BEGIN
         BEGIN
           IF (ABS((Ticks - LastTimeSlice)) >= General.Slicetimer) THEN
           BEGIN
+{$IFDEF MSDOS}
             CASE Tasker OF
               None : ASM
                        int 28h
@@ -2832,6 +2834,10 @@ BEGIN
                        Pop dx
                      END;
             END;
+{$ENDIF}
+{$IFDEF WIN32}
+            Sleep(1);
+{$ENDIF}
             LastTimeSlice := Ticks;
           END
           ELSE IF (MultiNodeChat) AND (NOT InChat) AND (ABS(Ticks - LastCheckTimeSlice) > 9) THEN
@@ -2996,6 +3002,7 @@ BEGIN
   END;
 END;
 
+{$IFDEF MSDOS}
 FUNCTION AOnOff(b: Boolean; CONST s1,s2:AStr): STRING; ASSEMBLER;
 ASM
   PUSH ds
@@ -3014,6 +3021,13 @@ ASM
   REP  MOVSB
   POP  ds
 END;
+{$ENDIF}
+{$IFDEF WIN32}
+FUNCTION AOnOff(b: Boolean; CONST s1,s2:AStr): STRING;
+BEGIN
+  WriteLn('REETODO COMMON AOnOff'); Halt;
+END;
+{$ENDIF}
 
 FUNCTION ShowOnOff(b: Boolean): STRING;
 BEGIN
diff --git a/SOURCE/COMMON2.PAS b/SOURCE/COMMON2.PAS
index be40eff..808fa13 100644
--- a/SOURCE/COMMON2.PAS
+++ b/SOURCE/COMMON2.PAS
@@ -29,7 +29,11 @@ USES
   LineChat,
   SysOp2G,
   SysOp3,
-  SplitCha;
+  SplitCha
+{$IFDEF WIN32}
+  ,Windows
+{$ENDIF}
+  ;
 
 CONST
   SYSKEY_LENGTH = 1269;
@@ -155,6 +159,7 @@ CONST
     'H','o','u','r','s',':',#25,#6 ,'M','a','i','l',' ',':',#25,#6 ,'O',
     'v','e','r','l','a','y','s',':',#25,#7 ,#24);
 
+{$IFDEF MSDOS}
 PROCEDURE BiosScroll(up: Boolean); ASSEMBLER;
 ASM
   Mov cx,0
@@ -171,6 +176,13 @@ ASM
   @Go:
   Int 10h
 END;
+{$ENDIF}
+{$IFDEF WIN32}
+PROCEDURE BiosScroll(up: Boolean);
+BEGIN
+  WriteLn('REETODO COMMON2 BiosScroll'); Halt;
+END;
+{$ENDIF}
 
 PROCEDURE CPR(c1,c2: Byte);
 VAR
@@ -845,9 +857,14 @@ BEGIN
              REPEAT
                OutKey(^G);
                Delay(500);
+{$IFDEF MSDOS}
                ASM
                 Int 28h
                END;
+{$ENDIF}
+{$IFDEF WIN32}
+               Sleep(1);
+{$ENDIF}
                CheckHangUp;
              UNTIL ((NOT Empty) OR (HangUp));
              Update_Screen;
diff --git a/SOURCE/COMMON3.PAS b/SOURCE/COMMON3.PAS
index 13cad50..b07167c 100644
--- a/SOURCE/COMMON3.PAS
+++ b/SOURCE/COMMON3.PAS
@@ -340,6 +340,7 @@ VAR
     Inc(Cp);
   END;
 
+{$IFDEF MSDOS}
   PROCEDURE SetCursor(InsertMode: Boolean); ASSEMBLER;
   ASM
     cmp InsertMode,0
@@ -354,6 +355,13 @@ VAR
     mov ah,1
     int 10h
   END;
+{$ENDIF}
+{$IFDEF WIN32}
+  PROCEDURE SetCursor(InsertMode: Boolean);
+  BEGIN
+    WriteLn('REETODO COMMON3 SetCursor'); Halt;
+  END;
+{$ENDIF}
 
 BEGIN
   FirstKey := FALSE;
diff --git a/SOURCE/FILE0.PAS b/SOURCE/FILE0.PAS
index 965c0b9..2487204 100644
--- a/SOURCE/FILE0.PAS
+++ b/SOURCE/FILE0.PAS
@@ -41,7 +41,11 @@ USES
   Dos,
   File1,
   ShortMsg,
-  TimeFunc;
+  TimeFunc
+{$IFDEF WIN32}
+  ,Windows
+{$ENDIF}
+  ;
 
 FUNCTION CompFileArea(FArea,ArrayNum: Integer): Integer;
 VAR
@@ -585,9 +589,14 @@ BEGIN
       SaveTimer := Timer;
     END
     ELSE
+{$IFDEF MSDOS}
       ASM
         Int 28h
       END;
+{$ENDIF}
+{$IFDEF WIN32}
+      Sleep(1);
+{$ENDIF}
   END;
   IF (Cmd <> #27) THEN
   BEGIN
diff --git a/SOURCE/MYIO.PAS b/SOURCE/MYIO.PAS
index 49fdd75..598900b 100644
--- a/SOURCE/MYIO.PAS
+++ b/SOURCE/MYIO.PAS
@@ -71,6 +71,7 @@ IMPLEMENTATION
 USES
   Crt;
 
+{$IFDEF MSDOS}
 PROCEDURE CursorOn(b: BOOLEAN); ASSEMBLER;
 ASM
   cmp b, 1
@@ -85,6 +86,13 @@ ASM
   mov ah,1
   int 10h
 END;
+{$ENDIF}
+{$IFDEF WIN32}
+PROCEDURE CursorOn(b: BOOLEAN);
+BEGIN
+  WriteLn('REETODO MYIO CursorOn'); Halt;
+END;
+{$ENDIF}
 
 PROCEDURE infield1(x,y: Byte; VAR s: AStr; Len: Byte);
 VAR
diff --git a/SOURCE/RENEMAIL.PAS b/SOURCE/RENEMAIL.PAS
index 1efc988..fcce515 100644
--- a/SOURCE/RENEMAIL.PAS
+++ b/SOURCE/RENEMAIL.PAS
@@ -368,6 +368,7 @@ BEGIN
 END;
 *)
 
+{$IFDEF MSDOS}
 FUNCTION AOnOff(B: Boolean; S1,S2: STRING): STRING; ASSEMBLER;
 ASM
   PUSH ds
@@ -386,6 +387,13 @@ ASM
   REP  MOVSB
   POP  ds
 END;
+{$ENDIF}
+{$IFDEF WIN32}
+FUNCTION AOnOff(B: Boolean; S1,S2: STRING): STRING;
+BEGIN
+  WriteLn('REETODO RENEMAIL AOnOff'); Halt;
+END;
+{$ENDIF}
 
 FUNCTION StripName(S: STRING): STRING;
 VAR
diff --git a/SOURCE/WFCMENU.PAS b/SOURCE/WFCMENU.PAS
index 27d9aa6..88ecda5 100644
--- a/SOURCE/WFCMENU.PAS
+++ b/SOURCE/WFCMENU.PAS
@@ -47,7 +47,11 @@ USES
   SysOp11,
   SysOp12,
   TimeFunc,
-  MiscUser;
+  MiscUser
+{$IFDEF WIN32}
+  ,Windows
+{$ENDIF}
+  ;
 
 VAR
   LastKeyPress: LongInt;
@@ -946,9 +950,14 @@ BEGIN
 
     DailyMaint;
 
+{$IFDEF MSDOS}
     ASM
       Int 28h
     END;
+{$ENDIF}
+{$IFDEF WIN32}
+    Sleep(1);
+{$ENDIF}
 
     IF (AnswerBaud = 0) THEN
     BEGIN