Removed some DOS only code from other ports.

zsnes/src/gui/gui.asm

@@ -79,9 +79,9 @@ EXTSYM statesaver,loadstate2,vidbuffer,ASCII2Font,hirestiledat,showallext
 EXTSYM scanlines,statefileloc,pl1selk,pl2selk,fnamest,sprlefttot,spritetablea
 EXTSYM fnames,CHIPBATT,sfxramdata,setaramdata,SETAEnable,cgram,srama,tempco0
 EXTSYM prevbright,maxbr,prevpal,coladdr,coladdg,coladdb,scaddtype,ScreenScale
-EXTSYM initvideo2,initvideo,pressed,UpdateDevices,memtabler8
+EXTSYM initvideo,pressed,UpdateDevices,memtabler8
 EXTSYM memtablew8,writeon,pl1contrl,pl2contrl,JoyRead,SetInputDevice,delay
-EXTSYM SetInputDevice209,FPSOn,RevStereo,WDSPReg0C,WDSPReg1C,pl12s34,resolutn
+EXTSYM FPSOn,RevStereo,WDSPReg0C,WDSPReg1C,pl12s34,resolutn
 EXTSYM InitDrive,InitDir,createnewcfg,Makemode7Table,vidbufferofsb,ZipSupport
 EXTSYM wramdata,bgfixer,cfgnewgfx,videotroub,Open_File,Read_File
 EXTSYM Close_File,Write_File,Create_File,File_Seek,File_Seek_End,Get_Date
@@ -149,7 +149,7 @@ EXTSYM numlockptr
 %elifdef __WIN32__
 EXTSYM initDirectDraw,reInitSound
 %elifdef __MSDOS__
-EXTSYM dssel
+EXTSYM dssel,SetInputDevice209,initvideo2
 %endif
 
 %include "gui/guitools.inc"
@@ -477,16 +477,18 @@ GUIQuickLoadUpdate:
 .off
     mov dword[GUIPrevMenuData.onoff+15],'OFF '
 .on
-    mov esi,prevloadfnamel
 %ifdef __MSDOS__
     mov esi,prevloadnames
+%else
+    mov esi,prevloadfnamel
 %endif
     mov edi,GUIPrevMenuData+3
     mov edx,10
 .mainloop
-    mov ecx,25
 %ifdef __MSDOS__
     mov ecx,16
+%else
+    mov ecx,25
 %endif
     push edi
     push esi
@@ -525,9 +527,10 @@ GUIQuickLoadUpdate:
 .fin
     pop esi
     pop edi
-    add esi,512 ;16
 %ifdef __MSDOS__
-    sub esi,512-16
+    add esi,16
+%else
+    add esi,512 ;16
 %endif
     add edi,32
     dec edx

zsnes/src/gui/guimisc.inc

@@ -238,6 +238,7 @@ CalibrateDev1:
     mov [JoyMaxY],eax
     mov [CalibYmax],eax
     ret
+%ifdef __MSDOS__
 .port209
     cmp bl,1
     jbe .nojoy209
@@ -305,6 +306,7 @@ CalibrateDev1:
     mov [JoyMaxY209],eax
     mov [CalibYmax209],eax
     ret
+%endif
 SECTION .bss
 .joyblx resd 1
 .joybly resd 1
@@ -333,6 +335,7 @@ SetDevice:
     call SetInputDevice
     call UpdateDevices
     jmp .procmtap
+%ifdef __MSDOS__
 .port209
     mov dword[CalibXmin209],0
     mov ecx,[DevicePtr+eax*4]
@@ -344,6 +347,7 @@ SetDevice:
     mov bh,[cplayernum]
     call SetInputDevice209
     call UpdateDevices
+%endif
 .procmtap
     mov byte[MultiTap],1
     cmp byte[SFXEnable],1

zsnes/src/gui/guimouse.inc

@@ -813,8 +813,8 @@ ProcessMouseButtons:
 
 
 GUIProcVideo:
-    mov al,[GUIcurrentvideocursloc]
 %ifdef __MSDOS__
+    mov al,[GUIcurrentvideocursloc]
     cmp al,3
     je .yes16b
     cmp al,5
@@ -825,8 +825,8 @@ GUIProcVideo:
     je .yes16b
     cmp al,8
     jne .no16b
-%endif
 .yes16b
+%endif
 ;    mov byte[newengen],0
 ;    mov byte[cfgnewgfx],0
 ;    jmp .skipno16b
@@ -1300,8 +1300,8 @@ GUIWinClicked:
 %%done
     mov al,%3
     mov %4,al
-    call ClearScreen
 %ifdef __MSDOS__
+    call ClearScreen
     cmp byte[En2xSaI],0
     jne %%nomodeq
     cmp byte[cvidmode],2
@@ -1315,8 +1315,8 @@ GUIWinClicked:
     call initvideo2
     mov byte[cbitmode],0
     call GUISetPal
-%endif
 %%nomodex
+%endif
     ret
 %%noclick
 %endmacro
@@ -2062,8 +2062,8 @@ DisplayGUIChoseSaveClick:
     mov ebx,[keycontrolval]
     mov byte[ebx],1
     pop ebx
-%endif
 %%notwin32
+%endif
     ret
 %%cancelkey
     xor ebx,ebx

zsnes/src/gui/guitools.inc

@@ -433,8 +433,8 @@ GUIOutputStringwinl:
     cmp al,'%'
     jne .noperc
     call ConvertPercValue
-%endif
 .noperc
+%endif
     or al,al
     jz .nomore
     mov al,[ASCII2Font+eax]
@@ -459,6 +459,7 @@ GUIOutputStringwinl:
 .nomore
     ret
 
+%ifndef __MSDOS__
 ConvertPercValue:
     mov al,[edi+2]
     cmp al,'a'
@@ -511,6 +512,7 @@ ConvertPercValue:
     xor eax,eax
     mov al,[edi]
     ret
+%endif
 
 OutputUnder:
     cmp edx,-8